diff options
| -rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index b8168f1f8139..38d8f689f7ae 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi | |||
| @@ -61,6 +61,8 @@ | |||
| 61 | reg = <0x03830000 0x100>; | 61 | reg = <0x03830000 0x100>; |
| 62 | clocks = <&clock_audss EXYNOS_I2S_BUS>; | 62 | clocks = <&clock_audss EXYNOS_I2S_BUS>; |
| 63 | clock-names = "iis"; | 63 | clock-names = "iis"; |
| 64 | #clock-cells = <1>; | ||
| 65 | clock-output-names = "i2s_cdclk0"; | ||
| 64 | dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>; | 66 | dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>; |
| 65 | dma-names = "tx", "rx", "tx-sec"; | 67 | dma-names = "tx", "rx", "tx-sec"; |
| 66 | samsung,idma-addr = <0x03000000>; | 68 | samsung,idma-addr = <0x03000000>; |
| @@ -372,6 +374,8 @@ | |||
| 372 | reg = <0x13960000 0x100>; | 374 | reg = <0x13960000 0x100>; |
| 373 | clocks = <&clock CLK_I2S1>; | 375 | clocks = <&clock CLK_I2S1>; |
| 374 | clock-names = "iis"; | 376 | clock-names = "iis"; |
| 377 | #clock-cells = <1>; | ||
| 378 | clock-output-names = "i2s_cdclk1"; | ||
| 375 | dmas = <&pdma1 12>, <&pdma1 11>; | 379 | dmas = <&pdma1 12>, <&pdma1 11>; |
| 376 | dma-names = "tx", "rx"; | 380 | dma-names = "tx", "rx"; |
| 377 | status = "disabled"; | 381 | status = "disabled"; |
| @@ -382,6 +386,8 @@ | |||
| 382 | reg = <0x13970000 0x100>; | 386 | reg = <0x13970000 0x100>; |
| 383 | clocks = <&clock CLK_I2S2>; | 387 | clocks = <&clock CLK_I2S2>; |
| 384 | clock-names = "iis"; | 388 | clock-names = "iis"; |
| 389 | #clock-cells = <1>; | ||
| 390 | clock-output-names = "i2s_cdclk2"; | ||
| 385 | dmas = <&pdma0 14>, <&pdma0 13>; | 391 | dmas = <&pdma0 14>, <&pdma0 13>; |
| 386 | dma-names = "tx", "rx"; | 392 | dma-names = "tx", "rx"; |
| 387 | status = "disabled"; | 393 | status = "disabled"; |
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi index 3fbf588682b9..c26b9fbf12c9 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | * published by the Free Software Foundation. | 7 | * published by the Free Software Foundation. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <dt-bindings/sound/samsung-i2s.h> | ||
| 10 | #include <dt-bindings/input/input.h> | 11 | #include <dt-bindings/input/input.h> |
| 11 | #include "exynos4412.dtsi" | 12 | #include "exynos4412.dtsi" |
| 12 | 13 | ||
| @@ -37,8 +38,9 @@ | |||
| 37 | pinctrl-names = "default"; | 38 | pinctrl-names = "default"; |
| 38 | status = "okay"; | 39 | status = "okay"; |
| 39 | clocks = <&clock_audss EXYNOS_I2S_BUS>, | 40 | clocks = <&clock_audss EXYNOS_I2S_BUS>, |
| 40 | <&clock_audss EXYNOS_DOUT_AUD_BUS>; | 41 | <&clock_audss EXYNOS_DOUT_AUD_BUS>, |
| 41 | clock-names = "iis", "i2s_opclk0"; | 42 | <&clock_audss EXYNOS_SCLK_I2S>; |
| 43 | clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; | ||
| 42 | }; | 44 | }; |
| 43 | 45 | ||
| 44 | sound: sound { | 46 | sound: sound { |
| @@ -373,6 +375,8 @@ | |||
| 373 | reg = <0x10>; | 375 | reg = <0x10>; |
| 374 | interrupt-parent = <&gpx0>; | 376 | interrupt-parent = <&gpx0>; |
| 375 | interrupts = <0 0>; | 377 | interrupts = <0 0>; |
| 378 | clocks = <&i2s0 CLK_I2S_CDCLK>; | ||
| 379 | clock-names = "mclk"; | ||
| 376 | }; | 380 | }; |
| 377 | }; | 381 | }; |
| 378 | 382 | ||
