mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 13:13:57 +08:00
ASoC: ak4671: 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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
7928b2cbe5
commit
57188d8875
@ -163,15 +163,15 @@ static const struct snd_kcontrol_new ak4671_snd_controls[] = {
|
|||||||
static int ak4671_out2_event(struct snd_soc_dapm_widget *w,
|
static int ak4671_out2_event(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);
|
||||||
|
|
||||||
switch (event) {
|
switch (event) {
|
||||||
case SND_SOC_DAPM_POST_PMU:
|
case SND_SOC_DAPM_POST_PMU:
|
||||||
snd_soc_update_bits(codec, AK4671_LOUT2_POWER_MANAGERMENT,
|
snd_soc_component_update_bits(component, AK4671_LOUT2_POWER_MANAGERMENT,
|
||||||
AK4671_MUTEN, AK4671_MUTEN);
|
AK4671_MUTEN, AK4671_MUTEN);
|
||||||
break;
|
break;
|
||||||
case SND_SOC_DAPM_PRE_PMD:
|
case SND_SOC_DAPM_PRE_PMD:
|
||||||
snd_soc_update_bits(codec, AK4671_LOUT2_POWER_MANAGERMENT,
|
snd_soc_component_update_bits(component, AK4671_LOUT2_POWER_MANAGERMENT,
|
||||||
AK4671_MUTEN, 0);
|
AK4671_MUTEN, 0);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -427,10 +427,10 @@ static int ak4671_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;
|
||||||
u8 fs;
|
u8 fs;
|
||||||
|
|
||||||
fs = snd_soc_read(codec, AK4671_PLL_MODE_SELECT0);
|
fs = snd_soc_component_read32(component, AK4671_PLL_MODE_SELECT0);
|
||||||
fs &= ~AK4671_FS;
|
fs &= ~AK4671_FS;
|
||||||
|
|
||||||
switch (params_rate(params)) {
|
switch (params_rate(params)) {
|
||||||
@ -465,7 +465,7 @@ static int ak4671_hw_params(struct snd_pcm_substream *substream,
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
snd_soc_write(codec, AK4671_PLL_MODE_SELECT0, fs);
|
snd_soc_component_write(component, AK4671_PLL_MODE_SELECT0, fs);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -473,10 +473,10 @@ static int ak4671_hw_params(struct snd_pcm_substream *substream,
|
|||||||
static int ak4671_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
|
static int ak4671_set_dai_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;
|
||||||
u8 pll;
|
u8 pll;
|
||||||
|
|
||||||
pll = snd_soc_read(codec, AK4671_PLL_MODE_SELECT0);
|
pll = snd_soc_component_read32(component, AK4671_PLL_MODE_SELECT0);
|
||||||
pll &= ~AK4671_PLL;
|
pll &= ~AK4671_PLL;
|
||||||
|
|
||||||
switch (freq) {
|
switch (freq) {
|
||||||
@ -511,19 +511,19 @@ static int ak4671_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
snd_soc_write(codec, AK4671_PLL_MODE_SELECT0, pll);
|
snd_soc_component_write(component, AK4671_PLL_MODE_SELECT0, pll);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ak4671_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
static int ak4671_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
||||||
{
|
{
|
||||||
struct snd_soc_codec *codec = dai->codec;
|
struct snd_soc_component *component = dai->component;
|
||||||
u8 mode;
|
u8 mode;
|
||||||
u8 format;
|
u8 format;
|
||||||
|
|
||||||
/* set master/slave audio interface */
|
/* set master/slave audio interface */
|
||||||
mode = snd_soc_read(codec, AK4671_PLL_MODE_SELECT1);
|
mode = snd_soc_component_read32(component, AK4671_PLL_MODE_SELECT1);
|
||||||
|
|
||||||
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:
|
||||||
@ -537,7 +537,7 @@ static int ak4671_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* interface format */
|
/* interface format */
|
||||||
format = snd_soc_read(codec, AK4671_FORMAT_SELECT);
|
format = snd_soc_component_read32(component, AK4671_FORMAT_SELECT);
|
||||||
format &= ~AK4671_DIF;
|
format &= ~AK4671_DIF;
|
||||||
|
|
||||||
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
|
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
|
||||||
@ -557,24 +557,24 @@ static int ak4671_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* set mode and format */
|
/* set mode and format */
|
||||||
snd_soc_write(codec, AK4671_PLL_MODE_SELECT1, mode);
|
snd_soc_component_write(component, AK4671_PLL_MODE_SELECT1, mode);
|
||||||
snd_soc_write(codec, AK4671_FORMAT_SELECT, format);
|
snd_soc_component_write(component, AK4671_FORMAT_SELECT, format);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ak4671_set_bias_level(struct snd_soc_codec *codec,
|
static int ak4671_set_bias_level(struct snd_soc_component *component,
|
||||||
enum snd_soc_bias_level level)
|
enum snd_soc_bias_level level)
|
||||||
{
|
{
|
||||||
switch (level) {
|
switch (level) {
|
||||||
case SND_SOC_BIAS_ON:
|
case SND_SOC_BIAS_ON:
|
||||||
case SND_SOC_BIAS_PREPARE:
|
case SND_SOC_BIAS_PREPARE:
|
||||||
case SND_SOC_BIAS_STANDBY:
|
case SND_SOC_BIAS_STANDBY:
|
||||||
snd_soc_update_bits(codec, AK4671_AD_DA_POWER_MANAGEMENT,
|
snd_soc_component_update_bits(component, AK4671_AD_DA_POWER_MANAGEMENT,
|
||||||
AK4671_PMVCM, AK4671_PMVCM);
|
AK4671_PMVCM, AK4671_PMVCM);
|
||||||
break;
|
break;
|
||||||
case SND_SOC_BIAS_OFF:
|
case SND_SOC_BIAS_OFF:
|
||||||
snd_soc_write(codec, AK4671_AD_DA_POWER_MANAGEMENT, 0x00);
|
snd_soc_component_write(component, AK4671_AD_DA_POWER_MANAGEMENT, 0x00);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
@ -610,16 +610,18 @@ static struct snd_soc_dai_driver ak4671_dai = {
|
|||||||
.ops = &ak4671_dai_ops,
|
.ops = &ak4671_dai_ops,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_codec_driver soc_codec_dev_ak4671 = {
|
static const struct snd_soc_component_driver soc_component_dev_ak4671 = {
|
||||||
.set_bias_level = ak4671_set_bias_level,
|
.set_bias_level = ak4671_set_bias_level,
|
||||||
.component_driver = {
|
.controls = ak4671_snd_controls,
|
||||||
.controls = ak4671_snd_controls,
|
.num_controls = ARRAY_SIZE(ak4671_snd_controls),
|
||||||
.num_controls = ARRAY_SIZE(ak4671_snd_controls),
|
.dapm_widgets = ak4671_dapm_widgets,
|
||||||
.dapm_widgets = ak4671_dapm_widgets,
|
.num_dapm_widgets = ARRAY_SIZE(ak4671_dapm_widgets),
|
||||||
.num_dapm_widgets = ARRAY_SIZE(ak4671_dapm_widgets),
|
.dapm_routes = ak4671_intercon,
|
||||||
.dapm_routes = ak4671_intercon,
|
.num_dapm_routes = ARRAY_SIZE(ak4671_intercon),
|
||||||
.num_dapm_routes = ARRAY_SIZE(ak4671_intercon),
|
.idle_bias_on = 1,
|
||||||
},
|
.use_pmdown_time = 1,
|
||||||
|
.endianness = 1,
|
||||||
|
.non_legacy_dai_naming = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct regmap_config ak4671_regmap = {
|
static const struct regmap_config ak4671_regmap = {
|
||||||
@ -645,17 +647,11 @@ static int ak4671_i2c_probe(struct i2c_client *client,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = snd_soc_register_codec(&client->dev,
|
ret = devm_snd_soc_register_component(&client->dev,
|
||||||
&soc_codec_dev_ak4671, &ak4671_dai, 1);
|
&soc_component_dev_ak4671, &ak4671_dai, 1);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ak4671_i2c_remove(struct i2c_client *client)
|
|
||||||
{
|
|
||||||
snd_soc_unregister_codec(&client->dev);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const struct i2c_device_id ak4671_i2c_id[] = {
|
static const struct i2c_device_id ak4671_i2c_id[] = {
|
||||||
{ "ak4671", 0 },
|
{ "ak4671", 0 },
|
||||||
{ }
|
{ }
|
||||||
@ -667,7 +663,6 @@ static struct i2c_driver ak4671_i2c_driver = {
|
|||||||
.name = "ak4671-codec",
|
.name = "ak4671-codec",
|
||||||
},
|
},
|
||||||
.probe = ak4671_i2c_probe,
|
.probe = ak4671_i2c_probe,
|
||||||
.remove = ak4671_i2c_remove,
|
|
||||||
.id_table = ak4671_i2c_id,
|
.id_table = ak4671_i2c_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user