Skip to content

Commit f03669d

Browse files
brooniebroonie
committed
Merge remote-tracking branch 'asoc/for-6.14' into asoc-next
2 parents 32c9c06 + 69dcf02 commit f03669d

110 files changed

Lines changed: 20716 additions & 734 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/allwinner,sun4i-a10-codec.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ properties:
2323
- allwinner,sun8i-h3-codec
2424
- allwinner,sun8i-v3s-codec
2525
- allwinner,sun50i-h616-codec
26+
- allwinner,suniv-f1c100s-codec
2627

2728
reg:
2829
maxItems: 1
@@ -77,6 +78,7 @@ properties:
7778
- MIC1
7879
- MIC2
7980
- MIC3
81+
- MIC
8082

8183
# Microphone Biases from the SoC
8284
- HBIAS
@@ -87,6 +89,8 @@ properties:
8789
- Headset Mic
8890
- Line In
8991
- Line Out
92+
- Right FM In
93+
- Left FM In
9094
- Mic
9195
- Speaker
9296

@@ -270,6 +274,33 @@ allOf:
270274
- const: rx
271275
- const: tx
272276

277+
- if:
278+
properties:
279+
compatible:
280+
enum:
281+
- allwinner,suniv-f1c100s-codec
282+
283+
then:
284+
properties:
285+
allwinner,audio-routing:
286+
items:
287+
enum:
288+
- HP
289+
- HPCOM
290+
- LINEIN
291+
- LINEOUT
292+
- MIC
293+
- HBIAS
294+
- MBIAS
295+
- Headphone
296+
- Headset Mic
297+
- Line In
298+
- Line Out
299+
- Right FM In
300+
- Left FM In
301+
- Mic
302+
- Speaker
303+
273304
unevaluatedProperties: false
274305

275306
examples:

‎Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- mediatek,mt8188-es8326
19-
- mediatek,mt8188-mt6359-evb
20-
- mediatek,mt8188-nau8825
21-
- mediatek,mt8188-rt5682s
17+
oneOf:
18+
- enum:
19+
- mediatek,mt8188-es8326
20+
- mediatek,mt8188-mt6359-evb
21+
- mediatek,mt8188-nau8825
22+
- mediatek,mt8188-rt5682s
23+
- items:
24+
- const: mediatek,mt8390-mt6359-evk
25+
- const: mediatek,mt8188-mt6359-evb
2226

2327
audio-routing:
2428
description:
@@ -56,6 +60,8 @@ patternProperties:
5660
- ETDM2_OUT_BE
5761
- ETDM3_OUT_BE
5862
- PCM1_BE
63+
- DL_SRC_BE
64+
- UL_SRC_BE
5965

6066
codec:
6167
description: Holds subnode which indicates codec dai.

‎Documentation/devicetree/bindings/sound/realtek,rt5682.yaml‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/realtek,rt5682.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Realtek rt5682 and rt5682i codecs
8+
9+
maintainers:
10+
- Bard Liao <bardliao@realtek.com>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- realtek,rt5682
19+
- realtek,rt5682i
20+
21+
reg:
22+
maxItems: 1
23+
description: I2C address of the device.
24+
25+
interrupts:
26+
maxItems: 1
27+
description: The CODEC's interrupt output.
28+
29+
realtek,dmic1-data-pin:
30+
$ref: /schemas/types.yaml#/definitions/uint32
31+
enum:
32+
- 0 # dmic1 data is not used
33+
- 1 # using GPIO2 pin as dmic1 data pin
34+
- 2 # using GPIO5 pin as dmic1 data pin
35+
description:
36+
Specify which GPIO pin be used as DMIC1 data pin.
37+
38+
realtek,dmic1-clk-pin:
39+
$ref: /schemas/types.yaml#/definitions/uint32
40+
enum:
41+
- 0 # using GPIO1 pin as dmic1 clock pin
42+
- 1 # using GPIO3 pin as dmic1 clock pin
43+
description:
44+
Specify which GPIO pin be used as DMIC1 clk pin.
45+
46+
realtek,jd-src:
47+
$ref: /schemas/types.yaml#/definitions/uint32
48+
enum:
49+
- 0 # No JD is used
50+
- 1 # using JD1 as JD source
51+
description:
52+
Specify which JD source be used.
53+
54+
realtek,ldo1-en-gpios:
55+
description:
56+
The GPIO that controls the CODEC's LDO1_EN pin.
57+
58+
realtek,btndet-delay:
59+
$ref: /schemas/types.yaml#/definitions/uint32
60+
description:
61+
The debounce delay for push button.
62+
The delay time is realtek,btndet-delay value multiple of 8.192 ms.
63+
If absent, the default is 16.
64+
65+
realtek,dmic-clk-rate-hz:
66+
description:
67+
Set the clock rate (hz) for the requirement of the particular DMIC.
68+
69+
realtek,dmic-delay-ms:
70+
description:
71+
Set the delay time (ms) for the requirement of the particular DMIC.
72+
73+
realtek,dmic-clk-driving-high:
74+
type: boolean
75+
description:
76+
Set the high driving of the DMIC clock out.
77+
78+
clocks:
79+
items:
80+
- description: phandle and clock specifier for codec MCLK.
81+
82+
clock-names:
83+
items:
84+
- const: mclk
85+
86+
"#clock-cells":
87+
const: 1
88+
89+
clock-output-names:
90+
minItems: 2
91+
maxItems: 2
92+
description: Name given for DAI word clock and bit clock outputs.
93+
94+
"#sound-dai-cells":
95+
const: 1
96+
97+
AVDD-supply:
98+
description: Regulator supplying analog power through the AVDD pin.
99+
100+
MICVDD-supply:
101+
description: Regulator supplying power for the microphone bias through
102+
the MICVDD pin.
103+
104+
VBAT-supply:
105+
description: Regulator supplying battery power through the VBAT pin.
106+
107+
DBVDD-supply:
108+
description: Regulator supplying I/O power through the DBVDD pin.
109+
110+
LDO1-IN-supply:
111+
description: Regulator supplying power to the digital core and charge
112+
pump through the LDO1_IN pin.
113+
114+
required:
115+
- compatible
116+
- reg
117+
- AVDD-supply
118+
- VBAT-supply
119+
- MICVDD-supply
120+
- DBVDD-supply
121+
- LDO1-IN-supply
122+
123+
unevaluatedProperties: false
124+
125+
examples:
126+
- |
127+
#include <dt-bindings/gpio/gpio.h>
128+
#include <dt-bindings/interrupt-controller/irq.h>
129+
130+
i2c {
131+
#address-cells = <1>;
132+
#size-cells = <0>;
133+
134+
codec@1a {
135+
compatible = "realtek,rt5682";
136+
reg = <0x1a>;
137+
interrupts = <6 IRQ_TYPE_LEVEL_HIGH>;
138+
realtek,ldo1-en-gpios =
139+
<&gpio 2 GPIO_ACTIVE_HIGH>;
140+
realtek,dmic1-data-pin = <1>;
141+
realtek,dmic1-clk-pin = <1>;
142+
realtek,jd-src = <1>;
143+
144+
#clock-cells = <1>;
145+
clock-output-names = "rt5682-dai-wclk", "rt5682-dai-bclk";
146+
147+
clocks = <&osc>;
148+
clock-names = "mclk";
149+
150+
AVDD-supply = <&avdd_reg>;
151+
VBAT-supply = <&vbat_reg>;
152+
MICVDD-supply = <&micvdd_reg>;
153+
DBVDD-supply = <&dbvdd_reg>;
154+
LDO1-IN-supply = <&ldo1_in_reg>;
155+
};
156+
};

‎Documentation/devicetree/bindings/sound/renesas,rz-ssi.yaml‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
- renesas,r9a07g043-ssi # RZ/G2UL and RZ/Five
2020
- renesas,r9a07g044-ssi # RZ/G2{L,LC}
2121
- renesas,r9a07g054-ssi # RZ/V2L
22+
- renesas,r9a08g045-ssi # RZ/G3S
2223
- const: renesas,rz-ssi
2324

2425
reg:
@@ -57,24 +58,6 @@ properties:
5758
dmas:
5859
minItems: 1
5960
maxItems: 2
60-
description:
61-
The first cell represents a phandle to dmac.
62-
The second cell specifies the encoded MID/RID values of the SSI port
63-
connected to the DMA client and the slave channel configuration
64-
parameters.
65-
bits[0:9] - Specifies MID/RID value of a SSI channel as below
66-
MID/RID value of SSI rx0 = 0x256
67-
MID/RID value of SSI tx0 = 0x255
68-
MID/RID value of SSI rx1 = 0x25a
69-
MID/RID value of SSI tx1 = 0x259
70-
MID/RID value of SSI rt2 = 0x25f
71-
MID/RID value of SSI rx3 = 0x262
72-
MID/RID value of SSI tx3 = 0x261
73-
bit[10] - HIEN = 1, Detects a request in response to the rising edge
74-
of the signal
75-
bit[11] - LVL = 0, Detects based on the edge
76-
bits[12:14] - AM = 2, Bus cycle mode
77-
bit[15] - TM = 0, Single transfer mode
7861

7962
dma-names:
8063
oneOf:

‎Documentation/devicetree/bindings/sound/rt5682.txt‎

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

‎MAINTAINERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5501,8 +5501,8 @@ L: patches@opensource.cirrus.com
55015501
S: Supported
55025502
W: https://github.com/CirrusLogic/linux-drivers/wiki
55035503
T: git https://github.com/CirrusLogic/linux-drivers.git
5504-
F: drivers/firmware/cirrus/*
5505-
F: include/linux/firmware/cirrus/*
5504+
F: drivers/firmware/cirrus/
5505+
F: include/linux/firmware/cirrus/
55065506

55075507
CIRRUS LOGIC EP93XX ETHERNET DRIVER
55085508
M: Hartley Sweeten <hsweeten@visionengravers.com>

0 commit comments

Comments
 (0)