diff options
author | Rob Herring <robh@kernel.org> | 2021-05-28 00:32:17 +0200 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2021-06-03 03:59:28 +0200 |
commit | 1ee292a66e8199d234c8f8fa5cd3d2fef16fc97d (patch) | |
tree | 0cd92b74a793e2f49c0cb88b65d473a4b8f9c710 | |
parent | dt-bindings: reset: update ti,sci-reset.yaml references (diff) | |
download | linux-1ee292a66e8199d234c8f8fa5cd3d2fef16fc97d.tar.xz linux-1ee292a66e8199d234c8f8fa5cd3d2fef16fc97d.zip |
of: Drop reserved mem dependency on DMA_DECLARE_COHERENT and DMA_CMA
Reserved memory regions can be used for more than just DMA regions, so
only enabling on DMA_DECLARE_COHERENT (via HAS_DMA) or DMA_CMA is wrong.
This effectively doesn't matter except for the few cases arches select
NO_DMA.
At least, these users of RESERVEDMEM_OF_DECLARE depend on reserved memory
support:
arch/riscv/mm/init.c:RESERVEDMEM_OF_DECLARE(elfcorehdr, "linux,elfcorehdr", elfcore_hdr_setup);
drivers/memory/tegra/tegra210-emc-table.c:RESERVEDMEM_OF_DECLARE(tegra210_emc_table, "nvidia,tegra210-emc-table",
drivers/soc/fsl/qbman/bman_ccsr.c:RESERVEDMEM_OF_DECLARE(bman_fbpr, "fsl,bman-fbpr", bman_fbpr);
drivers/soc/fsl/qbman/qman_ccsr.c:RESERVEDMEM_OF_DECLARE(qman_fqd, "fsl,qman-fqd", qman_fqd);
drivers/soc/fsl/qbman/qman_ccsr.c:RESERVEDMEM_OF_DECLARE(qman_pfdr, "fsl,qman-pfdr", qman_pfdr);
Let's simplify things and enable OF_RESERVED_MEM when OF_EARLY_FLATTREE is
enabled.
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210527223217.1572631-1-robh@kernel.org
-rw-r--r-- | drivers/of/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 18450437d5d5..3dfeae8912df 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -75,9 +75,7 @@ config OF_NET def_bool y config OF_RESERVED_MEM - bool - depends on OF_EARLY_FLATTREE - default y if DMA_DECLARE_COHERENT || DMA_CMA + def_bool OF_EARLY_FLATTREE config OF_RESOLVE bool |