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

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes. All changes are rather boring
  device-specific fixes and quirks:

   - A few fixes for missing NULL checks

   - ASoC NAU8821 fixes for jack and irq handling

   - Various fixes for ASoC TAS2781, IDT821034, sc8280xp, max9809x,
     wcd938x, and SoundWire

   - Usual HD-audio and USB-audio quirks"

* tag 'sound-6.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (27 commits)
  ALSA: hda/realtek: Fix mute led for HP Omen 17-cb0xxx
  ALSA: usb-audio: fix vendor quirk for Logitech H390
  ALSA: usb-audio: add volume quirks for MS LifeChat LX-3000
  ASoC: amd/sdw_utils: avoid NULL deref when devm_kasprintf() fails
  ASoC: max98090/91: fixed max98091 ALSA widget powering up/down
  ASoC: dt-bindings: Add compatible string fsl,imx-audio-tlv320
  ASoC: codecs: wcd938x-sdw: remove redundant runtime pm calls
  ASoC: sdw_utils: add rt1321 part id to codec_info_list
  ALSA: usb-audio: Fix NULL pointer deference in try_to_register_card
  ALSA: firewire: amdtp-stream: fix enum kernel-doc warnings
  ALSA: usb-audio: add mixer_playback_min_mute quirk for Logitech H390
  ASoC: nau8821: Avoid unnecessary blocking in IRQ handler
  ASoC: nau8821: Add DMI quirk to bypass jack debounce circuit
  ASoC: nau8821: Consistently clear interrupts before unmasking
  ASoC: nau8821: Generalize helper to clear IRQ status
  ASoC: nau8821: Cancel jdet_work before handling jack ejection
  ASoC: codecs: Fix gain setting ranges for Renesas IDT821034 codec
  ASoC: tas2781: Update ti,tas2781.yaml for adding tas58xx
  ASoC: tas2781: Support more newly-released amplifiers tas58xx in the driver
  ASoC: qcom: sc8280xp: Add support for QCS615
  ...
parents e96687c6 2a786348

Documentation/devicetree/bindings/sound/fsl-asoc-card.yaml

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ properties: 
              - fsl,imx-audio-nau8822

              - fsl,imx-audio-sgtl5000

              - fsl,imx-audio-si476x

              - fsl,imx-audio-tlv320

              - fsl,imx-audio-tlv320aic31xx

              - fsl,imx-audio-tlv320aic32x4

              - fsl,imx-audio-wm8524

Documentation/devicetree/bindings/sound/qcom,sm8250.yaml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ properties: 
          - qcom,apq8096-sndcard

          - qcom,glymur-sndcard

          - qcom,qcm6490-idp-sndcard

          - qcom,qcs615-sndcard

          - qcom,qcs6490-rb3gen2-sndcard

          - qcom,qcs8275-sndcard

          - qcom,qcs9075-sndcard

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

+37 −6
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ description: | 
  Instruments Smart Amp speaker protection algorithm. The

  integrated speaker voltage and current sense provides for real time

  monitoring of loudspeaker behavior.

  The TAS5825/TAS5827 is a stereo, digital input Class-D audio

  amplifier optimized for efficiently driving high peak power into

  small loudspeakers. An integrated on-chip DSP supports Texas

  Instruments Smart Amp speaker protection algorithm.

  The TAS5802/TAS5815/TAS5825/TAS5827/TAS5828 is a stereo, digital input

  Class-D audio amplifier optimized for efficiently driving high peak

  power into small loudspeakers. An integrated on-chip DSP supports

  Texas Instruments Smart Amp speaker protection algorithm.



  Specifications about the audio amplifier can be found at:

    https://www.ti.com/lit/gpn/tas2120
@@ -35,8 +35,10 @@ description: | 
    https://www.ti.com/lit/gpn/tas2563

    https://www.ti.com/lit/gpn/tas2572

    https://www.ti.com/lit/gpn/tas2781

    https://www.ti.com/lit/gpn/tas5815

    https://www.ti.com/lit/gpn/tas5825m

    https://www.ti.com/lit/gpn/tas5827

    https://www.ti.com/lit/gpn/tas5828m



properties:

  compatible:
@@ -65,11 +67,21 @@ properties: 
      Protection and Audio Processing, 16/20/24/32bit stereo I2S or

      multichannel TDM.



      ti,tas5802: 22-W, Inductor-Less, Digital Input, Closed-Loop Class-D

      Audio Amplifier with 96-Khz Extended Processing and Low Idle Power

      Dissipation.



      ti,tas5815: 30-W, Digital Input, Stereo, Closed-loop Class-D Audio

      Amplifier with 96 kHz Enhanced Processing



      ti,tas5825: 38-W Stereo, Inductor-Less, Digital Input, Closed-Loop 4.5V

      to 26.4V Class-D Audio Amplifier with 192-kHz Extended Audio Processing.



      ti,tas5827: 47-W Stereo, Digital Input, High Efficiency Closed-Loop Class-D

      Amplifier with Class-H Algorithm

      ti,tas5827: 47-W Stereo, Digital Input, High Efficiency Closed-Loop

      Class-D Amplifier with Class-H Algorithm



      ti,tas5828: 50-W Stereo, Digital Input, High Efficiency Closed-Loop

      Class-D Amplifier with Hybrid-Pro Algorithm

    oneOf:

      - items:

          - enum:
@@ -80,8 +92,11 @@ properties: 
              - ti,tas2563

              - ti,tas2570

              - ti,tas2572

              - ti,tas5802

              - ti,tas5815

              - ti,tas5825

              - ti,tas5827

              - ti,tas5828

          - const: ti,tas2781

      - enum:

          - ti,tas2781
@@ -177,12 +192,28 @@ allOf: 
            minimum: 0x38

            maximum: 0x3f



  - if:

      properties:

        compatible:

          contains:

            enum:

              - ti,tas5802

              - ti,tas5815

    then:

      properties:

        reg:

          maxItems: 4

          items:

            minimum: 0x54

            maximum: 0x57



  - if:

      properties:

        compatible:

          contains:

            enum:

              - ti,tas5827

              - ti,tas5828

    then:

      properties:

        reg:

include/sound/tas2781.h

+3 −0
Original line number Diff line number Diff line
@@ -120,8 +120,11 @@ enum audio_device { 
	TAS2570,

	TAS2572,

	TAS2781,

	TAS5802,

	TAS5815,

	TAS5825,

	TAS5827,

	TAS5828,

	TAS_OTHERS,

};

sound/firewire/amdtp-stream.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
 *	allows 5 times as large as IEC 61883-6 defines.

 * @CIP_HEADER_WITHOUT_EOH: Only for in-stream. CIP Header doesn't include

 *	valid EOH.

 * @CIP_NO_HEADERS: a lack of headers in packets

 * @CIP_NO_HEADER: a lack of headers in packets

 * @CIP_UNALIGHED_DBC: Only for in-stream. The value of dbc is not alighed to

 *	the value of current SYT_INTERVAL; e.g. initial value is not zero.

 * @CIP_UNAWARE_SYT: For outgoing packet, the value in SYT field of CIP is 0xffff.