Commit 8f08ed05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Here is a collection of fixes that have been gathered since the
  previous pull request.

  All about device-specific fixes and quirks, and most of them are
  pretty small and trivial"

* tag 'sound-fix-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (25 commits)
  ALSA: hda/realtek: Workaround for resume on Dell Venue 11 Pro 7130
  ALSA: hda: Fix headset detection failure due to unstable sort
  ALSA: pcm: use new array-copying-wrapper
  ASoC: codec: es8316: "DAC Soft Ramp Rate" is just a 2 bit control
  ASoC: amd: acp: Fix possible deadlock
  firmware: cs_dsp: FW_CS_DSP_KUNIT_TEST should not select REGMAP
  ALSA: usb-audio: Add delay quirk for iBasso DC07 Pro
  ALSA: hda/realtek: Fix quirk matching for Legion Pro 7
  ASoC: renesas: SND_SIU_MIGOR should depend on DMADEVICES
  ASoC: Intel: bytcr_rt5640: Add DMI quirk for Vexia Edu Atla 10 tablet 5V
  ASoC: da7213: Initialize the mutex
  ASoC: use to_platform_device() instead of container_of()
  ASoC: acp: Support microphone from Lenovo Go S
  ASoC: SOF: imx8m: Add entry for new 8M Plus revision
  ASoC: SOF: imx8: Add entries for new 8QM and 8QXP revisions
  ASoC: SOF: imx: Add mach entry to select cs42888 topology
  dt-bindings: arm: imx: Add board revisions for i.MX8MP, i.MX8QM and i.MX8QXP
  ASoC: fsl_asrc_m2m: select CONFIG_DMA_SHARED_BUFFER
  ASoC: audio-graph-card2: use correct endpoint when getting link parameters
  ASoC: SOF: imx8m: add SAI2,5,6,7
  ...
parents 69e858e0 8c2fa441

Documentation/devicetree/bindings/arm/fsl.yaml

+3 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,7 @@ properties: 
              - dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC

              - emcraft,imx8mp-navqp      # i.MX8MP Emcraft Systems NavQ+ Kit

              - fsl,imx8mp-evk            # i.MX8MP EVK Board

              - fsl,imx8mp-evk-revb4      # i.MX8MP EVK Rev B4 Board

              - gateworks,imx8mp-gw71xx-2x # i.MX8MP Gateworks Board

              - gateworks,imx8mp-gw72xx-2x # i.MX8MP Gateworks Board

              - gateworks,imx8mp-gw73xx-2x # i.MX8MP Gateworks Board
@@ -1271,6 +1272,7 @@ properties: 
        items:

          - enum:

              - fsl,imx8qm-mek           # i.MX8QM MEK Board

              - fsl,imx8qm-mek-revd      # i.MX8QM MEK Rev D Board

              - toradex,apalis-imx8      # Apalis iMX8 Modules

              - toradex,apalis-imx8-v1.1 # Apalis iMX8 V1.1 Modules

          - const: fsl,imx8qm
@@ -1299,6 +1301,7 @@ properties: 
          - enum:

              - einfochips,imx8qxp-ai_ml  # i.MX8QXP AI_ML Board

              - fsl,imx8qxp-mek           # i.MX8QXP MEK Board

              - fsl,imx8qxp-mek-wcpu      # i.MX8QXP MEK WCPU Board

          - const: fsl,imx8qxp



      - description: i.MX8DXL based Boards

Documentation/devicetree/bindings/sound/ti,pcm1681.yaml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
$id: http://devicetree.org/schemas/sound/ti,pcm1681.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Texas Instruments PCM1681 8-channel PWM Processor

title: Texas Instruments PCM1681 8-channel Digital-to-Analog Converter



maintainers:

  - Shenghao Ding <shenghao-ding@ti.com>

drivers/firmware/cirrus/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -6,15 +6,13 @@ config FW_CS_DSP 


config FW_CS_DSP_KUNIT_TEST_UTILS

	tristate

	depends on KUNIT

	select REGMAP

	depends on KUNIT && REGMAP

	select FW_CS_DSP



config FW_CS_DSP_KUNIT_TEST

	tristate "KUnit tests for Cirrus Logic cs_dsp" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on KUNIT && REGMAP

	default KUNIT_ALL_TESTS

	select REGMAP

	select FW_CS_DSP

	select FW_CS_DSP_KUNIT_TEST_UTILS

	help

sound/core/pcm_native.c

+1 −1
Original line number Diff line number Diff line
@@ -3245,7 +3245,7 @@ static int snd_pcm_xfern_frames_ioctl(struct snd_pcm_substream *substream, 
	if (copy_from_user(&xfern, _xfern, sizeof(xfern)))

		return -EFAULT;



	bufs = memdup_user(xfern.bufs, sizeof(void *) * runtime->channels);

	bufs = memdup_array_user(xfern.bufs, runtime->channels, sizeof(void *));

	if (IS_ERR(bufs))

		return PTR_ERR(bufs);

	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

sound/pci/hda/hda_auto_parser.c

+7 −1
Original line number Diff line number Diff line
@@ -80,7 +80,11 @@ static int compare_input_type(const void *ap, const void *bp) 


	/* In case one has boost and the other one has not,

	   pick the one with boost first. */

	if (a->has_boost_on_pin != b->has_boost_on_pin)

		return (int)(b->has_boost_on_pin - a->has_boost_on_pin);



	/* Keep the original order */

	return a->order - b->order;

}



/* Reorder the surround channels
@@ -400,6 +404,8 @@ int snd_hda_parse_pin_defcfg(struct hda_codec *codec, 
	reorder_outputs(cfg->speaker_outs, cfg->speaker_pins);



	/* sort inputs in the order of AUTO_PIN_* type */

	for (i = 0; i < cfg->num_inputs; i++)

		cfg->inputs[i].order = i;

	sort(cfg->inputs, cfg->num_inputs, sizeof(cfg->inputs[0]),

	     compare_input_type, NULL);