This patch enables the new clock features from arm920t/at91/clock.c. This is an required step to get at91rm9200_usart replaced by atmel_usart driver.
Signed-off-by: Andreas Bießmann andreas.devel@googlemail.com Cc: Jens Scharsig js_at_ng@scharsoft.de Cc: Eric Bénard eric@eukrea.com --- arch/arm/cpu/arm920t/at91/Makefile | 1 + arch/arm/cpu/arm920t/at91/cpu.c | 43 +++++++++++++++++++++++++++ arch/arm/include/asm/arch-at91/at91rm9200.h | 1 + include/configs/at91rm9200ek.h | 3 ++ include/configs/cpuat91.h | 5 ++- include/configs/eb_cpux9k2.h | 4 +- 6 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 arch/arm/cpu/arm920t/at91/cpu.c
diff --git a/arch/arm/cpu/arm920t/at91/Makefile b/arch/arm/cpu/arm920t/at91/Makefile index 8258ecd..4417dfe 100644 --- a/arch/arm/cpu/arm920t/at91/Makefile +++ b/arch/arm/cpu/arm920t/at91/Makefile @@ -29,6 +29,7 @@ SOBJS += lowlevel_init.o COBJS += reset.o COBJS += timer.o COBJS += clock.o +COBJS += cpu.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/arch/arm/cpu/arm920t/at91/cpu.c b/arch/arm/cpu/arm920t/at91/cpu.c new file mode 100644 index 0000000..74a1158 --- /dev/null +++ b/arch/arm/cpu/arm920t/at91/cpu.c @@ -0,0 +1,43 @@ +/* + * [origin: arch/arm/cpu/arm926ejs/at91/cpu.c] + * + * (C) Copyright 2011 + * Andreas Bießmann, andreas.devel@googlemail.com + * (C) Copyright 2010 + * Reinhard Meyer, reinhard.meyer@emk-elektronik.de + * (C) Copyright 2009 + * Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/hardware.h> +#include <asm/arch/clk.h> + +#ifndef CONFIG_SYS_AT91_MAIN_CLOCK +#define CONFIG_SYS_AT91_MAIN_CLOCK 0 +#endif + +int arch_cpu_init(void) +{ + return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK); +} + diff --git a/arch/arm/include/asm/arch-at91/at91rm9200.h b/arch/arm/include/asm/arch-at91/at91rm9200.h index f1912e2..fd774b4 100644 --- a/arch/arm/include/asm/arch-at91/at91rm9200.h +++ b/arch/arm/include/asm/arch-at91/at91rm9200.h @@ -22,6 +22,7 @@ #define __AT91RM9200_H__
#define CONFIG_AT91FAMILY /* it's a member of AT91 */ +#define CONFIG_ARCH_CPU_INIT /* we need arch_cpu_init() for hw timers */ #define CONFIG_ARM920T /* This is an ARM920T Core */
/* Periperial Identifiers */ diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 16cd214..ee199ab 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -55,6 +55,7 @@ * CONFIG_SYS_HZ is the tick rate for timer tc0 */ #define AT91C_XTAL_CLOCK 18432000 +#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define AT91C_MAIN_CLOCK ((AT91C_XTAL_CLOCK / 4) * 39) #define AT91C_MASTER_CLOCK (AT91C_MAIN_CLOCK / 3 ) #define CONFIG_SYS_HZ_CLOCK (AT91C_MASTER_CLOCK / 2) @@ -66,6 +67,8 @@ #define CONFIG_CPUAT91 #define USE_920T_MMU
+#include <asm/hardware.h> /* needed for port definitions */ + #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h index cfaef15..2bda72b 100644 --- a/include/configs/cpuat91.h +++ b/include/configs/cpuat91.h @@ -37,6 +37,7 @@ #endif
#define AT91C_XTAL_CLOCK 18432000 +#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define AT91C_MAIN_CLOCK ((AT91C_XTAL_CLOCK / 4) * 39) #define AT91C_MASTER_CLOCK (AT91C_MAIN_CLOCK / 3) #define CONFIG_SYS_HZ_CLOCK (AT91C_MASTER_CLOCK / 2) @@ -45,11 +46,11 @@ #define CONFIG_ARM920T #define CONFIG_AT91RM9200 #define CONFIG_CPUAT91 -#define CONFIG_AT91FAMILY - #undef CONFIG_USE_IRQ #define USE_920T_MMU
+#include <asm/hardware.h> /* needed for port definitions */ + #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h index e12770a..25b28f5 100644 --- a/include/configs/eb_cpux9k2.h +++ b/include/configs/eb_cpux9k2.h @@ -36,7 +36,7 @@ #define CONFIG_VERSION_VARIABLE #define CONFIG_IDENT_STRING " on EB+CPUx9K2"
-#include <asm/arch/hardware.h> /* needed for port definitions */ +#include <asm/hardware.h> /* needed for port definitions */
#define CONFIG_MISC_INIT_R
@@ -69,7 +69,7 @@ #define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ_CLOCK (AT91C_MASTER_CLOCK / 2)
-#define AT91_SLOW_CLOCK 32768 /* slow clock */ +#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock */
#define CONFIG_CMDLINE_TAG 1 #define CONFIG_SETUP_MEMORY_TAGS 1