Commit c503ca52 authored by Mark Brown's avatar Mark Brown

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

parents b2dde2f9 fddcd300
...@@ -368,7 +368,7 @@ port@0 { ...@@ -368,7 +368,7 @@ port@0 {
}; };
i2s1: i2s@13960000 { i2s1: i2s@13960000 {
compatible = "samsung,s5pv210-i2s"; compatible = "samsung,s3c6410-i2s";
reg = <0x13960000 0x100>; reg = <0x13960000 0x100>;
clocks = <&clock CLK_I2S1>; clocks = <&clock CLK_I2S1>;
clock-names = "iis"; clock-names = "iis";
...@@ -378,7 +378,7 @@ i2s1: i2s@13960000 { ...@@ -378,7 +378,7 @@ i2s1: i2s@13960000 {
}; };
i2s2: i2s@13970000 { i2s2: i2s@13970000 {
compatible = "samsung,s5pv210-i2s"; compatible = "samsung,s3c6410-i2s";
reg = <0x13970000 0x100>; reg = <0x13970000 0x100>;
clocks = <&clock CLK_I2S2>; clocks = <&clock CLK_I2S2>;
clock-names = "iis"; clock-names = "iis";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment