diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-07 10:20:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-07 10:20:33 -0800 |
| commit | 0007c04038e5a3111bea1c4588bfb6778a69131d (patch) | |
| tree | b124a68c9d53d54b76a590861046951f8913bea8 /arch | |
| parent | c28bdeaf5d723b40c8e2901662f4e8acd574e839 (diff) | |
| parent | 064e32dc5b03114d0767893fecdaf7b5dfd8c286 (diff) | |
Merge tag 'devicetree-fixes-for-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
- Fix DT memory scanning for some MIPS boards when memory is not
specified in DT
- Redo CONFIG_CMDLINE* handling for missing /chosen node. The first
attempt broke PS3 (and possibly other PPC platforms).
- Fix constraints in QCom Soundwire schema
* tag 'devicetree-fixes-for-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
of: fdt: Honor CONFIG_CMDLINE* even without /chosen node, take 2
Revert "of: fdt: Honor CONFIG_CMDLINE* even without /chosen node"
dt-bindings: soundwire: qcom,soundwire: correct sizes related to number of ports
of/fdt: run soc memory setup when early_init_dt_scan_memory fails
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/ralink/of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c index 01c132bc33d5..4d06de77d92a 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c @@ -64,7 +64,7 @@ void __init plat_mem_setup(void) dtb = get_fdt(); __dt_setup_arch(dtb); - if (!early_init_dt_scan_memory()) + if (early_init_dt_scan_memory()) return; if (soc_info.mem_detect) |