diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-30 11:53:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-30 11:53:14 -0800 |
| commit | 8c947645151cc2c279c75c7f640dd8f0fc0b9aa2 (patch) | |
| tree | 22dfc18cfd2443c7cca22cbf26f94d2df54ef896 /arch/arm | |
| parent | 3bf255315bed7ccdde94603ec164d04dc5953ad9 (diff) | |
| parent | 32ada6b0980d86133d080d62371a5787ea2ec5ed (diff) | |
| download | linux-8c947645151cc2c279c75c7f640dd8f0fc0b9aa2.tar.gz linux-8c947645151cc2c279c75c7f640dd8f0fc0b9aa2.tar.bz2 linux-8c947645151cc2c279c75c7f640dd8f0fc0b9aa2.zip | |
Merge tag 'devicetree-fixes-for-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
- Cleanups on properties with standard unit suffixes
- Fix overwriting dma_range_map if there's no 'dma-ranges' property
- Fix a bug when creating a /chosen node from ARM ATAGs
- Add missing properties for TI j721e USB binding
- Several doc reference updates due to DT schema conversions
* tag 'devicetree-fixes-for-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: Cleanup standard unit properties
of/device: Update dma_range_map only when dev has valid dma-ranges
ARM: zImage: atags_to_fdt: Fix node names on added root nodes
dt-bindings: usb: j721e: add ranges and dma-coherent props
dt-bindings:iio:adc: update adc.yaml reference
dt-bindings: memory: mediatek: update mediatek,smi-larb.yaml references
dt-bindings: display: mediatek: update mediatek,dpi.yaml reference
ASoC: audio-graph-card: update audio-graph-card.yaml reference
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/compressed/atags_to_fdt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c index 8452753efebe..31927d2fe297 100644 --- a/arch/arm/boot/compressed/atags_to_fdt.c +++ b/arch/arm/boot/compressed/atags_to_fdt.c @@ -15,7 +15,8 @@ static int node_offset(void *fdt, const char *node_path) { int offset = fdt_path_offset(fdt, node_path); if (offset == -FDT_ERR_NOTFOUND) - offset = fdt_add_subnode(fdt, 0, node_path); + /* Add the node to root if not found, dropping the leading '/' */ + offset = fdt_add_subnode(fdt, 0, node_path + 1); return offset; } |