Similar to every other SoCs define oscillator clock definitions for OMAP4+ SoCs to include/configs/. This will allow to not depend on SoC clock.h header file for getting default timer frequency.
Signed-off-by: Lokesh Vutla lokeshvutla@ti.com --- arch/arm/include/asm/arch-omap4/clock.h | 4 ---- arch/arm/include/asm/arch-omap5/clock.h | 8 -------- include/configs/ti_omap4_common.h | 4 ++++ include/configs/ti_omap5_common.h | 8 ++++++++ 4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/include/asm/arch-omap4/clock.h b/arch/arm/include/asm/arch-omap4/clock.h index 037045ca31..ba92ca8ee9 100644 --- a/arch/arm/include/asm/arch-omap4/clock.h +++ b/arch/arm/include/asm/arch-omap4/clock.h @@ -205,10 +205,6 @@ #define DPLL_NO_LOCK 0 #define DPLL_LOCK 1
-/* Clock Defines */ -#define V_OSCK 38400000 /* Clock output from T2 */ -#define V_SCLK V_OSCK - struct omap4_scrm_regs { u32 revision; /* 0x0000 */ u32 pad00[63]; diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h index e261bd43f2..b5da576e70 100644 --- a/arch/arm/include/asm/arch-omap5/clock.h +++ b/arch/arm/include/asm/arch-omap5/clock.h @@ -391,14 +391,6 @@ #define DPLL_NO_LOCK 0 #define DPLL_LOCK 1
-#if defined(CONFIG_DRA7XX) -#define V_OSCK 20000000 /* Clock output from T2 */ -#else -#define V_OSCK 19200000 /* Clock output from T2 */ -#endif - -#define V_SCLK V_OSCK - /* CKO buffer control */ #define CKOBUFFER_CLK_ENABLE_MASK (1 << 28)
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 33761c65e9..53982f0246 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -22,6 +22,10 @@ #include <asm/arch/cpu.h> #include <asm/arch/omap.h>
+/* Clock Defines */ +#define V_OSCK 38400000 /* Clock output from T2 */ +#define V_SCLK V_OSCK + /* Use General purpose timer 1 */ #define CONFIG_SYS_TIMERBASE GPT2_BASE
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 8bf4a6b7e9..6ae725d413 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -37,6 +37,14 @@
#include <configs/ti_armv7_omap.h>
+#if defined(CONFIG_DRA7XX) +#define V_OSCK 20000000 /* Clock output from T2 */ +#else +#define V_OSCK 19200000 /* Clock output from T2 */ +#endif + +#define V_SCLK V_OSCK + /* * Hardware drivers */