Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes

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

diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index b77dac6..84a23f9 100644 (file)
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -116,7 +116,6 @@
                clocks = <&clock CLK_SCLK_FIMG2D>, <&clock CLK_G2D>;
                clock-names = "sclk_fimg2d", "fimg2d";
                iommus = <&sysmmu_g2d>;
-               status = "disabled";
        };
 
        camera {
@@ -339,6 +338,10 @@
        compatible = "samsung,exynos4212-jpeg";
 };
 
+&rotator {
+       compatible = "samsung,exynos4212-rotator";
+};
+
 &mixer {
        compatible = "samsung,exynos4212-mixer";
        clock-names = "mixer", "hdmi", "sclk_hdmi", "vp";