diff options
| author | Peng Fan <peng.fan@nxp.com> | 2018-09-12 14:32:27 +0800 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2020-05-27 15:13:48 +0800 |
| commit | f13108a1842a2819489975f0d0040c9c65c3856c (patch) | |
| tree | 21045e186ce77c826e2d571937a1de75b11b19fa /arch | |
| parent | 7041ded231da64df7799c0f74b14f33e2534c723 (diff) | |
MLK-19552 imx8qm: xen: fix memory map
Fixes 9486251ced24("MLK-19494 configs: imx8qm mek android audo: correct xen physical memory")
correct text base, IPC address, memmap.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 884cada50b9a9fcda09d259cf145d87a29122cac)
(cherry picked from commit 55822e16786817f843d32c1347d705c2a2a435dd)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/fsl-imx8qm-mek-xen.dts | 7 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx8/cpu.c | 8 |
2 files changed, 4 insertions, 11 deletions
diff --git a/arch/arm/dts/fsl-imx8qm-mek-xen.dts b/arch/arm/dts/fsl-imx8qm-mek-xen.dts index f812b34a99..4061999375 100644 --- a/arch/arm/dts/fsl-imx8qm-mek-xen.dts +++ b/arch/arm/dts/fsl-imx8qm-mek-xen.dts @@ -14,14 +14,7 @@ #include "fsl-imx8qm-mek.dts" -&usdhc1 { - /* Need to be same as iomem for sdhc1 in domu.cfg */ - reg = <0x1 0x5b010000 0x0 0x10000>; -}; - &usdhc2 { - /* Need to be same as iomem for sdhc2 in domu.cfg */ - reg = <0x1 0x5b020000 0x0 0x10000>; status = "disabled"; }; diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 202fd1387b..5f6e0e1b51 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -753,12 +753,12 @@ void enable_caches(void) if (IS_ENABLED(CONFIG_XEN)) { imx8_mem_map[0].virt = 0x00000000UL; imx8_mem_map[0].phys = 0x00000000UL; - imx8_mem_map[0].size = 0x40000000UL; + imx8_mem_map[0].size = 0x80000000UL; imx8_mem_map[0].attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN; - imx8_mem_map[1].virt = 0x40000000UL; - imx8_mem_map[1].phys = 0x40000000UL; - imx8_mem_map[1].size = 0xC0000000UL; + imx8_mem_map[1].virt = 0x80000000UL; + imx8_mem_map[1].phys = 0x80000000UL; + imx8_mem_map[1].size = 0x80000000UL; imx8_mem_map[1].attrs = (PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE); imx8_mem_map[2].virt = 0x100000000UL; |