diff options
author | Ian Molton <spyro@f2s.com> | 2008-01-10 08:50:34 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:29:54 -0500 |
commit | ab40d4f12cda366ed1f308d2a041480769f9a77e (patch) | |
tree | f25c6696125c4655376ea8d6ee70e6ba17c6ac8d /sound/soc/pxa | |
parent | 6cab2d3ddd54f2ef4872a4fca3d44655377737dd (diff) |
[ALSA] soc - Preliminary ac97 drivers for Toshiba e800 PDAs
Currently only the AUX channel is used (touchscreen)
Signed-off-by: Ian Molton <spyro@f2s.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r-- | sound/soc/pxa/Kconfig | 9 | ||||
-rw-r--r-- | sound/soc/pxa/Makefile | 2 | ||||
-rw-r--r-- | sound/soc/pxa/e800_wm9712.c | 89 |
3 files changed, 100 insertions, 0 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index a83e22937c27..484f883459e0 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig | |||
@@ -53,3 +53,12 @@ config SND_PXA2XX_SOC_TOSA | |||
53 | help | 53 | help |
54 | Say Y if you want to add support for SoC audio on Sharp | 54 | Say Y if you want to add support for SoC audio on Sharp |
55 | Zaurus SL-C6000x models (Tosa). | 55 | Zaurus SL-C6000x models (Tosa). |
56 | |||
57 | config SND_PXA2XX_SOC_E800 | ||
58 | tristate "SoC AC97 Audio support for e800" | ||
59 | depends on SND_PXA2XX_SOC && MACH_E800 | ||
60 | select SND_SOC_WM9712 | ||
61 | select SND_PXA2XX_SOC_AC97 | ||
62 | help | ||
63 | Say Y if you want to add support for SoC audio on the | ||
64 | Toshiba e800 PDA | ||
diff --git a/sound/soc/pxa/Makefile b/sound/soc/pxa/Makefile index 78e0d6b07d1d..04e5646f75ba 100644 --- a/sound/soc/pxa/Makefile +++ b/sound/soc/pxa/Makefile | |||
@@ -11,10 +11,12 @@ obj-$(CONFIG_SND_PXA2XX_SOC_I2S) += snd-soc-pxa2xx-i2s.o | |||
11 | snd-soc-corgi-objs := corgi.o | 11 | snd-soc-corgi-objs := corgi.o |
12 | snd-soc-poodle-objs := poodle.o | 12 | snd-soc-poodle-objs := poodle.o |
13 | snd-soc-tosa-objs := tosa.o | 13 | snd-soc-tosa-objs := tosa.o |
14 | snd-soc-e800-objs := e800_wm9712.o | ||
14 | snd-soc-spitz-objs := spitz.o | 15 | snd-soc-spitz-objs := spitz.o |
15 | 16 | ||
16 | obj-$(CONFIG_SND_PXA2XX_SOC_CORGI) += snd-soc-corgi.o | 17 | obj-$(CONFIG_SND_PXA2XX_SOC_CORGI) += snd-soc-corgi.o |
17 | obj-$(CONFIG_SND_PXA2XX_SOC_POODLE) += snd-soc-poodle.o | 18 | obj-$(CONFIG_SND_PXA2XX_SOC_POODLE) += snd-soc-poodle.o |
18 | obj-$(CONFIG_SND_PXA2XX_SOC_TOSA) += snd-soc-tosa.o | 19 | obj-$(CONFIG_SND_PXA2XX_SOC_TOSA) += snd-soc-tosa.o |
20 | obj-$(CONFIG_SND_PXA2XX_SOC_E800) += snd-soc-e800.o | ||
19 | obj-$(CONFIG_SND_PXA2XX_SOC_SPITZ) += snd-soc-spitz.o | 21 | obj-$(CONFIG_SND_PXA2XX_SOC_SPITZ) += snd-soc-spitz.o |
20 | 22 | ||
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c new file mode 100644 index 000000000000..06e8afb25277 --- /dev/null +++ b/sound/soc/pxa/e800_wm9712.c | |||
@@ -0,0 +1,89 @@ | |||
1 | /* | ||
2 | * e800-wm9712.c -- SoC audio for e800 | ||
3 | * | ||
4 | * Based on tosa.c | ||
5 | * | ||
6 | * Copyright 2007 (c) Ian Molton <spyro@f2s.com> | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify it | ||
9 | * under the terms of the GNU General Public License as published by the | ||
10 | * Free Software Foundation; version 2 ONLY. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #include <linux/module.h> | ||
15 | #include <linux/moduleparam.h> | ||
16 | #include <linux/device.h> | ||
17 | |||
18 | #include <sound/core.h> | ||
19 | #include <sound/pcm.h> | ||
20 | #include <sound/soc.h> | ||
21 | #include <sound/soc-dapm.h> | ||
22 | |||
23 | #include <asm/mach-types.h> | ||
24 | #include <asm/arch/pxa-regs.h> | ||
25 | #include <asm/arch/hardware.h> | ||
26 | #include <asm/arch/audio.h> | ||
27 | |||
28 | #include "../codecs/wm9712.h" | ||
29 | #include "pxa2xx-pcm.h" | ||
30 | #include "pxa2xx-ac97.h" | ||
31 | |||
32 | static struct snd_soc_machine e800; | ||
33 | |||
34 | static struct snd_soc_dai_link e800_dai[] = { | ||
35 | { | ||
36 | .name = "AC97 Aux", | ||
37 | .stream_name = "AC97 Aux", | ||
38 | .cpu_dai = &pxa_ac97_dai[PXA2XX_DAI_AC97_AUX], | ||
39 | .codec_dai = &wm9712_dai[WM9712_DAI_AC97_AUX], | ||
40 | }, | ||
41 | }; | ||
42 | |||
43 | static struct snd_soc_machine e800 = { | ||
44 | .name = "Toshiba e800", | ||
45 | .dai_link = e800_dai, | ||
46 | .num_links = ARRAY_SIZE(e800_dai), | ||
47 | }; | ||
48 | |||
49 | static struct snd_soc_device e800_snd_devdata = { | ||
50 | .machine = &e800, | ||
51 | .platform = &pxa2xx_soc_platform, | ||
52 | .codec_dev = &soc_codec_dev_wm9712, | ||
53 | }; | ||
54 | |||
55 | static struct platform_device *e800_snd_device; | ||
56 | |||
57 | static int __init e800_init(void) | ||
58 | { | ||
59 | int ret; | ||
60 | |||
61 | if (!machine_is_e800()) | ||
62 | return -ENODEV; | ||
63 | |||
64 | e800_snd_device = platform_device_alloc("soc-audio", -1); | ||
65 | if (!e800_snd_device) | ||
66 | return -ENOMEM; | ||
67 | |||
68 | platform_set_drvdata(e800_snd_device, &e800_snd_devdata); | ||
69 | e800_snd_devdata.dev = &e800_snd_device->dev; | ||
70 | ret = platform_device_add(e800_snd_device); | ||
71 | |||
72 | if (ret) | ||
73 | platform_device_put(e800_snd_device); | ||
74 | |||
75 | return ret; | ||
76 | } | ||
77 | |||
78 | static void __exit e800_exit(void) | ||
79 | { | ||
80 | platform_device_unregister(e800_snd_device); | ||
81 | } | ||
82 | |||
83 | module_init(e800_init); | ||
84 | module_exit(e800_exit); | ||
85 | |||
86 | /* Module information */ | ||
87 | MODULE_AUTHOR("Ian Molton <spyro@f2s.com>"); | ||
88 | MODULE_DESCRIPTION("ALSA SoC driver for e800"); | ||
89 | MODULE_LICENSE("GPL"); | ||