From patchwork Tue Jan 22 01:47:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 214307 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 233002C0080 for ; Tue, 22 Jan 2013 12:44:31 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 984FC4A0A5; Tue, 22 Jan 2013 02:44:24 +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 6dmY8htCdA0J; Tue, 22 Jan 2013 02:44:24 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A390D4A0BF; Tue, 22 Jan 2013 02:44:04 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 57E7C4A0AD for ; Tue, 22 Jan 2013 02:43:56 +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 KXApWw1xpLk7 for ; Tue, 22 Jan 2013 02:43:53 +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-gh0-f174.google.com (mail-gh0-f174.google.com [209.85.160.174]) by theia.denx.de (Postfix) with ESMTPS id 25E254A0F6 for ; Tue, 22 Jan 2013 02:43:45 +0100 (CET) Received: by mail-gh0-f174.google.com with SMTP id g15so658713ghb.19 for ; Mon, 21 Jan 2013 17:43:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=GQVSfRj8gPA9ypoTQMR72mujKy343gBRbw7TcHiqQB4=; b=yhrEyNb5DsrLx7xjeieaAyjvKNAsNMC9NC8AdQE+OgczcOOCRtmN2+RGLACRXJ0zxY zYnimuIxbpLHayPF1042yX+Jha3/DsqXT1V6opSTh+9niehFC+FxGcxOuZZuJZu2wslq B/bsk6+vw5Cfpu9+CzwG1qNwYRGzY2DFrMWF1LkXyml5nHjqtuVGbNVcIO0T0f3yf4QZ K9QgPWkXaGuhV9qci95N70A037GjvnqQ4I7pLa/1UiT++HSH+iqrVMgEDOW9PcZV9pow cRZLzjQ2uM2+2+vY2MBkJwYdlK6YGjRYv71seenG5E/baFqdpO1zw8clY9YA1Js99B0y YaCw== X-Received: by 10.236.156.230 with SMTP id m66mr17038926yhk.28.1358819024562; Mon, 21 Jan 2013 17:43:44 -0800 (PST) Received: from nano.lab.ossystems.com.br ([177.35.66.48]) by mx.google.com with ESMTPS id s70sm5363563yhb.14.2013.01.21.17.43.41 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jan 2013 17:43:43 -0800 (PST) From: Otavio Salvador To: u-boot@lists.denx.de Date: Mon, 21 Jan 2013 23:47:25 -0200 Message-Id: <1358819250-31625-6-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1358819250-31625-1-git-send-email-otavio@ossystems.com.br> References: <1358819250-31625-1-git-send-email-otavio@ossystems.com.br> Cc: marex@denx.de, fabio.estevam@freescale.com Subject: [U-Boot] [PATCH 5/9] mx23_olinuxino: Add MMC support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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: Marek Vasut Signed-off-by: Marek Vasut --- board/olimex/mx23_olinuxino/mx23_olinuxino.c | 17 ++++++++++++++++- board/olimex/mx23_olinuxino/spl_boot.c | 10 ++++++++++ include/configs/mx23_olinuxino.h | 12 ++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/board/olimex/mx23_olinuxino/mx23_olinuxino.c b/board/olimex/mx23_olinuxino/mx23_olinuxino.c index 2fcad26..421ed9c 100644 --- a/board/olimex/mx23_olinuxino/mx23_olinuxino.c +++ b/board/olimex/mx23_olinuxino/mx23_olinuxino.c @@ -23,7 +23,10 @@ */ #include +#include +#include #include +#include #include DECLARE_GLOBAL_DATA_PTR; @@ -33,7 +36,12 @@ DECLARE_GLOBAL_DATA_PTR; */ int board_early_init_f(void) { - /* SSP clock init will come here soon. */ + /* IO0 clock at 480MHz */ + mxs_set_ioclk(MXC_IOCLK0, 480000); + + /* SSP0 clock at 96MHz */ + mxs_set_sspclk(MXC_SSPCLK0, 96000, 0); + return 0; } @@ -42,6 +50,13 @@ int dram_init(void) return mxs_dram_init(); } +#ifdef CONFIG_CMD_MMC +int board_mmc_init(bd_t *bis) +{ + return mxsmmc_initialize(bis, 0, NULL); +} +#endif + int board_init(void) { /* Adress of boot parameters */ diff --git a/board/olimex/mx23_olinuxino/spl_boot.c b/board/olimex/mx23_olinuxino/spl_boot.c index aaebe6c..3cc40cd 100644 --- a/board/olimex/mx23_olinuxino/spl_boot.c +++ b/board/olimex/mx23_olinuxino/spl_boot.c @@ -30,6 +30,7 @@ #include #define MUX_CONFIG_EMI (MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL) +#define MUX_CONFIG_SSP (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP) const iomux_cfg_t iomux_setup[] = { /* DUART */ @@ -82,6 +83,15 @@ const iomux_cfg_t iomux_setup[] = { MX23_PAD_EMI_CKE__EMI_CKE | MUX_CONFIG_EMI, MX23_PAD_EMI_RASN__EMI_RASN | MUX_CONFIG_EMI, MX23_PAD_EMI_WEN__EMI_WEN | MUX_CONFIG_EMI, + + /* MMC 0 */ + MX23_PAD_SSP1_CMD__SSP1_CMD | MUX_CONFIG_SSP, + MX23_PAD_SSP1_DETECT__SSP1_DETECT | MUX_CONFIG_SSP, + MX23_PAD_SSP1_DATA0__SSP1_DATA0 | MUX_CONFIG_SSP, + MX23_PAD_SSP1_DATA1__SSP1_DATA1 | MUX_CONFIG_SSP, + MX23_PAD_SSP1_DATA2__SSP1_DATA2 | MUX_CONFIG_SSP, + MX23_PAD_SSP1_DATA3__SSP1_DATA3 | MUX_CONFIG_SSP, + MX23_PAD_SSP1_SCK__SSP1_SCK | MUX_CONFIG_SSP, }; void board_init_ll(void) diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index e5e718c..bc63481 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -53,8 +53,10 @@ #define CONFIG_DOS_PARTITION #define CONFIG_CMD_CACHE +#define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT #define CONFIG_CMD_GPIO +#define CONFIG_CMD_MMC /* * Memory configurations @@ -110,6 +112,16 @@ #define CONFIG_BAUDRATE 115200 /* Default baud rate */ /* + * MMC Driver + */ +#ifdef CONFIG_CMD_MMC +#define CONFIG_MMC +#define CONFIG_BOUNCE_BUFFER +#define CONFIG_GENERIC_MMC +#define CONFIG_MXS_MMC +#endif + +/* * APBH DMA */ #define CONFIG_APBH_DMA