ARM: dts: at91: sama5d2: Move flx1 definitions in the SoC dtsi

The Flexcom IP is part of the sama5d2 SoC. Move the flx0 node together
with its function definitions in sama5d2.dtsi. Boards will just fill
the pins and enable the desired functions.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20200514050301.147442-6-tudor.ambarus@microchip.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
index abbf14e29d85ca226f590421890007801e264b01..a0deff15fb9ab26cd87cd23cce6e8530ce13f694 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
@@ -126,20 +126,13 @@
                                status = "okay";
 
                                i2c3: i2c@600 {
-                                       compatible = "atmel,sama5d2-i2c";
-                                       reg = <0x600 0x200>;
-                                       interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>;
                                        dmas = <0>, <0>;
                                        dma-names = "tx", "rx";
                                        i2c-analog-filter;
                                        i2c-digital-filter;
                                        i2c-digital-filter-width-ns = <35>;
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_mikrobus_i2c>;
-                                       atmel,fifo-size = <16>;
                                        status = "okay";
                                };
                        };

diff --git a/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi b/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
index bea3d60b9722e6be9ac4bb4155b69e41c63d093b..a06700e53e4c3a09b3a3790435760b75df75419f 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
+++ b/arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
@@ -36,18 +36,6 @@
        atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
 
        uart6: serial@200 {
-               compatible = "atmel,at91sam9260-usart";
-               reg = <0x200 0x200>;
-               interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>;
-               dmas = <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
-                        AT91_XDMAC_DT_PERID(13))>,
-                      <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
-                        AT91_XDMAC_DT_PERID(14))>;
-               dma-names = "tx", "rx";
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;
-               clock-names = "usart";
                pinctrl-0 = <&pinctrl_flx1_default>;
                pinctrl-names = "default";
        };

diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 89064225e9aabb1f95d028e2b672c13b6c583e68..79ed7bd02df6900de59cb1b3669e36d273569ba7 100644 (file)
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -645,6 +645,35 @@
                                #size-cells = <1>;
                                ranges = <0x0 0xf8038000 0x800>;
                                status = "disabled";
+
+                               uart6: serial@200 {
+                                       compatible = "atmel,at91sam9260-usart";
+                                       reg = <0x200 0x200>;
+                                       interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;
+                                       clock-names = "usart";
+                                       dmas = <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(13))>,
+                                              <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(14))>;
+                                       dma-names = "tx", "rx";
+                                       status = "disabled";
+                               };
+
+                               i2c3: i2c@600 {
+                                       compatible = "atmel,sama5d2-i2c";
+                                       reg = <0x600 0x200>;
+                                       interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 20>;
+                                       atmel,fifo-size = <16>;
+                                       status = "disabled";
+                               };
                        };
 
                        securam: sram@f8044000 {