summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/bcm2835.dtsi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-09-17 03:51:36 +0200
committerArnd Bergmann <arnd@arndb.de>2014-09-25 23:25:30 +0200
commit667bbd533772e2539cf7d7fed7cd7d284a624e37 (patch)
tree2145ca54c1ec64e277e555bcf92fe026b7bff51e /arch/arm/boot/dts/bcm2835.dtsi
parentMerge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into... (diff)
downloadlinux-667bbd533772e2539cf7d7fed7cd7d284a624e37.tar.xz
linux-667bbd533772e2539cf7d7fed7cd7d284a624e37.zip
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>
Diffstat (limited to '')
-rw-r--r--arch/arm/boot/dts/bcm2835.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index b8473c43e888..3342cb1407bc 100644
--- 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 {