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

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

Pull sound updates from Takashi Iwai:
 "Lots of code development have been see in ASoC side as usual, while
  the continued development on memalloc helper and USB-audio low-
  latency support are found in the rest.

  Note that a few changes in the unusual places like arch/sh are
  included, which are a part of ASoC DAI format cleanups.

  ALSA core:

   - Continued memalloc helper updates and cleanups, now supporting
     non-coherent and non-contiguous pages

   - Fixes for races in mixer OSS layer

  ASoC:

   - A new version of the audio graph card which supports a wider range
     of systems

   - Several conversions to YAML DT bindings

   - Continuing cleanups to the SOF and Intel code

   - Move of the Cirrus DSP framework into drivers/firmware to allow for
     future use by non-audio DSPs

   - An overhaul of the cs42l42 driver, correcting many problems

   - DAI format terminology conversions over many drivers for cleanups

   - Support for AMD Vangogh and Yelow Cap, Cirrus CS35L41, Maxim
     MAX98520 and MAX98360A, Mediatek MT8195, Nuvoton NAU8821, nVidia
     Tegra210, NXP i.MX8ULP, Qualcomm AudioReach, Realtek ALC5682I-VS,
     RT5682S, and RT9120 and Rockchip RV1126 and RK3568

  USB-audio:

   - Continued improvements on low-latency playback

   - Quirks for Pioneer devices, Line6 HX-Stomp XL, Audient iD14

  HD-audio:

   - Reduce excessive udelay() calls on Intel platforms; this should
     reduce the CPU load with PulseAudio

   - Quirks for HP and Clevo laptops

  FireWire:

   - Support for meter information on MOTU"

* tag 'sound-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (513 commits)
  ALSA: usb-audio: Add quirk for Audient iD14
  ALSA: hda/realtek: Add quirk for Clevo PC70HS
  ALSA: usb-audio: Line6 HX-Stomp XL USB_ID for 48k-fixed quirk
  ALSA: usb-audio: Add registration quirk for JBL Quantum 400
  ASoC: rsnd: Fix an error handling path in 'rsnd_node_count()'
  ASoC: tlv320aic3x: Make aic3x_remove() return void
  ASoC: Intel: soc-acpi: use const for all uses of snd_soc_acpi_codecs
  ASoC: Intel: soc-acpi-cht: shrink tables using compatible IDs
  ASoC: Intel: soc-acpi-byt: shrink tables using compatible IDs
  ASoC: Intel: sof_rt5682: use comp_ids to enumerate rt5682s
  ASoC: Intel: sof_rt5682: detect codec variant in probe function
  ASoC: soc-acpi: add comp_ids field for machine driver matching
  ASoC: mediatek: mt8195: add mt8195-mt6359-rt1011-rt5682 bindings document
  ASoC: mediatek: mt8195: add machine driver with mt6359, rt1011 and rt5682
  ASoC: Stop dummy from overriding hwparams
  ASoC: topology: Change topology device to card device
  ASoC: topology: Use correct device for prints
  ASoC: topology: Check for dapm widget completeness
  ASoC: topology: Add header payload_size verification
  ASoC: core: Remove invalid snd_soc_component_set_jack call
  ...
parents dcd68326 df0380b9

Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt

deleted100644 → 0
+0 −134
Original line number Diff line number Diff line 
Qualcomm APR (Asynchronous Packet Router) binding



This binding describes the Qualcomm APR. APR is a IPC protocol for

communication between Application processor and QDSP. APR is mainly

used for audio/voice services on the QDSP.



- compatible:

	Usage: required

	Value type: <stringlist>

	Definition: must be "qcom,apr-v<VERSION-NUMBER>", example "qcom,apr-v2"



- qcom,apr-domain

	Usage: required

	Value type: <u32>

	Definition: Destination processor ID.

	Possible values are :

			1 - APR simulator

			2 - PC

			3 - MODEM

			4 - ADSP

			5 - APPS

			6 - MODEM2

			7 - APPS2



= APR SERVICES

Each subnode of the APR node represents service tied to this apr. The name

of the nodes are not important. The properties of these nodes are defined

by the individual bindings for the specific service

- All APR services MUST contain the following property:



- reg

	Usage: required

	Value type: <u32>

	Definition: APR Service ID

	Possible values are :

			3 - DSP Core Service

			4 - Audio Front End Service.

			5 - Voice Stream Manager Service.

			6 - Voice processing manager.

			7 - Audio Stream Manager Service.

			8 - Audio Device Manager Service.

			9 - Multimode voice manager.

			10 - Core voice stream.

			11 - Core voice processor.

			12 - Ultrasound stream manager.

			13 - Listen stream manager.



- qcom,protection-domain

	Usage: optional

	Value type: <stringlist>

	Definition: Must list the protection domain service name and path

		    that the particular apr service has a dependency on.

	Possible values are :

			"avs/audio", "msm/adsp/audio_pd".

			"kernel/elf_loader", "msm/modem/wlan_pd".

			"tms/servreg", "msm/adsp/audio_pd".

			"tms/servreg", "msm/modem/wlan_pd".

			"tms/servreg", "msm/slpi/sensor_pd".



= EXAMPLE

The following example represents a QDSP based sound card on a MSM8996 device

which uses apr as communication between Apps and QDSP.



	apr {

		compatible = "qcom,apr-v2";

		qcom,apr-domain = <APR_DOMAIN_ADSP>;



		apr-service@3 {

			compatible = "qcom,q6core";

			reg = <APR_SVC_ADSP_CORE>;

		};



		apr-service@4 {

			compatible = "qcom,q6afe";

			reg = <APR_SVC_AFE>;



			dais {

				#sound-dai-cells = <1>;

				dai@1 {

					reg = <HDMI_RX>;

				};

			};

		};



		apr-service@7 {

			compatible = "qcom,q6asm";

			reg = <APR_SVC_ASM>;

			...

		};



		apr-service@8 {

			compatible = "qcom,q6adm";

			reg = <APR_SVC_ADM>;

			...

		};

	};



= EXAMPLE 2

The following example represents a QDSP based sound card with protection domain

dependencies specified. Here some of the apr services are dependent on services

running on protection domain hosted on ADSP/SLPI remote processors while others

have no such dependency.



	apr {

		compatible = "qcom,apr-v2";

		qcom,glink-channels = "apr_audio_svc";

		qcom,apr-domain = <APR_DOMAIN_ADSP>;



		apr-service@3 {

			compatible = "qcom,q6core";

			reg = <APR_SVC_ADSP_CORE>;

		};



		q6afe: apr-service@4 {

			compatible = "qcom,q6afe";

			reg = <APR_SVC_AFE>;

			qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";

			...

		};



		q6asm: apr-service@7 {

			compatible = "qcom,q6asm";

			reg = <APR_SVC_ASM>;

			qcom,protection-domain = "tms/servreg", "msm/slpi/sensor_pd";

			...

		};



		q6adm: apr-service@8 {

			compatible = "qcom,q6adm";

			reg = <APR_SVC_ADM>;

			qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";

			...

		};

	};

Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml

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

%YAML 1.2

---

$id: "http://devicetree.org/schemas/soc/qcom/qcom,apr.yaml#"

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



title: Qualcomm APR/GPR (Asynchronous/Generic Packet Router) binding



maintainers:

  - Srinivas Kandagatla <srinivas.kandagatla@linaro.org>



description: |

  This binding describes the Qualcomm APR/GPR, APR/GPR is a IPC protocol for

  communication between Application processor and QDSP. APR/GPR is mainly

  used for audio/voice services on the QDSP.



properties:

  compatible:

    enum:

      - qcom,apr-v2

      - qcom,gpr



  qcom,apr-domain:

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

    enum: [1, 2, 3, 4, 5, 6, 7]

    description:

      Selects the processor domain for apr

        1 = APR simulator

        2 = PC Domain

        3 = Modem Domain

        4 = ADSP Domain

        5 = Application processor Domain

        6 = Modem2 Domain

        7 = Application Processor2 Domain

    deprecated: true



  qcom,domain:

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

    minimum: 1

    maximum: 7

    description:

      Selects the processor domain for apr

        1 = APR simulator

        2 = PC Domain

        3 = Modem Domain

        4 = ADSP Domain

        5 = Application processor Domain

        6 = Modem2 Domain

        7 = Application Processor2 Domain

      Selects the processor domain for gpr

        1 = Modem Domain

        2 = Audio DSP Domain

        3 = Application Processor Domain



  '#address-cells':

    const: 1



  '#size-cells':

    const: 0



#APR/GPR Services

patternProperties:

  "^service@[1-9a-d]$":

    type: object

    description:

      APR/GPR node's client devices use subnodes for desired static port services.



    properties:

      compatible:

        enum:

          - qcom,q6core

          - qcom,q6asm

          - qcom,q6afe

          - qcom,q6adm

          - qcom,q6apm

          - qcom,q6prm



      reg:

        minimum: 1

        maximum: 13

        description:

          APR Service ID

            3 = DSP Core Service

            4 = Audio  Front End Service.

            5 = Voice Stream Manager Service.

            6 = Voice processing manager.

            7 = Audio Stream Manager Service.

            8 = Audio Device Manager Service.

            9 = Multimode voice manager.

            10 = Core voice stream.

            11 = Core voice processor.

            12 = Ultrasound stream manager.

            13 = Listen stream manager.

          GPR Service ID

            1 = Audio Process Manager Service

            2 = Proxy Resource Manager Service.

            3 = AMDB Service.

            4 = Voice processing manager.



      qcom,protection-domain:

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

        description: protection domain service name and path for apr service

          possible values are

          "avs/audio", "msm/adsp/audio_pd".

          "kernel/elf_loader", "msm/modem/wlan_pd".

          "tms/servreg", "msm/adsp/audio_pd".

          "tms/servreg", "msm/modem/wlan_pd".

          "tms/servreg", "msm/slpi/sensor_pd".



      '#address-cells':

        const: 1



      '#size-cells':

        const: 0



    patternProperties:

      "^.*@[0-9a-f]+$":

        type: object

        description:

          Service based devices like clock controllers or digital audio interfaces.



    additionalProperties: false



required:

  - compatible

  - qcom,domain



additionalProperties: false



examples:

  - |

    #include <dt-bindings/soc/qcom,apr.h>

    apr {

        compatible = "qcom,apr-v2";

        qcom,domain = <APR_DOMAIN_ADSP>;

        #address-cells = <1>;

        #size-cells = <0>;



        q6core: service@3 {

          compatible = "qcom,q6core";

          reg = <APR_SVC_ADSP_CORE>;

          qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";

        };



        q6afe: service@4 {

          compatible = "qcom,q6afe";

          reg = <APR_SVC_AFE>;

          qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";

        };



        q6asm: service@7 {

          compatible = "qcom,q6asm";

          reg = <APR_SVC_ASM>;

          qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";

        };



        q6adm: service@8 {

          compatible = "qcom,q6adm";

          reg = <APR_SVC_ADM>;

          qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";

        };

    };



  - |

    #include <dt-bindings/soc/qcom,gpr.h>

    gpr {

        compatible = "qcom,gpr";

        qcom,domain = <GPR_DOMAIN_ID_ADSP>;

        #address-cells = <1>;

        #size-cells = <0>;



        service@1 {

          compatible = "qcom,q6apm";

          reg = <GPR_APM_MODULE_IID>;

          qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd";

        };

    };

Documentation/devicetree/bindings/sound/amlogic,t9015.yaml

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ properties: 
  resets:

    maxItems: 1



  AVDD-supply:

    description:

      Analogue power supply.



required:

  - "#sound-dai-cells"

  - compatible
@@ -41,6 +45,7 @@ required: 
  - clocks

  - clock-names

  - resets

  - AVDD-supply



additionalProperties: false
@@ -56,4 +61,5 @@ examples: 
        clocks = <&clkc CLKID_AUDIO_CODEC>;

        clock-names = "pclk";

        resets = <&reset RESET_AUDIO_CODEC>;

        AVDD-supply = <&vddao_1v8>;

    };

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

0 → 100644
+57 −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/audio-graph-card2.yaml#

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



title: Audio Graph Card2 Device Tree Bindings



maintainers:

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



properties:

  compatible:

    enum:

      - audio-graph-card2

  links:

    $ref: /schemas/types.yaml#/definitions/phandle-array

  label:

    maxItems: 1

  routing:

    description: |

      A list of the connections between audio components.

      Each entry is a pair of strings, the first being the

      connection's sink, the second being the connection's source.

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

  multi:

    description: Multi-CPU/Codec node

  dpcm:

    description: DPCM node

  codec2codec:

    description: Codec to Codec node



required:

  - compatible

  - links



additionalProperties: false



examples:

  - |

    sound {

        compatible = "audio-graph-card2";



        links = <&cpu_port>;

    };



    cpu {

        compatible = "cpu-driver";



        cpu_port: port { cpu_ep: endpoint { remote-endpoint = <&codec_ep>; }; };

    };



    codec {

        compatible = "codec-driver";



        port { codec_ep: endpoint { remote-endpoint = <&cpu_ep>; }; };

    };

Documentation/devicetree/bindings/sound/bt-sco.txt

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
Bluetooth-SCO audio CODEC



This device support generic Bluetooth SCO link.



Required properties:



  - compatible : "delta,dfbmcs320" or "linux,bt-sco"



Example:



codec: bt_sco {

	compatible = "delta,dfbmcs320";

};