Commit bac4d822 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.4-rc3' of... 

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

ASoC: Fixes for v6.4

A collection of fixes for v6.4, mostly driver specific but there's also
one fix for DPCM to avoid incorrectly repeated calls to prepare() which
can trigger issues on some systems.
parents 81302b1c 011a8719

Documentation/devicetree/bindings/sound/tlv320aic32x4.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Required properties: 
	"ti,tlv320aic32x6" TLV320AIC3206, TLV320AIC3256

	"ti,tas2505" TAS2505, TAS2521

 - reg: I2C slave address

 - supply-*: Required supply regulators are:

 - *-supply: Required supply regulators are:

    "iov" - digital IO power supply

    "ldoin" - LDO power supply

    "dv" - Digital core power supply

include/sound/soc-acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ struct snd_soc_acpi_link_adr { 
/* Descriptor for SST ASoC machine driver */

struct snd_soc_acpi_mach {

	u8 id[ACPI_ID_LEN];

	const char *uid;

	const struct snd_soc_acpi_codecs *comp_ids;

	const u32 link_mask;

	const struct snd_soc_acpi_link_adr *links;

include/sound/soc-dpcm.h

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe, 
int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe,

		struct snd_soc_pcm_runtime *be, int stream);



/* can this BE perform prepare */

int snd_soc_dpcm_can_be_prepared(struct snd_soc_pcm_runtime *fe,

				 struct snd_soc_pcm_runtime *be, int stream);



/* is the current PCM operation for this FE ? */

int snd_soc_dpcm_fe_can_update(struct snd_soc_pcm_runtime *fe, int stream);

include/uapi/sound/skl-tplg-interface.h

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ enum skl_ch_cfg { 
	SKL_CH_CFG_DUAL_MONO = 9,

	SKL_CH_CFG_I2S_DUAL_STEREO_0 = 10,

	SKL_CH_CFG_I2S_DUAL_STEREO_1 = 11,

	SKL_CH_CFG_4_CHANNEL = 12,

	SKL_CH_CFG_7_1 = 12,

	SKL_CH_CFG_4_CHANNEL = SKL_CH_CFG_7_1,

	SKL_CH_CFG_INVALID

};

sound/soc/codecs/cs35l41-lib.c

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static const struct reg_default cs35l41_reg[] = { 
	{ CS35L41_DSP1_RX5_SRC,			0x00000020 },

	{ CS35L41_DSP1_RX6_SRC,			0x00000021 },

	{ CS35L41_DSP1_RX7_SRC,			0x0000003A },

	{ CS35L41_DSP1_RX8_SRC,			0x00000001 },

	{ CS35L41_DSP1_RX8_SRC,			0x0000003B },

	{ CS35L41_NGATE1_SRC,			0x00000008 },

	{ CS35L41_NGATE2_SRC,			0x00000009 },

	{ CS35L41_AMP_DIG_VOL_CTRL,		0x00008000 },
@@ -58,8 +58,8 @@ static const struct reg_default cs35l41_reg[] = { 
	{ CS35L41_IRQ1_MASK2,			0xFFFFFFFF },

	{ CS35L41_IRQ1_MASK3,			0xFFFF87FF },

	{ CS35L41_IRQ1_MASK4,			0xFEFFFFFF },

	{ CS35L41_GPIO1_CTRL1,			0xE1000001 },

	{ CS35L41_GPIO2_CTRL1,			0xE1000001 },

	{ CS35L41_GPIO1_CTRL1,			0x81000001 },

	{ CS35L41_GPIO2_CTRL1,			0x81000001 },

	{ CS35L41_MIXER_NGATE_CFG,		0x00000000 },

	{ CS35L41_MIXER_NGATE_CH1_CFG,		0x00000303 },

	{ CS35L41_MIXER_NGATE_CH2_CFG,		0x00000303 },