summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/kernel
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2015-09-24 23:36:45 +0300
committerMax Filippov <jcmvbkbc@gmail.com>2015-11-02 18:03:02 +0300
commit260c64bbabdb8da7248c87e0cdd92023bd7b76c6 (patch)
treebbb5763475f2d5fbc3bf61a4d1c9432bd1f74b0e /arch/xtensa/kernel
parentcfedf08b0c09f325fa24d91e8c9433ec481800cf (diff)
downloadlinux-stable-260c64bbabdb8da7248c87e0cdd92023bd7b76c6.tar.gz
linux-stable-260c64bbabdb8da7248c87e0cdd92023bd7b76c6.tar.bz2
linux-stable-260c64bbabdb8da7248c87e0cdd92023bd7b76c6.zip
xtensa: nommu: provide correct KIO addresses
KIO region location is different for noMMU cores. Provide different default physical address and make KIO virtual address equal to physical. Move xtensa_get_kio_paddr function close to XCHAL_KIO_PADDR definition and define it not only for MMUv3, but for all MMU options except MMUv2. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/kernel')
-rw-r--r--arch/xtensa/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 28fc57ef5b86..149d372a9350 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -190,7 +190,7 @@ static int __init parse_bootparam(const bp_tag_t* tag)
#ifdef CONFIG_OF
bool __initdata dt_memory_scan = false;
-#if XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY
+#if !XCHAL_HAVE_PTP_MMU || XCHAL_HAVE_SPANNING_WAY
unsigned long xtensa_kio_paddr = XCHAL_KIO_DEFAULT_PADDR;
EXPORT_SYMBOL(xtensa_kio_paddr);