enable sound on OpenRD Ultimate
svn path=/dists/trunk/linux-2.6/; revision=16600
This commit is contained in:
parent
3e6d726913
commit
160388d6e0
|
@ -6,6 +6,7 @@ linux-2.6 (2.6.36-1~experimental.2) UNRELEASED; urgency=low
|
|||
[ Martin Michlmayr ]
|
||||
* Add ixp4xx build fix from Arnaud Patard (Closes: #602669)
|
||||
* [armel/kirkwood] Enable sound.
|
||||
* ASoC: Add support for OpenRD Ultimate (Arnaud Patard).
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* Enable PM_ADVANCED_DEBUG (Closes: #603254)
|
||||
|
|
|
@ -0,0 +1,55 @@
|
|||
From: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
|
||||
Date: Sat, 13 Nov 2010 17:51:53 +0000 (+0100)
|
||||
Subject: ASoC: Add support for OpenRD Ultimate
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fbroonie%2Fsound-2.6.git;a=commitdiff_plain;h=3c9e28e751cf9969c2cb2e57b5573cab86cf521a
|
||||
|
||||
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>
|
||||
---
|
||||
|
||||
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
|
||||
index c9d77fa..cfcca41 100644
|
||||
--- a/arch/arm/mach-kirkwood/openrd-setup.c
|
||||
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
|
||||
@@ -94,7 +94,7 @@ static void __init openrd_init(void)
|
||||
|
||||
kirkwood_i2c_init();
|
||||
|
||||
- if (machine_is_openrd_client()) {
|
||||
+ if (machine_is_openrd_client() || machine_is_openrd_ultimate()) {
|
||||
i2c_register_board_info(0, i2c_board_info,
|
||||
ARRAY_SIZE(i2c_board_info));
|
||||
kirkwood_audio_init();
|
||||
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
|
||||
index 54258fd..8f49e16 100644
|
||||
--- a/sound/soc/kirkwood/Kconfig
|
||||
+++ b/sound/soc/kirkwood/Kconfig
|
||||
@@ -11,7 +11,7 @@ config SND_KIRKWOOD_SOC_I2S
|
||||
|
||||
config SND_KIRKWOOD_SOC_OPENRD
|
||||
tristate "SoC Audio support for Kirkwood Openrd Client"
|
||||
- depends on SND_KIRKWOOD_SOC && MACH_OPENRD_CLIENT
|
||||
+ depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE)
|
||||
select SND_KIRKWOOD_SOC_I2S
|
||||
select SND_SOC_CS42L51
|
||||
help
|
||||
diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c
|
||||
index 9d7c81e..d863afb 100644
|
||||
--- a/sound/soc/kirkwood/kirkwood-openrd.c
|
||||
+++ b/sound/soc/kirkwood/kirkwood-openrd.c
|
||||
@@ -91,7 +91,7 @@ static int __init openrd_client_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
- if (!machine_is_openrd_client())
|
||||
+ if (!machine_is_openrd_client() && !machine_is_openrd_ultimate())
|
||||
return 0;
|
||||
|
||||
openrd_client_snd_device = platform_device_alloc("soc-audio", -1);
|
|
@ -1,3 +1,4 @@
|
|||
+ debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
|
||||
+ debian/rds-Disable-auto-loading-as-mitigation-against-local.patch
|
||||
+ debian/decnet-Disable-auto-loading-as-mitigation-against-lo.patch
|
||||
+ features/arm/asoc-openrd-ultimate.patch
|
||||
|
|
Loading…
Reference in New Issue