Merge tag 'iio-fixes-for-4.5b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[cascardo/linux.git] / arch / arm / boot / dts / exynos4.dtsi

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 07e10ee..045785c 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -727,6 +727,15 @@
                iommus = <&sysmmu_jpeg>;
        };
 
+       rotator: rotator@12810000 {
+               compatible = "samsung,exynos4210-rotator";
+               reg = <0x12810000 0x64>;
+               interrupts = <0 83 0>;
+               clocks = <&clock CLK_ROTATOR>;
+               clock-names = "rotator";
+               iommus = <&sysmmu_rotator>;
+       };
+
        hdmi: hdmi@12D00000 {
                compatible = "samsung,exynos4210-hdmi";
                reg = <0x12D00000 0x70000>;
@@ -954,7 +963,6 @@
                interrupts = <5 0>;
                clock-names = "sysmmu", "master";
                clocks = <&clock CLK_SMMU_ROTATOR>, <&clock CLK_ROTATOR>;
-               power-domains = <&pd_lcd0>;
                #iommu-cells = <0>;
        };
 
@@ -968,4 +976,12 @@
                power-domains = <&pd_lcd0>;
                #iommu-cells = <0>;
        };
+
+       prng: rng@10830400 {
+               compatible = "samsung,exynos4-rng";
+               reg = <0x10830400 0x200>;
+               clocks = <&clock CLK_SSS>;
+               clock-names = "secss";
+               status = "disabled";
+       };
 };