ARM: dts: at91: sama5d2: Move flx0 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.

There is a single functional change in this patch. With the move of the
flx0 uart5 definition in the SoC dtsi, the uart5 from
at91-sama5d27_wlsom1_ek.dts inherits the following optional property:
atmel,fifo-size = <32>;
This particular change was tested by Codrin.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Tested-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
Link: https://lore.kernel.org/r/20200514050301.147442-7-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 4351a8d..7c3076e 100644 (file)
--- a/arch/arm/boot/dts/at91-kizbox3_common.dtsi
+++ b/arch/arm/boot/dts/at91-kizbox3_common.dtsi
@@ -299,21 +299,8 @@
        status = "disabled";
 
        uart5: serial@200  {
-               compatible = "atmel,at91sam9260-usart";
-               reg = <0x200 0x400>;
-               interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
-               dmas = <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
-                       | AT91_XDMAC_DT_PERID(11))>,
-                      <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
-                       | AT91_XDMAC_DT_PERID(12))>;
-               dma-names = "tx", "rx";
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
-               clock-names = "usart";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_flx0_default>;
-               atmel,fifo-size = <32>;
                atmel,use-dma-rx;
                atmel,use-dma-tx;
                status = "disabled";

diff --git a/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
index 6b84612..6b38fa3 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
@@ -77,18 +77,6 @@
        status = "okay";
 
        uart5: serial@200 {
-               compatible = "atmel,at91sam9260-usart";
-               reg = <0x200 0x200>;
-               interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
-               dmas = <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
-                        AT91_XDMAC_DT_PERID(11))>,
-                      <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
-                        AT91_XDMAC_DT_PERID(12))>;
-               dma-names = "tx", "rx";
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
-               clock-names = "usart";
                pinctrl-0 = <&pinctrl_flx0_default>;
                pinctrl-names = "default";
                atmel,use-dma-rx;

diff --git a/arch/arm/boot/dts/at91-sama5d2_icp.dts b/arch/arm/boot/dts/at91-sama5d2_icp.dts
index 23f413a..4a01ab8 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_icp.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_icp.dts
@@ -105,15 +105,9 @@
        status = "okay";
 
        spi2: spi@400 {
-               compatible = "atmel,at91rm9200-spi";
-               reg = <0x400 0x200>;
-               interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
-               clock-names = "spi_clk";
                cs-gpios = <&pioA PIN_PC0 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_mikrobus2_spi &pinctrl_ksz_spi_cs>;
-               atmel,fifo-size = <16>;
                status = "okay";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
index 32435ce..8ad3a9c 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
@@ -191,20 +191,13 @@
                                status = "okay";
 
                                i2c2: i2c@600 {
-                                       compatible = "atmel,sama5d2-i2c";
-                                       reg = <0x600 0x200>;
-                                       interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
                                        dmas = <0>, <0>;
                                        dma-names = "tx", "rx";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
                                        pinctrl-names = "default", "gpio";
                                        pinctrl-0 = <&pinctrl_flx0_default>;
                                        pinctrl-1 = <&pinctrl_flx0_gpio>;
                                        sda-gpios = <&pioA PIN_PB28 GPIO_ACTIVE_HIGH>;
                                        scl-gpios = <&pioA PIN_PB29 GPIO_ACTIVE_HIGH>;
-                                       atmel,fifo-size = <16>;
                                        status = "okay";
                                };
                        };

diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
index a5046f8..da44427 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
@@ -327,14 +327,9 @@
                                status = "disabled"; /* conflict with ISC_D2 & ISC_D3 data pins */
 
                                uart5: serial@200 {
-                                       compatible = "atmel,at91sam9260-usart";
-                                       reg = <0x200 0x200>;
-                                       interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
-                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
-                                       clock-names = "usart";
+                                       dmas = <0>, <0>;
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx0_default>;
-                                       atmel,fifo-size = <32>;
                                        status = "okay";
                                };
                        };

diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index 79ed7bd..acb9190 100644 (file)
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -635,6 +635,46 @@
                                #size-cells = <1>;
                                ranges = <0x0 0xf8034000 0x800>;
                                status = "disabled";
+
+                               uart5: serial@200 {
+                                       compatible = "atmel,at91sam9260-usart";
+                                       reg = <0x200 0x200>;
+                                       interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
+                                       clock-names = "usart";
+                                       dmas = <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(11))>,
+                                              <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(12))>;
+                                       dma-names = "tx", "rx";
+                                       atmel,fifo-size = <32>;
+                                       status = "disabled";
+                               };
+
+                               spi2: spi@400 {
+                                       compatible = "atmel,at91rm9200-spi";
+                                       reg = <0x400 0x200>;
+                                       interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
+                                       clock-names = "spi_clk";
+                                       atmel,fifo-size = <16>;
+                                       status = "disabled";
+                               };
+
+                               i2c2: i2c@600 {
+                                       compatible = "atmel,sama5d2-i2c";
+                                       reg = <0x600 0x200>;
+                                       interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
+                                       atmel,fifo-size = <16>;
+                                       status = "disabled";
+                               };
                        };
 
                        flx1: flexcom@f8038000 {