Commit d172859e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of various small fixes that have been gathered since the
  last PR.

  The majority of changes are for ASoC, and there is a small change in
  ASoC PCM core, but the rest are all for driver- specific fixes /
  quirks / updates"

* tag 'sound-fix-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (32 commits)
  ALSA: ice1712: Delete unreachable code in aureon_add_controls()
  ALSA: ice1712: Do not left ice->gpio_mutex locked in aureon_add_controls()
  ALSA: hda/realtek: Add quirk for HP EliteDesk 800 G6 Tower PC
  ALSA: hda/realtek: Improve support for Dell Precision 3260
  ASoC: mediatek: mt8195: add missing initialization
  ASoC: mediatek: mt8188: add missing initialization
  ASoC: amd: yc: Add DMI entries to support HP OMEN 16-n0xxx (8A43)
  ASoC: zl38060 add gpiolib dependency
  ASoC: sam9g20ek: Disable capture unless building with microphone input
  ASoC: mt8192: Fix range for sidetone positive gain
  ASoC: mt8192: Report an error if when an invalid sidetone gain is written
  ASoC: mt8192: Fix event generation for controls
  ASoC: mt8192: Remove spammy log messages
  ASoC: mchp-pdmc: fix poc noise at capture startup
  ASoC: dt-bindings: sama7g5-pdmc: add microchip,startup-delay-us binding
  ASoC: soc-pcm: add option to start DMA after DAI
  ASoC: mt8183: Fix event generation for I2S DAI operations
  ASoC: mt8183: Remove spammy logging from I2S DAI driver
  ASoC: mt6358: Remove undefined HPx Mux enumeration values
  ASoC: mt6358: Validate Wake on Voice 2 writes
  ...
parents 0988a0ea a8e98f34

Documentation/devicetree/bindings/sound/apple,mca.yaml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
      - enum:

          - apple,t6000-mca

          - apple,t8103-mca

          - apple,t8112-mca

      - const: apple,mca



  reg:

Documentation/devicetree/bindings/sound/microchip,sama7g5-pdmc.yaml

+6 −0
Original line number Diff line number Diff line
@@ -67,6 +67,12 @@ properties: 
    maxItems: 4

    uniqueItems: true



  microchip,startup-delay-us:

    description: |

      Specifies the delay in microseconds that needs to be applied after

      enabling the PDMC microphones to avoid unwanted noise due to microphones

      not being ready.



required:

  - compatible

  - reg

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ struct snd_soc_component_driver { 
	bool use_dai_pcm_id;	/* use DAI link PCM ID as PCM device number */

	int be_pcm_base;	/* base device ID for all BE PCMs */



	unsigned int start_dma_last;



#ifdef CONFIG_DEBUG_FS

	const char *debugfs_prefix;

#endif

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Diff line number Diff line
@@ -9260,6 +9260,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0a62, "Dell Precision 5560", ALC289_FIXUP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x0a9d, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0a9e, "Dell Latitude 5430", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0ac9, "Dell Precision 3260", ALC295_FIXUP_CHROME_BOOK),

	SND_PCI_QUIRK(0x1028, 0x0b19, "Dell XPS 15 9520", ALC289_FIXUP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x0b1a, "Dell Precision 5570", ALC289_FIXUP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x0b37, "Dell Inspiron 16 Plus 7620 2-in-1", ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS),
@@ -11617,6 +11618,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0698, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x069f, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),

	SND_PCI_QUIRK(0x103c, 0x870c, "HP", ALC897_FIXUP_HP_HSMIC_VERB),

	SND_PCI_QUIRK(0x103c, 0x8719, "HP", ALC897_FIXUP_HP_HSMIC_VERB),

	SND_PCI_QUIRK(0x103c, 0x873e, "HP", ALC671_FIXUP_HP_HEADSET_MIC2),

	SND_PCI_QUIRK(0x103c, 0x877e, "HP 288 Pro G6", ALC671_FIXUP_HP_HEADSET_MIC2),

sound/pci/ice1712/aureon.c

+1 −5
Original line number Diff line number Diff line
@@ -1892,13 +1892,10 @@ static int aureon_add_controls(struct snd_ice1712 *ice) 
		unsigned char id;

		snd_ice1712_save_gpio_status(ice);

		id = aureon_cs8415_get(ice, CS8415_ID);

		snd_ice1712_restore_gpio_status(ice);

		if (id != 0x41)

			dev_info(ice->card->dev,

				 "No CS8415 chip. Skipping CS8415 controls.\n");

		else if ((id & 0x0F) != 0x01)

			dev_info(ice->card->dev,

				 "Detected unsupported CS8415 rev. (%c)\n",

				 (char)((id & 0x0F) + 'A' - 1));

		else {

			for (i = 0; i < ARRAY_SIZE(cs8415_controls); i++) {

				struct snd_kcontrol *kctl;
@@ -1909,7 +1906,6 @@ static int aureon_add_controls(struct snd_ice1712 *ice) 
					kctl->id.device = ice->pcm->device;

			}

		}

		snd_ice1712_restore_gpio_status(ice);

	}



	return 0;