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

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

diff --git a/arch/arm/boot/dts/at91-kizbox3_common.dtsi b/arch/arm/boot/dts/at91-kizbox3_common.dtsi
index ee6f036aa00859fa6c50b1913feb6dbd3ed56a56..4351a8d322250dd7c4d44c955f05cf7603f8ef23 100644 (file)
--- a/arch/arm/boot/dts/at91-kizbox3_common.dtsi
+++ b/arch/arm/boot/dts/at91-kizbox3_common.dtsi
@@ -325,21 +325,8 @@
        status = "disabled";
 
        uart8: serial@200 {
-               compatible = "atmel,at91sam9260-usart";
-               reg = <0x200 0x400>;
-               interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
-               dmas = <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
-                       | AT91_XDMAC_DT_PERID(17))>,
-                      <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
-                       | AT91_XDMAC_DT_PERID(18))>;
-               dma-names = "tx", "rx";
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;
-               clock-names = "usart";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_flx3_default>;
-               atmel,fifo-size = <32>;
                atmel,use-dma-rx;
                atmel,use-dma-tx;
                status = "disabled";

diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
index 5f4a7c8725f3bbfd2fab2d7ec33133ee4c59dc6e..abbf14e29d85ca226f590421890007801e264b01 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
@@ -179,26 +179,15 @@
                                status = "disabled";
 
                                uart8: serial@200 {
-                                       compatible = "atmel,at91sam9260-usart";
-                                       reg = <0x200 0x200>;
-                                       interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
-                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;
-                                       clock-names = "usart";
+                                       dmas = <0>, <0>;
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx3_default>;
-                                       atmel,fifo-size = <32>;
                                        status = "disabled"; /* Conflict with isc. */
                                };
 
                                spi5: spi@400 {
-                                       compatible = "atmel,at91rm9200-spi";
-                                       reg = <0x400 0x200>;
-                                       interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
-                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;
-                                       clock-names = "spi_clk";
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx3_default>;
-                                       atmel,fifo-size = <16>;
                                        status = "disabled"; /* Conflict with isc. */
                                };
                        };

diff --git a/arch/arm/boot/dts/at91-sama5d2_icp.dts b/arch/arm/boot/dts/at91-sama5d2_icp.dts
index 7216a794f4f63f14ee91092bc97f08b83a1601a9..8a4336e12a60ae58a7f3552c64083441d0182252 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_icp.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_icp.dts
@@ -185,14 +185,8 @@
        status = "okay";
 
        spi5: spi@400 {
-               compatible = "atmel,at91rm9200-spi";
-               reg = <0x400 0x200>;
-               interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;
-               clock-names = "spi_clk";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_mikrobus1_spi &pinctrl_mikrobus1_spi_cs>;
-               atmel,fifo-size = <16>;
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 5c31e4068eb590bbc79336d9b1c811bf9d93c769..5e84cde8226a11d275a55d7baed2a23cf3fec2c5 100644 (file)
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -804,6 +804,35 @@
                                #size-cells = <1>;
                                ranges = <0x0 0xfc014000 0x800>;
                                status = "disabled";
+
+                               uart8: serial@200 {
+                                       compatible = "atmel,at91sam9260-usart";
+                                       reg = <0x200 0x200>;
+                                       interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;
+                                       clock-names = "usart";
+                                       dmas = <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(17))>,
+                                              <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(18))>;
+                                       dma-names = "tx", "rx";
+                                       atmel,fifo-size = <32>;
+                                       status = "disabled";
+                               };
+
+                               spi5: spi@400 {
+                                       compatible = "atmel,at91rm9200-spi";
+                                       reg = <0x400 0x200>;
+                                       interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;
+                                       clock-names = "spi_clk";
+                                       atmel,fifo-size = <16>;
+                                       status = "disabled";
+                               };
                        };
 
                        flx4: flexcom@fc018000 {