Merge tag 'selinux-pr-20181115' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos5410-odroidxu.dts

diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts
index a2046f5f998c1127e722f2ecf34751e05bdac8ba..434a7591ff6397e5f1e397690ecd46f6277e7786 100644 (file)
--- a/arch/arm/boot/dts/exynos5410-odroidxu.dts
+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts
@@ -530,7 +530,7 @@
        samsung,dw-mshc-sdr-timing = <0 4>;
        samsung,dw-mshc-ddr-timing = <0 2>;
        pinctrl-names = "default";
-       pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>;
+       pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4 &sd2_wp>;
        bus-width = <4>;
        cap-sd-highspeed;
        vmmc-supply = <&ldo21_reg>;
@@ -545,6 +545,14 @@
                samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
        };
 
+       sd2_wp: sd2-wp {
+               samsung,pins = "gpm5-0";
+               samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+               /* Pin is floating so be sure to disable write-protect */
+               samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+               samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV4>;
+       };
+
        pmic_dvs_3: pmic-dvs-3 {
                samsung,pins = "gpx0-0";
                samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;