summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/at91-sama5d3_xplained.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-05-24 01:02:49 +0400
committerArnd Bergmann <arnd@arndb.de>2014-05-24 01:02:49 +0400
commit77579afc35eeea20d3b34aad66dcbb6fdaf502da (patch)
treeb640c86b4fee33493e5ea44633b8713c3e98c78c /arch/arm/boot/dts/at91-sama5d3_xplained.dts
parentd5cd8605e2814d268cddee1ff1d95d9010b4e8eb (diff)
parentb4a86b3810f5dc4b959ee69a3818c876752c88cd (diff)
downloadlinux-77579afc35eeea20d3b34aad66dcbb6fdaf502da.tar.xz
Merge tag 'at91-dt3' of git://github.com/at91linux/linux-at91 into next/dt
3.16 third DT series: - move of both at91sam9n12 and at91sam9x5 to CCF * tag 'at91-dt3' of git://github.com/at91linux/linux-at91: ARM: at91: move sam9n12 SoC to the CCF ARM: at91/dt: define sam9n12ek crystal frequencies ARM: at91/dt: define sam9n12 clocks ARM: at91: prepare common clk transition for sam9n12 SoC ARM: at91: move sam9x5 SoCs to the CCF ARM: at91/dt: define sam9x5ek's crystal frequencies ARM: at91/dt: define sam9x5 clocks ARM: at91: prepare common clk transition for sam9x5 SoCs dt-bindings: clock: Move at91.h to dt-bindigs/clock ARM: at91: fix spi cs on sama5d3 Xplained board Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/at91-sama5d3_xplained.dts')
-rw-r--r--arch/arm/boot/dts/at91-sama5d3_xplained.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 903b2bd9acbf..5b8e40400bec 100644
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -42,7 +42,7 @@
};
spi0: spi@f0004000 {
- cs-gpios = <&pioD 13 0>;
+ cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;
status = "okay";
};
@@ -136,7 +136,7 @@
};
spi1: spi@f8008000 {
- cs-gpios = <&pioC 25 0>, <0>, <0>, <&pioD 16 0>;
+ cs-gpios = <&pioC 25 0>;
status = "okay";
};