From patchwork Tue Mar 1 00:05:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: matt.waddel@linaro.org X-Patchwork-Id: 84873 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 E96A9B70D5 for ; Tue, 1 Mar 2011 11:06:51 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D0E192809A; Tue, 1 Mar 2011 01:06:41 +0100 (CET) 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 hLnvBi9WPazN; Tue, 1 Mar 2011 01:06:41 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E9975280A7; Tue, 1 Mar 2011 01:06:35 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EA4AA28091 for ; Tue, 1 Mar 2011 01:06:32 +0100 (CET) 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 927RmlCkXoes for ; Tue, 1 Mar 2011 01:06:32 +0100 (CET) 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-iw0-f172.google.com (mail-iw0-f172.google.com [209.85.214.172]) by theia.denx.de (Postfix) with ESMTPS id 431B728097 for ; Tue, 1 Mar 2011 01:06:32 +0100 (CET) Received: by mail-iw0-f172.google.com with SMTP id 42so3454902iwl.3 for ; Mon, 28 Feb 2011 16:06:32 -0800 (PST) Received: by 10.43.58.129 with SMTP id wk1mr5702781icb.456.1298937991955; Mon, 28 Feb 2011 16:06:31 -0800 (PST) Received: from localhost.localdomain (c-98-202-116-201.hsd1.ut.comcast.net [98.202.116.201]) by mx.google.com with ESMTPS id yf11sm3471379icb.8.2011.02.28.16.06.30 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 Feb 2011 16:06:31 -0800 (PST) From: matt.waddel@linaro.org To: u-boot@lists.denx.de Date: Mon, 28 Feb 2011 17:05:37 -0700 Message-Id: <1298937937-22759-3-git-send-email-matt.waddel@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1298601325-12112-1-git-send-email-matt.waddel@linaro.org> References: <1298601325-12112-1-git-send-email-matt.waddel@linaro.org> Cc: Matt Waddel , patches@linaro.org Subject: [U-Boot] [PATCH V2 3/3] ARMV7: Vexpress: Add MMC support 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Matt Waddel Added the board specific definitions to use the MMCI device. Signed-off-by: Matt Waddel --- board/armltd/vexpress/ca9x4_ct_vxp.c | 9 +++++++++ include/configs/ca9x4_ct_vxp.h | 4 ++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/board/armltd/vexpress/ca9x4_ct_vxp.c b/board/armltd/vexpress/ca9x4_ct_vxp.c index ce1be1e..92cb6be 100644 --- a/board/armltd/vexpress/ca9x4_ct_vxp.c +++ b/board/armltd/vexpress/ca9x4_ct_vxp.c @@ -86,6 +86,15 @@ int board_eth_init(bd_t *bis) return rc; } +int cpu_mmc_init(bd_t *bis) +{ + int rc = 0; +#ifdef CONFIG_ARM_MMCI + rc = arm_mmci_init(); +#endif + return rc; +} + static void flash__init(void) { /* Setup the sytem control register to allow writing to flash */ diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h index 63f003d..52fb5df 100644 --- a/include/configs/ca9x4_ct_vxp.h +++ b/include/configs/ca9x4_ct_vxp.h @@ -86,6 +86,10 @@ #define CONFIG_MMC 1 #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC +#define CONFIG_ARM_MMCI +#define CONFIG_ARM_MMCI_BASE 0x10005000 +#define CONFIG_SYS_MMC_MAX_BLK_COUNT 127 +#define CONFIG_ARM_MMCI_CLOCK_FREQ 6250000 /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE