diff options
| author | Dani Krishna Mohan <krishna.md@samsung.com> | 2013-09-11 16:38:47 +0530 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-09-24 09:10:33 -0400 |
| commit | b7006a7f5edf7385956658b5196df266a5dc2cc6 (patch) | |
| tree | 9dbdc40cdbd6d60e36cbdb637c2206f7fb179902 | |
| parent | d981d80d743623d50e10de77dfe013263aa0c866 (diff) | |
DTS: Addition of I2S0 channel and replacing I2S1
This patch enables default I2S0 channel.And I2S platform
parameter has been moved to a common file viz exynos5.dtsi.
Signed-off-by: Dani Krishna Mohan <krishna.md@samsung.com>
| -rw-r--r-- | arch/arm/dts/exynos5250.dtsi | 19 | ||||
| -rw-r--r-- | board/samsung/dts/exynos5250-smdk5250.dts | 13 | ||||
| -rw-r--r-- | board/samsung/dts/exynos5250-snow.dts | 14 |
3 files changed, 32 insertions, 14 deletions
diff --git a/arch/arm/dts/exynos5250.dtsi b/arch/arm/dts/exynos5250.dtsi index 4fff5e3694..1c5474f40b 100644 --- a/arch/arm/dts/exynos5250.dtsi +++ b/arch/arm/dts/exynos5250.dtsi @@ -93,9 +93,28 @@ interrupts = <0 63 0>; }; + sound@3830000 { + compatible = "samsung,exynos-sound"; + reg = <0x3830000 0x50>; + samsung,i2s-epll-clock-frequency = <192000000>; + samsung,i2s-sampling-rate = <48000>; + samsung,i2s-bits-per-sample = <16>; + samsung,i2s-channels = <2>; + samsung,i2s-lr-clk-framesize = <256>; + samsung,i2s-bit-clk-framesize = <32>; + samsung,i2s-id = <0>; + }; + sound@12d60000 { compatible = "samsung,exynos-sound"; reg = <0x12d60000 0x20>; + samsung,i2s-epll-clock-frequency = <192000000>; + samsung,i2s-sampling-rate = <48000>; + samsung,i2s-bits-per-sample = <16>; + samsung,i2s-channels = <2>; + samsung,i2s-lr-clk-framesize = <256>; + samsung,i2s-bit-clk-framesize = <32>; + samsung,i2s-id = <1>; }; spi@12d20000 { diff --git a/board/samsung/dts/exynos5250-smdk5250.dts b/board/samsung/dts/exynos5250-smdk5250.dts index 1e94c7f82c..b1bba9662e 100644 --- a/board/samsung/dts/exynos5250-smdk5250.dts +++ b/board/samsung/dts/exynos5250-smdk5250.dts @@ -36,6 +36,7 @@ mmc3 = "/mmc@12230000"; serial0 = "/serial@12C30000"; console = "/serial@12C30000"; + i2s = "/sound@3830000"; }; sromc@12250000 { @@ -49,16 +50,14 @@ }; }; - sound@12d60000 { - samsung,i2s-epll-clock-frequency = <192000000>; - samsung,i2s-sampling-rate = <48000>; - samsung,i2s-bits-per-sample = <16>; - samsung,i2s-channels = <2>; - samsung,i2s-lr-clk-framesize = <256>; - samsung,i2s-bit-clk-framesize = <32>; + sound@3830000 { samsung,codec-type = "wm8994"; }; + sound@12d60000 { + status = "disabled"; + }; + i2c@12c70000 { soundcodec@1a { reg = <0x1a>; diff --git a/board/samsung/dts/exynos5250-snow.dts b/board/samsung/dts/exynos5250-snow.dts index 7832e4edda..9b7e57e43d 100644 --- a/board/samsung/dts/exynos5250-snow.dts +++ b/board/samsung/dts/exynos5250-snow.dts @@ -36,6 +36,7 @@ mmc3 = "/mmc@12230000"; serial0 = "/serial@12C30000"; console = "/serial@12C30000"; + i2s = "/sound@3830000"; }; i2c4: i2c@12ca0000 { @@ -65,16 +66,15 @@ }; }; - sound@12d60000 { - samsung,i2s-epll-clock-frequency = <192000000>; - samsung,i2s-sampling-rate = <48000>; - samsung,i2s-bits-per-sample = <16>; - samsung,i2s-channels = <2>; - samsung,i2s-lr-clk-framesize = <256>; - samsung,i2s-bit-clk-framesize = <32>; + sound@3830000 { samsung,codec-type = "max98095"; + codec-enable-gpio = <&gpio 0xb7 0>; }; + sound@12d60000 { + status = "disabled"; + }; + i2c@12cd0000 { soundcodec@22 { reg = <0x22>; |