ALSA: ASoC: Use snd_soc_dapm_nc_pin() in Zaurus machine drivers
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
6b58a82121
commit
35f5e54db9
|
@ -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++) {
|
||||||
|
|
|
@ -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 */
|
||||||
|
|
|
@ -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++) {
|
||||||
|
|
|
@ -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++) {
|
||||||
|
|
Loading…
Reference in a new issue