Commit d02b1059 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.8-rc3' of... 

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

ASoC: Fixes for v5.8

A few small driver specific fixes, nothing particularly dramatic.
parents b9fd2007 bc5c7f55

sound/soc/amd/renoir/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Renoir platform Support

snd-rn-pci-acp3x-objs	:= rn-pci-acp3x.o

snd-acp3x-pdm-dma-objs	:= acp3x-pdm-dma.o

snd-acp3x-rn-objs	:= acp3x-rn.o

obj-$(CONFIG_SND_SOC_AMD_RENOIR)	+= snd-rn-pci-acp3x.o

obj-$(CONFIG_SND_SOC_AMD_RENOIR)	+= snd-acp3x-pdm-dma.o

obj-$(CONFIG_SND_SOC_AMD_RENOIR_MACH)	+= acp3x-rn.o
 
obj-$(CONFIG_SND_SOC_AMD_RENOIR_MACH)	+= snd-acp3x-rn.o

sound/soc/codecs/rt5682.c

+8 −1
Original line number Diff line number Diff line
@@ -932,7 +932,9 @@ int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert) 
			RT5682_PWR_ANLG_1, RT5682_PWR_FV2, RT5682_PWR_FV2);

		snd_soc_component_update_bits(component, RT5682_PWR_ANLG_3,

			RT5682_PWR_CBJ, RT5682_PWR_CBJ);



		snd_soc_component_update_bits(component,

			RT5682_HP_CHARGE_PUMP_1,

			RT5682_OSW_L_MASK | RT5682_OSW_R_MASK, 0);

		snd_soc_component_update_bits(component, RT5682_CBJ_CTRL_1,

			RT5682_TRIG_JD_MASK, RT5682_TRIG_JD_HIGH);
@@ -956,6 +958,11 @@ int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert) 
			rt5682->jack_type = SND_JACK_HEADPHONE;

			break;

		}



		snd_soc_component_update_bits(component,

			RT5682_HP_CHARGE_PUMP_1,

			RT5682_OSW_L_MASK | RT5682_OSW_R_MASK,

			RT5682_OSW_L_EN | RT5682_OSW_R_EN);

	} else {

		rt5682_enable_push_button_irq(component, false);

		snd_soc_component_update_bits(component, RT5682_CBJ_CTRL_1,

sound/soc/fsl/fsl_mqs.c

+14 −9
Original line number Diff line number Diff line
@@ -265,12 +265,20 @@ static int fsl_mqs_remove(struct platform_device *pdev) 
static int fsl_mqs_runtime_resume(struct device *dev)

{

	struct fsl_mqs *mqs_priv = dev_get_drvdata(dev);

	int ret;



	if (mqs_priv->ipg)

		clk_prepare_enable(mqs_priv->ipg);

	ret = clk_prepare_enable(mqs_priv->ipg);

	if (ret) {

		dev_err(dev, "failed to enable ipg clock\n");

		return ret;

	}



	if (mqs_priv->mclk)

		clk_prepare_enable(mqs_priv->mclk);

	ret = clk_prepare_enable(mqs_priv->mclk);

	if (ret) {

		dev_err(dev, "failed to enable mclk clock\n");

		clk_disable_unprepare(mqs_priv->ipg);

		return ret;

	}



	if (mqs_priv->use_gpr)

		regmap_write(mqs_priv->regmap, IOMUXC_GPR2,
@@ -292,10 +300,7 @@ static int fsl_mqs_runtime_suspend(struct device *dev) 
		regmap_read(mqs_priv->regmap, REG_MQS_CTRL,

			    &mqs_priv->reg_mqs_ctrl);



	if (mqs_priv->mclk)

	clk_disable_unprepare(mqs_priv->mclk);



	if (mqs_priv->ipg)

	clk_disable_unprepare(mqs_priv->ipg);



	return 0;