aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-09-05 20:46:23 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-23 17:04:40 -0400
commitf72de6638b8e55283739de174b57c0ae4203c446 (patch)
tree6e3daf24ca74b0b4921747bddbf3a95bcaa2236b /sound
parent4fe3224fffc56b13fe54e0fa479b64db83d8b125 (diff)
[ARM] pxa/akita: use pca953x instead of akita-ioexp
Use generic pca953x which provides gpiolib interface instead of akita-specific akita-ioexp with non-standard interface to pins. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/pxa/spitz.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index acfa712844e2..b89a3edd2183 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -28,7 +28,6 @@
28#include <asm/mach-types.h> 28#include <asm/mach-types.h>
29#include <mach/pxa-regs.h> 29#include <mach/pxa-regs.h>
30#include <mach/hardware.h> 30#include <mach/hardware.h>
31#include <mach/akita.h>
32#include <mach/spitz.h> 31#include <mach/spitz.h>
33#include "../codecs/wm8750.h" 32#include "../codecs/wm8750.h"
34#include "pxa2xx-pcm.h" 33#include "pxa2xx-pcm.h"
@@ -219,14 +218,10 @@ static int spitz_mic_bias(struct snd_soc_dapm_widget *w,
219 gpio_set_value(SPITZ_GPIO_MIC_BIAS, 218 gpio_set_value(SPITZ_GPIO_MIC_BIAS,
220 SND_SOC_DAPM_EVENT_ON(event)); 219 SND_SOC_DAPM_EVENT_ON(event));
221 220
222 if (machine_is_akita()) { 221 if (machine_is_akita())
223 if (SND_SOC_DAPM_EVENT_ON(event)) 222 gpio_set_value(AKITA_GPIO_MIC_BIAS,
224 akita_set_ioexp(&akitaioexp_device.dev, 223 SND_SOC_DAPM_EVENT_ON(event));
225 AKITA_IOEXP_MIC_BIAS); 224
226 else
227 akita_reset_ioexp(&akitaioexp_device.dev,
228 AKITA_IOEXP_MIC_BIAS);
229 }
230 return 0; 225 return 0;
231} 226}
232 227