Commit f76b1683 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 8bd9238e ce740955

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ properties: 


patternProperties:

  # 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

    additionalProperties: true

    properties:

Documentation/devicetree/bindings/bus/renesas,bsc.yaml

+12 −0
Original line number Diff line number Diff line
@@ -41,6 +41,18 @@ properties: 
  interrupts:

    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:

  - reg

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -19248,6 +19248,7 @@ M: Rob Herring <robh@kernel.org> 
M:	Saravana Kannan <saravanak@google.com>

L:	devicetree@vger.kernel.org

S:	Maintained

Q:	http://patchwork.kernel.org/project/devicetree/list/

W:	http://www.devicetree.org/

C:	irc://irc.libera.chat/devicetree

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>

L:	devicetree@vger.kernel.org

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git

F:	Documentation/devicetree/

drivers/of/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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

 *

 * 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

 * node exist for the parent. It takes an interrupt specifier structure as

 * input, walks the tree looking for any interrupt-map properties, translates

drivers/of/overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static BLOCKING_NOTIFIER_HEAD(overlay_notify_chain); 
 * @nb:		Notifier block to register

 *

 * 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.

 *

 * Note that a notifier callback is not supposed to store pointers to a device