leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: pxa/mioa701_wm9713: replace codec to component

Browse Source 
Now codec can be replaced to component, let's do it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-01-29 04:46:53 +00:00 committed by Mark Brown
parent ac6267e34a
commit 6aa89ef38d
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sound/soc/pxa/mioa701_wm9713.c
View File

@ -58,20 +58,20 @@
#define AC97_GPIO_PULL 0x58 #define AC97_GPIO_PULL 0x58
/* Use GPIO8 for rear speaker amplifier */ /* Use GPIO8 for rear speaker amplifier */
static int rear_amp_power(struct snd_soc_codec *codec, int power) static int rear_amp_power(struct snd_soc_component *component, int power)
{ {
unsigned short reg; unsigned short reg;
if (power) { if (power) {
reg = snd_soc_read(codec, AC97_GPIO_CFG); reg = snd_soc_component_read32(component, AC97_GPIO_CFG);
snd_soc_write(codec, AC97_GPIO_CFG, reg | 0x0100); snd_soc_component_write(component, AC97_GPIO_CFG, reg | 0x0100);
reg = snd_soc_read(codec, AC97_GPIO_PULL); reg = snd_soc_component_read32(component, AC97_GPIO_PULL);
snd_soc_write(codec, AC97_GPIO_PULL, reg | (1<<15)); snd_soc_component_write(component, AC97_GPIO_PULL, reg | (1<<15));
} else { } else {
reg = snd_soc_read(codec, AC97_GPIO_CFG); reg = snd_soc_component_read32(component, AC97_GPIO_CFG);
snd_soc_write(codec, AC97_GPIO_CFG, reg & ~0x0100); snd_soc_component_write(component, AC97_GPIO_CFG, reg & ~0x0100);
reg = snd_soc_read(codec, AC97_GPIO_PULL); reg = snd_soc_component_read32(component, AC97_GPIO_PULL);
snd_soc_write(codec, AC97_GPIO_PULL, reg & ~(1<<15)); snd_soc_component_write(component, AC97_GPIO_PULL, reg & ~(1<<15));
} }
return 0; return 0;
@ -82,11 +82,11 @@ static int rear_amp_event(struct snd_soc_dapm_widget *widget,
{ {
struct snd_soc_card *card = widget->dapm->card; struct snd_soc_card *card = widget->dapm->card;
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
struct snd_soc_codec *codec; struct snd_soc_component *component;
rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name); rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);
codec = rtd->codec; component = rtd->codec_dai->component;
return rear_amp_power(codec, SND_SOC_DAPM_EVENT_ON(event)); return rear_amp_power(component, SND_SOC_DAPM_EVENT_ON(event));
} }
/* mioa701 machine dapm widgets */ /* mioa701 machine dapm widgets */
@ -129,13 +129,13 @@ static const struct snd_soc_dapm_route audio_map[] = {
static int mioa701_wm9713_init(struct snd_soc_pcm_runtime *rtd) static int mioa701_wm9713_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_codec *codec = rtd->codec; struct snd_soc_component *component = rtd->codec_dai->component;
/* Prepare GPIO8 for rear speaker amplifier */ /* Prepare GPIO8 for rear speaker amplifier */
snd_soc_update_bits(codec, AC97_GPIO_CFG, 0x100, 0x100); snd_soc_component_update_bits(component, AC97_GPIO_CFG, 0x100, 0x100);
/* Prepare MIC input */ /* Prepare MIC input */
snd_soc_update_bits(codec, AC97_3D_CONTROL, 0xc000, 0xc000); snd_soc_component_update_bits(component, AC97_3D_CONTROL, 0xc000, 0xc000);
return 0; return 0;
} }