ARM: bcm2835: add I2S pinctrl to device tree
Subsystems (3)
PATCH 1/1 ARM: bcm2835: add I2S pinctrl to device tree
From: Mark Brown <[email protected]>
Signed-off-by Florian Meier <[email protected]>
[Tweaked slightly to disable by default -- broonie]
Signed-off-by Mark Brown <[email protected]>
[swarren, removed duplicate i2s node]
Signed-off-by Stephen Warren <[email protected]>
---
These two patches are all I expect to have for RPi for 3.18, so I figure it's easiest to just forward them on to you rather than sending tiny pull requests.
arch/arm/boot/dts/bcm2835-rpi-b.dts | 8 +++++++- arch/arm/boot/dts/bcm2835.dtsi | 1 + 2 files changed, 8 insertions(+), 1 deletion(-)
arch/arm/boot/dts/bcm2835-rpi-b.dts +7 -1
@@ -23,7 +23,7 @@ &gpio { pinctrl-names = "default"; - pinctrl-0 = <&gpioout &alt0 &alt3>; + pinctrl-0 = <&gpioout &alt0 &alt2 &alt3>; gpioout: gpioout { brcm,pins = <6>;
@@ -39,6 +39,12 @@ brcm,pins = <48 49 50 51 52 53>; brcm,function = <7>; /* alt3 */ }; + + /* I2S interface */ + alt2: alt2 { + brcm,pins = <28 29 30 31>; + brcm,function = <6>; /* alt2 */ + }; }; &i2c0 {
arch/arm/boot/dts/bcm2835.dtsi +1 -0
@@ -99,6 +99,7 @@ dmas = <&dma 2>, <&dma 3>; dma-names = "tx", "rx"; + status = "disabled"; }; spi: spi at 7e204000 {
Signature · 1 line
1.9.1
Arnd Bergmann
AppliedPATCH 1/1 ARM: bcm2835: add I2S pinctrl to device tree
Quoted 11 lines · Stephen Warren
From: Mark Brown <[email protected]>
Signed-off-by Florian Meier <[email protected]>[Tweaked slightly to disable by default -- broonie]Signed-off-by Mark Brown <[email protected]>[swarren, removed duplicate i2s node]Signed-off-by Stephen Warren <[email protected]>---
These two patches are all I expect to have for RPi for 3.18, so I figure it's easiest to just forward them on to you rather than sending tiny pull requests.
Applied to next/dt, thanks!
Arnd