Skip to content

Commit 8cbd01b

Browse files
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

Lines changed: 5 additions & 0 deletions
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

Lines changed: 2 additions & 5 deletions
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

Lines changed: 27 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 6 additions & 0 deletions
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

Lines changed: 3 additions & 1 deletion
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

Lines changed: 4 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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__

0 commit comments

Comments
 (0)