diff options
author | Mike Rapoport <mike@compulab.co.il> | 2009-05-11 08:05:29 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-12 05:53:22 -0400 |
commit | eaaa5328835d8085d24221a0e5ceaacbe14a7523 (patch) | |
tree | 21e5be55e98b33d562b84fad992938fa6ec47a69 /sound/soc/pxa | |
parent | 31cb31f76e030ae05ed45f409ce5eb68ef2987f6 (diff) |
ASoC: em-x270: make the driver support also eXeda and CM-X300 machines
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r-- | sound/soc/pxa/Kconfig | 4 | ||||
-rw-r--r-- | sound/soc/pxa/em-x270.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index eb75a1c061aa..dcd163a4ee9a 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig | |||
@@ -89,13 +89,13 @@ config SND_PXA2XX_SOC_E800 | |||
89 | Toshiba e800 PDA | 89 | Toshiba e800 PDA |
90 | 90 | ||
91 | config SND_PXA2XX_SOC_EM_X270 | 91 | config SND_PXA2XX_SOC_EM_X270 |
92 | tristate "SoC Audio support for CompuLab EM-x270" | 92 | tristate "SoC Audio support for CompuLab EM-x270, eXeda and CM-X300" |
93 | depends on SND_PXA2XX_SOC && MACH_EM_X270 | 93 | depends on SND_PXA2XX_SOC && MACH_EM_X270 |
94 | select SND_PXA2XX_SOC_AC97 | 94 | select SND_PXA2XX_SOC_AC97 |
95 | select SND_SOC_WM9712 | 95 | select SND_SOC_WM9712 |
96 | help | 96 | help |
97 | Say Y if you want to add support for SoC audio on | 97 | Say Y if you want to add support for SoC audio on |
98 | CompuLab EM-x270. | 98 | CompuLab EM-x270, eXeda and CM-X300 machines. |
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 and LifeDrive" |
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index 949be9c2a01b..f4756e4025fd 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * em-x270.c -- SoC audio for EM-X270 | 2 | * SoC audio driver for EM-X270, eXeda and CM-X300 |
3 | * | 3 | * |
4 | * Copyright 2007 CompuLab, Ltd. | 4 | * Copyright 2007, 2009 CompuLab, Ltd. |
5 | * | 5 | * |
6 | * Author: Mike Rapoport <mike@compulab.co.il> | 6 | * Author: Mike Rapoport <mike@compulab.co.il> |
7 | * | 7 | * |
@@ -68,7 +68,8 @@ static int __init em_x270_init(void) | |||
68 | { | 68 | { |
69 | int ret; | 69 | int ret; |
70 | 70 | ||
71 | if (!machine_is_em_x270()) | 71 | if (!(machine_is_em_x270() || machine_is_exeda() |
72 | || machine_is_cm_x300())) | ||
72 | return -ENODEV; | 73 | return -ENODEV; |
73 | 74 | ||
74 | em_x270_snd_device = platform_device_alloc("soc-audio", -1); | 75 | em_x270_snd_device = platform_device_alloc("soc-audio", -1); |
@@ -95,5 +96,5 @@ module_exit(em_x270_exit); | |||
95 | 96 | ||
96 | /* Module information */ | 97 | /* Module information */ |
97 | MODULE_AUTHOR("Mike Rapoport"); | 98 | MODULE_AUTHOR("Mike Rapoport"); |
98 | MODULE_DESCRIPTION("ALSA SoC EM-X270"); | 99 | MODULE_DESCRIPTION("ALSA SoC EM-X270, eXeda and CM-X300"); |
99 | MODULE_LICENSE("GPL"); | 100 | MODULE_LICENSE("GPL"); |