From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 18 Oct 2013 14:23:23 +0000 (+0200) Subject: ARM: at91: remove pinctrl conflict between mmc and SPI for at91sam9g20ek X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e483341ce82750a1b526b65b7178213dcf967a7a;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Nicolas Ferre --- 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";