Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35f5e54d authored by Mark Brown's avatar Mark Brown Committed by Takashi Iwai
Browse files

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

sound/soc/pxa/corgi.c

+2 −2
Original line number Diff line number Diff line
@@ -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++) {

sound/soc/pxa/poodle.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */

sound/soc/pxa/spitz.c

+7 −7
Original line number Diff line number Diff line
@@ -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++) {

sound/soc/pxa/tosa.c

+2 −2
Original line number Diff line number Diff line
@@ -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++) {