diff options
-rw-r--r-- | arch/arm/mach-kirkwood/openrd-setup.c | 2 | ||||
-rw-r--r-- | sound/soc/kirkwood/Kconfig | 2 | ||||
-rw-r--r-- | sound/soc/kirkwood/kirkwood-openrd.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c index c9d77fad10ab..cfcca4174e25 100644 --- a/arch/arm/mach-kirkwood/openrd-setup.c +++ b/arch/arm/mach-kirkwood/openrd-setup.c | |||
@@ -171,7 +171,7 @@ static void __init openrd_init(void) | |||
171 | 171 | ||
172 | kirkwood_i2c_init(); | 172 | kirkwood_i2c_init(); |
173 | 173 | ||
174 | if (machine_is_openrd_client()) { | 174 | if (machine_is_openrd_client() || machine_is_openrd_ultimate()) { |
175 | i2c_register_board_info(0, i2c_board_info, | 175 | i2c_register_board_info(0, i2c_board_info, |
176 | ARRAY_SIZE(i2c_board_info)); | 176 | ARRAY_SIZE(i2c_board_info)); |
177 | kirkwood_audio_init(); | 177 | kirkwood_audio_init(); |
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); |