diff options
author | Naveen Krishna Chatradhi <ch.naveen@samsung.com> | 2014-09-16 04:58:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2014-11-05 10:30:32 -0500 |
commit | db9bf4d6577f23b9a9ee4f70c07a51946ed111a7 (patch) | |
tree | 875e43c2eda516c3a378051b0475ea909daeaa18 | |
parent | b626c8f0d909be88534ab3d25dd9fbffcc884b47 (diff) |
ARM: dts: exynos: Add sysreg phandle to ADC node
Instead of using the ADC_PHY register base address, use sysreg phandle
in ADC node to control ADC_PHY configuration register.
This patch adds syscon node for Exynos3250, Exynos4x12, Exynos5250,
and Exynos5420, Exynos5800.
Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
To: linux-samsung-soc@vger.kernel.org
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | arch/arm/boot/dts/exynos3250.dtsi | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4x12.dtsi | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5250.dtsi | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5420.dtsi | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi index 1d52de6370d5..b997a4c89eea 100644 --- a/arch/arm/boot/dts/exynos3250.dtsi +++ b/arch/arm/boot/dts/exynos3250.dtsi | |||
@@ -272,12 +272,13 @@ | |||
272 | adc: adc@126C0000 { | 272 | adc: adc@126C0000 { |
273 | compatible = "samsung,exynos3250-adc", | 273 | compatible = "samsung,exynos3250-adc", |
274 | "samsung,exynos-adc-v2"; | 274 | "samsung,exynos-adc-v2"; |
275 | reg = <0x126C0000 0x100>, <0x10020718 0x4>; | 275 | reg = <0x126C0000 0x100>; |
276 | interrupts = <0 137 0>; | 276 | interrupts = <0 137 0>; |
277 | clock-names = "adc", "sclk"; | 277 | clock-names = "adc", "sclk"; |
278 | clocks = <&cmu CLK_TSADC>, <&cmu CLK_SCLK_TSADC>; | 278 | clocks = <&cmu CLK_TSADC>, <&cmu CLK_SCLK_TSADC>; |
279 | #io-channel-cells = <1>; | 279 | #io-channel-cells = <1>; |
280 | io-channel-ranges; | 280 | io-channel-ranges; |
281 | samsung,syscon-phandle = <&pmu_system_controller>; | ||
281 | status = "disabled"; | 282 | status = "disabled"; |
282 | }; | 283 | }; |
283 | 284 | ||
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi index 861bb919f6d3..9ee77d3c4e03 100644 --- a/arch/arm/boot/dts/exynos4x12.dtsi +++ b/arch/arm/boot/dts/exynos4x12.dtsi | |||
@@ -108,13 +108,14 @@ | |||
108 | 108 | ||
109 | adc: adc@126C0000 { | 109 | adc: adc@126C0000 { |
110 | compatible = "samsung,exynos-adc-v1"; | 110 | compatible = "samsung,exynos-adc-v1"; |
111 | reg = <0x126C0000 0x100>, <0x10020718 0x4>; | 111 | reg = <0x126C0000 0x100>; |
112 | interrupt-parent = <&combiner>; | 112 | interrupt-parent = <&combiner>; |
113 | interrupts = <10 3>; | 113 | interrupts = <10 3>; |
114 | clocks = <&clock CLK_TSADC>; | 114 | clocks = <&clock CLK_TSADC>; |
115 | clock-names = "adc"; | 115 | clock-names = "adc"; |
116 | #io-channel-cells = <1>; | 116 | #io-channel-cells = <1>; |
117 | io-channel-ranges; | 117 | io-channel-ranges; |
118 | samsung,syscon-phandle = <&pmu_system_controller>; | ||
118 | status = "disabled"; | 119 | status = "disabled"; |
119 | }; | 120 | }; |
120 | 121 | ||
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 492e1eff37bd..8d575f24fe60 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
@@ -765,12 +765,13 @@ | |||
765 | 765 | ||
766 | adc: adc@12D10000 { | 766 | adc: adc@12D10000 { |
767 | compatible = "samsung,exynos-adc-v1"; | 767 | compatible = "samsung,exynos-adc-v1"; |
768 | reg = <0x12D10000 0x100>, <0x10040718 0x4>; | 768 | reg = <0x12D10000 0x100>; |
769 | interrupts = <0 106 0>; | 769 | interrupts = <0 106 0>; |
770 | clocks = <&clock CLK_ADC>; | 770 | clocks = <&clock CLK_ADC>; |
771 | clock-names = "adc"; | 771 | clock-names = "adc"; |
772 | #io-channel-cells = <1>; | 772 | #io-channel-cells = <1>; |
773 | io-channel-ranges; | 773 | io-channel-ranges; |
774 | samsung,syscon-phandle = <&pmu_system_controller>; | ||
774 | status = "disabled"; | 775 | status = "disabled"; |
775 | }; | 776 | }; |
776 | 777 | ||
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index bfe056d9148c..5fd587a842d2 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi | |||
@@ -541,12 +541,13 @@ | |||
541 | 541 | ||
542 | adc: adc@12D10000 { | 542 | adc: adc@12D10000 { |
543 | compatible = "samsung,exynos-adc-v2"; | 543 | compatible = "samsung,exynos-adc-v2"; |
544 | reg = <0x12D10000 0x100>, <0x10040720 0x4>; | 544 | reg = <0x12D10000 0x100>; |
545 | interrupts = <0 106 0>; | 545 | interrupts = <0 106 0>; |
546 | clocks = <&clock CLK_TSADC>; | 546 | clocks = <&clock CLK_TSADC>; |
547 | clock-names = "adc"; | 547 | clock-names = "adc"; |
548 | #io-channel-cells = <1>; | 548 | #io-channel-cells = <1>; |
549 | io-channel-ranges; | 549 | io-channel-ranges; |
550 | samsung,syscon-phandle = <&pmu_system_controller>; | ||
550 | status = "disabled"; | 551 | status = "disabled"; |
551 | }; | 552 | }; |
552 | 553 | ||