Commit f1f2212e authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Alexandre Belloni
Browse files

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: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20200514050301.147442-2-tudor.ambarus@microchip.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent e1e26620

arch/arm/boot/dts/at91-kizbox3-hs.dts

+2 −2
Original line number Diff line number Diff line
@@ -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";

	};

};

arch/arm/boot/dts/at91-kizbox3_common.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/at91-sama5d27_som1_ek.dts

+10 −10
Original line number Diff line number Diff line
@@ -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. */

				};

			};

arch/arm/boot/dts/at91-sama5d2_icp.dts

+4 −4
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/at91-sama5d2_xplained.dts

+1 −1
Original line number Diff line number Diff line
@@ -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>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE