Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…git/broonie/sound into for-next

ASoC: Updates for v6.3

There's been quite a lot of activity this release, but not really
one big feature - lots of new devices, plus a lot of cleanup and
modernisation work spread throughout the subsystem:

 - More factoring out of common operations into helper functions
   by Morimoto-san.
 - DT schema conversons and stylistic nits.
 - Continued work on building out the new SOF IPC4 scheme.
 - Support for Awinc AT88395, Infineon PEB2466, Iron Device
   SMA1303, Mediatek MT8188, Realtek RT712, Renesas IDT821034,
   Samsung/Tesla FSD SoC I2S, and TI TAS5720A-Q1.
  • Loading branch information
Takashi Iwai committed Feb 16, 2023
2 parents 5661706 + 76f5aaa commit 1bdb783
Show file tree
Hide file tree
Showing 326 changed files with 32,241 additions and 3,385 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ description: |
properties:
compatible:
const: mediatek,mt8186-dsp
enum:
- mediatek,mt8186-dsp
- mediatek,mt8188-dsp

reg:
items:
Expand Down
19 changes: 0 additions & 19 deletions Documentation/devicetree/bindings/sound/adi,adau7002.txt

This file was deleted.

40 changes: 40 additions & 0 deletions Documentation/devicetree/bindings/sound/adi,adau7002.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/sound/adi,adau7002.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Analog Devices ADAU7002 Stereo PDM-to-I2S/TDM Converter

maintainers:
- Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

allOf:
- $ref: dai-common.yaml#

properties:
compatible:
const: adi,adau7002

IOVDD-supply:
description:
IOVDD power supply, if skipped then it is assumed that the supply pin is
hardwired to always on.

wakeup-delay-ms:
description:
Delay after power up needed for device to settle.

required:
- compatible

unevaluatedProperties: false

examples:
- |
audio-codec {
compatible = "adi,adau7002";
IOVDD-supply = <&pp1800_l15a>;
#sound-dai-cells = <0>;
wakeup-delay-ms = <80>;
};
7 changes: 7 additions & 0 deletions Documentation/devicetree/bindings/sound/ak4613.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ properties:
"#sound-dai-cells":
const: 0

ports:
$ref: audio-graph-port.yaml#/definitions/ports

port:
$ref: audio-graph-port.yaml#
unevaluatedProperties: false

patternProperties:
"^asahi-kasei,in[1-2]-single-end$":
description: Input Pin 1 - 2.
Expand Down
34 changes: 0 additions & 34 deletions Documentation/devicetree/bindings/sound/amlogic,axg-fifo.txt

This file was deleted.

112 changes: 112 additions & 0 deletions Documentation/devicetree/bindings/sound/amlogic,axg-fifo.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/sound/amlogic,axg-fifo.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Amlogic AXG Audio FIFO controllers

maintainers:
- Jerome Brunet <jbrunet@baylibre.com>

properties:
compatible:
oneOf:
- enum:
- amlogic,axg-toddr
- amlogic,axg-frddr
- items:
- enum:
- amlogic,g12a-toddr
- amlogic,sm1-toddr
- const: amlogic,axg-toddr
- items:
- enum:
- amlogic,g12a-frddr
- amlogic,sm1-frddr
- const: amlogic,axg-frddr

reg:
maxItems: 1

"#sound-dai-cells":
const: 0

clocks:
items:
- description: Peripheral clock

interrupts:
maxItems: 1

resets:
minItems: 1
maxItems: 2

reset-names:
minItems: 1
maxItems: 2

amlogic,fifo-depth:
$ref: /schemas/types.yaml#/definitions/uint32
description: Size of the controller's fifo in bytes

required:
- compatible
- reg
- "#sound-dai-cells"
- clocks
- interrupts
- resets
- amlogic,fifo-depth

allOf:
- $ref: dai-common.yaml#
- if:
properties:
compatible:
contains:
enum:
- amlogic,g12a-toddr
- amlogic,sm1-toddr
- amlogic,g12a-frddr
- amlogic,sm1-frddr

then:
properties:
resets:
minItems: 2
reset-names:
items:
- const: arb
- const: rst
required:
- reset-names

else:
properties:
resets:
maxItems: 1
reset-names:
const: arb

unevaluatedProperties: false

examples:
- |
#include <dt-bindings/clock/axg-audio-clkc.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
audio-controller@1c0 {
compatible = "amlogic,g12a-frddr", "amlogic,axg-frddr";
reg = <0x1c0 0x1c>;
#sound-dai-cells = <0>;
clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
interrupts = <GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
resets = <&arb>, <&clkc_audio AUD_RESET_FRDDR_A>;
reset-names = "arb", "rst";
amlogic,fifo-depth = <512>;
};
29 changes: 0 additions & 29 deletions Documentation/devicetree/bindings/sound/amlogic,axg-pdm.txt

This file was deleted.

82 changes: 82 additions & 0 deletions Documentation/devicetree/bindings/sound/amlogic,axg-pdm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/sound/amlogic,axg-pdm.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Amlogic Audio AXG PDM input

maintainers:
- Jerome Brunet <jbrunet@baylibre.com>

properties:
compatible:
oneOf:
- items:
- enum:
- amlogic,g12a-pdm
- amlogic,sm1-pdm
- const: amlogic,axg-pdm
- const: amlogic,axg-pdm

reg:
maxItems: 1

"#sound-dai-cells":
const: 0

clocks:
items:
- description: Peripheral clock
- description: PDM digital clock
- description: DSP system clock

clock-names:
items:
- const: pclk
- const: dclk
- const: sysclk

resets:
maxItems: 1

required:
- compatible
- reg
- "#sound-dai-cells"
- clocks
- clock-names

allOf:
- $ref: dai-common.yaml#

- if:
properties:
compatible:
contains:
enum:
- amlogic,g12a-pdm
- amlogic,sm1-pdm
then:
required:
- resets

else:
properties:
resets: false

unevaluatedProperties: false

examples:
- |
#include <dt-bindings/clock/axg-audio-clkc.h>
audio-controller@ff632000 {
compatible = "amlogic,axg-pdm";
reg = <0xff632000 0x34>;
#sound-dai-cells = <0>;
clocks = <&clkc_audio AUD_CLKID_PDM>,
<&clkc_audio AUD_CLKID_PDM_DCLK>,
<&clkc_audio AUD_CLKID_PDM_SYSCLK>;
clock-names = "pclk", "dclk", "sysclk";
};
Loading

0 comments on commit 1bdb783

Please sign in to comment.