Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos5250.dtsi

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index f7e2d3493f82d556fd66b88fd6bc6a3549300b5e..7d7cc777ff7b76099e8de5098a4a3a044a208ca9 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -180,9 +180,10 @@
                clock-names = "mfc";
        };
 
-       rtc {
+       rtc@101E0000 {
                clocks = <&clock 337>;
                clock-names = "rtc";
+               status = "okay";
        };
 
        tmu@10060000 {
@@ -638,4 +639,15 @@
                clocks = <&clock 133>, <&clock 339>;
                clock-names = "sclk_fimd", "fimd";
        };
+
+       adc: adc@12D10000 {
+               compatible = "samsung,exynos-adc-v1";
+               reg = <0x12D10000 0x100>, <0x10040718 0x4>;
+               interrupts = <0 106 0>;
+               clocks = <&clock 303>;
+               clock-names = "adc";
+               #io-channel-cells = <1>;
+               io-channel-ranges;
+               status = "disabled";
+       };
 };