From patchwork Thu Feb 2 04:41:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 722739 X-Patchwork-Delegate: jh80.chung@samsung.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 3vDS4y4Cy6z9s7F for ; Thu, 2 Feb 2017 15:41:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 911274AACE; Thu, 2 Feb 2017 05:41:33 +0100 (CET) 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 3AOelMKwtvs0; Thu, 2 Feb 2017 05:41:33 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A02804A99B; Thu, 2 Feb 2017 05:41:32 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CBECE4A99B for ; Thu, 2 Feb 2017 05:41:28 +0100 (CET) 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 jpkcnKnnxYLG for ; Thu, 2 Feb 2017 05:41:28 +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 mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by theia.denx.de (Postfix) with ESMTPS id 451134A08A for ; Thu, 2 Feb 2017 05:41:24 +0100 (CET) Received: from epcas1p1.samsung.com (unknown [182.195.41.45]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OKQ0230SD0WZN20@mailout4.samsung.com> for u-boot@lists.denx.de; Thu, 02 Feb 2017 13:41:20 +0900 (KST) Received: from epsmges5p3.samsung.com (unknown [182.195.40.70]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20170202044119epcas1p16767b9667199f56b2dff9995c6af1fe8~fXqiA4Ifx1018010180epcas1p1p; Thu, 2 Feb 2017 04:41:19 +0000 (GMT) Received: from epcas5p3.samsung.com ( [182.195.41.41]) by epsmges5p3.samsung.com (EPCPMTA) with SMTP id 94.09.04850.F68B2985; Thu, 2 Feb 2017 13:41:19 +0900 (KST) Received: from epcpsbgm2new.samsung.com (u27.gpu120.samsung.co.kr [203.254.230.27]) by epcas5p1.samsung.com (KnoxPortal) with ESMTP id 20170202044119epcas5p10bc788d837e864e308d2410adf205097~fXqhWXsk11249212492epcas5p1v; Thu, 2 Feb 2017 04:41:19 +0000 (GMT) X-AuditID: b6c32a2e-f79656d0000012f2-e1-5892b86f1b1a Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 6A.E6.06428.E68B2985; Thu, 2 Feb 2017 13:41:19 +0900 (KST) Received: from localhost.localdomain ([10.113.62.216]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OKQ00F9UD0UJ650@mmp2.samsung.com>; Thu, 02 Feb 2017 13:41:18 +0900 (KST) From: Jaehoon Chung To: u-boot@lists.denx.de Date: Thu, 02 Feb 2017 13:41:14 +0900 Message-id: <20170202044114.5818-1-jh80.chung@samsung.com> X-Mailer: git-send-email 2.10.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLKsWRmVeSWpSXmKPExsWy7bCmpm7+jkkRBms2GFnc+NXGavFtyzZG i6mTNrNbvN3bye7A4jG74SKLx6sDq9g9zt7ZwejRt2UVYwBLVKpNRmpiSmqRQmpecn5KZl66 rZJ3cLxzvKmZgaGuoaWFuZJCXmJuqq2Si0+ArltmDtBOJYWyxJxSoFBAYnGxkr6dTVF+aUmq QkZ+cYmtUrShoZGeoYG5npGRkZ6JcayVkSlQSUJqxsRZC9gLFvNX/Przn62BcRFPFyMnh4SA icT982vYIGwxiQv31oPZQgJLGSWud0lB2O1MEtcajGHqW/dPZO1i5AKKz2GU2PJ3PROE84NR ouPPRhaQKjYBHYnt344zgdgiAhISv/qvMoLYzAJBEks/HwTq5uAQFvCU2HHeFyTMIqAqcXTO fCaQMK+AlcSxnhqIXfISC88fARsvIbCHTeLt07vsIDUSArISmw4wQ9S4SOy7f5kFwhaWeHV8 CzuELS3xd+ktRojebkaJf182skE4PYwSt7auZoKoMpa4/+AeM8RtfBK9v58wQSzglehoE4Io 8ZDoenoaaqijxK8nb9lASoQEYiX27nCfwCi9gJFhFaNYakFxbnpqsWmBsV5xYm5xaV66XnJ+ 7iZGcNLQ0tvB+G+B9yFGAQ5GJR5eibRJEUKsiWXFlbmHGCU4mJVEeD+vAgrxpiRWVqUW5ccX leakFh9iNAWGzERmKdHkfGBCyyuJNzQxMzQxsgRCc0NzJXHeKIOJEUIC6YklqdmpqQWpRTB9 TBycUg2MPUUOx1nlzqYf85vRFXFW/dCU6ikRJX9ObHQuYMk8m3Jo2f7NMbl/eo9KuChzb9QV nRv95oL+qmsXzns0T2NKPlb15W87N5u6Zs2lFLFnxZY+74MXrRea6S6s8uhRPdMUDtZpb7JW zn9QxvZ4Tt3BGc0BJQ2lNS7fWna/8Cl9ffyi/NYJTDZblFiKMxINtZiLihMB3XowOTADAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsVy+t9jQd38HZMiDI69YbO48auN1eLblm2M FlMnbWa3eLu3k92BxWN2w0UWj1cHVrF7nL2zg9Gjb8sqxgCWKDebjNTElNQihdS85PyUzLx0 W6XQEDddCyWFvMTcVFulCF3fkCAlhbLEnFIgz8gADTg4B7gHK+nbJbhlTJy1gL1gMX/Frz// 2RoYF/F0MXJySAiYSLTun8gKYYtJXLi3nq2LkYtDSGAWo8TZexOYQRJCAj8YJV6cygCx2QR0 JLZ/O84EYosISEj86r/KCGIzCwRIrGh4C9TMwSEs4Cmx47wvSJhFQFXi6Jz5TCBhXgEriWM9 NRCr5CUWnj/CNIGRewEjwypGidSC5ILipPRco7zUcr3ixNzi0rx0veT83E2M4MB7Jr2D8fAu 90OMAhyMSjy8HBGTIoRYE8uKK3MPMUpwMCuJ8H5eBRTiTUmsrEotyo8vKs1JLT7EaAq0fyKz lGhyPjAq8kriDU3MTcyNDSzMLS1NjJTEeRtnPwsXEkhPLEnNTk0tSC2C6WPi4JRqYHTXZnnw 5OqCXZPbquUPJ7ELN55tasuOl5w6oU9yjuGEBQ4igYq1/vktFy6ZB7AeMa2cLVxQv5lZs3me 66qja28HfQyz02DsqPMIvRhw5+SpJRFbe33mrLb60P8368XX5H93MiQybLZ2PRTtvl5+f22n 8tRjP3vF9d6tF9ANWyWv/cXi3sLPJkosxRmJhlrMRcWJAJMVSaRSAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170202044119epcas5p10bc788d837e864e308d2410adf205097 X-Msg-Generator: CA X-Sender-IP: 203.254.230.27 X-Local-Sender: =?UTF-8?B?7KCV7J6s7ZuIG1RpemVuIFBsYXRmb3JtIExhYihTL1fshLw=?= =?UTF-8?B?7YSwKRvsgrzshLHsoITsnpAbUzUo7LGF7J6EKS/ssYXsnoQ=?= X-Global-Sender: =?UTF-8?B?SmFlaG9vbiBDaHVuZxtUaXplbiBQbGF0Zm9ybSBMYWIuG1Nh?= =?UTF-8?B?bXN1bmcgRWxlY3Ryb25pY3MbUzUvU2VuaW9yIEVuZ2luZWVy?= X-Sender-Code: =?UTF-8?B?QzEwG1NUQUYbQzEwVjgxMTE=?= CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-HopCount: 7 X-CMS-RootMailID: 20170202044119epcas5p10bc788d837e864e308d2410adf205097 X-RootMTR: 20170202044119epcas5p10bc788d837e864e308d2410adf205097 References: Cc: trini@konsulko.com Subject: [U-Boot] [PATCH v2] mmc: mmc-uclass: use the fixed devnum with alias node X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" If there are alias nodes as "mmc", use the devnum as alias index number. This patch is for fixing a problem of Exynos4 series. Problem is the below thing. Current legacy mode: EXYNOS DWMMC: 0, SAMSUNG SDHCI: 1 After using DM: SAMSUNG SDHCI: 0, EXYNOS DWMMC: 1 Dev index is swapped. Then u-boot can't find the kernel image..because it is already set to 0 as mmcdev. If change from legacy to DM, also needs to touch all exynos4 config file. For using simply, just supporting the fixed devnum with alias node is better than it. Usage: alaise { .... mmc0 = &sdhci2; /* eMMC */ mmc1 = &sdhci1; /* SD */ ... } Signed-off-by: Jaehoon Chung Reviewed-by: Simon Glass --- Changelog on V2: - Add the #ifndef CONFIG_SPL_BUILD - Fixes the typo by Simon's comment drivers/mmc/mmc-uclass.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index 2fe5d61..de7acb6 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -13,6 +13,8 @@ #include #include "mmc_private.h" +DECLARE_GLOBAL_DATA_PTR; + #ifdef CONFIG_DM_MMC_OPS int dm_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) @@ -192,10 +194,15 @@ int mmc_bind(struct udevice *dev, struct mmc *mmc, const struct mmc_config *cfg) { struct blk_desc *bdesc; struct udevice *bdev; - int ret; + int ret, devnum = -1; + +#ifndef CONFIG_SPL_BUILD + /* Use the fixed index with aliase node's index */ + fdtdec_get_alias_seq(gd->fdt_blob, "mmc", dev->of_offset, &devnum); +#endif - ret = blk_create_devicef(dev, "mmc_blk", "blk", IF_TYPE_MMC, -1, 512, - 0, &bdev); + ret = blk_create_devicef(dev, "mmc_blk", "blk", IF_TYPE_MMC, + devnum, 512, 0, &bdev); if (ret) { debug("Cannot create block device\n"); return ret;