Commit a3b5d471 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v5.20-2' of... 

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

ASoC: More updates for v5.20

More updates that came in since the last pull request I sent, a series
of driver specific changes:

 - Support for AMD RPL, some Intel platforms and Mediatek MT8186.
parents 9769e44d 40d060b8

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

+4 −3
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ properties: 
  reset-gpios:

    maxItems: 1



  spi-max-frequency: true



  AVDD-supply:

    description: Analog power support for the device.
@@ -52,7 +50,10 @@ required: 
  - compatible

  - AVDD-supply



additionalProperties: false

allOf:

  - $ref: /schemas/spi/spi-peripheral-props.yaml#



unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/sound/atmel,sama5d2-classd.yaml

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

# Copyright (C) 2022 Microchip Technology, Inc. and its subsidiaries

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/atmel,sama5d2-classd.yaml#

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



title: Atmel ClassD Amplifier



maintainers:

  - Nicolas Ferre <nicolas.ferre@microchip.com>

  - Alexandre Belloni <alexandre.belloni@bootlin.com>

  - Claudiu Beznea <claudiu.beznea@microchip.com>



description:

  The Audio Class D Amplifier (CLASSD) is a digital input, Pulse Width

  Modulated (PWM) output stereo Class D amplifier.



properties:

  compatible:

    const: atmel,sama5d2-classd



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  dmas:

    maxItems: 1



  dma-names:

    const: tx



  clocks:

    maxItems: 2



  clock-names:

    items:

      - const: pclk

      - const: gclk



  atmel,model:

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

    default: CLASSD

    description: The user-visible name of this sound complex.



  atmel,pwm-type:

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

    enum:

      - single

      - diff

    default: single

    description: PWM modulation type.



  atmel,non-overlap-time:

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

    enum:

      - 5

      - 10

      - 15

      - 20

    default: 10

    description:

      Set non-overlapping time, the unit is nanosecond(ns).

      Non-overlapping will be disabled if not specified.



required:

  - compatible

  - reg

  - interrupts

  - dmas

  - dma-names

  - clock-names

  - clocks



additionalProperties: false



examples:

  - |

    #include <dt-bindings/dma/at91.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>



    classd: sound@fc048000 {

        compatible = "atmel,sama5d2-classd";

        reg = <0xfc048000 0x100>;

        interrupts = <59 IRQ_TYPE_LEVEL_HIGH 7>;

        dmas = <&dma0

            (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

            | AT91_XDMAC_DT_PERID(47))>;

        dma-names = "tx";

        clocks = <&classd_clk>, <&classd_gclk>;

        clock-names = "pclk", "gclk";

        assigned-clocks = <&classd_gclk>;

        pinctrl-names = "default";

        pinctrl-0 = <&pinctrl_classd_default>;

        atmel,model = "classd @ SAMA5D2-Xplained";

        atmel,pwm-type = "diff";

        atmel,non-overlap-time = <10>;

    };

Documentation/devicetree/bindings/sound/atmel,sama5d2-i2s.yaml

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

# Copyright (C) 2022 Microchip Technology, Inc. and its subsidiaries

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/atmel,sama5d2-i2s.yaml#

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



title: Atmel I2S controller



maintainers:

  - Nicolas Ferre <nicolas.ferre@microchip.com>

  - Alexandre Belloni <alexandre.belloni@bootlin.com>

  - Claudiu Beznea <claudiu.beznea@microchip.com>



description:

  Atmel I2S (Inter-IC Sound Controller) bus is the standard

  interface for connecting audio devices, such as audio codecs.



properties:

  compatible:

    const: atmel,sama5d2-i2s



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: Peripheral clock

      - description: Generated clock (Optional)

      - description: I2S mux clock (Optional). Set

          with gclk when Master Mode is required.

    minItems: 1



  clock-names:

    items:

      - const: pclk

      - const: gclk

      - const: muxclk

    minItems: 1



  dmas:

    items:

      - description: TX DMA Channel

      - description: RX DMA Channel



  dma-names:

    items:

      - const: tx

      - const: rx



required:

  - compatible

  - reg

  - interrupts

  - dmas

  - dma-names

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

    #include <dt-bindings/dma/at91.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>



    i2s@f8050000 {

        compatible = "atmel,sama5d2-i2s";

        reg = <0xf8050000 0x300>;

        interrupts = <54 IRQ_TYPE_LEVEL_HIGH 7>;

        dmas = <&dma0

                (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |

                AT91_XDMAC_DT_PERID(31))>,

               <&dma0

                (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |

                AT91_XDMAC_DT_PERID(32))>;

        dma-names = "tx", "rx";

        clocks = <&i2s0_clk>, <&i2s0_gclk>, <&i2s0muxck>;

        clock-names = "pclk", "gclk", "muxclk";

        pinctrl-names = "default";

        pinctrl-0 = <&pinctrl_i2s0_default>;

    };

Documentation/devicetree/bindings/sound/atmel,sama5d2-pdmic.yaml

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

# Copyright (C) 2022 Microchip Technology, Inc. and its subsidiaries

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/atmel,sama5d2-pdmic.yaml#

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



title: Atmel PDMIC decoder



maintainers:

  - Claudiu Beznea <claudiu.beznea@microchip.com>



description:

  Atmel Pulse Density Modulation Interface Controller

  (PDMIC) peripheral is a mono PDM decoder module

  that decodes an incoming PDM sample stream.



properties:

  compatible:

    const: atmel,sama5d2-pdmic



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: peripheral clock

      - description: generated clock



  clock-names:

    items:

      - const: pclk

      - const: gclk



  dmas:

    maxItems: 1



  dma-names:

    const: rx



  atmel,mic-min-freq:

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

    description:

      The minimal frequency that the microphone supports.



  atmel,mic-max-freq:

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

    description:

      The maximal frequency that the microphone supports.



  atmel,model:

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

    default: PDMIC

    description: The user-visible name of this sound card.



  atmel,mic-offset:

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

    default: 0

    description: The offset that should be added.



required:

  - compatible

  - reg

  - interrupts

  - dmas

  - dma-names

  - clock-names

  - clocks

  - atmel,mic-min-freq

  - atmel,mic-max-freq



additionalProperties: false



examples:

  - |

    #include <dt-bindings/dma/at91.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>



    pdmic: sound@f8018000 {

        compatible = "atmel,sama5d2-pdmic";

        reg = <0xf8018000 0x124>;

        interrupts = <48 IRQ_TYPE_LEVEL_HIGH 7>;

        dmas = <&dma0

                (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

                | AT91_XDMAC_DT_PERID(50))>;

        dma-names = "rx";

        clocks = <&pdmic_clk>, <&pdmic_gclk>;

        clock-names = "pclk", "gclk";

        pinctrl-names = "default";

        pinctrl-0 = <&pinctrl_pdmic_default>;

        atmel,model = "PDMIC@sama5d2_xplained";

        atmel,mic-min-freq = <1000000>;

        atmel,mic-max-freq = <3246000>;

        atmel,mic-offset = <0x0>;

    };

Documentation/devicetree/bindings/sound/atmel-classd.txt

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
* Atmel ClassD driver under ALSA SoC architecture



Required properties:

- compatible

	Should be "atmel,sama5d2-classd".

- reg

	Should contain ClassD registers location and length.

- interrupts

	Should contain the IRQ line for the ClassD.

- dmas

	One DMA specifiers as described in atmel-dma.txt and dma.txt files.

- dma-names

	Must be "tx".

- clock-names

	Tuple listing input clock names.

	Required elements: "pclk" and "gclk".

- clocks

	Please refer to clock-bindings.txt.

- assigned-clocks

	Should be <&classd_gclk>.



Optional properties:

- pinctrl-names, pinctrl-0

	Please refer to pinctrl-bindings.txt.

- atmel,model

	The user-visible name of this sound complex.

	The default value is "CLASSD".

- atmel,pwm-type

	PWM modulation type, "single" or "diff".

	The default value is "single".

- atmel,non-overlap-time

	Set non-overlapping time, the unit is nanosecond(ns).

	There are four values,

	<5>, <10>, <15>, <20>, the default value is <10>.

	Non-overlapping will be disabled if not specified.



Example:

classd: classd@fc048000 {

		compatible = "atmel,sama5d2-classd";

		reg = <0xfc048000 0x100>;

		interrupts = <59 IRQ_TYPE_LEVEL_HIGH 7>;

		dmas = <&dma0

			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

			| AT91_XDMAC_DT_PERID(47))>;

		dma-names = "tx";

		clocks = <&classd_clk>, <&classd_gclk>;

		clock-names = "pclk", "gclk";

		assigned-clocks = <&classd_gclk>;



		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_classd_default>;

		atmel,model = "classd @ SAMA5D2-Xplained";

		atmel,pwm-type = "diff";

		atmel,non-overlap-time = <10>;

};