Commit 923f1cbf authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/st',... 

Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/st', 'asoc/fix/sun4i-codec', 'asoc/fix/topology', 'asoc/fix/wm8960' and 'asoc/fix/wm8962' into asoc-linus
parents 642eb066 c22d7666 36a65e20 474d147a f4be978b 41a59cae e9f96bc5

sound/soc/codecs/rt5677.c

+61 −39
Original line number Diff line number Diff line
@@ -1386,90 +1386,90 @@ static const struct snd_kcontrol_new rt5677_dac_r_mix[] = { 
};



static const struct snd_kcontrol_new rt5677_sto1_dac_l_mix[] = {

	SOC_DAPM_SINGLE("ST L Switch", RT5677_STO1_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("ST L Switch", RT5677_STO1_DAC_MIXER,

			RT5677_M_ST_DAC1_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC1 L Switch", RT5677_STO1_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC1 L Switch", RT5677_STO1_DAC_MIXER,

			RT5677_M_DAC1_L_STO_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC2 L Switch", RT5677_STO1_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC2 L Switch", RT5677_STO1_DAC_MIXER,

			RT5677_M_DAC2_L_STO_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC1 R Switch", RT5677_STO1_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC1 R Switch", RT5677_STO1_DAC_MIXER,

			RT5677_M_DAC1_R_STO_L_SFT, 1, 1),

};



static const struct snd_kcontrol_new rt5677_sto1_dac_r_mix[] = {

	SOC_DAPM_SINGLE("ST R Switch", RT5677_STO1_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("ST R Switch", RT5677_STO1_DAC_MIXER,

			RT5677_M_ST_DAC1_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC1 R Switch", RT5677_STO1_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC1 R Switch", RT5677_STO1_DAC_MIXER,

			RT5677_M_DAC1_R_STO_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC2 R Switch", RT5677_STO1_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC2 R Switch", RT5677_STO1_DAC_MIXER,

			RT5677_M_DAC2_R_STO_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC1 L Switch", RT5677_STO1_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC1 L Switch", RT5677_STO1_DAC_MIXER,

			RT5677_M_DAC1_L_STO_R_SFT, 1, 1),

};



static const struct snd_kcontrol_new rt5677_mono_dac_l_mix[] = {

	SOC_DAPM_SINGLE("ST L Switch", RT5677_MONO_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("ST L Switch", RT5677_MONO_DAC_MIXER,

			RT5677_M_ST_DAC2_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC1 L Switch", RT5677_MONO_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC1 L Switch", RT5677_MONO_DAC_MIXER,

			RT5677_M_DAC1_L_MONO_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC2 L Switch", RT5677_MONO_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC2 L Switch", RT5677_MONO_DAC_MIXER,

			RT5677_M_DAC2_L_MONO_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC2 R Switch", RT5677_MONO_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC2 R Switch", RT5677_MONO_DAC_MIXER,

			RT5677_M_DAC2_R_MONO_L_SFT, 1, 1),

};



static const struct snd_kcontrol_new rt5677_mono_dac_r_mix[] = {

	SOC_DAPM_SINGLE("ST R Switch", RT5677_MONO_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("ST R Switch", RT5677_MONO_DAC_MIXER,

			RT5677_M_ST_DAC2_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC1 R Switch", RT5677_MONO_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC1 R Switch", RT5677_MONO_DAC_MIXER,

			RT5677_M_DAC1_R_MONO_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC2 R Switch", RT5677_MONO_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC2 R Switch", RT5677_MONO_DAC_MIXER,

			RT5677_M_DAC2_R_MONO_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC2 L Switch", RT5677_MONO_DAC_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC2 L Switch", RT5677_MONO_DAC_MIXER,

			RT5677_M_DAC2_L_MONO_R_SFT, 1, 1),

};



static const struct snd_kcontrol_new rt5677_dd1_l_mix[] = {

	SOC_DAPM_SINGLE("Sto DAC Mix L Switch", RT5677_DD1_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("Sto DAC Mix L Switch", RT5677_DD1_MIXER,

			RT5677_M_STO_L_DD1_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("Mono DAC Mix L Switch", RT5677_DD1_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("Mono DAC Mix L Switch", RT5677_DD1_MIXER,

			RT5677_M_MONO_L_DD1_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC3 L Switch", RT5677_DD1_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC3 L Switch", RT5677_DD1_MIXER,

			RT5677_M_DAC3_L_DD1_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC3 R Switch", RT5677_DD1_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC3 R Switch", RT5677_DD1_MIXER,

			RT5677_M_DAC3_R_DD1_L_SFT, 1, 1),

};



static const struct snd_kcontrol_new rt5677_dd1_r_mix[] = {

	SOC_DAPM_SINGLE("Sto DAC Mix R Switch", RT5677_DD1_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("Sto DAC Mix R Switch", RT5677_DD1_MIXER,

			RT5677_M_STO_R_DD1_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("Mono DAC Mix R Switch", RT5677_DD1_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("Mono DAC Mix R Switch", RT5677_DD1_MIXER,

			RT5677_M_MONO_R_DD1_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC3 R Switch", RT5677_DD1_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC3 R Switch", RT5677_DD1_MIXER,

			RT5677_M_DAC3_R_DD1_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC3 L Switch", RT5677_DD1_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC3 L Switch", RT5677_DD1_MIXER,

			RT5677_M_DAC3_L_DD1_R_SFT, 1, 1),

};



static const struct snd_kcontrol_new rt5677_dd2_l_mix[] = {

	SOC_DAPM_SINGLE("Sto DAC Mix L Switch", RT5677_DD2_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("Sto DAC Mix L Switch", RT5677_DD2_MIXER,

			RT5677_M_STO_L_DD2_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("Mono DAC Mix L Switch", RT5677_DD2_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("Mono DAC Mix L Switch", RT5677_DD2_MIXER,

			RT5677_M_MONO_L_DD2_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC4 L Switch", RT5677_DD2_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC4 L Switch", RT5677_DD2_MIXER,

			RT5677_M_DAC4_L_DD2_L_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC4 R Switch", RT5677_DD2_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC4 R Switch", RT5677_DD2_MIXER,

			RT5677_M_DAC4_R_DD2_L_SFT, 1, 1),

};



static const struct snd_kcontrol_new rt5677_dd2_r_mix[] = {

	SOC_DAPM_SINGLE("Sto DAC Mix R Switch", RT5677_DD2_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("Sto DAC Mix R Switch", RT5677_DD2_MIXER,

			RT5677_M_STO_R_DD2_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("Mono DAC Mix R Switch", RT5677_DD2_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("Mono DAC Mix R Switch", RT5677_DD2_MIXER,

			RT5677_M_MONO_R_DD2_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC4 R Switch", RT5677_DD2_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC4 R Switch", RT5677_DD2_MIXER,

			RT5677_M_DAC4_R_DD2_R_SFT, 1, 1),

	SOC_DAPM_SINGLE("DAC4 L Switch", RT5677_DD2_MIXER,

	SOC_DAPM_SINGLE_AUTODISABLE("DAC4 L Switch", RT5677_DD2_MIXER,

			RT5677_M_DAC4_L_DD2_R_SFT, 1, 1),

};
@@ -2596,6 +2596,21 @@ static int rt5677_vref_event(struct snd_soc_dapm_widget *w, 
	return 0;

}



static int rt5677_filter_power_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{

	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		msleep(50);

		break;



	default:

		return 0;

	}



	return 0;

}



static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {

	SND_SOC_DAPM_SUPPLY("PLL1", RT5677_PWR_ANLG2, RT5677_PWR_PLL1_BIT,

		0, rt5677_set_pll1_event, SND_SOC_DAPM_PRE_PMU |
@@ -3072,19 +3087,26 @@ static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = { 


	/* DAC Mixer */

	SND_SOC_DAPM_SUPPLY("dac stereo1 filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_S1F_BIT, 0, NULL, 0),

		RT5677_PWR_DAC_S1F_BIT, 0, rt5677_filter_power_event,

		SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_SUPPLY("dac mono2 left filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M2F_L_BIT, 0, NULL, 0),

		RT5677_PWR_DAC_M2F_L_BIT, 0, rt5677_filter_power_event,

		SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_SUPPLY("dac mono2 right filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M2F_R_BIT, 0, NULL, 0),

		RT5677_PWR_DAC_M2F_R_BIT, 0, rt5677_filter_power_event,

		SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_SUPPLY("dac mono3 left filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M3F_L_BIT, 0, NULL, 0),

		RT5677_PWR_DAC_M3F_L_BIT, 0, rt5677_filter_power_event,

		SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_SUPPLY("dac mono3 right filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M3F_R_BIT, 0, NULL, 0),

		RT5677_PWR_DAC_M3F_R_BIT, 0, rt5677_filter_power_event,

		SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_SUPPLY("dac mono4 left filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M4F_L_BIT, 0, NULL, 0),

		RT5677_PWR_DAC_M4F_L_BIT, 0, rt5677_filter_power_event,

		SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_SUPPLY("dac mono4 right filter", RT5677_PWR_DIG2,

		RT5677_PWR_DAC_M4F_R_BIT, 0, NULL, 0),

		RT5677_PWR_DAC_M4F_R_BIT, 0, rt5677_filter_power_event,

		SND_SOC_DAPM_POST_PMU),



	SND_SOC_DAPM_MIXER("Stereo DAC MIXL", SND_SOC_NOPM, 0, 0,

		rt5677_sto1_dac_l_mix, ARRAY_SIZE(rt5677_sto1_dac_l_mix)),

sound/soc/codecs/wm8960.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ SOC_DOUBLE_R_TLV("Capture Volume", WM8960_LINVOL, WM8960_RINVOL, 
SOC_DOUBLE_R("Capture Volume ZC Switch", WM8960_LINVOL, WM8960_RINVOL,

	6, 1, 0),

SOC_DOUBLE_R("Capture Switch", WM8960_LINVOL, WM8960_RINVOL,

	7, 1, 0),

	7, 1, 1),



SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT3 Volume",

	       WM8960_INBMIX1, 4, 7, 0, lineinboost_tlv),

sound/soc/codecs/wm8962.c

+2 −2
Original line number Diff line number Diff line
@@ -365,8 +365,8 @@ static const struct reg_default wm8962_reg[] = { 
	{ 16924, 0x0059 },   /* R16924 - HDBASS_PG_1 */

	{ 16925, 0x999A },   /* R16925 - HDBASS_PG_0 */



	{ 17048, 0x0083 },   /* R17408 - HPF_C_1 */

	{ 17049, 0x98AD },   /* R17409 - HPF_C_0 */

	{ 17408, 0x0083 },   /* R17408 - HPF_C_1 */

	{ 17409, 0x98AD },   /* R17409 - HPF_C_0 */



	{ 17920, 0x007F },   /* R17920 - ADCL_RETUNE_C1_1 */

	{ 17921, 0xFFFF },   /* R17921 - ADCL_RETUNE_C1_0 */

sound/soc/soc-topology.c

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ static int soc_tplg_kcontrol_bind_io(struct snd_soc_tplg_ctl_hdr *hdr, 
		/* TLV bytes controls need standard kcontrol info handler,

		 * TLV callback and extended put/get handlers.

		 */

		k->info = snd_soc_bytes_info;

		k->info = snd_soc_bytes_info_ext;

		k->tlv.c = snd_soc_bytes_tlv_callback;



		ext_ops = tplg->bytes_ext_ops;

sound/soc/sti/uniperif_player.c

+6 −3
Original line number Diff line number Diff line
@@ -669,6 +669,7 @@ static int uni_player_startup(struct snd_pcm_substream *substream, 
{

	struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);

	struct uniperif *player = priv->dai_data.uni;

	player->substream = substream;



	player->clk_adj = 0;
@@ -950,6 +951,8 @@ static void uni_player_shutdown(struct snd_pcm_substream *substream, 
	if (player->state != UNIPERIF_STATE_STOPPED)

		/* Stop the player */

		uni_player_stop(player);



	player->substream = NULL;

}



static int uni_player_parse_dt_clk_glue(struct platform_device *pdev,
@@ -989,7 +992,7 @@ static int uni_player_parse_dt(struct platform_device *pdev, 
	if (!info)

		return -ENOMEM;



	if (of_property_read_u32(pnode, "version", &player->ver) ||

	if (of_property_read_u32(pnode, "st,version", &player->ver) ||

	    player->ver == SND_ST_UNIPERIF_VERSION_UNKNOWN) {

		dev_err(dev, "Unknown uniperipheral version ");

		return -EINVAL;
@@ -998,13 +1001,13 @@ static int uni_player_parse_dt(struct platform_device *pdev, 
	if (player->ver >= SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0)

		info->underflow_enabled = 1;



	if (of_property_read_u32(pnode, "uniperiph-id", &info->id)) {

	if (of_property_read_u32(pnode, "st,uniperiph-id", &info->id)) {

		dev_err(dev, "uniperipheral id not defined");

		return -EINVAL;

	}



	/* Read the device mode property */

	if (of_property_read_string(pnode, "mode", &mode)) {

	if (of_property_read_string(pnode, "st,mode", &mode)) {

		dev_err(dev, "uniperipheral mode not defined");

		return -EINVAL;

	}