Skip to content

Commit e25169f

Browse files
brooniebroonie
committed
Merge remote-tracking branch 'asoc/for-6.13' into asoc-next
2 parents db7e59e + a77e6c1 commit e25169f

240 files changed

Lines changed: 8146 additions & 5410 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,14 @@ properties:
3737
pa-gpios:
3838
maxItems: 1
3939
hp-det-gpio:
40+
deprecated: true
41+
maxItems: 1
42+
hp-det-gpios:
4043
maxItems: 1
4144
mic-det-gpio:
45+
deprecated: true
46+
maxItems: 1
47+
mic-det-gpios:
4248
maxItems: 1
4349

4450
required:

‎Documentation/devicetree/bindings/sound/everest,es8316.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
$id: http://devicetree.org/schemas/sound/everest,es8316.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Everest ES8311 and ES8316 audio CODECs
7+
title: Everest ES8311, ES8316 and ES8323 audio CODECs
88

99
maintainers:
1010
- Daniel Drake <drake@endlessm.com>
1111
- Katsuhiro Suzuki <katsuhiro@katsuster.net>
1212
- Matteo Martelli <matteomartelli3@gmail.com>
13+
- Binbin Zhou <zhoubinbin@loongson.cn>
1314

1415
allOf:
1516
- $ref: dai-common.yaml#
@@ -19,6 +20,7 @@ properties:
1920
enum:
2021
- everest,es8311
2122
- everest,es8316
23+
- everest,es8323
2224

2325
reg:
2426
maxItems: 1

‎Documentation/devicetree/bindings/sound/everest,es8328.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ properties:
5050
HPVDD-supply:
5151
description: Regulator providing analog output voltage 3.3V
5252

53+
port:
54+
$ref: audio-graph-port.yaml#
55+
unevaluatedProperties: false
56+
5357
required:
5458
- compatible
5559
- clocks

‎Documentation/devicetree/bindings/sound/fsl,esai.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ properties:
6565
- const: rx
6666
- const: tx
6767

68+
power-domains:
69+
maxItems: 1
70+
6871
fsl,fifo-depth:
6972
$ref: /schemas/types.yaml#/definitions/uint32
7073
default: 64
@@ -101,6 +104,17 @@ unevaluatedProperties: false
101104

102105
allOf:
103106
- $ref: dai-common.yaml#
107+
- if:
108+
properties:
109+
compatible:
110+
contains:
111+
const: fsl,imx8qm-esai
112+
then:
113+
required:
114+
- power-domains
115+
else:
116+
properties:
117+
power-domains: false
104118

105119
examples:
106120
- |

‎Documentation/devicetree/bindings/sound/inno-rk3036.txt‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎Documentation/devicetree/bindings/sound/loongson,ls2k1000-i2s.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/loongson,ls2k1000-i2s.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Loongson-2K1000 I2S controller
8+
9+
maintainers:
10+
- Binbin Zhou <zhoubinbin@loongson.cn>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: loongson,ls2k1000-i2s
18+
19+
reg:
20+
items:
21+
- description: Loongson I2S controller Registers.
22+
- description: APB DMA config register for Loongson I2S controller.
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
clocks:
28+
maxItems: 1
29+
30+
dmas:
31+
maxItems: 2
32+
33+
dma-names:
34+
items:
35+
- const: tx
36+
- const: rx
37+
38+
'#sound-dai-cells':
39+
const: 0
40+
41+
required:
42+
- compatible
43+
- reg
44+
- interrupts
45+
- clocks
46+
- dmas
47+
- dma-names
48+
- '#sound-dai-cells'
49+
50+
unevaluatedProperties: false
51+
52+
examples:
53+
- |
54+
#include <dt-bindings/clock/loongson,ls2k-clk.h>
55+
#include <dt-bindings/interrupt-controller/irq.h>
56+
57+
i2s@1fe2d000 {
58+
compatible = "loongson,ls2k1000-i2s";
59+
reg = <0x1fe2d000 0x14>,
60+
<0x1fe00438 0x8>;
61+
interrupt-parent = <&liointc0>;
62+
interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
63+
clocks = <&clk LOONGSON2_APB_CLK>;
64+
dmas = <&apbdma2 0>, <&apbdma3 0>;
65+
dma-names = "tx", "rx";
66+
#sound-dai-cells = <0>;
67+
};
68+
...

‎Documentation/devicetree/bindings/sound/mt6359.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ properties:
2323
Indicates how many data pins are used to transmit two channels of PDM
2424
signal. 0 means two wires, 1 means one wire. Default value is 0.
2525
enum:
26-
- 0 # one wire
27-
- 1 # two wires
26+
- 0 # two wires
27+
- 1 # one wire
2828

2929
mediatek,mic-type-0:
3030
$ref: /schemas/types.yaml#/definitions/uint32
@@ -53,9 +53,9 @@ additionalProperties: false
5353

5454
examples:
5555
- |
56-
mt6359codec: mt6359codec {
57-
mediatek,dmic-mode = <0>;
58-
mediatek,mic-type-0 = <2>;
56+
mt6359codec: audio-codec {
57+
mediatek,dmic-mode = <0>;
58+
mediatek,mic-type-0 = <2>;
5959
};
6060
6161
...

‎Documentation/devicetree/bindings/sound/neofidelity,ntp8835.yaml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/neofidelity,ntp8835.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NeoFidelity NTP8835/NTP8835C Amplifiers
8+
9+
maintainers:
10+
- Igor Prusov <ivprusov@salutedevices.com>
11+
12+
description: |
13+
The NTP8835 is a single chip full digital audio amplifier
14+
including power stages for stereo amplifier systems.
15+
NTP8835 is integrated with versatile digital audio signal
16+
processing functions, high-performance, high-fidelity fully
17+
digital PWM modulator and two high-power full-bridge MOSFET
18+
power stages. NTP8835C has identical programming interface,
19+
but has different output signal characteristics.
20+
21+
allOf:
22+
- $ref: dai-common.yaml#
23+
24+
properties:
25+
compatible:
26+
enum:
27+
- neofidelity,ntp8835
28+
- neofidelity,ntp8835c
29+
30+
reg:
31+
enum:
32+
- 0x2a
33+
- 0x2b
34+
- 0x2c
35+
- 0x2d
36+
37+
reset-gpios:
38+
maxItems: 1
39+
40+
'#sound-dai-cells':
41+
const: 0
42+
43+
clocks:
44+
maxItems: 4
45+
46+
clock-names:
47+
items:
48+
- const: wck
49+
- const: bck
50+
- const: scl
51+
- const: mclk
52+
53+
required:
54+
- compatible
55+
- reg
56+
57+
unevaluatedProperties: false
58+
59+
examples:
60+
- |
61+
#include <dt-bindings/gpio/gpio.h>
62+
i2c {
63+
#address-cells = <1>;
64+
#size-cells = <0>;
65+
audio-codec@2b {
66+
compatible = "neofidelity,ntp8835";
67+
#sound-dai-cells = <0>;
68+
reg = <0x2b>;
69+
reset-gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
70+
clocks = <&clkc 551>, <&clkc 552>, <&clkc 553>, <&clkc 554>;
71+
clock-names = "wck", "bck", "scl", "mclk";
72+
};
73+
};

‎Documentation/devicetree/bindings/sound/neofidelity,ntp8918.yaml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/neofidelity,ntp8918.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NeoFidelity NTP8918 Amplifier
8+
9+
maintainers:
10+
- Igor Prusov <ivprusov@salutedevices.com>
11+
12+
description:
13+
The NTP8918 is a single chip full digital audio amplifier
14+
including power stage for stereo amplifier system.
15+
The NTP8918 is integrated with versatile digital audio signal
16+
processing functions, high-performance, high-fidelity fully
17+
digital PWM modulator and two high-power full-bridge MOSFET
18+
power stages.
19+
20+
allOf:
21+
- $ref: dai-common.yaml#
22+
23+
properties:
24+
compatible:
25+
enum:
26+
- neofidelity,ntp8918
27+
28+
reg:
29+
enum:
30+
- 0x2a
31+
- 0x2b
32+
- 0x2c
33+
- 0x2d
34+
35+
reset-gpios:
36+
maxItems: 1
37+
38+
'#sound-dai-cells':
39+
const: 0
40+
41+
clocks:
42+
maxItems: 3
43+
44+
clock-names:
45+
items:
46+
- const: wck
47+
- const: scl
48+
- const: bck
49+
50+
required:
51+
- compatible
52+
- reg
53+
54+
unevaluatedProperties: false
55+
56+
examples:
57+
- |
58+
#include <dt-bindings/gpio/gpio.h>
59+
i2c {
60+
#address-cells = <1>;
61+
#size-cells = <0>;
62+
audio-codec@2a {
63+
compatible = "neofidelity,ntp8918";
64+
#sound-dai-cells = <0>;
65+
reg = <0x2a>;
66+
clocks = <&clkc 150>, <&clkc 151>, <&clkc 152>;
67+
clock-names = "wck", "scl", "bck";
68+
reset-gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
69+
};
70+
};

‎Documentation/devicetree/bindings/sound/nxp,uda1342.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/nxp,uda1342.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP uda1342 audio CODECs
8+
9+
maintainers:
10+
- Binbin Zhou <zhoubinbin@loongson.cn>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: nxp,uda1342
18+
19+
reg:
20+
maxItems: 1
21+
22+
'#sound-dai-cells':
23+
const: 0
24+
25+
required:
26+
- compatible
27+
- reg
28+
- '#sound-dai-cells'
29+
30+
unevaluatedProperties: false
31+
32+
examples:
33+
- |
34+
i2c {
35+
#address-cells = <1>;
36+
#size-cells = <0>;
37+
codec@1a {
38+
compatible = "nxp,uda1342";
39+
reg = <0x1a>;
40+
#sound-dai-cells = <0>;
41+
};
42+
};

0 commit comments

Comments
 (0)