Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus

c503ca52 · Mark Brown · b2dde2f9 · fddcd300 · c503ca52
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

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

未找到文件。
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -368,7 +368,7 @@ port@0 {
 	};

 	i2s1: i2s@13960000 {
-		compatible = "samsung,s5pv210-i2s";
+		compatible = "samsung,s3c6410-i2s";
 		reg = <0x13960000 0x100>;
 		clocks = <&clock CLK_I2S1>;
 		clock-names = "iis";
@@ -378,7 +378,7 @@ i2s1: i2s@13960000 {
 	};

 	i2s2: i2s@13970000 {
-		compatible = "samsung,s5pv210-i2s";
+		compatible = "samsung,s3c6410-i2s";
 		reg = <0x13970000 0x100>;
 		clocks = <&clock CLK_I2S2>;
 		clock-names = "iis";