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

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

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

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

Merge "Secound round of Samsung Device Tree updates and improvements for v4.7" from Krzysztof Kozlowski:
1. Cleanup regulator bindings on Exynos5420 boards.
2. Support MIC bypass in display path for Exynos5420.
3. Enable PRNG and SSS for all Exynos4 devices.

* tag 'samsung-dt-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Enable PRNG and SSS for all Exynos4 devices
  ARM: dts: exynos: Add exynos5420-fimd compatible
  ARM: dts: exynos: Remove unsupported s2mps11 regulator bindings from Exynos5420 boards
parents a050ebb0 8691f91b

arch/arm/boot/dts/exynos4.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -987,7 +987,6 @@ 
		interrupts = <0 112 0>;

		clocks = <&clock CLK_SSS>;

		clock-names = "secss";

		status = "disabled";

	};



	prng: rng@10830400 {
@@ -995,6 +994,5 @@ 
		reg = <0x10830400 0x200>;

		clocks = <&clock CLK_SSS>;

		clock-names = "secss";

		status = "disabled";

	};

};

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -496,10 +496,6 @@ 
	status = "okay";

};



&sss {

	status = "okay";

};



&tmu {

	vtmu-supply = <&ldo10_reg>;

	status = "okay";

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

+0 −8
Original line number Diff line number Diff line
@@ -1234,10 +1234,6 @@ 
	status = "okay";

};



&prng {

	status = "okay";

};



&rtc {

	status = "okay";

	clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
@@ -1286,10 +1282,6 @@ 
	};

};



&sss {

	status = "okay";

};



&tmu {

	vtmu-supply = <&ldo10_reg>;

	status = "okay";

arch/arm/boot/dts/exynos5420-arndale-octa.dts

+0 −7
Original line number Diff line number Diff line
@@ -75,13 +75,6 @@ 
	s2mps11_pmic@66 {

		compatible = "samsung,s2mps11-pmic";

		reg = <0x66>;

		s2mps11,buck2-ramp-delay = <12>;

		s2mps11,buck34-ramp-delay = <12>;

		s2mps11,buck16-ramp-delay = <12>;

		s2mps11,buck6-ramp-enable = <1>;

		s2mps11,buck2-ramp-enable = <1>;

		s2mps11,buck3-ramp-enable = <1>;

		s2mps11,buck4-ramp-enable = <1>;



		interrupt-parent = <&gpx3>;

		interrupts = <2 IRQ_TYPE_EDGE_FALLING>;

arch/arm/boot/dts/exynos5420-smdk5420.dts

+0 −7
Original line number Diff line number Diff line
@@ -142,13 +142,6 @@ 
	s2mps11_pmic@66 {

		compatible = "samsung,s2mps11-pmic";

		reg = <0x66>;

		s2mps11,buck2-ramp-delay = <12>;

		s2mps11,buck34-ramp-delay = <12>;

		s2mps11,buck16-ramp-delay = <12>;

		s2mps11,buck6-ramp-enable = <1>;

		s2mps11,buck2-ramp-enable = <1>;

		s2mps11,buck3-ramp-enable = <1>;

		s2mps11,buck4-ramp-enable = <1>;



		s2mps11_osc: clocks {

			#clock-cells = <1>;