Skip to content

Commit 6e9a1f6

Browse files
authored
Merge pull request thesofproject#5667 from bardliao/merge/sound-upstream-20260211
Merge/sound upstream 20260211
2 parents 5f4a36a + 9c3b967 commit 6e9a1f6

453 files changed

Lines changed: 6486 additions & 2297 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>
3434
Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
3535
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
3636
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
37+
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@futurfusion.io>
3738
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin.ext@nsn.com>
3839
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@gmx.de>
3940
Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@nokia.com>
@@ -786,7 +787,8 @@ Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com> <subashab@codeaurora.
786787
Subbaraman Narayanamurthy <quic_subbaram@quicinc.com> <subbaram@codeaurora.org>
787788
Subhash Jadavani <subhashj@codeaurora.org>
788789
Sudarshan Rajagopalan <quic_sudaraja@quicinc.com> <sudaraja@codeaurora.org>
789-
Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
790+
Sudeep Holla <sudeep.holla@kernel.org> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
791+
Sudeep Holla <sudeep.holla@kernel.org> <sudeep.holla@arm.com>
790792
Sumit Garg <sumit.garg@kernel.org> <sumit.garg@linaro.org>
791793
Sumit Semwal <sumit.semwal@ti.com>
792794
Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org>
@@ -851,6 +853,7 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
851853
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>
852854
Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>
853855
Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>
856+
Viacheslav Bocharov <v@baodeep.com> <adeep@lexina.in>
854857
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>
855858
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>
856859
Vincent Mailhol <mailhol@kernel.org> <mailhol.vincent@wanadoo.fr>

Documentation/ABI/testing/sysfs-class-tsm

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,3 @@ Description:
77
signals when the PCI layer is able to support establishment of
88
link encryption and other device-security features coordinated
99
through a platform tsm.
10-
11-
What: /sys/class/tsm/tsmN/streamH.R.E
12-
Contact: linux-pci@vger.kernel.org
13-
Description:
14-
(RO) When a host bridge has established a secure connection via
15-
the platform TSM, symlink appears. The primary function of this
16-
is have a system global review of TSM resource consumption
17-
across host bridges. The link points to the endpoint PCI device
18-
and matches the same link published by the host bridge. See
19-
Documentation/ABI/testing/sysfs-devices-pci-host-bridge.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3472,6 +3472,11 @@ Kernel parameters
34723472
If there are multiple matching configurations changing
34733473
the same attribute, the last one is used.
34743474

3475+
liveupdate= [KNL,EARLY]
3476+
Format: <bool>
3477+
Enable Live Update Orchestrator (LUO).
3478+
Default: off.
3479+
34753480
load_ramdisk= [RAM] [Deprecated]
34763481

34773482
lockd.nlm_grace_period=P [NFS] Assign grace period.

Documentation/admin-guide/sysctl/vm.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,8 @@ eventually gets pushed out to disk. This tunable is used to define when dirty
231231
inode is old enough to be eligible for writeback by the kernel flusher threads.
232232
And, it is also used as the interval to wakeup dirtytime_writeback thread.
233233

234+
Setting this to zero disables periodic dirtytime writeback.
235+
234236

235237
dirty_writeback_centisecs
236238
=========================

Documentation/devicetree/bindings/pinctrl/marvell,armada3710-xb-pinctrl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ patternProperties:
8888
pcie1_clkreq, pcie1_wakeup, pmic0, pmic1, ptp, ptp_clk,
8989
ptp_trig, pwm0, pwm1, pwm2, pwm3, rgmii, sdio0, sdio_sb, smi,
9090
spi_cs1, spi_cs2, spi_cs3, spi_quad, uart1, uart2,
91-
usb2_drvvbus1, usb32_drvvbus ]
91+
usb2_drvvbus1, usb32_drvvbus0 ]
9292

9393
function:
9494
enum: [ drvbus, emmc, gpio, i2c, jtag, led, mii, mii_err, onewire,

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

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@ description:
1515
sound quallity, which is a new high efficiency, low
1616
noise, constant large volume, 6th Smart K audio amplifier.
1717

18-
allOf:
19-
- $ref: dai-common.yaml#
20-
2118
properties:
2219
compatible:
23-
const: awinic,aw87390
20+
oneOf:
21+
- enum:
22+
- awinic,aw87390
23+
- items:
24+
- enum:
25+
- anbernic,rgds-amp
26+
- const: awinic,aw87391
2427

2528
reg:
2629
maxItems: 1
@@ -40,10 +43,31 @@ required:
4043
- compatible
4144
- reg
4245
- "#sound-dai-cells"
43-
- awinic,audio-channel
4446

4547
unevaluatedProperties: false
4648

49+
allOf:
50+
- $ref: dai-common.yaml#
51+
- if:
52+
properties:
53+
compatible:
54+
contains:
55+
enum:
56+
- awinic,aw87390
57+
then:
58+
required:
59+
- awinic,audio-channel
60+
61+
- if:
62+
properties:
63+
compatible:
64+
contains:
65+
enum:
66+
- anbernic,rgds-amp
67+
then:
68+
properties:
69+
vdd-supply: true
70+
4771
examples:
4872
- |
4973
i2c {

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml

Lines changed: 66 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,33 @@ properties:
4040
tdm-slots:
4141
$ref: /schemas/types.yaml#/definitions/uint32
4242
description:
43-
number of channels over one serializer
44-
the property is ignored in DIT mode
43+
Number of channels over one serializer. This property
44+
specifies the TX playback TDM slot count, along with default RX slot count
45+
if tdm-slots-rx is not specified.
46+
The property is ignored in DIT mode.
4547
minimum: 2
4648
maximum: 32
4749

50+
tdm-slots-rx:
51+
$ref: /schemas/types.yaml#/definitions/uint32
52+
description:
53+
Number of RX capture channels over one serializer. If specified,
54+
allows independent RX TDM slot count separate from TX. Requires
55+
ti,async-mode to be enabled for independent TX/RX clock rates.
56+
The property is ignored in DIT mode.
57+
minimum: 2
58+
maximum: 32
59+
60+
ti,async-mode:
61+
description:
62+
Specify to allow independent TX & RX clocking,
63+
to enable audio playback & record with different sampling rate,
64+
and different number of bits per frame.
65+
if property is omitted, TX and RX will share same bit clock and frame clock signals,
66+
thus RX need to use same bits per frame and sampling rate as TX in synchronous mode.
67+
the property is ignored in DIT mode (as DIT is TX-only)
68+
type: boolean
69+
4870
serial-dir:
4971
description:
5072
A list of serializer configuration
@@ -125,7 +147,21 @@ properties:
125147

126148
auxclk-fs-ratio:
127149
$ref: /schemas/types.yaml#/definitions/uint32
128-
description: ratio of AUCLK and FS rate if applicable
150+
description:
151+
Ratio of AUCLK and FS rate if applicable. This property specifies
152+
the TX ratio, along with default RX ratio if auxclk-fs-ratio-rx
153+
is not specified.
154+
When not specified, the inputted system clock frequency via set_sysclk
155+
callback by the machine driver is used for divider calculation.
156+
157+
auxclk-fs-ratio-rx:
158+
$ref: /schemas/types.yaml#/definitions/uint32
159+
description:
160+
Ratio of AUCLK and FS rate for RX. If specified, allows
161+
for a different RX ratio. Requires ti,async-mode to be
162+
enabled when the ratio differs from auxclk-fs-ratio.
163+
When not specified, it defaults to the value of auxclk-fs-ratio.
164+
The property is ignored in DIT mode.
129165

130166
gpio-controller: true
131167

@@ -170,14 +206,38 @@ allOf:
170206
- $ref: dai-common.yaml#
171207
- if:
172208
properties:
173-
opmode:
209+
op-mode:
174210
enum:
175211
- 0
176-
177212
then:
178213
required:
179214
- tdm-slots
180215

216+
- if:
217+
properties:
218+
op-mode:
219+
const: 1
220+
then:
221+
properties:
222+
tdm-slots: false
223+
tdm-slots-rx: false
224+
ti,async-mode: false
225+
auxclk-fs-ratio-rx: false
226+
227+
- if:
228+
required:
229+
- tdm-slots-rx
230+
then:
231+
required:
232+
- ti,async-mode
233+
234+
- if:
235+
required:
236+
- auxclk-fs-ratio-rx
237+
then:
238+
required:
239+
- ti,async-mode
240+
181241
unevaluatedProperties: false
182242

183243
examples:
@@ -190,6 +250,7 @@ examples:
190250
interrupt-names = "tx", "rx";
191251
op-mode = <0>; /* MCASP_IIS_MODE */
192252
tdm-slots = <2>;
253+
ti,async-mode;
193254
dmas = <&main_udmap 0xc400>, <&main_udmap 0x4400>;
194255
dma-names = "tx", "rx";
195256
serial-dir = <

Documentation/devicetree/bindings/sound/fsl,imx-asrc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- fsl,imx53-asrc
2626
- fsl,imx8qm-asrc
2727
- fsl,imx8qxp-asrc
28+
- fsl,imx952-asrc
2829
- items:
2930
- enum:
3031
- fsl,imx6sx-asrc

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,20 @@ allOf:
2222

2323
properties:
2424
compatible:
25-
enum:
26-
- fsl,imx7ulp-rpmsg-audio
27-
- fsl,imx8mn-rpmsg-audio
28-
- fsl,imx8mm-rpmsg-audio
29-
- fsl,imx8mp-rpmsg-audio
30-
- fsl,imx8ulp-rpmsg-audio
31-
- fsl,imx93-rpmsg-audio
32-
- fsl,imx95-rpmsg-audio
25+
oneOf:
26+
- enum:
27+
- fsl,imx7ulp-rpmsg-audio
28+
- fsl,imx8mn-rpmsg-audio
29+
- fsl,imx8mm-rpmsg-audio
30+
- fsl,imx8mp-rpmsg-audio
31+
- fsl,imx8ulp-rpmsg-audio
32+
- fsl,imx93-rpmsg-audio
33+
- fsl,imx95-rpmsg-audio
34+
- items:
35+
- enum:
36+
- fsl,imx94-rpmsg-audio
37+
- fsl,imx952-rpmsg-audio
38+
- const: fsl,imx95-rpmsg-audio
3339

3440
clocks:
3541
items:

Documentation/devicetree/bindings/sound/ti,tlv320aic3x.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ maintainers:
4646
properties:
4747
compatible:
4848
enum:
49+
- ti,tlv320aic23
4950
- ti,tlv320aic3x
5051
- ti,tlv320aic33
5152
- ti,tlv320aic3007

0 commit comments

Comments
 (0)