Skip to content

K
Kernel

openeuler / Kernel
大约 1 年 前同步成功

通知 5
Star 0
Fork 0
K
Kernel

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

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

Merge remote-tracking branches 'asoc/topic/wm8900', 'asoc/topic/wm8903',... 

Merge remote-tracking branches 'asoc/topic/wm8900', 'asoc/topic/wm8903', 'asoc/topic/wm8904', 'asoc/topic/wm8940' and 'asoc/topic/wm8955' into asoc-next
上级 deb66f3f 825a52aa 58bd2934 46a9100c 78e89b82 69b626e6
展开全部 隐藏空白更改
内联 并排
Showing with 576 addition and 599 deletion
sound/soc/codecs/wm8900.c
浏览文件 @ 5a33ab48
此差异已折叠。
sound/soc/codecs/wm8903.c
浏览文件 @ 5a33ab48
此差异已折叠。
sound/soc/codecs/wm8903.h
浏览文件 @ 5a33ab48
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
extern int wm8903_mic_detect(struct snd_soc_codec *codec, extern int wm8903_mic_detect(struct snd_soc_component *component,
struct snd_soc_jack *jack, struct snd_soc_jack *jack,
int det, int shrt); int det, int shrt);
......
sound/soc/codecs/wm8904.c
浏览文件 @ 5a33ab48
此差异已折叠。
sound/soc/codecs/wm8940.c
浏览文件 @ 5a33ab48
...@@ -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, .controls = wm8940_snd_controls,
.num_controls = ARRAY_SIZE(wm8940_snd_controls),
.component_driver = { .dapm_widgets = wm8940_dapm_widgets,
.controls = wm8940_snd_controls, .num_dapm_widgets = ARRAY_SIZE(wm8940_dapm_widgets),
.num_controls = ARRAY_SIZE(wm8940_snd_controls), .dapm_routes = wm8940_dapm_routes,
.dapm_widgets = wm8940_dapm_widgets, .num_dapm_routes = ARRAY_SIZE(wm8940_dapm_routes),
.num_dapm_widgets = ARRAY_SIZE(wm8940_dapm_widgets), .suspend_bias_off = 1,
.dapm_routes = wm8940_dapm_routes, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(wm8940_dapm_routes), .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,
}; };
......
sound/soc/codecs/wm8955.c
浏览文件 @ 5a33ab48
...@@ -128,9 +128,9 @@ static bool wm8955_volatile(struct device *dev, unsigned int reg) ...@@ -128,9 +128,9 @@ static bool wm8955_volatile(struct device *dev, unsigned int reg)
} }
} }
static int wm8955_reset(struct snd_soc_codec *codec) static int wm8955_reset(struct snd_soc_component *component)
{ {
return snd_soc_write(codec, WM8955_RESET, 0); return snd_soc_component_write(component, WM8955_RESET, 0);
} }
struct pll_factors { struct pll_factors {
...@@ -242,9 +242,9 @@ static struct { ...@@ -242,9 +242,9 @@ static struct {
{ 11289600, 88200, 0, 31, }, { 11289600, 88200, 0, 31, },
}; };
static int wm8955_configure_clocking(struct snd_soc_codec *codec) static int wm8955_configure_clocking(struct snd_soc_component *component)
{ {
struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); struct wm8955_priv *wm8955 = snd_soc_component_get_drvdata(component);
int i, ret, val; int i, ret, val;
int clocking = 0; int clocking = 0;
int srate = 0; int srate = 0;
...@@ -267,7 +267,7 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec) ...@@ -267,7 +267,7 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec)
/* We should never get here with an unsupported sample rate */ /* We should never get here with an unsupported sample rate */
if (sr == -1) { if (sr == -1) {
dev_err(codec->dev, "Sample rate %dHz unsupported\n", dev_err(component->dev, "Sample rate %dHz unsupported\n",
wm8955->fs); wm8955->fs);
WARN_ON(sr == -1); WARN_ON(sr == -1);
return -EINVAL; return -EINVAL;
...@@ -282,30 +282,30 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec) ...@@ -282,30 +282,30 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec)
/* Use the last divider configuration we saw for the /* Use the last divider configuration we saw for the
* sample rate. */ * sample rate. */
ret = wm8995_pll_factors(codec->dev, wm8955->mclk_rate, ret = wm8995_pll_factors(component->dev, wm8955->mclk_rate,
clock_cfgs[sr].mclk, &pll); clock_cfgs[sr].mclk, &pll);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, dev_err(component->dev,
"Unable to generate %dHz from %dHz MCLK\n", "Unable to generate %dHz from %dHz MCLK\n",
wm8955->fs, wm8955->mclk_rate); wm8955->fs, wm8955->mclk_rate);
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, WM8955_PLL_CONTROL_1, snd_soc_component_update_bits(component, WM8955_PLL_CONTROL_1,
WM8955_N_MASK | WM8955_K_21_18_MASK, WM8955_N_MASK | WM8955_K_21_18_MASK,
(pll.n << WM8955_N_SHIFT) | (pll.n << WM8955_N_SHIFT) |
pll.k >> 18); pll.k >> 18);
snd_soc_update_bits(codec, WM8955_PLL_CONTROL_2, snd_soc_component_update_bits(component, WM8955_PLL_CONTROL_2,
WM8955_K_17_9_MASK, WM8955_K_17_9_MASK,
(pll.k >> 9) & WM8955_K_17_9_MASK); (pll.k >> 9) & WM8955_K_17_9_MASK);
snd_soc_update_bits(codec, WM8955_PLL_CONTROL_3, snd_soc_component_update_bits(component, WM8955_PLL_CONTROL_3,
WM8955_K_8_0_MASK, WM8955_K_8_0_MASK,
pll.k & WM8955_K_8_0_MASK); pll.k & WM8955_K_8_0_MASK);
if (pll.k) if (pll.k)
snd_soc_update_bits(codec, WM8955_PLL_CONTROL_4, snd_soc_component_update_bits(component, WM8955_PLL_CONTROL_4,
WM8955_KEN, WM8955_KEN); WM8955_KEN, WM8955_KEN);
else else
snd_soc_update_bits(codec, WM8955_PLL_CONTROL_4, snd_soc_component_update_bits(component, WM8955_PLL_CONTROL_4,
WM8955_KEN, 0); WM8955_KEN, 0);
if (pll.outdiv) if (pll.outdiv)
...@@ -314,17 +314,17 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec) ...@@ -314,17 +314,17 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec)
val = WM8955_PLL_RB; val = WM8955_PLL_RB;
/* Now start the PLL running */ /* Now start the PLL running */
snd_soc_update_bits(codec, WM8955_CLOCKING_PLL, snd_soc_component_update_bits(component, WM8955_CLOCKING_PLL,
WM8955_PLL_RB | WM8955_PLLOUTDIV2, val); WM8955_PLL_RB | WM8955_PLLOUTDIV2, val);
snd_soc_update_bits(codec, WM8955_CLOCKING_PLL, snd_soc_component_update_bits(component, WM8955_CLOCKING_PLL,
WM8955_PLLEN, WM8955_PLLEN); WM8955_PLLEN, WM8955_PLLEN);
} }
srate = clock_cfgs[sr].usb | (clock_cfgs[sr].sr << WM8955_SR_SHIFT); srate = clock_cfgs[sr].usb | (clock_cfgs[sr].sr << WM8955_SR_SHIFT);
snd_soc_update_bits(codec, WM8955_SAMPLE_RATE, snd_soc_component_update_bits(component, WM8955_SAMPLE_RATE,
WM8955_USB | WM8955_SR_MASK, srate); WM8955_USB | WM8955_SR_MASK, srate);
snd_soc_update_bits(codec, WM8955_CLOCKING_PLL, snd_soc_component_update_bits(component, WM8955_CLOCKING_PLL,
WM8955_MCLKSEL, clocking); WM8955_MCLKSEL, clocking);
return 0; return 0;
...@@ -333,22 +333,22 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec) ...@@ -333,22 +333,22 @@ static int wm8955_configure_clocking(struct snd_soc_codec *codec)
static int wm8955_sysclk(struct snd_soc_dapm_widget *w, static int wm8955_sysclk(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
int ret = 0; int ret = 0;
/* Always disable the clocks - if we're doing reconfiguration this /* Always disable the clocks - if we're doing reconfiguration this
* avoids misclocking. * avoids misclocking.
*/ */
snd_soc_update_bits(codec, WM8955_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8955_POWER_MANAGEMENT_1,
WM8955_DIGENB, 0); WM8955_DIGENB, 0);
snd_soc_update_bits(codec, WM8955_CLOCKING_PLL, snd_soc_component_update_bits(component, WM8955_CLOCKING_PLL,
WM8955_PLL_RB | WM8955_PLLEN, 0); WM8955_PLL_RB | WM8955_PLLEN, 0);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
break; break;
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
ret = wm8955_configure_clocking(codec); ret = wm8955_configure_clocking(component);
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
...@@ -360,9 +360,9 @@ static int wm8955_sysclk(struct snd_soc_dapm_widget *w, ...@@ -360,9 +360,9 @@ static int wm8955_sysclk(struct snd_soc_dapm_widget *w,
static int deemph_settings[] = { 0, 32000, 44100, 48000 }; static int deemph_settings[] = { 0, 32000, 44100, 48000 };
static int wm8955_set_deemph(struct snd_soc_codec *codec) static int wm8955_set_deemph(struct snd_soc_component *component)
{ {
struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); struct wm8955_priv *wm8955 = snd_soc_component_get_drvdata(component);
int val, i, best; int val, i, best;
/* If we're using deemphasis select the nearest available sample /* If we're using deemphasis select the nearest available sample
...@@ -381,17 +381,17 @@ static int wm8955_set_deemph(struct snd_soc_codec *codec) ...@@ -381,17 +381,17 @@ static int wm8955_set_deemph(struct snd_soc_codec *codec)
val = 0; val = 0;
} }
dev_dbg(codec->dev, "Set deemphasis %d\n", val); dev_dbg(component->dev, "Set deemphasis %d\n", val);
return snd_soc_update_bits(codec, WM8955_DAC_CONTROL, return snd_soc_component_update_bits(component, WM8955_DAC_CONTROL,
WM8955_DEEMPH_MASK, val); WM8955_DEEMPH_MASK, val);
} }
static int wm8955_get_deemph(struct snd_kcontrol *kcontrol, static int wm8955_get_deemph(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);
struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); struct wm8955_priv *wm8955 = snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = wm8955->deemph; ucontrol->value.integer.value[0] = wm8955->deemph;
return 0; return 0;
...@@ -400,8 +400,8 @@ static int wm8955_get_deemph(struct snd_kcontrol *kcontrol, ...@@ -400,8 +400,8 @@ static int wm8955_get_deemph(struct snd_kcontrol *kcontrol,
static int wm8955_put_deemph(struct snd_kcontrol *kcontrol, static int wm8955_put_deemph(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);
struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); struct wm8955_priv *wm8955 = snd_soc_component_get_drvdata(component);
unsigned int deemph = ucontrol->value.integer.value[0]; unsigned int deemph = ucontrol->value.integer.value[0];
if (deemph > 1) if (deemph > 1)
...@@ -409,7 +409,7 @@ static int wm8955_put_deemph(struct snd_kcontrol *kcontrol, ...@@ -409,7 +409,7 @@ static int wm8955_put_deemph(struct snd_kcontrol *kcontrol,
wm8955->deemph = deemph; wm8955->deemph = deemph;
return wm8955_set_deemph(codec); return wm8955_set_deemph(component);
} }
static const char *bass_mode_text[] = { static const char *bass_mode_text[] = {
...@@ -592,8 +592,8 @@ static int wm8955_hw_params(struct snd_pcm_substream *substream, ...@@ -592,8 +592,8 @@ static int wm8955_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 wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); struct wm8955_priv *wm8955 = snd_soc_component_get_drvdata(component);
int ret; int ret;
int wl; int wl;
...@@ -613,25 +613,25 @@ static int wm8955_hw_params(struct snd_pcm_substream *substream, ...@@ -613,25 +613,25 @@ static int wm8955_hw_params(struct snd_pcm_substream *substream,
default: default:
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, WM8955_AUDIO_INTERFACE, snd_soc_component_update_bits(component, WM8955_AUDIO_INTERFACE,
WM8955_WL_MASK, wl); WM8955_WL_MASK, wl);
wm8955->fs = params_rate(params); wm8955->fs = params_rate(params);
wm8955_set_deemph(codec); wm8955_set_deemph(component);
/* If the chip is clocked then disable the clocks and force a /* If the chip is clocked then disable the clocks and force a
* reconfiguration, otherwise DAPM will power up the * reconfiguration, otherwise DAPM will power up the
* clocks for us later. */ * clocks for us later. */
ret = snd_soc_read(codec, WM8955_POWER_MANAGEMENT_1); ret = snd_soc_component_read32(component, WM8955_POWER_MANAGEMENT_1);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret & WM8955_DIGENB) { if (ret & WM8955_DIGENB) {
snd_soc_update_bits(codec, WM8955_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8955_POWER_MANAGEMENT_1,
WM8955_DIGENB, 0); WM8955_DIGENB, 0);
snd_soc_update_bits(codec, WM8955_CLOCKING_PLL, snd_soc_component_update_bits(component, WM8955_CLOCKING_PLL,
WM8955_PLL_RB | WM8955_PLLEN, 0); WM8955_PLL_RB | WM8955_PLLEN, 0);
wm8955_configure_clocking(codec); wm8955_configure_clocking(component);
} }
return 0; return 0;
...@@ -641,8 +641,8 @@ static int wm8955_hw_params(struct snd_pcm_substream *substream, ...@@ -641,8 +641,8 @@ static int wm8955_hw_params(struct snd_pcm_substream *substream,
static int wm8955_set_sysclk(struct snd_soc_dai *dai, int clk_id, static int wm8955_set_sysclk(struct snd_soc_dai *dai, int clk_id,
unsigned int freq, int dir) unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct wm8955_priv *priv = snd_soc_codec_get_drvdata(codec); struct wm8955_priv *priv = snd_soc_component_get_drvdata(component);
int div; int div;
switch (clk_id) { switch (clk_id) {
...@@ -655,7 +655,7 @@ static int wm8955_set_sysclk(struct snd_soc_dai *dai, int clk_id, ...@@ -655,7 +655,7 @@ static int wm8955_set_sysclk(struct snd_soc_dai *dai, int clk_id,
div = 0; div = 0;
} }
snd_soc_update_bits(codec, WM8955_SAMPLE_RATE, snd_soc_component_update_bits(component, WM8955_SAMPLE_RATE,
WM8955_MCLKDIV2, div); WM8955_MCLKDIV2, div);
break; break;
...@@ -670,7 +670,7 @@ static int wm8955_set_sysclk(struct snd_soc_dai *dai, int clk_id, ...@@ -670,7 +670,7 @@ static int wm8955_set_sysclk(struct snd_soc_dai *dai, int clk_id,
static int wm8955_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int wm8955_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
u16 aif = 0; u16 aif = 0;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
...@@ -739,7 +739,7 @@ static int wm8955_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -739,7 +739,7 @@ static int wm8955_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
return -EINVAL; return -EINVAL;
} }
snd_soc_update_bits(codec, WM8955_AUDIO_INTERFACE, snd_soc_component_update_bits(component, WM8955_AUDIO_INTERFACE,
WM8955_MS | WM8955_FORMAT_MASK | WM8955_BCLKINV | WM8955_MS | WM8955_FORMAT_MASK | WM8955_BCLKINV |
WM8955_LRP, aif); WM8955_LRP, aif);
...@@ -749,7 +749,7 @@ static int wm8955_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -749,7 +749,7 @@ static int wm8955_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
static int wm8955_digital_mute(struct snd_soc_dai *codec_dai, int mute) static int wm8955_digital_mute(struct snd_soc_dai *codec_dai, int mute)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
int val; int val;
if (mute) if (mute)
...@@ -757,15 +757,15 @@ static int wm8955_digital_mute(struct snd_soc_dai *codec_dai, int mute) ...@@ -757,15 +757,15 @@ static int wm8955_digital_mute(struct snd_soc_dai *codec_dai, int mute)
else else
val = 0; val = 0;
snd_soc_update_bits(codec, WM8955_DAC_CONTROL, WM8955_DACMU, val); snd_soc_component_update_bits(component, WM8955_DAC_CONTROL, WM8955_DACMU, val);
return 0; return 0;
} }
static int wm8955_set_bias_level(struct snd_soc_codec *codec, static int wm8955_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); struct wm8955_priv *wm8955 = snd_soc_component_get_drvdata(component);
int ret; int ret;
switch (level) { switch (level) {
...@@ -774,22 +774,22 @@ static int wm8955_set_bias_level(struct snd_soc_codec *codec, ...@@ -774,22 +774,22 @@ static int wm8955_set_bias_level(struct snd_soc_codec *codec,
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
/* VMID resistance 2*50k */ /* VMID resistance 2*50k */
snd_soc_update_bits(codec, WM8955_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8955_POWER_MANAGEMENT_1,
WM8955_VMIDSEL_MASK, WM8955_VMIDSEL_MASK,
0x1 << WM8955_VMIDSEL_SHIFT); 0x1 << WM8955_VMIDSEL_SHIFT);
/* Default bias current */ /* Default bias current */
snd_soc_update_bits(codec, WM8955_ADDITIONAL_CONTROL_1, snd_soc_component_update_bits(component, WM8955_ADDITIONAL_CONTROL_1,
WM8955_VSEL_MASK, WM8955_VSEL_MASK,
0x2 << WM8955_VSEL_SHIFT); 0x2 << WM8955_VSEL_SHIFT);
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 = regulator_bulk_enable(ARRAY_SIZE(wm8955->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(wm8955->supplies),
wm8955->supplies); wm8955->supplies);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, dev_err(component->dev,
"Failed to enable supplies: %d\n", "Failed to enable supplies: %d\n",
ret); ret);
return ret; return ret;
...@@ -798,7 +798,7 @@ static int wm8955_set_bias_level(struct snd_soc_codec *codec, ...@@ -798,7 +798,7 @@ static int wm8955_set_bias_level(struct snd_soc_codec *codec,
regcache_sync(wm8955->regmap); regcache_sync(wm8955->regmap);
/* Enable VREF and VMID */ /* Enable VREF and VMID */
snd_soc_update_bits(codec, WM8955_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8955_POWER_MANAGEMENT_1,
WM8955_VREF | WM8955_VREF |
WM8955_VMIDSEL_MASK, WM8955_VMIDSEL_MASK,
WM8955_VREF | WM8955_VREF |
...@@ -808,29 +808,29 @@ static int wm8955_set_bias_level(struct snd_soc_codec *codec, ...@@ -808,29 +808,29 @@ static int wm8955_set_bias_level(struct snd_soc_codec *codec,
msleep(500); msleep(500);
/* High resistance VROI to maintain outputs */ /* High resistance VROI to maintain outputs */
snd_soc_update_bits(codec, snd_soc_component_update_bits(component,
WM8955_ADDITIONAL_CONTROL_3, WM8955_ADDITIONAL_CONTROL_3,
WM8955_VROI, WM8955_VROI); WM8955_VROI, WM8955_VROI);
} }
/* Maintain VMID with 2*250k */ /* Maintain VMID with 2*250k */
snd_soc_update_bits(codec, WM8955_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8955_POWER_MANAGEMENT_1,
WM8955_VMIDSEL_MASK, WM8955_VMIDSEL_MASK,
0x2 << WM8955_VMIDSEL_SHIFT); 0x2 << WM8955_VMIDSEL_SHIFT);
/* Minimum bias current */ /* Minimum bias current */
snd_soc_update_bits(codec, WM8955_ADDITIONAL_CONTROL_1, snd_soc_component_update_bits(component, WM8955_ADDITIONAL_CONTROL_1,
WM8955_VSEL_MASK, 0); WM8955_VSEL_MASK, 0);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
/* Low resistance VROI to help discharge */ /* Low resistance VROI to help discharge */
snd_soc_update_bits(codec, snd_soc_component_update_bits(component,
WM8955_ADDITIONAL_CONTROL_3, WM8955_ADDITIONAL_CONTROL_3,
WM8955_VROI, 0); WM8955_VROI, 0);
/* Turn off VMID and VREF */ /* Turn off VMID and VREF */
snd_soc_update_bits(codec, WM8955_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8955_POWER_MANAGEMENT_1,
WM8955_VREF | WM8955_VREF |
WM8955_VMIDSEL_MASK, 0); WM8955_VMIDSEL_MASK, 0);
...@@ -865,70 +865,70 @@ static struct snd_soc_dai_driver wm8955_dai = { ...@@ -865,70 +865,70 @@ static struct snd_soc_dai_driver wm8955_dai = {
.ops = &wm8955_dai_ops, .ops = &wm8955_dai_ops,
}; };
static int wm8955_probe(struct snd_soc_codec *codec) static int wm8955_probe(struct snd_soc_component *component)
{ {
struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); struct wm8955_priv *wm8955 = snd_soc_component_get_drvdata(component);
struct wm8955_pdata *pdata = dev_get_platdata(codec->dev); struct wm8955_pdata *pdata = dev_get_platdata(component->dev);
int ret, i; int ret, i;
for (i = 0; i < ARRAY_SIZE(wm8955->supplies); i++) for (i = 0; i < ARRAY_SIZE(wm8955->supplies); i++)
wm8955->supplies[i].supply = wm8955_supply_names[i]; wm8955->supplies[i].supply = wm8955_supply_names[i];
ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8955->supplies), ret = devm_regulator_bulk_get(component->dev, ARRAY_SIZE(wm8955->supplies),
wm8955->supplies); wm8955->supplies);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, "Failed to request supplies: %d\n", ret); dev_err(component->dev, "Failed to request supplies: %d\n", ret);
return ret; return ret;
} }
ret = regulator_bulk_enable(ARRAY_SIZE(wm8955->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(wm8955->supplies),
wm8955->supplies); wm8955->supplies);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, "Failed to enable supplies: %d\n", ret); dev_err(component->dev, "Failed to enable supplies: %d\n", ret);
return ret; return ret;
} }
ret = wm8955_reset(codec); ret = wm8955_reset(component);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Failed to issue reset: %d\n", ret); dev_err(component->dev, "Failed to issue reset: %d\n", ret);
goto err_enable; goto err_enable;
} }
/* Change some default settings - latch VU and enable ZC */ /* Change some default settings - latch VU and enable ZC */
snd_soc_update_bits(codec, WM8955_LEFT_DAC_VOLUME, snd_soc_component_update_bits(component, WM8955_LEFT_DAC_VOLUME,
WM8955_LDVU, WM8955_LDVU); WM8955_LDVU, WM8955_LDVU);
snd_soc_update_bits(codec, WM8955_RIGHT_DAC_VOLUME, snd_soc_component_update_bits(component, WM8955_RIGHT_DAC_VOLUME,
WM8955_RDVU, WM8955_RDVU); WM8955_RDVU, WM8955_RDVU);
snd_soc_update_bits(codec, WM8955_LOUT1_VOLUME, snd_soc_component_update_bits(component, WM8955_LOUT1_VOLUME,
WM8955_LO1VU | WM8955_LO1ZC, WM8955_LO1VU | WM8955_LO1ZC,
WM8955_LO1VU | WM8955_LO1ZC); WM8955_LO1VU | WM8955_LO1ZC);
snd_soc_update_bits(codec, WM8955_ROUT1_VOLUME, snd_soc_component_update_bits(component, WM8955_ROUT1_VOLUME,
WM8955_RO1VU | WM8955_RO1ZC, WM8955_RO1VU | WM8955_RO1ZC,
WM8955_RO1VU | WM8955_RO1ZC); WM8955_RO1VU | WM8955_RO1ZC);
snd_soc_update_bits(codec, WM8955_LOUT2_VOLUME, snd_soc_component_update_bits(component, WM8955_LOUT2_VOLUME,
WM8955_LO2VU | WM8955_LO2ZC, WM8955_LO2VU | WM8955_LO2ZC,
WM8955_LO2VU | WM8955_LO2ZC); WM8955_LO2VU | WM8955_LO2ZC);
snd_soc_update_bits(codec, WM8955_ROUT2_VOLUME, snd_soc_component_update_bits(component, WM8955_ROUT2_VOLUME,
WM8955_RO2VU | WM8955_RO2ZC, WM8955_RO2VU | WM8955_RO2ZC,
WM8955_RO2VU | WM8955_RO2ZC); WM8955_RO2VU | WM8955_RO2ZC);
snd_soc_update_bits(codec, WM8955_MONOOUT_VOLUME, snd_soc_component_update_bits(component, WM8955_MONOOUT_VOLUME,
WM8955_MOZC, WM8955_MOZC); WM8955_MOZC, WM8955_MOZC);
/* Also enable adaptive bass boost by default */ /* Also enable adaptive bass boost by default */
snd_soc_update_bits(codec, WM8955_BASS_CONTROL, WM8955_BB, WM8955_BB); snd_soc_component_update_bits(component, WM8955_BASS_CONTROL, WM8955_BB, WM8955_BB);
/* Set platform data values */ /* Set platform data values */
if (pdata) { if (pdata) {
if (pdata->out2_speaker) if (pdata->out2_speaker)
snd_soc_update_bits(codec, WM8955_ADDITIONAL_CONTROL_2, snd_soc_component_update_bits(component, WM8955_ADDITIONAL_CONTROL_2,
WM8955_ROUT2INV, WM8955_ROUT2INV); WM8955_ROUT2INV, WM8955_ROUT2INV);
if (pdata->monoin_diff) if (pdata->monoin_diff)
snd_soc_update_bits(codec, WM8955_MONO_OUT_MIX_1, snd_soc_component_update_bits(component, WM8955_MONO_OUT_MIX_1,
WM8955_DMEN, WM8955_DMEN); WM8955_DMEN, WM8955_DMEN);
} }
snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY); snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY);
/* Bias level configuration will have done an extra enable */ /* Bias level configuration will have done an extra enable */
regulator_bulk_disable(ARRAY_SIZE(wm8955->supplies), wm8955->supplies); regulator_bulk_disable(ARRAY_SIZE(wm8955->supplies), wm8955->supplies);
...@@ -940,19 +940,20 @@ static int wm8955_probe(struct snd_soc_codec *codec) ...@@ -940,19 +940,20 @@ static int wm8955_probe(struct snd_soc_codec *codec)
return ret; return ret;
} }
static const struct snd_soc_codec_driver soc_codec_dev_wm8955 = { static const struct snd_soc_component_driver soc_component_dev_wm8955 = {
.probe = wm8955_probe, .probe = wm8955_probe,
.set_bias_level = wm8955_set_bias_level, .set_bias_level = wm8955_set_bias_level,
.suspend_bias_off = true, .controls = wm8955_snd_controls,
.num_controls = ARRAY_SIZE(wm8955_snd_controls),
.component_driver = { .dapm_widgets = wm8955_dapm_widgets,
.controls = wm8955_snd_controls, .num_dapm_widgets = ARRAY_SIZE(wm8955_dapm_widgets),
.num_controls = ARRAY_SIZE(wm8955_snd_controls), .dapm_routes = wm8955_dapm_routes,
.dapm_widgets = wm8955_dapm_widgets, .num_dapm_routes = ARRAY_SIZE(wm8955_dapm_routes),
.num_dapm_widgets = ARRAY_SIZE(wm8955_dapm_widgets), .suspend_bias_off = 1,
.dapm_routes = wm8955_dapm_routes, .idle_bias_on = 1,
.num_dapm_routes = ARRAY_SIZE(wm8955_dapm_routes), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static const struct regmap_config wm8955_regmap = { static const struct regmap_config wm8955_regmap = {
...@@ -989,19 +990,12 @@ static int wm8955_i2c_probe(struct i2c_client *i2c, ...@@ -989,19 +990,12 @@ static int wm8955_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, wm8955); i2c_set_clientdata(i2c, wm8955);
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_wm8955, &wm8955_dai, 1); &soc_component_dev_wm8955, &wm8955_dai, 1);
return ret; return ret;
} }
static int wm8955_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
}
static const struct i2c_device_id wm8955_i2c_id[] = { static const struct i2c_device_id wm8955_i2c_id[] = {
{ "wm8955", 0 }, { "wm8955", 0 },
{ } { }
...@@ -1013,7 +1007,6 @@ static struct i2c_driver wm8955_i2c_driver = { ...@@ -1013,7 +1007,6 @@ static struct i2c_driver wm8955_i2c_driver = {
.name = "wm8955", .name = "wm8955",
}, },
.probe = wm8955_i2c_probe, .probe = wm8955_i2c_probe,
.remove = wm8955_i2c_remove,
.id_table = wm8955_i2c_id, .id_table = wm8955_i2c_id,
}; };
......
sound/soc/tegra/tegra_wm8903.c
浏览文件 @ 5a33ab48
...@@ -170,7 +170,7 @@ static const struct snd_kcontrol_new tegra_wm8903_controls[] = { ...@@ -170,7 +170,7 @@ static const struct snd_kcontrol_new tegra_wm8903_controls[] = {
static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dai *codec_dai = rtd->codec_dai;
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card); struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
...@@ -189,7 +189,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) ...@@ -189,7 +189,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
&tegra_wm8903_mic_jack, &tegra_wm8903_mic_jack,
tegra_wm8903_mic_jack_pins, tegra_wm8903_mic_jack_pins,
ARRAY_SIZE(tegra_wm8903_mic_jack_pins)); ARRAY_SIZE(tegra_wm8903_mic_jack_pins));
wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE, wm8903_mic_detect(component, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE,
0); 0);
snd_soc_dapm_force_enable_pin(&card->dapm, "MICBIAS"); snd_soc_dapm_force_enable_pin(&card->dapm, "MICBIAS");
...@@ -202,9 +202,9 @@ static int tegra_wm8903_remove(struct snd_soc_card *card) ...@@ -202,9 +202,9 @@ static int tegra_wm8903_remove(struct snd_soc_card *card)
struct snd_soc_pcm_runtime *rtd = struct snd_soc_pcm_runtime *rtd =
snd_soc_get_pcm_runtime(card, card->dai_link[0].name); snd_soc_get_pcm_runtime(card, card->dai_link[0].name);
struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dai *codec_dai = rtd->codec_dai;
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
wm8903_mic_detect(codec, NULL, 0, 0); wm8903_mic_detect(component, NULL, 0, 0);
return 0; return 0;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或