Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos5420.dtsi

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 6166730215dbd17e9e652748194c16ffbbcde3f6..8aa2cc7aa125f5513a8333d84f8caae7a67fd3e6 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -352,7 +352,7 @@
                        interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
                };
 
-               pinctrl_4: pinctrl@03860000 {
+               pinctrl_4: pinctrl@3860000 {
                        compatible = "samsung,exynos5420-pinctrl";
                        reg = <0x03860000 0x1000>;
                        interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
@@ -365,7 +365,7 @@
                        interrupt-parent = <&gic>;
                        ranges;
 
-                       adma: adma@03880000 {
+                       adma: adma@3880000 {
                                compatible = "arm,pl330", "arm,primecell";
                                reg = <0x03880000 0x1000>;
                                interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
@@ -429,7 +429,7 @@
                        };
                };
 
-               i2s0: i2s@03830000 {
+               i2s0: i2s@3830000 {
                        compatible = "samsung,exynos5420-i2s";
                        reg = <0x03830000 0x100>;
                        dmas = <&adma 0
@@ -646,6 +646,7 @@
                        clock-names = "mixer", "hdmi", "sclk_hdmi";
                        power-domains = <&disp_pd>;
                        iommus = <&sysmmu_tv>;
+                       status = "disabled";
                };
 
                rotator: rotator@11C00000 {