Merge tag 'devicetree-fixes-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 May 2023 20:27:59 +0000 (13:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 May 2023 20:27:59 +0000 (13:27 -0700)
Pull devicetree fixes from Rob Herring:

 - Add Conor Dooley as a DT binding maintainer

 - Swap the order of parsing /memreserve/ and /reserved-memory nodes so
   that the /reserved-memory nodes which have more information are
   handled first

 - Fix some property dependencies in riscv,pmu binding

 - Update maintainers entries on a couple of bindings

* tag 'devicetree-fixes-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  MAINTAINERS: add Conor as a dt-bindings maintainer
  dt-bindings: perf: riscv,pmu: fix property dependencies
  dt-bindings: xilinx: Remove Naga from memory and mtd bindings
  of: fdt: Scan /memreserve/ last
  dt-bindings: clock: r9a06g032-sysctrl: Change maintainer to Fabrizio Castro
  dt-bindings: pinctrl: renesas,rzv2m: Change maintainer to Fabrizio Castro
  dt-bindings: pinctrl: renesas,rzn1: Change maintainer to Fabrizio Castro
  dt-bindings: i2c: renesas,rzv2m: Change maintainer to Fabrizio Castro

1  2 
Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml
Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
Documentation/devicetree/bindings/pinctrl/renesas,rzn1-pinctrl.yaml
Documentation/devicetree/bindings/pinctrl/renesas,rzv2m-pinctrl.yaml
MAINTAINERS
drivers/of/fdt.c

index 2fe53cbfbee0b52a30070e5a63122344b887275a,3050575566be3dfe0c5741655bda28f3e97dbfe2..15b63bbb82a21a0d07815c9191e77c9bb41b53c8
@@@ -7,10 -7,10 +7,10 @@@ $schema: http://devicetree.org/meta-sch
  title: Arasan NAND Flash Controller with ONFI 3.1 support
  
  allOf:
 -  - $ref: "nand-controller.yaml"
 +  - $ref: nand-controller.yaml
  
  maintainers:
-   - Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
+   - Michal Simek <michal.simek@amd.com>
  
  properties:
    compatible:
diff --cc MAINTAINERS
Simple merge
Simple merge