Skip to content

Commit e6dc6ea

Browse files
author
Bartosz Golaszewski
committed
Merge tag 'reset-gpio-for-v6.19' of https://git.pengutronix.de/git/pza/linux into gpio/for-next
Reset/GPIO/swnode changes for v6.19 * Extend software node implementation, allowing its properties to reference existing firmware nodes. * Update the GPIO property interface to use reworked swnode macros. * Rework reset-gpio code to use GPIO lookup via swnode. * Fix spi-cs42l43 driver to work with swnode changes.
2 parents 6f87b41 + 5fc4e4c commit e6dc6ea

484 files changed

Lines changed: 4200 additions & 1881 deletions

File tree

Some content is hidden

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

.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/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/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/firmware-guide/acpi/i2c-muxes.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ which corresponds to the following ASL (in the scope of \_SB)::
3737
Name (_HID, ...)
3838
Name (_CRS, ResourceTemplate () {
3939
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
40-
AddressingMode7Bit, "\\_SB.SMB1.CH00", 0x00,
41-
ResourceConsumer,,)
40+
AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH00",
41+
0x00, ResourceConsumer,,)
4242
}
4343
}
4444
}
@@ -52,8 +52,8 @@ which corresponds to the following ASL (in the scope of \_SB)::
5252
Name (_HID, ...)
5353
Name (_CRS, ResourceTemplate () {
5454
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
55-
AddressingMode7Bit, "\\_SB.SMB1.CH01", 0x00,
56-
ResourceConsumer,,)
55+
AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH01",
56+
0x00, ResourceConsumer,,)
5757
}
5858
}
5959
}

Documentation/netlink/specs/dpll.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,8 @@ operations:
605605
reply: &pin-attrs
606606
attributes:
607607
- id
608+
- module-name
609+
- clock-id
608610
- board-label
609611
- panel-label
610612
- package-label

Documentation/networking/netconsole.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ Userdata append support by Matthew Wood <thepacketgeek@gmail.com>, Jan 22 2024
1919

2020
Sysdata append support by Breno Leitao <leitao@debian.org>, Jan 15 2025
2121

22-
Please send bug reports to Matt Mackall <mpm@selenic.com>
23-
Satyam Sharma <satyam.sharma@gmail.com>, and Cong Wang <xiyou.wangcong@gmail.com>
24-
2522
Introduction:
2623
=============
2724

MAINTAINERS

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4818,6 +4818,7 @@ F: drivers/net/dsa/b53/*
48184818
F: drivers/net/dsa/bcm_sf2*
48194819
F: include/linux/dsa/brcm.h
48204820
F: include/linux/platform_data/b53.h
4821+
F: net/dsa/tag_brcm.c
48214822

48224823
BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
48234824
M: Florian Fainelli <florian.fainelli@broadcom.com>
@@ -12528,6 +12529,7 @@ F: include/linux/avf/virtchnl.h
1252812529
F: include/linux/net/intel/*/
1252912530

1253012531
INTEL ETHERNET PROTOCOL DRIVER FOR RDMA
12532+
M: Krzysztof Czurylo <krzysztof.czurylo@intel.com>
1253112533
M: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
1253212534
L: linux-rdma@vger.kernel.org
1253312535
S: Supported
@@ -12868,7 +12870,8 @@ F: tools/testing/selftests/sgx/*
1286812870
K: \bSGX_
1286912871

1287012872
INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER
12871-
M: Daniel Scally <djrscally@gmail.com>
12873+
M: Daniel Scally <dan.scally@ideasonboard.com>
12874+
M: Sakari Ailus <sakari.ailus@linux.intel.com>
1287212875
S: Maintained
1287312876
F: drivers/platform/x86/intel/int3472/
1287412877
F: include/linux/platform_data/x86/int3472.h
@@ -13267,10 +13270,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git mast
1326713270
F: drivers/infiniband/ulp/isert
1326813271

1326913272
ISDN/CMTP OVER BLUETOOTH
13270-
M: Karsten Keil <isdn@linux-pingi.de>
13271-
L: isdn4linux@listserv.isdn4linux.de (subscribers-only)
1327213273
L: netdev@vger.kernel.org
13273-
S: Odd Fixes
13274+
S: Orphan
1327413275
W: http://www.isdn4linux.de
1327513276
F: Documentation/isdn/
1327613277
F: drivers/isdn/capi/
@@ -13279,10 +13280,8 @@ F: include/uapi/linux/isdn/
1327913280
F: net/bluetooth/cmtp/
1328013281

1328113282
ISDN/mISDN SUBSYSTEM
13282-
M: Karsten Keil <isdn@linux-pingi.de>
13283-
L: isdn4linux@listserv.isdn4linux.de (subscribers-only)
1328413283
L: netdev@vger.kernel.org
13285-
S: Maintained
13284+
S: Orphan
1328613285
W: http://www.isdn4linux.de
1328713286
F: drivers/isdn/Kconfig
1328813287
F: drivers/isdn/Makefile
@@ -13436,9 +13435,12 @@ F: mm/kasan/
1343613435
F: scripts/Makefile.kasan
1343713436

1343813437
KCONFIG
13438+
M: Nathan Chancellor <nathan@kernel.org>
13439+
M: Nicolas Schier <nsc@kernel.org>
1343913440
L: linux-kbuild@vger.kernel.org
13440-
S: Orphan
13441+
S: Odd Fixes
1344113442
Q: https://patchwork.kernel.org/project/linux-kbuild/list/
13443+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git
1344213444
F: Documentation/kbuild/kconfig*
1344313445
F: scripts/Kconfig.include
1344413446
F: scripts/kconfig/
@@ -13623,7 +13625,7 @@ F: fs/smb/server/
1362313625
KERNEL UNIT TESTING FRAMEWORK (KUnit)
1362413626
M: Brendan Higgins <brendan.higgins@linux.dev>
1362513627
M: David Gow <davidgow@google.com>
13626-
R: Rae Moar <rmoar@google.com>
13628+
R: Rae Moar <raemoar63@gmail.com>
1362713629
L: linux-kselftest@vger.kernel.org
1362813630
L: kunit-dev@googlegroups.com
1362913631
S: Maintained
@@ -20168,6 +20170,7 @@ R: Alexander Shishkin <alexander.shishkin@linux.intel.com>
2016820170
R: Jiri Olsa <jolsa@kernel.org>
2016920171
R: Ian Rogers <irogers@google.com>
2017020172
R: Adrian Hunter <adrian.hunter@intel.com>
20173+
R: James Clark <james.clark@linaro.org>
2017120174
L: linux-perf-users@vger.kernel.org
2017220175
L: linux-kernel@vger.kernel.org
2017320176
S: Supported
@@ -21339,6 +21342,7 @@ F: drivers/media/platform/qcom/venus/
2133921342
QUALCOMM WCN36XX WIRELESS DRIVER
2134021343
M: Loic Poulain <loic.poulain@oss.qualcomm.com>
2134121344
L: wcn36xx@lists.infradead.org
21345+
L: linux-wireless@vger.kernel.org
2134221346
S: Supported
2134321347
W: https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
2134421348
F: drivers/net/wireless/ath/wcn36xx/

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 18
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc3
5+
EXTRAVERSION = -rc5
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

0 commit comments

Comments
 (0)