summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-30 09:16:11 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-30 02:00:06 +0000
commit2445ecc3c036ae5f1cc0c3dfed4731d9519a3811 (patch)
tree2933161346e760b1052cb92227c5f47b485ea734 /arch
parent1b39bf3468e03016ffdcadef3dac1fd75d2db6fa (diff)
downloadop-kernel-dev-2445ecc3c036ae5f1cc0c3dfed4731d9519a3811.zip
op-kernel-dev-2445ecc3c036ae5f1cc0c3dfed4731d9519a3811.tar.gz
ASoC: pxa: Convert poodle to use snd_soc_register_card()
Use snd_soc_register_card() instead of creating a "soc-audio" platform device. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/poodle.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 50c8331..bd5682a 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -158,6 +158,11 @@ static struct scoop_pcmcia_config poodle_pcmcia_config = {
EXPORT_SYMBOL(poodle_scoop_device);
+static struct platform_device poodle_audio_device = {
+ .name = "poodle-audio",
+ .id = -1,
+};
+
/* LoCoMo device */
static struct resource locomo_resources[] = {
[0] = {
@@ -407,6 +412,7 @@ static struct platform_device sharpsl_rom_device = {
static struct platform_device *devices[] __initdata = {
&poodle_locomo_device,
&poodle_scoop_device,
+ &poodle_audio_device,
&sharpsl_nand_device,
&sharpsl_rom_device,
};
OpenPOWER on IntegriCloud