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

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

Pull sound updates from Takashi Iwai:
 "Most of changes at this time are for ASoC, spread over ASoC core and
  drivers due to the API prefix standardization.

  Other than that, there have little change wrt API, rather lots of
  driver-specific updates and fixes.

  Some highlight below:

  ASoC:
   - Standardization of API prefix
   - GPIO API usage improvements
   - Support for HDA patches
   - Lots of work on SOF, including crash dump support
   - Fixes for noise when stopping some Sounwire CODECs
   - Support for AMD platforms with es83xx, AMD ACP 6.3 and 7.0, Awinc
     AT87390 and AW88399, many Intel platforms, many Mediatek platforms,
     Qualcomm SM6115 and SC7180 platforms, Richtek RTQ9128 and Texas
     Instruments TAS575x

  HD-audio and USB-audio:
   - Deferred probe support of audio component binding
   - More fixes and enhancements for Cirrus subcodecs
   - USB Scarlett2 mixer and McIntosh DSD quirk

  Others:
   - More enhancement of snd-aloop driver
   - Update MAINTAINERS entry for linux-sound mailing list"

* tag 'sound-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (485 commits)
  ALSA: hda: cs35l41: Fix missing error code in cs35l41_smart_amp()
  ALSA: hda: cs35l41: mark cs35l41_verify_id() static
  ASoC: codecs: wsa883x: make use of new mute_unmute_on_trigger flag
  ASoC: soc-dai: add flag to mute and unmute stream during trigger
  ASoC: ams-delta.c: use component after check
  ASoC: amd: acp: select SND_SOC_AMD_ACP_LEGACY_COMMON for ACP63
  ASoC: codecs: aw88399: fix typo in Kconfig select
  ASoC: amd: acp: add ACPI dependency
  ASoC: Intel: avs: Add rt5514 machine board
  ASoC: Intel: avs: Add rt5514 machine board
  ALSA: scarlett2: Add missing check with firmware version control
  ALSA: virtio: use ack callback
  ALSA: scarlett2: Remap Level Meter values
  ALSA: scarlett2: Allow passing any output to line_out_remap()
  ALSA: scarlett2: Add support for reading firmware version
  ALSA: scarlett2: Rename Gen 3 config sets
  ALSA: scarlett2: Rename scarlett_gen2 to scarlett2
  ASoC: cs35l41: Detect CSPL errors when sending CSPL commands
  ALSA: hda: cs35l41: Check CSPL state after loading firmware
  ALSA: hda: cs35l41: Do not unload firmware before reset in system suspend
  ...
parents 4ea4ed22 dc6e08b1

Documentation/devicetree/bindings/sound/audio-graph-port.yaml

+6 −14
Original line number Diff line number Diff line
@@ -13,19 +13,17 @@ select: false 


definitions:

  port-base:

    $ref: /schemas/graph.yaml#/$defs/port-base

    allOf:

      - $ref: /schemas/graph.yaml#/$defs/port-base

      - $ref: /schemas/sound/dai-params.yaml#

    properties:

      convert-rate:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate

      convert-channels:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels

      convert-sample-format:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format

      mclk-fs:

        $ref: simple-card.yaml#/definitions/mclk-fs



  endpoint-base:

    $ref: /schemas/graph.yaml#/$defs/endpoint-base

    allOf:

      - $ref: /schemas/graph.yaml#/$defs/endpoint-base

      - $ref: /schemas/sound/dai-params.yaml#

    properties:

      mclk-fs:

        $ref: simple-card.yaml#/definitions/mclk-fs
@@ -68,12 +66,6 @@ definitions: 
            - pdm

            - msb

            - lsb

      convert-rate:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate

      convert-channels:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels

      convert-sample-format:

        $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format



      dai-tdm-slot-num:

        description: Number of slots in use.

Documentation/devicetree/bindings/sound/audio-graph.yaml

+3 −6
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Audio Graph 
maintainers:

  - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>



allOf:

  - $ref: /schemas/sound/dai-params.yaml#



properties:

  dais:

    $ref: /schemas/types.yaml#/definitions/phandle-array
@@ -30,12 +33,6 @@ properties: 
      widget ("Microphone", "Line", "Headphone", "Speaker"), the

      second being the machine specific name for the widget.

    $ref: /schemas/types.yaml#/definitions/non-unique-string-array

  convert-rate:

    $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate

  convert-channels:

    $ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels

  convert-sample-format:

    $ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format



  pa-gpios:

    maxItems: 1

Documentation/devicetree/bindings/sound/awinic,aw87390.yaml

0 → 100644
+58 −0
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/awinic,aw87390.yaml#

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



title: Awinic Aw87390 Audio Amplifier



maintainers:

  - Weidong Wang <wangweidong.a@awinic.com>



description:

  The awinic aw87390 is specifically designed to improve

  the musical output dynamic range, enhance the overall

  sound quallity, which is a new high efficiency, low

  noise, constant large volume, 6th Smart K audio amplifier.



allOf:

  - $ref: dai-common.yaml#



properties:

  compatible:

    const: awinic,aw87390



  reg:

    maxItems: 1



  "#sound-dai-cells":

    const: 0



  awinic,audio-channel:

    description:

      It is used to distinguish multiple PA devices, so that different

      configurations can be loaded to different PA devices

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 7



required:

  - compatible

  - reg

  - "#sound-dai-cells"

  - awinic,audio-channel



unevaluatedProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;

        audio-codec@58 {

            compatible = "awinic,aw87390";

            reg = <0x58>;

            #sound-dai-cells = <0>;

            awinic,audio-channel = <0>;

        };

    };

Documentation/devicetree/bindings/sound/awinic,aw88395.yaml

+29 −4
Original line number Diff line number Diff line
@@ -14,14 +14,12 @@ description: 
  digital Smart K audio amplifier with an integrated 10.25V

  smart boost convert.



allOf:

  - $ref: dai-common.yaml#



properties:

  compatible:

    enum:

      - awinic,aw88395

      - awinic,aw88261

      - awinic,aw88399



  reg:

    maxItems: 1
@@ -32,11 +30,36 @@ properties: 
  reset-gpios:

    maxItems: 1



  awinic,audio-channel:

    description:

      It is used to distinguish multiple PA devices, so that different

      configurations can be loaded to different PA devices

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 7



  awinic,sync-flag:

    description:

      Flag bit used to keep the phase synchronized in the case of multiple PA

    $ref: /schemas/types.yaml#/definitions/flag



required:

  - compatible

  - reg

  - '#sound-dai-cells'

  - reset-gpios

  - awinic,audio-channel



allOf:

  - $ref: dai-common.yaml#

  - if:

      properties:

        compatible:

          contains:

            enum:

              - awinic,aw88261

    then:

      properties:

        reset-gpios: false



unevaluatedProperties: false
@@ -51,5 +74,7 @@ examples: 
            reg = <0x34>;

            #sound-dai-cells = <0>;

            reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>;

            awinic,audio-channel = <0>;

            awinic,sync-flag;

        };

    };

Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ properties: 
      Current at which the headset micbias sense clamp will engage, 0 to

      disable.

    enum: [ 0, 14, 24, 43, 52, 61, 71, 90, 99 ]

    default: 0

    default: 14



  cirrus,bias-ramp-ms:

    description:
@@ -97,7 +97,7 @@ properties: 
      Time in microseconds the type detection will run for. Long values will

      cause more audible effects, but give more accurate detection.

    enum: [ 20, 100, 1000, 10000, 50000, 75000, 100000, 200000 ]

    default: 10000

    default: 1000



  cirrus,button-automute:

    type: boolean