diff options
| author | Padmavathi Venna <padma.v@samsung.com> | 2013-01-18 06:47:06 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-29 02:36:28 -0500 |
| commit | 28a480583361b8e67b0a7f4898180725b71cceec (patch) | |
| tree | b0f6434f93599ed86f264153854b3962e17b795b /arch | |
| parent | 99b97fdccbde9860366ec00bd61f2622055f1b86 (diff) | |
ASoC: SMDK: WM8994: Add device tree support for machine file
Add the basic device tree based lookup.
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5250.dtsi | 6 |
2 files changed, 18 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 78fee35d09fc..127b8cd1385c 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts | |||
| @@ -49,6 +49,11 @@ | |||
| 49 | compatible = "samsung,s524ad0xd1"; | 49 | compatible = "samsung,s524ad0xd1"; |
| 50 | reg = <0x51>; | 50 | reg = <0x51>; |
| 51 | }; | 51 | }; |
| 52 | |||
| 53 | wm8994: wm8994@1a { | ||
| 54 | compatible = "wlf,wm8994"; | ||
| 55 | reg = <0x1a>; | ||
| 56 | }; | ||
| 52 | }; | 57 | }; |
| 53 | 58 | ||
| 54 | i2c@121D0000 { | 59 | i2c@121D0000 { |
| @@ -205,17 +210,24 @@ | |||
| 205 | samsung,mfc-l = <0x51000000 0x800000>; | 210 | samsung,mfc-l = <0x51000000 0x800000>; |
| 206 | }; | 211 | }; |
| 207 | 212 | ||
| 208 | i2s@03830000 { | 213 | i2s0: i2s@03830000 { |
| 209 | gpios = <&gpz 0 2 0 0>, <&gpz 1 2 0 0>, <&gpz 2 2 0 0>, | 214 | gpios = <&gpz 0 2 0 0>, <&gpz 1 2 0 0>, <&gpz 2 2 0 0>, |
| 210 | <&gpz 3 2 0 0>, <&gpz 4 2 0 0>, <&gpz 5 2 0 0>, | 215 | <&gpz 3 2 0 0>, <&gpz 4 2 0 0>, <&gpz 5 2 0 0>, |
| 211 | <&gpz 6 2 0 0>; | 216 | <&gpz 6 2 0 0>; |
| 212 | }; | 217 | }; |
| 213 | 218 | ||
| 214 | i2s@12D60000 { | 219 | i2s1: i2s@12D60000 { |
| 215 | status = "disabled"; | 220 | status = "disabled"; |
| 216 | }; | 221 | }; |
| 217 | 222 | ||
| 218 | i2s@12D70000 { | 223 | i2s2: i2s@12D70000 { |
| 219 | status = "disabled"; | 224 | status = "disabled"; |
| 220 | }; | 225 | }; |
| 226 | |||
| 227 | sound { | ||
| 228 | compatible = "samsung,smdk-wm8994"; | ||
| 229 | |||
| 230 | samsung,i2s-controller = <&i2s0>; | ||
| 231 | samsung,audio-codec = <&wm8994>; | ||
| 232 | }; | ||
| 221 | }; | 233 | }; |
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index fe05b60a3984..a320b4ac11dd 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
| @@ -269,7 +269,7 @@ | |||
| 269 | #size-cells = <0>; | 269 | #size-cells = <0>; |
| 270 | }; | 270 | }; |
| 271 | 271 | ||
| 272 | i2s@03830000 { | 272 | i2s0: i2s@03830000 { |
| 273 | compatible = "samsung,i2s-v5"; | 273 | compatible = "samsung,i2s-v5"; |
| 274 | reg = <0x03830000 0x100>; | 274 | reg = <0x03830000 0x100>; |
| 275 | dmas = <&pdma0 10 | 275 | dmas = <&pdma0 10 |
| @@ -282,7 +282,7 @@ | |||
| 282 | samsung,idma-addr = <0x03000000>; | 282 | samsung,idma-addr = <0x03000000>; |
| 283 | }; | 283 | }; |
| 284 | 284 | ||
| 285 | i2s@12D60000 { | 285 | i2s1: i2s@12D60000 { |
| 286 | compatible = "samsung,i2s-v5"; | 286 | compatible = "samsung,i2s-v5"; |
| 287 | reg = <0x12D60000 0x100>; | 287 | reg = <0x12D60000 0x100>; |
| 288 | dmas = <&pdma1 12 | 288 | dmas = <&pdma1 12 |
| @@ -290,7 +290,7 @@ | |||
| 290 | dma-names = "tx", "rx"; | 290 | dma-names = "tx", "rx"; |
| 291 | }; | 291 | }; |
| 292 | 292 | ||
| 293 | i2s@12D70000 { | 293 | i2s2: i2s@12D70000 { |
| 294 | compatible = "samsung,i2s-v5"; | 294 | compatible = "samsung,i2s-v5"; |
| 295 | reg = <0x12D70000 0x100>; | 295 | reg = <0x12D70000 0x100>; |
| 296 | dmas = <&pdma0 12 | 296 | dmas = <&pdma0 12 |