PWN-Hunter/android_kernel_xiaomi_sdm845
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: cs4270: add Master Playback Switch

Browse Source 
This adds a new control named 'Master Playback Switch' for cs4270
codecs. It is implemented using the new SOC_DOUBLE_EXT macro to catch
the put function and store the information about manually set mute
controls from userspace. When a manual mute is set, we don't want the
soc core to un-mute the outputs.

Renamed cs4270_mute() to cs4270_dai_mute() to avoid confusion.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Daniel Mack 2009-04-24 16:37:45 +02:00 committed by Mark Brown
parent 9c93538651
commit 1a4ba05ec8
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sound/soc/codecs/cs4270.c
View File

@ -109,6 +109,7 @@ struct cs4270_private {
unsigned int mclk; /* Input frequency of the MCLK pin */ unsigned int mclk; /* Input frequency of the MCLK pin */
unsigned int mode; /* The mode (I2S or left-justified) */ unsigned int mode; /* The mode (I2S or left-justified) */
unsigned int slave_mode; unsigned int slave_mode;
unsigned int manual_mute;
}; };
/** /**
@ -453,7 +454,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
} }
/** /**
* cs4270_mute - enable/disable the CS4270 external mute * cs4270_dai_mute - enable/disable the CS4270 external mute
* @dai: the SOC DAI * @dai: the SOC DAI
* @mute: 0 = disable mute, 1 = enable mute * @mute: 0 = disable mute, 1 = enable mute
* *
@ -462,21 +463,52 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
* board does not have the MUTEA or MUTEB pins connected to such circuitry, * board does not have the MUTEA or MUTEB pins connected to such circuitry,
* then this function will do nothing. * then this function will do nothing.
*/ */
static int cs4270_mute(struct snd_soc_dai *dai, int mute) static int cs4270_dai_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
struct cs4270_private *cs4270 = codec->private_data;
int reg6; int reg6;
reg6 = snd_soc_read(codec, CS4270_MUTE); reg6 = snd_soc_read(codec, CS4270_MUTE);
if (mute) if (mute)
reg6 |= CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B; reg6 |= CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B;
else else {
reg6 &= ~(CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B); reg6 &= ~(CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B);
reg6 |= cs4270->manual_mute;
}
return snd_soc_write(codec, CS4270_MUTE, reg6); return snd_soc_write(codec, CS4270_MUTE, reg6);
} }
/**
* cs4270_soc_put_mute - put callback for the 'Master Playback switch'
* alsa control.
* @kcontrol: mixer control
* @ucontrol: control element information
*
* This function basically passes the arguments on to the generic
* snd_soc_put_volsw() function and saves the mute information in
* our private data structure. This is because we want to prevent
* cs4270_dai_mute() neglecting the user's decision to manually
* mute the codec's output.
*
* Returns 0 for success.
*/
static int cs4270_soc_put_mute(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct cs4270_private *cs4270 = codec->private_data;
int left = !ucontrol->value.integer.value[0];
int right = !ucontrol->value.integer.value[1];
cs4270->manual_mute = (left ? CS4270_MUTE_DAC_A : 0) |
(right ? CS4270_MUTE_DAC_B : 0);
return snd_soc_put_volsw(kcontrol, ucontrol);
}
/* A list of non-DAPM controls that the CS4270 supports */ /* A list of non-DAPM controls that the CS4270 supports */
static const struct snd_kcontrol_new cs4270_snd_controls[] = { static const struct snd_kcontrol_new cs4270_snd_controls[] = {
SOC_DOUBLE_R("Master Playback Volume", SOC_DOUBLE_R("Master Playback Volume",
@ -486,7 +518,9 @@ static const struct snd_kcontrol_new cs4270_snd_controls[] = {
SOC_SINGLE("Zero Cross Switch", CS4270_TRANS, 5, 1, 0), SOC_SINGLE("Zero Cross Switch", CS4270_TRANS, 5, 1, 0),
SOC_SINGLE("Popguard Switch", CS4270_MODE, 0, 1, 1), SOC_SINGLE("Popguard Switch", CS4270_MODE, 0, 1, 1),
SOC_SINGLE("Auto-Mute Switch", CS4270_MUTE, 5, 1, 0), SOC_SINGLE("Auto-Mute Switch", CS4270_MUTE, 5, 1, 0),
SOC_DOUBLE("Master Capture Switch", CS4270_MUTE, 3, 4, 1, 1) SOC_DOUBLE("Master Capture Switch", CS4270_MUTE, 3, 4, 1, 1),
SOC_DOUBLE_EXT("Master Playback Switch", CS4270_MUTE, 0, 1, 1, 1,
snd_soc_get_volsw, cs4270_soc_put_mute),
}; };
/* /*
@ -506,7 +540,7 @@ static struct snd_soc_dai_ops cs4270_dai_ops = {
.hw_params = cs4270_hw_params, .hw_params = cs4270_hw_params,
.set_sysclk = cs4270_set_dai_sysclk, .set_sysclk = cs4270_set_dai_sysclk,
.set_fmt = cs4270_set_dai_fmt, .set_fmt = cs4270_set_dai_fmt,
.digital_mute = cs4270_mute, .digital_mute = cs4270_dai_mute,
}; };
struct snd_soc_dai cs4270_dai = { struct snd_soc_dai cs4270_dai = {