Commit 3db9d4b3 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.8-rc4' of... 

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

ASoC: Fixes for v6.8

A relatively large set of fixes and quirk additions here but they're all
driver specific, people seem to be back into the swing of things after
the holidays.  This is all driver specific and much of it fairly minor.
parents 852d432a 0db0c177

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Google SC7280-Herobrine ASoC sound card driver



maintainers:

  - Srinivasa Rao Mandadapu <srivasam@codeaurora.org>

  - Judy Hsiao <judyhsiao@chromium.org>



description:

include/sound/tas2781.h

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ struct tasdevice_priv { 


void tas2781_reset(struct tasdevice_priv *tas_dev);

int tascodec_init(struct tasdevice_priv *tas_priv, void *codec,

	struct module *module,

	void (*cont)(const struct firmware *fw, void *context));

struct tasdevice_priv *tasdevice_kzalloc(struct i2c_client *i2c);

int tasdevice_init(struct tasdevice_priv *tas_priv);

sound/pci/hda/tas2781_hda_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ static int tas2781_hda_bind(struct device *dev, struct device *master, 


	strscpy(comps->name, dev_name(dev), sizeof(comps->name));



	ret = tascodec_init(tas_hda->priv, codec, tasdev_fw_ready);

	ret = tascodec_init(tas_hda->priv, codec, THIS_MODULE, tasdev_fw_ready);

	if (!ret)

		comps->playback_hook = tas2781_hda_playback_hook;

sound/soc/amd/yc/acp6x-mach.c

+14 −0
Original line number Diff line number Diff line
@@ -234,6 +234,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "82UG"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "82UU"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {
@@ -248,6 +255,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "82YM"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83AS"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/codecs/cs35l56-shared.c

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ static const struct reg_default cs35l56_reg_defaults[] = { 
	{ CS35L56_SWIRE_DP3_CH2_INPUT,		0x00000019 },

	{ CS35L56_SWIRE_DP3_CH3_INPUT,		0x00000029 },

	{ CS35L56_SWIRE_DP3_CH4_INPUT,		0x00000028 },

	{ CS35L56_IRQ1_CFG,			0x00000000 },

	{ CS35L56_IRQ1_MASK_1,			0x83ffffff },

	{ CS35L56_IRQ1_MASK_2,			0xffff7fff },

	{ CS35L56_IRQ1_MASK_4,			0xe0ffffff },