Skip to content

L
linux
Commit 78e89b82 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files
Options

ASoC: wm8940: replace codec to component 

Now we can replace Codec to Component. Let's do it.

Note:
	xxx_codec_xxx()		->	xxx_component_xxx()
	.idle_bias_off = 0	->	.idle_bias_on = 1
	.ignore_pmdown_time = 0	->	.use_pmdown_time = 1
	-			->	.endianness = 1
	-			->	.non_legacy_dai_naming = 1
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7928b2cb
Show whitespace changes
Inline Side-by-side
Showing with 76 additions and 83 deletions
sound/soc/codecs/wm8940.c
View file @ 78e89b82
...@@ -334,14 +334,14 @@ static const struct snd_soc_dapm_route wm8940_dapm_routes[] = { ...@@ -334,14 +334,14 @@ static const struct snd_soc_dapm_route wm8940_dapm_routes[] = {
{"ADC", NULL, "Boost Mixer"}, {"ADC", NULL, "Boost Mixer"},
}; };
#define wm8940_reset(c) snd_soc_write(c, WM8940_SOFTRESET, 0); #define wm8940_reset(c) snd_soc_component_write(c, WM8940_SOFTRESET, 0);
static int wm8940_set_dai_fmt(struct snd_soc_dai *codec_dai, static int wm8940_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
u16 iface = snd_soc_read(codec, WM8940_IFACE) & 0xFE67; u16 iface = snd_soc_component_read32(component, WM8940_IFACE) & 0xFE67;
u16 clk = snd_soc_read(codec, WM8940_CLOCK) & 0x1fe; u16 clk = snd_soc_component_read32(component, WM8940_CLOCK) & 0x1fe;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBM_CFM: case SND_SOC_DAIFMT_CBM_CFM:
...@@ -352,7 +352,7 @@ static int wm8940_set_dai_fmt(struct snd_soc_dai *codec_dai, ...@@ -352,7 +352,7 @@ static int wm8940_set_dai_fmt(struct snd_soc_dai *codec_dai,
default: default:
return -EINVAL; return -EINVAL;
} }
snd_soc_write(codec, WM8940_CLOCK, clk); snd_soc_component_write(component, WM8940_CLOCK, clk);
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S: case SND_SOC_DAIFMT_I2S:
...@@ -385,7 +385,7 @@ static int wm8940_set_dai_fmt(struct snd_soc_dai *codec_dai, ...@@ -385,7 +385,7 @@ static int wm8940_set_dai_fmt(struct snd_soc_dai *codec_dai,
break; break;
} }
snd_soc_write(codec, WM8940_IFACE, iface); snd_soc_component_write(component, WM8940_IFACE, iface);
return 0; return 0;
} }
...@@ -394,10 +394,10 @@ static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -394,10 +394,10 @@ static int wm8940_i2s_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;
u16 iface = snd_soc_read(codec, WM8940_IFACE) & 0xFD9F; u16 iface = snd_soc_component_read32(component, WM8940_IFACE) & 0xFD9F;
u16 addcntrl = snd_soc_read(codec, WM8940_ADDCNTRL) & 0xFFF1; u16 addcntrl = snd_soc_component_read32(component, WM8940_ADDCNTRL) & 0xFFF1;
u16 companding = snd_soc_read(codec, u16 companding = snd_soc_component_read32(component,
WM8940_COMPANDINGCTL) & 0xFFDF; WM8940_COMPANDINGCTL) & 0xFFDF;
int ret; int ret;
...@@ -426,7 +426,7 @@ static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -426,7 +426,7 @@ static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream,
case 48000: case 48000:
break; break;
} }
ret = snd_soc_write(codec, WM8940_ADDCNTRL, addcntrl); ret = snd_soc_component_write(component, WM8940_ADDCNTRL, addcntrl);
if (ret) if (ret)
goto error_ret; goto error_ret;
...@@ -446,10 +446,10 @@ static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -446,10 +446,10 @@ static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream,
iface |= (3 << 5); iface |= (3 << 5);
break; break;
} }
ret = snd_soc_write(codec, WM8940_COMPANDINGCTL, companding); ret = snd_soc_component_write(component, WM8940_COMPANDINGCTL, companding);
if (ret) if (ret)
goto error_ret; goto error_ret;
ret = snd_soc_write(codec, WM8940_IFACE, iface); ret = snd_soc_component_write(component, WM8940_IFACE, iface);
error_ret: error_ret:
return ret; return ret;
...@@ -457,21 +457,21 @@ static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -457,21 +457,21 @@ static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream,
static int wm8940_mute(struct snd_soc_dai *dai, int mute) static int wm8940_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
u16 mute_reg = snd_soc_read(codec, WM8940_DAC) & 0xffbf; u16 mute_reg = snd_soc_component_read32(component, WM8940_DAC) & 0xffbf;
if (mute) if (mute)
mute_reg |= 0x40; mute_reg |= 0x40;
return snd_soc_write(codec, WM8940_DAC, mute_reg); return snd_soc_component_write(component, WM8940_DAC, mute_reg);
} }
static int wm8940_set_bias_level(struct snd_soc_codec *codec, static int wm8940_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct wm8940_priv *wm8940 = snd_soc_codec_get_drvdata(codec); struct wm8940_priv *wm8940 = snd_soc_component_get_drvdata(component);
u16 val; u16 val;
u16 pwr_reg = snd_soc_read(codec, WM8940_POWER1) & 0x1F0; u16 pwr_reg = snd_soc_component_read32(component, WM8940_POWER1) & 0x1F0;
int ret = 0; int ret = 0;
switch (level) { switch (level) {
...@@ -479,23 +479,23 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec, ...@@ -479,23 +479,23 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec,
/* ensure bufioen and biasen */ /* ensure bufioen and biasen */
pwr_reg |= (1 << 2) | (1 << 3); pwr_reg |= (1 << 2) | (1 << 3);
/* Enable thermal shutdown */ /* Enable thermal shutdown */
val = snd_soc_read(codec, WM8940_OUTPUTCTL); val = snd_soc_component_read32(component, WM8940_OUTPUTCTL);
ret = snd_soc_write(codec, WM8940_OUTPUTCTL, val | 0x2); ret = snd_soc_component_write(component, WM8940_OUTPUTCTL, val | 0x2);
if (ret) if (ret)
break; break;
/* set vmid to 75k */ /* set vmid to 75k */
ret = snd_soc_write(codec, WM8940_POWER1, pwr_reg | 0x1); ret = snd_soc_component_write(component, WM8940_POWER1, pwr_reg | 0x1);
break; break;
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
/* ensure bufioen and biasen */ /* ensure bufioen and biasen */
pwr_reg |= (1 << 2) | (1 << 3); pwr_reg |= (1 << 2) | (1 << 3);
ret = snd_soc_write(codec, WM8940_POWER1, pwr_reg | 0x1); ret = snd_soc_component_write(component, WM8940_POWER1, pwr_reg | 0x1);
break; break;
case SND_SOC_BIAS_STANDBY: 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) {
ret = regcache_sync(wm8940->regmap); ret = regcache_sync(wm8940->regmap);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to sync cache: %d\n", ret); dev_err(component->dev, "Failed to sync cache: %d\n", ret);
return ret; return ret;
} }
} }
...@@ -503,10 +503,10 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec, ...@@ -503,10 +503,10 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec,
/* ensure bufioen and biasen */ /* ensure bufioen and biasen */
pwr_reg |= (1 << 2) | (1 << 3); pwr_reg |= (1 << 2) | (1 << 3);
/* set vmid to 300k for standby */ /* set vmid to 300k for standby */
ret = snd_soc_write(codec, WM8940_POWER1, pwr_reg | 0x2); ret = snd_soc_component_write(component, WM8940_POWER1, pwr_reg | 0x2);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
ret = snd_soc_write(codec, WM8940_POWER1, pwr_reg); ret = snd_soc_component_write(component, WM8940_POWER1, pwr_reg);
break; break;
} }
...@@ -576,40 +576,40 @@ static void pll_factors(unsigned int target, unsigned int source) ...@@ -576,40 +576,40 @@ static void pll_factors(unsigned int target, unsigned int source)
static int wm8940_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, static int wm8940_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
int source, unsigned int freq_in, unsigned int freq_out) int source, unsigned int freq_in, unsigned int freq_out)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
u16 reg; u16 reg;
/* Turn off PLL */ /* Turn off PLL */
reg = snd_soc_read(codec, WM8940_POWER1); reg = snd_soc_component_read32(component, WM8940_POWER1);
snd_soc_write(codec, WM8940_POWER1, reg & 0x1df); snd_soc_component_write(component, WM8940_POWER1, reg & 0x1df);
if (freq_in == 0 || freq_out == 0) { if (freq_in == 0 || freq_out == 0) {
/* Clock CODEC directly from MCLK */ /* Clock CODEC directly from MCLK */
reg = snd_soc_read(codec, WM8940_CLOCK); reg = snd_soc_component_read32(component, WM8940_CLOCK);
snd_soc_write(codec, WM8940_CLOCK, reg & 0x0ff); snd_soc_component_write(component, WM8940_CLOCK, reg & 0x0ff);
/* Pll power down */ /* Pll power down */
snd_soc_write(codec, WM8940_PLLN, (1 << 7)); snd_soc_component_write(component, WM8940_PLLN, (1 << 7));
return 0; return 0;
} }
/* Pll is followed by a frequency divide by 4 */ /* Pll is followed by a frequency divide by 4 */
pll_factors(freq_out*4, freq_in); pll_factors(freq_out*4, freq_in);
if (pll_div.k) if (pll_div.k)
snd_soc_write(codec, WM8940_PLLN, snd_soc_component_write(component, WM8940_PLLN,
(pll_div.pre_scale << 4) | pll_div.n | (1 << 6)); (pll_div.pre_scale << 4) | pll_div.n | (1 << 6));
else /* No factional component */ else /* No factional component */
snd_soc_write(codec, WM8940_PLLN, snd_soc_component_write(component, WM8940_PLLN,
(pll_div.pre_scale << 4) | pll_div.n); (pll_div.pre_scale << 4) | pll_div.n);
snd_soc_write(codec, WM8940_PLLK1, pll_div.k >> 18); snd_soc_component_write(component, WM8940_PLLK1, pll_div.k >> 18);
snd_soc_write(codec, WM8940_PLLK2, (pll_div.k >> 9) & 0x1ff); snd_soc_component_write(component, WM8940_PLLK2, (pll_div.k >> 9) & 0x1ff);
snd_soc_write(codec, WM8940_PLLK3, pll_div.k & 0x1ff); snd_soc_component_write(component, WM8940_PLLK3, pll_div.k & 0x1ff);
/* Enable the PLL */ /* Enable the PLL */
reg = snd_soc_read(codec, WM8940_POWER1); reg = snd_soc_component_read32(component, WM8940_POWER1);
snd_soc_write(codec, WM8940_POWER1, reg | 0x020); snd_soc_component_write(component, WM8940_POWER1, reg | 0x020);
/* Run CODEC from PLL instead of MCLK */ /* Run CODEC from PLL instead of MCLK */
reg = snd_soc_read(codec, WM8940_CLOCK); reg = snd_soc_component_read32(component, WM8940_CLOCK);
snd_soc_write(codec, WM8940_CLOCK, reg | 0x100); snd_soc_component_write(component, WM8940_CLOCK, reg | 0x100);
return 0; return 0;
} }
...@@ -617,8 +617,8 @@ static int wm8940_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, ...@@ -617,8 +617,8 @@ static int wm8940_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
static int wm8940_set_dai_sysclk(struct snd_soc_dai *codec_dai, static int wm8940_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 wm8940_priv *wm8940 = snd_soc_codec_get_drvdata(codec); struct wm8940_priv *wm8940 = snd_soc_component_get_drvdata(component);
switch (freq) { switch (freq) {
case 11289600: case 11289600:
...@@ -635,22 +635,22 @@ static int wm8940_set_dai_sysclk(struct snd_soc_dai *codec_dai, ...@@ -635,22 +635,22 @@ static int wm8940_set_dai_sysclk(struct snd_soc_dai *codec_dai,
static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai, static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
int div_id, int div) int div_id, int div)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
u16 reg; u16 reg;
int ret = 0; int ret = 0;
switch (div_id) { switch (div_id) {
case WM8940_BCLKDIV: case WM8940_BCLKDIV:
reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFE3; reg = snd_soc_component_read32(component, WM8940_CLOCK) & 0xFFE3;
ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 2)); ret = snd_soc_component_write(component, WM8940_CLOCK, reg | (div << 2));
break; break;
case WM8940_MCLKDIV: case WM8940_MCLKDIV:
reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFF1F; reg = snd_soc_component_read32(component, WM8940_CLOCK) & 0xFF1F;
ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 5)); ret = snd_soc_component_write(component, WM8940_CLOCK, reg | (div << 5));
break; break;
case WM8940_OPCLKDIV: case WM8940_OPCLKDIV:
reg = snd_soc_read(codec, WM8940_GPIO) & 0xFFCF; reg = snd_soc_component_read32(component, WM8940_GPIO) & 0xFFCF;
ret = snd_soc_write(codec, WM8940_GPIO, reg | (div << 4)); ret = snd_soc_component_write(component, WM8940_GPIO, reg | (div << 4));
break; break;
} }
return ret; return ret;
...@@ -693,29 +693,29 @@ static struct snd_soc_dai_driver wm8940_dai = { ...@@ -693,29 +693,29 @@ static struct snd_soc_dai_driver wm8940_dai = {
.symmetric_rates = 1, .symmetric_rates = 1,
}; };
static int wm8940_probe(struct snd_soc_codec *codec) static int wm8940_probe(struct snd_soc_component *component)
{ {
struct wm8940_setup_data *pdata = codec->dev->platform_data; struct wm8940_setup_data *pdata = component->dev->platform_data;
int ret; int ret;
u16 reg; u16 reg;
ret = wm8940_reset(codec); ret = wm8940_reset(component);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to issue reset\n"); dev_err(component->dev, "Failed to issue reset\n");
return ret; return ret;
} }
snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY); snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY);
ret = snd_soc_write(codec, WM8940_POWER1, 0x180); ret = snd_soc_component_write(component, WM8940_POWER1, 0x180);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!pdata) if (!pdata)
dev_warn(codec->dev, "No platform data supplied\n"); dev_warn(component->dev, "No platform data supplied\n");
else { else {
reg = snd_soc_read(codec, WM8940_OUTPUTCTL); reg = snd_soc_component_read32(component, WM8940_OUTPUTCTL);
ret = snd_soc_write(codec, WM8940_OUTPUTCTL, reg | pdata->vroi); ret = snd_soc_component_write(component, WM8940_OUTPUTCTL, reg | pdata->vroi);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
...@@ -723,19 +723,20 @@ static int wm8940_probe(struct snd_soc_codec *codec) ...@@ -723,19 +723,20 @@ static int wm8940_probe(struct snd_soc_codec *codec)
return ret; return ret;
} }
static const struct snd_soc_codec_driver soc_codec_dev_wm8940 = { static const struct snd_soc_component_driver soc_component_dev_wm8940 = {
.probe = wm8940_probe, .probe = wm8940_probe,
.set_bias_level = wm8940_set_bias_level, .set_bias_level = wm8940_set_bias_level,
.suspend_bias_off = true,
.component_driver = {
.controls = wm8940_snd_controls, .controls = wm8940_snd_controls,
.num_controls = ARRAY_SIZE(wm8940_snd_controls), .num_controls = ARRAY_SIZE(wm8940_snd_controls),
.dapm_widgets = wm8940_dapm_widgets, .dapm_widgets = wm8940_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(wm8940_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(wm8940_dapm_widgets),
.dapm_routes = wm8940_dapm_routes, .dapm_routes = wm8940_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(wm8940_dapm_routes), .num_dapm_routes = ARRAY_SIZE(wm8940_dapm_routes),
}, .suspend_bias_off = 1,
.idle_bias_on = 1,
.use_pmdown_time = 1,
.endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static const struct regmap_config wm8940_regmap = { static const struct regmap_config wm8940_regmap = {
...@@ -768,19 +769,12 @@ static int wm8940_i2c_probe(struct i2c_client *i2c, ...@@ -768,19 +769,12 @@ static int wm8940_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, wm8940); i2c_set_clientdata(i2c, wm8940);
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_wm8940, &wm8940_dai, 1); &soc_component_dev_wm8940, &wm8940_dai, 1);
return ret; return ret;
} }
static int wm8940_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
}
static const struct i2c_device_id wm8940_i2c_id[] = { static const struct i2c_device_id wm8940_i2c_id[] = {
{ "wm8940", 0 }, { "wm8940", 0 },
{ } { }
...@@ -792,7 +786,6 @@ static struct i2c_driver wm8940_i2c_driver = { ...@@ -792,7 +786,6 @@ static struct i2c_driver wm8940_i2c_driver = {
.name = "wm8940", .name = "wm8940",
}, },
.probe = wm8940_i2c_probe, .probe = wm8940_i2c_probe,
.remove = wm8940_i2c_remove,
.id_table = wm8940_i2c_id, .id_table = wm8940_i2c_id,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7