From patchwork Thu Nov 18 03:05:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chuanxiao.Dong" X-Patchwork-Id: 334941 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 oAI37MS1009019 for ; Thu, 18 Nov 2010 03:07:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751371Ab0KRDHV (ORCPT ); Wed, 17 Nov 2010 22:07:21 -0500 Received: from mga09.intel.com ([134.134.136.24]:48888 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244Ab0KRDHV convert rfc822-to-8bit (ORCPT ); Wed, 17 Nov 2010 22:07:21 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 17 Nov 2010 19:07:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,214,1288594800"; d="scan'208,223";a="574960134" Received: from unknown (HELO intel.com) ([172.16.120.128]) by orsmga002.jf.intel.com with ESMTP; 17 Nov 2010 19:07:19 -0800 Date: Thu, 18 Nov 2010 11:05:06 +0800 From: Chuanxiao Dong To: cjb@laptop.org Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, arjan@linux.intel.com, alan@linux.intel.com Subject: [PATCH v3 2/2]mmc:implemented HW reset callback in sdhci layer Message-ID: <20101118030506.GC10621@intel.com> Reply-To: Chuanxiao Dong MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) 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.3 (demeter1.kernel.org [140.211.167.41]); Thu, 18 Nov 2010 03:07:22 +0000 (UTC) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 154cbf8..a05b87c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1266,11 +1266,34 @@ out: spin_unlock_irqrestore(&host->lock, flags); } +/* + * HW reset callback for eMMC4.4 card + * In this function, HC will do the real HW reset + * for eMMC4.4 card + * + * RETURN VALUE: + * 0: reset emmc successfully + * -ENODEV: no valid hardware to do so + */ +static int sdhci_hardware_reset(struct mmc_host *mmc) +{ + int err = 1; + struct sdhci_host *host; + + host = mmc_priv(mmc); + + if (host->ops && host->ops->reset_emmc) + err = host->ops->reset_emmc(host); + + return err; +} + static const struct mmc_host_ops sdhci_ops = { .request = sdhci_request, .set_ios = sdhci_set_ios, .get_ro = sdhci_get_ro, .enable_sdio_irq = sdhci_enable_sdio_irq, + .hardware_reset = sdhci_hardware_reset, }; /*****************************************************************************\ diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index d52a716..24e49b0 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -218,6 +218,16 @@ struct sdhci_ops { void (*platform_send_init_74_clocks)(struct sdhci_host *host, u8 power_mode); unsigned int (*get_ro)(struct sdhci_host *host); + /* + * eMMC card reset callback. + * This callback can be used by sdhci layer to support eMMC4.4 + * hardware reset feature. In this function, should trigger a + * RST_n signal to reset eMMC card. + * return value: + * 0: successfully reset eMMC card. + * -ENODEV: no valid hardware to reset eMMC card. + */ + int (*reset_emmc)(struct sdhci_host *host); }; #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS