diff options
author | Marek Vasut <marek.vasut@gmail.com> | 2009-04-23 05:27:11 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2009-06-04 22:41:54 -0400 |
commit | 37330efd4abb474b3fdfacea68beb37cf67564ed (patch) | |
tree | 520b3c8cc2f11bfb7cdc17b4c7b5d018728dcae3 /sound/soc | |
parent | 8768dc9b75efa43e612f6f520cf76a89bbab69d3 (diff) |
[ARM] pxa/palm: Add Palm27x aSoC driver to PalmTE2
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/pxa/Kconfig | 7 | ||||
-rw-r--r-- | sound/soc/pxa/palm27x.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index ad8a10fe6298..96b2699abf61 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig | |||
@@ -98,13 +98,14 @@ config SND_PXA2XX_SOC_EM_X270 | |||
98 | CompuLab EM-x270. | 98 | CompuLab EM-x270. |
99 | 99 | ||
100 | config SND_PXA2XX_SOC_PALM27X | 100 | config SND_PXA2XX_SOC_PALM27X |
101 | bool "SoC Audio support for Palm T|X, T5 and LifeDrive" | 101 | bool "SoC Audio support for Palm T|X, T5, E2 and LifeDrive" |
102 | depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || MACH_PALMT5) | 102 | depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || \ |
103 | MACH_PALMT5 || MACH_PALMTE2) | ||
103 | select SND_PXA2XX_SOC_AC97 | 104 | select SND_PXA2XX_SOC_AC97 |
104 | select SND_SOC_WM9712 | 105 | select SND_SOC_WM9712 |
105 | help | 106 | help |
106 | Say Y if you want to add support for SoC audio on | 107 | Say Y if you want to add support for SoC audio on |
107 | Palm T|X, T5 or LifeDrive handheld computer. | 108 | Palm T|X, T5, E2 or LifeDrive handheld computer. |
108 | 109 | ||
109 | config SND_SOC_ZYLONITE | 110 | config SND_SOC_ZYLONITE |
110 | tristate "SoC Audio support for Marvell Zylonite" | 111 | tristate "SoC Audio support for Marvell Zylonite" |
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index 44fcc4e01e08..e6102fda0a7f 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c | |||
@@ -205,7 +205,7 @@ static int palm27x_asoc_probe(struct platform_device *pdev) | |||
205 | int ret; | 205 | int ret; |
206 | 206 | ||
207 | if (!(machine_is_palmtx() || machine_is_palmt5() || | 207 | if (!(machine_is_palmtx() || machine_is_palmt5() || |
208 | machine_is_palmld())) | 208 | machine_is_palmld() || machine_is_palmte2())) |
209 | return -ENODEV; | 209 | return -ENODEV; |
210 | 210 | ||
211 | if (pdev->dev.platform_data) | 211 | if (pdev->dev.platform_data) |