Skip to content

Commit 5314853

Browse files
committed
Merge branch 'sound/upstream-20260203' into merge/sound-upstream-20260203
2 parents 2124ec2 + 0c5f686 commit 5314853

File tree

465 files changed

+6616
-3183
lines changed

Some content is hidden

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

465 files changed

+6616
-3183
lines changed

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#
1313
Aaron Durbin <adurbin@google.com>
1414
Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>
15+
Abel Vesa <abelvesa@kernel.org> <abel.vesa@linaro.org>
1516
Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>
1617
Abhijeet Dharmapurikar <quic_adharmap@quicinc.com> <adharmap@codeaurora.org>
1718
Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
@@ -878,6 +879,8 @@ Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
878879
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
879880
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
880881
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
882+
Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
883+
Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
881884
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
882885
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
883886
Yusuke Goda <goda.yusuke@renesas.com>

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2231,6 +2231,10 @@ S: Markham, Ontario
22312231
S: L3R 8B2
22322232
S: Canada
22332233

2234+
N: Krzysztof Kozlowski
2235+
E: krzk@kernel.org
2236+
D: NFC network subsystem and drivers maintainer
2237+
22342238
N: Christian Krafft
22352239
D: PowerPC Cell support
22362240

Documentation/admin-guide/laptops/alienware-wmi.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ information.
105105

106106
Manual fan control on the other hand, is not exposed directly by the AWCC
107107
interface. Instead it let's us control a fan `boost` value. This `boost` value
108-
has the following aproximate behavior over the fan pwm:
108+
has the following approximate behavior over the fan pwm:
109109

110110
::
111111

Documentation/admin-guide/sysctl/vm.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,10 @@ memory allocations.
494494

495495
The default value depends on CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT.
496496

497+
When CONFIG_MEM_ALLOC_PROFILING_DEBUG=y, this control is read-only to avoid
498+
warnings produced by allocations made while profiling is disabled and freed
499+
when it's enabled.
500+
497501

498502
memory_failure_early_kill
499503
=========================

Documentation/arch/riscv/uabi.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ ISA string ordering in /proc/cpuinfo
77
------------------------------------
88

99
The canonical order of ISA extension names in the ISA string is defined in
10-
chapter 27 of the unprivileged specification.
10+
Chapter 27 of the RISC-V Instruction Set Manual Volume I Unprivileged ISA
11+
(Document Version 20191213).
12+
1113
The specification uses vague wording, such as should, when it comes to ordering,
1214
so for our purposes the following rules apply:
1315

Documentation/arch/x86/amd_hsmp.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set of mailbox registers.
1414

1515
More details on the interface can be found in chapter
1616
"7 Host System Management Port (HSMP)" of the family/model PPR
17-
Eg: https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/programmer-references/55898_B1_pub_0_50.zip
17+
Eg: https://docs.amd.com/v/u/en-US/55898_B1_pub_0_50
1818

1919

2020
HSMP interface is supported on EPYC line of server CPUs and MI300A (APU).
@@ -185,7 +185,7 @@ what happened. The transaction returns 0 on success.
185185

186186
More details on the interface and message definitions can be found in chapter
187187
"7 Host System Management Port (HSMP)" of the respective family/model PPR
188-
eg: https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/programmer-references/55898_B1_pub_0_50.zip
188+
eg: https://docs.amd.com/v/u/en-US/55898_B1_pub_0_50
189189

190190
User space C-APIs are made available by linking against the esmi library,
191191
which is provided by the E-SMS project https://www.amd.com/en/developer/e-sms.html.

Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ maintainers:
1111
- Jitao shi <jitao.shi@mediatek.com>
1212

1313
description: |
14-
MediaTek DP and eDP are different hardwares and there are some features
14+
MediaTek DP and eDP are different hardware and there are some features
1515
which are not supported for eDP. For example, audio is not supported for
1616
eDP. Therefore, we need to use two different compatibles to describe them.
1717
In addition, We just need to enable the power domain of DP, so the clock

Documentation/devicetree/bindings/interconnect/qcom,sa8775p-rpmh.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,37 @@ allOf:
7474
- description: aggre UFS CARD AXI clock
7575
- description: RPMH CC IPA clock
7676

77+
- if:
78+
properties:
79+
compatible:
80+
contains:
81+
enum:
82+
- qcom,sa8775p-config-noc
83+
- qcom,sa8775p-dc-noc
84+
- qcom,sa8775p-gem-noc
85+
- qcom,sa8775p-gpdsp-anoc
86+
- qcom,sa8775p-lpass-ag-noc
87+
- qcom,sa8775p-mmss-noc
88+
- qcom,sa8775p-nspa-noc
89+
- qcom,sa8775p-nspb-noc
90+
- qcom,sa8775p-pcie-anoc
91+
- qcom,sa8775p-system-noc
92+
then:
93+
properties:
94+
clocks: false
95+
96+
- if:
97+
properties:
98+
compatible:
99+
contains:
100+
enum:
101+
- qcom,sa8775p-clk-virt
102+
- qcom,sa8775p-mc-virt
103+
then:
104+
properties:
105+
reg: false
106+
clocks: false
107+
77108
unevaluatedProperties: false
78109

79110
examples:

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ description: |
3434
3535
properties:
3636
compatible:
37-
const: fsl,imx8qm-audmix
37+
enum:
38+
- fsl,imx8qm-audmix
39+
- fsl,imx952-audmix
3840

3941
reg:
4042
maxItems: 1
@@ -80,7 +82,17 @@ required:
8082
- reg
8183
- clocks
8284
- clock-names
83-
- power-domains
85+
86+
allOf:
87+
- if:
88+
properties:
89+
compatible:
90+
contains:
91+
enum:
92+
- fsl,imx8qm-audmix
93+
then:
94+
required:
95+
- power-domains
8496

8597
unevaluatedProperties: false
8698

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,16 @@ required:
6363

6464
allOf:
6565
- $ref: dai-common.yaml#
66+
- if:
67+
properties:
68+
compatible:
69+
contains:
70+
enum:
71+
- fsl,imx6sx-mqs
72+
- fsl,imx93-mqs
73+
then:
74+
required:
75+
- gpr
6676
- if:
6777
properties:
6878
compatible:
@@ -91,8 +101,6 @@ allOf:
91101
clock-names:
92102
items:
93103
- const: mclk
94-
required:
95-
- gpr
96104

97105
unevaluatedProperties: false
98106

0 commit comments

Comments
 (0)