Skip to content

Commit

Permalink
ALSA: ASoC: Use snd_soc_dapm_nc_pin() in Zaurus machine drivers
Browse files Browse the repository at this point in the history 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Mark Brown authored and Takashi Iwai committed Oct 13, 2008
1 parent 6b58a82 commit 35f5e54
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions sound/soc/pxa/corgi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ static int corgi_wm8731_init(struct snd_soc_codec *codec)
{
int i, err;

snd_soc_dapm_disable_pin(codec, "LLINEIN");
snd_soc_dapm_disable_pin(codec, "RLINEIN");
snd_soc_dapm_nc_pin(codec, "LLINEIN");
snd_soc_dapm_nc_pin(codec, "RLINEIN");

/* Add corgi specific controls */
for (i = 0; i < ARRAY_SIZE(wm8731_corgi_controls); i++) {
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/pxa/poodle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ static int poodle_wm8731_init(struct snd_soc_codec *codec)
{
int i, err;

snd_soc_dapm_disable_pin(codec, "LLINEIN");
snd_soc_dapm_disable_pin(codec, "RLINEIN");
snd_soc_dapm_nc_pin(codec, "LLINEIN");
snd_soc_dapm_nc_pin(codec, "RLINEIN");
snd_soc_dapm_enable_pin(codec, "MICIN");

/* Add poodle specific controls */
Expand Down
14 changes: 7 additions & 7 deletions sound/soc/pxa/spitz.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,13 +291,13 @@ static int spitz_wm8750_init(struct snd_soc_codec *codec)
int i, err;

/* NC codec pins */
snd_soc_dapm_disable_pin(codec, "RINPUT1");
snd_soc_dapm_disable_pin(codec, "LINPUT2");
snd_soc_dapm_disable_pin(codec, "RINPUT2");
snd_soc_dapm_disable_pin(codec, "LINPUT3");
snd_soc_dapm_disable_pin(codec, "RINPUT3");
snd_soc_dapm_disable_pin(codec, "OUT3");
snd_soc_dapm_disable_pin(codec, "MONO1");
snd_soc_dapm_nc_pin(codec, "RINPUT1");
snd_soc_dapm_nc_pin(codec, "LINPUT2");
snd_soc_dapm_nc_pin(codec, "RINPUT2");
snd_soc_dapm_nc_pin(codec, "LINPUT3");
snd_soc_dapm_nc_pin(codec, "RINPUT3");
snd_soc_dapm_nc_pin(codec, "OUT3");
snd_soc_dapm_nc_pin(codec, "MONO1");

/* Add spitz specific controls */
for (i = 0; i < ARRAY_SIZE(wm8750_spitz_controls); i++) {
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/pxa/tosa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ static int tosa_ac97_init(struct snd_soc_codec *codec)
{
int i, err;

snd_soc_dapm_disable_pin(codec, "OUT3");
snd_soc_dapm_disable_pin(codec, "MONOOUT");
snd_soc_dapm_nc_pin(codec, "OUT3");
snd_soc_dapm_nc_pin(codec, "MONOOUT");

/* add tosa specific controls */
for (i = 0; i < ARRAY_SIZE(tosa_controls); i++) {
Expand Down

0 comments on commit 35f5e54

Please sign in to comment.