Merge remote-tracking branches 'asoc/topic/cx20442', 'asoc/topic/cygnus', 'asoc/topic/da7210', 'asoc/topic/da7213' and 'asoc/topic/da7218' into asoc-next
This commit is contained in:
Mark Brown
commit
f499cf3542
|
|
@ -1281,7 +1281,7 @@ static int cygnus_ssp_probe(struct platform_device *pdev)
|
|||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct device_node *child_node;
|
||||
struct resource *res = pdev->resource;
|
||||
struct resource *res;
|
||||
struct cygnus_audio *cygaud;
|
||||
int err = -EINVAL;
|
||||
int node_count;
|
||||
|
|
|
|||
|
|
@ -89,10 +89,10 @@ static const struct snd_soc_dapm_route cx20442_audio_map[] = {
|
|||
{"ADC", NULL, "Input Mixer"},
|
||||
};
|
||||
|
||||
static unsigned int cx20442_read_reg_cache(struct snd_soc_codec *codec,
|
||||
static unsigned int cx20442_read_reg_cache(struct snd_soc_component *component,
|
||||
unsigned int reg)
|
||||
{
|
||||
struct cx20442_priv *cx20442 = snd_soc_codec_get_drvdata(codec);
|
||||
struct cx20442_priv *cx20442 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
if (reg >= 1)
|
||||
return -EINVAL;
|
||||
|
|
@ -153,10 +153,10 @@ static int cx20442_pm_to_v253_vsp(u8 value)
|
|||
return (value & (1 << CX20442_AGC)) ? -EINVAL : 0;
|
||||
}
|
||||
|
||||
static int cx20442_write(struct snd_soc_codec *codec, unsigned int reg,
|
||||
static int cx20442_write(struct snd_soc_component *component, unsigned int reg,
|
||||
unsigned int value)
|
||||
{
|
||||
struct cx20442_priv *cx20442 = snd_soc_codec_get_drvdata(codec);
|
||||
struct cx20442_priv *cx20442 = snd_soc_component_get_drvdata(component);
|
||||
int vls, vsp, old, len;
|
||||
char buf[18];
|
||||
|
||||
|
|
@ -193,7 +193,7 @@ static int cx20442_write(struct snd_soc_codec *codec, unsigned int reg,
|
|||
if (unlikely(len > (ARRAY_SIZE(buf) - 1)))
|
||||
return -ENOMEM;
|
||||
|
||||
dev_dbg(codec->dev, "%s: %s\n", __func__, buf);
|
||||
dev_dbg(component->dev, "%s: %s\n", __func__, buf);
|
||||
if (cx20442->tty->ops->write(cx20442->tty, buf, len) != len)
|
||||
return -EIO;
|
||||
|
||||
|
|
@ -240,19 +240,19 @@ err:
|
|||
/* Line discipline .close() */
|
||||
static void v253_close(struct tty_struct *tty)
|
||||
{
|
||||
struct snd_soc_codec *codec = tty->disc_data;
|
||||
struct snd_soc_component *component = tty->disc_data;
|
||||
struct cx20442_priv *cx20442;
|
||||
|
||||
tty->disc_data = NULL;
|
||||
|
||||
if (!codec)
|
||||
if (!component)
|
||||
return;
|
||||
|
||||
cx20442 = snd_soc_codec_get_drvdata(codec);
|
||||
cx20442 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
/* Prevent the codec driver from further accessing the modem */
|
||||
cx20442->tty = NULL;
|
||||
codec->component.card->pop_time = 0;
|
||||
component->card->pop_time = 0;
|
||||
}
|
||||
|
||||
/* Line discipline .hangup() */
|
||||
|
|
@ -266,20 +266,20 @@ static int v253_hangup(struct tty_struct *tty)
|
|||
static void v253_receive(struct tty_struct *tty,
|
||||
const unsigned char *cp, char *fp, int count)
|
||||
{
|
||||
struct snd_soc_codec *codec = tty->disc_data;
|
||||
struct snd_soc_component *component = tty->disc_data;
|
||||
struct cx20442_priv *cx20442;
|
||||
|
||||
if (!codec)
|
||||
if (!component)
|
||||
return;
|
||||
|
||||
cx20442 = snd_soc_codec_get_drvdata(codec);
|
||||
cx20442 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
if (!cx20442->tty) {
|
||||
/* First modem response, complete setup procedure */
|
||||
|
||||
/* Set up codec driver access to modem controls */
|
||||
cx20442->tty = tty;
|
||||
codec->component.card->pop_time = 1;
|
||||
component->card->pop_time = 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -323,15 +323,15 @@ static struct snd_soc_dai_driver cx20442_dai = {
|
|||
},
|
||||
};
|
||||
|
||||
static int cx20442_set_bias_level(struct snd_soc_codec *codec,
|
||||
static int cx20442_set_bias_level(struct snd_soc_component *component,
|
||||
enum snd_soc_bias_level level)
|
||||
{
|
||||
struct cx20442_priv *cx20442 = snd_soc_codec_get_drvdata(codec);
|
||||
struct cx20442_priv *cx20442 = snd_soc_component_get_drvdata(component);
|
||||
int err = 0;
|
||||
|
||||
switch (level) {
|
||||
case SND_SOC_BIAS_PREPARE:
|
||||
if (snd_soc_codec_get_bias_level(codec) != SND_SOC_BIAS_STANDBY)
|
||||
if (snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_STANDBY)
|
||||
break;
|
||||
if (IS_ERR(cx20442->por))
|
||||
err = PTR_ERR(cx20442->por);
|
||||
|
|
@ -339,7 +339,7 @@ static int cx20442_set_bias_level(struct snd_soc_codec *codec,
|
|||
err = regulator_enable(cx20442->por);
|
||||
break;
|
||||
case SND_SOC_BIAS_STANDBY:
|
||||
if (snd_soc_codec_get_bias_level(codec) != SND_SOC_BIAS_PREPARE)
|
||||
if (snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_PREPARE)
|
||||
break;
|
||||
if (IS_ERR(cx20442->por))
|
||||
err = PTR_ERR(cx20442->por);
|
||||
|
|
@ -353,7 +353,7 @@ static int cx20442_set_bias_level(struct snd_soc_codec *codec,
|
|||
return err;
|
||||
}
|
||||
|
||||
static int cx20442_codec_probe(struct snd_soc_codec *codec)
|
||||
static int cx20442_component_probe(struct snd_soc_component *component)
|
||||
{
|
||||
struct cx20442_priv *cx20442;
|
||||
|
||||
|
|
@ -361,21 +361,21 @@ static int cx20442_codec_probe(struct snd_soc_codec *codec)
|
|||
if (cx20442 == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
cx20442->por = regulator_get(codec->dev, "POR");
|
||||
cx20442->por = regulator_get(component->dev, "POR");
|
||||
if (IS_ERR(cx20442->por))
|
||||
dev_warn(codec->dev, "failed to get the regulator");
|
||||
dev_warn(component->dev, "failed to get the regulator");
|
||||
cx20442->tty = NULL;
|
||||
|
||||
snd_soc_codec_set_drvdata(codec, cx20442);
|
||||
codec->component.card->pop_time = 0;
|
||||
snd_soc_component_set_drvdata(component, cx20442);
|
||||
component->card->pop_time = 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* power down chip */
|
||||
static int cx20442_codec_remove(struct snd_soc_codec *codec)
|
||||
static void cx20442_component_remove(struct snd_soc_component *component)
|
||||
{
|
||||
struct cx20442_priv *cx20442 = snd_soc_codec_get_drvdata(codec);
|
||||
struct cx20442_priv *cx20442 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
if (cx20442->tty) {
|
||||
struct tty_struct *tty = cx20442->tty;
|
||||
|
|
@ -387,36 +387,30 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec)
|
|||
regulator_put(cx20442->por);
|
||||
}
|
||||
|
||||
snd_soc_codec_set_drvdata(codec, NULL);
|
||||
snd_soc_component_set_drvdata(component, NULL);
|
||||
kfree(cx20442);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct snd_soc_codec_driver cx20442_codec_dev = {
|
||||
.probe = cx20442_codec_probe,
|
||||
.remove = cx20442_codec_remove,
|
||||
.set_bias_level = cx20442_set_bias_level,
|
||||
.read = cx20442_read_reg_cache,
|
||||
.write = cx20442_write,
|
||||
|
||||
.component_driver = {
|
||||
.dapm_widgets = cx20442_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(cx20442_dapm_widgets),
|
||||
.dapm_routes = cx20442_audio_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(cx20442_audio_map),
|
||||
},
|
||||
static const struct snd_soc_component_driver cx20442_component_dev = {
|
||||
.probe = cx20442_component_probe,
|
||||
.remove = cx20442_component_remove,
|
||||
.set_bias_level = cx20442_set_bias_level,
|
||||
.read = cx20442_read_reg_cache,
|
||||
.write = cx20442_write,
|
||||
.dapm_widgets = cx20442_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(cx20442_dapm_widgets),
|
||||
.dapm_routes = cx20442_audio_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(cx20442_audio_map),
|
||||
.idle_bias_on = 1,
|
||||
.use_pmdown_time = 1,
|
||||
.endianness = 1,
|
||||
.non_legacy_dai_naming = 1,
|
||||
};
|
||||
|
||||
static int cx20442_platform_probe(struct platform_device *pdev)
|
||||
{
|
||||
return snd_soc_register_codec(&pdev->dev,
|
||||
&cx20442_codec_dev, &cx20442_dai, 1);
|
||||
}
|
||||
|
||||
static int cx20442_platform_remove(struct platform_device *pdev)
|
||||
{
|
||||
snd_soc_unregister_codec(&pdev->dev);
|
||||
return 0;
|
||||
return devm_snd_soc_register_component(&pdev->dev,
|
||||
&cx20442_component_dev, &cx20442_dai, 1);
|
||||
}
|
||||
|
||||
static struct platform_driver cx20442_platform_driver = {
|
||||
|
|
@ -424,7 +418,6 @@ static struct platform_driver cx20442_platform_driver = {
|
|||
.name = "cx20442-codec",
|
||||
},
|
||||
.probe = cx20442_platform_probe,
|
||||
.remove = cx20442_platform_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(cx20442_platform_driver);
|
||||
|
|
|
|||
|
|
@ -331,12 +331,12 @@ static SOC_ENUM_SINGLE_DECL(da7210_hp_mode_sel,
|
|||
static int da7210_put_alc_sw(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
|
||||
struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
|
||||
|
||||
if (ucontrol->value.integer.value[0]) {
|
||||
/* Check if noise suppression is enabled */
|
||||
if (snd_soc_read(codec, DA7210_CONTROL) & DA7210_NOISE_SUP_EN) {
|
||||
dev_dbg(codec->dev,
|
||||
if (snd_soc_component_read32(component, DA7210_CONTROL) & DA7210_NOISE_SUP_EN) {
|
||||
dev_dbg(component->dev,
|
||||
"Disable noise suppression to enable ALC\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -354,32 +354,32 @@ static int da7210_put_alc_sw(struct snd_kcontrol *kcontrol,
|
|||
static int da7210_put_noise_sup_sw(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
|
||||
struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
|
||||
u8 val;
|
||||
|
||||
if (ucontrol->value.integer.value[0]) {
|
||||
/* Check if ALC is enabled */
|
||||
if (snd_soc_read(codec, DA7210_ADC) & DA7210_ADC_ALC_EN)
|
||||
if (snd_soc_component_read32(component, DA7210_ADC) & DA7210_ADC_ALC_EN)
|
||||
goto err;
|
||||
|
||||
/* Check ZC for HP and AUX1 PGA */
|
||||
if ((snd_soc_read(codec, DA7210_ZERO_CROSS) &
|
||||
if ((snd_soc_component_read32(component, DA7210_ZERO_CROSS) &
|
||||
(DA7210_AUX1_L_ZC | DA7210_AUX1_R_ZC | DA7210_HP_L_ZC |
|
||||
DA7210_HP_R_ZC)) != (DA7210_AUX1_L_ZC |
|
||||
DA7210_AUX1_R_ZC | DA7210_HP_L_ZC | DA7210_HP_R_ZC))
|
||||
goto err;
|
||||
|
||||
/* Check INPGA_L_VOL and INPGA_R_VOL */
|
||||
val = snd_soc_read(codec, DA7210_IN_GAIN);
|
||||
val = snd_soc_component_read32(component, DA7210_IN_GAIN);
|
||||
if (((val & DA7210_INPGA_L_VOL) < DA7210_INPGA_MIN_VOL_NS) ||
|
||||
(((val & DA7210_INPGA_R_VOL) >> 4) <
|
||||
DA7210_INPGA_MIN_VOL_NS))
|
||||
goto err;
|
||||
|
||||
/* Check AUX1_L_VOL and AUX1_R_VOL */
|
||||
if (((snd_soc_read(codec, DA7210_AUX1_L) & DA7210_AUX1_L_VOL) <
|
||||
if (((snd_soc_component_read32(component, DA7210_AUX1_L) & DA7210_AUX1_L_VOL) <
|
||||
DA7210_AUX1_MIN_VOL_NS) ||
|
||||
((snd_soc_read(codec, DA7210_AUX1_R) & DA7210_AUX1_R_VOL) <
|
||||
((snd_soc_component_read32(component, DA7210_AUX1_R) & DA7210_AUX1_R_VOL) <
|
||||
DA7210_AUX1_MIN_VOL_NS))
|
||||
goto err;
|
||||
}
|
||||
|
|
@ -760,19 +760,19 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
|
|||
struct snd_pcm_hw_params *params,
|
||||
struct snd_soc_dai *dai)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = dai->component;
|
||||
struct da7210_priv *da7210 = snd_soc_component_get_drvdata(component);
|
||||
u32 dai_cfg1;
|
||||
u32 fs, sysclk;
|
||||
|
||||
/* set DAI source to Left and Right ADC */
|
||||
snd_soc_write(codec, DA7210_DAI_SRC_SEL,
|
||||
snd_soc_component_write(component, DA7210_DAI_SRC_SEL,
|
||||
DA7210_DAI_OUT_R_SRC | DA7210_DAI_OUT_L_SRC);
|
||||
|
||||
/* Enable DAI */
|
||||
snd_soc_write(codec, DA7210_DAI_CFG3, DA7210_DAI_OE | DA7210_DAI_EN);
|
||||
snd_soc_component_write(component, DA7210_DAI_CFG3, DA7210_DAI_OE | DA7210_DAI_EN);
|
||||
|
||||
dai_cfg1 = 0xFC & snd_soc_read(codec, DA7210_DAI_CFG1);
|
||||
dai_cfg1 = 0xFC & snd_soc_component_read32(component, DA7210_DAI_CFG1);
|
||||
|
||||
switch (params_width(params)) {
|
||||
case 16:
|
||||
|
|
@ -791,7 +791,7 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
snd_soc_write(codec, DA7210_DAI_CFG1, dai_cfg1);
|
||||
snd_soc_component_write(component, DA7210_DAI_CFG1, dai_cfg1);
|
||||
|
||||
switch (params_rate(params)) {
|
||||
case 8000:
|
||||
|
|
@ -839,17 +839,17 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
|
|||
}
|
||||
|
||||
/* Disable active mode */
|
||||
snd_soc_update_bits(codec, DA7210_STARTUP1, DA7210_SC_MST_EN, 0);
|
||||
snd_soc_component_update_bits(component, DA7210_STARTUP1, DA7210_SC_MST_EN, 0);
|
||||
|
||||
snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_FS_MASK, fs);
|
||||
snd_soc_component_update_bits(component, DA7210_PLL, DA7210_PLL_FS_MASK, fs);
|
||||
|
||||
if (da7210->mclk_rate && (da7210->mclk_rate != sysclk)) {
|
||||
/* PLL mode, disable PLL bypass */
|
||||
snd_soc_update_bits(codec, DA7210_PLL_DIV3, DA7210_PLL_BYP, 0);
|
||||
snd_soc_component_update_bits(component, DA7210_PLL_DIV3, DA7210_PLL_BYP, 0);
|
||||
|
||||
if (!da7210->master) {
|
||||
/* PLL slave mode, also enable SRM */
|
||||
snd_soc_update_bits(codec, DA7210_PLL,
|
||||
snd_soc_component_update_bits(component, DA7210_PLL,
|
||||
(DA7210_MCLK_SRM_EN |
|
||||
DA7210_MCLK_DET_EN),
|
||||
(DA7210_MCLK_SRM_EN |
|
||||
|
|
@ -857,13 +857,13 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
|
|||
}
|
||||
} else {
|
||||
/* PLL bypass mode, enable PLL bypass and Auto Detection */
|
||||
snd_soc_update_bits(codec, DA7210_PLL, DA7210_MCLK_DET_EN,
|
||||
snd_soc_component_update_bits(component, DA7210_PLL, DA7210_MCLK_DET_EN,
|
||||
DA7210_MCLK_DET_EN);
|
||||
snd_soc_update_bits(codec, DA7210_PLL_DIV3, DA7210_PLL_BYP,
|
||||
snd_soc_component_update_bits(component, DA7210_PLL_DIV3, DA7210_PLL_BYP,
|
||||
DA7210_PLL_BYP);
|
||||
}
|
||||
/* Enable active mode */
|
||||
snd_soc_update_bits(codec, DA7210_STARTUP1,
|
||||
snd_soc_component_update_bits(component, DA7210_STARTUP1,
|
||||
DA7210_SC_MST_EN, DA7210_SC_MST_EN);
|
||||
|
||||
return 0;
|
||||
|
|
@ -874,16 +874,16 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
|
|||
*/
|
||||
static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
struct da7210_priv *da7210 = snd_soc_component_get_drvdata(component);
|
||||
u32 dai_cfg1;
|
||||
u32 dai_cfg3;
|
||||
|
||||
dai_cfg1 = 0x7f & snd_soc_read(codec, DA7210_DAI_CFG1);
|
||||
dai_cfg3 = 0xfc & snd_soc_read(codec, DA7210_DAI_CFG3);
|
||||
dai_cfg1 = 0x7f & snd_soc_component_read32(component, DA7210_DAI_CFG1);
|
||||
dai_cfg3 = 0xfc & snd_soc_component_read32(component, DA7210_DAI_CFG3);
|
||||
|
||||
if ((snd_soc_read(codec, DA7210_PLL) & DA7210_PLL_EN) &&
|
||||
(!(snd_soc_read(codec, DA7210_PLL_DIV3) & DA7210_PLL_BYP)))
|
||||
if ((snd_soc_component_read32(component, DA7210_PLL) & DA7210_PLL_EN) &&
|
||||
(!(snd_soc_component_read32(component, DA7210_PLL_DIV3) & DA7210_PLL_BYP)))
|
||||
return -EINVAL;
|
||||
|
||||
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||
|
|
@ -923,21 +923,21 @@ static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt)
|
|||
*/
|
||||
dai_cfg1 |= DA7210_DAI_FLEN_64BIT;
|
||||
|
||||
snd_soc_write(codec, DA7210_DAI_CFG1, dai_cfg1);
|
||||
snd_soc_write(codec, DA7210_DAI_CFG3, dai_cfg3);
|
||||
snd_soc_component_write(component, DA7210_DAI_CFG1, dai_cfg1);
|
||||
snd_soc_component_write(component, DA7210_DAI_CFG3, dai_cfg3);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int da7210_mute(struct snd_soc_dai *dai, int mute)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
u8 mute_reg = snd_soc_read(codec, DA7210_DAC_HPF) & 0xFB;
|
||||
struct snd_soc_component *component = dai->component;
|
||||
u8 mute_reg = snd_soc_component_read32(component, DA7210_DAC_HPF) & 0xFB;
|
||||
|
||||
if (mute)
|
||||
snd_soc_write(codec, DA7210_DAC_HPF, mute_reg | 0x4);
|
||||
snd_soc_component_write(component, DA7210_DAC_HPF, mute_reg | 0x4);
|
||||
else
|
||||
snd_soc_write(codec, DA7210_DAC_HPF, mute_reg);
|
||||
snd_soc_component_write(component, DA7210_DAC_HPF, mute_reg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -947,8 +947,8 @@ static int da7210_mute(struct snd_soc_dai *dai, int mute)
|
|||
static int da7210_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
||||
int clk_id, unsigned int freq, int dir)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
struct da7210_priv *da7210 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
switch (clk_id) {
|
||||
case DA7210_CLKSRC_MCLK:
|
||||
|
|
@ -988,8 +988,8 @@ static int da7210_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
|||
static int da7210_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
|
||||
int source, unsigned int fref, unsigned int fout)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
struct da7210_priv *da7210 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
u8 pll_div1, pll_div2, pll_div3, cnt;
|
||||
|
||||
|
|
@ -1014,18 +1014,18 @@ static int da7210_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
|
|||
goto err;
|
||||
|
||||
/* Disable active mode */
|
||||
snd_soc_update_bits(codec, DA7210_STARTUP1, DA7210_SC_MST_EN, 0);
|
||||
snd_soc_component_update_bits(component, DA7210_STARTUP1, DA7210_SC_MST_EN, 0);
|
||||
/* Write PLL dividers */
|
||||
snd_soc_write(codec, DA7210_PLL_DIV1, pll_div1);
|
||||
snd_soc_write(codec, DA7210_PLL_DIV2, pll_div2);
|
||||
snd_soc_update_bits(codec, DA7210_PLL_DIV3,
|
||||
snd_soc_component_write(component, DA7210_PLL_DIV1, pll_div1);
|
||||
snd_soc_component_write(component, DA7210_PLL_DIV2, pll_div2);
|
||||
snd_soc_component_update_bits(component, DA7210_PLL_DIV3,
|
||||
DA7210_PLL_DIV_L_MASK, pll_div3);
|
||||
|
||||
/* Enable PLL */
|
||||
snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_EN, DA7210_PLL_EN);
|
||||
snd_soc_component_update_bits(component, DA7210_PLL, DA7210_PLL_EN, DA7210_PLL_EN);
|
||||
|
||||
/* Enable active mode */
|
||||
snd_soc_update_bits(codec, DA7210_STARTUP1, DA7210_SC_MST_EN,
|
||||
snd_soc_component_update_bits(component, DA7210_STARTUP1, DA7210_SC_MST_EN,
|
||||
DA7210_SC_MST_EN);
|
||||
return 0;
|
||||
err:
|
||||
|
|
@ -1064,53 +1064,53 @@ static struct snd_soc_dai_driver da7210_dai = {
|
|||
.symmetric_rates = 1,
|
||||
};
|
||||
|
||||
static int da7210_probe(struct snd_soc_codec *codec)
|
||||
static int da7210_probe(struct snd_soc_component *component)
|
||||
{
|
||||
struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec);
|
||||
struct da7210_priv *da7210 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION);
|
||||
dev_info(component->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION);
|
||||
|
||||
da7210->mclk_rate = 0; /* This will be set from set_sysclk() */
|
||||
da7210->master = 0; /* This will be set from set_fmt() */
|
||||
|
||||
/* Enable internal regulator & bias current */
|
||||
snd_soc_write(codec, DA7210_CONTROL, DA7210_REG_EN | DA7210_BIAS_EN);
|
||||
snd_soc_component_write(component, DA7210_CONTROL, DA7210_REG_EN | DA7210_BIAS_EN);
|
||||
|
||||
/*
|
||||
* ADC settings
|
||||
*/
|
||||
|
||||
/* Enable Left & Right MIC PGA and Mic Bias */
|
||||
snd_soc_write(codec, DA7210_MIC_L, DA7210_MIC_L_EN | DA7210_MICBIAS_EN);
|
||||
snd_soc_write(codec, DA7210_MIC_R, DA7210_MIC_R_EN);
|
||||
snd_soc_component_write(component, DA7210_MIC_L, DA7210_MIC_L_EN | DA7210_MICBIAS_EN);
|
||||
snd_soc_component_write(component, DA7210_MIC_R, DA7210_MIC_R_EN);
|
||||
|
||||
/* Enable Left and Right input PGA */
|
||||
snd_soc_write(codec, DA7210_INMIX_L, DA7210_IN_L_EN);
|
||||
snd_soc_write(codec, DA7210_INMIX_R, DA7210_IN_R_EN);
|
||||
snd_soc_component_write(component, DA7210_INMIX_L, DA7210_IN_L_EN);
|
||||
snd_soc_component_write(component, DA7210_INMIX_R, DA7210_IN_R_EN);
|
||||
|
||||
/* Enable Left and Right ADC */
|
||||
snd_soc_write(codec, DA7210_ADC, DA7210_ADC_L_EN | DA7210_ADC_R_EN);
|
||||
snd_soc_component_write(component, DA7210_ADC, DA7210_ADC_L_EN | DA7210_ADC_R_EN);
|
||||
|
||||
/*
|
||||
* DAC settings
|
||||
*/
|
||||
|
||||
/* Enable Left and Right DAC */
|
||||
snd_soc_write(codec, DA7210_DAC_SEL,
|
||||
snd_soc_component_write(component, DA7210_DAC_SEL,
|
||||
DA7210_DAC_L_SRC_DAI_L | DA7210_DAC_L_EN |
|
||||
DA7210_DAC_R_SRC_DAI_R | DA7210_DAC_R_EN);
|
||||
|
||||
/* Enable Left and Right out PGA */
|
||||
snd_soc_write(codec, DA7210_OUTMIX_L, DA7210_OUT_L_EN);
|
||||
snd_soc_write(codec, DA7210_OUTMIX_R, DA7210_OUT_R_EN);
|
||||
snd_soc_component_write(component, DA7210_OUTMIX_L, DA7210_OUT_L_EN);
|
||||
snd_soc_component_write(component, DA7210_OUTMIX_R, DA7210_OUT_R_EN);
|
||||
|
||||
/* Enable Left and Right HeadPhone PGA */
|
||||
snd_soc_write(codec, DA7210_HP_CFG,
|
||||
snd_soc_component_write(component, DA7210_HP_CFG,
|
||||
DA7210_HP_2CAP_MODE | DA7210_HP_SENSE_EN |
|
||||
DA7210_HP_L_EN | DA7210_HP_MODE | DA7210_HP_R_EN);
|
||||
|
||||
/* Enable ramp mode for DAC gain update */
|
||||
snd_soc_write(codec, DA7210_SOFTMUTE, DA7210_RAMP_EN);
|
||||
snd_soc_component_write(component, DA7210_SOFTMUTE, DA7210_RAMP_EN);
|
||||
|
||||
/*
|
||||
* For DA7210 codec, there are two ways to enable/disable analog IOs
|
||||
|
|
@ -1138,43 +1138,44 @@ static int da7210_probe(struct snd_soc_codec *codec)
|
|||
*/
|
||||
|
||||
/* Enable Line out amplifiers */
|
||||
snd_soc_write(codec, DA7210_OUT1_L, DA7210_OUT1_L_EN);
|
||||
snd_soc_write(codec, DA7210_OUT1_R, DA7210_OUT1_R_EN);
|
||||
snd_soc_write(codec, DA7210_OUT2, DA7210_OUT2_EN |
|
||||
snd_soc_component_write(component, DA7210_OUT1_L, DA7210_OUT1_L_EN);
|
||||
snd_soc_component_write(component, DA7210_OUT1_R, DA7210_OUT1_R_EN);
|
||||
snd_soc_component_write(component, DA7210_OUT2, DA7210_OUT2_EN |
|
||||
DA7210_OUT2_OUTMIX_L | DA7210_OUT2_OUTMIX_R);
|
||||
|
||||
/* Enable Aux1 */
|
||||
snd_soc_write(codec, DA7210_AUX1_L, DA7210_AUX1_L_EN);
|
||||
snd_soc_write(codec, DA7210_AUX1_R, DA7210_AUX1_R_EN);
|
||||
snd_soc_component_write(component, DA7210_AUX1_L, DA7210_AUX1_L_EN);
|
||||
snd_soc_component_write(component, DA7210_AUX1_R, DA7210_AUX1_R_EN);
|
||||
/* Enable Aux2 */
|
||||
snd_soc_write(codec, DA7210_AUX2, DA7210_AUX2_EN);
|
||||
snd_soc_component_write(component, DA7210_AUX2, DA7210_AUX2_EN);
|
||||
|
||||
/* Set PLL Master clock range 10-20 MHz, enable PLL bypass */
|
||||
snd_soc_write(codec, DA7210_PLL_DIV3, DA7210_MCLK_RANGE_10_20_MHZ |
|
||||
snd_soc_component_write(component, DA7210_PLL_DIV3, DA7210_MCLK_RANGE_10_20_MHZ |
|
||||
DA7210_PLL_BYP);
|
||||
|
||||
/* Diable PLL and bypass it */
|
||||
snd_soc_write(codec, DA7210_PLL, DA7210_PLL_FS_48000);
|
||||
snd_soc_component_write(component, DA7210_PLL, DA7210_PLL_FS_48000);
|
||||
|
||||
/* Activate all enabled subsystem */
|
||||
snd_soc_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN);
|
||||
snd_soc_component_write(component, DA7210_STARTUP1, DA7210_SC_MST_EN);
|
||||
|
||||
dev_info(codec->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION);
|
||||
dev_info(component->dev, "DA7210 Audio Codec %s\n", DA7210_VERSION);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct snd_soc_codec_driver soc_codec_dev_da7210 = {
|
||||
static const struct snd_soc_component_driver soc_component_dev_da7210 = {
|
||||
.probe = da7210_probe,
|
||||
|
||||
.component_driver = {
|
||||
.controls = da7210_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(da7210_snd_controls),
|
||||
.dapm_widgets = da7210_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(da7210_dapm_widgets),
|
||||
.dapm_routes = da7210_audio_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(da7210_audio_map),
|
||||
},
|
||||
.controls = da7210_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(da7210_snd_controls),
|
||||
.dapm_widgets = da7210_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(da7210_dapm_widgets),
|
||||
.dapm_routes = da7210_audio_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(da7210_audio_map),
|
||||
.idle_bias_on = 1,
|
||||
.use_pmdown_time = 1,
|
||||
.endianness = 1,
|
||||
.non_legacy_dai_naming = 1,
|
||||
};
|
||||
|
||||
#if IS_ENABLED(CONFIG_I2C)
|
||||
|
|
@ -1232,20 +1233,14 @@ static int da7210_i2c_probe(struct i2c_client *i2c,
|
|||
if (ret != 0)
|
||||
dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
|
||||
|
||||
ret = snd_soc_register_codec(&i2c->dev,
|
||||
&soc_codec_dev_da7210, &da7210_dai, 1);
|
||||
ret = devm_snd_soc_register_component(&i2c->dev,
|
||||
&soc_component_dev_da7210, &da7210_dai, 1);
|
||||
if (ret < 0)
|
||||
dev_err(&i2c->dev, "Failed to register codec: %d\n", ret);
|
||||
dev_err(&i2c->dev, "Failed to register component: %d\n", ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int da7210_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
snd_soc_unregister_codec(&client->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id da7210_i2c_id[] = {
|
||||
{ "da7210", 0 },
|
||||
{ }
|
||||
|
|
@ -1258,7 +1253,6 @@ static struct i2c_driver da7210_i2c_driver = {
|
|||
.name = "da7210",
|
||||
},
|
||||
.probe = da7210_i2c_probe,
|
||||
.remove = da7210_i2c_remove,
|
||||
.id_table = da7210_i2c_id,
|
||||
};
|
||||
#endif
|
||||
|
|
@ -1325,24 +1319,17 @@ static int da7210_spi_probe(struct spi_device *spi)
|
|||
if (ret != 0)
|
||||
dev_warn(&spi->dev, "Failed to apply regmap patch: %d\n", ret);
|
||||
|
||||
ret = snd_soc_register_codec(&spi->dev,
|
||||
&soc_codec_dev_da7210, &da7210_dai, 1);
|
||||
ret = devm_snd_soc_register_component(&spi->dev,
|
||||
&soc_component_dev_da7210, &da7210_dai, 1);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int da7210_spi_remove(struct spi_device *spi)
|
||||
{
|
||||
snd_soc_unregister_codec(&spi->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct spi_driver da7210_spi_driver = {
|
||||
.driver = {
|
||||
.name = "da7210",
|
||||
},
|
||||
.probe = da7210_spi_probe,
|
||||
.remove = da7210_spi_remove
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ static SOC_ENUM_SINGLE_DECL(da7213_alc_integ_release_rate,
|
|||
* Control Functions
|
||||
*/
|
||||
|
||||
static int da7213_get_alc_data(struct snd_soc_codec *codec, u8 reg_val)
|
||||
static int da7213_get_alc_data(struct snd_soc_component *component, u8 reg_val)
|
||||
{
|
||||
int mid_data, top_data;
|
||||
int sum = 0;
|
||||
|
|
@ -203,17 +203,17 @@ static int da7213_get_alc_data(struct snd_soc_codec *codec, u8 reg_val)
|
|||
for (iteration = 0; iteration < DA7213_ALC_AVG_ITERATIONS;
|
||||
iteration++) {
|
||||
/* Select the left or right channel and capture data */
|
||||
snd_soc_write(codec, DA7213_ALC_CIC_OP_LVL_CTRL, reg_val);
|
||||
snd_soc_component_write(component, DA7213_ALC_CIC_OP_LVL_CTRL, reg_val);
|
||||
|
||||
/* Select middle 8 bits for read back from data register */
|
||||
snd_soc_write(codec, DA7213_ALC_CIC_OP_LVL_CTRL,
|
||||
snd_soc_component_write(component, DA7213_ALC_CIC_OP_LVL_CTRL,
|
||||
reg_val | DA7213_ALC_DATA_MIDDLE);
|
||||
mid_data = snd_soc_read(codec, DA7213_ALC_CIC_OP_LVL_DATA);
|
||||
mid_data = snd_soc_component_read32(component, DA7213_ALC_CIC_OP_LVL_DATA);
|
||||
|
||||
/* Select top 8 bits for read back from data register */
|
||||
snd_soc_write(codec, DA7213_ALC_CIC_OP_LVL_CTRL,
|
||||
snd_soc_component_write(component, DA7213_ALC_CIC_OP_LVL_CTRL,
|
||||
reg_val | DA7213_ALC_DATA_TOP);
|
||||
top_data = snd_soc_read(codec, DA7213_ALC_CIC_OP_LVL_DATA);
|
||||
top_data = snd_soc_component_read32(component, DA7213_ALC_CIC_OP_LVL_DATA);
|
||||
|
||||
sum += ((mid_data << 8) | (top_data << 16));
|
||||
}
|
||||
|
|
@ -221,17 +221,17 @@ static int da7213_get_alc_data(struct snd_soc_codec *codec, u8 reg_val)
|
|||
return sum / DA7213_ALC_AVG_ITERATIONS;
|
||||
}
|
||||
|
||||
static void da7213_alc_calib_man(struct snd_soc_codec *codec)
|
||||
static void da7213_alc_calib_man(struct snd_soc_component *component)
|
||||
{
|
||||
u8 reg_val;
|
||||
int avg_left_data, avg_right_data, offset_l, offset_r;
|
||||
|
||||
/* Calculate average for Left and Right data */
|
||||
/* Left Data */
|
||||
avg_left_data = da7213_get_alc_data(codec,
|
||||
avg_left_data = da7213_get_alc_data(component,
|
||||
DA7213_ALC_CIC_OP_CHANNEL_LEFT);
|
||||
/* Right Data */
|
||||
avg_right_data = da7213_get_alc_data(codec,
|
||||
avg_right_data = da7213_get_alc_data(component,
|
||||
DA7213_ALC_CIC_OP_CHANNEL_RIGHT);
|
||||
|
||||
/* Calculate DC offset */
|
||||
|
|
@ -239,122 +239,122 @@ static void da7213_alc_calib_man(struct snd_soc_codec *codec)
|
|||
offset_r = -avg_right_data;
|
||||
|
||||
reg_val = (offset_l & DA7213_ALC_OFFSET_15_8) >> 8;
|
||||
snd_soc_write(codec, DA7213_ALC_OFFSET_MAN_M_L, reg_val);
|
||||
snd_soc_component_write(component, DA7213_ALC_OFFSET_MAN_M_L, reg_val);
|
||||
reg_val = (offset_l & DA7213_ALC_OFFSET_19_16) >> 16;
|
||||
snd_soc_write(codec, DA7213_ALC_OFFSET_MAN_U_L, reg_val);
|
||||
snd_soc_component_write(component, DA7213_ALC_OFFSET_MAN_U_L, reg_val);
|
||||
|
||||
reg_val = (offset_r & DA7213_ALC_OFFSET_15_8) >> 8;
|
||||
snd_soc_write(codec, DA7213_ALC_OFFSET_MAN_M_R, reg_val);
|
||||
snd_soc_component_write(component, DA7213_ALC_OFFSET_MAN_M_R, reg_val);
|
||||
reg_val = (offset_r & DA7213_ALC_OFFSET_19_16) >> 16;
|
||||
snd_soc_write(codec, DA7213_ALC_OFFSET_MAN_U_R, reg_val);
|
||||
snd_soc_component_write(component, DA7213_ALC_OFFSET_MAN_U_R, reg_val);
|
||||
|
||||
/* Enable analog/digital gain mode & offset cancellation */
|
||||
snd_soc_update_bits(codec, DA7213_ALC_CTRL1,
|
||||
snd_soc_component_update_bits(component, DA7213_ALC_CTRL1,
|
||||
DA7213_ALC_OFFSET_EN | DA7213_ALC_SYNC_MODE,
|
||||
DA7213_ALC_OFFSET_EN | DA7213_ALC_SYNC_MODE);
|
||||
}
|
||||
|
||||
static void da7213_alc_calib_auto(struct snd_soc_codec *codec)
|
||||
static void da7213_alc_calib_auto(struct snd_soc_component *component)
|
||||
{
|
||||
u8 alc_ctrl1;
|
||||
|
||||
/* Begin auto calibration and wait for completion */
|
||||
snd_soc_update_bits(codec, DA7213_ALC_CTRL1, DA7213_ALC_AUTO_CALIB_EN,
|
||||
snd_soc_component_update_bits(component, DA7213_ALC_CTRL1, DA7213_ALC_AUTO_CALIB_EN,
|
||||
DA7213_ALC_AUTO_CALIB_EN);
|
||||
do {
|
||||
alc_ctrl1 = snd_soc_read(codec, DA7213_ALC_CTRL1);
|
||||
alc_ctrl1 = snd_soc_component_read32(component, DA7213_ALC_CTRL1);
|
||||
} while (alc_ctrl1 & DA7213_ALC_AUTO_CALIB_EN);
|
||||
|
||||
/* If auto calibration fails, fall back to digital gain only mode */
|
||||
if (alc_ctrl1 & DA7213_ALC_CALIB_OVERFLOW) {
|
||||
dev_warn(codec->dev,
|
||||
dev_warn(component->dev,
|
||||
"ALC auto calibration failed with overflow\n");
|
||||
snd_soc_update_bits(codec, DA7213_ALC_CTRL1,
|
||||
snd_soc_component_update_bits(component, DA7213_ALC_CTRL1,
|
||||
DA7213_ALC_OFFSET_EN | DA7213_ALC_SYNC_MODE,
|
||||
0);
|
||||
} else {
|
||||
/* Enable analog/digital gain mode & offset cancellation */
|
||||
snd_soc_update_bits(codec, DA7213_ALC_CTRL1,
|
||||
snd_soc_component_update_bits(component, DA7213_ALC_CTRL1,
|
||||
DA7213_ALC_OFFSET_EN | DA7213_ALC_SYNC_MODE,
|
||||
DA7213_ALC_OFFSET_EN | DA7213_ALC_SYNC_MODE);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static void da7213_alc_calib(struct snd_soc_codec *codec)
|
||||
static void da7213_alc_calib(struct snd_soc_component *component)
|
||||
{
|
||||
struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
|
||||
struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
|
||||
u8 adc_l_ctrl, adc_r_ctrl;
|
||||
u8 mixin_l_sel, mixin_r_sel;
|
||||
u8 mic_1_ctrl, mic_2_ctrl;
|
||||
|
||||
/* Save current values from ADC control registers */
|
||||
adc_l_ctrl = snd_soc_read(codec, DA7213_ADC_L_CTRL);
|
||||
adc_r_ctrl = snd_soc_read(codec, DA7213_ADC_R_CTRL);
|
||||
adc_l_ctrl = snd_soc_component_read32(component, DA7213_ADC_L_CTRL);
|
||||
adc_r_ctrl = snd_soc_component_read32(component, DA7213_ADC_R_CTRL);
|
||||
|
||||
/* Save current values from MIXIN_L/R_SELECT registers */
|
||||
mixin_l_sel = snd_soc_read(codec, DA7213_MIXIN_L_SELECT);
|
||||
mixin_r_sel = snd_soc_read(codec, DA7213_MIXIN_R_SELECT);
|
||||
mixin_l_sel = snd_soc_component_read32(component, DA7213_MIXIN_L_SELECT);
|
||||
mixin_r_sel = snd_soc_component_read32(component, DA7213_MIXIN_R_SELECT);
|
||||
|
||||
/* Save current values from MIC control registers */
|
||||
mic_1_ctrl = snd_soc_read(codec, DA7213_MIC_1_CTRL);
|
||||
mic_2_ctrl = snd_soc_read(codec, DA7213_MIC_2_CTRL);
|
||||
mic_1_ctrl = snd_soc_component_read32(component, DA7213_MIC_1_CTRL);
|
||||
mic_2_ctrl = snd_soc_component_read32(component, DA7213_MIC_2_CTRL);
|
||||
|
||||
/* Enable ADC Left and Right */
|
||||
snd_soc_update_bits(codec, DA7213_ADC_L_CTRL, DA7213_ADC_EN,
|
||||
snd_soc_component_update_bits(component, DA7213_ADC_L_CTRL, DA7213_ADC_EN,
|
||||
DA7213_ADC_EN);
|
||||
snd_soc_update_bits(codec, DA7213_ADC_R_CTRL, DA7213_ADC_EN,
|
||||
snd_soc_component_update_bits(component, DA7213_ADC_R_CTRL, DA7213_ADC_EN,
|
||||
DA7213_ADC_EN);
|
||||
|
||||
/* Enable MIC paths */
|
||||
snd_soc_update_bits(codec, DA7213_MIXIN_L_SELECT,
|
||||
snd_soc_component_update_bits(component, DA7213_MIXIN_L_SELECT,
|
||||
DA7213_MIXIN_L_MIX_SELECT_MIC_1 |
|
||||
DA7213_MIXIN_L_MIX_SELECT_MIC_2,
|
||||
DA7213_MIXIN_L_MIX_SELECT_MIC_1 |
|
||||
DA7213_MIXIN_L_MIX_SELECT_MIC_2);
|
||||
snd_soc_update_bits(codec, DA7213_MIXIN_R_SELECT,
|
||||
snd_soc_component_update_bits(component, DA7213_MIXIN_R_SELECT,
|
||||
DA7213_MIXIN_R_MIX_SELECT_MIC_2 |
|
||||
DA7213_MIXIN_R_MIX_SELECT_MIC_1,
|
||||
DA7213_MIXIN_R_MIX_SELECT_MIC_2 |
|
||||
DA7213_MIXIN_R_MIX_SELECT_MIC_1);
|
||||
|
||||
/* Mute MIC PGAs */
|
||||
snd_soc_update_bits(codec, DA7213_MIC_1_CTRL, DA7213_MUTE_EN,
|
||||
snd_soc_component_update_bits(component, DA7213_MIC_1_CTRL, DA7213_MUTE_EN,
|
||||
DA7213_MUTE_EN);
|
||||
snd_soc_update_bits(codec, DA7213_MIC_2_CTRL, DA7213_MUTE_EN,
|
||||
snd_soc_component_update_bits(component, DA7213_MIC_2_CTRL, DA7213_MUTE_EN,
|
||||
DA7213_MUTE_EN);
|
||||
|
||||
/* Perform calibration */
|
||||
if (da7213->alc_calib_auto)
|
||||
da7213_alc_calib_auto(codec);
|
||||
da7213_alc_calib_auto(component);
|
||||
else
|
||||
da7213_alc_calib_man(codec);
|
||||
da7213_alc_calib_man(component);
|
||||
|
||||
/* Restore MIXIN_L/R_SELECT registers to their original states */
|
||||
snd_soc_write(codec, DA7213_MIXIN_L_SELECT, mixin_l_sel);
|
||||
snd_soc_write(codec, DA7213_MIXIN_R_SELECT, mixin_r_sel);
|
||||
snd_soc_component_write(component, DA7213_MIXIN_L_SELECT, mixin_l_sel);
|
||||
snd_soc_component_write(component, DA7213_MIXIN_R_SELECT, mixin_r_sel);
|
||||
|
||||
/* Restore ADC control registers to their original states */
|
||||
snd_soc_write(codec, DA7213_ADC_L_CTRL, adc_l_ctrl);
|
||||
snd_soc_write(codec, DA7213_ADC_R_CTRL, adc_r_ctrl);
|
||||
snd_soc_component_write(component, DA7213_ADC_L_CTRL, adc_l_ctrl);
|
||||
snd_soc_component_write(component, DA7213_ADC_R_CTRL, adc_r_ctrl);
|
||||
|
||||
/* Restore original values of MIC control registers */
|
||||
snd_soc_write(codec, DA7213_MIC_1_CTRL, mic_1_ctrl);
|
||||
snd_soc_write(codec, DA7213_MIC_2_CTRL, mic_2_ctrl);
|
||||
snd_soc_component_write(component, DA7213_MIC_1_CTRL, mic_1_ctrl);
|
||||
snd_soc_component_write(component, DA7213_MIC_2_CTRL, mic_2_ctrl);
|
||||
}
|
||||
|
||||
static int da7213_put_mixin_gain(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
|
||||
struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
|
||||
struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
|
||||
int ret;
|
||||
|
||||
ret = snd_soc_put_volsw_2r(kcontrol, ucontrol);
|
||||
|
||||
/* If ALC in operation, make sure calibrated offsets are updated */
|
||||
if ((!ret) && (da7213->alc_en))
|
||||
da7213_alc_calib(codec);
|
||||
da7213_alc_calib(component);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -362,14 +362,14 @@ static int da7213_put_mixin_gain(struct snd_kcontrol *kcontrol,
|
|||
static int da7213_put_alc_sw(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
|
||||
struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
|
||||
struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
/* Force ALC offset calibration if enabling ALC */
|
||||
if (ucontrol->value.integer.value[0] ||
|
||||
ucontrol->value.integer.value[1]) {
|
||||
if (!da7213->alc_en) {
|
||||
da7213_alc_calib(codec);
|
||||
da7213_alc_calib(component);
|
||||
da7213->alc_en = true;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -735,8 +735,8 @@ static const struct snd_kcontrol_new da7213_dapm_mixoutr_controls[] = {
|
|||
static int da7213_dai_event(struct snd_soc_dapm_widget *w,
|
||||
struct snd_kcontrol *kcontrol, int event)
|
||||
{
|
||||
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
|
||||
struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
|
||||
struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
|
||||
u8 pll_ctrl, pll_status;
|
||||
int i = 0;
|
||||
bool srm_lock = false;
|
||||
|
|
@ -745,29 +745,29 @@ static int da7213_dai_event(struct snd_soc_dapm_widget *w,
|
|||
case SND_SOC_DAPM_PRE_PMU:
|
||||
/* Enable DAI clks for master mode */
|
||||
if (da7213->master)
|
||||
snd_soc_update_bits(codec, DA7213_DAI_CLK_MODE,
|
||||
snd_soc_component_update_bits(component, DA7213_DAI_CLK_MODE,
|
||||
DA7213_DAI_CLK_EN_MASK,
|
||||
DA7213_DAI_CLK_EN_MASK);
|
||||
|
||||
/* PC synchronised to DAI */
|
||||
snd_soc_update_bits(codec, DA7213_PC_COUNT,
|
||||
snd_soc_component_update_bits(component, DA7213_PC_COUNT,
|
||||
DA7213_PC_FREERUN_MASK, 0);
|
||||
|
||||
/* If SRM not enabled then nothing more to do */
|
||||
pll_ctrl = snd_soc_read(codec, DA7213_PLL_CTRL);
|
||||
pll_ctrl = snd_soc_component_read32(component, DA7213_PLL_CTRL);
|
||||
if (!(pll_ctrl & DA7213_PLL_SRM_EN))
|
||||
return 0;
|
||||
|
||||
/* Assist 32KHz mode PLL lock */
|
||||
if (pll_ctrl & DA7213_PLL_32K_MODE) {
|
||||
snd_soc_write(codec, 0xF0, 0x8B);
|
||||
snd_soc_write(codec, 0xF2, 0x03);
|
||||
snd_soc_write(codec, 0xF0, 0x00);
|
||||
snd_soc_component_write(component, 0xF0, 0x8B);
|
||||
snd_soc_component_write(component, 0xF2, 0x03);
|
||||
snd_soc_component_write(component, 0xF0, 0x00);
|
||||
}
|
||||
|
||||
/* Check SRM has locked */
|
||||
do {
|
||||
pll_status = snd_soc_read(codec, DA7213_PLL_STATUS);
|
||||
pll_status = snd_soc_component_read32(component, DA7213_PLL_STATUS);
|
||||
if (pll_status & DA7219_PLL_SRM_LOCK) {
|
||||
srm_lock = true;
|
||||
} else {
|
||||
|
|
@ -777,26 +777,26 @@ static int da7213_dai_event(struct snd_soc_dapm_widget *w,
|
|||
} while ((i < DA7213_SRM_CHECK_RETRIES) && (!srm_lock));
|
||||
|
||||
if (!srm_lock)
|
||||
dev_warn(codec->dev, "SRM failed to lock\n");
|
||||
dev_warn(component->dev, "SRM failed to lock\n");
|
||||
|
||||
return 0;
|
||||
case SND_SOC_DAPM_POST_PMD:
|
||||
/* Revert 32KHz PLL lock udpates if applied previously */
|
||||
pll_ctrl = snd_soc_read(codec, DA7213_PLL_CTRL);
|
||||
pll_ctrl = snd_soc_component_read32(component, DA7213_PLL_CTRL);
|
||||
if (pll_ctrl & DA7213_PLL_32K_MODE) {
|
||||
snd_soc_write(codec, 0xF0, 0x8B);
|
||||
snd_soc_write(codec, 0xF2, 0x01);
|
||||
snd_soc_write(codec, 0xF0, 0x00);
|
||||
snd_soc_component_write(component, 0xF0, 0x8B);
|
||||
snd_soc_component_write(component, 0xF2, 0x01);
|
||||
snd_soc_component_write(component, 0xF0, 0x00);
|
||||
}
|
||||
|
||||
/* PC free-running */
|
||||
snd_soc_update_bits(codec, DA7213_PC_COUNT,
|
||||
snd_soc_component_update_bits(component, DA7213_PC_COUNT,
|
||||
DA7213_PC_FREERUN_MASK,
|
||||
DA7213_PC_FREERUN_MASK);
|
||||
|
||||
/* Disable DAI clks if in master mode */
|
||||
if (da7213->master)
|
||||
snd_soc_update_bits(codec, DA7213_DAI_CLK_MODE,
|
||||
snd_soc_component_update_bits(component, DA7213_DAI_CLK_MODE,
|
||||
DA7213_DAI_CLK_EN_MASK, 0);
|
||||
return 0;
|
||||
default:
|
||||
|
|
@ -1150,7 +1150,7 @@ static int da7213_hw_params(struct snd_pcm_substream *substream,
|
|||
struct snd_pcm_hw_params *params,
|
||||
struct snd_soc_dai *dai)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct snd_soc_component *component = dai->component;
|
||||
u8 dai_ctrl = 0;
|
||||
u8 fs;
|
||||
|
||||
|
|
@ -1208,17 +1208,17 @@ static int da7213_hw_params(struct snd_pcm_substream *substream,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
snd_soc_update_bits(codec, DA7213_DAI_CTRL, DA7213_DAI_WORD_LENGTH_MASK,
|
||||
snd_soc_component_update_bits(component, DA7213_DAI_CTRL, DA7213_DAI_WORD_LENGTH_MASK,
|
||||
dai_ctrl);
|
||||
snd_soc_write(codec, DA7213_SR, fs);
|
||||
snd_soc_component_write(component, DA7213_SR, fs);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
|
||||
u8 dai_clk_mode = 0, dai_ctrl = 0;
|
||||
u8 dai_offset = 0;
|
||||
|
||||
|
|
@ -1305,27 +1305,27 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
|
|||
/* By default only 64 BCLK per WCLK is supported */
|
||||
dai_clk_mode |= DA7213_DAI_BCLKS_PER_WCLK_64;
|
||||
|
||||
snd_soc_write(codec, DA7213_DAI_CLK_MODE, dai_clk_mode);
|
||||
snd_soc_update_bits(codec, DA7213_DAI_CTRL, DA7213_DAI_FORMAT_MASK,
|
||||
snd_soc_component_write(component, DA7213_DAI_CLK_MODE, dai_clk_mode);
|
||||
snd_soc_component_update_bits(component, DA7213_DAI_CTRL, DA7213_DAI_FORMAT_MASK,
|
||||
dai_ctrl);
|
||||
snd_soc_write(codec, DA7213_DAI_OFFSET, dai_offset);
|
||||
snd_soc_component_write(component, DA7213_DAI_OFFSET, dai_offset);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int da7213_mute(struct snd_soc_dai *dai, int mute)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
struct snd_soc_component *component = dai->component;
|
||||
|
||||
if (mute) {
|
||||
snd_soc_update_bits(codec, DA7213_DAC_L_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_DAC_L_CTRL,
|
||||
DA7213_MUTE_EN, DA7213_MUTE_EN);
|
||||
snd_soc_update_bits(codec, DA7213_DAC_R_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_DAC_R_CTRL,
|
||||
DA7213_MUTE_EN, DA7213_MUTE_EN);
|
||||
} else {
|
||||
snd_soc_update_bits(codec, DA7213_DAC_L_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_DAC_L_CTRL,
|
||||
DA7213_MUTE_EN, 0);
|
||||
snd_soc_update_bits(codec, DA7213_DAC_R_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_DAC_R_CTRL,
|
||||
DA7213_MUTE_EN, 0);
|
||||
}
|
||||
|
||||
|
|
@ -1338,8 +1338,8 @@ static int da7213_mute(struct snd_soc_dai *dai, int mute)
|
|||
static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
||||
int clk_id, unsigned int freq, int dir)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
|
||||
int ret = 0;
|
||||
|
||||
if ((da7213->clk_src == clk_id) && (da7213->mclk_rate == freq))
|
||||
|
|
@ -1353,11 +1353,11 @@ static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
|||
|
||||
switch (clk_id) {
|
||||
case DA7213_CLKSRC_MCLK:
|
||||
snd_soc_update_bits(codec, DA7213_PLL_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_PLL_CTRL,
|
||||
DA7213_PLL_MCLK_SQR_EN, 0);
|
||||
break;
|
||||
case DA7213_CLKSRC_MCLK_SQR:
|
||||
snd_soc_update_bits(codec, DA7213_PLL_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_PLL_CTRL,
|
||||
DA7213_PLL_MCLK_SQR_EN,
|
||||
DA7213_PLL_MCLK_SQR_EN);
|
||||
break;
|
||||
|
|
@ -1387,8 +1387,8 @@ static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
|||
static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
|
||||
int source, unsigned int fref, unsigned int fout)
|
||||
{
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_component *component = codec_dai->component;
|
||||
struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
u8 pll_ctrl, indiv_bits, indiv;
|
||||
u8 pll_frac_top, pll_frac_bot, pll_integer;
|
||||
|
|
@ -1398,7 +1398,7 @@ static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
|
|||
/* Workout input divider based on MCLK rate */
|
||||
if (da7213->mclk_rate == 32768) {
|
||||
if (!da7213->master) {
|
||||
dev_err(codec->dev,
|
||||
dev_err(component->dev,
|
||||
"32KHz only valid if codec is clock master\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -1411,7 +1411,7 @@ static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
|
|||
|
||||
} else {
|
||||
if (da7213->mclk_rate < 5000000) {
|
||||
dev_err(codec->dev,
|
||||
dev_err(component->dev,
|
||||
"PLL input clock %d below valid range\n",
|
||||
da7213->mclk_rate);
|
||||
return -EINVAL;
|
||||
|
|
@ -1428,7 +1428,7 @@ static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
|
|||
indiv_bits = DA7213_PLL_INDIV_36_TO_54_MHZ;
|
||||
indiv = DA7213_PLL_INDIV_36_TO_54_MHZ_VAL;
|
||||
} else {
|
||||
dev_err(codec->dev,
|
||||
dev_err(component->dev,
|
||||
"PLL input clock %d above valid range\n",
|
||||
da7213->mclk_rate);
|
||||
return -EINVAL;
|
||||
|
|
@ -1441,7 +1441,7 @@ static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
|
|||
/* Configure PLL */
|
||||
switch (source) {
|
||||
case DA7213_SYSCLK_MCLK:
|
||||
snd_soc_update_bits(codec, DA7213_PLL_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_PLL_CTRL,
|
||||
DA7213_PLL_INDIV_MASK |
|
||||
DA7213_PLL_MODE_MASK, pll_ctrl);
|
||||
return 0;
|
||||
|
|
@ -1453,7 +1453,7 @@ static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
|
|||
break;
|
||||
case DA7213_SYSCLK_PLL_32KHZ:
|
||||
if (da7213->mclk_rate != 32768) {
|
||||
dev_err(codec->dev,
|
||||
dev_err(component->dev,
|
||||
"32KHz mode only valid with 32KHz MCLK\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -1462,7 +1462,7 @@ static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
|
|||
fout = DA7213_PLL_FREQ_OUT_94310400;
|
||||
break;
|
||||
default:
|
||||
dev_err(codec->dev, "Invalid PLL config\n");
|
||||
dev_err(component->dev, "Invalid PLL config\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
@ -1474,22 +1474,22 @@ static int da7213_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
|
|||
pll_frac_bot = (frac_div) & DA7213_BYTE_MASK;
|
||||
|
||||
/* Write PLL dividers */
|
||||
snd_soc_write(codec, DA7213_PLL_FRAC_TOP, pll_frac_top);
|
||||
snd_soc_write(codec, DA7213_PLL_FRAC_BOT, pll_frac_bot);
|
||||
snd_soc_write(codec, DA7213_PLL_INTEGER, pll_integer);
|
||||
snd_soc_component_write(component, DA7213_PLL_FRAC_TOP, pll_frac_top);
|
||||
snd_soc_component_write(component, DA7213_PLL_FRAC_BOT, pll_frac_bot);
|
||||
snd_soc_component_write(component, DA7213_PLL_INTEGER, pll_integer);
|
||||
|
||||
/* Enable PLL */
|
||||
pll_ctrl |= DA7213_PLL_EN;
|
||||
snd_soc_update_bits(codec, DA7213_PLL_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_PLL_CTRL,
|
||||
DA7213_PLL_INDIV_MASK | DA7213_PLL_MODE_MASK,
|
||||
pll_ctrl);
|
||||
|
||||
/* Assist 32KHz mode PLL lock */
|
||||
if (source == DA7213_SYSCLK_PLL_32KHZ) {
|
||||
snd_soc_write(codec, 0xF0, 0x8B);
|
||||
snd_soc_write(codec, 0xF1, 0x03);
|
||||
snd_soc_write(codec, 0xF1, 0x01);
|
||||
snd_soc_write(codec, 0xF0, 0x00);
|
||||
snd_soc_component_write(component, 0xF0, 0x8B);
|
||||
snd_soc_component_write(component, 0xF1, 0x03);
|
||||
snd_soc_component_write(component, 0xF1, 0x01);
|
||||
snd_soc_component_write(component, 0xF0, 0x00);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -1526,10 +1526,10 @@ static struct snd_soc_dai_driver da7213_dai = {
|
|||
.symmetric_rates = 1,
|
||||
};
|
||||
|
||||
static int da7213_set_bias_level(struct snd_soc_codec *codec,
|
||||
static int da7213_set_bias_level(struct snd_soc_component *component,
|
||||
enum snd_soc_bias_level level)
|
||||
{
|
||||
struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
|
||||
struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
|
||||
int ret;
|
||||
|
||||
switch (level) {
|
||||
|
|
@ -1537,11 +1537,11 @@ static int da7213_set_bias_level(struct snd_soc_codec *codec,
|
|||
break;
|
||||
case SND_SOC_BIAS_PREPARE:
|
||||
/* Enable MCLK for transition to ON state */
|
||||
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_STANDBY) {
|
||||
if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_STANDBY) {
|
||||
if (da7213->mclk) {
|
||||
ret = clk_prepare_enable(da7213->mclk);
|
||||
if (ret) {
|
||||
dev_err(codec->dev,
|
||||
dev_err(component->dev,
|
||||
"Failed to enable mclk\n");
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -1549,9 +1549,9 @@ static int da7213_set_bias_level(struct snd_soc_codec *codec,
|
|||
}
|
||||
break;
|
||||
case SND_SOC_BIAS_STANDBY:
|
||||
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {
|
||||
if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
|
||||
/* Enable VMID reference & master bias */
|
||||
snd_soc_update_bits(codec, DA7213_REFERENCES,
|
||||
snd_soc_component_update_bits(component, DA7213_REFERENCES,
|
||||
DA7213_VMID_EN | DA7213_BIAS_EN,
|
||||
DA7213_VMID_EN | DA7213_BIAS_EN);
|
||||
} else {
|
||||
|
|
@ -1562,7 +1562,7 @@ static int da7213_set_bias_level(struct snd_soc_codec *codec,
|
|||
break;
|
||||
case SND_SOC_BIAS_OFF:
|
||||
/* Disable VMID reference & master bias */
|
||||
snd_soc_update_bits(codec, DA7213_REFERENCES,
|
||||
snd_soc_component_update_bits(component, DA7213_REFERENCES,
|
||||
DA7213_VMID_EN | DA7213_BIAS_EN, 0);
|
||||
break;
|
||||
}
|
||||
|
|
@ -1588,7 +1588,7 @@ MODULE_DEVICE_TABLE(acpi, da7213_acpi_match);
|
|||
#endif
|
||||
|
||||
static enum da7213_micbias_voltage
|
||||
da7213_of_micbias_lvl(struct snd_soc_codec *codec, u32 val)
|
||||
da7213_of_micbias_lvl(struct snd_soc_component *component, u32 val)
|
||||
{
|
||||
switch (val) {
|
||||
case 1600:
|
||||
|
|
@ -1600,39 +1600,39 @@ static enum da7213_micbias_voltage
|
|||
case 3000:
|
||||
return DA7213_MICBIAS_3_0V;
|
||||
default:
|
||||
dev_warn(codec->dev, "Invalid micbias level\n");
|
||||
dev_warn(component->dev, "Invalid micbias level\n");
|
||||
return DA7213_MICBIAS_2_2V;
|
||||
}
|
||||
}
|
||||
|
||||
static enum da7213_dmic_data_sel
|
||||
da7213_of_dmic_data_sel(struct snd_soc_codec *codec, const char *str)
|
||||
da7213_of_dmic_data_sel(struct snd_soc_component *component, const char *str)
|
||||
{
|
||||
if (!strcmp(str, "lrise_rfall")) {
|
||||
return DA7213_DMIC_DATA_LRISE_RFALL;
|
||||
} else if (!strcmp(str, "lfall_rrise")) {
|
||||
return DA7213_DMIC_DATA_LFALL_RRISE;
|
||||
} else {
|
||||
dev_warn(codec->dev, "Invalid DMIC data select type\n");
|
||||
dev_warn(component->dev, "Invalid DMIC data select type\n");
|
||||
return DA7213_DMIC_DATA_LRISE_RFALL;
|
||||
}
|
||||
}
|
||||
|
||||
static enum da7213_dmic_samplephase
|
||||
da7213_of_dmic_samplephase(struct snd_soc_codec *codec, const char *str)
|
||||
da7213_of_dmic_samplephase(struct snd_soc_component *component, const char *str)
|
||||
{
|
||||
if (!strcmp(str, "on_clkedge")) {
|
||||
return DA7213_DMIC_SAMPLE_ON_CLKEDGE;
|
||||
} else if (!strcmp(str, "between_clkedge")) {
|
||||
return DA7213_DMIC_SAMPLE_BETWEEN_CLKEDGE;
|
||||
} else {
|
||||
dev_warn(codec->dev, "Invalid DMIC sample phase\n");
|
||||
dev_warn(component->dev, "Invalid DMIC sample phase\n");
|
||||
return DA7213_DMIC_SAMPLE_ON_CLKEDGE;
|
||||
}
|
||||
}
|
||||
|
||||
static enum da7213_dmic_clk_rate
|
||||
da7213_of_dmic_clkrate(struct snd_soc_codec *codec, u32 val)
|
||||
da7213_of_dmic_clkrate(struct snd_soc_component *component, u32 val)
|
||||
{
|
||||
switch (val) {
|
||||
case 1500000:
|
||||
|
|
@ -1640,46 +1640,46 @@ static enum da7213_dmic_clk_rate
|
|||
case 3000000:
|
||||
return DA7213_DMIC_CLK_3_0MHZ;
|
||||
default:
|
||||
dev_warn(codec->dev, "Invalid DMIC clock rate\n");
|
||||
dev_warn(component->dev, "Invalid DMIC clock rate\n");
|
||||
return DA7213_DMIC_CLK_1_5MHZ;
|
||||
}
|
||||
}
|
||||
|
||||
static struct da7213_platform_data
|
||||
*da7213_fw_to_pdata(struct snd_soc_codec *codec)
|
||||
*da7213_fw_to_pdata(struct snd_soc_component *component)
|
||||
{
|
||||
struct device *dev = codec->dev;
|
||||
struct device *dev = component->dev;
|
||||
struct da7213_platform_data *pdata;
|
||||
const char *fw_str;
|
||||
u32 fw_val32;
|
||||
|
||||
pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL);
|
||||
pdata = devm_kzalloc(component->dev, sizeof(*pdata), GFP_KERNEL);
|
||||
if (!pdata)
|
||||
return NULL;
|
||||
|
||||
if (device_property_read_u32(dev, "dlg,micbias1-lvl", &fw_val32) >= 0)
|
||||
pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, fw_val32);
|
||||
pdata->micbias1_lvl = da7213_of_micbias_lvl(component, fw_val32);
|
||||
else
|
||||
pdata->micbias1_lvl = DA7213_MICBIAS_2_2V;
|
||||
|
||||
if (device_property_read_u32(dev, "dlg,micbias2-lvl", &fw_val32) >= 0)
|
||||
pdata->micbias2_lvl = da7213_of_micbias_lvl(codec, fw_val32);
|
||||
pdata->micbias2_lvl = da7213_of_micbias_lvl(component, fw_val32);
|
||||
else
|
||||
pdata->micbias2_lvl = DA7213_MICBIAS_2_2V;
|
||||
|
||||
if (!device_property_read_string(dev, "dlg,dmic-data-sel", &fw_str))
|
||||
pdata->dmic_data_sel = da7213_of_dmic_data_sel(codec, fw_str);
|
||||
pdata->dmic_data_sel = da7213_of_dmic_data_sel(component, fw_str);
|
||||
else
|
||||
pdata->dmic_data_sel = DA7213_DMIC_DATA_LRISE_RFALL;
|
||||
|
||||
if (!device_property_read_string(dev, "dlg,dmic-samplephase", &fw_str))
|
||||
pdata->dmic_samplephase =
|
||||
da7213_of_dmic_samplephase(codec, fw_str);
|
||||
da7213_of_dmic_samplephase(component, fw_str);
|
||||
else
|
||||
pdata->dmic_samplephase = DA7213_DMIC_SAMPLE_ON_CLKEDGE;
|
||||
|
||||
if (device_property_read_u32(dev, "dlg,dmic-clkrate", &fw_val32) >= 0)
|
||||
pdata->dmic_clk_rate = da7213_of_dmic_clkrate(codec, fw_val32);
|
||||
pdata->dmic_clk_rate = da7213_of_dmic_clkrate(component, fw_val32);
|
||||
else
|
||||
pdata->dmic_clk_rate = DA7213_DMIC_CLK_3_0MHZ;
|
||||
|
||||
|
|
@ -1687,41 +1687,41 @@ static struct da7213_platform_data
|
|||
}
|
||||
|
||||
|
||||
static int da7213_probe(struct snd_soc_codec *codec)
|
||||
static int da7213_probe(struct snd_soc_component *component)
|
||||
{
|
||||
struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
|
||||
struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
|
||||
|
||||
/* Default to using ALC auto offset calibration mode. */
|
||||
snd_soc_update_bits(codec, DA7213_ALC_CTRL1,
|
||||
snd_soc_component_update_bits(component, DA7213_ALC_CTRL1,
|
||||
DA7213_ALC_CALIB_MODE_MAN, 0);
|
||||
da7213->alc_calib_auto = true;
|
||||
|
||||
/* Default PC counter to free-running */
|
||||
snd_soc_update_bits(codec, DA7213_PC_COUNT, DA7213_PC_FREERUN_MASK,
|
||||
snd_soc_component_update_bits(component, DA7213_PC_COUNT, DA7213_PC_FREERUN_MASK,
|
||||
DA7213_PC_FREERUN_MASK);
|
||||
|
||||
/* Enable all Gain Ramps */
|
||||
snd_soc_update_bits(codec, DA7213_AUX_L_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_AUX_L_CTRL,
|
||||
DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);
|
||||
snd_soc_update_bits(codec, DA7213_AUX_R_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_AUX_R_CTRL,
|
||||
DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);
|
||||
snd_soc_update_bits(codec, DA7213_MIXIN_L_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_MIXIN_L_CTRL,
|
||||
DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);
|
||||
snd_soc_update_bits(codec, DA7213_MIXIN_R_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_MIXIN_R_CTRL,
|
||||
DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);
|
||||
snd_soc_update_bits(codec, DA7213_ADC_L_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_ADC_L_CTRL,
|
||||
DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);
|
||||
snd_soc_update_bits(codec, DA7213_ADC_R_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_ADC_R_CTRL,
|
||||
DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);
|
||||
snd_soc_update_bits(codec, DA7213_DAC_L_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_DAC_L_CTRL,
|
||||
DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);
|
||||
snd_soc_update_bits(codec, DA7213_DAC_R_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_DAC_R_CTRL,
|
||||
DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);
|
||||
snd_soc_update_bits(codec, DA7213_HP_L_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_HP_L_CTRL,
|
||||
DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);
|
||||
snd_soc_update_bits(codec, DA7213_HP_R_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_HP_R_CTRL,
|
||||
DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);
|
||||
snd_soc_update_bits(codec, DA7213_LINE_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_LINE_CTRL,
|
||||
DA7213_GAIN_RAMP_EN, DA7213_GAIN_RAMP_EN);
|
||||
|
||||
/*
|
||||
|
|
@ -1732,28 +1732,28 @@ static int da7213_probe(struct snd_soc_codec *codec)
|
|||
* being managed by DAPM while other (non power related) bits are
|
||||
* enabled here
|
||||
*/
|
||||
snd_soc_update_bits(codec, DA7213_MIXIN_L_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_MIXIN_L_CTRL,
|
||||
DA7213_MIXIN_MIX_EN, DA7213_MIXIN_MIX_EN);
|
||||
snd_soc_update_bits(codec, DA7213_MIXIN_R_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_MIXIN_R_CTRL,
|
||||
DA7213_MIXIN_MIX_EN, DA7213_MIXIN_MIX_EN);
|
||||
|
||||
snd_soc_update_bits(codec, DA7213_MIXOUT_L_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_MIXOUT_L_CTRL,
|
||||
DA7213_MIXOUT_MIX_EN, DA7213_MIXOUT_MIX_EN);
|
||||
snd_soc_update_bits(codec, DA7213_MIXOUT_R_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_MIXOUT_R_CTRL,
|
||||
DA7213_MIXOUT_MIX_EN, DA7213_MIXOUT_MIX_EN);
|
||||
|
||||
snd_soc_update_bits(codec, DA7213_HP_L_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_HP_L_CTRL,
|
||||
DA7213_HP_AMP_OE, DA7213_HP_AMP_OE);
|
||||
snd_soc_update_bits(codec, DA7213_HP_R_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_HP_R_CTRL,
|
||||
DA7213_HP_AMP_OE, DA7213_HP_AMP_OE);
|
||||
|
||||
snd_soc_update_bits(codec, DA7213_LINE_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_LINE_CTRL,
|
||||
DA7213_LINE_AMP_OE, DA7213_LINE_AMP_OE);
|
||||
|
||||
/* Handle DT/Platform data */
|
||||
da7213->pdata = dev_get_platdata(codec->dev);
|
||||
da7213->pdata = dev_get_platdata(component->dev);
|
||||
if (!da7213->pdata)
|
||||
da7213->pdata = da7213_fw_to_pdata(codec);
|
||||
da7213->pdata = da7213_fw_to_pdata(component);
|
||||
|
||||
/* Set platform data values */
|
||||
if (da7213->pdata) {
|
||||
|
|
@ -1779,7 +1779,7 @@ static int da7213_probe(struct snd_soc_codec *codec)
|
|||
DA7213_MICBIAS2_LEVEL_SHIFT);
|
||||
break;
|
||||
}
|
||||
snd_soc_update_bits(codec, DA7213_MICBIAS_CTRL,
|
||||
snd_soc_component_update_bits(component, DA7213_MICBIAS_CTRL,
|
||||
DA7213_MICBIAS1_LEVEL_MASK |
|
||||
DA7213_MICBIAS2_LEVEL_MASK, micbias_lvl);
|
||||
|
||||
|
|
@ -1805,14 +1805,14 @@ static int da7213_probe(struct snd_soc_codec *codec)
|
|||
DA7213_DMIC_CLK_RATE_SHIFT);
|
||||
break;
|
||||
}
|
||||
snd_soc_update_bits(codec, DA7213_MIC_CONFIG,
|
||||
snd_soc_component_update_bits(component, DA7213_MIC_CONFIG,
|
||||
DA7213_DMIC_DATA_SEL_MASK |
|
||||
DA7213_DMIC_SAMPLEPHASE_MASK |
|
||||
DA7213_DMIC_CLK_RATE_MASK, dmic_cfg);
|
||||
}
|
||||
|
||||
/* Check if MCLK provided */
|
||||
da7213->mclk = devm_clk_get(codec->dev, "mclk");
|
||||
da7213->mclk = devm_clk_get(component->dev, "mclk");
|
||||
if (IS_ERR(da7213->mclk)) {
|
||||
if (PTR_ERR(da7213->mclk) != -ENOENT)
|
||||
return PTR_ERR(da7213->mclk);
|
||||
|
|
@ -1823,18 +1823,19 @@ static int da7213_probe(struct snd_soc_codec *codec)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const struct snd_soc_codec_driver soc_codec_dev_da7213 = {
|
||||
static const struct snd_soc_component_driver soc_component_dev_da7213 = {
|
||||
.probe = da7213_probe,
|
||||
.set_bias_level = da7213_set_bias_level,
|
||||
|
||||
.component_driver = {
|
||||
.controls = da7213_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(da7213_snd_controls),
|
||||
.dapm_widgets = da7213_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(da7213_dapm_widgets),
|
||||
.dapm_routes = da7213_audio_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(da7213_audio_map),
|
||||
},
|
||||
.controls = da7213_snd_controls,
|
||||
.num_controls = ARRAY_SIZE(da7213_snd_controls),
|
||||
.dapm_widgets = da7213_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(da7213_dapm_widgets),
|
||||
.dapm_routes = da7213_audio_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(da7213_audio_map),
|
||||
.idle_bias_on = 1,
|
||||
.use_pmdown_time = 1,
|
||||
.endianness = 1,
|
||||
.non_legacy_dai_naming = 1,
|
||||
};
|
||||
|
||||
static const struct regmap_config da7213_regmap_config = {
|
||||
|
|
@ -1866,21 +1867,15 @@ static int da7213_i2c_probe(struct i2c_client *i2c,
|
|||
return ret;
|
||||
}
|
||||
|
||||
ret = snd_soc_register_codec(&i2c->dev,
|
||||
&soc_codec_dev_da7213, &da7213_dai, 1);
|
||||
ret = devm_snd_soc_register_component(&i2c->dev,
|
||||
&soc_component_dev_da7213, &da7213_dai, 1);
|
||||
if (ret < 0) {
|
||||
dev_err(&i2c->dev, "Failed to register da7213 codec: %d\n",
|
||||
dev_err(&i2c->dev, "Failed to register da7213 component: %d\n",
|
||||
ret);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int da7213_remove(struct i2c_client *client)
|
||||
{
|
||||
snd_soc_unregister_codec(&client->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id da7213_i2c_id[] = {
|
||||
{ "da7213", 0 },
|
||||
{ }
|
||||
|
|
@ -1895,7 +1890,6 @@ static struct i2c_driver da7213_i2c_driver = {
|
|||
.acpi_match_table = ACPI_PTR(da7213_acpi_match),
|
||||
},
|
||||
.probe = da7213_i2c_probe,
|
||||
.remove = da7213_remove,
|
||||
.id_table = da7213_i2c_id,
|
||||
};
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1410,6 +1410,6 @@ struct da7218_priv {
|
|||
};
|
||||
|
||||
/* HP detect control */
|
||||
int da7218_hpldet(struct snd_soc_codec *codec, struct snd_soc_jack *jack);
|
||||
int da7218_hpldet(struct snd_soc_component *component, struct snd_soc_jack *jack);
|
||||
|
||||
#endif /* _DA7218_H */
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ static unsigned short ams_delta_audio_agc;
|
|||
* Used for passing a codec structure pointer
|
||||
* from the board initialization code to the tty line discipline.
|
||||
*/
|
||||
static struct snd_soc_codec *cx20442_codec;
|
||||
static struct snd_soc_component *cx20442_codec;
|
||||
|
||||
static int ams_delta_set_audio_mode(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
|
|
@ -105,7 +105,7 @@ static int ams_delta_set_audio_mode(struct snd_kcontrol *kcontrol,
|
|||
int pin, changed = 0;
|
||||
|
||||
/* Refuse any mode changes if we are not able to control the codec. */
|
||||
if (!cx20442_codec->component.card->pop_time)
|
||||
if (!cx20442_codec->card->pop_time)
|
||||
return -EUNATCH;
|
||||
|
||||
if (ucontrol->value.enumerated.item[0] >= control->items)
|
||||
|
|
@ -300,15 +300,15 @@ static int cx81801_open(struct tty_struct *tty)
|
|||
/* Line discipline .close() */
|
||||
static void cx81801_close(struct tty_struct *tty)
|
||||
{
|
||||
struct snd_soc_codec *codec = tty->disc_data;
|
||||
struct snd_soc_dapm_context *dapm = &codec->component.card->dapm;
|
||||
struct snd_soc_component *component = tty->disc_data;
|
||||
struct snd_soc_dapm_context *dapm = &component->card->dapm;
|
||||
|
||||
del_timer_sync(&cx81801_timer);
|
||||
|
||||
/* Prevent the hook switch from further changing the DAPM pins */
|
||||
INIT_LIST_HEAD(&ams_delta_hook_switch.pins);
|
||||
|
||||
if (!codec)
|
||||
if (!component)
|
||||
return;
|
||||
|
||||
v253_ops.close(tty);
|
||||
|
|
@ -338,14 +338,14 @@ static int cx81801_hangup(struct tty_struct *tty)
|
|||
static void cx81801_receive(struct tty_struct *tty,
|
||||
const unsigned char *cp, char *fp, int count)
|
||||
{
|
||||
struct snd_soc_codec *codec = tty->disc_data;
|
||||
struct snd_soc_component *component = tty->disc_data;
|
||||
const unsigned char *c;
|
||||
int apply, ret;
|
||||
|
||||
if (!codec)
|
||||
if (!component)
|
||||
return;
|
||||
|
||||
if (!codec->component.card->pop_time) {
|
||||
if (!component->card->pop_time) {
|
||||
/* First modem response, complete setup procedure */
|
||||
|
||||
/* Initialize timer used for config pulse generation */
|
||||
|
|
@ -358,7 +358,7 @@ static void cx81801_receive(struct tty_struct *tty,
|
|||
ARRAY_SIZE(ams_delta_hook_switch_pins),
|
||||
ams_delta_hook_switch_pins);
|
||||
if (ret)
|
||||
dev_warn(codec->dev,
|
||||
dev_warn(component->dev,
|
||||
"Failed to link hook switch to DAPM pins, "
|
||||
"will continue with hook switch unlinked.\n");
|
||||
|
||||
|
|
@ -467,7 +467,7 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
|
|||
/* Codec is ready, now add/activate board specific controls */
|
||||
|
||||
/* Store a pointer to the codec structure for tty ldisc use */
|
||||
cx20442_codec = rtd->codec;
|
||||
cx20442_codec = rtd->codec_dai->component;
|
||||
|
||||
/* Set up digital mute if not provided by the codec */
|
||||
if (!codec_dai->driver->ops) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue