Commit 029c77f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes:

   - HD-audio runtime PM bug fix

   - A couple of HD-audio quirks

   - Fix series of ASoC Intel AVS drivers

   - ASoC DPCM fix for a bug found on new Intel systems

   - A few other ASoC device-specific small fixes"

* tag 'sound-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek: Enable headset onLenovo M70/M90
  ASoC: dwc: move DMA init to snd_soc_dai_driver probe()
  ASoC: cs35l41: Fix default regmap values for some registers
  ALSA: hda: Fix unhandled register update during auto-suspend period
  ASoC: dt-bindings: tlv320aic32x4: Fix supply names
  ASoC: Intel: avs: Add missing checks on FE startup
  ASoC: Intel: avs: Fix avs_path_module::instance_id size
  ASoC: Intel: avs: Account for UID of ACPI device
  ASoC: Intel: avs: Fix declaration of enum avs_channel_config
  ASoC: Intel: Skylake: Fix declaration of enum skl_ch_cfg
  ASoC: Intel: avs: Access path components under lock
  ASoC: Intel: avs: Fix module lookup
  ALSA: hda/ca0132: add quirk for EVGA X299 DARK
  ASoC: soc-pcm: test if a BE can be prepared
  ASoC: rt5682: Disable jack detection interrupt during suspend
  ASoC: lpass: Fix for KASAN use_after_free out of bounds
parents ecea3ba2 4ca110ca

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/hda/hdac_device.c

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_power_up_pm); 
int snd_hdac_keep_power_up(struct hdac_device *codec)

{

	if (!atomic_inc_not_zero(&codec->in_pm)) {

		int ret = pm_runtime_get_if_in_use(&codec->dev);

		int ret = pm_runtime_get_if_active(&codec->dev, true);

		if (!ret)

			return -1;

		if (ret < 0)