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

Merge tag 'arm-soc/for-4.12/devicetree-fixes' of http://github.com/Broadcom/stblinux into fixes

This pull request contains Broadcom ARM-based SoC Device Tree fixes for
4.12, please pull the following:

- Baruch provides several fixes for the Raspberry Pi (BCM2835) Device
Tree source include file: uart0 pinctrl node names, pin number for
i2c0, uart0 rts/cts pins and invalid uart1 pin, missing numbers for
ethernet aliases

* tag 'arm-soc/for-4.12/devicetree-fixes' of http://github.com/Broadcom/stblinux:
ARM: dts: bcm2835: add index to the ethernet alias
ARM: dts: bcm2835: fix uart0/uart1 pins
ARM: dts: bcm2835: fix i2c0 pins
ARM: dts: bcm2835: fix uart0 pinctrl node names

Signed-off-by: Olof Johansson <olof@lixom.net>

+15 -11
+1 -1
arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi
··· 1 1 / { 2 2 aliases { 3 - ethernet = &ethernet; 3 + ethernet0 = &ethernet; 4 4 }; 5 5 }; 6 6
+1 -1
arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi
··· 1 1 / { 2 2 aliases { 3 - ethernet = &ethernet; 3 + ethernet0 = &ethernet; 4 4 }; 5 5 }; 6 6
+13 -9
arch/arm/boot/dts/bcm283x.dtsi
··· 198 198 brcm,pins = <0 1>; 199 199 brcm,function = <BCM2835_FSEL_ALT0>; 200 200 }; 201 - i2c0_gpio32: i2c0_gpio32 { 202 - brcm,pins = <32 34>; 201 + i2c0_gpio28: i2c0_gpio28 { 202 + brcm,pins = <28 29>; 203 203 brcm,function = <BCM2835_FSEL_ALT0>; 204 204 }; 205 205 i2c0_gpio44: i2c0_gpio44 { ··· 295 295 /* Separate from the uart0_gpio14 group 296 296 * because it conflicts with spi1_gpio16, and 297 297 * people often run uart0 on the two pins 298 - * without flow contrl. 298 + * without flow control. 299 299 */ 300 300 uart0_ctsrts_gpio16: uart0_ctsrts_gpio16 { 301 301 brcm,pins = <16 17>; 302 302 brcm,function = <BCM2835_FSEL_ALT3>; 303 303 }; 304 - uart0_gpio30: uart0_gpio30 { 304 + uart0_ctsrts_gpio30: uart0_ctsrts_gpio30 { 305 305 brcm,pins = <30 31>; 306 306 brcm,function = <BCM2835_FSEL_ALT3>; 307 307 }; 308 - uart0_ctsrts_gpio32: uart0_ctsrts_gpio32 { 308 + uart0_gpio32: uart0_gpio32 { 309 309 brcm,pins = <32 33>; 310 310 brcm,function = <BCM2835_FSEL_ALT3>; 311 + }; 312 + uart0_gpio36: uart0_gpio36 { 313 + brcm,pins = <36 37>; 314 + brcm,function = <BCM2835_FSEL_ALT2>; 315 + }; 316 + uart0_ctsrts_gpio38: uart0_ctsrts_gpio38 { 317 + brcm,pins = <38 39>; 318 + brcm,function = <BCM2835_FSEL_ALT2>; 311 319 }; 312 320 313 321 uart1_gpio14: uart1_gpio14 { ··· 333 325 uart1_ctsrts_gpio30: uart1_ctsrts_gpio30 { 334 326 brcm,pins = <30 31>; 335 327 brcm,function = <BCM2835_FSEL_ALT5>; 336 - }; 337 - uart1_gpio36: uart1_gpio36 { 338 - brcm,pins = <36 37 38 39>; 339 - brcm,function = <BCM2835_FSEL_ALT2>; 340 328 }; 341 329 uart1_gpio40: uart1_gpio40 { 342 330 brcm,pins = <40 41>;