ARM: dts: at91: sama5d2: Move flx4 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-3-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 d7a6c97..ee6f036 100644 (file)
--- a/arch/arm/boot/dts/at91-kizbox3_common.dtsi
+++ b/arch/arm/boot/dts/at91-kizbox3_common.dtsi
@@ -351,22 +351,8 @@
        status = "disabled";
 
        i2c6: i2c@600 {
-               compatible = "atmel,sama5d2-i2c";
-               reg = <0x600 0x200>;
-               interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
-               dmas = <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
-                       | AT91_XDMAC_DT_PERID(19))>,
-                      <&dma0
-                       (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
-                       | AT91_XDMAC_DT_PERID(20))>;
-               dma-names = "tx", "rx";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_flx4_default>;
-               atmel,fifo-size = <16>;
                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 d215243..5f4a7c8 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
@@ -208,41 +208,21 @@
                                status = "okay";
 
                                uart9: serial@200 {
-                                       compatible = "atmel,at91sam9260-usart";
-                                       reg = <0x200 0x200>;
-                                       interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
-                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
-                                       clock-names = "usart";
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx4_default>;
-                                       atmel,fifo-size = <32>;
                                        status = "disabled"; /* Conflict with spi6 and i2c6. */
                                };
 
                                spi6: spi@400 {
-                                       compatible = "atmel,at91rm9200-spi";
-                                       reg = <0x400 0x200>;
-                                       interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
-                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
-                                       clock-names = "spi_clk";
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>;
-                                       atmel,fifo-size = <16>;
                                        status = "okay"; /* Conflict with uart5 and i2c6. */
                                };
 
                                i2c6: i2c@600 {
-                                       compatible = "atmel,sama5d2-i2c";
-                                       reg = <0x600 0x200>;
-                                       interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
                                        dmas = <0>, <0>;
-                                       dma-names = "tx", "rx";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx4_default>;
-                                       atmel,fifo-size = <16>;
                                        status = "disabled"; /* Conflict with uart5 and spi6. */
                                };
                        };

diff --git a/arch/arm/boot/dts/at91-sama5d2_icp.dts b/arch/arm/boot/dts/at91-sama5d2_icp.dts
index 1d9556d..7216a79 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_icp.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_icp.dts
@@ -202,17 +202,9 @@
        status = "okay";
 
        i2c6: i2c@600 {
-               compatible = "atmel,sama5d2-i2c";
-               reg = <0x600 0x200>;
-               interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
                dmas = <0>, <0>;
-               dma-names = "tx", "rx";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_flx4_default>;
-               atmel,fifo-size = <16>;
                status = "okay";
 
                mcp16502@5b {

diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
index 0666708..a5046f8 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
@@ -378,20 +378,12 @@
                                status = "okay";
 
                                i2c6: i2c@600 {
-                                       compatible = "atmel,sama5d2-i2c";
-                                       reg = <0x600 0x200>;
-                                       interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
                                        dmas = <0>, <0>;
-                                       dma-names = "tx", "rx";
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
                                        pinctrl-names = "default", "gpio";
                                        pinctrl-0 = <&pinctrl_flx4_default>;
                                        pinctrl-1 = <&pinctrl_flx4_gpio>;
                                        sda-gpios = <&pioA PIN_PD12 GPIO_ACTIVE_HIGH>;
                                        scl-gpios = <&pioA PIN_PD13 GPIO_ACTIVE_HIGH>;
-                                       atmel,fifo-size = <16>;
                                        i2c-analog-filter;
                                        i2c-digital-filter;
                                        i2c-digital-filter-width-ns = <35>;

diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi
index ab550d6..5c31e40 100644 (file)
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -814,6 +814,46 @@
                                #size-cells = <1>;
                                ranges = <0x0 0xfc018000 0x800>;
                                status = "disabled";
+
+                               uart9: serial@200 {
+                                       compatible = "atmel,at91sam9260-usart";
+                                       reg = <0x200 0x200>;
+                                       interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
+                                       clock-names = "usart";
+                                       atmel,fifo-size = <32>;
+                                       status = "disabled";
+                               };
+
+                               spi6: spi@400 {
+                                       compatible = "atmel,at91rm9200-spi";
+                                       reg = <0x400 0x200>;
+                                       interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
+                                       clock-names = "spi_clk";
+                                       atmel,fifo-size = <16>;
+                                       status = "disabled";
+                               };
+
+                               i2c6: i2c@600 {
+                                       compatible = "atmel,sama5d2-i2c";
+                                       reg = <0x600 0x200>;
+                                       interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;
+                                       dmas = <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(19))>,
+                                              <&dma0
+                                               (AT91_XDMAC_DT_MEM_IF(0) |
+                                                AT91_XDMAC_DT_PER_IF(1) |
+                                                AT91_XDMAC_DT_PERID(20))>;
+                                       dma-names = "tx", "rx";
+                                       atmel,fifo-size = <16>;
+                                       status = "disabled";
+                               };
                        };
 
                        trng@fc01c000 {