BCM2835: Add I2S driver to device tree
Subsystems (3)
PATCH 1/1 BCM2835: Add I2S driver to device tree
From: Mark Brown <[email protected]>
[Tweaked slightly to disable by default -- broonie]
--- arch/arm/boot/dts/bcm2835-rpi-b.dts | 8 +++++++- arch/arm/boot/dts/bcm2835.dtsi | 11 +++++++++++ 2 files changed, 18 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 +11 -0
@@ -99,6 +99,7 @@ dmas = <&dma 2>, <&dma 3>; dma-names = "tx", "rx"; + status = "disabled"; }; spi: spi at 7e204000 {
@@ -148,6 +149,16 @@ arm-pmu { compatible = "arm,arm1176-pmu"; }; + + bcm2835_i2s: i2s at 7e203000 { + compatible = "brcm,bcm2835-i2s"; + reg = <0x7e203000 0x20>, + <0x7e101098 0x02>; + + dmas = <&dma 2>, + <&dma 3>; + dma-names = "tx", "rx"; + }; }; clocks {
Signature · 1 line
2.0.0
PATCH 1/1 BCM2835: Add I2S driver to device tree
Quoted 6 lines · Mark Brown
From: Mark Brown <[email protected]>
[Tweaked slightly to disable by default -- broonie]
Signed-off-by Florian Meier <[email protected]>Signed-off-by Mark Brown <[email protected]>
I've belatedly forwarded this to arm-soc for application, except:
arch/arm/boot/dts/bcm2835.dtsi line 161
Quoted 11 lines
arch/arm/boot/dts/bcm2835.dtsi +9
-0+ bcm2835_i2s: i2s at 7e203000 { + compatible = "brcm,bcm2835-i2s"; + reg = <0x7e203000 0x20>, + <0x7e101098 0x02>; + + dmas = <&dma 2>, + <&dma 3>; + dma-names = "tx", "rx"; + };
This node is already there (and even edited in this patch), so I dropped that hunk.
PATCH 1/1 BCM2835: Add I2S driver to device tree
Quoted 15 lines · Stephen Warren
arch/arm/boot/dts/bcm2835.dtsi line 161
Quoted 11 lines · Mark Brown
From: Mark Brown <[email protected]>
arch/arm/boot/dts/bcm2835.dtsi +9
-0+ bcm2835_i2s: i2s at 7e203000 { + compatible = "brcm,bcm2835-i2s"; + reg = <0x7e203000 0x20>, + <0x7e101098 0x02>; + + dmas = <&dma 2>, + <&dma 3>; + dma-names = "tx", "rx"; + };This node is already there (and even edited in this patch), so I dropped that hunk.
Right, not sure what went on with applying it upstream originally but it
looks like git rebase didn't figure out what was going on well - thebcm2835_i2s is needed so we can reference the node. I'll probably get
round to resending an incremental patch.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140917/f718a915/attachment.sig>
PATCH 1/1 BCM2835: Add I2S driver to device tree
Quoted 17 lines · Mark Brown
Quoted 15 lines · Stephen Warren
arch/arm/boot/dts/bcm2835.dtsi line 161
Quoted 11 lines · Mark Brown
From: Mark Brown <[email protected]>
arch/arm/boot/dts/bcm2835.dtsi +9
-0+ bcm2835_i2s: i2s at 7e203000 { + compatible = "brcm,bcm2835-i2s"; + reg = <0x7e203000 0x20>, + <0x7e101098 0x02>; + + dmas = <&dma 2>, + <&dma 3>; + dma-names = "tx", "rx"; + };This node is already there (and even edited in this patch), so I dropped that hunk.
Quoted 4 lines
Right, not sure what went on with applying it upstream originally but it looks like git rebase didn't figure out what was going on well - the
bcm2835_i2sis needed so we can reference the node. I'll probably get round to resending an incremental patch.
Oh right, I guess I did drop the addition of that label when I dropped that node.
The board DT could doesn't necessarily require a label though; it could just repeat the node name:
/ {
i2s at 7e203000 {
... extra properties
Still, it looks like we typically use labels to reference nodes in bcm2835-*.dts, so adding the label would indeed be a good idea.