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

The Flexcom IP is part of the sama5d2 SoC. Move the flx2 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-5-tudor.ambarus@microchip.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/arch/arm/boot/dts/at91-sama5d2_icp.dts b/arch/arm/boot/dts/at91-sama5d2_icp.dts
index 8a4336e12a60ae58a7f3552c64083441d0182252..23f413afb3333fec1667491684b78a706d875725 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_icp.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_icp.dts
@@ -160,18 +160,6 @@
        status = "okay";
 
        uart7: serial@200 {
-               compatible = "atmel,at91sam9260-usart";
-               reg = <0x200 0x200>;
-               interrupts = <21 IRQ_TYPE_LEVEL_HIGH 7>;
-               dmas = <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
-                               AT91_XDMAC_DT_PERID(15))>,
-                               <&dma0
-                               (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
-                               AT91_XDMAC_DT_PERID(16))>;
-               dma-names = "tx", "rx";
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 21>;
-               clock-names = "usart";
                pinctrl-0 = <&pinctrl_flx2_default>;
                pinctrl-names = "default";
                atmel,use-dma-rx;

diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 5e84cde8226a11d275a55d7baed2a23cf3fec2c5..89064225e9aabb1f95d028e2b672c13b6c583e68 100644 (file)
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -794,6 +794,24 @@
                                #size-cells = <1>;
                                ranges = <0x0 0xfc010000 0x800>;
                                status = "disabled";
+
+                               uart7: serial@200 {
+                                       compatible = "atmel,at91sam9260-usart";
+                                       reg = <0x200 0x200>;
+                                       interrupts = <21 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 21>;
+                                       clock-names = "usart";
+                                       dmas = <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(15))>,
+                                               <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(16))>;
+                                       dma-names = "tx", "rx";
+                                       status = "disabled";
+                               };
                        };
 
                        flx3: flexcom@fc014000 {