Skip to content

Commit 8aa902d

Browse files
brooniebroonie
committed
Merge remote-tracking branch 'asoc/for-7.1' into asoc-next
2 parents 30c64fb + 00da2ed commit 8aa902d

119 files changed

Lines changed: 4261 additions & 1240 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/awinic,aw88395.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ properties:
3535

3636
dvdd-supply: true
3737

38+
firmware-name:
39+
maxItems: 1
40+
description: Name of the *_acf.bin file used for amplifier initialization
41+
3842
awinic,audio-channel:
3943
description:
4044
It is used to distinguish multiple PA devices, so that different

‎Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ description: |
1616
DAC for headphone output, two integrated Class D amplifiers for
1717
loudspeakers, and two ADCs for wired headset microphone input or
1818
stereo line input. PDM inputs are provided for digital microphones.
19+
CS42L43B variant adds dedicated PDM interface, SoundWire Clock Gearing
20+
support and more decimators to ISRCs.
1921
2022
allOf:
2123
- $ref: dai-common.yaml#
@@ -24,6 +26,7 @@ properties:
2426
compatible:
2527
enum:
2628
- cirrus,cs42l43
29+
- cirrus,cs42l43b
2730

2831
reg:
2932
maxItems: 1

‎Documentation/devicetree/bindings/sound/nvidia,tegra-audio-cpcap.yaml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/nvidia,tegra-audio-cpcap.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NVIDIA Tegra audio complex with CPCAP CODEC
8+
9+
maintainers:
10+
- Svyatoslav Ryhel <clamor95@gmail.com>
11+
12+
allOf:
13+
- $ref: nvidia,tegra-audio-common.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- pattern: '^motorola,tegra-audio-cpcap(-[a-z0-9]+)+$'
19+
- const: nvidia,tegra-audio-cpcap
20+
21+
nvidia,audio-routing:
22+
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
23+
description:
24+
A list of the connections between audio components. Each entry is a
25+
pair of strings, the first being the connection's sink, the second
26+
being the connection's source. Valid names for sources and sinks are
27+
the pins (documented in the binding document), and the jacks on the
28+
board.
29+
minItems: 2
30+
items:
31+
enum:
32+
# Board Connectors
33+
- Speakers
34+
- Int Spk
35+
- Earpiece
36+
- Int Mic
37+
- Headset Mic
38+
- Internal Mic 1
39+
- Internal Mic 2
40+
- Headphone
41+
- Headphones
42+
- Headphone Jack
43+
- Mic Jack
44+
45+
# CODEC Pins
46+
- MICR
47+
- HSMIC
48+
- EMUMIC
49+
- MICL
50+
- EXTR
51+
- EXTL
52+
- EP
53+
- SPKR
54+
- SPKL
55+
- LINER
56+
- LINEL
57+
- HSR
58+
- HSL
59+
- EMUR
60+
- EMUL
61+
62+
unevaluatedProperties: false
63+
64+
examples:
65+
- |
66+
#include <dt-bindings/clock/tegra20-car.h>
67+
#include <dt-bindings/soc/tegra-pmc.h>
68+
sound {
69+
compatible = "motorola,tegra-audio-cpcap-olympus",
70+
"nvidia,tegra-audio-cpcap";
71+
nvidia,model = "Motorola Atrix 4G (MB860) CPCAP";
72+
73+
nvidia,audio-routing =
74+
"Headphones", "HSR",
75+
"Headphones", "HSL",
76+
"Int Spk", "SPKR",
77+
"Int Spk", "SPKL",
78+
"Earpiece", "EP",
79+
"HSMIC", "Mic Jack",
80+
"MICR", "Internal Mic 1",
81+
"MICL", "Internal Mic 2";
82+
83+
nvidia,i2s-controller = <&tegra_i2s1>;
84+
nvidia,audio-codec = <&cpcap_audio>;
85+
86+
clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
87+
<&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
88+
<&tegra_car TEGRA20_CLK_CDEV1>;
89+
clock-names = "pll_a", "pll_a_out0", "mclk";
90+
};

‎Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max9808x.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,15 @@ properties:
3535
items:
3636
enum:
3737
# Board Connectors
38+
- Speakers
3839
- Int Spk
40+
- Headphone
41+
- Headphones
3942
- Headphone Jack
4043
- Earpiece
4144
- Headset Mic
45+
- Mic Jack
46+
- Int Mic
4247
- Internal Mic 1
4348
- Internal Mic 2
4449

‎Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8962.yaml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/nvidia,tegra-audio-wm8962.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NVIDIA Tegra audio complex with WM8962 CODEC
8+
9+
maintainers:
10+
- Svyatoslav Ryhel <clamor95@gmail.com>
11+
12+
allOf:
13+
- $ref: nvidia,tegra-audio-common.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- pattern: '^[a-z0-9]+,tegra-audio-wm8962(-[a-z0-9]+)+$'
19+
- const: nvidia,tegra-audio-wm8962
20+
21+
nvidia,audio-routing:
22+
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
23+
description:
24+
A list of the connections between audio components. Each entry is a
25+
pair of strings, the first being the connection's sink, the second
26+
being the connection's source. Valid names for sources and sinks are
27+
the pins (documented in the binding document), and the jacks on the
28+
board.
29+
minItems: 2
30+
items:
31+
enum:
32+
# Board Connectors
33+
- Speakers
34+
- Int Spk
35+
- Earpiece
36+
- Int Mic
37+
- Headset Mic
38+
- Internal Mic 1
39+
- Internal Mic 2
40+
- Headphone
41+
- Headphones
42+
- Headphone Jack
43+
- Mic Jack
44+
45+
# CODEC Pins
46+
- IN1L
47+
- IN1R
48+
- IN2L
49+
- IN2R
50+
- IN3L
51+
- IN3R
52+
- IN4L
53+
- IN4R
54+
- DMICDAT
55+
- HPOUTL
56+
- HPOUTR
57+
- SPKOUT
58+
- SPKOUTL
59+
- SPKOUTR
60+
61+
required:
62+
- nvidia,i2s-controller
63+
64+
unevaluatedProperties: false
65+
66+
examples:
67+
- |
68+
#include <dt-bindings/clock/tegra30-car.h>
69+
#include <dt-bindings/soc/tegra-pmc.h>
70+
sound {
71+
compatible = "microsoft,tegra-audio-wm8962-surface-rt",
72+
"nvidia,tegra-audio-wm8962";
73+
nvidia,model = "Microsoft Surface RT WM8962";
74+
75+
nvidia,audio-routing =
76+
"Headphone Jack", "HPOUTR",
77+
"Headphone Jack", "HPOUTL",
78+
"Int Spk", "SPKOUTR",
79+
"Int Spk", "SPKOUTL";
80+
81+
nvidia,i2s-controller = <&tegra_i2s1>;
82+
nvidia,audio-codec = <&wm8962>;
83+
84+
clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
85+
<&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
86+
<&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
87+
clock-names = "pll_a", "pll_a_out0", "mclk";
88+
};

‎Documentation/devicetree/bindings/sound/ti,tas2770.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ properties:
3030
description: |
3131
I2C address of the device can be between 0x41 to 0x48.
3232
33-
reset-gpio:
33+
reset-gpios:
3434
maxItems: 1
3535
description: GPIO used to reset the device.
3636

@@ -82,7 +82,7 @@ examples:
8282
#sound-dai-cells = <0>;
8383
interrupt-parent = <&gpio1>;
8484
interrupts = <14>;
85-
reset-gpio = <&gpio1 15 GPIO_ACTIVE_HIGH>;
85+
reset-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
8686
shutdown-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
8787
ti,imon-slot-no = <0>;
8888
ti,vmon-slot-no = <2>;

0 commit comments

Comments
 (0)