summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorCristian Birsan <cristian.birsan@microchip.com>2017-02-16 20:16:28 +0300
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2017-03-06 01:53:41 +0300
commit1142f1760a4c1b6f55835de89424114b085b1ca1 (patch)
tree1c80279285edebfbda8ab16721d4f03de4a69037 /arch/arm
parent8682827f66fb37fcc41cedefc754ba4f5075df6f (diff)
downloadlinux-1142f1760a4c1b6f55835de89424114b085b1ca1.tar.xz
ARM: dts: at91: Disable SPI on at91sam9x5ek to allow MCI1 to work.
The A13 hardware line is shared by SPI and MCI1 controller.This patch disables the SPI controller so that the MCI1 (the big MMC card slot) can be used. Signed-off-by: Cristian Birsan <cristian.birsan@microchip.com> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/at91sam9x5ek.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 696b8ba064a6..9d2bbc41a7b0 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -116,7 +116,7 @@
};
spi0: spi@f0000000 {
- status = "okay";
+ status = "disabled"; /* conflicts with mmc1 */
cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
m25p80@0 {
compatible = "atmel,at25df321a";