From: Cristian Birsan <cristian.birsan@microchip.com>
Date: Thu, 16 Feb 2017 17:16:28 +0000 (+0200)
Subject: ARM: dts: at91: Disable SPI on at91sam9x5ek to allow MCI1 to work.
X-Git-Tag: v4.12-rc1~56^2~12^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1142f1760a4c1b6f55835de89424114b085b1ca1;p=karo-tx-linux.git

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>
---

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";