Skip to content

Commit f2b5e7c

Browse files
committed
Merge branch 'sound/upstream-20251111' into merge/sound-upstream-20251111
2 parents 45e07ee + d71e6d1 commit f2b5e7c

File tree

326 files changed

+2954
-2925
lines changed

Some content is hidden

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

326 files changed

+2954
-2925
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,7 @@ Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
644644
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
645645
Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
646646
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
647+
Rae Moar <raemoar63@gmail.com> <rmoar@google.com>
647648
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
648649
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
649650
Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>

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: isdn@linux-pingi.de
2041+
D: ISDN subsystem maintainer
2042+
20392043
N: Jakob Kemi
20402044
E: jakob.kemi@telia.com
20412045
D: V4L W9966 Webcam driver

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/sound/adi,max98363.yaml

Lines changed: 0 additions & 60 deletions
This file was deleted.

Documentation/devicetree/bindings/sound/adi,ssm2602.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

Documentation/devicetree/bindings/sound/adi,ssm3515.yaml

Lines changed: 0 additions & 49 deletions
This file was deleted.

Documentation/devicetree/bindings/sound/cirrus,cs4271.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ properties:
2525
reg:
2626
maxItems: 1
2727

28+
clocks:
29+
items:
30+
- description:
31+
Master clock connected to the MCLK pin if MCLK is an input (i.e. no
32+
crystal used).
33+
34+
clock-names:
35+
items:
36+
- const: mclk
37+
2838
spi-cpha: true
2939

3040
spi-cpol: true

Documentation/devicetree/bindings/sound/cs4265.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.

Documentation/devicetree/bindings/sound/cs4341.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.

Documentation/devicetree/bindings/sound/cs4349.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)