ARM: dts: imx7-colibri: move SD-card to module level
authorStefan Agner <stefan@agner.ch>
Mon, 29 Aug 2016 05:13:22 +0000 (22:13 -0700)
committerShawn Guo <shawnguo@kernel.org>
Mon, 29 Aug 2016 14:24:51 +0000 (22:24 +0800)
Move SD-card definition to module level. While at it, also disable
write-protect since the Colibri standard does not define a pin for
SD-Card write-protection.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
arch/arm/boot/dts/imx7-colibri.dtsi

index 1545661df5835e0e12f9fc96ee66f2f91566f6cd..373ee19196a675f51f683ea0a4aa99c6d030cceb 100644 (file)
 };
 
 &usdhc1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>;
-       no-1-8-v;
-       cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
        keep-power-in-suspend;
        wakeup-source;
        status = "okay";
index 0a9d3a822fc00b2b84b9c5381ff1a7cc525033f3..044b83e355c6aa1bb134ff3fd81b0f8a8e1ff0af 100644 (file)
        dr_mode = "host";
 };
 
+&usdhc1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>;
+       no-1-8-v;
+       cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+       disable-wp;
+};
+
 &iomuxc {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4>;