Просмотр исходного кода

ARM: dts: Change i2s compatible string on exynos5250

This patch removes quirks from i2s node and change the i2s
compatible names.

Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Padmavathi Venna 12 лет назад
Родитель
Сommit
c7f7e60751
2 измененных файлов с 3 добавлено и 6 удалено
  1. 2 2
      arch/arm/boot/dts/exynos5.dtsi
  2. 1 4
      arch/arm/boot/dts/exynos5250.dtsi

+ 2 - 2
arch/arm/boot/dts/exynos5.dtsi

@@ -115,7 +115,7 @@
 	};
 
 	i2s1: i2s@12D60000 {
-		compatible = "samsung,i2s-v5";
+		compatible = "samsung,s3c6410-i2s";
 		reg = <0x12D60000 0x100>;
 		dmas = <&pdma1 12
 			&pdma1 11>;
@@ -123,7 +123,7 @@
 	};
 
 	i2s2: i2s@12D70000 {
-		compatible = "samsung,i2s-v5";
+		compatible = "samsung,s3c6410-i2s";
 		reg = <0x12D70000 0x100>;
 		dmas = <&pdma0 12
 			&pdma0 11>;

+ 1 - 4
arch/arm/boot/dts/exynos5250.dtsi

@@ -405,7 +405,7 @@
 	};
 
 	i2s0: i2s@03830000 {
-		compatible = "samsung,i2s-v5";
+		compatible = "samsung,s5pv210-i2s";
 		dmas = <&pdma0 10
 			&pdma0 9
 			&pdma0 8>;
@@ -414,9 +414,6 @@
 			<&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;
 		pinctrl-names = "default";
 		pinctrl-0 = <&i2s0_bus>;
 	};