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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Tudor Ambarus and committed by

Alexandre Belloni 5 years ago f1f2212e e1e26620

+21 -21

5 changed files

expand all

arch

arm

boot

dts

at91-kizbox3-hs.dts

at91-kizbox3_common.dtsi

at91-sama5d27_som1_ek.dts

at91-sama5d2_icp.dts

at91-sama5d2_xplained.dts

+2 -2

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

··· 283 283 284 284 &flx3 { 285 285 status = "okay"; 286 - uart6: serial@200 { 286 + uart8: serial@200 { 287 287 status = "okay"; 288 288 }; 289 289 }; ··· 291 291 &flx4 { 292 292 status = "okay"; 293 293 294 - i2c2: i2c@600 { 294 + i2c6: i2c@600 { 295 295 status = "okay"; 296 296 }; 297 297 };

+4 -4

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

··· 28 28 serial3 = &uart3; 29 29 serial4 = &uart4; 30 30 serial5 = &uart5; 31 - serial6 = &uart6; 31 + serial6 = &uart8; 32 32 }; 33 33 34 34 chosen { ··· 207 207 }; 208 208 }; 209 209 210 - pinctrl_flx4_default: flx4_i2c2_default { 210 + pinctrl_flx4_default: flx4_i2c6_default { 211 211 pinmux = <PIN_PD12__FLEXCOM4_IO0>, //DATA 212 212 <PIN_PD13__FLEXCOM4_IO1>; //CLK 213 213 bias-disable; ··· 324 324 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>; 325 325 status = "disabled"; 326 326 327 - uart6: serial@200 { 327 + uart8: serial@200 { 328 328 compatible = "atmel,at91sam9260-usart"; 329 329 reg = <0x200 0x400>; 330 330 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; ··· 350 350 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>; 351 351 status = "disabled"; 352 352 353 - i2c2: i2c@600 { 353 + i2c6: i2c@600 { 354 354 compatible = "atmel,sama5d2-i2c"; 355 355 reg = <0x600 0x200>; 356 356 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;

+10 -10

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

··· 21 21 serial1 = &uart4; /* mikro BUS 1 */ 22 22 serial2 = &uart2; /* mikro BUS 2 */ 23 23 i2c1 = &i2c1; 24 - i2c2 = &i2c2; 24 + i2c2 = &i2c3; 25 25 }; 26 26 27 27 chosen { ··· 125 125 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>; 126 126 status = "okay"; 127 127 128 - i2c2: i2c@600 { 128 + i2c3: i2c@600 { 129 129 compatible = "atmel,sama5d2-i2c"; 130 130 reg = <0x600 0x200>; 131 131 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>; ··· 178 178 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_SPI>; 179 179 status = "disabled"; 180 180 181 - uart7: serial@200 { 181 + uart8: serial@200 { 182 182 compatible = "atmel,at91sam9260-usart"; 183 183 reg = <0x200 0x200>; 184 184 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; ··· 190 190 status = "disabled"; /* Conflict with isc. */ 191 191 }; 192 192 193 - spi2: spi@400 { 193 + spi5: spi@400 { 194 194 compatible = "atmel,at91rm9200-spi"; 195 195 reg = <0x400 0x200>; 196 196 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; ··· 207 207 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_SPI>; 208 208 status = "okay"; 209 209 210 - uart6: serial@200 { 210 + uart9: serial@200 { 211 211 compatible = "atmel,at91sam9260-usart"; 212 212 reg = <0x200 0x200>; 213 213 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>; ··· 216 216 pinctrl-names = "default"; 217 217 pinctrl-0 = <&pinctrl_flx4_default>; 218 218 atmel,fifo-size = <32>; 219 - status = "disabled"; /* Conflict with spi3 and i2c3. */ 219 + status = "disabled"; /* Conflict with spi6 and i2c6. */ 220 220 }; 221 221 222 - spi3: spi@400 { 222 + spi6: spi@400 { 223 223 compatible = "atmel,at91rm9200-spi"; 224 224 reg = <0x400 0x200>; 225 225 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>; ··· 228 228 pinctrl-names = "default"; 229 229 pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>; 230 230 atmel,fifo-size = <16>; 231 - status = "okay"; /* Conflict with uart6 and i2c3. */ 231 + status = "okay"; /* Conflict with uart5 and i2c6. */ 232 232 }; 233 233 234 - i2c3: i2c@600 { 234 + i2c6: i2c@600 { 235 235 compatible = "atmel,sama5d2-i2c"; 236 236 reg = <0x600 0x200>; 237 237 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>; ··· 243 243 pinctrl-names = "default"; 244 244 pinctrl-0 = <&pinctrl_flx4_default>; 245 245 atmel,fifo-size = <16>; 246 - status = "disabled"; /* Conflict with uart6 and spi3. */ 246 + status = "disabled"; /* Conflict with uart5 and spi6. */ 247 247 }; 248 248 }; 249 249

+4 -4

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

··· 22 22 serial0 = &uart0; /* debug uart0 + mikro BUS 1 */ 23 23 serial1 = &uart1; /* mikro BUS 3 */ 24 24 serial3 = &uart3; /* mikro BUS 2 */ 25 - serial5 = &uart5; /* flx2 */ 25 + serial5 = &uart7; /* flx2 */ 26 26 i2c0 = &i2c0; 27 27 i2c1 = &i2c1; 28 28 }; ··· 159 159 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>; 160 160 status = "okay"; 161 161 162 - uart5: serial@200 { 162 + uart7: serial@200 { 163 163 compatible = "atmel,at91sam9260-usart"; 164 164 reg = <0x200 0x200>; 165 165 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 7>; ··· 184 184 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_SPI>; 185 185 status = "okay"; 186 186 187 - spi3: spi@400 { 187 + spi5: spi@400 { 188 188 compatible = "atmel,at91rm9200-spi"; 189 189 reg = <0x400 0x200>; 190 190 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; ··· 201 201 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>; 202 202 status = "okay"; 203 203 204 - i2c2: i2c@600 { 204 + i2c6: i2c@600 { 205 205 compatible = "atmel,sama5d2-i2c"; 206 206 reg = <0x600 0x200>; 207 207 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;

+1 -1

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

··· 377 377 atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>; 378 378 status = "okay"; 379 379 380 - i2c2: i2c@600 { 380 + i2c6: i2c@600 { 381 381 compatible = "atmel,sama5d2-i2c"; 382 382 reg = <0x600 0x200>; 383 383 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;