ARM: bcm2835: add I2S pinctrl to device tree

Signed-off-by: Florian Meier <florian.meier@koalo.de>
[Tweaked slightly to disable by default -- broonie]
Signed-off-by: Mark Brown <broonie@linaro.org>
[swarren, removed duplicate i2s node]
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 2a3b1c1313a0c474bed0c681fea43029ba8fe20d..58a0d60b95f1b9064d790b60aef80b69edb2a962 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -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 {

diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index b8473c43e88827de921d727001ef7871704736c7..3342cb1407bc927be59f42ece4410c4b38b4e472 100644 (file)
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -99,6 +99,7 @@
                        dmas = <&dma 2>,
                               <&dma 3>;
                        dma-names = "tx", "rx";
+                       status = "disabled";
                };
 
                spi: spi@7e204000 {