Skip to content

Commit 8cbd01b

Browse files
tiwaitiwai
committed
Merge tag 'asoc-fix-v6.13-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.13 A mix of quirks and small fixes, nothing too major anywhere.
2 parents 66a0a2b + 32c9c06 commit 8cbd01b

File tree

344 files changed

+7148
-5340
lines changed

Some content is hidden

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

344 files changed

+7148
-5340
lines changed

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

+5
Original file line numberDiff line numberDiff line change
@@ -4822,6 +4822,11 @@
48224822
can be preempted anytime. Tasks will also yield
48234823
contended spinlocks (if the critical section isn't
48244824
explicitly preempt disabled beyond the lock itself).
4825+
lazy - Scheduler controlled. Similar to full but instead
4826+
of preempting the task immediately, the task gets
4827+
one HZ tick time to yield itself before the
4828+
preemption will be forced. One preemption is when the
4829+
task returns to user space.
48254830

48264831
print-fatal-signals=
48274832
[KNL] debug: print fatal signals

‎Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml

+2-5
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,8 @@ allOf:
113113
maxItems: 1
114114

115115
- if:
116-
properties:
117-
compatible:
118-
contains:
119-
enum:
120-
- fsl,imx95-usb-phy
116+
required:
117+
- orientation-switch
121118
then:
122119
$ref: /schemas/usb/usb-switch.yaml#
123120

‎Documentation/devicetree/bindings/regulator/qcom,qca6390-pmu.yaml

+27
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
compatible:
1919
enum:
2020
- qcom,qca6390-pmu
21+
- qcom,wcn6750-pmu
2122
- qcom,wcn6855-pmu
2223
- qcom,wcn7850-pmu
2324

@@ -27,6 +28,9 @@ properties:
2728
vddaon-supply:
2829
description: VDD_AON supply regulator handle
2930

31+
vddasd-supply:
32+
description: VDD_ASD supply regulator handle
33+
3034
vdddig-supply:
3135
description: VDD_DIG supply regulator handle
3236

@@ -42,6 +46,9 @@ properties:
4246
vddio1p2-supply:
4347
description: VDD_IO_1P2 supply regulator handle
4448

49+
vddrfa0p8-supply:
50+
description: VDD_RFA_0P8 supply regulator handle
51+
4552
vddrfa0p95-supply:
4653
description: VDD_RFA_0P95 supply regulator handle
4754

@@ -51,12 +58,18 @@ properties:
5158
vddrfa1p3-supply:
5259
description: VDD_RFA_1P3 supply regulator handle
5360

61+
vddrfa1p7-supply:
62+
description: VDD_RFA_1P7 supply regulator handle
63+
5464
vddrfa1p8-supply:
5565
description: VDD_RFA_1P8 supply regulator handle
5666

5767
vddrfa1p9-supply:
5868
description: VDD_RFA_1P9 supply regulator handle
5969

70+
vddrfa2p2-supply:
71+
description: VDD_RFA_2P2 supply regulator handle
72+
6073
vddpcie1p3-supply:
6174
description: VDD_PCIE_1P3 supply regulator handle
6275

@@ -119,6 +132,20 @@ allOf:
119132
- vddpcie1p3-supply
120133
- vddpcie1p9-supply
121134
- vddio-supply
135+
- if:
136+
properties:
137+
compatible:
138+
contains:
139+
const: qcom,wcn6750-pmu
140+
then:
141+
required:
142+
- vddaon-supply
143+
- vddasd-supply
144+
- vddpmu-supply
145+
- vddrfa0p8-supply
146+
- vddrfa1p2-supply
147+
- vddrfa1p7-supply
148+
- vddrfa2p2-supply
122149
- if:
123150
properties:
124151
compatible:

‎Documentation/devicetree/bindings/sound/realtek,rt5645.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ properties:
5151
description: Power supply for AVDD, providing 1.8V.
5252

5353
cpvdd-supply:
54-
description: Power supply for CPVDD, providing 3.5V.
54+
description: Power supply for CPVDD, providing 1.8V.
5555

5656
hp-detect-gpios:
5757
description:

‎Documentation/networking/ip-sysctl.rst

+6
Original file line numberDiff line numberDiff line change
@@ -2170,6 +2170,12 @@ nexthop_compat_mode - BOOLEAN
21702170
understands the new API, this sysctl can be disabled to achieve full
21712171
performance benefits of the new API by disabling the nexthop expansion
21722172
and extraneous notifications.
2173+
2174+
Note that as a backward-compatible mode, dumping of modern features
2175+
might be incomplete or wrong. For example, resilient groups will not be
2176+
shown as such, but rather as just a list of next hops. Also weights that
2177+
do not fit into 8 bits will show incorrectly.
2178+
21732179
Default: true (backward compat mode)
21742180

21752181
fib_notify_on_flag_change - INTEGER

‎Documentation/power/runtime_pm.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,9 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h:
347347

348348
`int pm_runtime_resume_and_get(struct device *dev);`
349349
- run pm_runtime_resume(dev) and if successful, increment the device's
350-
usage counter; return the result of pm_runtime_resume
350+
usage counter; returns 0 on success (whether or not the device's
351+
runtime PM status was already 'active') or the error code from
352+
pm_runtime_resume() on failure.
351353

352354
`int pm_request_idle(struct device *dev);`
353355
- submit a request to execute the subsystem-level idle callback for the

‎MAINTAINERS

+4-2
Original file line numberDiff line numberDiff line change
@@ -3893,7 +3893,7 @@ W: http://www.baycom.org/~tom/ham/ham.html
38933893
F: drivers/net/hamradio/baycom*
38943894

38953895
BCACHE (BLOCK LAYER CACHE)
3896-
M: Coly Li <colyli@suse.de>
3896+
M: Coly Li <colyli@kernel.org>
38973897
M: Kent Overstreet <kent.overstreet@linux.dev>
38983898
L: linux-bcache@vger.kernel.org
38993899
S: Maintained
@@ -15345,7 +15345,7 @@ M: Daniel Machon <daniel.machon@microchip.com>
1534515345
M: UNGLinuxDriver@microchip.com
1534615346
L: netdev@vger.kernel.org
1534715347
S: Maintained
15348-
F: drivers/net/ethernet/microchip/lan969x/*
15348+
F: drivers/net/ethernet/microchip/sparx5/lan969x/*
1534915349

1535015350
MICROCHIP LCDFB DRIVER
1535115351
M: Nicolas Ferre <nicolas.ferre@microchip.com>
@@ -16337,6 +16337,7 @@ F: Documentation/networking/
1633716337
F: Documentation/networking/net_cachelines/
1633816338
F: Documentation/process/maintainer-netdev.rst
1633916339
F: Documentation/userspace-api/netlink/
16340+
F: include/linux/ethtool.h
1634016341
F: include/linux/framer/framer-provider.h
1634116342
F: include/linux/framer/framer.h
1634216343
F: include/linux/in.h
@@ -16351,6 +16352,7 @@ F: include/linux/rtnetlink.h
1635116352
F: include/linux/seq_file_net.h
1635216353
F: include/linux/skbuff*
1635316354
F: include/net/
16355+
F: include/uapi/linux/ethtool.h
1635416356
F: include/uapi/linux/genetlink.h
1635516357
F: include/uapi/linux/hsr_netlink.h
1635616358
F: include/uapi/linux/in.h

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 13
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc2
5+
EXTRAVERSION = -rc3
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

‎arch/arc/Kconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ config ARC_PAGE_SIZE_16K
297297
config ARC_PAGE_SIZE_4K
298298
bool "4KB"
299299
select HAVE_PAGE_SIZE_4KB
300-
depends on ARC_MMU_V3 || ARC_MMU_V4
301300

302301
endchoice
303302

@@ -474,7 +473,8 @@ config HIGHMEM
474473

475474
config ARC_HAS_PAE40
476475
bool "Support for the 40-bit Physical Address Extension"
477-
depends on ISA_ARCV2
476+
depends on ARC_MMU_V4
477+
depends on !ARC_PAGE_SIZE_4K
478478
select HIGHMEM
479479
select PHYS_ADDR_T_64BIT
480480
help

‎arch/arc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
KBUILD_DEFCONFIG := haps_hs_smp_defconfig
77

88
ifeq ($(CROSS_COMPILE),)
9-
CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux-)
9+
CROSS_COMPILE := $(call cc-cross-prefix, arc-linux- arceb-linux- arc-linux-gnu-)
1010
endif
1111

1212
cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

‎arch/arc/boot/dts/axc001.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
compatible = "snps,dw-apb-gpio-port";
5555
gpio-controller;
5656
#gpio-cells = <2>;
57-
snps,nr-gpios = <30>;
57+
ngpios = <30>;
5858
reg = <0>;
5959
interrupt-controller;
6060
#interrupt-cells = <2>;

‎arch/arc/boot/dts/axc003.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
compatible = "snps,dw-apb-gpio-port";
6363
gpio-controller;
6464
#gpio-cells = <2>;
65-
snps,nr-gpios = <30>;
65+
ngpios = <30>;
6666
reg = <0>;
6767
interrupt-controller;
6868
#interrupt-cells = <2>;

‎arch/arc/boot/dts/axc003_idu.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
compatible = "snps,dw-apb-gpio-port";
7070
gpio-controller;
7171
#gpio-cells = <2>;
72-
snps,nr-gpios = <30>;
72+
ngpios = <30>;
7373
reg = <0>;
7474
interrupt-controller;
7575
#interrupt-cells = <2>;

‎arch/arc/boot/dts/axs10x_mb.dtsi

+6-6
Original file line numberDiff line numberDiff line change
@@ -250,23 +250,23 @@
250250
compatible = "snps,dw-apb-gpio-port";
251251
gpio-controller;
252252
#gpio-cells = <2>;
253-
snps,nr-gpios = <32>;
253+
ngpios = <32>;
254254
reg = <0>;
255255
};
256256

257257
gpio0_bankb: gpio-controller@1 {
258258
compatible = "snps,dw-apb-gpio-port";
259259
gpio-controller;
260260
#gpio-cells = <2>;
261-
snps,nr-gpios = <8>;
261+
ngpios = <8>;
262262
reg = <1>;
263263
};
264264

265265
gpio0_bankc: gpio-controller@2 {
266266
compatible = "snps,dw-apb-gpio-port";
267267
gpio-controller;
268268
#gpio-cells = <2>;
269-
snps,nr-gpios = <8>;
269+
ngpios = <8>;
270270
reg = <2>;
271271
};
272272
};
@@ -281,23 +281,23 @@
281281
compatible = "snps,dw-apb-gpio-port";
282282
gpio-controller;
283283
#gpio-cells = <2>;
284-
snps,nr-gpios = <30>;
284+
ngpios = <30>;
285285
reg = <0>;
286286
};
287287

288288
gpio1_bankb: gpio-controller@1 {
289289
compatible = "snps,dw-apb-gpio-port";
290290
gpio-controller;
291291
#gpio-cells = <2>;
292-
snps,nr-gpios = <10>;
292+
ngpios = <10>;
293293
reg = <1>;
294294
};
295295

296296
gpio1_bankc: gpio-controller@2 {
297297
compatible = "snps,dw-apb-gpio-port";
298298
gpio-controller;
299299
#gpio-cells = <2>;
300-
snps,nr-gpios = <8>;
300+
ngpios = <8>;
301301
reg = <2>;
302302
};
303303
};

‎arch/arc/boot/dts/hsdk.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
compatible = "snps,dw-apb-gpio-port";
309309
gpio-controller;
310310
#gpio-cells = <2>;
311-
snps,nr-gpios = <24>;
311+
ngpios = <24>;
312312
reg = <0>;
313313
};
314314
};

‎arch/arc/include/asm/arcregs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146

147147
#ifndef __ASSEMBLY__
148148

149-
#include <soc/arc/aux.h>
149+
#include <soc/arc/arc_aux.h>
150150

151151
/* Helpers */
152152
#define TO_KB(bytes) ((bytes) >> 10)

‎arch/arc/include/asm/cmpxchg.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
\
4949
switch(sizeof((_p_))) { \
5050
case 1: \
51-
_prev_ = (__typeof__(*(ptr)))cmpxchg_emu_u8((volatile u8 *)_p_, (uintptr_t)_o_, (uintptr_t)_n_); \
51+
_prev_ = (__typeof__(*(ptr)))cmpxchg_emu_u8((volatile u8 *__force)_p_, (uintptr_t)_o_, (uintptr_t)_n_); \
5252
break; \
5353
case 4: \
5454
_prev_ = __cmpxchg(_p_, _o_, _n_); \

‎arch/arc/include/asm/mmu-arcv2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef _ASM_ARC_MMU_ARCV2_H
1010
#define _ASM_ARC_MMU_ARCV2_H
1111

12-
#include <soc/arc/aux.h>
12+
#include <soc/arc/arc_aux.h>
1313

1414
/*
1515
* TLB Management regs

‎arch/arc/net/bpf_jit_arcv2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2916,7 +2916,7 @@ bool check_jmp_32(u32 curr_off, u32 targ_off, u8 cond)
29162916
addendum = (cond == ARC_CC_AL) ? 0 : INSN_len_normal;
29172917
disp = get_displacement(curr_off + addendum, targ_off);
29182918

2919-
if (ARC_CC_AL)
2919+
if (cond == ARC_CC_AL)
29202920
return is_valid_far_disp(disp);
29212921
else
29222922
return is_valid_near_disp(disp);

‎arch/arm64/include/asm/el2_setup.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
1 << PMSCR_EL2_PA_SHIFT)
8888
msr_s SYS_PMSCR_EL2, x0 // addresses and physical counter
8989
.Lskip_spe_el2_\@:
90-
mov x0, #(MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT)
90+
mov x0, #MDCR_EL2_E2PB_MASK
9191
orr x2, x2, x0 // If we don't have VHE, then
9292
// use EL1&0 translation.
9393

@@ -100,7 +100,7 @@
100100
and x0, x0, TRBIDR_EL1_P
101101
cbnz x0, .Lskip_trace_\@ // If TRBE is available at EL2
102102

103-
mov x0, #(MDCR_EL2_E2TB_MASK << MDCR_EL2_E2TB_SHIFT)
103+
mov x0, #MDCR_EL2_E2TB_MASK
104104
orr x2, x2, x0 // allow the EL1&0 translation
105105
// to own it.
106106

‎arch/arm64/kernel/hyp-stub.S

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ SYM_CODE_START_LOCAL(__finalise_el2)
114114

115115
// Use EL2 translations for SPE & TRBE and disable access from EL1
116116
mrs x0, mdcr_el2
117-
bic x0, x0, #(MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT)
118-
bic x0, x0, #(MDCR_EL2_E2TB_MASK << MDCR_EL2_E2TB_SHIFT)
117+
bic x0, x0, #MDCR_EL2_E2PB_MASK
118+
bic x0, x0, #MDCR_EL2_E2TB_MASK
119119
msr mdcr_el2, x0
120120

121121
// Transfer the MM state from EL1 to EL2

0 commit comments

Comments
 (0)