From patchwork Tue Aug 20 10:53:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Przemyslaw Marczak X-Patchwork-Id: 268490 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 EDBAE2C0118 for ; Tue, 20 Aug 2013 21:04:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E5EAD4A08F; Tue, 20 Aug 2013 13:04:15 +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 WEoB+ta7Edox; Tue, 20 Aug 2013 13:04:15 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 75F604A090; Tue, 20 Aug 2013 13:04:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 514424A067 for ; Tue, 20 Aug 2013 13:03:55 +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 7XBEGUll+Wtr for ; Tue, 20 Aug 2013 13:03:49 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=ERR(-1.5) (only DNSBL check requested) Received: from mailout3.w1.samsung.com (mailout3.w1.samsung.com [210.118.77.13]) by theia.denx.de (Postfix) with ESMTP id 752714A065 for ; Tue, 20 Aug 2013 13:03:42 +0200 (CEST) Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MRT00DFXSX5BK70@mailout3.w1.samsung.com> for u-boot@lists.denx.de; Tue, 20 Aug 2013 11:53:31 +0100 (BST) X-AuditID: cbfec7f5-b7f5f6d00000105f-a5-52134aab1f5c Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id E0.87.04191.BAA43125; Tue, 20 Aug 2013 11:53:31 +0100 (BST) Received: from AMDC1186.digital.local ([106.116.147.185]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MRT00CZ2SWXE540@eusync1.samsung.com>; Tue, 20 Aug 2013 11:53:31 +0100 (BST) From: Przemyslaw Marczak To: u-boot@lists.denx.de Date: Tue, 20 Aug 2013 12:53:11 +0200 Message-id: <1376995992-20870-2-git-send-email-p.marczak@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1376995992-20870-1-git-send-email-p.marczak@samsung.com> References: <1376995992-20870-1-git-send-email-p.marczak@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIJMWRmVeSWpSXmKPExsVy+t/xy7qrvYSDDG71GFmcbXrDbtFxpIXR YsflGywWkxfPZ7Z4u7eT3YHV4+ydHYwefVtWMXocv7GdKYA5issmJTUnsyy1SN8ugSuj+91r 1oLTfBXLrq5ia2C8x93FyMkhIWAi8fvAP3YIW0ziwr31bCC2kMBSRon/p8sh7D4mideX5EBs NgEDiT2XzjCD2CICEhK/+q8ydjFycTAL9DJKnP08C2yQsICPxL97i5lAbBYBVYnm2X/AhvIK uEq8X7QFKM4BtExBYs4kG5Awp4CbxKyNz6D2uko8mjyZZQIj7wJGhlWMoqmlyQXFSem5RnrF ibnFpXnpesn5uZsYIcHydQfj0mNWhxgFOBiVeHg7lISChFgTy4orcw8xSnAwK4nwvnYUDhLi TUmsrEotyo8vKs1JLT7EyMTBKdXAWJD35ZVv897vB5hP51vJVh+8IRa3NEZAW07thMzmQtt9 QqslXPvrRL6d/ROqe0iu/biW/+4depsnb2xyvNbrJK7PdaZNs/LVZpe6Mim+FZYqARl6ItMM bwVb5YspaLi5f1oSuW+78samfAn+n9FbVl1nXZDzg5lr94J7Aaz+Gjrts+cc8+tVYinOSDTU Yi4qTgQAOoR47/QBAAA= Cc: trini@ti.com, Kyungmin Park , Przemyslaw Marczak Subject: [U-Boot] [PATCH 2/3] arm:goni:mmc: Add sd card detection and initialization. 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 change allow to use sd card on Goni the same like mmc 0. SD card is mmc dev 1, so it can be used like this: "fatls mmc 1:2". Signed-off-by: Przemyslaw Marczak Signed-off-by: Kyungmin Park CC: Minkyu Kang --- board/samsung/goni/goni.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index c05801d..3b236b4 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -69,6 +69,7 @@ int checkboard(void) int board_mmc_init(bd_t *bis) { int i; + int ret; /* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */ s5p_gpio_direction_output(&s5pc110_gpio->j2, 7, 1); @@ -91,7 +92,36 @@ int board_mmc_init(bd_t *bis) s5p_gpio_set_drv(&s5pc110_gpio->g0, i, GPIO_DRV_4X); } - return s5p_mmc_init(0, 4); + ret = s5p_mmc_init(0, 4); + if (ret) { + puts("MMC: Failed to init MMC:0.\n"); + return ret; + } + + /* + * SD card (T_FLASH) detect and init + * T_FLASH_DETECT: EINT28: GPH3[4] input mode + */ + s5p_gpio_cfg_pin(&s5pc110_gpio->h3, 4, GPIO_INPUT); + s5p_gpio_set_pull(&s5pc110_gpio->h3, 4, GPIO_PULL_UP); + + if (!s5p_gpio_get_value(&s5pc110_gpio->h3, 4)) { + for (i = 0; i < 7; i++) { + if (i == 2) + continue; + /* GPG2[0:6] special function 2 */ + s5p_gpio_cfg_pin(&s5pc110_gpio->g2, i, 0x2); + /* GPG2[0:6] pull disable */ + s5p_gpio_set_pull(&s5pc110_gpio->g2, i, GPIO_PULL_NONE); + /* GPG2[0:6] drv 4x */ + s5p_gpio_set_drv(&s5pc110_gpio->g2, i, GPIO_DRV_4X); + } + if (s5p_mmc_init(2, 4)) + puts("MMC: Failed to init SD card (MMC:2).\n"); + } + + /* SD card init is optional so print information when it fails only */ + return ret; } #endif