ARM: dts: at91: sama5d2: Fix the label numbering for flexcom functions

The sama5d2 SoC has the following IPs: [uart0, uart4], {spi0, spi1}, {i2c0, i2c1}.
Label the flexcom functions in order:
flx0: uart5, spi2, i2c2
flx1: uart6, spi3, i2c3
flx2: uart7, spi4, i2c4
flx3: uart8, spi5, i2c5
flx4: uart9, spi6, i2c6

Some boards respected this scheme, others not. Fix the ones that didn't.

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

diff --git a/arch/arm/boot/dts/at91-kizbox3-hs.dts b/arch/arm/boot/dts/at91-kizbox3-hs.dts
index 8734e7f8939e93fa84b281b18884e5a2fda64bbe..0da1f0557eaf9cfeb077edd5af260a89d18b372e 100644 (file)
--- a/arch/arm/boot/dts/at91-kizbox3-hs.dts
+++ b/arch/arm/boot/dts/at91-kizbox3-hs.dts
@@ -283,7 +283,7 @@
 
 &flx3 {
        status = "okay";
-       uart6: serial@200 {
+       uart8: serial@200 {
                status = "okay";
        };
 };
@@ -291,7 +291,7 @@
 &flx4 {
        status = "okay";
 
-       i2c2: i2c@600 {
+       i2c6: i2c@600 {
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/at91-kizbox3_common.dtsi b/arch/arm/boot/dts/at91-kizbox3_common.dtsi
index 299e74d23184580e5264465ab82db8bdc087a6c9..d7a6c972bdac0bc954b31f80245c991e1e60176d 100644 (file)
--- a/arch/arm/boot/dts/at91-kizbox3_common.dtsi
+++ b/arch/arm/boot/dts/at91-kizbox3_common.dtsi
@@ -28,7 +28,7 @@
                serial3 = &uart3;
                serial4 = &uart4;
                serial5 = &uart5;
-               serial6 = &uart6;
+               serial6 = &uart8;
        };
 
        chosen {
@@ -207,7 +207,7 @@
                };
        };
 
-       pinctrl_flx4_default: flx4_i2c2_default {
+       pinctrl_flx4_default: flx4_i2c6_default {
                pinmux = <PIN_PD12__FLEXCOM4_IO0>, //DATA
                <PIN_PD13__FLEXCOM4_IO1>; //CLK
                bias-disable;
@@ -324,7 +324,7 @@
        atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
        status = "disabled";
 
-       uart6: serial@200 {
+       uart8: serial@200 {
                compatible = "atmel,at91sam9260-usart";
                reg = <0x200 0x400>;
                interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -350,7 +350,7 @@
        atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
        status = "disabled";
 
-       i2c2: i2c@600 {
+       i2c6: i2c@600 {
                compatible = "atmel,sama5d2-i2c";
                reg = <0x600 0x200>;
                interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;

diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
index b0853bf7901ceea59d91947c5ae1954e3956fd85..d215243fe1635dcc595f87926d4a19bbdbb172b0 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
@@ -21,7 +21,7 @@
                serial1 = &uart4;       /* mikro BUS 1 */
                serial2 = &uart2;       /* mikro BUS 2 */
                i2c1    = &i2c1;
-               i2c2    = &i2c2;
+               i2c2    = &i2c3;
        };
 
        chosen {
@@ -125,7 +125,7 @@
                                atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
                                status = "okay";
 
-                               i2c2: i2c@600 {
+                               i2c3: i2c@600 {
                                        compatible = "atmel,sama5d2-i2c";
                                        reg = <0x600 0x200>;
                                        interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -178,7 +178,7 @@
                                atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_SPI>;
                                status = "disabled";
 
-                               uart7: serial@200 {
+                               uart8: serial@200 {
                                        compatible = "atmel,at91sam9260-usart";
                                        reg = <0x200 0x200>;
                                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -190,7 +190,7 @@
                                        status = "disabled"; /* Conflict with isc. */
                                };
 
-                               spi2: spi@400 {
+                               spi5: spi@400 {
                                        compatible = "atmel,at91rm9200-spi";
                                        reg = <0x400 0x200>;
                                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -207,7 +207,7 @@
                                atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_SPI>;
                                status = "okay";
 
-                               uart6: serial@200 {
+                               uart9: serial@200 {
                                        compatible = "atmel,at91sam9260-usart";
                                        reg = <0x200 0x200>;
                                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -216,10 +216,10 @@
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx4_default>;
                                        atmel,fifo-size = <32>;
-                                       status = "disabled"; /* Conflict with spi3 and i2c3. */
+                                       status = "disabled"; /* Conflict with spi6 and i2c6. */
                                };
 
-                               spi3: spi@400 {
+                               spi6: spi@400 {
                                        compatible = "atmel,at91rm9200-spi";
                                        reg = <0x400 0x200>;
                                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -228,10 +228,10 @@
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>;
                                        atmel,fifo-size = <16>;
-                                       status = "okay"; /* Conflict with uart6 and i2c3. */
+                                       status = "okay"; /* Conflict with uart5 and i2c6. */
                                };
 
-                               i2c3: i2c@600 {
+                               i2c6: i2c@600 {
                                        compatible = "atmel,sama5d2-i2c";
                                        reg = <0x600 0x200>;
                                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -243,7 +243,7 @@
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_flx4_default>;
                                        atmel,fifo-size = <16>;
-                                       status = "disabled"; /* Conflict with uart6 and spi3. */
+                                       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 cc9fa700eafb67f878de082ea1dfbc8aba47b43b..1d9556dbbd63af1b39b5b615be012456038e74c4 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_icp.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_icp.dts
@@ -22,7 +22,7 @@
                serial0 = &uart0;       /* debug uart0 + mikro BUS 1 */
                serial1 = &uart1;       /* mikro BUS 3 */
                serial3 = &uart3;       /* mikro BUS 2 */
-               serial5 = &uart5;       /* flx2 */
+               serial5 = &uart7;       /* flx2 */
                i2c0    = &i2c0;
                i2c1    = &i2c1;
        };
@@ -159,7 +159,7 @@
        atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
        status = "okay";
 
-       uart5: serial@200 {
+       uart7: serial@200 {
                compatible = "atmel,at91sam9260-usart";
                reg = <0x200 0x200>;
                interrupts = <21 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -184,7 +184,7 @@
        atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_SPI>;
        status = "okay";
 
-       spi3: spi@400 {
+       spi5: spi@400 {
                compatible = "atmel,at91rm9200-spi";
                reg = <0x400 0x200>;
                interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -201,7 +201,7 @@
        atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
        status = "okay";
 
-       i2c2: i2c@600 {
+       i2c6: i2c@600 {
                compatible = "atmel,sama5d2-i2c";
                reg = <0x600 0x200>;
                interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;

diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
index e0c6cff1a31245ebcd98f208b676488fc4b804e3..0666708b05f9981dc721fdb0284a8314acf208aa 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
@@ -377,7 +377,7 @@
                                atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
                                status = "okay";
 
-                               i2c2: i2c@600 {
+                               i2c6: i2c@600 {
                                        compatible = "atmel,sama5d2-i2c";
                                        reg = <0x600 0x200>;
                                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;