Skip to content

Commit 9532350

Browse files
author
CKI KWF Bot
committed
Merge: ALSA - update drivers for 9.8 - upstream 6.16
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7342 JIRA: https://issues.redhat.com/browse/RHEL-112755 This upstream patchset updates the ALSA driver code: - ALSA core - ALSA HDA - ALSA USB - ALSA PCI - ALSA SoC (mainly SOF including SoundWire drivers) - Soundwire bus The other components are touched to get things in sync with the current upstream: Some touched drivers are for hardware platforms which are not used in RHEL. The purpose to merge those upstream commits is to keep the future code sync more easy. Module snd-hda-cs-dsp-ctls.ko was merged into another module and then removed by upstream commit bdd9ea9 ("ALSA: hda/hda_cs_dsp_ctl: Delete hda_cs_dsp_ctl module"). Omitted-fix: 44499ec # will be included in 6.17 ALSA code backport Omitted-fix: b0035df # will be included in 6.17 ALSA code backport Omitted-fix: 71d2893 # will be included in 6.17 ALSA code backport Omitted-fix: ba0c67d # will be included in 6.17 ALSA code backport Signed-off-by: Jaroslav Kysela <jkysela@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Rafael Aquini <raquini@redhat.com> Approved-by: Eric Chanudet <echanude@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 5689bd3 + efe3dcf commit 9532350

File tree

388 files changed

+20909
-7213
lines changed

Some content is hidden

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

388 files changed

+20909
-7213
lines changed

Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- const: nvidia,tegra210-aconnect
2222
- items:
2323
- enum:
24+
- nvidia,tegra264-aconnect
2425
- nvidia,tegra234-aconnect
2526
- nvidia,tegra186-aconnect
2627
- nvidia,tegra194-aconnect

Documentation/devicetree/bindings/display/tegra/nvidia,tegra114-mipi.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ properties:
1717
compatible:
1818
enum:
1919
- nvidia,tegra114-mipi
20+
- nvidia,tegra124-mipi
2021
- nvidia,tegra210-mipi
2122
- nvidia,tegra186-mipi
2223

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/cirrus,cs48l32.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Cirrus Logic CS48L32 audio DSP.
8+
9+
maintainers:
10+
- patches@opensource.cirrus.com
11+
12+
description: |
13+
The CS48L32 is a high-performance low-power audio DSP for smartphones and
14+
other portable audio devices. The CS48L32 combines a programmable Halo Core
15+
DSP with a variety of power-efficient fixed-function audio processors.
16+
17+
See also the binding headers:
18+
19+
include/dt-bindings/sound/cs48l32.yaml
20+
21+
allOf:
22+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
23+
- $ref: dai-common.yaml#
24+
25+
properties:
26+
compatible:
27+
enum:
28+
- cirrus,cs48l32
29+
30+
reg:
31+
description: SPI chip-select number.
32+
maxItems: 1
33+
34+
spi-max-frequency:
35+
maximum: 25000000
36+
37+
vdd-a-supply:
38+
description: Regulator supplying VDD_A
39+
40+
vdd-d-supply:
41+
description: Regulator supplying VDD_D
42+
43+
vdd-io-supply:
44+
description: Regulator supplying VDD_IO
45+
46+
vdd-cp-supply:
47+
description: Regulator supplying VDD_CP
48+
49+
reset-gpios:
50+
description:
51+
One entry specifying the GPIO controlling /RESET. Although optional,
52+
it is strongly recommended to use a hardware reset.
53+
maxItems: 1
54+
55+
interrupts:
56+
maxItems: 1
57+
58+
clocks:
59+
items:
60+
- description: The clock supplied on MCLK1
61+
62+
clock-names:
63+
const: mclk1
64+
65+
'#sound-dai-cells':
66+
const: 1
67+
68+
cirrus,in-type:
69+
description: |
70+
A list of input type settings for each ADC input.
71+
Inputs are one of these types:
72+
CS48L32_IN_TYPE_DIFF : analog differential (default)
73+
CS48L32_IN_TYPE_SE : analog single-ended
74+
75+
The type of the left (L) and right (R) channel on each input is
76+
independently configured, as are the two groups of pins muxable to
77+
the input (referred to in the datasheet as "1" and "2").
78+
79+
$ref: /schemas/types.yaml#/definitions/uint32-array
80+
items:
81+
- description:
82+
IN1L_1 analog input type. One of the CS48L32_IN_TYPE_xxx.
83+
minimum: 0
84+
maximum: 1
85+
default: 0
86+
- description:
87+
IN1R_1 analog input type. One of the CS48L32_IN_TYPE_xxx.
88+
minimum: 0
89+
maximum: 1
90+
default: 0
91+
- description:
92+
IN1L_2 analog input type. One of the CS48L32_IN_TYPE_xxx.
93+
minimum: 0
94+
maximum: 1
95+
default: 0
96+
- description:
97+
IN1R_2 analog input type. One of the CS48L32_IN_TYPE_xxx.
98+
minimum: 0
99+
maximum: 1
100+
default: 0
101+
102+
cirrus,pdm-sup:
103+
description: |
104+
Indicate which MICBIAS output supplies bias to the microphone.
105+
There is one cell per input (IN1, IN2, ...).
106+
107+
One of the CS48L32_MICBIAS_xxx values.
108+
CS48L32_PDM_SUP_VOUT_MIC : mic biased from VOUT_MIC
109+
CS48L32_PDM_SUP_MICBIAS1 : mic biased from MICBIAS1
110+
111+
Also see the INn_PDM_SUP field in the datasheet.
112+
$ref: /schemas/types.yaml#/definitions/uint32-array
113+
items:
114+
- description: IN1 PDM supply source
115+
minimum: 0
116+
maximum: 1
117+
default: 0
118+
- description: IN2 PDM supply source
119+
minimum: 0
120+
maximum: 1
121+
default: 0
122+
123+
required:
124+
- compatible
125+
- reg
126+
- vdd-a-supply
127+
- vdd-d-supply
128+
- vdd-io-supply
129+
- vdd-cp-supply
130+
131+
additionalProperties: false
132+
133+
examples:
134+
- |
135+
#include <dt-bindings/sound/cs48l32.h>
136+
137+
spi@e0006000 {
138+
#address-cells = <1>;
139+
#size-cells = <0>;
140+
reg = <0xe0006000 0x1000>;
141+
142+
codec@1 {
143+
compatible = "cirrus,cs48l32";
144+
145+
reg = <0x1>;
146+
spi-max-frequency = <2500000>;
147+
148+
vdd-a-supply = <&regulator_1v8>;
149+
vdd-d-supply = <&regulator_1v2>;
150+
vdd-io-supply = <&regulator_1v8>;
151+
vdd-cp-supply = <&regulator_1v8>;
152+
153+
reset-gpios = <&gpio 0 0>;
154+
155+
clocks = <&clks 0>;
156+
clock-names = "mclk1";
157+
158+
interrupt-parent = <&gpio0>;
159+
interrupts = <56 8>;
160+
161+
#sound-dai-cells = <1>;
162+
163+
cirrus,in-type = <
164+
CS48L32_IN_TYPE_DIFF CS48L32_IN_TYPE_DIFF
165+
CS48L32_IN_TYPE_SE CS48L32_IN_TYPE_SE
166+
>;
167+
168+
cirrus,pdm-sup = <
169+
CS48L32_PDM_SUP_MICBIAS1 CS48L32_PDM_SUP_MICBIAS1
170+
>;
171+
};
172+
};
173+
174+
#
175+
# Minimal config
176+
#
177+
- |
178+
#include <dt-bindings/sound/cs48l32.h>
179+
180+
spi@e0006000 {
181+
#address-cells = <1>;
182+
#size-cells = <0>;
183+
reg = <0xe0006000 0x1000>;
184+
185+
codec@1 {
186+
compatible = "cirrus,cs48l32";
187+
188+
reg = <0x1>;
189+
190+
vdd-a-supply = <&regulator_1v8>;
191+
vdd-d-supply = <&regulator_1v2>;
192+
vdd-io-supply = <&regulator_1v8>;
193+
vdd-cp-supply = <&regulator_1v8>;
194+
};
195+
};

Documentation/devicetree/bindings/sound/fsl,mqs.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ properties:
2828
- fsl,imx95-aonmix-mqs
2929
- fsl,imx95-netcmix-mqs
3030

31+
"#sound-dai-cells":
32+
const: 0
33+
3134
clocks:
3235
minItems: 1
3336
maxItems: 2
@@ -49,12 +52,17 @@ properties:
4952
resets:
5053
maxItems: 1
5154

55+
port:
56+
$ref: audio-graph-port.yaml#
57+
unevaluatedProperties: false
58+
5259
required:
5360
- compatible
5461
- clocks
5562
- clock-names
5663

5764
allOf:
65+
- $ref: dai-common.yaml#
5866
- if:
5967
properties:
6068
compatible:
@@ -86,7 +94,7 @@ allOf:
8694
required:
8795
- gpr
8896

89-
additionalProperties: false
97+
unevaluatedProperties: false
9098

9199
examples:
92100
- |

Documentation/devicetree/bindings/sound/maxim,max98925.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ additionalProperties: false
7777

7878
examples:
7979
- |
80+
#include <dt-bindings/gpio/gpio.h>
8081
i2c {
8182
#address-cells = <1>;
8283
#size-cells = <0>;
8384
84-
#include <dt-bindings/gpio/gpio.h>
8585
audio-codec@3a {
8686
compatible = "maxim,max98927";
8787
reg = <0x3a>;

Documentation/devicetree/bindings/sound/nvidia,tegra-audio-graph-card.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ properties:
2323
enum:
2424
- nvidia,tegra210-audio-graph-card
2525
- nvidia,tegra186-audio-graph-card
26+
- nvidia,tegra264-audio-graph-card
2627

2728
clocks:
2829
minItems: 2

Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ properties:
3131

3232
compatible:
3333
oneOf:
34-
- const: nvidia,tegra186-asrc
34+
- enum:
35+
- nvidia,tegra186-asrc
36+
- nvidia,tegra264-asrc
3537
- items:
3638
- enum:
3739
- nvidia,tegra234-asrc

Documentation/devicetree/bindings/sound/nvidia,tegra186-dspk.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ properties:
2929
- const: nvidia,tegra186-dspk
3030
- items:
3131
- enum:
32+
- nvidia,tegra264-dspk
3233
- nvidia,tegra234-dspk
3334
- nvidia,tegra194-dspk
3435
- const: nvidia,tegra186-dspk

Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- enum:
2727
- nvidia,tegra210-admaif
2828
- nvidia,tegra186-admaif
29+
- nvidia,tegra264-admaif
2930
- items:
3031
- enum:
3132
- nvidia,tegra234-admaif
@@ -39,6 +40,19 @@ properties:
3940

4041
dma-names: true
4142

43+
interconnects:
44+
items:
45+
- description: APE read memory client
46+
- description: APE write memory client
47+
48+
interconnect-names:
49+
items:
50+
- const: dma-mem # read
51+
- const: write
52+
53+
iommus:
54+
maxItems: 1
55+
4256
ports:
4357
$ref: /schemas/graph.yaml#/properties/ports
4458
description: |
@@ -74,6 +88,9 @@ then:
7488
Should be "tx1", "tx2" ... "tx10" for DMA Tx channel
7589
minItems: 1
7690
maxItems: 20
91+
interconnects: false
92+
interconnect-names: false
93+
iommus: false
7794

7895
else:
7996
properties:

Documentation/devicetree/bindings/sound/nvidia,tegra210-adx.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ properties:
2727

2828
compatible:
2929
oneOf:
30-
- const: nvidia,tegra210-adx
30+
- enum:
31+
- nvidia,tegra210-adx
32+
- nvidia,tegra264-adx
3133
- items:
3234
- enum:
3335
- nvidia,tegra234-adx

0 commit comments

Comments
 (0)