diff options
author | Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> | 2010-11-13 12:51:53 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-15 07:27:57 -0500 |
commit | 3c9e28e751cf9969c2cb2e57b5573cab86cf521a (patch) | |
tree | 73cb87fb2503f919ae554bdab1c8aeadc2758994 /sound/soc/kirkwood | |
parent | f9a67059d43a8f12446356ed42d7694afc34bb92 (diff) |
ASoC: Add support for OpenRD Ultimate
OpenRD Ultimate & Client are similar machines so enable OpenRD client sound
support on Ultimate too
Tested-by: Robas Teodor <teodor.robas@gmail.com>
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/kirkwood')
-rw-r--r-- | sound/soc/kirkwood/Kconfig | 2 | ||||
-rw-r--r-- | sound/soc/kirkwood/kirkwood-openrd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig index 54258fd9797f..8f49e165f4d1 100644 --- a/sound/soc/kirkwood/Kconfig +++ b/sound/soc/kirkwood/Kconfig | |||
@@ -11,7 +11,7 @@ config SND_KIRKWOOD_SOC_I2S | |||
11 | 11 | ||
12 | config SND_KIRKWOOD_SOC_OPENRD | 12 | config SND_KIRKWOOD_SOC_OPENRD |
13 | tristate "SoC Audio support for Kirkwood Openrd Client" | 13 | tristate "SoC Audio support for Kirkwood Openrd Client" |
14 | depends on SND_KIRKWOOD_SOC && MACH_OPENRD_CLIENT | 14 | depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE) |
15 | select SND_KIRKWOOD_SOC_I2S | 15 | select SND_KIRKWOOD_SOC_I2S |
16 | select SND_SOC_CS42L51 | 16 | select SND_SOC_CS42L51 |
17 | help | 17 | help |
diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c index 9d7c81e921f1..d863afb3ee52 100644 --- a/sound/soc/kirkwood/kirkwood-openrd.c +++ b/sound/soc/kirkwood/kirkwood-openrd.c | |||
@@ -86,7 +86,7 @@ static int __init openrd_client_init(void) | |||
86 | { | 86 | { |
87 | int ret; | 87 | int ret; |
88 | 88 | ||
89 | if (!machine_is_openrd_client()) | 89 | if (!machine_is_openrd_client() && !machine_is_openrd_ultimate()) |
90 | return 0; | 90 | return 0; |
91 | 91 | ||
92 | openrd_client_snd_device = platform_device_alloc("soc-audio", -1); | 92 | openrd_client_snd_device = platform_device_alloc("soc-audio", -1); |