ARM: dts: at91: sam9x60: move flexcom definitions

Move the flexcom definitions from board specific DTS file
to the SoC specific DTSI file for sam9x60ek.

[durai.manickamkr@microchip.com: Logical split-up of this patch and added
 missing UART5 compatibles]

Signed-off-by: Manikandan Muralidharan <manikandan.m@microchip.com>
Signed-off-by: Hari Prasath Gujulan Elango <Hari.PrasathGE@microchip.com>
Signed-off-by: Durai Manickam KR <durai.manickamkr@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20230207110651.197268-3-durai.manickamkr@microchip.com

diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts
index cf5d786..4ff8463 100644 (file)
--- a/arch/arm/boot/dts/at91-sam9x60ek.dts
+++ b/arch/arm/boot/dts/at91-sam9x60ek.dts
@@ -207,15 +207,10 @@
        status = "okay";
 
        i2c0: i2c@600 {
-               compatible = "microchip,sam9x60-i2c";
-               reg = <0x600 0x200>;
-               interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;
                #address-cells = <1>;
                #size-cells = <0>;
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_flx0_default>;
-               atmel,fifo-size = <16>;
                i2c-analog-filter;
                i2c-digital-filter;
                i2c-digital-filter-width-ns = <35>;
@@ -235,14 +230,8 @@
        status = "disabled";
 
        spi4: spi@400 {
-               compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
-               reg = <0x400 0x200>;
-               interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
-               clock-names = "spi_clk";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_flx4_default>;
-               atmel,fifo-size = <16>;
                #address-cells = <1>;
                #size-cells = <0>;
                status = "disabled";
@@ -254,23 +243,8 @@
        status = "okay";
 
        uart5: serial@200 {
-               compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
-               reg = <0x200 0x200>;
-               atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
-               interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;
-               dmas = <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
-                        AT91_XDMAC_DT_PERID(10))>,
-                      <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
-                        AT91_XDMAC_DT_PERID(11))>;
-               dma-names = "tx", "rx";
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
-               clock-names = "usart";
-               pinctrl-0 = <&pinctrl_flx5_default>;
                pinctrl-names = "default";
-               atmel,use-dma-rx;
-               atmel,use-dma-tx;
+               pinctrl-0 = <&pinctrl_flx5_default>;
                status = "okay";
        };
 };
@@ -280,15 +254,10 @@
        status = "okay";
 
        i2c6: i2c@600 {
-               compatible = "microchip,sam9x60-i2c";
-               reg = <0x600 0x200>;
-               interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>;
                #address-cells = <1>;
                #size-cells = <0>;
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_flx6_default>;
-               atmel,fifo-size = <16>;
                i2c-analog-filter;
                i2c-digital-filter;
                i2c-digital-filter-width-ns = <35>;

diff --git a/arch/arm/boot/dts/sam9x60.dtsi b/arch/arm/boot/dts/sam9x60.dtsi
index 8f5477e..ee6cc43 100644 (file)
--- a/arch/arm/boot/dts/sam9x60.dtsi
+++ b/arch/arm/boot/dts/sam9x60.dtsi
@@ -170,6 +170,16 @@
                                #size-cells = <1>;
                                ranges = <0x0 0xf0000000 0x800>;
                                status = "disabled";
+
+                               spi4: spi@400 {
+                                       compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
+                                       reg = <0x400 0x200>;
+                                       interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
+                                       clock-names = "spi_clk";
+                                       atmel,fifo-size = <16>;
+                                       status = "disabled";
+                               };
                        };
 
                        flx5: flexcom@f0004000 {
@@ -180,6 +190,27 @@
                                #size-cells = <1>;
                                ranges = <0x0 0xf0004000 0x800>;
                                status = "disabled";
+
+                               uart5: serial@200 {
+                                       compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
+                                       reg = <0x200 0x200>;
+                                       atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
+                                       interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       dmas = <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(10))>,
+                                               <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(11))>;
+                                       dma-names = "tx", "rx";
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
+                                       clock-names = "usart";
+                                       atmel,use-dma-rx;
+                                       atmel,use-dma-tx;
+                                       status = "disabled";
+                               };
                        };
 
                        dma0: dma-controller@f0008000 {
@@ -379,6 +410,15 @@
                                #size-cells = <1>;
                                ranges = <0x0 0xf8010000 0x800>;
                                status = "disabled";
+
+                               i2c6: i2c@600 {
+                                       compatible = "microchip,sam9x60-i2c";
+                                       reg = <0x600 0x200>;
+                                       interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
+                                       atmel,fifo-size = <16>;
+                                       status = "disabled";
+                               };
                        };
 
                        flx7: flexcom@f8014000 {
@@ -409,6 +449,15 @@
                                #size-cells = <1>;
                                ranges = <0x0 0xf801c000 0x800>;
                                status = "disabled";
+
+                               i2c0: i2c@600 {
+                                       compatible = "microchip,sam9x60-i2c";
+                                       reg = <0x600 0x200>;
+                                       interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
+                                       atmel,fifo-size = <16>;
+                                       status = "disabled";
+                               };
                        };
 
                        flx1: flexcom@f8020000 {