diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:41 +0000 |
| commit | 2944c2f5d5c88d5893d6a1dad51d0768aed52d00 (patch) | |
| tree | b09658ebfcbb078afe82beb6e462b3edebd03ddd /arch/arm/boot/dts/exynos5250-smdk5250.dts | |
| parent | f8843c91c60ed744cc7dd6326e44ddb91250ab35 (diff) | |
| parent | 5b1d3c3472f1941ab1a78575fe9ada718a7c0c25 (diff) | |
| download | kernel_goldelico_gta04-2944c2f5d5c88d5893d6a1dad51d0768aed52d00.zip kernel_goldelico_gta04-2944c2f5d5c88d5893d6a1dad51d0768aed52d00.tar.gz kernel_goldelico_gta04-2944c2f5d5c88d5893d6a1dad51d0768aed52d00.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'arch/arm/boot/dts/exynos5250-smdk5250.dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-smdk5250.dts | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index e05b18f..4db9db0 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -49,6 +49,11 @@ compatible = "samsung,s524ad0xd1"; reg = <0x51>; }; + + wm8994: wm8994@1a { + compatible = "wlf,wm8994"; + reg = <0x1a>; + }; }; i2c@121D0000 { @@ -204,4 +209,25 @@ samsung,mfc-r = <0x43000000 0x800000>; samsung,mfc-l = <0x51000000 0x800000>; }; + + i2s0: i2s@03830000 { + gpios = <&gpz 0 2 0 0>, <&gpz 1 2 0 0>, <&gpz 2 2 0 0>, + <&gpz 3 2 0 0>, <&gpz 4 2 0 0>, <&gpz 5 2 0 0>, + <&gpz 6 2 0 0>; + }; + + i2s1: i2s@12D60000 { + status = "disabled"; + }; + + i2s2: i2s@12D70000 { + status = "disabled"; + }; + + sound { + compatible = "samsung,smdk-wm8994"; + + samsung,i2s-controller = <&i2s0>; + samsung,audio-codec = <&wm8994>; + }; }; |