Skip to content

Commit f8561e9

Browse files
caringicaringi
committed
Merge: ALSA - update drivers for 9.7 - upstream 6.13
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6587 JIRA: https://issues.redhat.com/browse/RHEL-80681 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. Omitted-fix: 704dbe9 # not supported platform Omitted-fix: efa527f # code is not used Omitted-fix: ec15e50 # not supported platform Omitted-fix: 3f0b8d3 # not supported platform Omitted-fix: e9d2a2f # not supported platform Omitted-fix: be8cd36 # in MR !6787 Omitted-fix: 38e94ce # in MR !6787 Signed-off-by: Jaroslav Kysela <jkysela@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Eric Chanudet <echanude@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents 8b4b8b6 + 57ef1d5 commit f8561e9

File tree

310 files changed

+15114
-5203
lines changed

Some content is hidden

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

310 files changed

+15114
-5203
lines changed

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

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/adi,adau1373.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices ADAU1373 CODEC
8+
9+
maintainers:
10+
- Nuno Sá <nuno.sa@analog.com>
11+
12+
description: |
13+
Analog Devices ADAU1373 Low power codec with speaker and headphone amplifiers.
14+
https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1373.pdf
15+
16+
allOf:
17+
- $ref: dai-common.yaml#
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- adi,adau1373
23+
24+
reg:
25+
maxItems: 1
26+
27+
"#sound-dai-cells":
28+
const: 0
29+
30+
powerdown-gpios:
31+
description: GPIO used for hardware power-down.
32+
maxItems: 1
33+
34+
adi,micbias1-microvolt:
35+
description:
36+
This property sets the microphone bias voltage for the first microphone.
37+
enum: [1800000, 2200000, 2600000, 2900000]
38+
default: 2900000
39+
40+
adi,micbias2-microvolt:
41+
description:
42+
This property sets the microphone bias voltage for the second microphone.
43+
enum: [1800000, 2200000, 2600000, 2900000]
44+
default: 2900000
45+
46+
adi,input1-differential:
47+
description: This property sets the first analog input as differential.
48+
type: boolean
49+
50+
adi,input2-differential:
51+
description: This property sets the second analog input as differential.
52+
type: boolean
53+
54+
adi,input3-differential:
55+
description: This property sets the third analog input as differential.
56+
type: boolean
57+
58+
adi,input4-differential:
59+
description: This property sets the fourth analog input as differential.
60+
type: boolean
61+
62+
adi,lineout-differential:
63+
description: This property sets the line output as differential.
64+
type: boolean
65+
66+
adi,lineout-gnd-sense:
67+
description: This property enables the line output ground sense control.
68+
type: boolean
69+
70+
adi,drc-settings:
71+
description:
72+
This setting is used to control the dynamic range of the signal. The
73+
device provides a maximum of three full band DRCs with 13 entries each.
74+
$ref: /schemas/types.yaml#/definitions/uint8-array
75+
oneOf:
76+
- minItems: 13
77+
maxItems: 13
78+
- minItems: 26
79+
maxItems: 26
80+
- minItems: 39
81+
maxItems: 39
82+
83+
required:
84+
- "#sound-dai-cells"
85+
- compatible
86+
- reg
87+
88+
unevaluatedProperties: false
89+
90+
examples:
91+
- |
92+
#include <dt-bindings/gpio/gpio.h>
93+
94+
i2c {
95+
#address-cells = <1>;
96+
#size-cells = <0>;
97+
audio-codec@1a {
98+
compatible = "adi,adau1373";
99+
reg = <0x1a>;
100+
#sound-dai-cells = <0>;
101+
powerdown-gpios = <&gpio 100 GPIO_ACTIVE_LOW>;
102+
adi,input2-differential;
103+
adi,input1-differential;
104+
adi,lineout-differential;
105+
adi,micbias2-microvolt = <1800000>;
106+
adi,drc-settings = /bits/ 8 <
107+
0xff 0xff 0x1 0x2 0xa 0xa 0xd 0x1 0xff 0xff 0x5 0xd 0xff
108+
>;
109+
};
110+
};
111+
...

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ description:
1717
properties:
1818
compatible:
1919
enum:
20-
- awinic,aw88395
20+
- awinic,aw88081
2121
- awinic,aw88261
22+
- awinic,aw88395
2223
- awinic,aw88399
2324

2425
reg:
@@ -56,6 +57,7 @@ allOf:
5657
compatible:
5758
contains:
5859
enum:
60+
- awinic,aw88081
5961
- awinic,aw88261
6062
then:
6163
properties:

‎Documentation/devicetree/bindings/sound/irondevice,sma1307.yaml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/irondevice,sma1307.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Iron Device SMA1307 Audio Amplifier
8+
9+
maintainers:
10+
- Kiseok Jo <kiseok.jo@irondevice.com>
11+
12+
description:
13+
SMA1307 boosted digital speaker amplifier with feedback-loop.
14+
15+
allOf:
16+
- $ref: dai-common.yaml#
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- irondevice,sma1307a
22+
- irondevice,sma1307aq
23+
description:
24+
If a 'q' is added, it indicated the product is AEC-Q100
25+
qualified for automotive applications. SMA1307A supports
26+
both WLCSP and QFN packages. However, SMA1307AQ only
27+
supports the QFN package.
28+
29+
reg:
30+
maxItems: 1
31+
32+
'#sound-dai-cells':
33+
const: 1
34+
35+
required:
36+
- compatible
37+
- reg
38+
- '#sound-dai-cells'
39+
40+
additionalProperties: false
41+
42+
examples:
43+
- |
44+
i2c {
45+
#address-cells = <1>;
46+
#size-cells = <0>;
47+
48+
amplifier@1e {
49+
compatible = "irondevice,sma1307a";
50+
reg = <0x1e>;
51+
#sound-dai-cells = <1>;
52+
};
53+
};

‎Documentation/devicetree/bindings/sound/neofidelity,ntp8835.yaml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/neofidelity,ntp8835.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NeoFidelity NTP8835/NTP8835C Amplifiers
8+
9+
maintainers:
10+
- Igor Prusov <ivprusov@salutedevices.com>
11+
12+
description: |
13+
The NTP8835 is a single chip full digital audio amplifier
14+
including power stages for stereo amplifier systems.
15+
NTP8835 is integrated with versatile digital audio signal
16+
processing functions, high-performance, high-fidelity fully
17+
digital PWM modulator and two high-power full-bridge MOSFET
18+
power stages. NTP8835C has identical programming interface,
19+
but has different output signal characteristics.
20+
21+
allOf:
22+
- $ref: dai-common.yaml#
23+
24+
properties:
25+
compatible:
26+
enum:
27+
- neofidelity,ntp8835
28+
- neofidelity,ntp8835c
29+
30+
reg:
31+
enum:
32+
- 0x2a
33+
- 0x2b
34+
- 0x2c
35+
- 0x2d
36+
37+
reset-gpios:
38+
maxItems: 1
39+
40+
'#sound-dai-cells':
41+
const: 0
42+
43+
clocks:
44+
maxItems: 4
45+
46+
clock-names:
47+
items:
48+
- const: wck
49+
- const: bck
50+
- const: scl
51+
- const: mclk
52+
53+
required:
54+
- compatible
55+
- reg
56+
57+
unevaluatedProperties: false
58+
59+
examples:
60+
- |
61+
#include <dt-bindings/gpio/gpio.h>
62+
i2c {
63+
#address-cells = <1>;
64+
#size-cells = <0>;
65+
audio-codec@2b {
66+
compatible = "neofidelity,ntp8835";
67+
#sound-dai-cells = <0>;
68+
reg = <0x2b>;
69+
reset-gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
70+
clocks = <&clkc 551>, <&clkc 552>, <&clkc 553>, <&clkc 554>;
71+
clock-names = "wck", "bck", "scl", "mclk";
72+
};
73+
};

‎Documentation/devicetree/bindings/sound/neofidelity,ntp8918.yaml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/neofidelity,ntp8918.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NeoFidelity NTP8918 Amplifier
8+
9+
maintainers:
10+
- Igor Prusov <ivprusov@salutedevices.com>
11+
12+
description:
13+
The NTP8918 is a single chip full digital audio amplifier
14+
including power stage for stereo amplifier system.
15+
The NTP8918 is integrated with versatile digital audio signal
16+
processing functions, high-performance, high-fidelity fully
17+
digital PWM modulator and two high-power full-bridge MOSFET
18+
power stages.
19+
20+
allOf:
21+
- $ref: dai-common.yaml#
22+
23+
properties:
24+
compatible:
25+
enum:
26+
- neofidelity,ntp8918
27+
28+
reg:
29+
enum:
30+
- 0x2a
31+
- 0x2b
32+
- 0x2c
33+
- 0x2d
34+
35+
reset-gpios:
36+
maxItems: 1
37+
38+
'#sound-dai-cells':
39+
const: 0
40+
41+
clocks:
42+
maxItems: 3
43+
44+
clock-names:
45+
items:
46+
- const: wck
47+
- const: scl
48+
- const: bck
49+
50+
required:
51+
- compatible
52+
- reg
53+
54+
unevaluatedProperties: false
55+
56+
examples:
57+
- |
58+
#include <dt-bindings/gpio/gpio.h>
59+
i2c {
60+
#address-cells = <1>;
61+
#size-cells = <0>;
62+
audio-codec@2a {
63+
compatible = "neofidelity,ntp8918";
64+
#sound-dai-cells = <0>;
65+
reg = <0x2a>;
66+
clocks = <&clkc 150>, <&clkc 151>, <&clkc 152>;
67+
clock-names = "wck", "scl", "bck";
68+
reset-gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
69+
};
70+
};

‎Documentation/devicetree/bindings/sound/qcom,sm8250.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- enum:
2626
- qcom,sm8550-sndcard
2727
- qcom,sm8650-sndcard
28+
- qcom,sm8750-sndcard
2829
- const: qcom,sm8450-sndcard
2930
- enum:
3031
- qcom,apq8016-sbc-sndcard

‎Documentation/devicetree/bindings/sound/simple-audio-mux.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ properties:
2929
$ref: /schemas/types.yaml#/definitions/string-array
3030
maxItems: 2
3131

32+
idle-state:
33+
description: If present specifies the state when the mux is powered down
34+
$ref: /schemas/mux/mux-controller.yaml#/properties/idle-state
35+
3236
sound-name-prefix: true
3337

3438
required:
@@ -43,4 +47,5 @@ examples:
4347
compatible = "simple-audio-mux";
4448
mux-gpios = <&gpio 3 0>;
4549
state-labels = "Label_A", "Label_B";
50+
idle-state = <0>;
4651
};

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,8 @@ patternProperties:
776776
description: National Semiconductor
777777
"^nec,.*":
778778
description: NEC LCD Technologies, Ltd.
779+
"^neofidelity,.*":
780+
description: Neofidelity Inc.
779781
"^neonode,.*":
780782
description: Neonode Inc.
781783
"^netgear,.*":

0 commit comments

Comments
 (0)