ARM: bcm2835: Add device tree for Raspberry Pi model B+
Subsystems (4)
PATCH 1/1 ARM: bcm2835: Add device tree for Raspberry Pi model B+
From: Matthias Klein <[email protected]>
The model B and B+ differ in the GPIO lines for ACT and PWR leds, and the I2S interface.
---
As requested by Arnd.
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 30 +++++++++++++++++++ arch/arm/boot/dts/bcm2835-rpi-b.dts | 46 ++-------------------------- arch/arm/boot/dts/bcm2835-rpi.dtsi | 51 ++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 43 deletions(-) create mode 100644 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts create mode 100644 arch/arm/boot/dts/bcm2835-rpi.dtsi
arch/arm/boot/dts/Makefile +1 -0
@@ -54,6 +54,7 @@ dtb-$(CONFIG_ARCH_AT91) += at91-sama5d4ek.dtb dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb +dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts new file +30 -0
@@ -0,0 +1,30 @@ +/dts-v1/; +/include/ "bcm2835-rpi.dtsi" + +/ { + compatible = "raspberrypi,model-b-plus", "brcm,bcm2835"; + model = "Raspberry Pi Model B+"; + + leds { + act { + gpios = <&gpio 47 0>; + }; + + pwr { + label = "PWR"; + gpios = <&gpio 35 0>; + default-state = "keep"; + linux,default-trigger = "default-on"; + }; + }; +}; + +&gpio { + pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>; + + /* I2S interface */ + i2s_alt0: i2s_alt0 { + brcm,pins = <18 19 20 21>; + brcm,function = <4>; /* alt0 */ + }; +};
arch/arm/boot/dts/bcm2835-rpi-b.dts +3 -43
66 lines not on this page · raw message
arch/arm/boot/dts/bcm2835-rpi.dtsi new file +51 -0
51 lines not on this page · raw message
Signature · 1 line
1.9.1
Quoted 12 lines · On Thursday 20 November 2014 10:52:45 Lee Jones wrote:
From: Matthias Klein <[email protected]>
The model B and B+ differ in the GPIO lines for ACT and PWR leds, and the I2S interface.
Signed-off-by Matthias Klein <[email protected]>Tested-by Stephen Warren <[email protected]>Signed-off-by Lee Jones <[email protected]>---
As requested by Arnd.
Quoted 8 lines
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 30 +++++++++++++++++++ arch/arm/boot/dts/bcm2835-rpi-b.dts | 46 ++-------------------------- arch/arm/boot/dts/bcm2835-rpi.dtsi | 51 ++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 43 deletions(-) create mode 100644 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts create mode 100644 arch/arm/boot/dts/bcm2835-rpi.dtsi
Applied to next/dt.
When you send a patch for inclusion the next time, better be explicit and ask for it to be picked up into arm-soc, so we know it's not just for review.
Thanks,
Arnd
Quoted 22 lines · Arnd Bergmann
Quoted 12 lines · On Thursday 20 November 2014 10:52:45 Lee Jones wrote:
From: Matthias Klein <[email protected]>
The model B and B+ differ in the GPIO lines for ACT and PWR leds, and the I2S interface.
Signed-off-by Matthias Klein <[email protected]>Tested-by Stephen Warren <[email protected]>Signed-off-by Lee Jones <[email protected]>---
As requested by Arnd.
Quoted 8 lines
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 30 +++++++++++++++++++ arch/arm/boot/dts/bcm2835-rpi-b.dts | 46 ++-------------------------- arch/arm/boot/dts/bcm2835-rpi.dtsi | 51 ++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 43 deletions(-) create mode 100644 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts create mode 100644 arch/arm/boot/dts/bcm2835-rpi.dtsi
Quoted 5 lines
Applied to next/dt.
When you send a patch for inclusion the next time, better be explicit and ask for it to be picked up into arm-soc, so we know it's not just for review.
Sounds reasonable. Thanks Arnd.