ARM: dts: exynos: Add ADC node to Exynos5410 and Odroid XU

Move the ADC from exynos5420.dtsi to a shared file between Exynos5410 and
Exynos542x: exynos54xx.dtsi.  Enable the ADC on Odroid XU board.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts
index 8f9e08f940ab4d454f97239d51cd987c2a797953..e0db251e253f0e5a41dad06eef9ff40f3d978c35 100644 (file)
--- a/arch/arm/boot/dts/exynos5410-odroidxu.dts
+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts
@@ -85,6 +85,11 @@
        };
 };
 
+&adc {
+       vdd-supply = <&ldo10_reg>;
+       status = "okay";
+};
+
 &audi2s0 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi
index 57fc9c949e54a807d3d6742c1970d1bbfe0258cd..e6f78b1cee7c84b3b51bef788dc01fe97a8bbe71 100644 (file)
--- a/arch/arm/boot/dts/exynos5410.dtsi
+++ b/arch/arm/boot/dts/exynos5410.dtsi
@@ -260,6 +260,12 @@
        };
 };
 
+&adc {
+       clocks = <&clock CLK_TSADC>;
+       clock-names = "adc";
+       samsung,syscon-phandle = <&pmu_system_controller>;
+};
+
 &arm_a15_pmu {
        interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
        status = "okay";

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 16088186a33aacd7ce3a99fef4cdebdfde332623..55d4dbf6f83a9a34826c675048265010083d038d 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -550,18 +550,6 @@
                        status = "disabled";
                };
 
-               adc: adc@12d10000 {
-                       compatible = "samsung,exynos-adc-v2";
-                       reg = <0x12D10000 0x100>;
-                       interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&clock CLK_TSADC>;
-                       clock-names = "adc";
-                       #io-channel-cells = <1>;
-                       io-channel-ranges;
-                       samsung,syscon-phandle = <&pmu_system_controller>;
-                       status = "disabled";
-               };
-
                hsi2c_8: i2c@12e00000 {
                        compatible = "samsung,exynos5250-hsi2c";
                        reg = <0x12E00000 0x1000>;
@@ -1365,6 +1353,12 @@
        };
 };
 
+&adc {
+       clocks = <&clock CLK_TSADC>;
+       clock-names = "adc";
+       samsung,syscon-phandle = <&pmu_system_controller>;
+};
+
 &dp {
        clocks = <&clock CLK_DP1>;
        clock-names = "dp";

diff --git a/arch/arm/boot/dts/exynos54xx.dtsi b/arch/arm/boot/dts/exynos54xx.dtsi
index ae866bcc30c4e3c029b96e7d41e79fe4ce9c6729..0b27bebf9528c20bcdb85f7d5c354e8937f44264 100644 (file)
--- a/arch/arm/boot/dts/exynos54xx.dtsi
+++ b/arch/arm/boot/dts/exynos54xx.dtsi
@@ -96,6 +96,15 @@
                        interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
                };
 
+               adc: adc@12d10000 {
+                       compatible = "samsung,exynos-adc-v2";
+                       reg = <0x12d10000 0x100>;
+                       interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                       #io-channel-cells = <1>;
+                       io-channel-ranges;
+                       status = "disabled";
+               };
+
                /* i2c_0-3 are defined in exynos5.dtsi */
                hsi2c_4: i2c@12ca0000 {
                        compatible = "samsung,exynos5250-hsi2c";