Skip to content

Commit de5635f

Browse files
bardliaobardliao
authored
Merge pull request #5206 from bardliao/merge/sound-upstream-20241016
Merge/sound upstream 20241016
2 parents a8cc01c + e788959 commit de5635f

55 files changed

Lines changed: 1869 additions & 1065 deletions

Some content is hidden

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

‎Documentation/admin-guide/kernel-parameters.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ is applicable::
159159
SCSI Appropriate SCSI support is enabled.
160160
A lot of drivers have their options described inside
161161
the Documentation/scsi/ sub-directory.
162+
SDW SoundWire support is enabled.
162163
SECURITY Different security models are enabled.
163164
SELINUX SELinux support is enabled.
164165
SERIAL Serial support is enabled.

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6060,6 +6060,10 @@
60606060
non-zero "wait" parameter. See weight_single
60616061
and weight_many.
60626062

6063+
sdw_mclk_divider=[SDW]
6064+
Specify the MCLK divider for Intel SoundWire buses in
6065+
case the BIOS does not provide the clock rate properly.
6066+
60636067
skew_tick= [KNL,EARLY] Offset the periodic timer tick per cpu to mitigate
60646068
xtime_lock contention on larger systems, and/or RCU lock
60656069
contention on all systems with CONFIG_MAXSMP set.

‎Documentation/devicetree/bindings/sound/everest,es8316.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
$id: http://devicetree.org/schemas/sound/everest,es8316.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Everest ES8311 and ES8316 audio CODECs
7+
title: Everest ES8311, ES8316 and ES8323 audio CODECs
88

99
maintainers:
1010
- Daniel Drake <drake@endlessm.com>
1111
- Katsuhiro Suzuki <katsuhiro@katsuster.net>
1212
- Matteo Martelli <matteomartelli3@gmail.com>
13+
- Binbin Zhou <zhoubinbin@loongson.cn>
1314

1415
allOf:
1516
- $ref: dai-common.yaml#
@@ -19,6 +20,7 @@ properties:
1920
enum:
2021
- everest,es8311
2122
- everest,es8316
23+
- everest,es8323
2224

2325
reg:
2426
maxItems: 1

‎Documentation/devicetree/bindings/sound/loongson,ls2k1000-i2s.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/loongson,ls2k1000-i2s.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Loongson-2K1000 I2S controller
8+
9+
maintainers:
10+
- Binbin Zhou <zhoubinbin@loongson.cn>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: loongson,ls2k1000-i2s
18+
19+
reg:
20+
items:
21+
- description: Loongson I2S controller Registers.
22+
- description: APB DMA config register for Loongson I2S controller.
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
clocks:
28+
maxItems: 1
29+
30+
dmas:
31+
maxItems: 2
32+
33+
dma-names:
34+
items:
35+
- const: tx
36+
- const: rx
37+
38+
'#sound-dai-cells':
39+
const: 0
40+
41+
required:
42+
- compatible
43+
- reg
44+
- interrupts
45+
- clocks
46+
- dmas
47+
- dma-names
48+
- '#sound-dai-cells'
49+
50+
unevaluatedProperties: false
51+
52+
examples:
53+
- |
54+
#include <dt-bindings/clock/loongson,ls2k-clk.h>
55+
#include <dt-bindings/interrupt-controller/irq.h>
56+
57+
i2s@1fe2d000 {
58+
compatible = "loongson,ls2k1000-i2s";
59+
reg = <0x1fe2d000 0x14>,
60+
<0x1fe00438 0x8>;
61+
interrupt-parent = <&liointc0>;
62+
interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
63+
clocks = <&clk LOONGSON2_APB_CLK>;
64+
dmas = <&apbdma2 0>, <&apbdma3 0>;
65+
dma-names = "tx", "rx";
66+
#sound-dai-cells = <0>;
67+
};
68+
...

‎Documentation/devicetree/bindings/sound/nxp,uda1342.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/nxp,uda1342.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP uda1342 audio CODECs
8+
9+
maintainers:
10+
- Binbin Zhou <zhoubinbin@loongson.cn>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: nxp,uda1342
18+
19+
reg:
20+
maxItems: 1
21+
22+
'#sound-dai-cells':
23+
const: 0
24+
25+
required:
26+
- compatible
27+
- reg
28+
- '#sound-dai-cells'
29+
30+
unevaluatedProperties: false
31+
32+
examples:
33+
- |
34+
i2c {
35+
#address-cells = <1>;
36+
#size-cells = <0>;
37+
codec@1a {
38+
compatible = "nxp,uda1342";
39+
reg = <0x1a>;
40+
#sound-dai-cells = <0>;
41+
};
42+
};

‎MAINTAINERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15089,6 +15089,7 @@ F: drivers/spi/spi-at91-usart.c
1508915089

1509015090
MICROCHIP AUDIO ASOC DRIVERS
1509115091
M: Claudiu Beznea <claudiu.beznea@tuxon.dev>
15092+
M: Andrei Simion <andrei.simion@microchip.com>
1509215093
L: linux-sound@vger.kernel.org
1509315094
S: Supported
1509415095
F: Documentation/devicetree/bindings/sound/atmel*
@@ -15197,6 +15198,7 @@ F: include/video/atmel_lcdc.h
1519715198

1519815199
MICROCHIP MCP16502 PMIC DRIVER
1519915200
M: Claudiu Beznea <claudiu.beznea@tuxon.dev>
15201+
M: Andrei Simion <andrei.simion@microchip.com>
1520015202
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1520115203
S: Supported
1520215204
F: Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml
@@ -15328,6 +15330,7 @@ F: drivers/spi/spi-atmel.*
1532815330

1532915331
MICROCHIP SSC DRIVER
1533015332
M: Claudiu Beznea <claudiu.beznea@tuxon.dev>
15333+
M: Andrei Simion <andrei.simion@microchip.com>
1533115334
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1533215335
S: Supported
1533315336
F: Documentation/devicetree/bindings/misc/atmel-ssc.txt

‎include/sound/hda_register.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
180180
#define SD_STS_FIFO_READY 0x20 /* FIFO ready */
181181

182182
/* INTCTL and INTSTS */
183-
#define AZX_INT_ALL_STREAM 0xff /* all stream interrupts */
183+
#define AZX_INT_ALL_STREAM 0x3fffffff /* all stream interrupts */
184184
#define AZX_INT_CTRL_EN 0x40000000 /* controller interrupt enable bit */
185185
#define AZX_INT_GLOBAL_EN 0x80000000 /* global interrupt enable bit */
186186

‎include/uapi/sound/asoc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888

8989
/* ABI version */
9090
#define SND_SOC_TPLG_ABI_VERSION 0x5 /* current version */
91-
#define SND_SOC_TPLG_ABI_VERSION_MIN 0x4 /* oldest version supported */
91+
#define SND_SOC_TPLG_ABI_VERSION_MIN 0x5 /* oldest version supported */
9292

9393
/* Max size of TLV data */
9494
#define SND_SOC_TPLG_TLV_SIZE 32

‎sound/firewire/cmp.c‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -333,53 +333,6 @@ int cmp_connection_establish(struct cmp_connection *c)
333333
}
334334
EXPORT_SYMBOL(cmp_connection_establish);
335335

336-
/**
337-
* cmp_connection_update - update the connection after a bus reset
338-
* @c: the connection manager
339-
*
340-
* This function must be called from the driver's .update handler to
341-
* reestablish any connection that might have been active.
342-
*
343-
* Returns zero on success, or a negative error code. On an error, the
344-
* connection is broken and the caller must stop transmitting iso packets.
345-
*/
346-
int cmp_connection_update(struct cmp_connection *c)
347-
{
348-
int err;
349-
350-
mutex_lock(&c->mutex);
351-
352-
if (!c->connected) {
353-
mutex_unlock(&c->mutex);
354-
return 0;
355-
}
356-
357-
err = fw_iso_resources_update(&c->resources);
358-
if (err < 0)
359-
goto err_unconnect;
360-
361-
if (c->direction == CMP_OUTPUT)
362-
err = pcr_modify(c, opcr_set_modify, pcr_set_check,
363-
SUCCEED_ON_BUS_RESET);
364-
else
365-
err = pcr_modify(c, ipcr_set_modify, pcr_set_check,
366-
SUCCEED_ON_BUS_RESET);
367-
368-
if (err < 0)
369-
goto err_unconnect;
370-
371-
mutex_unlock(&c->mutex);
372-
373-
return 0;
374-
375-
err_unconnect:
376-
c->connected = false;
377-
mutex_unlock(&c->mutex);
378-
379-
return err;
380-
}
381-
EXPORT_SYMBOL(cmp_connection_update);
382-
383336
static __be32 pcr_break_modify(struct cmp_connection *c, __be32 pcr)
384337
{
385338
return pcr & ~cpu_to_be32(PCR_BCAST_CONN | PCR_P2P_CONN_MASK);

‎sound/firewire/cmp.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ int cmp_connection_reserve(struct cmp_connection *connection,
4747
void cmp_connection_release(struct cmp_connection *connection);
4848

4949
int cmp_connection_establish(struct cmp_connection *connection);
50-
int cmp_connection_update(struct cmp_connection *connection);
5150
void cmp_connection_break(struct cmp_connection *connection);
5251

5352
#endif

0 commit comments

Comments
 (0)