From patchwork Thu Jan 19 03:26:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Girish K S X-Patchwork-Id: 6290 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 83C0423FE9 for ; Thu, 19 Jan 2012 03:26:21 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 30093A1808E for ; Thu, 19 Jan 2012 03:26:21 +0000 (UTC) Received: by bkbzt4 with SMTP id zt4so3852027bkb.11 for ; Wed, 18 Jan 2012 19:26:21 -0800 (PST) Received: by 10.205.139.66 with SMTP id iv2mr9561008bkc.27.1326943580849; Wed, 18 Jan 2012 19:26:20 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs166449bkc; Wed, 18 Jan 2012 19:26:20 -0800 (PST) Received: by 10.50.207.72 with SMTP id lu8mr25420922igc.0.1326943578214; Wed, 18 Jan 2012 19:26:18 -0800 (PST) Received: from mail-iy0-f178.google.com (mail-iy0-f178.google.com [209.85.210.178]) by mx.google.com with ESMTPS id o5si14943488icu.37.2012.01.18.19.26.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 18 Jan 2012 19:26:18 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of girish.shivananjappa@linaro.org) client-ip=209.85.210.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of girish.shivananjappa@linaro.org) smtp.mail=girish.shivananjappa@linaro.org Received: by iabn5 with SMTP id n5so5300256iab.37 for ; Wed, 18 Jan 2012 19:26:17 -0800 (PST) Received: by 10.50.214.73 with SMTP id ny9mr25676390igc.1.1326943577249; Wed, 18 Jan 2012 19:26:17 -0800 (PST) Received: from girishks ([115.113.119.130]) by mx.google.com with ESMTPS id gd2sm647058igc.1.2012.01.18.19.26.13 (version=SSLv3 cipher=OTHER); Wed, 18 Jan 2012 19:26:16 -0800 (PST) From: Girish K S To: linux-mmc@vger.kernel.org Cc: cjb@laptop.org, patches@linaro.org, linux-samsung-soc@vger.kernel.org, Girish K S Subject: [PATCH] mmc: core: Fix Low speed mmc card detection failure Date: Thu, 19 Jan 2012 08:56:19 +0530 Message-Id: <1326943579-30952-1-git-send-email-girish.shivananjappa@linaro.org> X-Mailer: git-send-email 1.7.1 This patch fixes the failure of low speed mmc card detection Signed-off-by: Girish K S --- drivers/mmc/core/mmc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index dc03291..2bc586b 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1020,7 +1020,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, err = mmc_select_hs200(card); else if (host->caps & MMC_CAP_MMC_HIGHSPEED) err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, - EXT_CSD_HS_TIMING, 1, 0); + EXT_CSD_HS_TIMING, 1, + card->ext_csd.generic_cmd6_time); if (err && err != -EBADMSG) goto free_card; @@ -1130,7 +1131,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, * Activate wide bus and DDR (if supported). */ if (!mmc_card_hs200(card) && - (card->csd.mmca_vsn >= CSD_SPEC_VER_3) && + (card->csd.mmca_vsn >= CSD_SPEC_VER_4) && (host->caps & (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA))) { static unsigned ext_csd_bits[][2] = { { EXT_CSD_BUS_WIDTH_8, EXT_CSD_DDR_BUS_WIDTH_8 },