summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Holler <holler@ahsoftware.de>2013-09-12 22:35:32 +0400
committerBenoit Cousson <bcousson@baylibre.com>2013-10-11 23:06:30 +0400
commit3045ffffcf5f334216ccb80697ac1a2ee5db179e (patch)
treea44d3f1d95f73bf3020449a9c295b5af2889a4fa
parent55b4452b4b7082ecf3cc2095bc21762a901a8ca2 (diff)
downloadlinux-3045ffffcf5f334216ccb80697ac1a2ee5db179e.tar.xz
ARM: dts: am335x-bone: add CD for mmc1
This enables the use of MMC cards even when no card was inserted at boot. Signed-off-by: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Tested-by: Kevin Hilman <khilman@linaro.org> Reviewed-by: Nishanth Menon <nm@ti.com> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
-rw-r--r--arch/arm/boot/dts/am335x-bone-common.dtsi14
-rw-r--r--arch/arm/boot/dts/am335x-bone.dts1
2 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 2f66deda9f5c..0d95d54b6ae9 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -107,6 +107,12 @@
0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
>;
};
+
+ mmc1_pins: pinmux_mmc1_pins {
+ pinctrl-single,pins = <
+ 0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
+ >;
+ };
};
ocp {
@@ -260,3 +266,11 @@
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
};
+
+&mmc1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc1_pins>;
+ cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+ cd-inverted;
+};
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index d5f43fe2bfe1..0d6334875df8 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -17,6 +17,5 @@
};
&mmc1 {
- status = "okay";
vmmc-supply = <&ldo3_reg>;
};