Commit da3a6c47 authored by Arnd Bergmann's avatar Arnd Bergmann

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
...@@ -987,7 +987,6 @@ sss: sss@10830000 { ...@@ -987,7 +987,6 @@ sss: sss@10830000 {
interrupts = <0 112 0>; interrupts = <0 112 0>;
clocks = <&clock CLK_SSS>; clocks = <&clock CLK_SSS>;
clock-names = "secss"; clock-names = "secss";
status = "disabled";
}; };
prng: rng@10830400 { prng: rng@10830400 {
...@@ -995,6 +994,5 @@ prng: rng@10830400 { ...@@ -995,6 +994,5 @@ prng: rng@10830400 {
reg = <0x10830400 0x200>; reg = <0x10830400 0x200>;
clocks = <&clock CLK_SSS>; clocks = <&clock CLK_SSS>;
clock-names = "secss"; clock-names = "secss";
status = "disabled";
}; };
}; };
...@@ -496,10 +496,6 @@ &serial_1 { ...@@ -496,10 +496,6 @@ &serial_1 {
status = "okay"; status = "okay";
}; };
&sss {
status = "okay";
};
&tmu { &tmu {
vtmu-supply = <&ldo10_reg>; vtmu-supply = <&ldo10_reg>;
status = "okay"; status = "okay";
......
...@@ -1234,10 +1234,6 @@ &pwm { ...@@ -1234,10 +1234,6 @@ &pwm {
status = "okay"; status = "okay";
}; };
&prng {
status = "okay";
};
&rtc { &rtc {
status = "okay"; status = "okay";
clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>; clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
...@@ -1286,10 +1282,6 @@ controller-data { ...@@ -1286,10 +1282,6 @@ controller-data {
}; };
}; };
&sss {
status = "okay";
};
&tmu { &tmu {
vtmu-supply = <&ldo10_reg>; vtmu-supply = <&ldo10_reg>;
status = "okay"; status = "okay";
......
...@@ -75,13 +75,6 @@ &hsi2c_4 { ...@@ -75,13 +75,6 @@ &hsi2c_4 {
s2mps11_pmic@66 { s2mps11_pmic@66 {
compatible = "samsung,s2mps11-pmic"; compatible = "samsung,s2mps11-pmic";
reg = <0x66>; 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>; interrupt-parent = <&gpx3>;
interrupts = <2 IRQ_TYPE_EDGE_FALLING>; interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
......
...@@ -142,13 +142,6 @@ &hsi2c_4 { ...@@ -142,13 +142,6 @@ &hsi2c_4 {
s2mps11_pmic@66 { s2mps11_pmic@66 {
compatible = "samsung,s2mps11-pmic"; compatible = "samsung,s2mps11-pmic";
reg = <0x66>; 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 { s2mps11_osc: clocks {
#clock-cells = <1>; #clock-cells = <1>;
......
...@@ -1199,6 +1199,7 @@ &dp { ...@@ -1199,6 +1199,7 @@ &dp {
}; };
&fimd { &fimd {
compatible = "samsung,exynos5420-fimd";
clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>; clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;
clock-names = "sclk_fimd", "fimd"; clock-names = "sclk_fimd", "fimd";
power-domains = <&disp_pd>; power-domains = <&disp_pd>;
......
...@@ -92,13 +92,6 @@ &hsi2c_4 { ...@@ -92,13 +92,6 @@ &hsi2c_4 {
s2mps11_pmic@66 { s2mps11_pmic@66 {
compatible = "samsung,s2mps11-pmic"; compatible = "samsung,s2mps11-pmic";
reg = <0x66>; 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>;
samsung,s2mps11-acokb-ground; samsung,s2mps11-acokb-ground;
interrupt-parent = <&gpx0>; interrupt-parent = <&gpx0>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment