Skip to content

Commit 2c8d2a5

Browse files
committed
Merge tag 'sound-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "This was a relatively calm cycle, and most of changes are rather small device-specific fixes. Here are highlights: Core: - Further enhancements of ALSA rawmidi and sequencer APIs for MIDI 2.0 - compress-offload API extensions for ASRC support ASoC: - Allow clocking on each DAI in an audio graph card to be configured separately - Improved power management for Renesas RZ-SSI - KUnit testing for the Cirrus DSP framework - Memory to meory operation support for Freescale/NXP platforms - Support for pause operations in SOF - Support for Allwinner suinv F1C100s, Awinc AW88083, Realtek ALC5682I-VE HD- and USB-audio: - Add support for Focusrite Scarlett 4th Gen 16i16, 18i16, and 18i20 interfaces via new FCP driver - TAS2781 SPI HD-audio sub-codec support - Various device-specific quirks as usual" * tag 'sound-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (235 commits) ALSA: hda: tas2781-spi: Fix bogus error handling in tas2781_hda_spi_probe() ALSA: hda: tas2781-spi: Fix error code in tas2781_read_acpi() ALSA: hda: tas2781-spi: Delete some dead code ALSA: usb: fcp: Fix return code from poll ops ALSA: usb: fcp: Fix incorrect resp->opcode retrieval ALSA: usb: fcp: Fix meter_levels type to __le32 ALSA: hda/realtek: Enable Mute LED on HP Laptop 14s-fq1xxx ALSA: hda: tas2781-spi: Fix -Wsometimes-uninitialized in tasdevice_spi_switch_book() ALSA: ctxfi: Simplify dao_clear_{left,right}_input() functions ALSA: hda: tas2781-spi: select CRC32 instead of CRC32_SARWATE ALSA: usb: fcp: Fix hwdep read ops types ALSA: scarlett2: Add device_setup option to use FCP driver ALSA: FCP: Add Focusrite Control Protocol driver ALSA: hda/tas2781: Add tas2781 hda SPI driver ALSA: hda/realtek - Fixed headphone distorted sound on Acer Aspire A115-31 laptop ASoC: xilinx: xlnx_spdif: Simpify using devm_clk_get_enabled() ALSA: hda: Support for Ideapad hotkey mute LEDs ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83JX, 83MC and 83NM ASoC: Intel: sof_sdw: Fix DMI match for Lenovo 83LC ASoC: dapm: add support for preparing streams ...
2 parents 454cb97 + 6aa96f7 commit 2c8d2a5

File tree

233 files changed

+27079
-1786
lines changed

Some content is hidden

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

233 files changed

+27079
-1786
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: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ properties:
2323
- allwinner,sun8i-h3-codec
2424
- allwinner,sun8i-v3s-codec
2525
- allwinner,sun50i-h616-codec
26+
- allwinner,suniv-f1c100s-codec
2627

2728
reg:
2829
maxItems: 1
@@ -77,6 +78,7 @@ properties:
7778
- MIC1
7879
- MIC2
7980
- MIC3
81+
- MIC
8082

8183
# Microphone Biases from the SoC
8284
- HBIAS
@@ -87,6 +89,8 @@ properties:
8789
- Headset Mic
8890
- Line In
8991
- Line Out
92+
- Right FM In
93+
- Left FM In
9094
- Mic
9195
- Speaker
9296

@@ -270,6 +274,33 @@ allOf:
270274
- const: rx
271275
- const: tx
272276

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+
273304
unevaluatedProperties: false
274305

275306
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)