mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-03 15:51:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Arnd Bergmann
2016-04-28 16:05:46 +02:00
parent a050ebb014 8691f91b5f
commit da3a6c4787
7 changed files with 1 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/exynos4.dtsi
View File

@@ -987,7 +987,6 @@ sss: sss@10830000 {
interrupts = <0 112 0>;
clocks = <&clock CLK_SSS>;
clock-names = "secss";
status = "disabled";
};
prng: rng@10830400 {
@@ -995,6 +994,5 @@ prng: rng@10830400 {
reg = <0x10830400 0x200>;
clocks = <&clock CLK_SSS>;
clock-names = "secss";
status = "disabled";
};
};

4
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View File

@@ -496,10 +496,6 @@ &serial_1 {
status = "okay";
};
&sss {
status = "okay";
};
&tmu {
vtmu-supply = <&ldo10_reg>;
status = "okay";

8
arch/arm/boot/dts/exynos4412-trats2.dts
View File

@@ -1234,10 +1234,6 @@ &pwm {
status = "okay";
};
&prng {
status = "okay";
};
&rtc {
status = "okay";
clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
@@ -1286,10 +1282,6 @@ controller-data {
};
};
&sss {
status = "okay";
};
&tmu {
vtmu-supply = <&ldo10_reg>;
status = "okay";

7
arch/arm/boot/dts/exynos5420-arndale-octa.dts
View File

@@ -75,13 +75,6 @@ &hsi2c_4 {
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>;

7
arch/arm/boot/dts/exynos5420-smdk5420.dts
View File

@@ -142,13 +142,6 @@ &hsi2c_4 {
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>;

1
arch/arm/boot/dts/exynos5420.dtsi
View File

@@ -1199,6 +1199,7 @@ &dp {
};
&fimd {
compatible = "samsung,exynos5420-fimd";
clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;
clock-names = "sclk_fimd", "fimd";
power-domains = <&disp_pd>;

7
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
View File

@@ -92,13 +92,6 @@ &hsi2c_4 {
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>;
samsung,s2mps11-acokb-ground;
interrupt-parent = <&gpx0>;