Skip to content

Commit 4530278

Browse files
author
CKI KWF Bot
committed
Merge: ALSA - update drivers for 10.1 - upstream 6.14
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/760 JIRA: https://issues.redhat.com/browse/RHEL-80677 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 - regmap core 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. Omitted-fix: 91f505d # dup with bd40d91 Omitted-fix: 852c0b7 # dup with a7ebb02 Omitted-fix: 2c2eadd # dup with 658fb7f Omitted-fix: 75c2d63 # outside sound/ tree Omitted-fix: 5ad2abf # outside sound/ tree Omitted-fix: 1969392 # outside sound/ tree Omitted-fix: 84c398c # outside sound/ tree Omitted-fix: c2cd598 # outside sound/ tree Omitted-fix: b4aa02f # outside sound/ tree Omitted-fix: 84bbaeb # outside sound/ tree Omitted-fix: 38b2ea1 # outside sound/ tree Omitted-fix: 4d69f4c # outside sound/ tree Omitted-fix: 3d1a26a # outside sound/ tree Omitted-fix: b294259 # outside sound/ tree Omitted-fix: eefdb19 # outside sound/ tree Omitted-fix: e3b5ace # outside sound/ tree Omitted-fix: f5ea031 # outside sound/ tree Omitted-fix: 6d072c0 # outside sound/ tree Omitted-fix: f87e4f2 # outside sound/ tree Omitted-fix: 734ff31 # outside sound/ tree Omitted-fix: 7d2497f # outside sound/ tree Omitted-fix: a9d5131 # outside sound/ tree Omitted-fix: e3e627e # outside sound/ tree Omitted-fix: 3f0a819 # outside sound/ tree Omitted-fix: c9d84da # outside sound/ tree Omitted-fix: a131f20 # outside sound/ tree Omitted-fix: 84c34d0 # outside sound/ tree Omitted-fix: 78cf56f # outside sound/ tree Omitted-fix: 344825e # outside sound/ tree Omitted-fix: 8ef9019 # outside sound/ tree Omitted-fix: d583461 # outside sound/ tree Omitted-fix: a877cd2 # outside sound/ tree Omitted-fix: 2c54b24 # outside sound/ tree Omitted-fix: 6cf828d # outside sound/ tree Omitted-fix: 32fcd1b # outside sound/ tree Omitted-fix: eee6af2 # outside sound/ tree Omitted-fix: 1d2e01d # outside sound/ tree Omitted-fix: 7c9a8c5 # outside sound/ tree Omitted-fix: 96b8f46 # outside sound/ tree Omitted-fix: 8ba1b42 # outside sound/ tree Omitted-fix: b3e8dc1 # outside sound/ tree Omitted-fix: 66644d8 # outside sound/ tree Omitted-fix: f873136 # outside sound/ tree Omitted-fix: b8c6c13 # platform not supported in RHEL Omitted-fix: 97aa62e # platform not supported in RHEL Omitted-fix: f4293c2 # outside sound/tree Omitted-fix: 4d5b71b # handled in RHEL-80658 Omitted-fix: 7470998 # handled in RHEL-80658 Omitted-fix: a0b887f # handled in RHEL-80658 Omitted-fix: c1b0f51 # handled in RHEL-80658 Signed-off-by: Jaroslav Kysela <jkysela@redhat.com> Approved-by: Bastien Nocera <bnocera@redhat.com> Approved-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: Jan Stancek <jstancek@redhat.com> Approved-by: Brian Masney <bmasney@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 e4a85ec + 06fa1c0 commit 4530278

File tree

304 files changed

+25157
-2330
lines changed

Some content is hidden

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

304 files changed

+25157
-2330
lines changed

‎Documentation/devicetree/bindings/sound/adi,ssm2518.yaml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,14 @@ unevaluatedProperties: false
3636

3737
examples:
3838
- |
39-
i2c {
40-
#address-cells = <1>;
41-
#size-cells = <0>;
42-
codec@34 {
43-
compatible = "adi,ssm2518";
44-
reg = <0x34>;
45-
gpios = <&gpio 5 0>;
46-
};
47-
};
39+
#include <dt-bindings/gpio/gpio.h>
40+
41+
i2c {
42+
#address-cells = <1>;
43+
#size-cells = <0>;
44+
codec@34 {
45+
compatible = "adi,ssm2518";
46+
reg = <0x34>;
47+
gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
48+
};
49+
};

‎Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-codec.yaml‎

Lines changed: 78 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ properties:
2222
- allwinner,sun8i-a23-codec
2323
- allwinner,sun8i-h3-codec
2424
- allwinner,sun8i-v3s-codec
25+
- allwinner,sun50i-h616-codec
26+
- allwinner,suniv-f1c100s-codec
2527

2628
reg:
2729
maxItems: 1
@@ -40,14 +42,20 @@ properties:
4042
- const: codec
4143

4244
dmas:
43-
items:
44-
- description: RX DMA Channel
45-
- description: TX DMA Channel
45+
oneOf:
46+
- items:
47+
- description: RX DMA Channel
48+
- description: TX DMA Channel
49+
- items:
50+
- description: TX DMA Channel
4651

4752
dma-names:
48-
items:
49-
- const: rx
50-
- const: tx
53+
oneOf:
54+
- items:
55+
- const: rx
56+
- const: tx
57+
- items:
58+
- const: tx
5159

5260
resets:
5361
maxItems: 1
@@ -70,6 +78,7 @@ properties:
7078
- MIC1
7179
- MIC2
7280
- MIC3
81+
- MIC
7382

7483
# Microphone Biases from the SoC
7584
- HBIAS
@@ -80,6 +89,8 @@ properties:
8089
- Headset Mic
8190
- Line In
8291
- Line Out
92+
- Right FM In
93+
- Left FM In
8394
- Mic
8495
- Speaker
8596

@@ -229,6 +240,67 @@ allOf:
229240
- Mic
230241
- Speaker
231242

243+
- if:
244+
properties:
245+
compatible:
246+
enum:
247+
- allwinner,sun50i-h616-codec
248+
249+
then:
250+
properties:
251+
allwinner,audio-routing:
252+
items:
253+
enum:
254+
- LINEOUT
255+
- Line Out
256+
257+
dmas:
258+
items:
259+
- description: TX DMA Channel
260+
261+
dma-names:
262+
items:
263+
- const: tx
264+
265+
else:
266+
properties:
267+
dmas:
268+
items:
269+
- description: RX DMA Channel
270+
- description: TX DMA Channel
271+
272+
dma-names:
273+
items:
274+
- const: rx
275+
- const: tx
276+
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+
232304
unevaluatedProperties: false
233305

234306
examples:

‎Documentation/devicetree/bindings/sound/awinic,aw88395.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
compatible:
1919
enum:
2020
- awinic,aw88081
21+
- awinic,aw88083
2122
- awinic,aw88261
2223
- awinic,aw88395
2324
- awinic,aw88399
@@ -58,6 +59,7 @@ allOf:
5859
contains:
5960
enum:
6061
- awinic,aw88081
62+
- awinic,aw88083
6163
- awinic,aw88261
6264
then:
6365
properties:

‎Documentation/devicetree/bindings/sound/everest,es71x4.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ unevaluatedProperties: false
5353

5454
examples:
5555
- |
56-
codec {
57-
compatible = "everest,es7134";
58-
#sound-dai-cells = <0>;
59-
VDD-supply = <&vdd_supply>;
60-
};
56+
codec {
57+
compatible = "everest,es7134";
58+
#sound-dai-cells = <0>;
59+
VDD-supply = <&vdd_supply>;
60+
};
6161
6262
...

‎Documentation/devicetree/bindings/sound/everest,es7241.yaml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,15 @@ unevaluatedProperties: false
5454

5555
examples:
5656
- |
57-
#include <dt-bindings/gpio/gpio.h>
58-
codec {
59-
compatible = "everest,es7241";
60-
#sound-dai-cells = <0>;
61-
reset-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
62-
VDDP-supply = <&vddp_supply>;
63-
VDDA-supply = <&vdda_supply>;
64-
VDDD-supply = <&vddd_supply>;
65-
};
57+
#include <dt-bindings/gpio/gpio.h>
58+
59+
codec {
60+
compatible = "everest,es7241";
61+
#sound-dai-cells = <0>;
62+
reset-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
63+
VDDP-supply = <&vddp_supply>;
64+
VDDA-supply = <&vdda_supply>;
65+
VDDD-supply = <&vddd_supply>;
66+
};
6667
6768
...

‎Documentation/devicetree/bindings/sound/fsl,easrc.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,20 @@ examples:
8787
#include <dt-bindings/clock/imx8mn-clock.h>
8888
8989
easrc: easrc@300c0000 {
90-
compatible = "fsl,imx8mn-easrc";
91-
reg = <0x300c0000 0x10000>;
92-
interrupts = <0x0 122 0x4>;
93-
clocks = <&clk IMX8MN_CLK_ASRC_ROOT>;
94-
clock-names = "mem";
95-
dmas = <&sdma2 16 23 0> , <&sdma2 17 23 0>,
96-
<&sdma2 18 23 0> , <&sdma2 19 23 0>,
97-
<&sdma2 20 23 0> , <&sdma2 21 23 0>,
98-
<&sdma2 22 23 0> , <&sdma2 23 23 0>;
99-
dma-names = "ctx0_rx", "ctx0_tx",
100-
"ctx1_rx", "ctx1_tx",
101-
"ctx2_rx", "ctx2_tx",
102-
"ctx3_rx", "ctx3_tx";
103-
firmware-name = "imx/easrc/easrc-imx8mn.bin";
104-
fsl,asrc-rate = <8000>;
105-
fsl,asrc-format = <2>;
90+
compatible = "fsl,imx8mn-easrc";
91+
reg = <0x300c0000 0x10000>;
92+
interrupts = <0x0 122 0x4>;
93+
clocks = <&clk IMX8MN_CLK_ASRC_ROOT>;
94+
clock-names = "mem";
95+
dmas = <&sdma2 16 23 0> , <&sdma2 17 23 0>,
96+
<&sdma2 18 23 0> , <&sdma2 19 23 0>,
97+
<&sdma2 20 23 0> , <&sdma2 21 23 0>,
98+
<&sdma2 22 23 0> , <&sdma2 23 23 0>;
99+
dma-names = "ctx0_rx", "ctx0_tx",
100+
"ctx1_rx", "ctx1_tx",
101+
"ctx2_rx", "ctx2_tx",
102+
"ctx3_rx", "ctx3_tx";
103+
firmware-name = "imx/easrc/easrc-imx8mn.bin";
104+
fsl,asrc-rate = <8000>;
105+
fsl,asrc-format = <2>;
106106
};

‎Documentation/devicetree/bindings/sound/fsl,micfil.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- fsl,imx8mm-micfil
2626
- fsl,imx8mp-micfil
2727
- fsl,imx93-micfil
28+
- fsl,imx943-micfil
2829

2930
reg:
3031
maxItems: 1

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ properties:
2323
- fsl,imx8qm-mqs
2424
- fsl,imx8qxp-mqs
2525
- fsl,imx93-mqs
26+
- fsl,imx943-aonmix-mqs
27+
- fsl,imx943-wakeupmix-mqs
2628
- fsl,imx95-aonmix-mqs
2729
- fsl,imx95-netcmix-mqs
2830

‎Documentation/devicetree/bindings/sound/fsl,xcvr.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -140,21 +140,21 @@ examples:
140140
#include <dt-bindings/reset/imx8mp-reset.h>
141141
142142
xcvr: xcvr@30cc0000 {
143-
compatible = "fsl,imx8mp-xcvr";
144-
reg = <0x30cc0000 0x800>,
145-
<0x30cc0800 0x400>,
146-
<0x30cc0c00 0x080>,
147-
<0x30cc0e00 0x080>;
148-
reg-names = "ram", "regs", "rxfifo", "txfifo";
149-
interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
150-
<GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
151-
<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
152-
clocks = <&audiomix_clk IMX8MP_CLK_AUDIOMIX_EARC_IPG>,
153-
<&audiomix_clk IMX8MP_CLK_AUDIOMIX_EARC_PHY>,
154-
<&audiomix_clk IMX8MP_CLK_AUDIOMIX_SPBA2_ROOT>,
155-
<&audiomix_clk IMX8MP_CLK_AUDIOMIX_AUDPLL_ROOT>;
156-
clock-names = "ipg", "phy", "spba", "pll_ipg";
157-
dmas = <&sdma2 30 2 0>, <&sdma2 31 2 0>;
158-
dma-names = "rx", "tx";
159-
resets = <&audiomix_reset 0>;
143+
compatible = "fsl,imx8mp-xcvr";
144+
reg = <0x30cc0000 0x800>,
145+
<0x30cc0800 0x400>,
146+
<0x30cc0c00 0x080>,
147+
<0x30cc0e00 0x080>;
148+
reg-names = "ram", "regs", "rxfifo", "txfifo";
149+
interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
150+
<GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
151+
<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>;
152+
clocks = <&audiomix_clk IMX8MP_CLK_AUDIOMIX_EARC_IPG>,
153+
<&audiomix_clk IMX8MP_CLK_AUDIOMIX_EARC_PHY>,
154+
<&audiomix_clk IMX8MP_CLK_AUDIOMIX_SPBA2_ROOT>,
155+
<&audiomix_clk IMX8MP_CLK_AUDIOMIX_AUDPLL_ROOT>;
156+
clock-names = "ipg", "phy", "spba", "pll_ipg";
157+
dmas = <&sdma2 30 2 0>, <&sdma2 31 2 0>;
158+
dma-names = "rx", "tx";
159+
resets = <&audiomix_reset 0>;
160160
};

‎Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ unevaluatedProperties: false
7272

7373
examples:
7474
- |
75-
#include <dt-bindings/interrupt-controller/arm-gic.h>
76-
#include <dt-bindings/interrupt-controller/irq.h>
77-
#define KEEM_BAY_PSS_AUX_I2S3
78-
#define KEEM_BAY_PSS_I2S3
79-
i2s3: i2s@20140000 {
80-
compatible = "intel,keembay-i2s";
81-
#sound-dai-cells = <0>;
82-
reg = <0x20140000 0x200>, /* I2S registers */
83-
<0x202a00a4 0x4>; /* I2S gen configuration */
84-
reg-names = "i2s-regs", "i2s_gen_cfg";
85-
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
86-
clock-names = "osc", "apb_clk";
87-
clocks = <&scmi_clk KEEM_BAY_PSS_AUX_I2S3>, <&scmi_clk KEEM_BAY_PSS_I2S3>;
88-
dmas = <&axi_dma0 29>, <&axi_dma0 33>;
89-
dma-names = "tx", "rx";
90-
};
75+
#include <dt-bindings/interrupt-controller/arm-gic.h>
76+
#include <dt-bindings/interrupt-controller/irq.h>
77+
#define KEEM_BAY_PSS_AUX_I2S3
78+
#define KEEM_BAY_PSS_I2S3
79+
i2s@20140000 {
80+
compatible = "intel,keembay-i2s";
81+
#sound-dai-cells = <0>;
82+
reg = <0x20140000 0x200>, /* I2S registers */
83+
<0x202a00a4 0x4>; /* I2S gen configuration */
84+
reg-names = "i2s-regs", "i2s_gen_cfg";
85+
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
86+
clock-names = "osc", "apb_clk";
87+
clocks = <&scmi_clk KEEM_BAY_PSS_AUX_I2S3>, <&scmi_clk KEEM_BAY_PSS_I2S3>;
88+
dmas = <&axi_dma0 29>, <&axi_dma0 33>;
89+
dma-names = "tx", "rx";
90+
};

0 commit comments

Comments
 (0)