Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / arm / boot / dts / exynos3250.dtsi

diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 242ddda..2246549 100644 (file)
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -311,12 +311,13 @@
                adc: adc@126C0000 {
                        compatible = "samsung,exynos3250-adc",
                                     "samsung,exynos-adc-v2";
-                       reg = <0x126C0000 0x100>, <0x10020718 0x4>;
+                       reg = <0x126C0000 0x100>;
                        interrupts = <0 137 0>;
                        clock-names = "adc", "sclk";
                        clocks = <&cmu CLK_TSADC>, <&cmu CLK_SCLK_TSADC>;
                        #io-channel-cells = <1>;
                        io-channel-ranges;
+                       samsung,syscon-phandle = <&pmu_system_controller>;
                        status = "disabled";
                };