Skip to content

K
Kernel

openeuler / Kernel
11 个月 前同步成功

通知 5
Star 0
Fork 0
K
Kernel

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 f499cf35 编写于 作者: M Mark Brown
浏览文件
操作

Merge remote-tracking branches 'asoc/topic/cx20442', 'asoc/topic/cygnus',... 

Merge remote-tracking branches 'asoc/topic/cx20442', 'asoc/topic/cygnus', 'asoc/topic/da7210', 'asoc/topic/da7213' and 'asoc/topic/da7218' into asoc-next
上级 651c939f d0fdfe34 0338753a c0153b12 2918d9cc bc596c42
展开全部 隐藏空白更改
内联 并排
Showing with 543 addition and 577 deletion
sound/soc/bcm/cygnus-ssp.c
浏览文件 @ f499cf35
...@@ -1281,7 +1281,7 @@ static int cygnus_ssp_probe(struct platform_device *pdev) ...@@ -1281,7 +1281,7 @@ static int cygnus_ssp_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *child_node; struct device_node *child_node;
struct resource *res = pdev->resource; struct resource *res;
struct cygnus_audio *cygaud; struct cygnus_audio *cygaud;
int err = -EINVAL; int err = -EINVAL;
int node_count; int node_count;
......
sound/soc/codecs/cx20442.c
浏览文件 @ f499cf35
...@@ -89,10 +89,10 @@ static const struct snd_soc_dapm_route cx20442_audio_map[] = { ...@@ -89,10 +89,10 @@ static const struct snd_soc_dapm_route cx20442_audio_map[] = {
{"ADC", NULL, "Input Mixer"}, {"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) 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) if (reg >= 1)
return -EINVAL; return -EINVAL;
...@@ -153,10 +153,10 @@ static int cx20442_pm_to_v253_vsp(u8 value) ...@@ -153,10 +153,10 @@ static int cx20442_pm_to_v253_vsp(u8 value)
return (value & (1 << CX20442_AGC)) ? -EINVAL : 0; 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) 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; int vls, vsp, old, len;
char buf[18]; char buf[18];
...@@ -193,7 +193,7 @@ static int cx20442_write(struct snd_soc_codec *codec, unsigned int reg, ...@@ -193,7 +193,7 @@ static int cx20442_write(struct snd_soc_codec *codec, unsigned int reg,
if (unlikely(len > (ARRAY_SIZE(buf) - 1))) if (unlikely(len > (ARRAY_SIZE(buf) - 1)))
return -ENOMEM; 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) if (cx20442->tty->ops->write(cx20442->tty, buf, len) != len)
return -EIO; return -EIO;
...@@ -240,19 +240,19 @@ static int v253_open(struct tty_struct *tty) ...@@ -240,19 +240,19 @@ static int v253_open(struct tty_struct *tty)
/* Line discipline .close() */ /* Line discipline .close() */
static void v253_close(struct tty_struct *tty) 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; struct cx20442_priv *cx20442;
tty->disc_data = NULL; tty->disc_data = NULL;
if (!codec) if (!component)
return; return;
cx20442 = snd_soc_codec_get_drvdata(codec); cx20442 = snd_soc_component_get_drvdata(component);
/* Prevent the codec driver from further accessing the modem */ /* Prevent the codec driver from further accessing the modem */
cx20442->tty = NULL; cx20442->tty = NULL;
codec->component.card->pop_time = 0; component->card->pop_time = 0;
} }
/* Line discipline .hangup() */ /* Line discipline .hangup() */
...@@ -266,20 +266,20 @@ static int v253_hangup(struct tty_struct *tty) ...@@ -266,20 +266,20 @@ static int v253_hangup(struct tty_struct *tty)
static void v253_receive(struct tty_struct *tty, static void v253_receive(struct tty_struct *tty,
const unsigned char *cp, char *fp, int count) 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; struct cx20442_priv *cx20442;
if (!codec) if (!component)
return; return;
cx20442 = snd_soc_codec_get_drvdata(codec); cx20442 = snd_soc_component_get_drvdata(component);
if (!cx20442->tty) { if (!cx20442->tty) {
/* First modem response, complete setup procedure */ /* First modem response, complete setup procedure */
/* Set up codec driver access to modem controls */ /* Set up codec driver access to modem controls */
cx20442->tty = tty; 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 = { ...@@ -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) 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; int err = 0;
switch (level) { switch (level) {
case SND_SOC_BIAS_PREPARE: 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; break;
if (IS_ERR(cx20442->por)) if (IS_ERR(cx20442->por))
err = PTR_ERR(cx20442->por); err = PTR_ERR(cx20442->por);
...@@ -339,7 +339,7 @@ static int cx20442_set_bias_level(struct snd_soc_codec *codec, ...@@ -339,7 +339,7 @@ static int cx20442_set_bias_level(struct snd_soc_codec *codec,
err = regulator_enable(cx20442->por); err = regulator_enable(cx20442->por);
break; break;
case SND_SOC_BIAS_STANDBY: 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; break;
if (IS_ERR(cx20442->por)) if (IS_ERR(cx20442->por))
err = PTR_ERR(cx20442->por); err = PTR_ERR(cx20442->por);
...@@ -353,7 +353,7 @@ static int cx20442_set_bias_level(struct snd_soc_codec *codec, ...@@ -353,7 +353,7 @@ static int cx20442_set_bias_level(struct snd_soc_codec *codec,
return err; 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; struct cx20442_priv *cx20442;
...@@ -361,21 +361,21 @@ static int cx20442_codec_probe(struct snd_soc_codec *codec) ...@@ -361,21 +361,21 @@ static int cx20442_codec_probe(struct snd_soc_codec *codec)
if (cx20442 == NULL) if (cx20442 == NULL)
return -ENOMEM; return -ENOMEM;
cx20442->por = regulator_get(codec->dev, "POR"); cx20442->por = regulator_get(component->dev, "POR");
if (IS_ERR(cx20442->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; cx20442->tty = NULL;
snd_soc_codec_set_drvdata(codec, cx20442); snd_soc_component_set_drvdata(component, cx20442);
codec->component.card->pop_time = 0; component->card->pop_time = 0;
return 0; return 0;
} }
/* power down chip */ /* 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) { if (cx20442->tty) {
struct tty_struct *tty = cx20442->tty; struct tty_struct *tty = cx20442->tty;
...@@ -387,36 +387,30 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec) ...@@ -387,36 +387,30 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec)
regulator_put(cx20442->por); regulator_put(cx20442->por);
} }
snd_soc_codec_set_drvdata(codec, NULL); snd_soc_component_set_drvdata(component, NULL);
kfree(cx20442); kfree(cx20442);
return 0;
} }
static const struct snd_soc_codec_driver cx20442_codec_dev = { static const struct snd_soc_component_driver cx20442_component_dev = {
.probe = cx20442_codec_probe, .probe = cx20442_component_probe,
.remove = cx20442_codec_remove, .remove = cx20442_component_remove,
.set_bias_level = cx20442_set_bias_level, .set_bias_level = cx20442_set_bias_level,
.read = cx20442_read_reg_cache, .read = cx20442_read_reg_cache,
.write = cx20442_write, .write = cx20442_write,
.dapm_widgets = cx20442_dapm_widgets,
.component_driver = { .num_dapm_widgets = ARRAY_SIZE(cx20442_dapm_widgets),
.dapm_widgets = cx20442_dapm_widgets, .dapm_routes = cx20442_audio_map,
.num_dapm_widgets = ARRAY_SIZE(cx20442_dapm_widgets), .num_dapm_routes = ARRAY_SIZE(cx20442_audio_map),
.dapm_routes = cx20442_audio_map, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(cx20442_audio_map), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static int cx20442_platform_probe(struct platform_device *pdev) static int cx20442_platform_probe(struct platform_device *pdev)
{ {
return snd_soc_register_codec(&pdev->dev, return devm_snd_soc_register_component(&pdev->dev,
&cx20442_codec_dev, &cx20442_dai, 1); &cx20442_component_dev, &cx20442_dai, 1);
}
static int cx20442_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
} }
static struct platform_driver cx20442_platform_driver = { static struct platform_driver cx20442_platform_driver = {
...@@ -424,7 +418,6 @@ static struct platform_driver cx20442_platform_driver = { ...@@ -424,7 +418,6 @@ static struct platform_driver cx20442_platform_driver = {
.name = "cx20442-codec", .name = "cx20442-codec",
}, },
.probe = cx20442_platform_probe, .probe = cx20442_platform_probe,
.remove = cx20442_platform_remove,
}; };
module_platform_driver(cx20442_platform_driver); module_platform_driver(cx20442_platform_driver);
......
sound/soc/codecs/da7210.c
浏览文件 @ f499cf35
...@@ -331,12 +331,12 @@ static SOC_ENUM_SINGLE_DECL(da7210_hp_mode_sel, ...@@ -331,12 +331,12 @@ static SOC_ENUM_SINGLE_DECL(da7210_hp_mode_sel,
static int da7210_put_alc_sw(struct snd_kcontrol *kcontrol, static int da7210_put_alc_sw(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) 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]) { if (ucontrol->value.integer.value[0]) {
/* Check if noise suppression is enabled */ /* Check if noise suppression is enabled */
if (snd_soc_read(codec, DA7210_CONTROL) & DA7210_NOISE_SUP_EN) { if (snd_soc_component_read32(component, DA7210_CONTROL) & DA7210_NOISE_SUP_EN) {
dev_dbg(codec->dev, dev_dbg(component->dev,
"Disable noise suppression to enable ALC\n"); "Disable noise suppression to enable ALC\n");
return -EINVAL; return -EINVAL;
} }
...@@ -354,32 +354,32 @@ static int da7210_put_alc_sw(struct snd_kcontrol *kcontrol, ...@@ -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, static int da7210_put_noise_sup_sw(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) 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; u8 val;
if (ucontrol->value.integer.value[0]) { if (ucontrol->value.integer.value[0]) {
/* Check if ALC is enabled */ /* 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; goto err;
/* Check ZC for HP and AUX1 PGA */ /* 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_AUX1_L_ZC | DA7210_AUX1_R_ZC | DA7210_HP_L_ZC |
DA7210_HP_R_ZC)) != (DA7210_AUX1_L_ZC | DA7210_HP_R_ZC)) != (DA7210_AUX1_L_ZC |
DA7210_AUX1_R_ZC | DA7210_HP_L_ZC | DA7210_HP_R_ZC)) DA7210_AUX1_R_ZC | DA7210_HP_L_ZC | DA7210_HP_R_ZC))
goto err; goto err;
/* Check INPGA_L_VOL and INPGA_R_VOL */ /* 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) || if (((val & DA7210_INPGA_L_VOL) < DA7210_INPGA_MIN_VOL_NS) ||
(((val & DA7210_INPGA_R_VOL) >> 4) < (((val & DA7210_INPGA_R_VOL) >> 4) <
DA7210_INPGA_MIN_VOL_NS)) DA7210_INPGA_MIN_VOL_NS))
goto err; goto err;
/* Check AUX1_L_VOL and AUX1_R_VOL */ /* 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) || 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)) DA7210_AUX1_MIN_VOL_NS))
goto err; goto err;
} }
...@@ -760,19 +760,19 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, ...@@ -760,19 +760,19 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); struct da7210_priv *da7210 = snd_soc_component_get_drvdata(component);
u32 dai_cfg1; u32 dai_cfg1;
u32 fs, sysclk; u32 fs, sysclk;
/* set DAI source to Left and Right ADC */ /* 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); DA7210_DAI_OUT_R_SRC | DA7210_DAI_OUT_L_SRC);
/* Enable DAI */ /* 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)) { switch (params_width(params)) {
case 16: case 16:
...@@ -791,7 +791,7 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, ...@@ -791,7 +791,7 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; 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)) { switch (params_rate(params)) {
case 8000: case 8000:
...@@ -839,17 +839,17 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, ...@@ -839,17 +839,17 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
} }
/* Disable active mode */ /* 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)) { if (da7210->mclk_rate && (da7210->mclk_rate != sysclk)) {
/* PLL mode, disable PLL bypass */ /* 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) { if (!da7210->master) {
/* PLL slave mode, also enable SRM */ /* 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_SRM_EN |
DA7210_MCLK_DET_EN), DA7210_MCLK_DET_EN),
(DA7210_MCLK_SRM_EN | (DA7210_MCLK_SRM_EN |
...@@ -857,13 +857,13 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, ...@@ -857,13 +857,13 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
} }
} else { } else {
/* PLL bypass mode, enable PLL bypass and Auto Detection */ /* 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); 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); DA7210_PLL_BYP);
} }
/* Enable active mode */ /* 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); DA7210_SC_MST_EN, DA7210_SC_MST_EN);
return 0; return 0;
...@@ -874,16 +874,16 @@ static int da7210_hw_params(struct snd_pcm_substream *substream, ...@@ -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) static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); struct da7210_priv *da7210 = snd_soc_component_get_drvdata(component);
u32 dai_cfg1; u32 dai_cfg1;
u32 dai_cfg3; u32 dai_cfg3;
dai_cfg1 = 0x7f & snd_soc_read(codec, DA7210_DAI_CFG1); dai_cfg1 = 0x7f & snd_soc_component_read32(component, DA7210_DAI_CFG1);
dai_cfg3 = 0xfc & snd_soc_read(codec, DA7210_DAI_CFG3); dai_cfg3 = 0xfc & snd_soc_component_read32(component, DA7210_DAI_CFG3);
if ((snd_soc_read(codec, DA7210_PLL) & DA7210_PLL_EN) && if ((snd_soc_component_read32(component, DA7210_PLL) & DA7210_PLL_EN) &&
(!(snd_soc_read(codec, DA7210_PLL_DIV3) & DA7210_PLL_BYP))) (!(snd_soc_component_read32(component, DA7210_PLL_DIV3) & DA7210_PLL_BYP)))
return -EINVAL; return -EINVAL;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { 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) ...@@ -923,21 +923,21 @@ static int da7210_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt)
*/ */
dai_cfg1 |= DA7210_DAI_FLEN_64BIT; dai_cfg1 |= DA7210_DAI_FLEN_64BIT;
snd_soc_write(codec, DA7210_DAI_CFG1, dai_cfg1); snd_soc_component_write(component, DA7210_DAI_CFG1, dai_cfg1);
snd_soc_write(codec, DA7210_DAI_CFG3, dai_cfg3); snd_soc_component_write(component, DA7210_DAI_CFG3, dai_cfg3);
return 0; return 0;
} }
static int da7210_mute(struct snd_soc_dai *dai, int mute) static int da7210_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
u8 mute_reg = snd_soc_read(codec, DA7210_DAC_HPF) & 0xFB; u8 mute_reg = snd_soc_component_read32(component, DA7210_DAC_HPF) & 0xFB;
if (mute) if (mute)
snd_soc_write(codec, DA7210_DAC_HPF, mute_reg | 0x4); snd_soc_component_write(component, DA7210_DAC_HPF, mute_reg | 0x4);
else else
snd_soc_write(codec, DA7210_DAC_HPF, mute_reg); snd_soc_component_write(component, DA7210_DAC_HPF, mute_reg);
return 0; return 0;
} }
...@@ -947,8 +947,8 @@ static int da7210_mute(struct snd_soc_dai *dai, int mute) ...@@ -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, static int da7210_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); struct da7210_priv *da7210 = snd_soc_component_get_drvdata(component);
switch (clk_id) { switch (clk_id) {
case DA7210_CLKSRC_MCLK: case DA7210_CLKSRC_MCLK:
...@@ -988,8 +988,8 @@ static int da7210_set_dai_sysclk(struct snd_soc_dai *codec_dai, ...@@ -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, static int da7210_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
int source, unsigned int fref, unsigned int fout) int source, unsigned int fref, unsigned int fout)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct da7210_priv *da7210 = snd_soc_codec_get_drvdata(codec); struct da7210_priv *da7210 = snd_soc_component_get_drvdata(component);
u8 pll_div1, pll_div2, pll_div3, cnt; 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, ...@@ -1014,18 +1014,18 @@ static int da7210_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
goto err; goto err;
/* Disable active mode */ /* 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 */ /* Write PLL dividers */
snd_soc_write(codec, DA7210_PLL_DIV1, pll_div1); snd_soc_component_write(component, DA7210_PLL_DIV1, pll_div1);
snd_soc_write(codec, DA7210_PLL_DIV2, pll_div2); snd_soc_component_write(component, DA7210_PLL_DIV2, pll_div2);
snd_soc_update_bits(codec, DA7210_PLL_DIV3, snd_soc_component_update_bits(component, DA7210_PLL_DIV3,
DA7210_PLL_DIV_L_MASK, pll_div3); DA7210_PLL_DIV_L_MASK, pll_div3);
/* Enable PLL */ /* 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 */ /* 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); DA7210_SC_MST_EN);
return 0; return 0;
err: err:
...@@ -1064,53 +1064,53 @@ static struct snd_soc_dai_driver da7210_dai = { ...@@ -1064,53 +1064,53 @@ static struct snd_soc_dai_driver da7210_dai = {
.symmetric_rates = 1, .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->mclk_rate = 0; /* This will be set from set_sysclk() */
da7210->master = 0; /* This will be set from set_fmt() */ da7210->master = 0; /* This will be set from set_fmt() */
/* Enable internal regulator & bias current */ /* 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 * ADC settings
*/ */
/* Enable Left & Right MIC PGA and Mic Bias */ /* Enable Left & Right MIC PGA and Mic Bias */
snd_soc_write(codec, DA7210_MIC_L, DA7210_MIC_L_EN | DA7210_MICBIAS_EN); snd_soc_component_write(component, 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_R, DA7210_MIC_R_EN);
/* Enable Left and Right input PGA */ /* Enable Left and Right input PGA */
snd_soc_write(codec, DA7210_INMIX_L, DA7210_IN_L_EN); snd_soc_component_write(component, 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_R, DA7210_IN_R_EN);
/* Enable Left and Right ADC */ /* 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 * DAC settings
*/ */
/* Enable Left and Right DAC */ /* 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_L_SRC_DAI_L | DA7210_DAC_L_EN |
DA7210_DAC_R_SRC_DAI_R | DA7210_DAC_R_EN); DA7210_DAC_R_SRC_DAI_R | DA7210_DAC_R_EN);
/* Enable Left and Right out PGA */ /* Enable Left and Right out PGA */
snd_soc_write(codec, DA7210_OUTMIX_L, DA7210_OUT_L_EN); snd_soc_component_write(component, 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_R, DA7210_OUT_R_EN);
/* Enable Left and Right HeadPhone PGA */ /* 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_2CAP_MODE | DA7210_HP_SENSE_EN |
DA7210_HP_L_EN | DA7210_HP_MODE | DA7210_HP_R_EN); DA7210_HP_L_EN | DA7210_HP_MODE | DA7210_HP_R_EN);
/* Enable ramp mode for DAC gain update */ /* 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 * 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) ...@@ -1138,43 +1138,44 @@ static int da7210_probe(struct snd_soc_codec *codec)
*/ */
/* Enable Line out amplifiers */ /* Enable Line out amplifiers */
snd_soc_write(codec, DA7210_OUT1_L, DA7210_OUT1_L_EN); snd_soc_component_write(component, DA7210_OUT1_L, DA7210_OUT1_L_EN);
snd_soc_write(codec, DA7210_OUT1_R, DA7210_OUT1_R_EN); snd_soc_component_write(component, DA7210_OUT1_R, DA7210_OUT1_R_EN);
snd_soc_write(codec, DA7210_OUT2, DA7210_OUT2_EN | snd_soc_component_write(component, DA7210_OUT2, DA7210_OUT2_EN |
DA7210_OUT2_OUTMIX_L | DA7210_OUT2_OUTMIX_R); DA7210_OUT2_OUTMIX_L | DA7210_OUT2_OUTMIX_R);
/* Enable Aux1 */ /* Enable Aux1 */
snd_soc_write(codec, DA7210_AUX1_L, DA7210_AUX1_L_EN); snd_soc_component_write(component, 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_R, DA7210_AUX1_R_EN);
/* Enable Aux2 */ /* 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 */ /* 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); DA7210_PLL_BYP);
/* Diable PLL and bypass it */ /* 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 */ /* 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; 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, .probe = da7210_probe,
.controls = da7210_snd_controls,
.component_driver = { .num_controls = ARRAY_SIZE(da7210_snd_controls),
.controls = da7210_snd_controls, .dapm_widgets = da7210_dapm_widgets,
.num_controls = ARRAY_SIZE(da7210_snd_controls), .num_dapm_widgets = ARRAY_SIZE(da7210_dapm_widgets),
.dapm_widgets = da7210_dapm_widgets, .dapm_routes = da7210_audio_map,
.num_dapm_widgets = ARRAY_SIZE(da7210_dapm_widgets), .num_dapm_routes = ARRAY_SIZE(da7210_audio_map),
.dapm_routes = da7210_audio_map, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(da7210_audio_map), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
#if IS_ENABLED(CONFIG_I2C) #if IS_ENABLED(CONFIG_I2C)
...@@ -1232,20 +1233,14 @@ static int da7210_i2c_probe(struct i2c_client *i2c, ...@@ -1232,20 +1233,14 @@ static int da7210_i2c_probe(struct i2c_client *i2c,
if (ret != 0) if (ret != 0)
dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret); dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_da7210, &da7210_dai, 1); &soc_component_dev_da7210, &da7210_dai, 1);
if (ret < 0) 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; 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[] = { static const struct i2c_device_id da7210_i2c_id[] = {
{ "da7210", 0 }, { "da7210", 0 },
{ } { }
...@@ -1258,7 +1253,6 @@ static struct i2c_driver da7210_i2c_driver = { ...@@ -1258,7 +1253,6 @@ static struct i2c_driver da7210_i2c_driver = {
.name = "da7210", .name = "da7210",
}, },
.probe = da7210_i2c_probe, .probe = da7210_i2c_probe,
.remove = da7210_i2c_remove,
.id_table = da7210_i2c_id, .id_table = da7210_i2c_id,
}; };
#endif #endif
...@@ -1325,24 +1319,17 @@ static int da7210_spi_probe(struct spi_device *spi) ...@@ -1325,24 +1319,17 @@ static int da7210_spi_probe(struct spi_device *spi)
if (ret != 0) if (ret != 0)
dev_warn(&spi->dev, "Failed to apply regmap patch: %d\n", ret); dev_warn(&spi->dev, "Failed to apply regmap patch: %d\n", ret);
ret = snd_soc_register_codec(&spi->dev, ret = devm_snd_soc_register_component(&spi->dev,
&soc_codec_dev_da7210, &da7210_dai, 1); &soc_component_dev_da7210, &da7210_dai, 1);
return ret; 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 = { static struct spi_driver da7210_spi_driver = {
.driver = { .driver = {
.name = "da7210", .name = "da7210",
}, },
.probe = da7210_spi_probe, .probe = da7210_spi_probe,
.remove = da7210_spi_remove
}; };
#endif #endif
......
sound/soc/codecs/da7213.c
浏览文件 @ f499cf35
此差异已折叠。
sound/soc/codecs/da7218.c
浏览文件 @ f499cf35
此差异已折叠。
sound/soc/codecs/da7218.h
浏览文件 @ f499cf35
...@@ -1410,6 +1410,6 @@ struct da7218_priv { ...@@ -1410,6 +1410,6 @@ struct da7218_priv {
}; };
/* HP detect control */ /* 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 */ #endif /* _DA7218_H */
sound/soc/omap/ams-delta.c
浏览文件 @ f499cf35
...@@ -93,7 +93,7 @@ static unsigned short ams_delta_audio_agc; ...@@ -93,7 +93,7 @@ static unsigned short ams_delta_audio_agc;
* Used for passing a codec structure pointer * Used for passing a codec structure pointer
* from the board initialization code to the tty line discipline. * 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, static int ams_delta_set_audio_mode(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
...@@ -105,7 +105,7 @@ static int ams_delta_set_audio_mode(struct snd_kcontrol *kcontrol, ...@@ -105,7 +105,7 @@ static int ams_delta_set_audio_mode(struct snd_kcontrol *kcontrol,
int pin, changed = 0; int pin, changed = 0;
/* Refuse any mode changes if we are not able to control the codec. */ /* 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; return -EUNATCH;
if (ucontrol->value.enumerated.item[0] >= control->items) if (ucontrol->value.enumerated.item[0] >= control->items)
...@@ -300,15 +300,15 @@ static int cx81801_open(struct tty_struct *tty) ...@@ -300,15 +300,15 @@ static int cx81801_open(struct tty_struct *tty)
/* Line discipline .close() */ /* Line discipline .close() */
static void cx81801_close(struct tty_struct *tty) static void cx81801_close(struct tty_struct *tty)
{ {
struct snd_soc_codec *codec = tty->disc_data; struct snd_soc_component *component = tty->disc_data;
struct snd_soc_dapm_context *dapm = &codec->component.card->dapm; struct snd_soc_dapm_context *dapm = &component->card->dapm;
del_timer_sync(&cx81801_timer); del_timer_sync(&cx81801_timer);
/* Prevent the hook switch from further changing the DAPM pins */ /* Prevent the hook switch from further changing the DAPM pins */
INIT_LIST_HEAD(&ams_delta_hook_switch.pins); INIT_LIST_HEAD(&ams_delta_hook_switch.pins);
if (!codec) if (!component)
return; return;
v253_ops.close(tty); v253_ops.close(tty);
...@@ -338,14 +338,14 @@ static int cx81801_hangup(struct tty_struct *tty) ...@@ -338,14 +338,14 @@ static int cx81801_hangup(struct tty_struct *tty)
static void cx81801_receive(struct tty_struct *tty, static void cx81801_receive(struct tty_struct *tty,
const unsigned char *cp, char *fp, int count) 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; const unsigned char *c;
int apply, ret; int apply, ret;
if (!codec) if (!component)
return; return;
if (!codec->component.card->pop_time) { if (!component->card->pop_time) {
/* First modem response, complete setup procedure */ /* First modem response, complete setup procedure */
/* Initialize timer used for config pulse generation */ /* Initialize timer used for config pulse generation */
...@@ -358,7 +358,7 @@ static void cx81801_receive(struct tty_struct *tty, ...@@ -358,7 +358,7 @@ static void cx81801_receive(struct tty_struct *tty,
ARRAY_SIZE(ams_delta_hook_switch_pins), ARRAY_SIZE(ams_delta_hook_switch_pins),
ams_delta_hook_switch_pins); ams_delta_hook_switch_pins);
if (ret) if (ret)
dev_warn(codec->dev, dev_warn(component->dev,
"Failed to link hook switch to DAPM pins, " "Failed to link hook switch to DAPM pins, "
"will continue with hook switch unlinked.\n"); "will continue with hook switch unlinked.\n");
...@@ -467,7 +467,7 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd) ...@@ -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 */ /* Codec is ready, now add/activate board specific controls */
/* Store a pointer to the codec structure for tty ldisc use */ /* 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 */ /* Set up digital mute if not provided by the codec */
if (!codec_dai->driver->ops) { if (!codec_dai->driver->ops) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或