diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-20 11:49:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-20 11:49:49 -0800 |
| commit | d571fe47bb86c107ec57dd546b1ba4ccc209eb27 (patch) | |
| tree | c1252e89dc3469c5e6bceb9c3ec3e18908adb550 /drivers | |
| parent | a688362b19c408dc501dca3e1651e446afbd5d9a (diff) | |
| parent | ce7b1d58609abc2941a1f38094147f439fb74233 (diff) | |
Merge tag 'devicetree-fixes-for-6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
- Fix warnings for Mediatek overlays not getting applied
- Fix regression in handling elfcorehdr region
- Fix creating cpufreq device on OPPv1 platforms
- Add GE7800 GPU in Renesas R-Car V3U
- Simplify dma-coherent property in TI display bindings
- Allow "reg" in sprd,sc9860-clk binding
- Update Linus Walleij's email
* tag 'devicetree-fixes-for-6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
arm64: dts: mediatek: Apply mt8395-radxa DT overlay at build time
arm64: dts: mediatek: mt7988: add dtbs with applied overlays for bpi-r4 (pro)
arm64: dts: mediatek: mt7986: add dtbs with applied overlays for bpi-r3
dt-bindings: Updates Linus Walleij's mail address
dt-bindings: gpu: img,powervr-rogue: Document GE7800 GPU in Renesas R-Car V3U
cpufreq: dt-platdev: Fix creating device on OPPv1 platforms
dt-bindings: clock: sprd,sc9860-clk: Allow "reg" for gate clocks
dt-bindings: display/ti: Simplify dma-coherent property
arm64: kdump: Fix elfcorehdr overlap caused by reserved memory processing reorder
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/cpufreq-dt-platdev.c | 7 | ||||
| -rw-r--r-- | drivers/of/fdt.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c index a1d11ecd1ac8..b06a43143d23 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c @@ -219,11 +219,12 @@ static bool __init cpu0_node_has_opp_v2_prop(void) static int __init cpufreq_dt_platdev_init(void) { - const void *data; + const void *data = NULL; - data = of_machine_get_match_data(allowlist); - if (data) + if (of_machine_device_match(allowlist)) { + data = of_machine_get_match_data(allowlist); goto create_pdev; + } if (cpu0_node_has_opp_v2_prop() && !of_machine_device_match(blocklist)) goto create_pdev; diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index d378d4b4109f..331646d667b9 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -503,8 +503,8 @@ void __init early_init_fdt_scan_reserved_mem(void) if (!initial_boot_params) return; - fdt_scan_reserved_mem(); fdt_reserve_elfcorehdr(); + fdt_scan_reserved_mem(); /* Process header /memreserve/ fields */ for (n = 0; ; n++) { |