Commit 9747b22a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v6.19' of...

Merge tag 'asoc-v6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v6.19

This is a very large set of updates, as well as some more extensive
cleanup work from Morimto-san we've also added a generic SCDA class
driver for SoundWire devices enabling us to support many chips with
no custom code.  There's also a batch of new drivers added for both
SoCs and CODECs.

 - Added a SoundWire SCDA generic class driver, pulling in a little
   regmap work to support it.
 - A *lot* of cleaup and API improvement work from Morimoto-san.
 - Lots of work on the existing Cirrus, Intel, Maxim and Qualcomm
   drivers.
 - Support for Allwinner A523, Mediatek MT8189, Qualcomm QCM2290,
   QRB2210 and SM6115, SpacemiT K1, and TI TAS2568, TAS5802, TAS5806,
   TAS5815, TAS5828 and TAS5830.

This also pulls in some gpiolib changes supporting shared GPIOs in the
core there so we can convert some of the ASoC drivers open coding
handling of that to the core functionality.
parents ef5e0a02 c5fae31f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>
Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>
+14 −12
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ patternProperties:
      groups:
        description:
          Name of the pin group to use for the functions.
        $ref: /schemas/types.yaml#/definitions/string
        items:
          enum: [i2c0_grp, i2c1_grp, i2c2_grp, i2c3_grp, i2c4_grp,
                 i2c5_grp, i2c6_grp, i2c7_grp, i2c8_grp,
                 spi0_grp, spi0_cs0_grp, spi0_cs1_grp, spi0_cs2_grp,
@@ -62,6 +62,8 @@ patternProperties:
                 pwm2_gpio10_grp, pwm2_gpio14_grp, pwm2_gpio18_grp,
                 pwm3_gpio7_grp, pwm3_gpio11_grp, pwm3_gpio15_grp,
                 pwm3_gpio19_grp, pcmif_out_grp, pcmif_in_grp]
        minItems: 1
        maxItems: 8

      drive-strength:
        enum: [2, 4, 6, 8, 16, 24, 32]
+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ patternProperties:

      '^conf':
        type: object
        unevaluatedProperties: false
        description:
          Pinctrl node's client devices use subnodes for pin configurations,
          which in turn use the standard properties below.
+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";
        };
    };
+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>;
	};
Loading