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

Commit 41b06818 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-4.13-2' of... 

Merge tag 'samsung-dt-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Pull "Samsung DeviceTree update for v4.13, part two" from Krzysztof Kozłowski:
1. Add needed property for CEC on Odroid U3,
2. Fix reset GPIO polarity on Rinato.

* tag 'samsung-dt-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Fix polarity of panel reset gpio in Rinato
  ARM: dts: exynos: add needs-hpd to &hdmicec for Odroid-U3
parents 2cb6115d bc8ebb86

arch/arm/boot/dts/exynos3250-rinato.dts

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ 
		reg = <0>;

		vdd3-supply = <&ldo16_reg>;

		vci-supply = <&ldo20_reg>;

		reset-gpios = <&gpe0 1 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpe0 1 GPIO_ACTIVE_LOW>;

		te-gpios = <&gpx0 6 GPIO_ACTIVE_HIGH>;

		power-on-delay= <30>;

		power-off-delay= <120>;

arch/arm/boot/dts/exynos4412-odroidu3.dts

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ 
	regulator-max-microvolt = <3300000>;

};



&hdmicec {

	needs-hpd;

};



/* VDDQ for MSHC (eMMC card) */

&ldo22_reg {

	regulator-name = "LDO22_VDDQ_MMC4_2.8V";