Skip to content

Commit 7912a63

Browse files
committed
Merge tag 'sound-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "It was a calm development cycle. There were an ALSA core extension for subformat PCM bits and a few ASoC core changes to support N:M mappings, while the most of remaining changes are driver-specific. Core: - API extensions for properly limiting PCM format bits via subformat - Enhanced support for N:M CPU:CODEC mappings in the core and in audio-graph-card2 ASoC: - Lots of SOF updates: fallback support to older IPC versions, notification on control changes with IPC4. Also supports for ACPI parse for the ES83xx driver that reduces quirks. - Device tree support for describing parts of the card which can be active over suspend (for very low power playback or wake word use cases) - Support for more AMD and Intel systems, NXP i.MX8m MICFIL, Qualcomm SM8250, SM8550, SM8650 and X1E80100 - Drop of Freescale MPC8610 code that is no longer supported HD-audio: - More CS35L41 codec extensions for Dell, HP and Lenovo models - TAS2781 codec extensions for Lenovo and co - New PCM subformat supports Others: - More enhancement for Scarlett2 USB mixer support - Various kselftest fixes" * tag 'sound-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (337 commits) kselftest/alsa - conf: Stringify the printed errno in sysfs_get() kselftest/alsa - mixer-test: Fix the print format specifier warning kselftest/alsa - mixer-test: Fix the print format specifier warning kselftest/alsa - mixer-test: fix the number of parameters to ksft_exit_fail_msg() ALSA: hda/tas2781: annotate calibration data endianness ALSA: hda/realtek: Fix mute and mic-mute LEDs for HP Envy X360 13-ay0xxx ALSA: hda/conexant: Fix headset auto detect fail in cx8070 and SN6140 ALSA: ac97: fix build regression ALSA: hda: cs35l41: Support more HP models without _DSD ALSA: hda/tas2781: add fixup for Lenovo 14ARB7 ALSA: hda/tas2781: add TAS2563 support for 14ARB7 ALSA: hda/tas2781: add configurable global i2c address ALSA: hda/tas2781: add ptrs to calibration functions ALSA: hda: Add driver properties for cs35l41 for Lenovo Legion Slim 7 Gen 8 serie ALSA: hda/realtek: enable SND_PCI_QUIRK for Lenovo Legion Slim 7 Gen 8 (2023) serie ALSA: hda/tas2781: configure the amp after firmware load ALSA: mark all struct bus_type as const ASoC: pxa: sspa: Don't select SND_ARM ASoC: rt5663: cancel the work when system suspends ALSA: scarlett2: Add PCM Input Switch for Solo Gen 4 ...
2 parents cf65598 + fd38dd6 commit 7912a63

File tree

287 files changed

+10674
-4060
lines changed

Some content is hidden

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

287 files changed

+10674
-4060
lines changed

Documentation/devicetree/bindings/sound/adi,max98363.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ unevaluatedProperties: false
3939

4040
examples:
4141
- |
42-
soundwire-controller@3250000 {
42+
soundwire@3250000 {
4343
#address-cells = <2>;
4444
#size-cells = <0>;
4545
reg = <0x3250000 0x2000>;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ definitions:
1919
properties:
2020
mclk-fs:
2121
$ref: simple-card.yaml#/definitions/mclk-fs
22+
playback-only:
23+
description: port connection used only for playback
24+
$ref: /schemas/types.yaml#/definitions/flag
25+
capture-only:
26+
description: port connection used only for capture
27+
$ref: /schemas/types.yaml#/definitions/flag
2228

2329
endpoint-base:
2430
allOf:

Documentation/devicetree/bindings/sound/es8328.txt

Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/everest,es8328.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Everest ES8328 audio CODEC
8+
9+
description:
10+
Everest Audio Codec, which can be connected via I2C or SPI.
11+
Pins on the device (for linking into audio routes) are
12+
* LOUT1
13+
* LOUT2
14+
* ROUT1
15+
* ROUT2
16+
* LINPUT1
17+
* RINPUT1
18+
* LINPUT2
19+
* RINPUT2
20+
* Mic Bias
21+
22+
maintainers:
23+
- David Yang <[email protected]>
24+
25+
properties:
26+
compatible:
27+
enum:
28+
- everest,es8328
29+
- everest,es8388
30+
31+
reg:
32+
maxItems: 1
33+
34+
"#sound-dai-cells":
35+
const: 0
36+
37+
clocks:
38+
items:
39+
- description: A 22.5792 or 11.2896 MHz clock
40+
41+
DVDD-supply:
42+
description: Regulator providing digital core supply voltage 1.8 - 3.6V
43+
44+
AVDD-supply:
45+
description: Regulator providing analog supply voltage 3.3V
46+
47+
PVDD-supply:
48+
description: Regulator providing digital IO supply voltage 1.8 - 3.6V
49+
50+
HPVDD-supply:
51+
description: Regulator providing analog output voltage 3.3V
52+
53+
required:
54+
- compatible
55+
- clocks
56+
- DVDD-supply
57+
- AVDD-supply
58+
- PVDD-supply
59+
- HPVDD-supply
60+
61+
additionalProperties: false
62+
63+
examples:
64+
- |
65+
i2c {
66+
#address-cells = <1>;
67+
#size-cells = <0>;
68+
es8328: codec@11 {
69+
compatible = "everest,es8328";
70+
reg = <0x11>;
71+
AVDD-supply = <&reg_3p3v>;
72+
DVDD-supply = <&reg_3p3v>;
73+
HPVDD-supply = <&reg_3p3v>;
74+
PVDD-supply = <&reg_3p3v>;
75+
clocks = <&clks 169>;
76+
};
77+
};

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

Lines changed: 0 additions & 36 deletions
This file was deleted.
Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
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 <[email protected]>
11+
- Chancel Liu <[email protected]>
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+
27+
clocks:
28+
minItems: 1
29+
maxItems: 2
30+
31+
clock-names:
32+
minItems: 1
33+
maxItems: 2
34+
35+
gpr:
36+
$ref: /schemas/types.yaml#/definitions/phandle
37+
description: The phandle to the General Purpose Register (GPR) node
38+
39+
reg:
40+
maxItems: 1
41+
42+
power-domains:
43+
maxItems: 1
44+
45+
resets:
46+
maxItems: 1
47+
48+
required:
49+
- compatible
50+
- clocks
51+
- clock-names
52+
53+
allOf:
54+
- if:
55+
properties:
56+
compatible:
57+
contains:
58+
enum:
59+
- fsl,imx8qm-mqs
60+
- fsl,imx8qxp-mqs
61+
then:
62+
properties:
63+
clocks:
64+
items:
65+
- description: Master clock
66+
- description: Clock for register access
67+
clock-names:
68+
items:
69+
- const: mclk
70+
- const: core
71+
required:
72+
- reg
73+
- power-domains
74+
else:
75+
properties:
76+
clocks:
77+
items:
78+
- description: Master clock
79+
clock-names:
80+
items:
81+
- const: mclk
82+
required:
83+
- gpr
84+
85+
additionalProperties: false
86+
87+
examples:
88+
- |
89+
#include <dt-bindings/clock/imx6sx-clock.h>
90+
mqs0: mqs {
91+
compatible = "fsl,imx6sx-mqs";
92+
gpr = <&gpr>;
93+
clocks = <&clks IMX6SX_CLK_SAI1>;
94+
clock-names = "mclk";
95+
};
96+
97+
- |
98+
#include <dt-bindings/firmware/imx/rsrc.h>
99+
mqs1: mqs@59850000 {
100+
compatible = "fsl,imx8qm-mqs";
101+
reg = <0x59850000 0x10000>;
102+
clocks = <&mqs0_lpcg 0>, <&mqs0_lpcg 1>;
103+
clock-names = "mclk", "core";
104+
power-domains = <&pd IMX_SC_R_MQS_0>;
105+
};

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ properties:
3838
- const: txfifo
3939

4040
interrupts:
41-
maxItems: 1
41+
items:
42+
- description: WAKEUPMIX Audio XCVR Interrupt 1
43+
- description: WAKEUPMIX Audio XCVR Interrupt 2
44+
minItems: 1
4245

4346
clocks:
4447
items:
@@ -78,6 +81,23 @@ required:
7881
- dma-names
7982
- resets
8083

84+
allOf:
85+
- if:
86+
properties:
87+
compatible:
88+
contains:
89+
enum:
90+
- fsl,imx93-xcvr
91+
then:
92+
properties:
93+
interrupts:
94+
minItems: 2
95+
maxItems: 2
96+
else:
97+
properties:
98+
interrupts:
99+
maxItems: 1
100+
81101
additionalProperties: false
82102

83103
examples:

Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ allOf:
1515
properties:
1616
compatible:
1717
enum:
18+
- mediatek,mt8188-es8326
1819
- mediatek,mt8188-mt6359-evb
1920
- mediatek,mt8188-nau8825
2021
- mediatek,mt8188-rt5682s

Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,14 @@ properties:
8989
$ref: /schemas/types.yaml#/definitions/uint32
9090
default: 3072000
9191

92+
nuvoton,dmic-slew-rate:
93+
description: The range 0 to 7 represents the speed of DMIC slew rate.
94+
The lowest value 0 means the slowest rate and the highest value
95+
7 means the fastest rate.
96+
$ref: /schemas/types.yaml#/definitions/uint32
97+
maximum: 7
98+
default: 0
99+
92100
nuvoton,left-input-single-end:
93101
description: Enable left input with single-ended settings if set.
94102
For the headset mic application, the single-ended control is
@@ -127,6 +135,7 @@ examples:
127135
nuvoton,jack-insert-debounce = <7>;
128136
nuvoton,jack-eject-debounce = <0>;
129137
nuvoton,dmic-clk-threshold = <3072000>;
138+
nuvoton,dmic-slew-rate = <0>;
130139
#sound-dai-cells = <0>;
131140
};
132141
};

Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
enum:
15-
- qcom,sc7280-lpass-rx-macro
16-
- qcom,sm8250-lpass-rx-macro
17-
- qcom,sm8450-lpass-rx-macro
18-
- qcom,sm8550-lpass-rx-macro
19-
- qcom,sc8280xp-lpass-rx-macro
14+
oneOf:
15+
- enum:
16+
- qcom,sc7280-lpass-rx-macro
17+
- qcom,sm8250-lpass-rx-macro
18+
- qcom,sm8450-lpass-rx-macro
19+
- qcom,sm8550-lpass-rx-macro
20+
- qcom,sc8280xp-lpass-rx-macro
21+
- items:
22+
- enum:
23+
- qcom,sm8650-lpass-rx-macro
24+
- qcom,x1e80100-lpass-rx-macro
25+
- const: qcom,sm8550-lpass-rx-macro
2026

2127
reg:
2228
maxItems: 1
@@ -96,8 +102,9 @@ allOf:
96102
- if:
97103
properties:
98104
compatible:
99-
enum:
100-
- qcom,sm8550-lpass-rx-macro
105+
contains:
106+
enum:
107+
- qcom,sm8550-lpass-rx-macro
101108
then:
102109
properties:
103110
clocks:

0 commit comments

Comments
 (0)