Skip to content

Commit 50c8f83

Browse files
committed
Merge tag 'asoc-fix-v7.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v7.0 This is two week's worth of fixes and quirks so it's a bit larger than you might expect, there's nothing too exciting individually and nothing in core code.
2 parents 5917212 + d40a198 commit 50c8f83

841 files changed

Lines changed: 9971 additions & 5507 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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ Henrik Rydberg <[email protected]>
327327
Herbert Xu <[email protected]>
328328
329329
330+
330331
331332
332333
@@ -498,7 +499,8 @@ Lior David <[email protected]> <[email protected]>
498499
499500
500501
501-
502+
503+
502504
503505
504506

Documentation/ABI/testing/sysfs-block-zram

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ Description:
151151
The algorithm_params file is write-only and is used to setup
152152
compression algorithm parameters.
153153

154-
What: /sys/block/zram<id>/writeback_compressed
154+
What: /sys/block/zram<id>/compressed_writeback
155155
Date: Decemeber 2025
156156
Contact: Richard Chang <[email protected]>
157157
Description:
158-
The writeback_compressed device atrribute toggles compressed
158+
The compressed_writeback device atrribute toggles compressed
159159
writeback feature.
160160

161161
What: /sys/block/zram<id>/writeback_batch_size

Documentation/admin-guide/blockdev/zram.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ writeback_limit WO specifies the maximum amount of write IO zram
216216
writeback_limit_enable RW show and set writeback_limit feature
217217
writeback_batch_size RW show and set maximum number of in-flight
218218
writeback operations
219-
writeback_compressed RW show and set compressed writeback feature
219+
compressed_writeback RW show and set compressed writeback feature
220220
comp_algorithm RW show and change the compression algorithm
221221
algorithm_params WO setup compression algorithm parameters
222222
compact WO trigger memory compaction
@@ -439,11 +439,11 @@ budget in next setting is user's job.
439439
By default zram stores written back pages in decompressed (raw) form, which
440440
means that writeback operation involves decompression of the page before
441441
writing it to the backing device. This behavior can be changed by enabling
442-
`writeback_compressed` feature, which causes zram to write compressed pages
442+
`compressed_writeback` feature, which causes zram to write compressed pages
443443
to the backing device, thus avoiding decompression overhead. To enable
444444
this feature, execute::
445445

446-
$ echo yes > /sys/block/zramX/writeback_compressed
446+
$ echo yes > /sys/block/zramX/compressed_writeback
447447

448448
Note that this feature should be configured before the `zramX` device is
449449
initialized.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8196,6 +8196,9 @@ Kernel parameters
81968196
p = USB_QUIRK_SHORT_SET_ADDRESS_REQ_TIMEOUT
81978197
(Reduce timeout of the SET_ADDRESS
81988198
request from 5000 ms to 500 ms);
8199+
q = USB_QUIRK_FORCE_ONE_CONFIG (Device
8200+
claims zero configurations,
8201+
forcing to 1);
81998202
Example: quirks=0781:5580:bk,0a5c:5834:gij
82008203

82018204
usbhid.mousepoll=

Documentation/dev-tools/kunit/run_wrapper.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@ command line arguments:
336336
- ``--list_tests_attr``: If set, lists all tests that will be run and all of their
337337
attributes.
338338

339+
- ``--list_suites``: If set, lists all suites that will be run.
340+
339341
Command-line completion
340342
==============================
341343

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ allOf:
253253
enum:
254254
# these platforms support 2 streams MST on some interfaces,
255255
# others are SST only
256-
- qcom,glymur-dp
257256
- qcom,sc8280xp-dp
258257
- qcom,x1e80100-dp
259258
then:
@@ -310,6 +309,26 @@ allOf:
310309
minItems: 6
311310
maxItems: 8
312311

312+
- if:
313+
properties:
314+
compatible:
315+
contains:
316+
enum:
317+
# these platforms support 2 streams MST on some interfaces,
318+
# others are SST only, but all controllers have 4 ports
319+
- qcom,glymur-dp
320+
then:
321+
properties:
322+
reg:
323+
minItems: 9
324+
maxItems: 9
325+
clocks:
326+
minItems: 5
327+
maxItems: 6
328+
clocks-names:
329+
minItems: 5
330+
maxItems: 6
331+
313332
unevaluatedProperties: false
314333

315334
examples:

Documentation/devicetree/bindings/display/msm/qcom,glymur-mdss.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,17 @@ examples:
176176
};
177177
};
178178
179-
displayport-controller@ae90000 {
179+
displayport-controller@af54000 {
180180
compatible = "qcom,glymur-dp";
181-
reg = <0xae90000 0x200>,
182-
<0xae90200 0x200>,
183-
<0xae90400 0x600>,
184-
<0xae91000 0x400>,
185-
<0xae91400 0x400>;
181+
reg = <0xaf54000 0x200>,
182+
<0xaf54200 0x200>,
183+
<0xaf55000 0xc00>,
184+
<0xaf56000 0x400>,
185+
<0xaf57000 0x400>,
186+
<0xaf58000 0x400>,
187+
<0xaf59000 0x400>,
188+
<0xaf5a000 0x600>,
189+
<0xaf5b000 0x600>;
186190
187191
interrupt-parent = <&mdss>;
188192
interrupts = <12>;

Documentation/devicetree/bindings/display/msm/qcom,sm8750-mdss.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- Krzysztof Kozlowski <[email protected]>
1111

1212
description:
13-
SM8650 MSM Mobile Display Subsystem(MDSS), which encapsulates sub-blocks like
13+
SM8750 MSM Mobile Display Subsystem(MDSS), which encapsulates sub-blocks like
1414
DPU display controller, DSI and DP interfaces etc.
1515

1616
$ref: /schemas/display/msm/mdss-common.yaml#

Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Synopsys DesignWare APB I2C Controller
88

99
maintainers:
10-
- Jarkko Nikula <jarkko.nikula@linux.intel.com>
10+
- Mika Westerberg <mika.westerberg@linux.intel.com>
1111

1212
allOf:
1313
- $ref: /schemas/i2c/i2c-controller.yaml#

Documentation/devicetree/bindings/mtd/st,spear600-smi.yaml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ description:
1919
Flash sub nodes describe the memory range and optional per-flash
2020
properties.
2121

22-
allOf:
23-
- $ref: mtd.yaml#
24-
2522
properties:
2623
compatible:
2724
const: st,spear600-smi
@@ -42,14 +39,29 @@ properties:
4239
$ref: /schemas/types.yaml#/definitions/uint32
4340
description: Functional clock rate of the SMI controller in Hz.
4441

45-
st,smi-fast-mode:
46-
type: boolean
47-
description: Indicates that the attached flash supports fast read mode.
42+
patternProperties:
43+
"^flash@.*$":
44+
$ref: /schemas/mtd/mtd.yaml#
45+
46+
properties:
47+
reg:
48+
maxItems: 1
49+
50+
st,smi-fast-mode:
51+
type: boolean
52+
description: Indicates that the attached flash supports fast read mode.
53+
54+
unevaluatedProperties: false
55+
56+
required:
57+
- reg
4858

4959
required:
5060
- compatible
5161
- reg
5262
- clock-rate
63+
- "#address-cells"
64+
- "#size-cells"
5365

5466
unevaluatedProperties: false
5567

@@ -64,7 +76,7 @@ examples:
6476
interrupts = <12>;
6577
clock-rate = <50000000>; /* 50 MHz */
6678
67-
flash@f8000000 {
79+
flash@fc000000 {
6880
reg = <0xfc000000 0x1000>;
6981
st,smi-fast-mode;
7082
};

0 commit comments

Comments
 (0)