diff options
| author | Julien Stephan <[email protected]> | 2026-02-19 11:03:37 +0100 |
|---|---|---|
| committer | David Lechner <[email protected]> | 2026-03-06 17:07:22 -0600 |
| commit | 40a4889220acb5f26ca2704c6f66f149234ee3b4 (patch) | |
| tree | edce0ae412f76afb0321f003f548cc44ed91c9d3 | |
| parent | c0ca147ac6228949a6d6497531c9f2f4a0dc6c67 (diff) | |
arm: mediatek: MT8195 fix mem_map
Commit 2517e2b524e8 ("arm: mediatek: add support for MediaTek MT8195
SoC") was merged after commit 24ffbb2aa17e ("arm: mediatek: consolidate
ARMv8 memory maps") but was not rebased on top of it, so mem_map is
defined twice. Fix it.
Fixes: 2517e2b524e8 ("arm: mediatek: add support for MediaTek MT8195 SoC")
Signed-off-by: Julien Stephan <[email protected]>
Reviewed-by: Macpaul Lin <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: David Lechner <[email protected]>
| -rw-r--r-- | arch/arm/mach-mediatek/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mediatek/mt8195/init.c | 21 |
2 files changed, 1 insertions, 22 deletions
diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig index 8da4ba5ceab..671a6cb1cad 100644 --- a/arch/arm/mach-mediatek/Kconfig +++ b/arch/arm/mach-mediatek/Kconfig @@ -149,7 +149,7 @@ config MTK_MEM_MAP_DDR_BASE_PHY config MTK_MEM_MAP_DDR_SIZE hex "DDR .size in mem_map" - default 0x200000000 if TARGET_MT7987 || TARGET_MT7988 || TARGET_MT8188 + default 0x200000000 if TARGET_MT7987 || TARGET_MT7988 || TARGET_MT8188 || TARGET_MT8195 default 0xc0000000 if TARGET_MT8365 default 0x80000000 if TARGET_MT7981 || TARGET_MT7986 || TARGET_MT8183 default 0x40000000 if TARGET_MT7622 || TARGET_MT8512 diff --git a/arch/arm/mach-mediatek/mt8195/init.c b/arch/arm/mach-mediatek/mt8195/init.c index c399550b8fc..0f68c589e9a 100644 --- a/arch/arm/mach-mediatek/mt8195/init.c +++ b/arch/arm/mach-mediatek/mt8195/init.c @@ -68,24 +68,3 @@ int print_cpuinfo(void) printf("CPU: MediaTek MT8195\n"); return 0; } - -static struct mm_region mt8195_mem_map[] = { - { - /* DDR */ - .virt = 0x40000000UL, - .phys = 0x40000000UL, - .size = 0x200000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE, - }, { - .virt = 0x00000000UL, - .phys = 0x00000000UL, - .size = 0x20000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | - PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, { - 0, - } -}; - -struct mm_region *mem_map = mt8195_mem_map; |