summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-10-18 18:23:23 +0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-10-18 18:50:13 +0400
commite483341ce82750a1b526b65b7178213dcf967a7a (patch)
treed25c6e1d282df9b1356ca9345dd4dd60871427e3 /arch/arm
parent551a409ca6b6285367669883186f84ea3bc88ecf (diff)
downloadlinux-e483341ce82750a1b526b65b7178213dcf967a7a.tar.xz
ARM: at91: remove pinctrl conflict between mmc and SPI for at91sam9g20ek
These MMC and SPI buses can't be configured at the same time because they share the same traces on the EK board. Reported-by: Mark Brown <broonie@kernel.org> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/at91sam9g20ek_common.dtsi1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index 137354689ad0..cb2c010e08e2 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -96,7 +96,6 @@
};
spi0: spi@fffc8000 {
- status = "okay";
cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
mtd_dataflash@0 {
compatible = "atmel,at45", "atmel,dataflash";