Skip to content

Commit 88ca349

Browse files
maddy-kerneldevmaddy-kerneldev
committed
Automatic merge of 'next' into merge (2025-11-11 09:08)
2 parents 124f0ef + e9a6fb0 commit 88ca349

File tree

814 files changed

+8489
-4531
lines changed

Some content is hidden

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

814 files changed

+8489
-4531
lines changed

‎.mailmap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Alan Cox <[email protected]>
2727
Alan Cox <[email protected]>
2828
Aleksandar Markovic <[email protected]> <[email protected]>
2929
Aleksey Gorelov <[email protected]>
30+
Alex Williamson <[email protected]> <[email protected]>
3031
Alexander Lobakin <[email protected]> <[email protected]>
3132
Alexander Lobakin <[email protected]> <[email protected]>
3233
Alexander Lobakin <[email protected]> <[email protected]>
@@ -643,6 +644,7 @@ Qais Yousef <[email protected]> <[email protected]>
643644
Quentin Monnet <[email protected]> <[email protected]>
644645
Quentin Monnet <[email protected]> <[email protected]>
645646
Quentin Perret <[email protected]> <[email protected]>
647+
Rae Moar <[email protected]> <[email protected]>
646648
Rafael J. Wysocki <[email protected]> <[email protected]>
647649
Rajeev Nandan <[email protected]> <[email protected]>
648650
Rajendra Nayak <[email protected]> <[email protected]>

‎CREDITS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,6 +2036,10 @@ S: Botanicka' 68a
20362036
S: 602 00 Brno
20372037
S: Czech Republic
20382038

2039+
N: Karsten Keil
2040+
E: [email protected]
2041+
D: ISDN subsystem maintainer
2042+
20392043
N: Jakob Kemi
20402044
E: [email protected]
20412045
D: V4L W9966 Webcam driver

‎Documentation/devicetree/bindings/gpio/ti,twl4030-gpio.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/ti,twl4030-gpio.yaml#
4+
$id: http://devicetree.org/schemas/gpio/ti,twl4030-gpio.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: TI TWL4030 GPIO controller

‎Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ allOf:
180180
then:
181181
properties:
182182
reg:
183-
minItems: 2
183+
maxItems: 2
184184
reg-names:
185-
minItems: 2
185+
maxItems: 2
186186
else:
187187
properties:
188188
reg:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ allOf:
142142
required:
143143
- orientation-switch
144144
then:
145-
$ref: /schemas/usb/usb-switch.yaml#
145+
allOf:
146+
- $ref: /schemas/usb/usb-switch.yaml#
147+
- $ref: /schemas/usb/usb-switch-ports.yaml#
146148

147149
unevaluatedProperties: false
148150

‎Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ properties:
2424
- enum:
2525
- qcom,qcs8300-qmp-ufs-phy
2626
- const: qcom,sa8775p-qmp-ufs-phy
27+
- items:
28+
- enum:
29+
- qcom,kaanapali-qmp-ufs-phy
30+
- const: qcom,sm8750-qmp-ufs-phy
2731
- enum:
2832
- qcom,msm8996-qmp-ufs-phy
2933
- qcom,msm8998-qmp-ufs-phy

‎Documentation/devicetree/bindings/phy/samsung,usb3-drd-phy.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ allOf:
125125
contains:
126126
const: google,gs101-usb31drd-phy
127127
then:
128-
$ref: /schemas/usb/usb-switch.yaml#
128+
allOf:
129+
- $ref: /schemas/usb/usb-switch.yaml#
130+
- $ref: /schemas/usb/usb-switch-ports.yaml#
129131

130132
properties:
131133
clocks:

‎Documentation/devicetree/bindings/serial/renesas,scif.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ allOf:
197197
- renesas,rcar-gen2-scif
198198
- renesas,rcar-gen3-scif
199199
- renesas,rcar-gen4-scif
200+
- renesas,rcar-gen5-scif
200201
then:
201202
properties:
202203
interrupts:

‎Documentation/devicetree/bindings/sound/qcom,pm4125-sdw.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ properties:
3232
3333
$ref: /schemas/types.yaml#/definitions/uint32-array
3434
minItems: 2
35-
maxItems: 2
35+
maxItems: 4
3636
items:
3737
enum: [1, 2, 3, 4]
3838

@@ -48,7 +48,7 @@ properties:
4848
4949
$ref: /schemas/types.yaml#/definitions/uint32-array
5050
minItems: 2
51-
maxItems: 2
51+
maxItems: 5
5252
items:
5353
enum: [1, 2, 3, 4, 5]
5454

‎Documentation/devicetree/bindings/spi/spi-cadence.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,14 @@ allOf:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- cdns,spi-r1p6
19-
- xlnx,zynq-spi-r1p6
17+
oneOf:
18+
- enum:
19+
- xlnx,zynq-spi-r1p6
20+
- items:
21+
- enum:
22+
- xlnx,zynqmp-spi-r1p6
23+
- xlnx,versal-net-spi-r1p6
24+
- const: cdns,spi-r1p6
2025

2126
reg:
2227
maxItems: 1

0 commit comments

Comments
 (0)