Skip to content

Commit becf4a2

Browse files
committed
Merge: ALSA - update drivers for 9.7 - upstream 6.15
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6980 JIRA: https://issues.redhat.com/browse/RHEL-80657 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: 91b7512 # not for rhel9 Omitted-fix: b8c6c13 # platform not supported Omitted-fix: 97aa62e # platform not supported Omitted-fix: b7e3ec4 # platform not supported Omitted-fix: dc6458e # will be handled separately Signed-off-by: Jaroslav Kysela <jkysela@redhat.com> Approved-by: Jan Stancek <jstancek@redhat.com> Approved-by: Radu Rendec <rrendec@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents f07d352 + fc81358 commit becf4a2

File tree

568 files changed

+19803
-6227
lines changed

Some content is hidden

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

568 files changed

+19803
-6227
lines changed

Documentation/devicetree/bindings/mfd/motorola-cpcap.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ node must be named "audio-codec".
3131
Required properties for the audio-codec subnode:
3232

3333
- #sound-dai-cells = <1>;
34+
- interrupts : should contain jack detection interrupts, with headset
35+
detect interrupt matching "hs" and microphone bias 2
36+
detect interrupt matching "mb2" in interrupt-names.
37+
- interrupt-names : Contains "hs", "mb2"
3438

3539
The audio-codec provides two DAIs. The first one is connected to the
3640
Stereo HiFi DAC and the second one is connected to the Voice DAC.
@@ -52,6 +56,8 @@ Example:
5256

5357
audio-codec {
5458
#sound-dai-cells = <1>;
59+
interrupts-extended = <&cpcap 9 0>, <&cpcap 10 0>;
60+
interrupt-names = "hs", "mb2";
5561

5662
/* HiFi */
5763
port@0 {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
enum:
2020
- awinic,aw88081
2121
- awinic,aw88083
22+
- awinic,aw88166
2223
- awinic,aw88261
2324
- awinic,aw88395
2425
- awinic,aw88399
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/dmic-codec.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Generic PDM Digital microphone (DMIC) codec
8+
9+
maintainers:
10+
- Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
11+
12+
allOf:
13+
- $ref: name-prefix.yaml#
14+
15+
properties:
16+
compatible:
17+
const: dmic-codec
18+
19+
'#sound-dai-cells':
20+
const: 0
21+
22+
vref-supply:
23+
description: Phandle to the digital microphone reference supply
24+
25+
dmicen-gpios:
26+
description: GPIO specifier for DMIC to control start and stop
27+
maxItems: 1
28+
29+
num-channels:
30+
description: Number of microphones on this DAI
31+
$ref: /schemas/types.yaml#/definitions/uint32
32+
minimum: 1
33+
maximum: 8
34+
default: 8
35+
36+
modeswitch-delay-ms:
37+
description: Delay (in ms) to complete DMIC mode switch
38+
39+
wakeup-delay-ms:
40+
description: Delay (in ms) after enabling the DMIC
41+
42+
required:
43+
- compatible
44+
45+
unevaluatedProperties: false
46+
47+
examples:
48+
- |
49+
#include <dt-bindings/gpio/gpio.h>
50+
51+
dmic {
52+
compatible = "dmic-codec";
53+
dmicen-gpios = <&gpio4 3 GPIO_ACTIVE_HIGH>;
54+
num-channels = <1>;
55+
wakeup-delay-ms = <50>;
56+
modeswitch-delay-ms = <35>;
57+
};
58+
...

Documentation/devicetree/bindings/sound/dmic.txt

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

Documentation/devicetree/bindings/sound/imx-audio-card.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ patternProperties:
5555
description: see tdm-slot.txt.
5656
$ref: /schemas/types.yaml#/definitions/uint32
5757

58+
playback-only:
59+
description: link is used only for playback
60+
$ref: /schemas/types.yaml#/definitions/flag
61+
62+
capture-only:
63+
description: link is used only for capture
64+
$ref: /schemas/types.yaml#/definitions/flag
65+
5866
cpu:
5967
description: Holds subnode which indicates cpu dai.
6068
type: object
@@ -80,6 +88,12 @@ patternProperties:
8088
- link-name
8189
- cpu
8290

91+
allOf:
92+
- not:
93+
required:
94+
- playback-only
95+
- capture-only
96+
8397
additionalProperties: false
8498

8599
required:

Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,40 @@ properties:
5858
items:
5959
enum: [1, 2, 3, 4, 5]
6060

61+
qcom,tx-channel-mapping:
62+
description: |
63+
Specifies static channel mapping between slave and master tx port
64+
channels.
65+
In the order of slave port channels which is adc1, adc2, adc3,
66+
dmic0, dmic1, mbhc, dmic2, dmic3, dmci4, dmic5, dmic6, dmic7.
67+
$ref: /schemas/types.yaml#/definitions/uint8-array
68+
minItems: 12
69+
maxItems: 12
70+
additionalItems: false
71+
items:
72+
enum:
73+
- 1 # WCD9370_SWRM_CH1
74+
- 2 # WCD9370_SWRM_CH2
75+
- 3 # WCD9370_SWRM_CH3
76+
- 4 # WCD9370_SWRM_CH4
77+
78+
qcom,rx-channel-mapping:
79+
description: |
80+
Specifies static channels mapping between slave and master rx port
81+
channels.
82+
In the order of slave port channels, which is
83+
hph_l, hph_r, clsh, comp_l, comp_r, lo, dsd_r, dsd_l.
84+
$ref: /schemas/types.yaml#/definitions/uint8-array
85+
minItems: 8
86+
maxItems: 8
87+
additionalItems: false
88+
items:
89+
enum:
90+
- 1 # WCD9370_SWRM_CH1
91+
- 2 # WCD9370_SWRM_CH2
92+
- 3 # WCD9370_SWRM_CH3
93+
- 4 # WCD9370_SWRM_CH4
94+
6195
required:
6296
- compatible
6397
- reg
@@ -74,6 +108,7 @@ examples:
74108
compatible = "sdw20217010a00";
75109
reg = <0 4>;
76110
qcom,rx-port-mapping = <1 2 3 4 5>;
111+
qcom,rx-channel-mapping = /bits/ 8 <1 2 1 1 2 1 1 2>;
77112
};
78113
};
79114
@@ -85,6 +120,7 @@ examples:
85120
compatible = "sdw20217010a00";
86121
reg = <0 3>;
87122
qcom,tx-port-mapping = <2 2 3 4>;
123+
qcom,tx-channel-mapping = /bits/ 8 <1 2 1 1 2 3 3 4 1 2 3 4>;
88124
};
89125
};
90126

0 commit comments

Comments
 (0)