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 / exynos5420.dtsi

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 1b3d6c7..48a0a55 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -717,6 +717,15 @@
                iommus = <&sysmmu_tv>;
        };
 
+       rotator: rotator@11C00000 {
+               compatible = "samsung,exynos5250-rotator";
+               reg = <0x11C00000 0x64>;
+               interrupts = <0 84 0>;
+               clocks = <&clock CLK_ROTATOR>;
+               clock-names = "rotator";
+               iommus = <&sysmmu_rotator>;
+       };
+
        gsc_0: video-scaler@13e00000 {
                compatible = "samsung,exynos5-gsc";
                reg = <0x13e00000 0x1000>;
@@ -1059,6 +1068,16 @@
                #iommu-cells = <0>;
        };
 
+       sysmmu_rotator: sysmmu@0x11D40000 {
+               compatible = "samsung,exynos-sysmmu";
+               reg = <0x11D40000 0x1000>;
+               interrupt-parent = <&combiner>;
+               interrupts = <4 0>;
+               clock-names = "sysmmu", "master";
+               clocks = <&clock CLK_SMMU_ROTATOR>, <&clock CLK_ROTATOR>;
+               #iommu-cells = <0>;
+       };
+
        sysmmu_jpeg0: sysmmu@0x11F10000 {
                compatible = "samsung,exynos-sysmmu";
                reg = <0x11F10000 0x1000>;