Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b483792c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-4.20-3' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 7e6a361d 48ab742c

arch/arm/boot/dts/exynos5410-odroidxu.dts

+9 −1
Original line number Original line Diff line number Diff line
@@ -530,7 +530,7 @@ 
	samsung,dw-mshc-sdr-timing = <0 4>;

	samsung,dw-mshc-sdr-timing = <0 4>;

	samsung,dw-mshc-ddr-timing = <0 2>;

	samsung,dw-mshc-ddr-timing = <0 2>;

	pinctrl-names = "default";

	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>;

	bus-width = <4>;

	cap-sd-highspeed;

	cap-sd-highspeed;

	vmmc-supply = <&ldo21_reg>;

	vmmc-supply = <&ldo21_reg>;
@@ -545,6 +545,14 @@ 
		samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;

		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 {

	pmic_dvs_3: pmic-dvs-3 {

		samsung,pins = "gpx0-0";

		samsung,pins = "gpx0-0";

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;

		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;