diff options
| author | Eric Miao <eric.miao@marvell.com> | 2008-09-06 08:46:23 +0800 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-23 22:04:40 +0100 |
| commit | f72de6638b8e55283739de174b57c0ae4203c446 (patch) | |
| tree | 6e3daf24ca74b0b4921747bddbf3a95bcaa2236b /sound/soc | |
| parent | 4fe3224fffc56b13fe54e0fa479b64db83d8b125 (diff) | |
| download | kernel_samsung_smdk4412-f72de6638b8e55283739de174b57c0ae4203c446.zip kernel_samsung_smdk4412-f72de6638b8e55283739de174b57c0ae4203c446.tar.gz kernel_samsung_smdk4412-f72de6638b8e55283739de174b57c0ae4203c446.tar.bz2 | |
[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/soc')
| -rw-r--r-- | sound/soc/pxa/spitz.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index acfa712..b89a3ed 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -28,7 +28,6 @@ #include <asm/mach-types.h> #include <mach/pxa-regs.h> #include <mach/hardware.h> -#include <mach/akita.h> #include <mach/spitz.h> #include "../codecs/wm8750.h" #include "pxa2xx-pcm.h" @@ -219,14 +218,10 @@ static int spitz_mic_bias(struct snd_soc_dapm_widget *w, gpio_set_value(SPITZ_GPIO_MIC_BIAS, SND_SOC_DAPM_EVENT_ON(event)); - if (machine_is_akita()) { - if (SND_SOC_DAPM_EVENT_ON(event)) - akita_set_ioexp(&akitaioexp_device.dev, - AKITA_IOEXP_MIC_BIAS); - else - akita_reset_ioexp(&akitaioexp_device.dev, - AKITA_IOEXP_MIC_BIAS); - } + if (machine_is_akita()) + gpio_set_value(AKITA_GPIO_MIC_BIAS, + SND_SOC_DAPM_EVENT_ON(event)); + return 0; } |