From patchwork Wed May 11 09:32:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chang-Ming.Huang@freescale.com X-Patchwork-Id: 775942 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4BFaRKp022109 for ; Wed, 11 May 2011 15:36:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751803Ab1EKPf4 (ORCPT ); Wed, 11 May 2011 11:35:56 -0400 Received: from tx2ehsobe001.messaging.microsoft.com ([65.55.88.11]:35864 "EHLO TX2EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751770Ab1EKPfy (ORCPT ); Wed, 11 May 2011 11:35:54 -0400 Received: from mail24-tx2-R.bigfish.com (10.9.14.239) by TX2EHSOBE001.bigfish.com (10.9.40.21) with Microsoft SMTP Server id 14.1.225.8; Wed, 11 May 2011 10:19:44 +0000 Received: from mail24-tx2 (localhost.localdomain [127.0.0.1]) by mail24-tx2-R.bigfish.com (Postfix) with ESMTP id C9D9E13200A2 for ; Wed, 11 May 2011 10:19:42 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail24-tx2 (localhost.localdomain [127.0.0.1]) by mail24-tx2 (MessageSwitch) id 130510916619223_27936; Wed, 11 May 2011 10:19:26 +0000 (UTC) Received: from TX2EHSMHS019.bigfish.com (unknown [10.9.14.249]) by mail24-tx2.bigfish.com (Postfix) with ESMTP id AF47613101BB for ; Wed, 11 May 2011 10:19:03 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS019.bigfish.com (10.9.99.119) with Microsoft SMTP Server (TLS) id 14.1.225.8; Wed, 11 May 2011 10:19:03 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server id 14.1.270.2; Wed, 11 May 2011 05:19:02 -0500 Received: from localhost (rock.ap.freescale.net [10.193.20.106]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p4BAJ116021651; Wed, 11 May 2011 05:19:01 -0500 (CDT) From: To: CC: , Jerry Huang Subject: [PATCH 3/3] SDHC/MMC: add f_min to mmc_power_on Date: Wed, 11 May 2011 17:32:11 +0800 Message-ID: <1305106331-21280-3-git-send-email-Chang-Ming.Huang@freescale.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1305106331-21280-2-git-send-email-Chang-Ming.Huang@freescale.com> References: <1305106331-21280-1-git-send-email-Chang-Ming.Huang@freescale.com> <1305106331-21280-2-git-send-email-Chang-Ming.Huang@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 11 May 2011 15:36:27 +0000 (UTC) From: Jerry Huang 1. when f_init is zero, the SDHC can't work correctly, so f_min will replace it. 2. Before running get_cd recall function to detect if the card is present, must make sure the power is up. Signed-off-by: Jerry Huang --- drivers/mmc/core/core.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 1f453ac..5a22b85 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -993,7 +993,10 @@ static void mmc_power_up(struct mmc_host *host) */ mmc_delay(10); - host->ios.clock = host->f_init; + if (host->f_init) + host->ios.clock = host->f_init; + else + host->ios.clock = host->f_min; host->ios.power_mode = MMC_POWER_ON; mmc_set_ios(host); @@ -1571,8 +1574,10 @@ void mmc_rescan(struct work_struct *work) */ mmc_bus_put(host); + mmc_power_up(host); if (host->ops->get_cd && host->ops->get_cd(host) == 0) goto out; + mmc_power_off(host); mmc_claim_host(host); for (i = 0; i < ARRAY_SIZE(freqs); i++) {