Skip to content

Commit

Permalink
ARM: bcm2835: add I2S pinctrl to device tree
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown authored and Arnd Bergmann committed Sep 25, 2014
1 parent 0bee2b6 commit 667bbd5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
8 changes: 7 additions & 1 deletion arch/arm/boot/dts/bcm2835-rpi-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

&gpio {
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0 &alt3>;
pinctrl-0 = <&gpioout &alt0 &alt2 &alt3>;

gpioout: gpioout {
brcm,pins = <6>;
Expand All @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/bcm2835.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
dmas = <&dma 2>,
<&dma 3>;
dma-names = "tx", "rx";
status = "disabled";
};

spi: spi@7e204000 {
Expand Down

0 comments on commit 667bbd5

Please sign in to comment.