summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-08-24 16:06:03 -0400
committerTom Rini <trini@konsulko.com>2015-08-24 16:06:03 -0400
commit7d31c6ab83d8a5875875eda041c0a1e756189917 (patch)
tree4294f1ed6c6dc162940d8a1b79f834879ffbe53a /arch/arm/include
parenta31a415803b8850f52d78395103fca3bdd1d37af (diff)
parent3664fa1beec3921dcfed605a9b37f63dee28ce6a (diff)
Merge git://git.denx.de/u-boot-pxa
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/arch-pxa/config.h25
-rw-r--r--arch/arm/include/asm/config.h5
2 files changed, 29 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-pxa/config.h b/arch/arm/include/asm/arch-pxa/config.h
new file mode 100644
index 0000000000..5836945214
--- /dev/null
+++ b/arch/arm/include/asm/arch-pxa/config.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2014 Andrew Ruder <andrew.ruder@elecsyscorp.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef _ASM_ARM_PXA_CONFIG_
+#define _ASM_ARM_PXA_CONFIG_
+
+#include <asm/arch/pxa-regs.h>
+
+/*
+ * Generic timer support
+ */
+#if defined(CONFIG_CPU_PXA27X) || defined(CONFIG_CPU_MONAHANS)
+#define CONFIG_SYS_TIMER_RATE 3250000
+#elif defined(CONFIG_CPU_PXA25X)
+#define CONFIG_SYS_TIMER_RATE 3686400
+#else
+#error "Timer frequency unknown - please config PXA CPU type"
+#endif
+
+#define CONFIG_SYS_TIMER_COUNTER OSCR
+
+#endif /* _ASM_ARM_PXA_CONFIG_ */
diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h
index 7a34a0186c..22fff02778 100644
--- a/arch/arm/include/asm/config.h
+++ b/arch/arm/include/asm/config.h
@@ -19,7 +19,10 @@
#include <asm/arch-fsl-lsch3/config.h>
#endif
-#ifdef CONFIG_LS102XA
+#if defined(CONFIG_LS102XA) || \
+ defined(CONFIG_CPU_PXA27X) || \
+ defined(CONFIG_CPU_MONAHANS) || \
+ defined(CONFIG_CPU_PXA25X)
#include <asm/arch/config.h>
#endif