Skip to content

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

ASoC: cs35l34: 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
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 64 deletions
sound/soc/codecs/cs35l34.c
View file @ 8a6e7dd6
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#define CS35L34_START_DELAY 50 #define CS35L34_START_DELAY 50
struct cs35l34_private { struct cs35l34_private {
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct cs35l34_platform_data pdata; struct cs35l34_platform_data pdata;
struct regmap *regmap; struct regmap *regmap;
struct regulator_bulk_data core_supplies[2]; struct regulator_bulk_data core_supplies[2];
...@@ -237,8 +237,8 @@ static bool cs35l34_precious_register(struct device *dev, unsigned int reg) ...@@ -237,8 +237,8 @@ static bool cs35l34_precious_register(struct device *dev, unsigned int reg)
static int cs35l34_sdin_event(struct snd_soc_dapm_widget *w, static int cs35l34_sdin_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);
struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); struct cs35l34_private *priv = snd_soc_component_get_drvdata(component);
int ret; int ret;
switch (event) { switch (event) {
...@@ -250,7 +250,7 @@ static int cs35l34_sdin_event(struct snd_soc_dapm_widget *w, ...@@ -250,7 +250,7 @@ static int cs35l34_sdin_event(struct snd_soc_dapm_widget *w,
ret = regmap_update_bits(priv->regmap, CS35L34_PWRCTL1, ret = regmap_update_bits(priv->regmap, CS35L34_PWRCTL1,
CS35L34_PDN_ALL, 0); CS35L34_PDN_ALL, 0);
if (ret < 0) { if (ret < 0) {
dev_err(codec->dev, "Cannot set Power bits %d\n", ret); dev_err(component->dev, "Cannot set Power bits %d\n", ret);
return ret; return ret;
} }
usleep_range(5000, 5100); usleep_range(5000, 5100);
...@@ -272,8 +272,8 @@ static int cs35l34_sdin_event(struct snd_soc_dapm_widget *w, ...@@ -272,8 +272,8 @@ static int cs35l34_sdin_event(struct snd_soc_dapm_widget *w,
static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
unsigned int rx_mask, int slots, int slot_width) unsigned int rx_mask, int slots, int slot_width)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); struct cs35l34_private *priv = snd_soc_component_get_drvdata(component);
unsigned int reg, bit_pos; unsigned int reg, bit_pos;
int slot, slot_num; int slot, slot_num;
...@@ -284,7 +284,7 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, ...@@ -284,7 +284,7 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
/* scan rx_mask for aud slot */ /* scan rx_mask for aud slot */
slot = ffs(rx_mask) - 1; slot = ffs(rx_mask) - 1;
if (slot >= 0) if (slot >= 0)
snd_soc_update_bits(codec, CS35L34_TDM_RX_CTL_1_AUDIN, snd_soc_component_update_bits(component, CS35L34_TDM_RX_CTL_1_AUDIN,
CS35L34_X_LOC, slot); CS35L34_X_LOC, slot);
/* scan tx_mask: vmon(2 slots); imon (2 slots); vpmon (1 slot) /* scan tx_mask: vmon(2 slots); imon (2 slots); vpmon (1 slot)
...@@ -294,10 +294,10 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, ...@@ -294,10 +294,10 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
slot_num = 0; slot_num = 0;
/* disable vpmon/vbstmon: enable later if set in tx_mask */ /* disable vpmon/vbstmon: enable later if set in tx_mask */
snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_3_VPMON, snd_soc_component_update_bits(component, CS35L34_TDM_TX_CTL_3_VPMON,
CS35L34_X_STATE | CS35L34_X_LOC, CS35L34_X_STATE | CS35L34_X_LOC,
CS35L34_X_STATE | CS35L34_X_LOC); CS35L34_X_STATE | CS35L34_X_LOC);
snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_4_VBSTMON, snd_soc_component_update_bits(component, CS35L34_TDM_TX_CTL_4_VBSTMON,
CS35L34_X_STATE | CS35L34_X_LOC, CS35L34_X_STATE | CS35L34_X_LOC,
CS35L34_X_STATE | CS35L34_X_LOC); CS35L34_X_STATE | CS35L34_X_LOC);
...@@ -305,22 +305,22 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, ...@@ -305,22 +305,22 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
while (slot >= 0) { while (slot >= 0) {
/* configure VMON_TX_LOC */ /* configure VMON_TX_LOC */
if (slot_num == 0) if (slot_num == 0)
snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_1_VMON, snd_soc_component_update_bits(component, CS35L34_TDM_TX_CTL_1_VMON,
CS35L34_X_STATE | CS35L34_X_LOC, slot); CS35L34_X_STATE | CS35L34_X_LOC, slot);
/* configure IMON_TX_LOC */ /* configure IMON_TX_LOC */
if (slot_num == 4) { if (slot_num == 4) {
snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_2_IMON, snd_soc_component_update_bits(component, CS35L34_TDM_TX_CTL_2_IMON,
CS35L34_X_STATE | CS35L34_X_LOC, slot); CS35L34_X_STATE | CS35L34_X_LOC, slot);
} }
/* configure VPMON_TX_LOC */ /* configure VPMON_TX_LOC */
if (slot_num == 3) { if (slot_num == 3) {
snd_soc_update_bits(codec, CS35L34_TDM_TX_CTL_3_VPMON, snd_soc_component_update_bits(component, CS35L34_TDM_TX_CTL_3_VPMON,
CS35L34_X_STATE | CS35L34_X_LOC, slot); CS35L34_X_STATE | CS35L34_X_LOC, slot);
} }
/* configure VBSTMON_TX_LOC */ /* configure VBSTMON_TX_LOC */
if (slot_num == 7) { if (slot_num == 7) {
snd_soc_update_bits(codec, snd_soc_component_update_bits(component,
CS35L34_TDM_TX_CTL_4_VBSTMON, CS35L34_TDM_TX_CTL_4_VBSTMON,
CS35L34_X_STATE | CS35L34_X_LOC, slot); CS35L34_X_STATE | CS35L34_X_LOC, slot);
} }
...@@ -328,7 +328,7 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, ...@@ -328,7 +328,7 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
/* Enable the relevant tx slot */ /* Enable the relevant tx slot */
reg = CS35L34_TDM_TX_SLOT_EN_4 - (slot/8); reg = CS35L34_TDM_TX_SLOT_EN_4 - (slot/8);
bit_pos = slot - ((slot / 8) * (8)); bit_pos = slot - ((slot / 8) * (8));
snd_soc_update_bits(codec, reg, snd_soc_component_update_bits(component, reg,
1 << bit_pos, 1 << bit_pos); 1 << bit_pos, 1 << bit_pos);
tx_mask &= ~(1 << slot); tx_mask &= ~(1 << slot);
...@@ -342,8 +342,8 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, ...@@ -342,8 +342,8 @@ static int cs35l34_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
static int cs35l34_main_amp_event(struct snd_soc_dapm_widget *w, static int cs35l34_main_amp_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);
struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); struct cs35l34_private *priv = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
...@@ -382,8 +382,8 @@ static const struct snd_kcontrol_new cs35l34_snd_controls[] = { ...@@ -382,8 +382,8 @@ static const struct snd_kcontrol_new cs35l34_snd_controls[] = {
static int cs35l34_mclk_event(struct snd_soc_dapm_widget *w, static int cs35l34_mclk_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);
struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); struct cs35l34_private *priv = snd_soc_component_get_drvdata(component);
int ret, i; int ret, i;
unsigned int reg; unsigned int reg;
...@@ -524,8 +524,8 @@ static int cs35l34_get_mclk_coeff(int mclk, int srate) ...@@ -524,8 +524,8 @@ static int cs35l34_get_mclk_coeff(int mclk, int srate)
static int cs35l34_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) static int cs35l34_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); struct cs35l34_private *priv = snd_soc_component_get_drvdata(component);
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:
...@@ -546,15 +546,15 @@ static int cs35l34_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -546,15 +546,15 @@ static int cs35l34_pcm_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 cs35l34_private *priv = snd_soc_codec_get_drvdata(codec); struct cs35l34_private *priv = snd_soc_component_get_drvdata(component);
int srate = params_rate(params); int srate = params_rate(params);
int ret; int ret;
int coeff = cs35l34_get_mclk_coeff(priv->mclk_int, srate); int coeff = cs35l34_get_mclk_coeff(priv->mclk_int, srate);
if (coeff < 0) { if (coeff < 0) {
dev_err(codec->dev, "ERROR: Invalid mclk %d and/or srate %d\n", dev_err(component->dev, "ERROR: Invalid mclk %d and/or srate %d\n",
priv->mclk_int, srate); priv->mclk_int, srate);
return coeff; return coeff;
} }
...@@ -562,7 +562,7 @@ static int cs35l34_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -562,7 +562,7 @@ static int cs35l34_pcm_hw_params(struct snd_pcm_substream *substream,
ret = regmap_update_bits(priv->regmap, CS35L34_ADSP_CLK_CTL, ret = regmap_update_bits(priv->regmap, CS35L34_ADSP_CLK_CTL,
CS35L34_ADSP_RATE, cs35l34_mclk_coeffs[coeff].adsp_rate); CS35L34_ADSP_RATE, cs35l34_mclk_coeffs[coeff].adsp_rate);
if (ret != 0) if (ret != 0)
dev_err(codec->dev, "Failed to set clock state %d\n", ret); dev_err(component->dev, "Failed to set clock state %d\n", ret);
return ret; return ret;
} }
...@@ -590,13 +590,13 @@ static int cs35l34_pcm_startup(struct snd_pcm_substream *substream, ...@@ -590,13 +590,13 @@ static int cs35l34_pcm_startup(struct snd_pcm_substream *substream,
static int cs35l34_set_tristate(struct snd_soc_dai *dai, int tristate) static int cs35l34_set_tristate(struct snd_soc_dai *dai, int tristate)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
if (tristate) if (tristate)
snd_soc_update_bits(codec, CS35L34_PWRCTL3, snd_soc_component_update_bits(component, CS35L34_PWRCTL3,
CS35L34_PDN_SDOUT, CS35L34_PDN_SDOUT); CS35L34_PDN_SDOUT, CS35L34_PDN_SDOUT);
else else
snd_soc_update_bits(codec, CS35L34_PWRCTL3, snd_soc_component_update_bits(component, CS35L34_PWRCTL3,
CS35L34_PDN_SDOUT, 0); CS35L34_PDN_SDOUT, 0);
return 0; return 0;
} }
...@@ -604,8 +604,8 @@ static int cs35l34_set_tristate(struct snd_soc_dai *dai, int tristate) ...@@ -604,8 +604,8 @@ static int cs35l34_set_tristate(struct snd_soc_dai *dai, int tristate)
static int cs35l34_dai_set_sysclk(struct snd_soc_dai *dai, static int cs35l34_dai_set_sysclk(struct snd_soc_dai *dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct cs35l34_private *cs35l34 = snd_soc_codec_get_drvdata(codec); struct cs35l34_private *cs35l34 = snd_soc_component_get_drvdata(component);
unsigned int value; unsigned int value;
switch (freq) { switch (freq) {
...@@ -634,7 +634,7 @@ static int cs35l34_dai_set_sysclk(struct snd_soc_dai *dai, ...@@ -634,7 +634,7 @@ static int cs35l34_dai_set_sysclk(struct snd_soc_dai *dai,
cs35l34->mclk_int = freq / 2; cs35l34->mclk_int = freq / 2;
break; break;
default: default:
dev_err(codec->dev, "ERROR: Invalid Frequency %d\n", freq); dev_err(component->dev, "ERROR: Invalid Frequency %d\n", freq);
cs35l34->mclk_int = 0; cs35l34->mclk_int = 0;
return -EINVAL; return -EINVAL;
} }
...@@ -676,7 +676,7 @@ static struct snd_soc_dai_driver cs35l34_dai = { ...@@ -676,7 +676,7 @@ static struct snd_soc_dai_driver cs35l34_dai = {
static int cs35l34_boost_inductor(struct cs35l34_private *cs35l34, static int cs35l34_boost_inductor(struct cs35l34_private *cs35l34,
unsigned int inductor) unsigned int inductor)
{ {
struct snd_soc_codec *codec = cs35l34->codec; struct snd_soc_component *component = cs35l34->component;
switch (inductor) { switch (inductor) {
case 1000: /* 1 uH */ case 1000: /* 1 uH */
...@@ -708,19 +708,19 @@ static int cs35l34_boost_inductor(struct cs35l34_private *cs35l34, ...@@ -708,19 +708,19 @@ static int cs35l34_boost_inductor(struct cs35l34_private *cs35l34,
regmap_write(cs35l34->regmap, CS35L34_BST_CONV_SW_FREQ, 3); regmap_write(cs35l34->regmap, CS35L34_BST_CONV_SW_FREQ, 3);
break; break;
default: default:
dev_err(codec->dev, "%s Invalid Inductor Value %d uH\n", dev_err(component->dev, "%s Invalid Inductor Value %d uH\n",
__func__, inductor); __func__, inductor);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
} }
static int cs35l34_probe(struct snd_soc_codec *codec) static int cs35l34_probe(struct snd_soc_component *component)
{ {
int ret = 0; int ret = 0;
struct cs35l34_private *cs35l34 = snd_soc_codec_get_drvdata(codec); struct cs35l34_private *cs35l34 = snd_soc_component_get_drvdata(component);
pm_runtime_get_sync(codec->dev); pm_runtime_get_sync(component->dev);
/* Set over temperature warning attenuation to 6 dB */ /* Set over temperature warning attenuation to 6 dB */
regmap_update_bits(cs35l34->regmap, CS35L34_PROTECT_CTL, regmap_update_bits(cs35l34->regmap, CS35L34_PROTECT_CTL,
...@@ -773,23 +773,24 @@ static int cs35l34_probe(struct snd_soc_codec *codec) ...@@ -773,23 +773,24 @@ static int cs35l34_probe(struct snd_soc_codec *codec)
regmap_update_bits(cs35l34->regmap, CS35L34_ADSP_TDM_CTL, regmap_update_bits(cs35l34->regmap, CS35L34_ADSP_TDM_CTL,
1, 1); 1, 1);
pm_runtime_put_sync(codec->dev); pm_runtime_put_sync(component->dev);
return ret; return ret;
} }
static const struct snd_soc_codec_driver soc_codec_dev_cs35l34 = { static const struct snd_soc_component_driver soc_component_dev_cs35l34 = {
.probe = cs35l34_probe, .probe = cs35l34_probe,
.dapm_widgets = cs35l34_dapm_widgets,
.component_driver = { .num_dapm_widgets = ARRAY_SIZE(cs35l34_dapm_widgets),
.dapm_widgets = cs35l34_dapm_widgets, .dapm_routes = cs35l34_audio_map,
.num_dapm_widgets = ARRAY_SIZE(cs35l34_dapm_widgets), .num_dapm_routes = ARRAY_SIZE(cs35l34_audio_map),
.dapm_routes = cs35l34_audio_map, .controls = cs35l34_snd_controls,
.num_dapm_routes = ARRAY_SIZE(cs35l34_audio_map), .num_controls = ARRAY_SIZE(cs35l34_snd_controls),
.controls = cs35l34_snd_controls, .idle_bias_on = 1,
.num_controls = ARRAY_SIZE(cs35l34_snd_controls), .use_pmdown_time = 1,
}, .endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static struct regmap_config cs35l34_regmap = { static struct regmap_config cs35l34_regmap = {
...@@ -864,7 +865,7 @@ static int cs35l34_handle_of_data(struct i2c_client *i2c_client, ...@@ -864,7 +865,7 @@ static int cs35l34_handle_of_data(struct i2c_client *i2c_client,
static irqreturn_t cs35l34_irq_thread(int irq, void *data) static irqreturn_t cs35l34_irq_thread(int irq, void *data)
{ {
struct cs35l34_private *cs35l34 = data; struct cs35l34_private *cs35l34 = data;
struct snd_soc_codec *codec = cs35l34->codec; struct snd_soc_component *component = cs35l34->component;
unsigned int sticky1, sticky2, sticky3, sticky4; unsigned int sticky1, sticky2, sticky3, sticky4;
unsigned int mask1, mask2, mask3, mask4, current1; unsigned int mask1, mask2, mask3, mask4, current1;
...@@ -887,11 +888,11 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) ...@@ -887,11 +888,11 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data)
regmap_read(cs35l34->regmap, CS35L34_INT_STATUS_1, &current1); regmap_read(cs35l34->regmap, CS35L34_INT_STATUS_1, &current1);
if (sticky1 & CS35L34_CAL_ERR) { if (sticky1 & CS35L34_CAL_ERR) {
dev_err(codec->dev, "Cal error\n"); dev_err(component->dev, "Cal error\n");
/* error is no longer asserted; safe to reset */ /* error is no longer asserted; safe to reset */
if (!(current1 & CS35L34_CAL_ERR)) { if (!(current1 & CS35L34_CAL_ERR)) {
dev_dbg(codec->dev, "Cal error release\n"); dev_dbg(component->dev, "Cal error release\n");
regmap_update_bits(cs35l34->regmap, regmap_update_bits(cs35l34->regmap,
CS35L34_PROT_RELEASE_CTL, CS35L34_PROT_RELEASE_CTL,
CS35L34_CAL_ERR_RLS, 0); CS35L34_CAL_ERR_RLS, 0);
...@@ -907,14 +908,14 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) ...@@ -907,14 +908,14 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data)
} }
if (sticky1 & CS35L34_ALIVE_ERR) if (sticky1 & CS35L34_ALIVE_ERR)
dev_err(codec->dev, "Alive error\n"); dev_err(component->dev, "Alive error\n");
if (sticky1 & CS35L34_AMP_SHORT) { if (sticky1 & CS35L34_AMP_SHORT) {
dev_crit(codec->dev, "Amp short error\n"); dev_crit(component->dev, "Amp short error\n");
/* error is no longer asserted; safe to reset */ /* error is no longer asserted; safe to reset */
if (!(current1 & CS35L34_AMP_SHORT)) { if (!(current1 & CS35L34_AMP_SHORT)) {
dev_dbg(codec->dev, dev_dbg(component->dev,
"Amp short error release\n"); "Amp short error release\n");
regmap_update_bits(cs35l34->regmap, regmap_update_bits(cs35l34->regmap,
CS35L34_PROT_RELEASE_CTL, CS35L34_PROT_RELEASE_CTL,
...@@ -930,11 +931,11 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) ...@@ -930,11 +931,11 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data)
} }
if (sticky1 & CS35L34_OTW) { if (sticky1 & CS35L34_OTW) {
dev_crit(codec->dev, "Over temperature warning\n"); dev_crit(component->dev, "Over temperature warning\n");
/* error is no longer asserted; safe to reset */ /* error is no longer asserted; safe to reset */
if (!(current1 & CS35L34_OTW)) { if (!(current1 & CS35L34_OTW)) {
dev_dbg(codec->dev, dev_dbg(component->dev,
"Over temperature warning release\n"); "Over temperature warning release\n");
regmap_update_bits(cs35l34->regmap, regmap_update_bits(cs35l34->regmap,
CS35L34_PROT_RELEASE_CTL, CS35L34_PROT_RELEASE_CTL,
...@@ -950,11 +951,11 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) ...@@ -950,11 +951,11 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data)
} }
if (sticky1 & CS35L34_OTE) { if (sticky1 & CS35L34_OTE) {
dev_crit(codec->dev, "Over temperature error\n"); dev_crit(component->dev, "Over temperature error\n");
/* error is no longer asserted; safe to reset */ /* error is no longer asserted; safe to reset */
if (!(current1 & CS35L34_OTE)) { if (!(current1 & CS35L34_OTE)) {
dev_dbg(codec->dev, dev_dbg(component->dev,
"Over temperature error release\n"); "Over temperature error release\n");
regmap_update_bits(cs35l34->regmap, regmap_update_bits(cs35l34->regmap,
CS35L34_PROT_RELEASE_CTL, CS35L34_PROT_RELEASE_CTL,
...@@ -970,7 +971,7 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) ...@@ -970,7 +971,7 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data)
} }
if (sticky3 & CS35L34_BST_HIGH) { if (sticky3 & CS35L34_BST_HIGH) {
dev_crit(codec->dev, "VBST too high error; powering off!\n"); dev_crit(component->dev, "VBST too high error; powering off!\n");
regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL2, regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL2,
CS35L34_PDN_AMP, CS35L34_PDN_AMP); CS35L34_PDN_AMP, CS35L34_PDN_AMP);
regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL1, regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL1,
...@@ -978,7 +979,7 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data) ...@@ -978,7 +979,7 @@ static irqreturn_t cs35l34_irq_thread(int irq, void *data)
} }
if (sticky3 & CS35L34_LBST_SHORT) { if (sticky3 & CS35L34_LBST_SHORT) {
dev_crit(codec->dev, "LBST short error; powering off!\n"); dev_crit(component->dev, "LBST short error; powering off!\n");
regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL2, regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL2,
CS35L34_PDN_AMP, CS35L34_PDN_AMP); CS35L34_PDN_AMP, CS35L34_PDN_AMP);
regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL1, regmap_update_bits(cs35l34->regmap, CS35L34_PWRCTL1,
...@@ -1108,11 +1109,11 @@ static int cs35l34_i2c_probe(struct i2c_client *i2c_client, ...@@ -1108,11 +1109,11 @@ static int cs35l34_i2c_probe(struct i2c_client *i2c_client,
pm_runtime_set_active(&i2c_client->dev); pm_runtime_set_active(&i2c_client->dev);
pm_runtime_enable(&i2c_client->dev); pm_runtime_enable(&i2c_client->dev);
ret = snd_soc_register_codec(&i2c_client->dev, ret = devm_snd_soc_register_component(&i2c_client->dev,
&soc_codec_dev_cs35l34, &cs35l34_dai, 1); &soc_component_dev_cs35l34, &cs35l34_dai, 1);
if (ret < 0) { if (ret < 0) {
dev_err(&i2c_client->dev, dev_err(&i2c_client->dev,
"%s: Register codec failed\n", __func__); "%s: Register component failed\n", __func__);
goto err_regulator; goto err_regulator;
} }
...@@ -1129,8 +1130,6 @@ static int cs35l34_i2c_remove(struct i2c_client *client) ...@@ -1129,8 +1130,6 @@ static int cs35l34_i2c_remove(struct i2c_client *client)
{ {
struct cs35l34_private *cs35l34 = i2c_get_clientdata(client); struct cs35l34_private *cs35l34 = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev);
gpiod_set_value_cansleep(cs35l34->reset_gpio, 0); gpiod_set_value_cansleep(cs35l34->reset_gpio, 0);
pm_runtime_disable(&client->dev); pm_runtime_disable(&client->dev);
......
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