Skip to content

L
linux-davinci
Commit 35f5e54d authored by Mark Brown's avatar Mark Brown Committed by Takashi Iwai
Browse files
Options

ALSA: ASoC: Use snd_soc_dapm_nc_pin() in Zaurus machine drivers 

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6b58a821
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
sound/soc/pxa/corgi.c
View file @ 35f5e54d
...@@ -289,8 +289,8 @@ static int corgi_wm8731_init(struct snd_soc_codec *codec) ...@@ -289,8 +289,8 @@ static int corgi_wm8731_init(struct snd_soc_codec *codec)
{ {
int i, err; int i, err;
snd_soc_dapm_disable_pin(codec, "LLINEIN"); snd_soc_dapm_nc_pin(codec, "LLINEIN");
snd_soc_dapm_disable_pin(codec, "RLINEIN"); snd_soc_dapm_nc_pin(codec, "RLINEIN");
/* Add corgi specific controls */ /* Add corgi specific controls */
for (i = 0; i < ARRAY_SIZE(wm8731_corgi_controls); i++) { for (i = 0; i < ARRAY_SIZE(wm8731_corgi_controls); i++) {
......
sound/soc/pxa/poodle.c
View file @ 35f5e54d
...@@ -242,8 +242,8 @@ static int poodle_wm8731_init(struct snd_soc_codec *codec) ...@@ -242,8 +242,8 @@ static int poodle_wm8731_init(struct snd_soc_codec *codec)
{ {
int i, err; int i, err;
snd_soc_dapm_disable_pin(codec, "LLINEIN"); snd_soc_dapm_nc_pin(codec, "LLINEIN");
snd_soc_dapm_disable_pin(codec, "RLINEIN"); snd_soc_dapm_nc_pin(codec, "RLINEIN");
snd_soc_dapm_enable_pin(codec, "MICIN"); snd_soc_dapm_enable_pin(codec, "MICIN");
/* Add poodle specific controls */ /* Add poodle specific controls */
......
sound/soc/pxa/spitz.c
View file @ 35f5e54d
...@@ -291,13 +291,13 @@ static int spitz_wm8750_init(struct snd_soc_codec *codec) ...@@ -291,13 +291,13 @@ static int spitz_wm8750_init(struct snd_soc_codec *codec)
int i, err; int i, err;
/* NC codec pins */ /* NC codec pins */
snd_soc_dapm_disable_pin(codec, "RINPUT1"); snd_soc_dapm_nc_pin(codec, "RINPUT1");
snd_soc_dapm_disable_pin(codec, "LINPUT2"); snd_soc_dapm_nc_pin(codec, "LINPUT2");
snd_soc_dapm_disable_pin(codec, "RINPUT2"); snd_soc_dapm_nc_pin(codec, "RINPUT2");
snd_soc_dapm_disable_pin(codec, "LINPUT3"); snd_soc_dapm_nc_pin(codec, "LINPUT3");
snd_soc_dapm_disable_pin(codec, "RINPUT3"); snd_soc_dapm_nc_pin(codec, "RINPUT3");
snd_soc_dapm_disable_pin(codec, "OUT3"); snd_soc_dapm_nc_pin(codec, "OUT3");
snd_soc_dapm_disable_pin(codec, "MONO1"); snd_soc_dapm_nc_pin(codec, "MONO1");
/* Add spitz specific controls */ /* Add spitz specific controls */
for (i = 0; i < ARRAY_SIZE(wm8750_spitz_controls); i++) { for (i = 0; i < ARRAY_SIZE(wm8750_spitz_controls); i++) {
......
sound/soc/pxa/tosa.c
View file @ 35f5e54d
...@@ -190,8 +190,8 @@ static int tosa_ac97_init(struct snd_soc_codec *codec) ...@@ -190,8 +190,8 @@ static int tosa_ac97_init(struct snd_soc_codec *codec)
{ {
int i, err; int i, err;
snd_soc_dapm_disable_pin(codec, "OUT3"); snd_soc_dapm_nc_pin(codec, "OUT3");
snd_soc_dapm_disable_pin(codec, "MONOOUT"); snd_soc_dapm_nc_pin(codec, "MONOOUT");
/* add tosa specific controls */ /* add tosa specific controls */
for (i = 0; i < ARRAY_SIZE(tosa_controls); i++) { for (i = 0; i < ARRAY_SIZE(tosa_controls); i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment