Skip to content

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

ASoC: codecs: max*: rename to snd_soc_component_read() 

We need to use snd_soc_component_read()
instead of     snd_soc_component_read32()

This patch renames _read32() to _read()
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87imfr4mdl.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent e348cf54
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
sound/soc/codecs/max98088.c
View file @ 1227f601
...@@ -996,7 +996,7 @@ static int max98088_dai1_hw_params(struct snd_pcm_substream *substream, ...@@ -996,7 +996,7 @@ static int max98088_dai1_hw_params(struct snd_pcm_substream *substream,
cdata->rate = rate; cdata->rate = rate;
/* Configure NI when operating as master */ /* Configure NI when operating as master */
if (snd_soc_component_read32(component, M98088_REG_14_DAI1_FORMAT) if (snd_soc_component_read(component, M98088_REG_14_DAI1_FORMAT)
& M98088_DAI_MAS) { & M98088_DAI_MAS) {
if (max98088->sysclk == 0) { if (max98088->sysclk == 0) {
dev_err(component->dev, "Invalid system clock frequency\n"); dev_err(component->dev, "Invalid system clock frequency\n");
...@@ -1063,7 +1063,7 @@ static int max98088_dai2_hw_params(struct snd_pcm_substream *substream, ...@@ -1063,7 +1063,7 @@ static int max98088_dai2_hw_params(struct snd_pcm_substream *substream,
cdata->rate = rate; cdata->rate = rate;
/* Configure NI when operating as master */ /* Configure NI when operating as master */
if (snd_soc_component_read32(component, M98088_REG_1C_DAI2_FORMAT) if (snd_soc_component_read(component, M98088_REG_1C_DAI2_FORMAT)
& M98088_DAI_MAS) { & M98088_DAI_MAS) {
if (max98088->sysclk == 0) { if (max98088->sysclk == 0) {
dev_err(component->dev, "Invalid system clock frequency\n"); dev_err(component->dev, "Invalid system clock frequency\n");
...@@ -1120,7 +1120,7 @@ static int max98088_dai_set_sysclk(struct snd_soc_dai *dai, ...@@ -1120,7 +1120,7 @@ static int max98088_dai_set_sysclk(struct snd_soc_dai *dai,
return -EINVAL; return -EINVAL;
} }
if (snd_soc_component_read32(component, M98088_REG_51_PWR_SYS) & M98088_SHDNRUN) { if (snd_soc_component_read(component, M98088_REG_51_PWR_SYS) & M98088_SHDNRUN) {
snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS, snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS,
M98088_SHDNRUN, 0); M98088_SHDNRUN, 0);
snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS, snd_soc_component_update_bits(component, M98088_REG_51_PWR_SYS,
...@@ -1440,7 +1440,7 @@ static void max98088_setup_eq1(struct snd_soc_component *component) ...@@ -1440,7 +1440,7 @@ static void max98088_setup_eq1(struct snd_soc_component *component)
pdata->eq_cfg[best].rate, fs); pdata->eq_cfg[best].rate, fs);
/* Disable EQ while configuring, and save current on/off state */ /* Disable EQ while configuring, and save current on/off state */
save = snd_soc_component_read32(component, M98088_REG_49_CFG_LEVEL); save = snd_soc_component_read(component, M98088_REG_49_CFG_LEVEL);
snd_soc_component_update_bits(component, M98088_REG_49_CFG_LEVEL, M98088_EQ1EN, 0); snd_soc_component_update_bits(component, M98088_REG_49_CFG_LEVEL, M98088_EQ1EN, 0);
coef_set = &pdata->eq_cfg[sel]; coef_set = &pdata->eq_cfg[sel];
...@@ -1487,7 +1487,7 @@ static void max98088_setup_eq2(struct snd_soc_component *component) ...@@ -1487,7 +1487,7 @@ static void max98088_setup_eq2(struct snd_soc_component *component)
pdata->eq_cfg[best].rate, fs); pdata->eq_cfg[best].rate, fs);
/* Disable EQ while configuring, and save current on/off state */ /* Disable EQ while configuring, and save current on/off state */
save = snd_soc_component_read32(component, M98088_REG_49_CFG_LEVEL); save = snd_soc_component_read(component, M98088_REG_49_CFG_LEVEL);
snd_soc_component_update_bits(component, M98088_REG_49_CFG_LEVEL, M98088_EQ2EN, 0); snd_soc_component_update_bits(component, M98088_REG_49_CFG_LEVEL, M98088_EQ2EN, 0);
coef_set = &pdata->eq_cfg[sel]; coef_set = &pdata->eq_cfg[sel];
...@@ -1673,7 +1673,7 @@ static int max98088_probe(struct snd_soc_component *component) ...@@ -1673,7 +1673,7 @@ static int max98088_probe(struct snd_soc_component *component)
max98088->mic1pre = 0; max98088->mic1pre = 0;
max98088->mic2pre = 0; max98088->mic2pre = 0;
ret = snd_soc_component_read32(component, M98088_REG_FF_REV_ID); ret = snd_soc_component_read(component, M98088_REG_FF_REV_ID);
if (ret < 0) { if (ret < 0) {
dev_err(component->dev, "Failed to read device revision: %d\n", dev_err(component->dev, "Failed to read device revision: %d\n",
ret); ret);
......
sound/soc/codecs/max98090.c
View file @ 1227f601
...@@ -353,7 +353,7 @@ static int max98090_get_enab_tlv(struct snd_kcontrol *kcontrol, ...@@ -353,7 +353,7 @@ static int max98090_get_enab_tlv(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc = struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value; (struct soc_mixer_control *)kcontrol->private_value;
unsigned int mask = (1 << fls(mc->max)) - 1; unsigned int mask = (1 << fls(mc->max)) - 1;
unsigned int val = snd_soc_component_read32(component, mc->reg); unsigned int val = snd_soc_component_read(component, mc->reg);
unsigned int *select; unsigned int *select;
switch (mc->reg) { switch (mc->reg) {
...@@ -394,7 +394,7 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol, ...@@ -394,7 +394,7 @@ static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol,
(struct soc_mixer_control *)kcontrol->private_value; (struct soc_mixer_control *)kcontrol->private_value;
unsigned int mask = (1 << fls(mc->max)) - 1; unsigned int mask = (1 << fls(mc->max)) - 1;
unsigned int sel = ucontrol->value.integer.value[0]; unsigned int sel = ucontrol->value.integer.value[0];
unsigned int val = snd_soc_component_read32(component, mc->reg); unsigned int val = snd_soc_component_read(component, mc->reg);
unsigned int *select; unsigned int *select;
switch (mc->reg) { switch (mc->reg) {
...@@ -730,7 +730,7 @@ static int max98090_micinput_event(struct snd_soc_dapm_widget *w, ...@@ -730,7 +730,7 @@ static int max98090_micinput_event(struct snd_soc_dapm_widget *w,
struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component); struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component);
unsigned int val = snd_soc_component_read32(component, w->reg); unsigned int val = snd_soc_component_read(component, w->reg);
if (w->reg == M98090_REG_MIC1_INPUT_LEVEL) if (w->reg == M98090_REG_MIC1_INPUT_LEVEL)
val = (val & M98090_MIC_PA1EN_MASK) >> M98090_MIC_PA1EN_SHIFT; val = (val & M98090_MIC_PA1EN_MASK) >> M98090_MIC_PA1EN_SHIFT;
...@@ -1496,7 +1496,7 @@ static void max98090_configure_bclk(struct snd_soc_component *component) ...@@ -1496,7 +1496,7 @@ static void max98090_configure_bclk(struct snd_soc_component *component)
} }
/* Skip configuration when operating as slave */ /* Skip configuration when operating as slave */
if (!(snd_soc_component_read32(component, M98090_REG_MASTER_MODE) & if (!(snd_soc_component_read(component, M98090_REG_MASTER_MODE) &
M98090_MAS_MASK)) { M98090_MAS_MASK)) {
return; return;
} }
...@@ -2132,7 +2132,7 @@ static void max98090_pll_work(struct max98090_priv *max98090) ...@@ -2132,7 +2132,7 @@ static void max98090_pll_work(struct max98090_priv *max98090)
usleep_range(1000, 1200); usleep_range(1000, 1200);
/* Check lock status */ /* Check lock status */
pll = snd_soc_component_read32( pll = snd_soc_component_read(
component, M98090_REG_DEVICE_STATUS); component, M98090_REG_DEVICE_STATUS);
if (!(pll & M98090_ULK_MASK)) if (!(pll & M98090_ULK_MASK))
break; break;
...@@ -2157,16 +2157,16 @@ static void max98090_jack_work(struct work_struct *work) ...@@ -2157,16 +2157,16 @@ static void max98090_jack_work(struct work_struct *work)
msleep(50); msleep(50);
reg = snd_soc_component_read32(component, M98090_REG_JACK_STATUS); reg = snd_soc_component_read(component, M98090_REG_JACK_STATUS);
/* Weak pull up allows only insertion detection */ /* Weak pull up allows only insertion detection */
snd_soc_component_update_bits(component, M98090_REG_JACK_DETECT, snd_soc_component_update_bits(component, M98090_REG_JACK_DETECT,
M98090_JDWK_MASK, M98090_JDWK_MASK); M98090_JDWK_MASK, M98090_JDWK_MASK);
} else { } else {
reg = snd_soc_component_read32(component, M98090_REG_JACK_STATUS); reg = snd_soc_component_read(component, M98090_REG_JACK_STATUS);
} }
reg = snd_soc_component_read32(component, M98090_REG_JACK_STATUS); reg = snd_soc_component_read(component, M98090_REG_JACK_STATUS);
switch (reg & (M98090_LSNS_MASK | M98090_JKSNS_MASK)) { switch (reg & (M98090_LSNS_MASK | M98090_JKSNS_MASK)) {
case M98090_LSNS_MASK | M98090_JKSNS_MASK: case M98090_LSNS_MASK | M98090_JKSNS_MASK:
...@@ -2406,7 +2406,7 @@ static int max98090_probe(struct snd_soc_component *component) ...@@ -2406,7 +2406,7 @@ static int max98090_probe(struct snd_soc_component *component)
max98090->pa1en = 0; max98090->pa1en = 0;
max98090->pa2en = 0; max98090->pa2en = 0;
ret = snd_soc_component_read32(component, M98090_REG_REVISION_ID); ret = snd_soc_component_read(component, M98090_REG_REVISION_ID);
if (ret < 0) { if (ret < 0) {
dev_err(component->dev, "Failed to read device revision: %d\n", dev_err(component->dev, "Failed to read device revision: %d\n",
ret); ret);
...@@ -2446,7 +2446,7 @@ static int max98090_probe(struct snd_soc_component *component) ...@@ -2446,7 +2446,7 @@ static int max98090_probe(struct snd_soc_component *component)
* An old interrupt ocurring prior to installing the ISR * An old interrupt ocurring prior to installing the ISR
* can keep a new interrupt from generating a trigger. * can keep a new interrupt from generating a trigger.
*/ */
snd_soc_component_read32(component, M98090_REG_DEVICE_STATUS); snd_soc_component_read(component, M98090_REG_DEVICE_STATUS);
/* High Performance is default */ /* High Performance is default */
snd_soc_component_update_bits(component, M98090_REG_DAC_CONTROL, snd_soc_component_update_bits(component, M98090_REG_DAC_CONTROL,
......
sound/soc/codecs/max98095.c
View file @ 1227f601
...@@ -971,7 +971,7 @@ static int max98095_dai1_hw_params(struct snd_pcm_substream *substream, ...@@ -971,7 +971,7 @@ static int max98095_dai1_hw_params(struct snd_pcm_substream *substream,
cdata->rate = rate; cdata->rate = rate;
/* Configure NI when operating as master */ /* Configure NI when operating as master */
if (snd_soc_component_read32(component, M98095_02A_DAI1_FORMAT) & M98095_DAI_MAS) { if (snd_soc_component_read(component, M98095_02A_DAI1_FORMAT) & M98095_DAI_MAS) {
if (max98095->sysclk == 0) { if (max98095->sysclk == 0) {
dev_err(component->dev, "Invalid system clock frequency\n"); dev_err(component->dev, "Invalid system clock frequency\n");
return -EINVAL; return -EINVAL;
...@@ -1032,7 +1032,7 @@ static int max98095_dai2_hw_params(struct snd_pcm_substream *substream, ...@@ -1032,7 +1032,7 @@ static int max98095_dai2_hw_params(struct snd_pcm_substream *substream,
cdata->rate = rate; cdata->rate = rate;
/* Configure NI when operating as master */ /* Configure NI when operating as master */
if (snd_soc_component_read32(component, M98095_034_DAI2_FORMAT) & M98095_DAI_MAS) { if (snd_soc_component_read(component, M98095_034_DAI2_FORMAT) & M98095_DAI_MAS) {
if (max98095->sysclk == 0) { if (max98095->sysclk == 0) {
dev_err(component->dev, "Invalid system clock frequency\n"); dev_err(component->dev, "Invalid system clock frequency\n");
return -EINVAL; return -EINVAL;
...@@ -1093,7 +1093,7 @@ static int max98095_dai3_hw_params(struct snd_pcm_substream *substream, ...@@ -1093,7 +1093,7 @@ static int max98095_dai3_hw_params(struct snd_pcm_substream *substream,
cdata->rate = rate; cdata->rate = rate;
/* Configure NI when operating as master */ /* Configure NI when operating as master */
if (snd_soc_component_read32(component, M98095_03E_DAI3_FORMAT) & M98095_DAI_MAS) { if (snd_soc_component_read(component, M98095_03E_DAI3_FORMAT) & M98095_DAI_MAS) {
if (max98095->sysclk == 0) { if (max98095->sysclk == 0) {
dev_err(component->dev, "Invalid system clock frequency\n"); dev_err(component->dev, "Invalid system clock frequency\n");
return -EINVAL; return -EINVAL;
...@@ -1534,7 +1534,7 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol, ...@@ -1534,7 +1534,7 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol,
regmask = (channel == 0) ? M98095_EQ1EN : M98095_EQ2EN; regmask = (channel == 0) ? M98095_EQ1EN : M98095_EQ2EN;
/* Disable filter while configuring, and save current on/off state */ /* Disable filter while configuring, and save current on/off state */
regsave = snd_soc_component_read32(component, M98095_088_CFG_LEVEL); regsave = snd_soc_component_read(component, M98095_088_CFG_LEVEL);
snd_soc_component_update_bits(component, M98095_088_CFG_LEVEL, regmask, 0); snd_soc_component_update_bits(component, M98095_088_CFG_LEVEL, regmask, 0);
mutex_lock(&max98095->lock); mutex_lock(&max98095->lock);
...@@ -1685,7 +1685,7 @@ static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol, ...@@ -1685,7 +1685,7 @@ static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol,
regmask = (channel == 0) ? M98095_BQ1EN : M98095_BQ2EN; regmask = (channel == 0) ? M98095_BQ1EN : M98095_BQ2EN;
/* Disable filter while configuring, and save current on/off state */ /* Disable filter while configuring, and save current on/off state */
regsave = snd_soc_component_read32(component, M98095_088_CFG_LEVEL); regsave = snd_soc_component_read(component, M98095_088_CFG_LEVEL);
snd_soc_component_update_bits(component, M98095_088_CFG_LEVEL, regmask, 0); snd_soc_component_update_bits(component, M98095_088_CFG_LEVEL, regmask, 0);
mutex_lock(&max98095->lock); mutex_lock(&max98095->lock);
...@@ -1816,7 +1816,7 @@ static irqreturn_t max98095_report_jack(int irq, void *data) ...@@ -1816,7 +1816,7 @@ static irqreturn_t max98095_report_jack(int irq, void *data)
int mic_report = 0; int mic_report = 0;
/* Read the Jack Status Register */ /* Read the Jack Status Register */
value = snd_soc_component_read32(component, M98095_007_JACK_AUTO_STS); value = snd_soc_component_read(component, M98095_007_JACK_AUTO_STS);
/* If ddone is not set, then detection isn't finished yet */ /* If ddone is not set, then detection isn't finished yet */
if ((value & M98095_DDONE) == 0) if ((value & M98095_DDONE) == 0)
...@@ -1972,7 +1972,7 @@ static int max98095_reset(struct snd_soc_component *component) ...@@ -1972,7 +1972,7 @@ static int max98095_reset(struct snd_soc_component *component)
/* Reset to hardware default for registers, as there is not /* Reset to hardware default for registers, as there is not
* a soft reset hardware control register */ * a soft reset hardware control register */
for (i = M98095_010_HOST_INT_CFG; i < M98095_REG_MAX_CACHED; i++) { for (i = M98095_010_HOST_INT_CFG; i < M98095_REG_MAX_CACHED; i++) {
ret = snd_soc_component_write(component, i, snd_soc_component_read32(component, i)); ret = snd_soc_component_write(component, i, snd_soc_component_read(component, i));
if (ret < 0) { if (ret < 0) {
dev_err(component->dev, "Failed to reset: %d\n", ret); dev_err(component->dev, "Failed to reset: %d\n", ret);
return ret; return ret;
...@@ -2038,7 +2038,7 @@ static int max98095_probe(struct snd_soc_component *component) ...@@ -2038,7 +2038,7 @@ static int max98095_probe(struct snd_soc_component *component)
} }
} }
ret = snd_soc_component_read32(component, M98095_0FF_REV_ID); ret = snd_soc_component_read(component, M98095_0FF_REV_ID);
if (ret < 0) { if (ret < 0) {
dev_err(component->dev, "Failure reading hardware revision: %d\n", dev_err(component->dev, "Failure reading hardware revision: %d\n",
ret); ret);
......
sound/soc/codecs/max9850.c
View file @ 1227f601
...@@ -121,7 +121,7 @@ static int max9850_hw_params(struct snd_pcm_substream *substream, ...@@ -121,7 +121,7 @@ static int max9850_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
/* lrclk_div = 2^22 * rate / iclk with iclk = mclk / sf */ /* lrclk_div = 2^22 * rate / iclk with iclk = mclk / sf */
sf = (snd_soc_component_read32(component, MAX9850_CLOCK) >> 2) + 1; sf = (snd_soc_component_read(component, MAX9850_CLOCK) >> 2) + 1;
lrclk_div = (1 << 22); lrclk_div = (1 << 22);
lrclk_div *= params_rate(params); lrclk_div *= params_rate(params);
lrclk_div *= sf; lrclk_div *= sf;
......
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