Unverified Commit 673f45f7 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 bd2b34e4 1a0f2433

MAINTAINERS

+13 −2
Original line number Diff line number Diff line
@@ -4021,8 +4021,8 @@ F: Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml 
F:	sound/soc/codecs/cros_ec_codec.*









CIRRUS LOGIC AUDIO CODEC DRIVERS









M:	Brian Austin <brian.austin@cirrus.com>









M:	Paul Handrigan <Paul.Handrigan@cirrus.com>









M:	James Schulman <james.schulman@cirrus.com>









M:	David Rhodes <david.rhodes@cirrus.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Maintained









F:	sound/soc/codecs/cs*








@@ -15615,6 +15615,17 @@ F:	sound/soc/







F:	include/dt-bindings/sound/









F:	include/sound/soc*

















SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS









M:	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>









M:	Liam Girdwood <lgirdwood@gmail.com>









M:	Ranjani Sridharan <ranjani.sridharan@linux.intel.com>









M:	Kai Vehmanen <kai.vehmanen@linux.intel.com>









M:	Daniel Baluta <daniel.baluta@nxp.com>









L:	sound-open-firmware@alsa-project.org (moderated for non-subscribers)









W:	https://github.com/thesofproject/linux/









S:	Supported









F:	sound/soc/sof/

















SOUNDWIRE SUBSYSTEM









M:	Vinod Koul <vkoul@kernel.org>









M:	Sanyog Kale <sanyog.r.kale@intel.com>
































include/sound/soc.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -1066,6 +1066,7 @@ struct snd_soc_card {







	const struct snd_soc_dapm_route *of_dapm_routes;









	int num_of_dapm_routes;









	bool fully_routed;









	bool disable_route_checks;



















	/* lists of probed devices belonging to this card */









	struct list_head component_dev_list;
































sound/soc/codecs/max98357a.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -133,6 +133,7 @@ MODULE_DEVICE_TABLE(of, max98357a_device_id);







#ifdef CONFIG_ACPI









static const struct acpi_device_id max98357a_acpi_match[] = {









	{ "MX98357A", 0 },









	{ "MX98360A", 0 },









	{},









};









MODULE_DEVICE_TABLE(acpi, max98357a_acpi_match);
































sound/soc/codecs/rt5682.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1166,7 +1166,7 @@ static void rt5682_jack_detect_handler(struct work_struct *work)







static const struct snd_kcontrol_new rt5682_snd_controls[] = {









	/* DAC Digital Volume */









	SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5682_DAC1_DIG_VOL,









		RT5682_L_VOL_SFT + 1, RT5682_R_VOL_SFT + 1, 86, 0, dac_vol_tlv),









		RT5682_L_VOL_SFT + 1, RT5682_R_VOL_SFT + 1, 87, 0, dac_vol_tlv),



















	/* IN Boost Volume */









	SOC_SINGLE_TLV("CBJ Boost Volume", RT5682_CBJ_BST_CTRL,
































sound/soc/codecs/wcd9335.c



+9
−9






























Original line number
Diff line number
Diff line







@@ -4926,11 +4926,11 @@ static const struct regmap_range_cfg wcd9335_ranges[] = {







		.name = "WCD9335",









		.range_min =  0x0,









		.range_max =  WCD9335_MAX_REGISTER,









		.selector_reg = WCD9335_REG(0x0, 0),









		.selector_reg = WCD9335_SEL_REGISTER,









		.selector_mask = 0xff,









		.selector_shift = 0,









		.window_start = 0x0,









		.window_len = 0x1000,









		.window_start = 0x800,









		.window_len = 0x100,









	},









};


















@@ -4968,12 +4968,12 @@ static const struct regmap_range_cfg wcd9335_ifc_ranges[] = {







	{









		.name = "WCD9335-IFC-DEV",









		.range_min =  0x0,









		.range_max = WCD9335_REG(0, 0x7ff),









		.selector_reg = WCD9335_REG(0, 0x0),









		.selector_mask = 0xff,









		.range_max = WCD9335_MAX_REGISTER,









		.selector_reg = WCD9335_SEL_REGISTER,









		.selector_mask = 0xfff,









		.selector_shift = 0,









		.window_start = 0x0,









		.window_len = 0x1000,









		.window_start = 0x800,









		.window_len = 0x400,









	},









};


















@@ -4981,7 +4981,7 @@ static struct regmap_config wcd9335_ifc_regmap_config = {







	.reg_bits = 16,









	.val_bits = 8,









	.can_multi_write = true,









	.max_register = WCD9335_REG(0, 0x7FF),









	.max_register = WCD9335_MAX_REGISTER,









	.ranges = wcd9335_ifc_ranges,









	.num_ranges = ARRAY_SIZE(wcd9335_ifc_ranges),









};