Skip to content

Commit ec7f152

Browse files
authored
Merge pull request #4004 from plbossart/merge/sound-upstream-20221110
Merge/sound upstream 20221110
2 parents 592a3f2 + 7890fb2 commit ec7f152

65 files changed

Lines changed: 937 additions & 751 deletions

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/fsl,micfil.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
enum:
1919
- fsl,imx8mm-micfil
2020
- fsl,imx8mp-micfil
21+
- fsl,imx93-micfil
2122

2223
reg:
2324
maxItems: 1

‎Documentation/devicetree/bindings/sound/ingenic,aic.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@ properties:
3737
items:
3838
- description: AIC clock
3939
- description: I2S clock
40-
- description: EXT clock
41-
- description: PLL/2 clock
4240

4341
clock-names:
4442
items:
4543
- const: aic
4644
- const: i2s
47-
- const: ext
48-
- const: pll half
4945

5046
dmas:
5147
items:
@@ -82,10 +78,8 @@ examples:
8278
interrupts = <18>;
8379
8480
clocks = <&cgu JZ4740_CLK_AIC>,
85-
<&cgu JZ4740_CLK_I2S>,
86-
<&cgu JZ4740_CLK_EXT>,
87-
<&cgu JZ4740_CLK_PLL_HALF>;
88-
clock-names = "aic", "i2s", "ext", "pll half";
81+
<&cgu JZ4740_CLK_I2S>;
82+
clock-names = "aic", "i2s";
8983
9084
dmas = <&dmac 25 0xffffffff>, <&dmac 24 0xffffffff>;
9185
dma-names = "rx", "tx";

‎Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ properties:
2121
$ref: "/schemas/types.yaml#/definitions/phandle"
2222
description: The phandle of MT8186 ASoC platform.
2323

24+
dmic-gpios:
25+
maxItems: 1
26+
description:
27+
dmic-gpios optional prop for switching between two DMICs.
28+
Ex, the GPIO can control a MUX HW component to select
29+
dmic clk and data form a Front or Rear dmic.
30+
2431
headset-codec:
2532
type: object
2633
additionalProperties: false
@@ -63,14 +70,19 @@ required:
6370

6471
examples:
6572
- |
73+
#include <dt-bindings/gpio/gpio.h>
6674
6775
sound: mt8186-sound {
6876
compatible = "mediatek,mt8186-mt6366-rt1019-rt5682s-sound";
6977
mediatek,platform = <&afe>;
7078
pinctrl-names = "aud_clk_mosi_off",
71-
"aud_clk_mosi_on";
79+
"aud_clk_mosi_on",
80+
"aud_gpio_dmic_sec";
7281
pinctrl-0 = <&aud_clk_mosi_off>;
7382
pinctrl-1 = <&aud_clk_mosi_on>;
83+
pinctrl-2 = <&aud_gpio_dmic_sec>;
84+
85+
dmic-gpios = <&pio 23 GPIO_ACTIVE_HIGH>;
7486
7587
headset-codec {
7688
sound-dai = <&rt5682s>;

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,29 @@ properties:
9090
"#sound-dai-cells":
9191
const: 1
9292

93+
AVDD-supply:
94+
description: Regulator supplying analog power through the AVDD pin.
95+
96+
MICVDD-supply:
97+
description: Regulator supplying power for the microphone bias through the
98+
MICVDD pin.
99+
100+
DBVDD-supply:
101+
description: Regulator supplying I/O power through the DBVDD pin.
102+
103+
LDO1-IN-supply:
104+
description: Regulator supplying power to the digital core and charge pump
105+
through the LDO1_IN pin.
106+
93107
additionalProperties: false
94108

95109
required:
96110
- compatible
97111
- reg
112+
- AVDD-supply
113+
- MICVDD-supply
114+
- DBVDD-supply
115+
- LDO1-IN-supply
98116

99117
examples:
100118
- |
@@ -120,5 +138,10 @@ examples:
120138
121139
clocks = <&osc>;
122140
clock-names = "mclk";
141+
142+
AVDD-supply = <&avdd_reg>;
143+
MICVDD-supply = <&micvdd_reg>;
144+
DBVDD-supply = <&dbvdd_reg>;
145+
LDO1-IN-supply = <&ldo1_in_reg>;
123146
};
124147
};

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,21 @@ Required properties:
88

99
- reg : The I2C address of the device.
1010

11+
- AVDD-supply: phandle to the regulator supplying analog power through the
12+
AVDD pin
13+
14+
- MICVDD-supply: phandle to the regulator supplying power for the microphone
15+
bias through the MICVDD pin. Either MICVDD or VBAT should be present.
16+
17+
- VBAT-supply: phandle to the regulator supplying battery power through the
18+
VBAT pin. Either MICVDD or VBAT should be present.
19+
20+
- DBVDD-supply: phandle to the regulator supplying I/O power through the DBVDD
21+
pin.
22+
23+
- LDO1-IN-supply: phandle to the regulator supplying power to the digital core
24+
and charge pump through the LDO1_IN pin.
25+
1126
Optional properties:
1227

1328
- interrupts : The CODEC's interrupt output.
@@ -75,4 +90,9 @@ rt5682 {
7590

7691
clocks = <&osc>;
7792
clock-names = "mclk";
93+
94+
AVDD-supply = <&avdd_reg>;
95+
MICVDD-supply = <&micvdd_reg>;
96+
DBVDD-supply = <&dbvdd_reg>;
97+
LDO1-IN-supply = <&ldo1_in_reg>;
7898
};

‎Documentation/devicetree/bindings/soundwire/qcom,sdw.txt‎

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

0 commit comments

Comments
 (0)