Merge remote-tracking branch 'samsung/for-next'

[karo-tx-linux.git] / arch / arm / boot / dts / qcom-apq8064-cm-qs600.dts

diff --git a/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
index cc9d9423a4c07ddbbcaea693fa7651e71894be10..03784f1366e593ef2b317568962d1ab17ae03363 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
@@ -29,6 +29,16 @@
        };
 
        soc {
+               pinctrl@800000 {
+                       card_detect: card_detect {
+                               mux {
+                                       pins = "gpio26";
+                                       function = "gpio";
+                                       bias-disable;
+                               };
+                       };
+               };
+
                rpm@108000 {
                        regulators {
                                vin_lvs1_3_6-supply = <&pm8921_s4>;
@@ -197,6 +207,9 @@
                        sdcc3: sdcc@12180000 {
                                status = "okay";
                                vmmc-supply = <&v3p3_fixed>;
+                               pinctrl-names   = "default";
+                               pinctrl-0       = <&card_detect>;
+                               cd-gpios        = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
                        };
                        /* WLAN */
                        sdcc4: sdcc@121c0000 {