UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: arizona: Fixup some minor formatting issues 

Repair any formatting/style issues that can be fixed without major
code refactoring.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2018-02-20 16:08:11 +00:00 committed by Mark Brown
parent 0fe1daa666
commit 7dd0f7ca5f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
6 changed files with 113 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
sound/soc/codecs/arizona.c
View File

@ -90,7 +90,8 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w,
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
val = snd_soc_component_read32(component, ARIZONA_INTERRUPT_RAW_STATUS_3); val = snd_soc_component_read32(component,
ARIZONA_INTERRUPT_RAW_STATUS_3);
if (val & ARIZONA_SPK_OVERHEAT_STS) { if (val & ARIZONA_SPK_OVERHEAT_STS) {
dev_crit(arizona->dev, dev_crit(arizona->dev,
"Speaker not enabled due to temperature\n"); "Speaker not enabled due to temperature\n");
@ -641,7 +642,6 @@ const unsigned int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE] = {
}; };
EXPORT_SYMBOL_GPL(arizona_rate_val); EXPORT_SYMBOL_GPL(arizona_rate_val);
const struct soc_enum arizona_isrc_fsh[] = { const struct soc_enum arizona_isrc_fsh[] = {
SOC_VALUE_ENUM_SINGLE(ARIZONA_ISRC_1_CTRL_1, SOC_VALUE_ENUM_SINGLE(ARIZONA_ISRC_1_CTRL_1,
ARIZONA_ISRC1_FSH_SHIFT, 0xf, ARIZONA_ISRC1_FSH_SHIFT, 0xf,
@ -923,7 +923,8 @@ int arizona_in_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
priv->in_pending++; priv->in_pending++;
break; break;
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
snd_soc_component_update_bits(component, reg, ARIZONA_IN1L_MUTE, 0); snd_soc_component_update_bits(component, reg,
ARIZONA_IN1L_MUTE, 0);
/* If this is the last input pending then allow VU */ /* If this is the last input pending then allow VU */
priv->in_pending--; priv->in_pending--;
@ -1070,9 +1071,8 @@ int arizona_out_ev(struct snd_soc_dapm_widget *w,
} }
EXPORT_SYMBOL_GPL(arizona_out_ev); EXPORT_SYMBOL_GPL(arizona_out_ev);
int arizona_hp_ev(struct snd_soc_dapm_widget *w, int arizona_hp_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
struct snd_kcontrol *kcontrol, int event)
int event)
{ {
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 arizona_priv *priv = snd_soc_component_get_drvdata(component); struct arizona_priv *priv = snd_soc_component_get_drvdata(component);
@ -1275,8 +1275,8 @@ static unsigned int arizona_opclk_ref_44k1_rates[] = {
45158400, 45158400,
}; };
static int arizona_set_opclk(struct snd_soc_component *component, unsigned int clk, static int arizona_set_opclk(struct snd_soc_component *component,
unsigned int freq) unsigned int clk, unsigned int freq)
{ {
struct arizona_priv *priv = snd_soc_component_get_drvdata(component); struct arizona_priv *priv = snd_soc_component_get_drvdata(component);
unsigned int reg; unsigned int reg;
@ -1302,7 +1302,7 @@ static int arizona_set_opclk(struct snd_soc_component *component, unsigned int c
rates = arizona_opclk_ref_48k_rates; rates = arizona_opclk_ref_48k_rates;
for (ref = 0; ref < ARRAY_SIZE(arizona_opclk_ref_48k_rates) && for (ref = 0; ref < ARRAY_SIZE(arizona_opclk_ref_48k_rates) &&
rates[ref] <= refclk; ref++) { rates[ref] <= refclk; ref++) {
div = 1; div = 1;
while (rates[ref] / div >= freq && div < 32) { while (rates[ref] / div >= freq && div < 32) {
if (rates[ref] / div == freq) { if (rates[ref] / div == freq) {
@ -1727,18 +1727,23 @@ static int arizona_hw_params_rate(struct snd_pcm_substream *substream,
} }
snd_soc_component_update_bits(component, ARIZONA_SAMPLE_RATE_1, snd_soc_component_update_bits(component, ARIZONA_SAMPLE_RATE_1,
ARIZONA_SAMPLE_RATE_1_MASK, sr_val); ARIZONA_SAMPLE_RATE_1_MASK,
sr_val);
if (base) if (base)
snd_soc_component_update_bits(component, base + ARIZONA_AIF_RATE_CTRL, snd_soc_component_update_bits(component,
ARIZONA_AIF1_RATE_MASK, 0); base + ARIZONA_AIF_RATE_CTRL,
ARIZONA_AIF1_RATE_MASK, 0);
break; break;
case ARIZONA_CLK_ASYNCCLK: case ARIZONA_CLK_ASYNCCLK:
snd_soc_component_update_bits(component, ARIZONA_ASYNC_SAMPLE_RATE_1, snd_soc_component_update_bits(component,
ARIZONA_ASYNC_SAMPLE_RATE_1_MASK, sr_val); ARIZONA_ASYNC_SAMPLE_RATE_1,
ARIZONA_ASYNC_SAMPLE_RATE_1_MASK,
sr_val);
if (base) if (base)
snd_soc_component_update_bits(component, base + ARIZONA_AIF_RATE_CTRL, snd_soc_component_update_bits(component,
ARIZONA_AIF1_RATE_MASK, base + ARIZONA_AIF_RATE_CTRL,
8 << ARIZONA_AIF1_RATE_SHIFT); ARIZONA_AIF1_RATE_MASK,
8 << ARIZONA_AIF1_RATE_SHIFT);
break; break;
default: default:
arizona_aif_err(dai, "Invalid clock %d\n", dai_priv->clk); arizona_aif_err(dai, "Invalid clock %d\n", dai_priv->clk);
@ -1849,9 +1854,10 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
base + ARIZONA_AIF_RX_ENABLES); base + ARIZONA_AIF_RX_ENABLES);
/* Disable AIF TX/RX before reconfiguring it */ /* Disable AIF TX/RX before reconfiguring it */
regmap_update_bits_async(arizona->regmap, regmap_update_bits_async(arizona->regmap,
base + ARIZONA_AIF_TX_ENABLES, 0xff, 0x0); base + ARIZONA_AIF_TX_ENABLES,
0xff, 0x0);
regmap_update_bits(arizona->regmap, regmap_update_bits(arizona->regmap,
base + ARIZONA_AIF_RX_ENABLES, 0xff, 0x0); base + ARIZONA_AIF_RX_ENABLES, 0xff, 0x0);
} }
ret = arizona_hw_params_rate(substream, params, dai); ret = arizona_hw_params_rate(substream, params, dai);
@ -1960,8 +1966,9 @@ static int arizona_set_tristate(struct snd_soc_dai *dai, int tristate)
else else
reg = 0; reg = 0;
return snd_soc_component_update_bits(component, base + ARIZONA_AIF_RATE_CTRL, return snd_soc_component_update_bits(component,
ARIZONA_AIF1_TRI, reg); base + ARIZONA_AIF_RATE_CTRL,
ARIZONA_AIF1_TRI, reg);
} }
static void arizona_set_channels_to_mask(struct snd_soc_dai *dai, static void arizona_set_channels_to_mask(struct snd_soc_dai *dai,
@ -2319,7 +2326,6 @@ static int arizona_calc_fll(struct arizona_fll *fll,
arizona_fll_dbg(fll, "GAIN=0x%x(%d)\n", cfg->gain, 1 << cfg->gain); arizona_fll_dbg(fll, "GAIN=0x%x(%d)\n", cfg->gain, 1 << cfg->gain);
return 0; return 0;
} }
static void arizona_apply_fll(struct arizona *arizona, unsigned int base, static void arizona_apply_fll(struct arizona *arizona, unsigned int base,
@ -2565,9 +2571,8 @@ int arizona_set_fll_refclk(struct arizona_fll *fll, int source,
fll->ref_src = source; fll->ref_src = source;
fll->ref_freq = Fref; fll->ref_freq = Fref;
if (fll->fout && Fref > 0) { if (fll->fout && Fref > 0)
ret = arizona_enable_fll(fll); ret = arizona_enable_fll(fll);
}
return ret; return ret;
} }
@ -2656,7 +2661,8 @@ EXPORT_SYMBOL_GPL(arizona_init_fll);
* Most systems have a single static configuration and should use * Most systems have a single static configuration and should use
* platform data instead. * platform data instead.
*/ */
int arizona_set_output_mode(struct snd_soc_component *component, int output, bool diff) int arizona_set_output_mode(struct snd_soc_component *component, int output,
bool diff)
{ {
unsigned int reg, val; unsigned int reg, val;
@ -2670,7 +2676,8 @@ int arizona_set_output_mode(struct snd_soc_component *component, int output, boo
else else
val = 0; val = 0;
return snd_soc_component_update_bits(component, reg, ARIZONA_OUT1_MONO, val); return snd_soc_component_update_bits(component, reg,
ARIZONA_OUT1_MONO, val);
} }
EXPORT_SYMBOL_GPL(arizona_set_output_mode); EXPORT_SYMBOL_GPL(arizona_set_output_mode);

22
sound/soc/codecs/cs47l24.c
View File

@ -196,14 +196,13 @@ SOC_SINGLE("HPOUT1 SC Protect Switch", ARIZONA_HP1_SHORT_CIRCUIT_CTRL,
SOC_DOUBLE_R("HPOUT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_1L, SOC_DOUBLE_R("HPOUT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_1L,
ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_MUTE_SHIFT, 1, 1), ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_MUTE_SHIFT, 1, 1),
SOC_SINGLE("Speaker Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_4L, SOC_SINGLE("Speaker Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_4L,
ARIZONA_OUT4L_MUTE_SHIFT, 1, 1), ARIZONA_OUT4L_MUTE_SHIFT, 1, 1),
SOC_DOUBLE_R_TLV("HPOUT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_1L, SOC_DOUBLE_R_TLV("HPOUT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_1L,
ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_VOL_SHIFT, ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_VOL_SHIFT,
0xbf, 0, digital_tlv), 0xbf, 0, digital_tlv),
SOC_SINGLE_TLV("Speaker Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_4L, SOC_SINGLE_TLV("Speaker Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_4L,
ARIZONA_OUT4L_VOL_SHIFT, ARIZONA_OUT4L_VOL_SHIFT, 0xbf, 0, digital_tlv),
0xbf, 0, digital_tlv),
SOC_ENUM("Output Ramp Up", arizona_out_vi_ramp), SOC_ENUM("Output Ramp Up", arizona_out_vi_ramp),
SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp), SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp),
@ -494,8 +493,7 @@ SND_SOC_DAPM_PGA("ISRC3DEC4", ARIZONA_ISRC_3_CTRL_3,
ARIZONA_ISRC3_DEC3_ENA_SHIFT, 0, NULL, 0), ARIZONA_ISRC3_DEC3_ENA_SHIFT, 0, NULL, 0),
SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, &cs47l24_aec_loopback_mux),
&cs47l24_aec_loopback_mux),
SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0, SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,
ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0), ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),
@ -931,8 +929,8 @@ static const struct snd_soc_dapm_route cs47l24_dapm_routes[] = {
{ "DSP3 Voice Trigger", "Switch", "DSP3" }, { "DSP3 Voice Trigger", "Switch", "DSP3" },
}; };
static int cs47l24_set_fll(struct snd_soc_component *component, int fll_id, int source, static int cs47l24_set_fll(struct snd_soc_component *component, int fll_id,
unsigned int Fref, unsigned int Fout) int source, unsigned int Fref, unsigned int Fout)
{ {
struct cs47l24_priv *cs47l24 = snd_soc_component_get_drvdata(component); struct cs47l24_priv *cs47l24 = snd_soc_component_get_drvdata(component);
@ -1144,7 +1142,8 @@ static int cs47l24_component_probe(struct snd_soc_component *component)
goto err_adsp2_codec_probe; goto err_adsp2_codec_probe;
ret = snd_soc_add_component_controls(component, ret = snd_soc_add_component_controls(component,
&arizona_adsp2_rate_controls[1], 2); &arizona_adsp2_rate_controls[1],
2);
if (ret) if (ret)
goto err_adsp2_codec_probe; goto err_adsp2_codec_probe;
@ -1214,7 +1213,7 @@ static int cs47l24_probe(struct platform_device *pdev)
BUILD_BUG_ON(ARRAY_SIZE(cs47l24_dai) > ARIZONA_MAX_DAI); BUILD_BUG_ON(ARRAY_SIZE(cs47l24_dai) > ARIZONA_MAX_DAI);
cs47l24 = devm_kzalloc(&pdev->dev, sizeof(struct cs47l24_priv), cs47l24 = devm_kzalloc(&pdev->dev, sizeof(struct cs47l24_priv),
GFP_KERNEL); GFP_KERNEL);
if (!cs47l24) if (!cs47l24)
return -ENOMEM; return -ENOMEM;
@ -1294,8 +1293,9 @@ static int cs47l24_probe(struct platform_device *pdev)
goto err_dsp_irq; goto err_dsp_irq;
ret = devm_snd_soc_register_component(&pdev->dev, ret = devm_snd_soc_register_component(&pdev->dev,
&soc_component_dev_cs47l24, &soc_component_dev_cs47l24,
cs47l24_dai, ARRAY_SIZE(cs47l24_dai)); cs47l24_dai,
ARRAY_SIZE(cs47l24_dai));
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to register component: %d\n", ret); dev_err(&pdev->dev, "Failed to register component: %d\n", ret);
goto err_spk_irqs; goto err_spk_irqs;

20
sound/soc/codecs/wm5102.c
View File

@ -620,7 +620,7 @@ static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w,
} }
static int wm5102_adsp_power_ev(struct snd_soc_dapm_widget *w, static int wm5102_adsp_power_ev(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
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 arizona *arizona = dev_get_drvdata(component->dev->parent); struct arizona *arizona = dev_get_drvdata(component->dev->parent);
@ -717,7 +717,7 @@ static int wm5102_out_comp_switch_put(struct snd_kcontrol *kcontrol,
return 0; return 0;
} }
static const char *wm5102_osr_text[] = { static const char * const wm5102_osr_text[] = {
"Low power", "Normal", "High performance", "Low power", "Normal", "High performance",
}; };
@ -1062,7 +1062,7 @@ ARIZONA_MIXER_ENUMS(DSP1R, ARIZONA_DSP1RMIX_INPUT_1_SOURCE);
ARIZONA_DSP_AUX_ENUMS(DSP1, ARIZONA_DSP1AUX1MIX_INPUT_1_SOURCE); ARIZONA_DSP_AUX_ENUMS(DSP1, ARIZONA_DSP1AUX1MIX_INPUT_1_SOURCE);
static const char *wm5102_aec_loopback_texts[] = { static const char * const wm5102_aec_loopback_texts[] = {
"HPOUT1L", "HPOUT1R", "HPOUT2L", "HPOUT2R", "EPOUT", "HPOUT1L", "HPOUT1R", "HPOUT2L", "HPOUT2R", "EPOUT",
"SPKOUTL", "SPKOUTR", "SPKDAT1L", "SPKDAT1R", "SPKOUTL", "SPKOUTR", "SPKDAT1L", "SPKDAT1R",
}; };
@ -1317,8 +1317,7 @@ SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0,
ARIZONA_DSP_WIDGETS(DSP1, "DSP1"), ARIZONA_DSP_WIDGETS(DSP1, "DSP1"),
SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, &wm5102_aec_loopback_mux),
&wm5102_aec_loopback_mux),
SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM, SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev, ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,
@ -1736,8 +1735,8 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = {
{ "DRC1 Signal Activity", NULL, "DRC1R" }, { "DRC1 Signal Activity", NULL, "DRC1R" },
}; };
static int wm5102_set_fll(struct snd_soc_component *component, int fll_id, int source, static int wm5102_set_fll(struct snd_soc_component *component, int fll_id,
unsigned int Fref, unsigned int Fout) int source, unsigned int Fref, unsigned int Fout)
{ {
struct wm5102_priv *wm5102 = snd_soc_component_get_drvdata(component); struct wm5102_priv *wm5102 = snd_soc_component_get_drvdata(component);
@ -1947,7 +1946,7 @@ static int wm5102_component_probe(struct snd_soc_component *component)
return ret; return ret;
ret = snd_soc_add_component_controls(component, ret = snd_soc_add_component_controls(component,
arizona_adsp2_rate_controls, 1); arizona_adsp2_rate_controls, 1);
if (ret) if (ret)
goto err_adsp2_codec_probe; goto err_adsp2_codec_probe;
@ -2105,8 +2104,9 @@ static int wm5102_probe(struct platform_device *pdev)
goto err_dsp_irq; goto err_dsp_irq;
ret = devm_snd_soc_register_component(&pdev->dev, ret = devm_snd_soc_register_component(&pdev->dev,
&soc_component_dev_wm5102, &soc_component_dev_wm5102,
wm5102_dai, ARRAY_SIZE(wm5102_dai)); wm5102_dai,
ARRAY_SIZE(wm5102_dai));
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to register component: %d\n", ret); dev_err(&pdev->dev, "Failed to register component: %d\n", ret);
goto err_spk_irqs; goto err_spk_irqs;

62
sound/soc/codecs/wm5110.c
View File

@ -332,19 +332,25 @@ static int wm5110_hp_pre_disable(struct snd_soc_dapm_widget *w)
switch (w->shift) { switch (w->shift) {
case ARIZONA_OUT1L_ENA_SHIFT: case ARIZONA_OUT1L_ENA_SHIFT:
if (!(val & ARIZONA_DRE1L_ENA_MASK)) { if (!(val & ARIZONA_DRE1L_ENA_MASK)) {
snd_soc_component_update_bits(component, ARIZONA_SPARE_TRIGGERS, snd_soc_component_update_bits(component,
ARIZONA_WS_TRG1, ARIZONA_WS_TRG1); ARIZONA_SPARE_TRIGGERS,
snd_soc_component_update_bits(component, ARIZONA_SPARE_TRIGGERS, ARIZONA_WS_TRG1,
ARIZONA_WS_TRG1, 0); ARIZONA_WS_TRG1);
snd_soc_component_update_bits(component,
ARIZONA_SPARE_TRIGGERS,
ARIZONA_WS_TRG1, 0);
priv->out_down_delay += 27; priv->out_down_delay += 27;
} }
break; break;
case ARIZONA_OUT1R_ENA_SHIFT: case ARIZONA_OUT1R_ENA_SHIFT:
if (!(val & ARIZONA_DRE1R_ENA_MASK)) { if (!(val & ARIZONA_DRE1R_ENA_MASK)) {
snd_soc_component_update_bits(component, ARIZONA_SPARE_TRIGGERS, snd_soc_component_update_bits(component,
ARIZONA_WS_TRG2, ARIZONA_WS_TRG2); ARIZONA_SPARE_TRIGGERS,
snd_soc_component_update_bits(component, ARIZONA_SPARE_TRIGGERS, ARIZONA_WS_TRG2,
ARIZONA_WS_TRG2, 0); ARIZONA_WS_TRG2);
snd_soc_component_update_bits(component,
ARIZONA_SPARE_TRIGGERS,
ARIZONA_WS_TRG2, 0);
priv->out_down_delay += 27; priv->out_down_delay += 27;
} }
break; break;
@ -539,7 +545,7 @@ static int wm5110_in_analog_ev(struct snd_soc_dapm_widget *w,
break; break;
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
snd_soc_component_update_bits(component, reg, mask, snd_soc_component_update_bits(component, reg, mask,
wm5110->in_pga_cache[w->shift]); wm5110->in_pga_cache[w->shift]);
wm5110->in_post_pending--; wm5110->in_post_pending--;
if (wm5110->in_post_pending == 0) if (wm5110->in_post_pending == 0)
@ -863,14 +869,14 @@ SOC_DOUBLE("SPKDAT2 Switch", ARIZONA_PDM_SPK2_CTRL_1, ARIZONA_SPK2L_MUTE_SHIFT,
ARIZONA_SPK2R_MUTE_SHIFT, 1, 1), ARIZONA_SPK2R_MUTE_SHIFT, 1, 1),
SOC_DOUBLE_EXT("HPOUT1 DRE Switch", ARIZONA_DRE_ENABLE, SOC_DOUBLE_EXT("HPOUT1 DRE Switch", ARIZONA_DRE_ENABLE,
ARIZONA_DRE1L_ENA_SHIFT, ARIZONA_DRE1R_ENA_SHIFT, 1, 0, ARIZONA_DRE1L_ENA_SHIFT, ARIZONA_DRE1R_ENA_SHIFT, 1, 0,
snd_soc_get_volsw, wm5110_put_dre), snd_soc_get_volsw, wm5110_put_dre),
SOC_DOUBLE_EXT("HPOUT2 DRE Switch", ARIZONA_DRE_ENABLE, SOC_DOUBLE_EXT("HPOUT2 DRE Switch", ARIZONA_DRE_ENABLE,
ARIZONA_DRE2L_ENA_SHIFT, ARIZONA_DRE2R_ENA_SHIFT, 1, 0, ARIZONA_DRE2L_ENA_SHIFT, ARIZONA_DRE2R_ENA_SHIFT, 1, 0,
snd_soc_get_volsw, wm5110_put_dre), snd_soc_get_volsw, wm5110_put_dre),
SOC_DOUBLE_EXT("HPOUT3 DRE Switch", ARIZONA_DRE_ENABLE, SOC_DOUBLE_EXT("HPOUT3 DRE Switch", ARIZONA_DRE_ENABLE,
ARIZONA_DRE3L_ENA_SHIFT, ARIZONA_DRE3R_ENA_SHIFT, 1, 0, ARIZONA_DRE3L_ENA_SHIFT, ARIZONA_DRE3R_ENA_SHIFT, 1, 0,
snd_soc_get_volsw, wm5110_put_dre), snd_soc_get_volsw, wm5110_put_dre),
SOC_ENUM("Output Ramp Up", arizona_out_vi_ramp), SOC_ENUM("Output Ramp Up", arizona_out_vi_ramp),
SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp), SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp),
@ -1036,7 +1042,7 @@ ARIZONA_MUX_ENUMS(ISRC3DEC2, ARIZONA_ISRC3DEC2MIX_INPUT_1_SOURCE);
ARIZONA_MUX_ENUMS(ISRC3DEC3, ARIZONA_ISRC3DEC3MIX_INPUT_1_SOURCE); ARIZONA_MUX_ENUMS(ISRC3DEC3, ARIZONA_ISRC3DEC3MIX_INPUT_1_SOURCE);
ARIZONA_MUX_ENUMS(ISRC3DEC4, ARIZONA_ISRC3DEC4MIX_INPUT_1_SOURCE); ARIZONA_MUX_ENUMS(ISRC3DEC4, ARIZONA_ISRC3DEC4MIX_INPUT_1_SOURCE);
static const char *wm5110_aec_loopback_texts[] = { static const char * const wm5110_aec_loopback_texts[] = {
"HPOUT1L", "HPOUT1R", "HPOUT2L", "HPOUT2R", "HPOUT3L", "HPOUT3R", "HPOUT1L", "HPOUT1R", "HPOUT2L", "HPOUT2R", "HPOUT3L", "HPOUT3R",
"SPKOUTL", "SPKOUTR", "SPKDAT1L", "SPKDAT1R", "SPKDAT2L", "SPKDAT2R", "SPKOUTL", "SPKOUTR", "SPKDAT1L", "SPKDAT1R", "SPKDAT2L", "SPKDAT2R",
}; };
@ -1274,18 +1280,17 @@ SND_SOC_DAPM_PGA("ISRC3DEC4", ARIZONA_ISRC_3_CTRL_3,
ARIZONA_ISRC3_DEC3_ENA_SHIFT, 0, NULL, 0), ARIZONA_ISRC3_DEC3_ENA_SHIFT, 0, NULL, 0),
SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, &wm5110_aec_loopback_mux),
&wm5110_aec_loopback_mux),
SND_SOC_DAPM_SUPPLY("RXANC NG External Clock", SND_SOC_NOPM, SND_SOC_DAPM_SUPPLY("RXANC NG External Clock", SND_SOC_NOPM,
ARIZONA_EXT_NG_SEL_SET_SHIFT, 0, arizona_anc_ev, ARIZONA_EXT_NG_SEL_SET_SHIFT, 0, arizona_anc_ev,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
SND_SOC_DAPM_PGA("RXANCL NG External", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_PGA("RXANCL NG External", SND_SOC_NOPM, 0, 0, NULL, 0),
SND_SOC_DAPM_PGA("RXANCR NG External", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_PGA("RXANCR NG External", SND_SOC_NOPM, 0, 0, NULL, 0),
SND_SOC_DAPM_SUPPLY("RXANC NG Clock", SND_SOC_NOPM, SND_SOC_DAPM_SUPPLY("RXANC NG Clock", SND_SOC_NOPM,
ARIZONA_CLK_NG_ENA_SET_SHIFT, 0, arizona_anc_ev, ARIZONA_CLK_NG_ENA_SET_SHIFT, 0, arizona_anc_ev,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
SND_SOC_DAPM_PGA("RXANCL NG Internal", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_PGA("RXANCL NG Internal", SND_SOC_NOPM, 0, 0, NULL, 0),
SND_SOC_DAPM_PGA("RXANCR NG Internal", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_PGA("RXANCR NG Internal", SND_SOC_NOPM, 0, 0, NULL, 0),
@ -2034,8 +2039,8 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {
{ "DSP3 Voice Trigger", "Switch", "DSP3" }, { "DSP3 Voice Trigger", "Switch", "DSP3" },
}; };
static int wm5110_set_fll(struct snd_soc_component *component, int fll_id, int source, static int wm5110_set_fll(struct snd_soc_component *component, int fll_id,
unsigned int Fref, unsigned int Fout) int source, unsigned int Fref, unsigned int Fout)
{ {
struct wm5110_priv *wm5110 = snd_soc_component_get_drvdata(component); struct wm5110_priv *wm5110 = snd_soc_component_get_drvdata(component);
@ -2302,8 +2307,8 @@ static int wm5110_component_probe(struct snd_soc_component *component)
} }
ret = snd_soc_add_component_controls(component, ret = snd_soc_add_component_controls(component,
arizona_adsp2_rate_controls, arizona_adsp2_rate_controls,
WM5110_NUM_ADSP); WM5110_NUM_ADSP);
if (ret) if (ret)
goto err_adsp2_codec_probe; goto err_adsp2_codec_probe;
@ -2460,8 +2465,9 @@ static int wm5110_probe(struct platform_device *pdev)
goto err_dsp_irq; goto err_dsp_irq;
ret = devm_snd_soc_register_component(&pdev->dev, ret = devm_snd_soc_register_component(&pdev->dev,
&soc_component_dev_wm5110, &soc_component_dev_wm5110,
wm5110_dai, ARRAY_SIZE(wm5110_dai)); wm5110_dai,
ARRAY_SIZE(wm5110_dai));
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to register component: %d\n", ret); dev_err(&pdev->dev, "Failed to register component: %d\n", ret);
goto err_spk_irqs; goto err_spk_irqs;

14
sound/soc/codecs/wm8997.c
View File

@ -118,7 +118,7 @@ static int wm8997_sysclk_ev(struct snd_soc_dapm_widget *w,
return arizona_dvfs_sysclk_ev(w, kcontrol, event); return arizona_dvfs_sysclk_ev(w, kcontrol, event);
} }
static const char *wm8997_osr_text[] = { static const char * const wm8997_osr_text[] = {
"Low power", "Normal", "High performance", "Low power", "Normal", "High performance",
}; };
@ -609,8 +609,7 @@ SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0,
ARIZONA_SLIMRX8_ENA_SHIFT, 0), ARIZONA_SLIMRX8_ENA_SHIFT, 0),
SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1, SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, &wm8997_aec_loopback_mux),
&wm8997_aec_loopback_mux),
SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM, SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev, ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,
@ -927,8 +926,8 @@ static const struct snd_soc_dapm_route wm8997_dapm_routes[] = {
{ "MICSUPP", NULL, "SYSCLK" }, { "MICSUPP", NULL, "SYSCLK" },
}; };
static int wm8997_set_fll(struct snd_soc_component *component, int fll_id, int source, static int wm8997_set_fll(struct snd_soc_component *component, int fll_id,
unsigned int Fref, unsigned int Fout) int source, unsigned int Fref, unsigned int Fout)
{ {
struct wm8997_priv *wm8997 = snd_soc_component_get_drvdata(component); struct wm8997_priv *wm8997 = snd_soc_component_get_drvdata(component);
@ -1173,8 +1172,9 @@ static int wm8997_probe(struct platform_device *pdev)
return ret; return ret;
ret = devm_snd_soc_register_component(&pdev->dev, ret = devm_snd_soc_register_component(&pdev->dev,
&soc_component_dev_wm8997, &soc_component_dev_wm8997,
wm8997_dai, ARRAY_SIZE(wm8997_dai)); wm8997_dai,
ARRAY_SIZE(wm8997_dai));
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to register component: %d\n", ret); dev_err(&pdev->dev, "Failed to register component: %d\n", ret);
goto err_spk_irqs; goto err_spk_irqs;

33
sound/soc/codecs/wm8998.c
View File

@ -137,11 +137,13 @@ static int wm8998_inmux_put(struct snd_kcontrol *kcontrol,
if (inmode & ARIZONA_INMODE_SE) if (inmode & ARIZONA_INMODE_SE)
src_val |= 1 << ARIZONA_IN1L_SRC_SE_SHIFT; src_val |= 1 << ARIZONA_IN1L_SRC_SE_SHIFT;
snd_soc_component_update_bits(component, mode_reg, ARIZONA_IN1_MODE_MASK, mode_val); snd_soc_component_update_bits(component, mode_reg,
ARIZONA_IN1_MODE_MASK, mode_val);
snd_soc_component_update_bits(component, e->reg, snd_soc_component_update_bits(component, e->reg,
ARIZONA_IN1L_SRC_MASK | ARIZONA_IN1L_SRC_SE_MASK, ARIZONA_IN1L_SRC_MASK |
src_val); ARIZONA_IN1L_SRC_SE_MASK,
src_val);
return snd_soc_dapm_mux_update_power(dapm, kcontrol, return snd_soc_dapm_mux_update_power(dapm, kcontrol,
ucontrol->value.enumerated.item[0], ucontrol->value.enumerated.item[0],
@ -322,7 +324,7 @@ SOC_DOUBLE_R("HPOUT Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_1L,
SOC_DOUBLE_R("LINEOUT Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L, SOC_DOUBLE_R("LINEOUT Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,
ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_MUTE_SHIFT, 1, 1), ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_MUTE_SHIFT, 1, 1),
SOC_SINGLE("EPOUT Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_3L, SOC_SINGLE("EPOUT Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_3L,
ARIZONA_OUT3L_MUTE_SHIFT, 1, 1), ARIZONA_OUT3L_MUTE_SHIFT, 1, 1),
SOC_DOUBLE_R("Speaker Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_4L, SOC_DOUBLE_R("Speaker Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_4L,
ARIZONA_DAC_DIGITAL_VOLUME_4R, ARIZONA_OUT4L_MUTE_SHIFT, 1, 1), ARIZONA_DAC_DIGITAL_VOLUME_4R, ARIZONA_OUT4L_MUTE_SHIFT, 1, 1),
SOC_DOUBLE_R("SPKDAT Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_5L, SOC_DOUBLE_R("SPKDAT Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_5L,
@ -335,7 +337,7 @@ SOC_DOUBLE_R_TLV("LINEOUT Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_2L,
ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_VOL_SHIFT, ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_OUT2L_VOL_SHIFT,
0xbf, 0, digital_tlv), 0xbf, 0, digital_tlv),
SOC_SINGLE_TLV("EPOUT Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_3L, SOC_SINGLE_TLV("EPOUT Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_3L,
ARIZONA_OUT3L_VOL_SHIFT, 0xbf, 0, digital_tlv), ARIZONA_OUT3L_VOL_SHIFT, 0xbf, 0, digital_tlv),
SOC_DOUBLE_R_TLV("Speaker Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_4L, SOC_DOUBLE_R_TLV("Speaker Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_4L,
ARIZONA_DAC_DIGITAL_VOLUME_4R, ARIZONA_OUT4L_VOL_SHIFT, ARIZONA_DAC_DIGITAL_VOLUME_4R, ARIZONA_OUT4L_VOL_SHIFT,
0xbf, 0, digital_tlv), 0xbf, 0, digital_tlv),
@ -615,12 +617,12 @@ SND_SOC_DAPM_PGA("ISRC2DEC2", ARIZONA_ISRC_2_CTRL_3,
ARIZONA_ISRC2_DEC1_ENA_SHIFT, 0, NULL, 0), ARIZONA_ISRC2_DEC1_ENA_SHIFT, 0, NULL, 0),
SND_SOC_DAPM_MUX("AEC1 Loopback", ARIZONA_DAC_AEC_CONTROL_1, SND_SOC_DAPM_MUX("AEC1 Loopback", ARIZONA_DAC_AEC_CONTROL_1,
ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0,
&wm8998_aec_loopback_mux[0]), &wm8998_aec_loopback_mux[0]),
SND_SOC_DAPM_MUX("AEC2 Loopback", ARIZONA_DAC_AEC_CONTROL_2, SND_SOC_DAPM_MUX("AEC2 Loopback", ARIZONA_DAC_AEC_CONTROL_2,
ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0, ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0,
&wm8998_aec_loopback_mux[1]), &wm8998_aec_loopback_mux[1]),
SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0, SND_SOC_DAPM_AIF_OUT("AIF1TX1", NULL, 0,
ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0), ARIZONA_AIF1_TX_ENABLES, ARIZONA_AIF1TX1_ENA_SHIFT, 0),
@ -739,9 +741,9 @@ SND_SOC_DAPM_PGA_E("OUT5R", ARIZONA_OUTPUT_ENABLES_1,
SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
SND_SOC_DAPM_PGA("SPD1TX1", ARIZONA_SPD1_TX_CONTROL, SND_SOC_DAPM_PGA("SPD1TX1", ARIZONA_SPD1_TX_CONTROL,
ARIZONA_SPD1_VAL1_SHIFT, 0, NULL, 0), ARIZONA_SPD1_VAL1_SHIFT, 0, NULL, 0),
SND_SOC_DAPM_PGA("SPD1TX2", ARIZONA_SPD1_TX_CONTROL, SND_SOC_DAPM_PGA("SPD1TX2", ARIZONA_SPD1_TX_CONTROL,
ARIZONA_SPD1_VAL2_SHIFT, 0, NULL, 0), ARIZONA_SPD1_VAL2_SHIFT, 0, NULL, 0),
SND_SOC_DAPM_OUT_DRV("SPD1", ARIZONA_SPD1_TX_CONTROL, SND_SOC_DAPM_OUT_DRV("SPD1", ARIZONA_SPD1_TX_CONTROL,
ARIZONA_SPD1_ENA_SHIFT, 0, NULL, 0), ARIZONA_SPD1_ENA_SHIFT, 0, NULL, 0),
@ -1249,8 +1251,8 @@ static struct snd_soc_dai_driver wm8998_dai[] = {
}, },
}; };
static int wm8998_set_fll(struct snd_soc_component *component, int fll_id, int source, static int wm8998_set_fll(struct snd_soc_component *component, int fll_id,
unsigned int Fref, unsigned int Fout) int source, unsigned int Fref, unsigned int Fout)
{ {
struct wm8998_priv *wm8998 = snd_soc_component_get_drvdata(component); struct wm8998_priv *wm8998 = snd_soc_component_get_drvdata(component);
@ -1379,8 +1381,9 @@ static int wm8998_probe(struct platform_device *pdev)
return ret; return ret;
ret = devm_snd_soc_register_component(&pdev->dev, ret = devm_snd_soc_register_component(&pdev->dev,
&soc_component_dev_wm8998, &soc_component_dev_wm8998,
wm8998_dai, ARRAY_SIZE(wm8998_dai)); wm8998_dai,
ARRAY_SIZE(wm8998_dai));
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to register component: %d\n", ret); dev_err(&pdev->dev, "Failed to register component: %d\n", ret);
goto err_spk_irqs; goto err_spk_irqs;