Skip to content

Commit 66957f5

Browse files
plbossartplbossart
authored
Merge pull request #2218 from bardliao/merge/sound-upstream-20200619
Merge/sound upstream 20200619
2 parents c7b50d2 + 345fc1f commit 66957f5

Some content is hidden

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

52 files changed

+2746
-738
lines changed

‎Documentation/devicetree/bindings/sound/fsl,spdif.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ a fibre cable.
66

77
Required properties:
88

9-
- compatible : Compatible list, must contain "fsl,imx35-spdif".
9+
- compatible : Compatible list, should contain one of the following
10+
compatibles:
11+
"fsl,imx35-spdif",
12+
"fsl,vf610-spdif",
13+
"fsl,imx6sx-spdif",
1014

1115
- reg : Offset and length of the register set for the device.
1216

‎Documentation/devicetree/bindings/sound/fsl-asoc-card.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ The compatible list for this generic sound card currently:
3434

3535
"fsl,imx-audio-wm8960"
3636

37+
"fsl,imx-audio-mqs"
38+
3739
Required properties:
3840

3941
- compatible : Contains one of entries in the compatible list.
@@ -44,6 +46,11 @@ Required properties:
4446

4547
- audio-codec : The phandle of an audio codec
4648

49+
Optional properties:
50+
51+
- audio-asrc : The phandle of ASRC. It can be absent if there's no
52+
need to add ASRC support via DPCM.
53+
4754
- audio-routing : A list of the connections between audio components.
4855
Each entry is a pair of strings, the first being the
4956
connection's sink, the second being the connection's
@@ -60,11 +67,6 @@ Required properties:
6067
coexisting in order to support the old bindings
6168
of wm8962 and sgtl5000.
6269

63-
Optional properties:
64-
65-
- audio-asrc : The phandle of ASRC. It can be absent if there's no
66-
need to add ASRC support via DPCM.
67-
6870
Optional unless SSI is selected as a CPU DAI:
6971

7072
- mux-int-port : The internal port of the i.MX audio muxer (AUDMUX)

‎Documentation/devicetree/bindings/sound/intel,keembay-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 OR BSD-2-Clause)
2+
# Copyright 2020 Intel Corporation
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/sound/intel,keembay-i2s.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Intel KeemBay I2S Device Tree Bindings
9+
10+
maintainers:
11+
- Sia, Jee Heng <jee.heng.sia@intel.com>
12+
13+
description: |
14+
Intel KeemBay I2S
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- intel,keembay-i2s
20+
21+
"#sound-dai-cells":
22+
const: 0
23+
24+
reg:
25+
items:
26+
- description: I2S configuration
27+
28+
reg-names:
29+
items:
30+
- const: i2s-regs
31+
- const: i2s_gen_cfg
32+
33+
interrupts:
34+
maxItems: 1
35+
36+
clocks:
37+
items:
38+
- description: Bus Clock
39+
- description: Module Clock
40+
41+
clock-names:
42+
items:
43+
- const: osc
44+
- const: apb_clk
45+
46+
required:
47+
- compatible
48+
- "#sound-dai-cells"
49+
- reg
50+
- clocks
51+
- clock-names
52+
- interrupts
53+
54+
examples:
55+
- |
56+
#include <dt-bindings/interrupt-controller/arm-gic.h>
57+
#include <dt-bindings/interrupt-controller/irq.h>
58+
#define KEEM_BAY_PSS_AUX_I2S3
59+
#define KEEM_BAY_PSS_I2S3
60+
i2s3: i2s@20140000 {
61+
compatible = "intel,keembay-i2s";
62+
#sound-dai-cells = <0>;
63+
reg = <0x20140000 0x200 0x202a00a4 0x4>;
64+
reg-names = "i2s-regs", "i2s_gen_cfg";
65+
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
66+
clock-names = "osc", "apb_clk";
67+
clocks = <&scmi_clk KEEM_BAY_PSS_AUX_I2S3>, <&scmi_clk KEEM_BAY_PSS_I2S3>;
68+
};

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
Maxim MAX98357A audio DAC
1+
Maxim MAX98357A/MAX98360A audio DAC
22

3-
This node models the Maxim MAX98357A DAC.
3+
This node models the Maxim MAX98357A/MAX98360A DAC.
44

55
Required properties:
6-
- compatible : "maxim,max98357a"
6+
- compatible : "maxim,max98357a" for MAX98357A.
7+
"maxim,max98360a" for MAX98360A.
78

89
Optional properties:
910
- sdmode-gpios : GPIO specifier for the chip's SD_MODE pin.
@@ -20,3 +21,8 @@ max98357a {
2021
compatible = "maxim,max98357a";
2122
sdmode-gpios = <&qcom_pinmux 25 0>;
2223
};
24+
25+
max98360a {
26+
compatible = "maxim,max98360a";
27+
sdmode-gpios = <&qcom_pinmux 25 0>;
28+
};

‎Documentation/devicetree/bindings/sound/maxim,max98390.yaml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/maxim,max98390.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Maxim Integrated MAX98390 Speaker Amplifier with Integrated Dynamic Speaker Management
8+
9+
maintainers:
10+
- Steve Lee <steves.lee@maximintegrated.com>
11+
12+
properties:
13+
compatible:
14+
const: maxim,max98390
15+
16+
reg:
17+
maxItems: 1
18+
description: I2C address of the device.
19+
20+
maxim,temperature_calib:
21+
allOf:
22+
- $ref: /schemas/types.yaml#/definitions/uint32
23+
description: The calculated temperature data was measured while doing the calibration.
24+
minimum: 0
25+
maximum: 65535
26+
27+
maxim,r0_calib:
28+
allOf:
29+
- $ref: /schemas/types.yaml#/definitions/uint32
30+
description: This is r0 calibration data which was measured in factory mode.
31+
minimum: 1
32+
maximum: 8388607
33+
34+
required:
35+
- compatible
36+
- reg
37+
38+
additionalProperties: false
39+
40+
examples:
41+
- |
42+
i2c {
43+
#address-cells = <1>;
44+
#size-cells = <0>;
45+
max98390: amplifier@38 {
46+
compatible = "maxim,max98390";
47+
reg = <0x38>;
48+
maxim,temperature_calib = <1024>;
49+
maxim,r0_calib = <100232>;
50+
};
51+
};

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@ Required properties:
1010
- compatible : "mediatek,mt6358-sound".
1111
- Avdd-supply : power source of AVDD
1212

13+
Optional properties:
14+
- mediatek,dmic-mode : Indicates how many data pins are used to transmit two
15+
channels of PDM signal. 0 means two wires, 1 means one wire. Default
16+
value is 0.
17+
1318
Example:
1419

1520
mt6358_snd {
1621
compatible = "mediatek,mt6358-sound";
1722
Avdd-supply = <&mt6358_vaud28_reg>;
23+
mediatek,dmic-mode = <0>;
1824
};

‎Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/samsung,aries-wm8994.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Samsung Aries audio complex with WM8994 codec
8+
9+
maintainers:
10+
- Jonathan Bakker <xc-racer2@live.ca>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- const: samsung,aries-wm8994
16+
description: With FM radio and modem master
17+
18+
- const: samsung,fascinate4g-wm8994
19+
description: Without FM radio and modem slave
20+
21+
model:
22+
$ref: /schemas/types.yaml#/definitions/string
23+
description: The user-visible name of this sound complex.
24+
25+
cpu:
26+
type: object
27+
properties:
28+
sound-dai:
29+
minItems: 2
30+
maxItems: 2
31+
$ref: /schemas/types.yaml#/definitions/phandle-array
32+
description: |
33+
phandles to the I2S controller and bluetooth codec,
34+
in that order
35+
36+
codec:
37+
type: object
38+
properties:
39+
sound-dai:
40+
$ref: /schemas/types.yaml#/definitions/phandle-array
41+
description: phandle to the WM8994 CODEC
42+
43+
samsung,audio-routing:
44+
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
45+
description: |
46+
List of the connections between audio
47+
components; each entry is a pair of strings, the first being the
48+
connection's sink, the second being the connection's source;
49+
valid names for sources and sinks are the WM8994's pins (as
50+
documented in its binding), and the jacks on the board -
51+
For samsung,aries-wm8994: HP, SPK, RCV, LINE, Main Mic, Headset Mic,
52+
or FM In
53+
For samsung,fascinate4g-wm8994: HP, SPK, RCV, LINE, Main Mic,
54+
or HeadsetMic
55+
56+
extcon:
57+
description: Extcon phandle for dock detection
58+
59+
main-micbias-supply:
60+
description: Supply for the micbias on the main mic
61+
62+
headset-micbias-supply:
63+
description: Supply for the micbias on the headset mic
64+
65+
earpath-sel-gpios:
66+
description: GPIO for switching between tv-out and mic paths
67+
68+
headset-detect-gpios:
69+
description: GPIO for detection of headset insertion
70+
71+
headset-key-gpios:
72+
description: GPIO for detection of headset key press
73+
74+
io-channels:
75+
maxItems: 1
76+
description: IO channel to read micbias voltage for headset detection
77+
78+
io-channel-names:
79+
const: headset-detect
80+
81+
required:
82+
- compatible
83+
- model
84+
- cpu
85+
- codec
86+
- samsung,audio-routing
87+
- extcon
88+
- main-micbias-supply
89+
- headset-micbias-supply
90+
- earpath-sel-gpios
91+
- headset-detect-gpios
92+
- headset-key-gpios
93+
94+
additionalProperties: false
95+
96+
examples:
97+
- |
98+
#include <dt-bindings/gpio/gpio.h>
99+
100+
sound {
101+
compatible = "samsung,fascinate4g-wm8994";
102+
103+
model = "Fascinate4G";
104+
105+
extcon = <&fsa9480>;
106+
107+
main-micbias-supply = <&main_micbias_reg>;
108+
headset-micbias-supply = <&headset_micbias_reg>;
109+
110+
earpath-sel-gpios = <&gpj2 6 GPIO_ACTIVE_HIGH>;
111+
112+
io-channels = <&adc 3>;
113+
io-channel-names = "headset-detect";
114+
headset-detect-gpios = <&gph0 6 GPIO_ACTIVE_HIGH>;
115+
headset-key-gpios = <&gph3 6 GPIO_ACTIVE_HIGH>;
116+
117+
samsung,audio-routing =
118+
"HP", "HPOUT1L",
119+
"HP", "HPOUT1R",
120+
121+
"SPK", "SPKOUTLN",
122+
"SPK", "SPKOUTLP",
123+
124+
"RCV", "HPOUT2N",
125+
"RCV", "HPOUT2P",
126+
127+
"LINE", "LINEOUT2N",
128+
"LINE", "LINEOUT2P",
129+
130+
"IN1LP", "Main Mic",
131+
"IN1LN", "Main Mic",
132+
133+
"IN1RP", "Headset Mic",
134+
"IN1RN", "Headset Mic";
135+
136+
pinctrl-names = "default";
137+
pinctrl-0 = <&headset_det &earpath_sel>;
138+
139+
cpu {
140+
sound-dai = <&i2s0>, <&bt_codec>;
141+
};
142+
143+
codec {
144+
sound-dai = <&wm8994>;
145+
};
146+
};
147+

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ Optional properties:
2121
enabled and disabled together with HP_L and HP_R pins in response to jack
2222
detect events.
2323

24+
- wlf,hp-cfg: A list of headphone jack detect configuration register values.
25+
The list must be 3 entries long.
26+
hp-cfg[0]: HPSEL[1:0] of R48 (Additional Control 4).
27+
hp-cfg[1]: {HPSWEN:HPSWPOL} of R24 (Additional Control 2).
28+
hp-cfg[2]: {TOCLKSEL:TOEN} of R23 (Additional Control 1).
29+
30+
- wlf,gpio-cfg: A list of GPIO configuration register values.
31+
The list must be 2 entries long.
32+
gpio-cfg[0]: ALRCGPIO of R9 (Audio interface)
33+
gpio-cfg[1]: {GPIOPOL:GPIOSEL[2:0]} of R48 (Additional Control 4).
34+
2435
Example:
2536

2637
wm8960: codec@1a {

0 commit comments

Comments
 (0)