Skip to content

Commit 418d5c9

Browse files
committed
Merge tag 'devicetree-fixes-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
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
2 parents 647681b + 6997f84 commit 418d5c9

File tree

10 files changed

+9
-10
lines changed

10 files changed

+9
-10
lines changed

Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Renesas RZ/N1D (R9A06G032) System Controller
88

99
maintainers:
10-
- Gareth Williams <gareth.williams.jx@renesas.com>
10+
- Fabrizio Castro <fabrizio.castro.jz@renesas.com>
1111
- Geert Uytterhoeven <geert+renesas@glider.be>
1212

1313
properties:

Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Renesas RZ/V2M I2C Bus Interface
88

99
maintainers:
10-
- Phil Edworthy <phil.edworthy@renesas.com>
10+
- Fabrizio Castro <fabrizio.castro.jz@renesas.com>
1111

1212
allOf:
1313
- $ref: /schemas/i2c/i2c-controller.yaml#

Documentation/devicetree/bindings/memory-controllers/arm,pl35x-smc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ title: Arm PL35x Series Static Memory Controller (SMC)
88

99
maintainers:
1010
- Miquel Raynal <miquel.raynal@bootlin.com>
11-
- Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
1211

1312
description: |
1413
The PL35x Static Memory Controller is a bus where you can connect two kinds

Documentation/devicetree/bindings/mtd/arasan,nand-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ allOf:
1010
- $ref: nand-controller.yaml
1111

1212
maintainers:
13-
- Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
13+
- Michal Simek <michal.simek@amd.com>
1414

1515
properties:
1616
compatible:

Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ allOf:
1111

1212
maintainers:
1313
- Miquel Raynal <miquel.raynal@bootlin.com>
14-
- Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>
1514

1615
properties:
1716
compatible:

Documentation/devicetree/bindings/perf/riscv,pmu.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ properties:
9191

9292
dependencies:
9393
"riscv,event-to-mhpmevent": [ "riscv,event-to-mhpmcounters" ]
94-
"riscv,event-to-mhpmcounters": [ "riscv,event-to-mhpmevent" ]
9594

9695
required:
9796
- compatible

Documentation/devicetree/bindings/pinctrl/renesas,rzn1-pinctrl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Renesas RZ/N1 Pin Controller
88

99
maintainers:
10-
- Gareth Williams <gareth.williams.jx@renesas.com>
10+
- Fabrizio Castro <fabrizio.castro.jz@renesas.com>
1111
- Geert Uytterhoeven <geert+renesas@glider.be>
1212

1313
properties:

Documentation/devicetree/bindings/pinctrl/renesas,rzv2m-pinctrl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Renesas RZ/V2M combined Pin and GPIO controller
88

99
maintainers:
10+
- Fabrizio Castro <fabrizio.castro.jz@renesas.com>
1011
- Geert Uytterhoeven <geert+renesas@glider.be>
11-
- Phil Edworthy <phil.edworthy@renesas.com>
1212

1313
description:
1414
The Renesas RZ/V2M SoC features a combined Pin and GPIO controller.

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15703,6 +15703,7 @@ K: of_overlay_remove
1570315703
OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
1570415704
M: Rob Herring <robh+dt@kernel.org>
1570515705
M: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
15706+
M: Conor Dooley <conor+dt@kernel.org>
1570615707
L: devicetree@vger.kernel.org
1570715708
S: Maintained
1570815709
C: irc://irc.libera.chat/devicetree

drivers/of/fdt.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,9 @@ void __init early_init_fdt_scan_reserved_mem(void)
635635
if (!initial_boot_params)
636636
return;
637637

638+
fdt_scan_reserved_mem();
639+
fdt_reserve_elfcorehdr();
640+
638641
/* Process header /memreserve/ fields */
639642
for (n = 0; ; n++) {
640643
fdt_get_mem_rsv(initial_boot_params, n, &base, &size);
@@ -643,8 +646,6 @@ void __init early_init_fdt_scan_reserved_mem(void)
643646
memblock_reserve(base, size);
644647
}
645648

646-
fdt_scan_reserved_mem();
647-
fdt_reserve_elfcorehdr();
648649
fdt_init_reserved_mem();
649650
}
650651

0 commit comments

Comments
 (0)