Commit 2aa680df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound updates from Takashi Iwai:
 "The majority of changes at this time were about ASoC with a lot of
  code refactoring works. From the functionality POV, there isn't much
  to see, but we have a wide range of device-specific fixes and updates.
  Here are some highlights:

   - Continued ASoC API cleanup work, spanned over many files

   - Added a SoundWire SCDA generic class driver with regmap support

   - Enhancements and fixes for Cirrus, Intel, Maxim and Qualcomm.

   - Support for ASoC Allwinner A523, Mediatek MT8189, Qualcomm QCM2290,
     QRB2210 and SM6115, SpacemiT K1, and TI TAS2568, TAS5802, TAS5806,
     TAS5815, TAS5828 and TAS5830

   - Usual HD-audio and USB-audio quirks and fixups

   - Support for Onkyo SE-300PCIE, TASCAM IF-FW/DM MkII

  Some gpiolib changes for shared GPIOs are included along with this PR
  for covering ASoC drivers changes"

* tag 'sound-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (739 commits)
  ALSA: hda/realtek: Add PCI SSIDs to HP ProBook quirks
  ALSA: usb-audio: Simplify with usb_endpoint_max_periodic_payload()
  ALSA: hda/realtek: fix mute/micmute LEDs don't work for more HP laptops
  ALSA: rawmidi: Fix inconsistent indenting warning reported by smatch
  ALSA: dice: fix buffer overflow in detect_stream_formats()
  ASoC: codecs: Modify awinic amplifier dsp read and write functions
  ASoC: SDCA: Fixup some more Kconfig issues
  ASoC: cs35l56: Log a message if firmware is missing
  ASoC: nau8325: Delete a stray tab
  firmware: cs_dsp: Add test cases for client_ops == NULL
  firmware: cs_dsp: Don't require client to provide a struct cs_dsp_client_ops
  ASoC: fsl_micfil: Set channel range control
  ASoC: fsl_micfil: Add default quality for different platforms
  ASoC: intel: sof_sdw: Add codec_info for cs42l45
  ASoC: sdw_utils: Add cs42l45 support functions
  ASoC: intel: sof_sdw: Add ability to have auxiliary devices
  ASoC: sdw_utils: Move codec_name to dai info
  ASoC: sdw_utils: Add codec_conf for every DAI
  ASoC: SDCA: Add terminal type into input/output widget name
  ASoC: SDCA: Align mute controls to ALSA expectations
  ...
parents 6dfafbd0 eaf526cf

Documentation/devicetree/bindings/sound/adi,max98363.yaml

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/adi,max98363.yaml#

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



title: Analog Devices MAX98363 SoundWire Amplifier



maintainers:

  - Ryan Lee <ryans.lee@analog.com>



description:

  The MAX98363 is a SoundWire input Class D mono amplifier that

  supports MIPI SoundWire v1.2-compatible digital interface for

  audio and control data.

  SoundWire peripheral device ID of MAX98363 is 0x3*019f836300

  where * is the peripheral device unique ID decoded from pin.

  It supports up to 10 peripheral devices(0x0 to 0x9).



allOf:

  - $ref: dai-common.yaml#



properties:

  compatible:

    const: sdw3019f836300



  reg:

    maxItems: 1



  '#sound-dai-cells':

    const: 0



required:

  - compatible

  - reg

  - "#sound-dai-cells"



unevaluatedProperties: false



examples:

  - |

    soundwire@3250000 {

        #address-cells = <2>;

        #size-cells = <0>;

        reg = <0x3250000 0x2000>;



        speaker@0,0 {

            compatible = "sdw3019f836300";

            reg = <0 0>;

            #sound-dai-cells = <0>;

            sound-name-prefix = "Speaker Left";

        };



        speaker@0,1 {

            compatible = "sdw3019f836300";

            reg = <0 1>;

            #sound-dai-cells = <0>;

            sound-name-prefix = "Speaker Right";

        };

    };

Documentation/devicetree/bindings/sound/adi,ssm2602.txt

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
Analog Devices SSM2602, SSM2603 and SSM2604 I2S audio CODEC devices



SSM2602 support both I2C and SPI as the configuration interface,

the selection is made by the MODE strap-in pin.

SSM2603 and SSM2604 only support I2C as the configuration interface.



Required properties:



  - compatible : One of "adi,ssm2602", "adi,ssm2603" or "adi,ssm2604"



  - reg : the I2C address of the device for I2C, the chip select

          number for SPI.



 Example:



	ssm2602: ssm2602@1a {

		compatible = "adi,ssm2602";

		reg = <0x1a>;

	};

Documentation/devicetree/bindings/sound/adi,ssm3515.yaml

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/adi,ssm3515.yaml#

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



title: Analog Devices SSM3515 Audio Amplifier



maintainers:

  - Martin Povišer <povik+lin@cutebit.org>



description: |

  SSM3515 is a mono Class-D audio amplifier with digital input.



  https://www.analog.com/media/en/technical-documentation/data-sheets/SSM3515.pdf



allOf:

  - $ref: dai-common.yaml#



properties:

  compatible:

    enum:

      - adi,ssm3515



  reg:

    maxItems: 1



  '#sound-dai-cells':

    const: 0



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    i2c {

      #address-cells = <1>;

      #size-cells = <0>;



      codec@14 {

        compatible = "adi,ssm3515";

        reg = <0x14>;

        #sound-dai-cells = <0>;

        sound-name-prefix = "Left Tweeter";

      };

    };

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml

+3 −1
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ properties: 
      - const: allwinner,sun50i-h6-i2s

      - const: allwinner,sun50i-r329-i2s

      - items:

          - const: allwinner,sun20i-d1-i2s

          - enum:

              - allwinner,sun20i-d1-i2s

              - allwinner,sun55i-a523-i2s

          - const: allwinner,sun50i-r329-i2s



  reg:

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml

+38 −6
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
      - const: allwinner,sun8i-h3-spdif

      - const: allwinner,sun50i-h6-spdif

      - const: allwinner,sun50i-h616-spdif

      - const: allwinner,sun55i-a523-spdif

      - items:

          - const: allwinner,sun8i-a83t-spdif

          - const: allwinner,sun8i-h3-spdif
@@ -37,14 +38,12 @@ properties: 
    maxItems: 1



  clocks:

    items:

      - description: Bus Clock

      - description: Module Clock

    minItems: 2

    maxItems: 3



  clock-names:

    items:

      - const: apb

      - const: spdif

    minItems: 2

    maxItems: 3



  # Even though it only applies to subschemas under the conditionals,

  # not listing them here will trigger a warning because of the
@@ -65,6 +64,7 @@ allOf: 
              - allwinner,sun8i-h3-spdif

              - allwinner,sun50i-h6-spdif

              - allwinner,sun50i-h616-spdif

              - allwinner,sun55i-a523-spdif



    then:

      required:
@@ -98,6 +98,38 @@ allOf: 
            - const: rx

            - const: tx



  - if:

      properties:

        compatible:

          contains:

            enum:

              - allwinner,sun55i-a523-spdif



    then:

      properties:

        clocks:

          items:

            - description: Bus Clock

            - description: TX Clock

            - description: RX Clock



        clock-names:

          items:

            - const: apb

            - const: tx

            - const: rx

    else:

      properties:

        clocks:

          items:

            - description: Bus Clock

            - description: Module Clock



        clock-names:

          items:

            - const: apb

            - const: spdif



required:

  - "#sound-dai-cells"

  - compatible