Unverified Commit 8c0b6e15 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.6' of... 

Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
parents a23d7f4a f25e2030

sound/soc/codecs/rt5682.c

+2 −0
Original line number Diff line number Diff line
@@ -3657,6 +3657,8 @@ static int rt5682_i2c_probe(struct i2c_client *i2c, 
			RT5682_CP_CLK_HP_MASK, RT5682_CP_CLK_HP_300KHZ);

	regmap_update_bits(rt5682->regmap, RT5682_HP_CHARGE_PUMP_1,

			RT5682_PM_HP_MASK, RT5682_PM_HP_HV);

	regmap_update_bits(rt5682->regmap, RT5682_DMIC_CTRL_1,

			RT5682_FIFO_CLK_DIV_MASK, RT5682_FIFO_CLK_DIV_2);



	INIT_DELAYED_WORK(&rt5682->jack_detect_work,

				rt5682_jack_detect_handler);

sound/soc/codecs/rt5682.h

+2 −0
Original line number Diff line number Diff line
@@ -657,6 +657,8 @@ 
#define RT5682_DMIC_1_EN_SFT			15

#define RT5682_DMIC_1_DIS			(0x0 << 15)

#define RT5682_DMIC_1_EN			(0x1 << 15)

#define RT5682_FIFO_CLK_DIV_MASK		(0x7 << 12)

#define RT5682_FIFO_CLK_DIV_2			(0x1 << 12)

#define RT5682_DMIC_1_DP_MASK			(0x3 << 4)

#define RT5682_DMIC_1_DP_SFT			4

#define RT5682_DMIC_1_DP_GPIO2			(0x0 << 4)

sound/soc/codecs/tas2562.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static const struct snd_kcontrol_new vsense_switch = 
			1, 1);



static const struct snd_kcontrol_new tas2562_snd_controls[] = {

	SOC_SINGLE_TLV("Amp Gain Volume", TAS2562_PB_CFG1, 0, 0x1c, 0,

	SOC_SINGLE_TLV("Amp Gain Volume", TAS2562_PB_CFG1, 1, 0x1c, 0,

		       tas2562_dac_tlv),

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

sound/soc/codecs/wsa881x.c

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ static int wsa881x_probe(struct sdw_slave *pdev, 
	wsa881x->sconfig.type = SDW_STREAM_PDM;

	pdev->prop.sink_ports = GENMASK(WSA881X_MAX_SWR_PORTS, 0);

	pdev->prop.sink_dpn_prop = wsa_sink_dpn_prop;

	gpiod_set_value(wsa881x->sd_n, 1);

	gpiod_direction_output(wsa881x->sd_n, 1);



	wsa881x->regmap = devm_regmap_init_sdw(pdev, &wsa881x_regmap_config);

	if (IS_ERR(wsa881x->regmap)) {

sound/soc/intel/boards/bdw-rt5650.c

+4 −3
Original line number Diff line number Diff line
@@ -226,9 +226,6 @@ SND_SOC_DAILINK_DEF(be, 
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)

SND_SOC_DAILINK_DEF(ssp0_port,

	    DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));

#else

SND_SOC_DAILINK_DEF(ssp0_port,

	    DAILINK_COMP_ARRAY(COMP_DUMMY()));

#endif



static struct snd_soc_dai_link bdw_rt5650_dais[] = {
@@ -264,7 +261,11 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { 
		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.init = bdw_rt5650_init,

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)

		SND_SOC_DAILINK_REG(dummy, be, dummy),

#else

		SND_SOC_DAILINK_REG(ssp0_port, be, platform),

#endif

	},

};