Skip to content

Commit

Permalink
ALSA: asoc: core - refactored DAPM pin control API.
Browse files Browse the repository at this point in the history 
Refactored snd_soc_dapm_set_endpoint() to snd_soc_dapm_enable_pin() and
snd_soc_dapm_disable_pin().

Renamed snd_soc_dapm_sync_endpoints() to snd_soc_dapm_sync().
Renamed snd_soc_dapm_get_endpoint_status() to
snd_soc_dapm_get_pin_status().

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
  • Loading branch information
Liam Girdwood authored and Jaroslav Kysela committed Jul 10, 2008
1 parent be321a8 commit a530218
Show file tree
Hide file tree
Showing 12 changed files with 230 additions and 199 deletions.
15 changes: 5 additions & 10 deletions include/sound/soc-dapm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,16 +234,11 @@ int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev,
/* dapm sys fs - used by the core */
int snd_soc_dapm_sys_add(struct device *dev);

/* event handler for register modifier widget - used by the soc-dapm */
int dapm_reg_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event);

/* dapm audio endpoint control */
int snd_soc_dapm_set_endpoint(struct snd_soc_codec *codec,
char *pin, int status);
int snd_soc_dapm_get_endpoint_status(struct snd_soc_codec *codec,
char *pin);
int snd_soc_dapm_sync_endpoints(struct snd_soc_codec *codec);
/* dapm audio pin control and status */
int snd_soc_dapm_enable_pin(struct snd_soc_codec *codec, char *pin);
int snd_soc_dapm_disable_pin(struct snd_soc_codec *codec, char *pin);
int snd_soc_dapm_get_pin_status(struct snd_soc_codec *codec, char *pin);
int snd_soc_dapm_sync(struct snd_soc_codec *codec);

/* dapm widget types */
enum snd_soc_dapm_type {
Expand Down
10 changes: 5 additions & 5 deletions sound/soc/at91/eti_b1_wm8731.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,14 @@ static int eti_b1_wm8731_init(struct snd_soc_codec *codec)
snd_soc_dapm_add_route(codec, intercon, ARRAY_SIZE(intercon));

/* not connected */
snd_soc_dapm_set_endpoint(codec, "RLINEIN", 0);
snd_soc_dapm_set_endpoint(codec, "LLINEIN", 0);
snd_soc_dapm_disable_pin(codec, "RLINEIN");
snd_soc_dapm_disable_pin(codec, "LLINEIN");

/* always connected */
snd_soc_dapm_set_endpoint(codec, "Int Mic", 1);
snd_soc_dapm_set_endpoint(codec, "Ext Spk", 1);
snd_soc_dapm_enable_pin(codec, "Int Mic");
snd_soc_dapm_enable_pin(codec, "Ext Spk");

snd_soc_dapm_sync_endpoints(codec);
snd_soc_dapm_sync(codec);

return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/codecs/tlv320aic3x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* ---------------------------------------
*
* Hence the machine layer should disable unsupported inputs/outputs by
* snd_soc_dapm_set_endpoint(codec, "MONO_LOUT", 0), etc.
* snd_soc_dapm_disable_pin(codec, "MONO_LOUT"), etc.
*/

#include <linux/module.h>
Expand Down Expand Up @@ -206,7 +206,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
}

if (found)
snd_soc_dapm_sync_endpoints(widget->codec);
snd_soc_dapm_sync(widget->codec);
}

ret = snd_soc_update_bits(widget->codec, reg, val_mask, val);
Expand Down
16 changes: 8 additions & 8 deletions sound/soc/davinci/davinci-evm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,17 @@ static int evm_aic3x_init(struct snd_soc_codec *codec)
snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));

/* not connected */
snd_soc_dapm_set_endpoint(codec, "MONO_LOUT", 0);
snd_soc_dapm_set_endpoint(codec, "HPLCOM", 0);
snd_soc_dapm_set_endpoint(codec, "HPRCOM", 0);
snd_soc_dapm_disable_pin(codec, "MONO_LOUT");
snd_soc_dapm_disable_pin(codec, "HPLCOM");
snd_soc_dapm_disable_pin(codec, "HPRCOM");

/* always connected */
snd_soc_dapm_set_endpoint(codec, "Headphone Jack", 1);
snd_soc_dapm_set_endpoint(codec, "Line Out", 1);
snd_soc_dapm_set_endpoint(codec, "Mic Jack", 1);
snd_soc_dapm_set_endpoint(codec, "Line In", 1);
snd_soc_dapm_enable_pin(codec, "Headphone Jack");
snd_soc_dapm_enable_pin(codec, "Line Out");
snd_soc_dapm_enable_pin(codec, "Mic Jack");
snd_soc_dapm_enable_pin(codec, "Line In");

snd_soc_dapm_sync_endpoints(codec);
snd_soc_dapm_sync(codec);

return 0;
}
Expand Down
27 changes: 19 additions & 8 deletions sound/soc/omap/n810.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,22 @@ static int n810_dmic_func;

static void n810_ext_control(struct snd_soc_codec *codec)
{
snd_soc_dapm_set_endpoint(codec, "Ext Spk", n810_spk_func);
snd_soc_dapm_set_endpoint(codec, "Headphone Jack", n810_jack_func);
snd_soc_dapm_set_endpoint(codec, "DMic", n810_dmic_func);
if (n810_spk_func)
snd_soc_dapm_enable_pin(codec, "Ext Spk");
else
snd_soc_dapm_disable_pin(codec, "Ext Spk");

if (n810_jack_func)
snd_soc_dapm_enable_pin(codec, "Headphone Jack");
else
snd_soc_dapm_disable_pin(codec, "Headphone Jack");

if (n810_dmic_func)
snd_soc_dapm_enable_pin(codec, "DMic");
else
snd_soc_dapm_disable_pin(codec, "DMic);

snd_soc_dapm_sync_endpoints(codec);
snd_soc_dapm_sync(codec);
}

static int n810_startup(struct snd_pcm_substream *substream)
Expand Down Expand Up @@ -236,9 +247,9 @@ static int n810_aic33_init(struct snd_soc_codec *codec)
int i, err;

/* Not connected */
snd_soc_dapm_set_endpoint(codec, "MONO_LOUT", 0);
snd_soc_dapm_set_endpoint(codec, "HPLCOM", 0);
snd_soc_dapm_set_endpoint(codec, "HPRCOM", 0);
snd_soc_dapm_disable_pin(codec, "MONO_LOUT");
snd_soc_dapm_disable_pin(codec, "HPLCOM");
snd_soc_dapm_disable_pin(codec, "HPRCOM");

/* Add N810 specific controls */
for (i = 0; i < ARRAY_SIZE(aic33_n810_controls); i++) {
Expand All @@ -255,7 +266,7 @@ static int n810_aic33_init(struct snd_soc_codec *codec)
/* Set up N810 specific audio path audio_map */
snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));

snd_soc_dapm_sync_endpoints(codec);
snd_soc_dapm_sync(codec);

return 0;
}
Expand Down
42 changes: 23 additions & 19 deletions sound/soc/pxa/corgi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,47 +50,51 @@ static int corgi_spk_func;

static void corgi_ext_control(struct snd_soc_codec *codec)
{
int spk = 0, mic = 0, line = 0, hp = 0, hs = 0;

/* set up jack connection */
switch (corgi_jack_func) {
case CORGI_HP:
hp = 1;
/* set = unmute headphone */
set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
snd_soc_dapm_disable_pin(codec, "Mic Jack");
snd_soc_dapm_disable_pin(codec, "Line Jack");
snd_soc_dapm_enable_pin(codec, "Headphone Jack");
snd_soc_dapm_disable_pin(codec, "Headset Jack");
break;
case CORGI_MIC:
mic = 1;
/* reset = mute headphone */
reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
snd_soc_dapm_enable_pin(codec, "Mic Jack");
snd_soc_dapm_disable_pin(codec, "Line Jack");
snd_soc_dapm_disable_pin(codec, "Headphone Jack");
snd_soc_dapm_disable_pin(codec, "Headset Jack");
break;
case CORGI_LINE:
line = 1;
reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
snd_soc_dapm_disable_pin(codec, "Mic Jack");
snd_soc_dapm_enable_pin(codec, "Line Jack");
snd_soc_dapm_disable_pin(codec, "Headphone Jack");
snd_soc_dapm_disable_pin(codec, "Headset Jack");
break;
case CORGI_HEADSET:
hs = 1;
mic = 1;
reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_L);
set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MUTE_R);
snd_soc_dapm_enable_pin(codec, "Mic Jack");
snd_soc_dapm_disable_pin(codec, "Line Jack");
snd_soc_dapm_disable_pin(codec, "Headphone Jack");
snd_soc_dapm_enable_pin(codec, "Headset Jack");
break;
}

if (corgi_spk_func == CORGI_SPK_ON)
spk = 1;

/* set the enpoints to their new connetion states */
snd_soc_dapm_set_endpoint(codec, "Ext Spk", spk);
snd_soc_dapm_set_endpoint(codec, "Mic Jack", mic);
snd_soc_dapm_set_endpoint(codec, "Line Jack", line);
snd_soc_dapm_set_endpoint(codec, "Headphone Jack", hp);
snd_soc_dapm_set_endpoint(codec, "Headset Jack", hs);
snd_soc_dapm_enable_pin(codec, "Ext Spk");
else
snd_soc_dapm_disable_pin(codec, "Ext Spk");

/* signal a DAPM event */
snd_soc_dapm_sync_endpoints(codec);
snd_soc_dapm_sync(codec);
}

static int corgi_startup(struct snd_pcm_substream *substream)
Expand Down Expand Up @@ -285,8 +289,8 @@ static int corgi_wm8731_init(struct snd_soc_codec *codec)
{
int i, err;

snd_soc_dapm_set_endpoint(codec, "LLINEIN", 0);
snd_soc_dapm_set_endpoint(codec, "RLINEIN", 0);
snd_soc_dapm_disable_pin(codec, "LLINEIN");
snd_soc_dapm_disable_pin(codec, "RLINEIN");

/* Add corgi specific controls */
for (i = 0; i < ARRAY_SIZE(wm8731_corgi_controls); i++) {
Expand All @@ -303,7 +307,7 @@ static int corgi_wm8731_init(struct snd_soc_codec *codec)
/* Set up corgi specific audio path audio_map */
snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));

snd_soc_dapm_sync_endpoints(codec);
snd_soc_dapm_sync(codec);
return 0;
}

Expand Down
24 changes: 11 additions & 13 deletions sound/soc/pxa/poodle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,32 +48,30 @@ static int poodle_spk_func;

static void poodle_ext_control(struct snd_soc_codec *codec)
{
int spk = 0;

/* set up jack connection */
if (poodle_jack_func == POODLE_HP) {
/* set = unmute headphone */
locomo_gpio_write(&poodle_locomo_device.dev,
POODLE_LOCOMO_GPIO_MUTE_L, 1);
locomo_gpio_write(&poodle_locomo_device.dev,
POODLE_LOCOMO_GPIO_MUTE_R, 1);
snd_soc_dapm_set_endpoint(codec, "Headphone Jack", 1);
snd_soc_dapm_enable_pin(codec, "Headphone Jack");
} else {
locomo_gpio_write(&poodle_locomo_device.dev,
POODLE_LOCOMO_GPIO_MUTE_L, 0);
locomo_gpio_write(&poodle_locomo_device.dev,
POODLE_LOCOMO_GPIO_MUTE_R, 0);
snd_soc_dapm_set_endpoint(codec, "Headphone Jack", 0);
snd_soc_dapm_disable_pin(codec, "Headphone Jack");
}

if (poodle_spk_func == POODLE_SPK_ON)
spk = 1;

/* set the enpoints to their new connetion states */
snd_soc_dapm_set_endpoint(codec, "Ext Spk", spk);
if (poodle_spk_func == POODLE_SPK_ON)
snd_soc_dapm_enable_pin(codec, "Ext Spk");
else
snd_soc_dapm_disable_pin(codec, "Ext Spk");

/* signal a DAPM event */
snd_soc_dapm_sync_endpoints(codec);
snd_soc_dapm_sync(codec);
}

static int poodle_startup(struct snd_pcm_substream *substream)
Expand Down Expand Up @@ -248,9 +246,9 @@ static int poodle_wm8731_init(struct snd_soc_codec *codec)
{
int i, err;

snd_soc_dapm_set_endpoint(codec, "LLINEIN", 0);
snd_soc_dapm_set_endpoint(codec, "RLINEIN", 0);
snd_soc_dapm_set_endpoint(codec, "MICIN", 1);
snd_soc_dapm_disable_pin(codec, "LLINEIN");
snd_soc_dapm_disable_pin(codec, "RLINEIN");
snd_soc_dapm_enable_pin(codec, "MICIN");

/* Add poodle specific controls */
for (i = 0; i < ARRAY_SIZE(wm8731_poodle_controls); i++) {
Expand All @@ -267,7 +265,7 @@ static int poodle_wm8731_init(struct snd_soc_codec *codec)
/* Set up poodle specific audio path audio_map */
snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));

snd_soc_dapm_sync_endpoints(codec);
snd_soc_dapm_sync(codec);
return 0;
}

Expand Down
62 changes: 31 additions & 31 deletions sound/soc/pxa/spitz.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,60 +51,60 @@ static int spitz_spk_func;
static void spitz_ext_control(struct snd_soc_codec *codec)
{
if (spitz_spk_func == SPITZ_SPK_ON)
snd_soc_dapm_set_endpoint(codec, "Ext Spk", 1);
snd_soc_dapm_enable_pin(codec, "Ext Spk");
else
snd_soc_dapm_set_endpoint(codec, "Ext Spk", 0);
snd_soc_dapm_disable_pin(codec, "Ext Spk");

/* set up jack connection */
switch (spitz_jack_func) {
case SPITZ_HP:
/* enable and unmute hp jack, disable mic bias */
snd_soc_dapm_set_endpoint(codec, "Headset Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Mic Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Line Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Headphone Jack", 1);
snd_soc_dapm_disable_pin(codec, "Headset Jack");
snd_soc_dapm_disable_pin(codec, "Mic Jack");
snd_soc_dapm_disable_pin(codec, "Line Jack");
snd_soc_dapm_enable_pin(codec, "Headphone Jack");
set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
break;
case SPITZ_MIC:
/* enable mic jack and bias, mute hp */
snd_soc_dapm_set_endpoint(codec, "Headphone Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Headset Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Line Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Mic Jack", 1);
snd_soc_dapm_disable_pin(codec, "Headphone Jack");
snd_soc_dapm_disable_pin(codec, "Headset Jack");
snd_soc_dapm_disable_pin(codec, "Line Jack");
snd_soc_dapm_enable_pin(codec, "Mic Jack");
reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
break;
case SPITZ_LINE:
/* enable line jack, disable mic bias and mute hp */
snd_soc_dapm_set_endpoint(codec, "Headphone Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Headset Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Mic Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Line Jack", 1);
snd_soc_dapm_disable_pin(codec, "Headphone Jack");
snd_soc_dapm_disable_pin(codec, "Headset Jack");
snd_soc_dapm_disable_pin(codec, "Mic Jack");
snd_soc_dapm_enable_pin(codec, "Line Jack");
reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
break;
case SPITZ_HEADSET:
/* enable and unmute headset jack enable mic bias, mute L hp */
snd_soc_dapm_set_endpoint(codec, "Headphone Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Mic Jack", 1);
snd_soc_dapm_set_endpoint(codec, "Line Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Headset Jack", 1);
snd_soc_dapm_disable_pin(codec, "Headphone Jack");
snd_soc_dapm_enable_pin(codec, "Mic Jack");
snd_soc_dapm_disable_pin(codec, "Line Jack");
snd_soc_dapm_enable_pin(codec, "Headset Jack");
reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
break;
case SPITZ_HP_OFF:

/* jack removed, everything off */
snd_soc_dapm_set_endpoint(codec, "Headphone Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Headset Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Mic Jack", 0);
snd_soc_dapm_set_endpoint(codec, "Line Jack", 0);
snd_soc_dapm_disable_pin(codec, "Headphone Jack");
snd_soc_dapm_disable_pin(codec, "Headset Jack");
snd_soc_dapm_disable_pin(codec, "Mic Jack");
snd_soc_dapm_disable_pin(codec, "Line Jack");
reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_L);
reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_MUTE_R);
break;
}
snd_soc_dapm_sync_endpoints(codec);
snd_soc_dapm_sync(codec);
}

static int spitz_startup(struct snd_pcm_substream *substream)
Expand Down 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_set_endpoint(codec, "RINPUT1", 0);
snd_soc_dapm_set_endpoint(codec, "LINPUT2", 0);
snd_soc_dapm_set_endpoint(codec, "RINPUT2", 0);
snd_soc_dapm_set_endpoint(codec, "LINPUT3", 0);
snd_soc_dapm_set_endpoint(codec, "RINPUT3", 0);
snd_soc_dapm_set_endpoint(codec, "OUT3", 0);
snd_soc_dapm_set_endpoint(codec, "MONO", 0);
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, "MONO");

/* Add spitz specific controls */
for (i = 0; i < ARRAY_SIZE(wm8750_spitz_controls); i++) {
Expand All @@ -314,7 +314,7 @@ static int spitz_wm8750_init(struct snd_soc_codec *codec)
/* Set up spitz specific audio paths */
snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));

snd_soc_dapm_sync_endpoints(codec);
snd_soc_dapm_sync(codec);
return 0;
}

Expand Down
Loading

0 comments on commit a530218

Please sign in to comment.