Commit 84ab9408 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.0-rc7' of... 

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

ASoC: Last fixes for v6.0

In the even that there's another pull request here's some more driver
specific fixes.
parents c35fbea4 e18f6bcf

sound/soc/codecs/es8316.c

+2 −0
Original line number Diff line number Diff line
@@ -793,6 +793,8 @@ static const struct regmap_access_table es8316_volatile_table = { 
static const struct regmap_config es8316_regmap = {

	.reg_bits = 8,

	.val_bits = 8,

	.use_single_read = true,

	.use_single_write = true,

	.max_register = 0x53,

	.volatile_table	= &es8316_volatile_table,

	.cache_type = REGCACHE_RBTREE,

sound/soc/codecs/wcd-mbhc-v2.c

+6 −4
Original line number Diff line number Diff line
@@ -714,11 +714,12 @@ static int wcd_mbhc_initialise(struct wcd_mbhc *mbhc) 
	struct snd_soc_component *component = mbhc->component;

	int ret;



	ret = pm_runtime_resume_and_get(component->dev);

	ret = pm_runtime_get_sync(component->dev);

	if (ret < 0 && ret != -EACCES) {

		dev_err_ratelimited(component->dev,

				    "pm_runtime_resume_and_get failed in %s, ret %d\n",

				    "pm_runtime_get_sync failed in %s, ret %d\n",

				    __func__, ret);

		pm_runtime_put_noidle(component->dev);

		return ret;

	}
@@ -1096,11 +1097,12 @@ static void wcd_correct_swch_plug(struct work_struct *work) 
	mbhc = container_of(work, struct wcd_mbhc, correct_plug_swch);

	component = mbhc->component;



	ret = pm_runtime_resume_and_get(component->dev);

	ret = pm_runtime_get_sync(component->dev);

	if (ret < 0 && ret != -EACCES) {

		dev_err_ratelimited(component->dev,

				    "pm_runtime_resume_and_get failed in %s, ret %d\n",

				    "pm_runtime_get_sync failed in %s, ret %d\n",

				    __func__, ret);

		pm_runtime_put_noidle(component->dev);

		return;

	}

	micbias_mv = wcd_mbhc_get_micbias(mbhc);

sound/soc/codecs/wcd9335.c

+1 −1
Original line number Diff line number Diff line
@@ -1974,8 +1974,8 @@ static int wcd9335_trigger(struct snd_pcm_substream *substream, int cmd, 
	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		slim_stream_unprepare(dai_data->sruntime);

		slim_stream_disable(dai_data->sruntime);

		slim_stream_unprepare(dai_data->sruntime);

		break;

	default:

		break;

sound/soc/codecs/wcd934x.c

+1 −1
Original line number Diff line number Diff line
@@ -1913,8 +1913,8 @@ static int wcd934x_trigger(struct snd_pcm_substream *substream, int cmd, 
	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		slim_stream_unprepare(dai_data->sruntime);

		slim_stream_disable(dai_data->sruntime);

		slim_stream_unprepare(dai_data->sruntime);

		break;

	default:

		break;

sound/soc/fsl/fsl_audmix.c

+4 −12
Original line number Diff line number Diff line
@@ -199,18 +199,10 @@ static int fsl_audmix_put_out_src(struct snd_kcontrol *kcontrol, 


static const struct snd_kcontrol_new fsl_audmix_snd_controls[] = {

	/* FSL_AUDMIX_CTR controls */

	{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Mixing Clock Source",

		.info = snd_soc_info_enum_double,

		.access = SNDRV_CTL_ELEM_ACCESS_WRITE,

		.put = fsl_audmix_put_mix_clk_src,

		.private_value = (unsigned long)&fsl_audmix_enum[0] },

	{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Output Source",

		.info = snd_soc_info_enum_double,

		.access = SNDRV_CTL_ELEM_ACCESS_WRITE,

		.put = fsl_audmix_put_out_src,

		.private_value = (unsigned long)&fsl_audmix_enum[1] },

	SOC_ENUM_EXT("Mixing Clock Source", fsl_audmix_enum[0],

		     snd_soc_get_enum_double, fsl_audmix_put_mix_clk_src),

	SOC_ENUM_EXT("Output Source", fsl_audmix_enum[1],

		     snd_soc_get_enum_double, fsl_audmix_put_out_src),

	SOC_ENUM("Output Width", fsl_audmix_enum[2]),

	SOC_ENUM("Frame Rate Diff Error", fsl_audmix_enum[3]),

	SOC_ENUM("Clock Freq Diff Error", fsl_audmix_enum[4]),