diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-10-11 16:03:38 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-10-11 16:04:13 +0200 |
commit | b483792c9ea8d8bf898261d148e1dd5590bf3ae4 (patch) | |
tree | 8054ce5dcb6d025ca590c3cdff9bc505d2287bc3 /arch | |
parent | 7e6a361d17b2e7c8a195546a80d6755cb352ff4b (diff) | |
parent | 48ab742ce3b0312f2ee23ed825d3c8820eda7acf (diff) | |
download | linux-stable-b483792c9ea8d8bf898261d148e1dd5590bf3ae4.tar.gz linux-stable-b483792c9ea8d8bf898261d148e1dd5590bf3ae4.tar.bz2 linux-stable-b483792c9ea8d8bf898261d148e1dd5590bf3ae4.zip |
Merge tag 'samsung-dt-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt
Samsung DTS ARM changes for v4.20, second round
Add proper configuration for Odroid XU SD write-protect pin.
* tag 'samsung-dt-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: dts: exynos: Add pin configuration for SD write protect on Odroid XU
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/exynos5410-odroidxu.dts | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts index a2046f5f998c..434a7591ff63 100644 --- 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>; |