From patchwork Mon Dec 17 11:19:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amar X-Patchwork-Id: 206824 X-Patchwork-Delegate: promsoft@gmail.com 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 C37F42C0095 for ; Mon, 17 Dec 2012 21:58:09 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9A28F4A049; Mon, 17 Dec 2012 11:58:02 +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 Te2PiJDMKFGE; Mon, 17 Dec 2012 11:58:02 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5DAA94A04A; Mon, 17 Dec 2012 11:57:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 45CBC4A040 for ; Mon, 17 Dec 2012 11:57:48 +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 97A5pnuGiJqI for ; Mon, 17 Dec 2012 11:57:46 +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 mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by theia.denx.de (Postfix) with ESMTP id 5F8294A03B for ; Mon, 17 Dec 2012 11:57:42 +0100 (CET) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MF600KVY93ADWJ0@mailout3.samsung.com> for u-boot@lists.denx.de; Mon, 17 Dec 2012 19:57:33 +0900 (KST) Received: from epcpdlpp25 ( [172.20.52.125]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 07.91.01231.C9AFEC05; Mon, 17 Dec 2012 19:57:32 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-a7-50cefa9c3879 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 76.91.01231.C9AFEC05; Mon, 17 Dec 2012 19:57:32 +0900 (KST) Received: from localhost.localdomain ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MF600FNU92TR670@mmp2.samsung.com> for u-boot@lists.denx.de; Mon, 17 Dec 2012 19:57:32 +0900 (KST) From: Amar To: u-boot@lists.denx.de Date: Mon, 17 Dec 2012 16:49:33 +0530 Message-id: <1355743176-12305-7-git-send-email-amarendra.xt@samsung.com> X-Mailer: git-send-email 1.7.0.4 In-reply-to: <1355743176-12305-1-git-send-email-amarendra.xt@samsung.com> References: <1355743176-12305-1-git-send-email-amarendra.xt@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLLMWRmVeSWpSXmKPExsWyRsSkVnfOr3MBBgsP6lu83dvJ7sDocfbO DsYAxigum5TUnMyy1CJ9uwSujKPrTrMU9ItUnLown6WB8axAFyMnh4SAiUTf/L1sELaYxIV7 64FsLg4hgVmMEsc6N7LDFO16+psRIjGdUeJhTx87hLOASWLq/FvMXYwcHGwCqhK/FtuDNIgI SEj86r8K1sAs0MEosWPiZkaQhLCAtsS5nrlMIDYLUP2F+bPBVvMKeEh09HYyQ2xTkGhddghs M6eAp8Tn3Q9ZQGwhoJo9u6YzQ/QKSHybfIgFZK+EgKzEpgPMILskBK6zScz48ogRYo6kxMEV N1gmMAovYGRYxSiaWpBcUJyUnmuoV5yYW1yal66XnJ+7iREYhqf/PZPawbiyweIQowAHoxIP r1HquQAh1sSy4srcQ4wSHMxKIrzSb4BCvCmJlVWpRfnxRaU5qcWHGH2ALpnILCWanA+MkbyS eENjE3NTY1NLIyMzU1McwkrivM0eKQFCAumJJanZqakFqUUw45g4OKUaGN24156zjOL44RHP YqCg6vvWROjU7fniB9b0/QtlX72uTMqdodg8O9Bk/kVjP25Ja0GxnMqDbWsnvTZjXbD6hxRn 2bt1LY7WURsvHFV+mpjc3fTMSIApjJv1hMoUjTWaxcz1mul2AR83eQlNyk548qjlSsO++X8V /yraTVnYL5Lisq8tWaxMiaU4I9FQi7moOBEARE0dm3ACAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42I5/e+xoO6cX+cCDC78lLN4u7eT3YHR4+yd HYwBjFENjDYZqYkpqUUKqXnJ+SmZeem2St7B8c7xpmYGhrqGlhbmSgp5ibmptkouPgG6bpk5 QGOVFMoSc0qBQgGJxcVK+naYJoSGuOlawDRG6PqGBMH1GBmggYQ1jBlH151mKegXqTh1YT5L A+NZgS5GTg4JAROJXU9/M0LYYhIX7q1n62Lk4hASmM4o8bCnjx3CWcAkMXX+LeYuRg4ONgFV iV+L7UEaRAQkJH71X2UEqWEW6GCU2DFxM9gkYQFtiXM9c5lAbBag+gvzZ7OB2LwCHhIdvZ3M ENsUJFqXHWIHsTkFPCU+737IAmILAdXs2TWdeQIj7wJGhlWMoqkFyQXFSem5hnrFibnFpXnp esn5uZsYwUH+TGoH48oGi0OMAhyMSjy8RqnnAoRYE8uKK3MPMUpwMCuJ8Eq/AQrxpiRWVqUW 5ccXleakFh9i9AG6aiKzlGhyPjAC80riDY1NzE2NTS1NLEzMLHEIK4nzNnukBAgJpCeWpGan phakFsGMY+LglGpg3Fi2beODwNyFElO777z/enq2u/L7lpmftqW1qr1aHLS7Pk3yZMaxtBCD AItoc+HHc6R8/Zhy30d/6vt2g2ftA35X690P3lotcTg7n1XuV+6L1sm17Vc2rOdKnrC4QUzu aD9XUonLD5OtugZT/O9MLubuUD7vuNVM6badnIXznt1bNF6s+/N0iRJLcUaioRZzUXEiAOQY XNafAgAA X-CFilter-Loop: Reflected Cc: patches@linaro.org, jh80.chung@samsung.com, afleming@gmail.com Subject: [U-Boot] [PATCH 6/9] SMDK5250: Enable DWMMC 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 This patch enables DWMMC for SMDK5250. Support both dt and non-dt versions. Signed-off-by: Amar --- board/samsung/smdk5250/smdk5250.c | 36 ++++++++++++++++++++++++++++++++---- include/configs/exynos5250-dt.h | 9 +++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index 4d24978..7a9c8f6 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -192,16 +193,43 @@ int checkboard(void) #ifdef CONFIG_GENERIC_MMC int board_mmc_init(bd_t *bis) { - int err; + int err = 0, ret = 0; +#ifdef CONFIG_OF_CONTROL + /* dwmmc initializattion for available channels */ + err = exynos_dwmmc_init(gd->fdt_blob); + if (err) { + debug("dwmmc init failed\n"); + } + ret |= err; +#else err = exynos_pinmux_config(PERIPH_ID_SDMMC0, PINMUX_FLAG_8BIT_MODE); if (err) { debug("SDMMC0 not configured\n"); - return err; } + ret |= err; - err = s5p_mmc_init(0, 8); - return err; + /*eMMC: dwmmc Channel-0 with 8 bit bus width */ + err = exynos_dwmmc_init(0, 8); + if (err) { + debug("dwmmc Channel-0 init failed\n"); + } + ret |= err; + + err = exynos_pinmux_config(PERIPH_ID_SDMMC2, PINMUX_FLAG_NONE); + if (err) { + debug("SDMMC2 not configured\n"); + } + ret |= err; + + /*SD: dwmmc Channel-2 with 4 bit bus width */ + err = exynos_dwmmc_init(2, 4); + if (err) { + debug("dwmmc Channel-2 init failed\n"); + } + ret |= err; +#endif + return ret; } #endif diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index 12f555c..3b89e20 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -84,6 +84,8 @@ #define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_S5P_SDHCI +#define CONFIG_DWMMC +#define CONFIG_EXYNOS_DWMMC #define CONFIG_BOARD_EARLY_INIT_F @@ -116,6 +118,13 @@ #define CONFIG_SPL #define COPY_BL2_FNPTR_ADDR 0x02020030 +/* eMMC4.4 SPL */ +#define EMMC44_COPY_BL2_FNPTR_ADDR 0x02020044 +#define EMMC44_END_BOOTOP_FNPTR_ADDR 0x02020048 + +#define FSYS1_MMC0_DIV_MASK 0xff0f + + /* specific .lds file */ #define CONFIG_SPL_LDSCRIPT "board/samsung/smdk5250/smdk5250-uboot-spl.lds" #define CONFIG_SPL_TEXT_BASE 0x02023400