Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a230f7d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-4.17-rc2' of... 

Merge tag 'asoc-fix-4.17-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v4.17

A small batch of fixes collected since the merge window, none of which
are particularly large or remarkable.  They've all been cooking in -next
for a while.
parents 65811834 a8419a0c

sound/soc/amd/acp-da7219-max98357a.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#define DUAL_CHANNEL		2



static struct snd_soc_jack cz_jack;

struct clk *da7219_dai_clk;

static struct clk *da7219_dai_clk;



static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)

{

sound/soc/codecs/adau17x1.c

+20 −6
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static int adau17x1_hw_params(struct snd_pcm_substream *substream, 
	}



	if (adau->sigmadsp) {

		ret = adau17x1_setup_firmware(adau, params_rate(params));

		ret = adau17x1_setup_firmware(component, params_rate(params));

		if (ret < 0)

			return ret;

	}
@@ -835,26 +835,40 @@ bool adau17x1_volatile_register(struct device *dev, unsigned int reg) 
}

EXPORT_SYMBOL_GPL(adau17x1_volatile_register);



int adau17x1_setup_firmware(struct adau *adau, unsigned int rate)

int adau17x1_setup_firmware(struct snd_soc_component *component,

	unsigned int rate)

{

	int ret;

	int dspsr;

	int dspsr, dsp_run;

	struct adau *adau = snd_soc_component_get_drvdata(component);

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);



	snd_soc_dapm_mutex_lock(dapm);



	ret = regmap_read(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, &dspsr);

	if (ret)

		return ret;

		goto err;



	ret = regmap_read(adau->regmap, ADAU17X1_DSP_RUN, &dsp_run);

	if (ret)

		goto err;



	regmap_write(adau->regmap, ADAU17X1_DSP_ENABLE, 1);

	regmap_write(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, 0xf);

	regmap_write(adau->regmap, ADAU17X1_DSP_RUN, 0);



	ret = sigmadsp_setup(adau->sigmadsp, rate);

	if (ret) {

		regmap_write(adau->regmap, ADAU17X1_DSP_ENABLE, 0);

		return ret;

		goto err;

	}

	regmap_write(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, dspsr);

	regmap_write(adau->regmap, ADAU17X1_DSP_RUN, dsp_run);



	return 0;

err:

	snd_soc_dapm_mutex_unlock(dapm);



	return ret;

}

EXPORT_SYMBOL_GPL(adau17x1_setup_firmware);

sound/soc/codecs/adau17x1.h

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ int adau17x1_resume(struct snd_soc_component *component); 


extern const struct snd_soc_dai_ops adau17x1_dai_ops;



int adau17x1_setup_firmware(struct adau *adau, unsigned int rate);

int adau17x1_setup_firmware(struct snd_soc_component *component,

	unsigned int rate);

bool adau17x1_has_dsp(struct adau *adau);



#define ADAU17X1_CLOCK_CONTROL			0x4000

sound/soc/codecs/msm8916-wcd-analog.c

+6 −3
Original line number Diff line number Diff line
@@ -1187,7 +1187,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) 
		return irq;

	}



	ret = devm_request_irq(dev, irq, pm8916_mbhc_switch_irq_handler,

	ret = devm_request_threaded_irq(dev, irq, NULL,

			       pm8916_mbhc_switch_irq_handler,

			       IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |

			       IRQF_ONESHOT,

			       "mbhc switch irq", priv);
@@ -1201,7 +1202,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) 
			return irq;

		}



		ret = devm_request_irq(dev, irq, mbhc_btn_press_irq_handler,

		ret = devm_request_threaded_irq(dev, irq, NULL,

				       mbhc_btn_press_irq_handler,

				       IRQF_TRIGGER_RISING |

				       IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				       "mbhc btn press irq", priv);
@@ -1214,7 +1216,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) 
			return irq;

		}



		ret = devm_request_irq(dev, irq, mbhc_btn_release_irq_handler,

		ret = devm_request_threaded_irq(dev, irq, NULL,

				       mbhc_btn_release_irq_handler,

				       IRQF_TRIGGER_RISING |

				       IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				       "mbhc btn release irq", priv);

sound/soc/codecs/rt5514.c

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static const struct reg_default rt5514_reg[] = { 
	{RT5514_PLL3_CALIB_CTRL5,	0x40220012},

	{RT5514_DELAY_BUF_CTRL1,	0x7fff006a},

	{RT5514_DELAY_BUF_CTRL3,	0x00000000},

	{RT5514_ASRC_IN_CTRL1,		0x00000003},

	{RT5514_DOWNFILTER0_CTRL1,	0x00020c2f},

	{RT5514_DOWNFILTER0_CTRL2,	0x00020c2f},

	{RT5514_DOWNFILTER0_CTRL3,	0x10000362},
@@ -181,6 +182,7 @@ static bool rt5514_readable_register(struct device *dev, unsigned int reg) 
	case RT5514_PLL3_CALIB_CTRL5:

	case RT5514_DELAY_BUF_CTRL1:

	case RT5514_DELAY_BUF_CTRL3:

	case RT5514_ASRC_IN_CTRL1:

	case RT5514_DOWNFILTER0_CTRL1:

	case RT5514_DOWNFILTER0_CTRL2:

	case RT5514_DOWNFILTER0_CTRL3:
@@ -238,6 +240,7 @@ static bool rt5514_i2c_readable_register(struct device *dev, 
	case RT5514_DSP_MAPPING | RT5514_PLL3_CALIB_CTRL5:

	case RT5514_DSP_MAPPING | RT5514_DELAY_BUF_CTRL1:

	case RT5514_DSP_MAPPING | RT5514_DELAY_BUF_CTRL3:

	case RT5514_DSP_MAPPING | RT5514_ASRC_IN_CTRL1:

	case RT5514_DSP_MAPPING | RT5514_DOWNFILTER0_CTRL1:

	case RT5514_DSP_MAPPING | RT5514_DOWNFILTER0_CTRL2:

	case RT5514_DSP_MAPPING | RT5514_DOWNFILTER0_CTRL3: