git
/
linux
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Devicetree fixes for v6.18: 

- Allow child nodes on renesas-bsc bus binding
 
 - Drop node name pattern on allwinner,sun50i-a64-de2 bus binding
 
 - Switch DT patchwork to kernel.org from ozlabs.org
 
 - Fix some typos in docs and bindings
 
 - Fix reference count in PCI node unittest
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEktVUI4SxYhzZyEuo+vtdtY28YcMFAmjpWnAACgkQ+vtdtY28
 YcMtshAAiSam4S3L2TILOeglTJvOFs18+klvvIru3Xlndgm3IBOIy/ittiGwK96e
 NuwZ4tPMdbXjBaCo8ozPC3ZFGYVAmUgVm9uTZYuSsbQL3Vpcr196CTzTc+d8GsdY
 t72Er45D8kR6p0Fg28N850ycMHIMlNpt3fk1ZMczCXr2XRYj70TNNv9mRK3paXIi
 r0IVieXm/OuzU1muDyLzihsfAEt+8hNQvyfBlYtWlPJY0z6micnPlnkEAsBtFaQr
 YHbvjZCyeRp7fD+FioPy+1xMHf46shCyQM/PbOL9nA6NLur2/FQoXCsS+/HyqrrV
 C/f6/ZWCywuODXg41rnzCm4P8BiqCuGGYUuY/clmAQno8yXLF0DG4yL7cslsR3bm
 vDOtlmJDdQ/+5zvsJDkipodOHw8SHK0x6941MGEufVz3j/2uSJef3veWMpgbVF6+
 BSbtEKQ3eBkxcpLkTHPTdqVguIoXSqC5+0HxekfcujgvIfst90D5U/VUDHfyXVRY
 /snbqKN5P//GzV/JmIVYznqqapfNFOPTaf0f1pol4nk/v77VoxbcS4CiLW0R1nJ5
 vpHQcD/Jbu7AO4oWhsJy0yNDHUnspyjxfS221gNV9DyzkGxgQkFl6okoI05RJNUZ
 NpgblCMk1JaWcHjxgddPxUoc5JNyveIVuY1UBQFeuAK2Cebze14=
 =7vRd
 -----END PGP SIGNATURE-----

Merge tag 'devicetree-fixes-for-6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree fixes from Rob Herring:

 - Allow child nodes on renesas-bsc bus binding

 - Drop node name pattern on allwinner,sun50i-a64-de2 bus binding

 - Switch DT patchwork to kernel.org from ozlabs.org

 - Fix some typos in docs and bindings

 - Fix reference count in PCI node unittest

* tag 'devicetree-fixes-for-6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: bus: renesas-bsc: allow additional properties
  dt-bindings: bus: allwinner,sun50i-a64-de2: don't check node names
  MAINTAINERS: Move DT patchwork to kernel.org
  of: unittest: Fix device reference count leak in of_unittest_pci_node_verify
  of: doc: Fix typo in doc comments.
  dt-bindings: mmc: Correct typo "upto" to "up to"
This commit is contained in:
Linus Torvalds 2025-10-10 13:05:40 -07:00
parent 8bd9238e51 ce740955b2
commit f76b1683d1
8 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml
View File

@ -44,7 +44,7 @@ properties:
patternProperties: patternProperties:
# All other properties should be child nodes with unit-address and 'reg' # All other properties should be child nodes with unit-address and 'reg'
"^[a-zA-Z][a-zA-Z0-9,+\\-._]{0,63}@[0-9a-fA-F]+$": "@[0-9a-f]+$":
type: object type: object
additionalProperties: true additionalProperties: true
properties: properties:

12
Documentation/devicetree/bindings/bus/renesas,bsc.yaml
View File

@ -41,6 +41,18 @@ properties:
interrupts: interrupts:
maxItems: 1 maxItems: 1
patternProperties:
# All other properties should be child nodes with unit-address and 'reg'
"@[0-9a-f]+$":
type: object
additionalProperties: true
properties:
reg:
maxItems: 1
required:
- reg
required: required:
- reg - reg

3
MAINTAINERS
View File

@ -19248,6 +19248,7 @@ M: Rob Herring <robh@kernel.org>
M: Saravana Kannan <saravanak@google.com> M: Saravana Kannan <saravanak@google.com>
L: devicetree@vger.kernel.org L: devicetree@vger.kernel.org
S: Maintained S: Maintained
Q: http://patchwork.kernel.org/project/devicetree/list/
W: http://www.devicetree.org/ W: http://www.devicetree.org/
C: irc://irc.libera.chat/devicetree C: irc://irc.libera.chat/devicetree
T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
@ -19268,7 +19269,7 @@ M: Krzysztof Kozlowski <krzk+dt@kernel.org>
M: Conor Dooley <conor+dt@kernel.org> M: Conor Dooley <conor+dt@kernel.org>
L: devicetree@vger.kernel.org L: devicetree@vger.kernel.org
S: Maintained S: Maintained
Q: http://patchwork.ozlabs.org/project/devicetree-bindings/list/ Q: http://patchwork.kernel.org/project/devicetree/list/
C: irc://irc.libera.chat/devicetree C: irc://irc.libera.chat/devicetree
T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
F: Documentation/devicetree/ F: Documentation/devicetree/

2
drivers/of/irq.c
View File

@ -163,7 +163,7 @@ const __be32 *of_irq_parse_imap_parent(const __be32 *imap, int len, struct of_ph
* @out_irq: structure of_phandle_args updated by this function * @out_irq: structure of_phandle_args updated by this function
* *
* This function is a low-level interrupt tree walking function. It * This function is a low-level interrupt tree walking function. It
* can be used to do a partial walk with synthetized reg and interrupts * can be used to do a partial walk with synthesized reg and interrupts
* properties, for example when resolving PCI interrupts when no device * properties, for example when resolving PCI interrupts when no device
* node exist for the parent. It takes an interrupt specifier structure as * node exist for the parent. It takes an interrupt specifier structure as
* input, walks the tree looking for any interrupt-map properties, translates * input, walks the tree looking for any interrupt-map properties, translates

2
drivers/of/overlay.c
View File

@ -135,7 +135,7 @@ static BLOCKING_NOTIFIER_HEAD(overlay_notify_chain);
* @nb: Notifier block to register * @nb: Notifier block to register
* *
* Register for notification on overlay operations on device tree nodes. The * Register for notification on overlay operations on device tree nodes. The
* reported actions definied by @of_reconfig_change. The notifier callback * reported actions defined by @of_reconfig_change. The notifier callback
* furthermore receives a pointer to the affected device tree node. * furthermore receives a pointer to the affected device tree node.
* *
* Note that a notifier callback is not supposed to store pointers to a device * Note that a notifier callback is not supposed to store pointers to a device

1
drivers/of/unittest.c
View File

@ -4300,6 +4300,7 @@ static int of_unittest_pci_node_verify(struct pci_dev *pdev, bool add)
unittest(!np, "Child device tree node is not removed\n"); unittest(!np, "Child device tree node is not removed\n");
child_dev = device_find_any_child(&pdev->dev); child_dev = device_find_any_child(&pdev->dev);
unittest(!child_dev, "Child device is not removed\n"); unittest(!child_dev, "Child device is not removed\n");
put_device(child_dev);
} }
failed: failed:

8
include/linux/of.h
View File

@ -1134,7 +1134,7 @@ static inline bool of_phandle_args_equal(const struct of_phandle_args *a1,
* Search for a property in a device node and count the number of u8 elements * Search for a property in a device node and count the number of u8 elements
* in it. * in it.
* *
* Return: The number of elements on sucess, -EINVAL if the property does * Return: The number of elements on success, -EINVAL if the property does
* not exist or its length does not match a multiple of u8 and -ENODATA if the * not exist or its length does not match a multiple of u8 and -ENODATA if the
* property does not have a value. * property does not have a value.
*/ */
@ -1153,7 +1153,7 @@ static inline int of_property_count_u8_elems(const struct device_node *np,
* Search for a property in a device node and count the number of u16 elements * Search for a property in a device node and count the number of u16 elements
* in it. * in it.
* *
* Return: The number of elements on sucess, -EINVAL if the property does * Return: The number of elements on success, -EINVAL if the property does
* not exist or its length does not match a multiple of u16 and -ENODATA if the * not exist or its length does not match a multiple of u16 and -ENODATA if the
* property does not have a value. * property does not have a value.
*/ */
@ -1172,7 +1172,7 @@ static inline int of_property_count_u16_elems(const struct device_node *np,
* Search for a property in a device node and count the number of u32 elements * Search for a property in a device node and count the number of u32 elements
* in it. * in it.
* *
* Return: The number of elements on sucess, -EINVAL if the property does * Return: The number of elements on success, -EINVAL if the property does
* not exist or its length does not match a multiple of u32 and -ENODATA if the * not exist or its length does not match a multiple of u32 and -ENODATA if the
* property does not have a value. * property does not have a value.
*/ */
@ -1191,7 +1191,7 @@ static inline int of_property_count_u32_elems(const struct device_node *np,
* Search for a property in a device node and count the number of u64 elements * Search for a property in a device node and count the number of u64 elements
* in it. * in it.
* *
* Return: The number of elements on sucess, -EINVAL if the property does * Return: The number of elements on success, -EINVAL if the property does
* not exist or its length does not match a multiple of u64 and -ENODATA if the * not exist or its length does not match a multiple of u64 and -ENODATA if the
* property does not have a value. * property does not have a value.
*/ */