Commit 6ab8ad31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound updates from Takashi Iwai:
 "As shown in diffstat and logs, it was again a busy development cycle
  at this time, too. The most significant changes are still on-going
  refactoring / modernization works for ASoC core and drivers, but there
  are lots of other changes as well. Here we go, some highlights below:

  ASoC:

   - Quite a lot of cleanup / refactoring of ASoC core and APIs; most of
     them are systematic, but also including cleanups and modernization

   - A bulk of updates for some ASoC platforms, Freescale, sunxi and
     Intel SST/SOF

   - Initial support for Sound Open Firmware on i.MX8

   - Removal of deprecated w90x900 and nuc900 drivers

   - New support for Cirrus Logic CS47L15 and CS47L92, Freescale i.MX
     7ULP and 8MQ, Meson G12A and NXP UDA1334

  USB-audio:

   - More validations of descriptor units for hardening against bugs
     reported by fuzzers

   - PCM device assignment workaround for a past call-order change

   - Scarlett Gen2 mixer interface, a few more more quirks

  HD-audio:

   - Support for audio component with AMD/ATI and Nvidia HDMI codecs

   - Clean up HD-audio core and remove indirect access ops for Intel SOF

   - DMIC detection at probe; it would make systems automatically
     falling back to SST/SOF driver on devices that need DMIC handling.
     Needs a new Kconfig to set, and beware that it's still new and a
     bit experimental

  FireWire:

   - Lots of code refactoring and cleanups"

* tag 'sound-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (521 commits)
  ASoC: sdm845: remove unneeded semicolon
  ASoC: fsl_sai: Implement set_bclk_ratio
  ASoC: dmaengine: Replace strncpy() with strscpy_pad() for pcm->name
  ASoC: wcd9335: remove redundant use of ret variable
  ALSA: firewire-tascam: check intermediate state of clock status and retry
  ALSA: firewire-tascam: handle error code when getting current source of clock
  ASoC: hdmi-codec: Add an op to set callback function for plug event
  ASoC: rt5677: keep analog power register at SND_SOC_BIAS_OFF
  ASoC: rt5677: Remove magic number register writes
  ASoC: soc-core: self contained soc_unbind_aux_dev()
  ASoC: soc-core: add soc_unbind_aux_dev()
  ASoC: soc-core: self contained soc_bind_aux_dev()
  ASoC: soc-core: move soc_probe_link_dais() next to soc_remove_link_dais()
  ASoC: soc-core: self contained soc_probe_link_dais()
  ASoC: soc-core: add new soc_link_init()
  ASoC: soc-core: move soc_probe_dai() next to soc_remove_dai()
  ASoC: soc-core: self contained soc_remove_link_dais()
  ASoC: soc-core: self contained soc_remove_link_components()
  ASoC: soc-core: self contained soc_probe_link_components()
  ASoC: rt1308: make array pd static const, makes object smaller
  ...
parents ea982ba7 9bf9bf54

Documentation/devicetree/bindings/dsp/fsl,dsp.yaml

0 → 100644
+88 −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/dsp/fsl,dsp.yaml#

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



title: NXP i.MX8 DSP core



maintainers:

  - Daniel Baluta <daniel.baluta@nxp.com>



description: |

  Some boards from i.MX8 family contain a DSP core used for

  advanced pre- and post- audio processing.



properties:

  compatible:

    enum:

      - fsl,imx8qxp-dsp



  reg:

    description: Should contain register location and length



  clocks:

    items:

      - description: ipg clock

      - description: ocram clock

      - description: core clock



  clock-names:

    items:

      - const: ipg

      - const: ocram

      - const: core



  power-domains:

    description:

      List of phandle and PM domain specifier as documented in

      Documentation/devicetree/bindings/power/power_domain.txt

    maxItems: 4



  mboxes:

    description:

      List of <&phandle type channel> - 2 channels for TXDB, 2 channels for RXDB

      (see mailbox/fsl,mu.txt)

    maxItems: 4



  mbox-names:

    items:

      - const: txdb0

      - const: txdb1

      - const: rxdb0

      - const: rxdb1



  memory-region:

    description:

       phandle to a node describing reserved memory (System RAM memory)

       used by DSP (see bindings/reserved-memory/reserved-memory.txt)

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - power-domains

  - mboxes

  - mbox-names

  - memory-region



examples:

  - |

    #include <dt-bindings/firmware/imx/rsrc.h>

    #include <dt-bindings/clock/imx8-clock.h>

    dsp@596e8000 {

        compatible = "fsl,imx8qxp-dsp";

        reg = <0x596e8000 0x88000>;

        clocks = <&adma_lpcg IMX_ADMA_LPCG_DSP_IPG_CLK>,

                 <&adma_lpcg IMX_ADMA_LPCG_OCRAM_IPG_CLK>,

                 <&adma_lpcg IMX_ADMA_LPCG_DSP_CORE_CLK>;

        clock-names = "ipg", "ocram", "core";

        power-domains = <&pd IMX_SC_R_MU_13A>,

                        <&pd IMX_SC_R_MU_13B>,

                        <&pd IMX_SC_R_DSP>,

                        <&pd IMX_SC_R_DSP_RAM>;

        mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1";

        mboxes = <&lsio_mu13 2 0>, <&lsio_mu13 2 1>, <&lsio_mu13 3 0>, <&lsio_mu13 3 1>;

    };

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

+3 −1
Original line number Diff line number Diff line
@@ -70,7 +70,9 @@ allOf: 
      properties:

        compatible:

          contains:

            const: allwinner,sun8i-h3-spdif

            enum:

              - allwinner,sun8i-h3-spdif

              - allwinner,sun50i-h6-spdif



    then:

      properties:

Documentation/devicetree/bindings/sound/allwinner,sun50i-a64-codec-analog.yaml

0 → 100644
+39 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/allwinner,sun50i-a64-codec-analog.yaml#

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



title: Allwinner A64 Analog Codec Device Tree Bindings



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Maxime Ripard <maxime.ripard@bootlin.com>



properties:

  compatible:

    const: allwinner,sun50i-a64-codec-analog



  reg:

    maxItems: 1



  cpvdd-supply:

    description:

      Regulator for the headphone amplifier



required:

  - compatible

  - reg

  - cpvdd-supply



additionalProperties: false



examples:

  - |

    codec_analog: codec-analog@1f015c0 {

      compatible = "allwinner,sun50i-a64-codec-analog";

      reg = <0x01f015c0 0x4>;

      cpvdd-supply = <&reg_eldo1>;

    };



...

Documentation/devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml

0 → 100644
+57 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/allwinner,sun8i-a33-codec.yaml#

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



title: Allwinner A33 Codec Device Tree Bindings



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Maxime Ripard <maxime.ripard@bootlin.com>



properties:

  "#sound-dai-cells":

    const: 0



  compatible:

    const: allwinner,sun8i-a33-codec



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: Bus Clock

      - description: Module Clock



  clock-names:

    items:

      - const: bus

      - const: mod



required:

  - "#sound-dai-cells"

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

    audio-codec@1c22e00 {

      #sound-dai-cells = <0>;

      compatible = "allwinner,sun8i-a33-codec";

      reg = <0x01c22e00 0x400>;

      interrupts = <0 29 4>;

      clocks = <&ccu 47>, <&ccu 92>;

      clock-names = "bus", "mod";

    };



...

Documentation/devicetree/bindings/sound/amlogic,axg-fifo.txt

+7 −2
Original line number Diff line number Diff line
@@ -4,13 +4,18 @@ Required properties: 
- compatible: 'amlogic,axg-toddr' or

	      'amlogic,axg-toddr' or

	      'amlogic,g12a-frddr' or

	      'amlogic,g12a-toddr'

	      'amlogic,g12a-toddr' or

	      'amlogic,sm1-frddr' or

	      'amlogic,sm1-toddr'

- reg: physical base address of the controller and length of memory

       mapped region.

- interrupts: interrupt specifier for the fifo.

- clocks: phandle to the fifo peripheral clock provided by the audio

	  clock controller.

- resets: phandle to memory ARB line provided by the arb reset controller.

- resets: list of reset phandle, one for each entry reset-names.

- reset-names: should contain the following:

  * "arb" : memory ARB line (required)

  * "rst" : dedicated device reset line (optional)

- #sound-dai-cells: must be 0.



Example of FRDDR A on the A113 SoC:

CRA Git | Maintained and supported by SUSTech CRA and CCSE