Skip to content

Commit 4fc2e98

Browse files
committed
Merge: ALSA - update drivers for 9.6
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5877 This is a backport of ALSA changes up to 6.12.8 kernel for RHEL 9.6 with linux-next picks. Depends on !5492 and !5269 . JIRA: https://issues.redhat.com/browse/RHEL-60915 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. CVE: CVE-2024-53045 CVE: CVE-2024-50160 CVE: CVE-2024-46862 CVE: CVE-2024-46863 CVE: CVE-2024-46798 CVE: CVE-2024-46793 CVE: CVE-2024-43896 CVE: CVE-2024-41069 CVE: CVE-2024-41037 CVE: CVE-2024-50007 CVE: CVE-2024-42097 CVE: CVE-2024-50292 CVE: CVE-2024-50105 CVE: CVE-2024-50104 CVE: CVE-2024-50103 CVE: CVE-2024-50011 CVE: CVE-2024-46849 CVE: CVE-2024-43818 CVE: CVE-2024-42298 CVE: CVE-2024-42089 CVE: CVE-2024-42074 CVE: CVE-2024-40964 CVE: CVE-2024-44954 CVE: CVE-2024-53197 CVE: CVE-2024-56532 CVE: CVE-2024-56533 Signed-off-by: Jaroslav Kysela <jkysela@redhat.com> Approved-by: John W. Linville <linville@redhat.com> Approved-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Eric Chanudet <echanude@redhat.com> Approved-by: Jan Stancek <jstancek@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Approved-by: Herton R. Krzesinski <herton@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2 parents 446b16a + a9b7a53 commit 4fc2e98

File tree

1,208 files changed

+45991
-19455
lines changed

Some content is hidden

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

1,208 files changed

+45991
-19455
lines changed

Documentation/devicetree/bindings/sound/audio-graph-port.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ definitions:
2525
capture-only:
2626
description: port connection used only for capture
2727
$ref: /schemas/types.yaml#/definitions/flag
28+
link-trigger-order:
29+
description: trigger order for both start/stop
30+
$ref: /schemas/types.yaml#/definitions/uint32-array
31+
link-trigger-order-start:
32+
description: trigger order for start
33+
$ref: /schemas/types.yaml#/definitions/uint32-array
34+
link-trigger-order-stop:
35+
description: trigger order for stop
36+
$ref: /schemas/types.yaml#/definitions/uint32-array
2837

2938
endpoint-base:
3039
allOf:

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

Lines changed: 0 additions & 36 deletions
This file was deleted.
Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/fsl,mqs.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP Medium Quality Sound (MQS)
8+
9+
maintainers:
10+
- Shengjiu Wang <shengjiu.wang@nxp.com>
11+
- Chancel Liu <chancel.liu@nxp.com>
12+
13+
description: |
14+
Medium quality sound (MQS) is used to generate medium quality audio
15+
via a standard GPIO in the pinmux, allowing the user to connect
16+
stereo speakers or headphones to a power amplifier without an
17+
additional DAC chip.
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- fsl,imx6sx-mqs
23+
- fsl,imx8qm-mqs
24+
- fsl,imx8qxp-mqs
25+
- fsl,imx93-mqs
26+
- fsl,imx95-aonmix-mqs
27+
- fsl,imx95-netcmix-mqs
28+
29+
clocks:
30+
minItems: 1
31+
maxItems: 2
32+
33+
clock-names:
34+
minItems: 1
35+
maxItems: 2
36+
37+
gpr:
38+
$ref: /schemas/types.yaml#/definitions/phandle
39+
description: The phandle to the General Purpose Register (GPR) node
40+
41+
reg:
42+
maxItems: 1
43+
44+
power-domains:
45+
maxItems: 1
46+
47+
resets:
48+
maxItems: 1
49+
50+
required:
51+
- compatible
52+
- clocks
53+
- clock-names
54+
55+
allOf:
56+
- if:
57+
properties:
58+
compatible:
59+
contains:
60+
enum:
61+
- fsl,imx8qm-mqs
62+
- fsl,imx8qxp-mqs
63+
then:
64+
properties:
65+
clocks:
66+
items:
67+
- description: Master clock
68+
- description: Clock for register access
69+
clock-names:
70+
items:
71+
- const: mclk
72+
- const: core
73+
required:
74+
- reg
75+
- power-domains
76+
else:
77+
properties:
78+
clocks:
79+
items:
80+
- description: Master clock
81+
clock-names:
82+
items:
83+
- const: mclk
84+
required:
85+
- gpr
86+
87+
additionalProperties: false
88+
89+
examples:
90+
- |
91+
#include <dt-bindings/clock/imx6sx-clock.h>
92+
mqs0: mqs {
93+
compatible = "fsl,imx6sx-mqs";
94+
gpr = <&gpr>;
95+
clocks = <&clks IMX6SX_CLK_SAI1>;
96+
clock-names = "mclk";
97+
};
98+
99+
- |
100+
#include <dt-bindings/firmware/imx/rsrc.h>
101+
mqs1: mqs@59850000 {
102+
compatible = "fsl,imx8qm-mqs";
103+
reg = <0x59850000 0x10000>;
104+
clocks = <&mqs0_lpcg 0>, <&mqs0_lpcg 1>;
105+
clock-names = "mclk", "core";
106+
power-domains = <&pd IMX_SC_R_MQS_0>;
107+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- fsl,imx8mp-rpmsg-audio
2727
- fsl,imx8ulp-rpmsg-audio
2828
- fsl,imx93-rpmsg-audio
29+
- fsl,imx95-rpmsg-audio
2930

3031
model:
3132
$ref: /schemas/types.yaml#/definitions/string

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

Lines changed: 59 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
enum:
2323
- fsl,imx8mp-xcvr
2424
- fsl,imx93-xcvr
25+
- fsl,imx95-xcvr
2526

2627
reg:
2728
items:
@@ -38,21 +39,31 @@ properties:
3839
- const: txfifo
3940

4041
interrupts:
41-
maxItems: 1
42+
items:
43+
- description: WAKEUPMIX Audio XCVR Interrupt 1
44+
- description: WAKEUPMIX Audio XCVR Interrupt 2
45+
- description: SPDIF wakeup interrupt from PHY
46+
minItems: 1
4247

4348
clocks:
4449
items:
4550
- description: Peripheral clock
4651
- description: PHY clock
4752
- description: SPBA clock
4853
- description: PLL clock
54+
- description: PLL clock source for 8kHz series
55+
- description: PLL clock source for 11kHz series
56+
minItems: 4
4957

5058
clock-names:
5159
items:
5260
- const: ipg
5361
- const: phy
5462
- const: spba
5563
- const: pll_ipg
64+
- const: pll8k
65+
- const: pll11k
66+
minItems: 4
5667

5768
dmas:
5869
items:
@@ -76,9 +87,51 @@ required:
7687
- clock-names
7788
- dmas
7889
- dma-names
79-
- resets
8090

81-
additionalProperties: false
91+
allOf:
92+
- $ref: dai-common.yaml#
93+
- if:
94+
properties:
95+
compatible:
96+
contains:
97+
const: fsl,imx8mp-xcvr
98+
then:
99+
required:
100+
- resets
101+
102+
- if:
103+
properties:
104+
compatible:
105+
contains:
106+
enum:
107+
- fsl,imx93-xcvr
108+
- fsl,imx95-xcvr
109+
then:
110+
properties:
111+
interrupts:
112+
minItems: 2
113+
maxItems: 2
114+
else:
115+
properties:
116+
interrupts:
117+
minItems: 3
118+
maxItems: 3
119+
120+
- if:
121+
properties:
122+
compatible:
123+
contains:
124+
enum:
125+
- fsl,imx8mp-xcvr
126+
- fsl,imx93-xcvr
127+
then:
128+
properties:
129+
clocks:
130+
maxItems: 4
131+
clock-names:
132+
maxItems: 4
133+
134+
unevaluatedProperties: false
82135

83136
examples:
84137
- |
@@ -93,7 +146,9 @@ examples:
93146
<0x30cc0c00 0x080>,
94147
<0x30cc0e00 0x080>;
95148
reg-names = "ram", "regs", "rxfifo", "txfifo";
96-
interrupts = <0x0 128 IRQ_TYPE_LEVEL_HIGH>;
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>;
97152
clocks = <&audiomix_clk IMX8MP_CLK_AUDIOMIX_EARC_IPG>,
98153
<&audiomix_clk IMX8MP_CLK_AUDIOMIX_EARC_PHY>,
99154
<&audiomix_clk IMX8MP_CLK_AUDIOMIX_SPBA2_ROOT>,

Documentation/devicetree/bindings/sound/nau8824.txt

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

0 commit comments

Comments
 (0)