Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[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 63ef1246b9d54c27c7523574038ca110d462d367..f7e2d3493f82d556fd66b88fd6bc6a3549300b5e 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -68,17 +68,17 @@
                };
        };
 
-       pd_gsc: gsc-power-domain@0x10044000 {
+       pd_gsc: gsc-power-domain@10044000 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10044000 0x20>;
        };
 
-       pd_mfc: mfc-power-domain@0x10044040 {
+       pd_mfc: mfc-power-domain@10044040 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10044040 0x20>;
        };
 
-       clock: clock-controller@0x10010000 {
+       clock: clock-controller@10010000 {
                compatible = "samsung,exynos5250-clock";
                reg = <0x10010000 0x30000>;
                #clock-cells = <1>;
@@ -415,7 +415,7 @@
        };
 
        i2s0: i2s@03830000 {
-               compatible = "samsung,i2s-v5";
+               compatible = "samsung,s5pv210-i2s";
                reg = <0x03830000 0x100>;
                dmas = <&pdma0 10
                        &pdma0 9
@@ -425,16 +425,13 @@
                        <&clock_audss EXYNOS_I2S_BUS>,
                        <&clock_audss EXYNOS_SCLK_I2S>;
                clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
-               samsung,supports-6ch;
-               samsung,supports-rstclr;
-               samsung,supports-secdai;
                samsung,idma-addr = <0x03000000>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s0_bus>;
        };
 
        i2s1: i2s@12D60000 {
-               compatible = "samsung,i2s-v5";
+               compatible = "samsung,s3c6410-i2s";
                reg = <0x12D60000 0x100>;
                dmas = <&pdma1 12
                        &pdma1 11>;
@@ -446,7 +443,7 @@
        };
 
        i2s2: i2s@12D70000 {
-               compatible = "samsung,i2s-v5";
+               compatible = "samsung,s3c6410-i2s";
                reg = <0x12D70000 0x100>;
                dmas = <&pdma0 12
                        &pdma0 11>;
@@ -572,7 +569,7 @@
                };
        };
 
-       gsc_0:  gsc@0x13e00000 {
+       gsc_0:  gsc@13e00000 {
                compatible = "samsung,exynos5-gsc";
                reg = <0x13e00000 0x1000>;
                interrupts = <0 85 0>;
@@ -581,7 +578,7 @@
                clock-names = "gscl";
        };
 
-       gsc_1:  gsc@0x13e10000 {
+       gsc_1:  gsc@13e10000 {
                compatible = "samsung,exynos5-gsc";
                reg = <0x13e10000 0x1000>;
                interrupts = <0 86 0>;
@@ -590,7 +587,7 @@
                clock-names = "gscl";
        };
 
-       gsc_2:  gsc@0x13e20000 {
+       gsc_2:  gsc@13e20000 {
                compatible = "samsung,exynos5-gsc";
                reg = <0x13e20000 0x1000>;
                interrupts = <0 87 0>;
@@ -599,7 +596,7 @@
                clock-names = "gscl";
        };
 
-       gsc_3:  gsc@0x13e30000 {
+       gsc_3:  gsc@13e30000 {
                compatible = "samsung,exynos5-gsc";
                reg = <0x13e30000 0x1000>;
                interrupts = <0 88 0>;