Commit 711673f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "This became a bit larger than wished for, often seen as a bump at the
  middle, but almost all changes are small device-specific fixes, so the
  risk must be pretty low.

   - SoundWire fix for missing symbol export

   - Fixes for device-tree bindings

   - A fix for OOB access in USB-audio, spotted by fuzzer

   - Quirks for HD-audio, SoundWire, AMD ACP

   - A series of ASoC tlv320 and wsa codec fixes

   - Other misc fixes in PCM OSS error-handling, Cirrus scodec test,
     ASoC ops endianess, davinci, simple-card, and tegra"

* tag 'sound-6.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (33 commits)
  ALSA: hda/tas2781: Add newly-released HP laptop
  ASoC: rt5640: Fix duplicate clock properties in DT binding
  ALSA: hda/realtek: Add quirk for HP Pavilion x360 to enable mute LED
  ASoC: tlv320adcx140: fix word length
  ASoC: tlv320adcx140: Propagate error codes during probe
  ASoC: tlv320adcx140: fix null pointer
  ASoC: tlv320adcx140: invert DRE_ENABLE
  ASoC: sdw_utils: cs42l43: Enable Headphone pin for LINEOUT jack type
  ASoC: sdw_utils: Call init callbacks on the correct codec DAI
  soundwire: Add missing EXPORT for sdw_slave_type
  ALSA: usb-audio: Prevent excessive number of frames
  ALSA: hda/cirrus_scodec_test: Fix test suite name
  ALSA: hda/cirrus_scodec_test: Fix incorrect setup of gpiochip
  ALSA: hda/realtek: Add quirk for Asus Zephyrus G14 2025 using CS35L56, fix speakers
  ASoC: amd: yc: Fix microphone on ASUS M6500RE
  ASoC: tegra: Revert fix for uninitialized flat cache warning in tegra210_ahub
  ASoC: dt-bindings: rockchip-spdif: Allow "port" node
  ASoC: dt-bindings: realtek,rt5640: Allow 7 for realtek,jack-detect-source
  ASoC: dt-bindings: realtek,rt5640: Add missing properties/node
  ASoC: dt-bindings: realtek,rt5640: Document port node
  ...
parents c2a44a02 46b8d088

Documentation/devicetree/bindings/sound/everest,es8316.yaml

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ properties: 
    items:

      - const: mclk



  interrupts:

    maxItems: 1

    description: Headphone detect interrupt



  port:

    $ref: audio-graph-port.yaml#

    unevaluatedProperties: false

Documentation/devicetree/bindings/sound/realtek,rt5640.yaml

+11 −0
Original line number Diff line number Diff line
@@ -47,6 +47,12 @@ properties: 
  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-names:

    const: mclk



  interrupts:

    maxItems: 1

    description: The CODEC's interrupt output.
@@ -98,6 +104,7 @@ properties: 
      - 4 # Use GPIO2 for jack-detect

      - 5 # Use GPIO3 for jack-detect

      - 6 # Use GPIO4 for jack-detect

      - 7 # Use HDA header for jack-detect



  realtek,jack-detect-not-inverted:

    description:
@@ -121,6 +128,10 @@ properties: 
      - 2 # Scale current by 1.0

      - 3 # Scale current by 1.5



  port:

    $ref: audio-graph-port.yaml#

    unevaluatedProperties: false



required:

  - compatible

  - reg

Documentation/devicetree/bindings/sound/rockchip-spdif.yaml

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ properties: 
  "#sound-dai-cells":

    const: 0



  port:

    $ref: /schemas/graph.yaml#/properties/port



required:

  - compatible

  - reg

drivers/soundwire/slave.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ const struct device_type sdw_slave_type = { 
	.release =	sdw_slave_release,

	.uevent =	sdw_slave_uevent,

};

EXPORT_SYMBOL_GPL(sdw_slave_type);



int sdw_slave_add(struct sdw_bus *bus,

		  struct sdw_slave_id *id, struct fwnode_handle *fwnode)

include/sound/pcm.h

+1 −1
Original line number Diff line number Diff line
@@ -1402,7 +1402,7 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, struct vm_area_s 
#define snd_pcm_lib_mmap_iomem	NULL

#endif



void snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime);

int snd_pcm_runtime_buffer_set_silence(struct snd_pcm_runtime *runtime);



/**

 * snd_pcm_limit_isa_dma_size - Get the max size fitting with ISA DMA transfer