From: Ben Dooks Date: Mon, 27 Apr 2015 13:19:10 +0000 (+0200) Subject: ARM: at91/dt: sama5d3 xplained: fill in mmc1 and set it to disabled X-Git-Tag: v4.2-rc1~99^2~9^2~25 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6f4728c5e5c633b3df618bdec067c80cbb446d3b;p=linux-2.6-block.git ARM: at91/dt: sama5d3 xplained: fill in mmc1 and set it to disabled The mmc1 channel is not populated on the SAM5D3 Xplained board, however it is enabled and therefore the driver is attaching to it. The node configuration for mmc1 is missing, so add an mmc1 node in the device tree and set its status to disabled. Also add the vmmc and the necessary slot configuration if this node were enabled to avoid the following warnings from the driver: atmel_mci f8000000.mmc: No vmmc regulator found atmel_mci f8000000.mmc: No vqmmc regulator found Signed-off-by: Ben Dooks Signed-off-by: Ludovic Desroches Signed-off-by: Nicolas Ferre --- diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts index 64636974d7dd..df15587bedcc 100644 --- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts @@ -43,6 +43,17 @@ }; }; + mmc1: mmc@f8000000 { + vmmc-supply = <&vcc_3v3_reg>; + vqmmc-supply = <&vcc_3v3_reg>; + status = "disabled"; + slot@0 { + reg = <0>; + bus-width = <4>; + cd-gpios = <&pioE 1 GPIO_ACTIVE_LOW>; + }; + }; + spi0: spi@f0004000 { cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>; status = "okay";