From patchwork Tue Jun 7 23:27:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Bie=C3=9Fmann?= X-Patchwork-Id: 99345 X-Patchwork-Delegate: info@emk-elektronik.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 1DDD9B6FA9 for ; Wed, 8 Jun 2011 09:28:53 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9AB6F2832E; Wed, 8 Jun 2011 01:28:36 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vxdUz+82TJI6; Wed, 8 Jun 2011 01:28:36 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1011C2833E; Wed, 8 Jun 2011 01:28:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B5ECB280EF for ; Wed, 8 Jun 2011 01:28:22 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9qPOVrkozhR7 for ; Wed, 8 Jun 2011 01:28:17 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-bw0-f44.google.com (mail-bw0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id 3D9A628118 for ; Wed, 8 Jun 2011 01:28:17 +0200 (CEST) Received: by mail-bw0-f44.google.com with SMTP id 13so200266bwz.3 for ; Tue, 07 Jun 2011 16:28:17 -0700 (PDT) Received: by 10.204.136.1 with SMTP id p1mr181415bkt.105.1307489296950; Tue, 07 Jun 2011 16:28:16 -0700 (PDT) Received: from andreas-mbp.erlangen.biessmann.tld (dslb-188-105-233-069.pools.arcor-ip.net [188.105.233.69]) by mx.google.com with ESMTPS id ek1sm12483bkb.9.2011.06.07.16.28.15 (version=SSLv3 cipher=OTHER); Tue, 07 Jun 2011 16:28:16 -0700 (PDT) From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= To: u-boot@lists.denx.de, Reinhard Meyer Date: Wed, 8 Jun 2011 01:27:58 +0200 Message-Id: <1307489278-96804-3-git-send-email-andreas.devel@googlemail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1307489278-96804-1-git-send-email-andreas.devel@googlemail.com> References: <1307489278-96804-1-git-send-email-andreas.devel@googlemail.com> MIME-Version: 1.0 Cc: Jens Scharsig , =?UTF-8?q?Eric=20B=C3=A9nard?= Subject: [U-Boot] [PATCH 2/2] arm920t/at91: use new clock features from libat91-common X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch enables the new clock features from new libat91-common. This is a required step to get at91rm9200_usart replaced by atmel_usart driver. Signed-off-by: Andreas Bießmann CC: Jens Scharsig CC: Eric Bénard --- arch/arm/cpu/arm920t/at91/Makefile | 1 + 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 ++-- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/arm920t/at91/Makefile b/arch/arm/cpu/arm920t/at91/Makefile index 5c71b77..872461a 100644 --- a/arch/arm/cpu/arm920t/at91/Makefile +++ b/arch/arm/cpu/arm920t/at91/Makefile @@ -28,6 +28,7 @@ LIB = $(obj)lib$(SOC).o SOBJS += lowlevel_init.o COBJS += reset.o COBJS += timer.o +COBJS += cpu.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/arch/arm/include/asm/arch-at91/at91rm9200.h b/arch/arm/include/asm/arch-at91/at91rm9200.h index ff18014..979241e 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 /* 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 /* 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 /* needed for port definitions */ +#include /* 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