diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-05 14:36:29 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-05 14:36:29 -0500 |
| commit | c503ca52a57cfe24f8937ca145a96ba94f6bb112 (patch) | |
| tree | 870d4f44e6c17f25f426bf662fb8fdf466b6e264 | |
| parent | b2dde2f975a7850b696c21253864fd93c1753e7c (diff) | |
| parent | fddcd300732dad5b822d27de7aa78998dca43162 (diff) | |
Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus
| -rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index b8168f1f8139..24ff27049ce0 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi | |||
| @@ -368,7 +368,7 @@ | |||
| 368 | }; | 368 | }; |
| 369 | 369 | ||
| 370 | i2s1: i2s@13960000 { | 370 | i2s1: i2s@13960000 { |
| 371 | compatible = "samsung,s5pv210-i2s"; | 371 | compatible = "samsung,s3c6410-i2s"; |
| 372 | reg = <0x13960000 0x100>; | 372 | reg = <0x13960000 0x100>; |
| 373 | clocks = <&clock CLK_I2S1>; | 373 | clocks = <&clock CLK_I2S1>; |
| 374 | clock-names = "iis"; | 374 | clock-names = "iis"; |
| @@ -378,7 +378,7 @@ | |||
| 378 | }; | 378 | }; |
| 379 | 379 | ||
| 380 | i2s2: i2s@13970000 { | 380 | i2s2: i2s@13970000 { |
| 381 | compatible = "samsung,s5pv210-i2s"; | 381 | compatible = "samsung,s3c6410-i2s"; |
| 382 | reg = <0x13970000 0x100>; | 382 | reg = <0x13970000 0x100>; |
| 383 | clocks = <&clock CLK_I2S2>; | 383 | clocks = <&clock CLK_I2S2>; |
| 384 | clock-names = "iis"; | 384 | clock-names = "iis"; |