aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/include/asm
diff options
context:
space:
mode:
authorStefan Roese2020-05-14 11:59:03 +0200
committerDaniel Schwierzeck2020-07-18 14:23:25 +0200
commit2eed3dca229e97aa03954ee5178457c4f2f8cfdb (patch)
tree61100bd50c69a9e14f471b0219bbc7189a9421e9 /arch/mips/include/asm
parentc37281310593c01981516bb706242f80295a1308 (diff)
mips: cache: Allow using CONFIG_MIPS_L2_CACHE without CONFIG_MIPS_CM
This patch enables the usage of CONFIG_MIPS_L2_CACHE without CONFIG_MIPS_CM, which is what is needed for the newly added Octeon platform. Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch/mips/include/asm')
-rw-r--r--arch/mips/include/asm/cm.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/mips/include/asm/cm.h b/arch/mips/include/asm/cm.h
index 3878171607d..99ddbccd808 100644
--- a/arch/mips/include/asm/cm.h
+++ b/arch/mips/include/asm/cm.h
@@ -41,6 +41,7 @@
#include <asm/io.h>
#include <linux/bitops.h>
+#if CONFIG_IS_ENABLED(MIPS_CM)
static inline void *mips_cm_base(void)
{
return (void *)CKSEG1ADDR(CONFIG_MIPS_CM_BASE);
@@ -56,6 +57,17 @@ static inline unsigned long mips_cm_l2_line_size(void)
line_sz &= GENMASK(GCR_L2_CONFIG_LINESZ_BITS - 1, 0);
return line_sz ? (2 << line_sz) : 0;
}
+#else
+static inline void *mips_cm_base(void)
+{
+ return NULL;
+}
+
+static inline unsigned long mips_cm_l2_line_size(void)
+{
+ return 0;
+}
+#endif
#endif /* !__ASSEMBLY__ */