From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 May 2024 00:27:49 +0000 (-0700)
Subject: Merge tag 'devicetree-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=06f054b1fee83415fe35204845708988fc16ef22;p=linux.git

Merge tag 'devicetree-for-6.10' of git://git./linux/kernel/git/robh/linux

Pull devicetree updates from Rob Herring:
 "DT Bindings:

   - Convert samsung,exynos5-dp, atmel,lcdc, aspeed,ast2400-wdt bindings
     to schemas

   - Add bindings for Allwinner H616 NMI controller, Renesas r8a779g0
     irqc, Renesas R-Car V4M TMU and CMT timers, Freescale S32G3
     linflexuart, and Mediatek MT7988 XHCI

   - Add 'reg' constraints on DSI and SPI display panels

   - More dropping of unnecessary quotes in schemas

   - Use full paths rather than relative paths in schema $refs

   - Drop redundant storing of phandle for reserved memory

  DT Core:

   - Use scope based cleanups for kfree() and of_node_put()

   - Track interrupt-map and power-supplies for fw_devlink

   - Add buffer overflow check in of_modalias()

   - Add and use __of_prop_free() helper for freeing struct property"

* tag 'devicetree-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (25 commits)
  of: property: Add fw_devlink support for interrupt-map property
  dt-bindings: display: panel: constrain 'reg' in DSI panels
  dt-bindings: display: panel: constrain 'reg' in SPI panels
  dt-bindings: display: samsung,ams495qa01: add missing SPI properties ref
  dt-bindings: Use full path to other schemas
  dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema
  of: module: add buffer overflow check in of_modalias()
  dt-bindings: PCI: microchip: increase number of items in ranges property
  dt-bindings: Drop unnecessary quotes on keys
  dt-bindings: interrupt-controller: mediatek,mt6577-sysirq: Drop unnecessary quotes
  of: property: Use scope based cleanup on port_node
  of: reserved_mem: Remove the use of phandle from the reserved_mem APIs
  of: property: fw_devlink: Add support for "power-supplies" binding
  dt-bindings: watchdog: aspeed,ast2400-wdt: Convert to DT schema
  dt-bindings: irq: sun7i-nmi: Add binding for the H616 NMI controller
  dt-bindings: interrupt-controller: renesas,irqc: Add r8a779g0 support
  dt-bindings: timer: renesas,tmu: Add R-Car V4M support
  dt-bindings: timer: renesas,cmt: Add R-Car V4M support
  of: Use scope based of_node_put() cleanups
  of: Use scope based kfree() cleanups
  ...
---

06f054b1fee83415fe35204845708988fc16ef22
diff --cc Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
index bbeea8cfa5fbc,0447ee7249474..c4bae4f77085b
--- a/Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
+++ b/Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
@@@ -34,7 -40,7 +37,6 @@@ properties
    vddio-supply:
      description: regulator that supplies the I/O voltage
  
-   reg: true
 -  ports: true
    rotation: true
    backlight: true
  
diff --cc Documentation/devicetree/bindings/display/panel/sony,td4353-jdi.yaml
index 07bce556ad406,feca40b0d7591..191b692125e14
--- a/Documentation/devicetree/bindings/display/panel/sony,td4353-jdi.yaml
+++ b/Documentation/devicetree/bindings/display/panel/sony,td4353-jdi.yaml
@@@ -20,11 -20,10 +20,12 @@@ properties
    compatible:
      const: sony,td4353-jdi-tama
  
-   reg: true
+   reg:
+     maxItems: 1
  
    backlight: true
 +  width-mm: true
 +  height-mm: true
  
    vddio-supply:
      description: VDDIO 1.8V supply
diff --cc drivers/of/dynamic.c
index 4d57a4e341054,43f4e2c93bd25..dda6092e6d3a8
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@@ -9,7 -9,7 +9,8 @@@
  
  #define pr_fmt(fmt)	"OF: " fmt
  
+ #include <linux/cleanup.h>
 +#include <linux/device.h>
  #include <linux/of.h>
  #include <linux/spinlock.h>
  #include <linux/slab.h>
diff --cc drivers/of/property.c
index 0320f1ae9b4d8,21f59e3cd6aa9..1c83e68f805ba
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1252,8 -1241,7 +1241,9 @@@ DEFINE_SIMPLE_PROP(backlight, "backligh
  DEFINE_SIMPLE_PROP(panel, "panel", NULL)
  DEFINE_SIMPLE_PROP(msi_parent, "msi-parent", "#msi-cells")
  DEFINE_SIMPLE_PROP(post_init_providers, "post-init-providers", NULL)
 +DEFINE_SIMPLE_PROP(access_controllers, "access-controllers", "#access-controller-cells")
 +DEFINE_SIMPLE_PROP(pses, "pses", "#pse-cells")
+ DEFINE_SIMPLE_PROP(power_supplies, "power-supplies", NULL)
  DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
  DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
  
@@@ -1359,10 -1398,10 +1400,12 @@@ static const struct supplier_bindings o
  	{ .parse_prop = parse_backlight, },
  	{ .parse_prop = parse_panel, },
  	{ .parse_prop = parse_msi_parent, },
 +	{ .parse_prop = parse_pses, },
+ 	{ .parse_prop = parse_power_supplies, },
  	{ .parse_prop = parse_gpio_compat, },
  	{ .parse_prop = parse_interrupts, },
+ 	{ .parse_prop = parse_interrupt_map, },
 +	{ .parse_prop = parse_access_controllers, },
  	{ .parse_prop = parse_regulators, },
  	{ .parse_prop = parse_gpio, },
  	{ .parse_prop = parse_gpios, },