Skip to content

Commit 4b3e381

Browse files
committed
Merge tag 'asoc-fix-v6.10-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.10 A relatively large batch of updates, largely due to the long interval since I last sent fixes due to various travel and holidays. There's a lot of driver specific fixes and quirks in here, none of them too major, and also some fixes for recently introduced memory safety issues in the topology code.
2 parents 9d65ab6 + 68f97fe commit 4b3e381

File tree

299 files changed

+3235
-1805
lines changed

Some content is hidden

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

299 files changed

+3235
-1805
lines changed

.mailmap

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,11 @@ Kalyan Thota <[email protected]> <[email protected]>
337337
Karthikeyan Periyasamy <[email protected]> <[email protected]>
338338
339339
Kay Sievers <[email protected]>
340-
341-
342-
343-
340+
341+
342+
343+
344+
344345
345346
346347
Kenneth W Chen <[email protected]>

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,6 +1921,28 @@
19211921
Format:
19221922
<bus_id>,<clkrate>
19231923

1924+
i2c_touchscreen_props= [HW,ACPI,X86]
1925+
Set device-properties for ACPI-enumerated I2C-attached
1926+
touchscreen, to e.g. fix coordinates of upside-down
1927+
mounted touchscreens. If you need this option please
1928+
submit a drivers/platform/x86/touchscreen_dmi.c patch
1929+
adding a DMI quirk for this.
1930+
1931+
Format:
1932+
<ACPI_HW_ID>:<prop_name>=<val>[:prop_name=val][:...]
1933+
Where <val> is one of:
1934+
Omit "=<val>" entirely Set a boolean device-property
1935+
Unsigned number Set a u32 device-property
1936+
Anything else Set a string device-property
1937+
1938+
Examples (split over multiple lines):
1939+
i2c_touchscreen_props=GDIX1001:touchscreen-inverted-x:
1940+
touchscreen-inverted-y
1941+
1942+
i2c_touchscreen_props=MSSL1680:touchscreen-size-x=1920:
1943+
touchscreen-size-y=1080:touchscreen-inverted-y:
1944+
firmware-name=gsl1680-vendor-model.fw:silead,home-button
1945+
19241946
i8042.debug [HW] Toggle i8042 debug mode
19251947
i8042.unmask_kbd_data
19261948
[HW] Enable printing of interrupt data from the KBD port

Documentation/arch/riscv/uabi.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,6 @@ the extension, or may have deliberately removed it from the listing.
6565
Misaligned accesses
6666
-------------------
6767

68-
Misaligned accesses are supported in userspace, but they may perform poorly.
68+
Misaligned scalar accesses are supported in userspace, but they may perform
69+
poorly. Misaligned vector accesses are only supported if the Zicclsm extension
70+
is supported.

Documentation/core-api/swiotlb.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ alignment larger than PAGE_SIZE.
192192

193193
Dynamic swiotlb
194194
---------------
195-
When CONFIG_DYNAMIC_SWIOTLB is enabled, swiotlb can do on-demand expansion of
195+
When CONFIG_SWIOTLB_DYNAMIC is enabled, swiotlb can do on-demand expansion of
196196
the amount of memory available for allocation as bounce buffers. If a bounce
197197
buffer request fails due to lack of available space, an asynchronous background
198198
task is kicked off to allocate memory from general system memory and turn it

Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ properties:
2424

2525
managers:
2626
type: object
27+
additionalProperties: false
2728
description:
2829
List of the PD69208T4/PD69204T4/PD69208M PSE managers. Each manager
2930
have 4 or 8 physical ports according to the chip version. No need to
@@ -47,8 +48,9 @@ properties:
4748
- "#size-cells"
4849

4950
patternProperties:
50-
"^manager@0[0-9a-b]$":
51+
"^manager@[0-9a-b]$":
5152
type: object
53+
additionalProperties: false
5254
description:
5355
PD69208T4/PD69204T4/PD69208M PSE manager exposing 4 or 8 physical
5456
ports.
@@ -69,9 +71,14 @@ properties:
6971
patternProperties:
7072
'^port@[0-7]$':
7173
type: object
74+
additionalProperties: false
75+
76+
properties:
77+
reg:
78+
maxItems: 1
79+
7280
required:
7381
- reg
74-
additionalProperties: false
7582

7683
required:
7784
- reg

Documentation/devicetree/bindings/net/pse-pd/ti,tps23881.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,31 @@ properties:
2929
of the ports conversion matrix that establishes relationship between
3030
the logical ports and the physical channels.
3131
type: object
32+
additionalProperties: false
33+
34+
properties:
35+
"#address-cells":
36+
const: 1
37+
38+
"#size-cells":
39+
const: 0
3240

3341
patternProperties:
3442
'^channel@[0-7]$':
3543
type: object
44+
additionalProperties: false
45+
46+
properties:
47+
reg:
48+
maxItems: 1
49+
3650
required:
3751
- reg
3852

53+
required:
54+
- "#address-cells"
55+
- "#size-cells"
56+
3957
unevaluatedProperties: false
4058

4159
required:

Documentation/netlink/specs/netdev.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,10 @@ attribute-sets:
349349
Number of packets dropped due to transient lack of resources, such as
350350
buffer space, host descriptors etc.
351351
type: uint
352+
-
353+
name: rx-csum-complete
354+
doc: Number of packets that were marked as CHECKSUM_COMPLETE.
355+
type: uint
352356
-
353357
name: rx-csum-unnecessary
354358
doc: Number of packets that were marked as CHECKSUM_UNNECESSARY.

Documentation/process/maintainer-netdev.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ preferably including links to previous postings, for example::
227227
The amount of mooing will depend on packet rate so should match
228228
the diurnal cycle quite well.
229229

230-
Signed-of-by: Joe Defarmer <[email protected]>
230+
Signed-off-by: Joe Defarmer <[email protected]>
231231
---
232232
v3:
233233
- add a note about time-of-day mooing fluctuation to the commit message

MAINTAINERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3854,6 +3854,7 @@ BPF JIT for ARM64
38543854
M: Daniel Borkmann <[email protected]>
38553855
M: Alexei Starovoitov <[email protected]>
38563856
M: Puranjay Mohan <[email protected]>
3857+
R: Xu Kuohai <[email protected]>
38573858
38583859
S: Supported
38593860
F: arch/arm64/net/
@@ -18211,6 +18212,7 @@ QCOM AUDIO (ASoC) DRIVERS
1821118212
M: Srinivas Kandagatla <[email protected]>
1821218213
M: Banajit Goswami <[email protected]>
1821318214
L: [email protected] (moderated for non-subscribers)
18215+
1821418216
S: Supported
1821518217
F: Documentation/devicetree/bindings/soc/qcom/qcom,apr*
1821618218
F: Documentation/devicetree/bindings/sound/qcom,*
@@ -21315,7 +21317,7 @@ F: arch/riscv/boot/dts/starfive/
2131521317

2131621318
STARFIVE DWMAC GLUE LAYER
2131721319
M: Emil Renner Berthing <[email protected]>
21318-
M: Samin Guo <samin.guo@starfivetech.com>
21320+
M: Minda Chen <minda.chen@starfivetech.com>
2131921321
S: Maintained
2132021322
F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
2132121323
F: drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 10
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

0 commit comments

Comments
 (0)