All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: Ulf Hansson <ulf.hansson@linaro.org>, Chris Ball <chris@printf.net>
Cc: linux-mmc <linux-mmc@vger.kernel.org>,
	Philip Rakity <prakity@nvidia.com>,
	Adrian Hunter <adrian.hunter@intel.com>
Subject: [PATCH 04/12] mmc: core: Add 'card' to drive strength selection callback
Date: Thu,  5 Feb 2015 15:13:41 +0200	[thread overview]
Message-ID: <1423142029-22521-5-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1423142029-22521-1-git-send-email-adrian.hunter@intel.com>

In preparation for supporting also eMMC drive strength,
add the 'card' as a parameter so that the callback can
distinguish different types of cards if necessary.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
 drivers/mmc/core/sd.c    | 2 +-
 drivers/mmc/core/sdio.c  | 2 +-
 include/linux/mmc/host.h | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index fab83e8..dba1acf 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -411,7 +411,7 @@ static int sd_select_driver_type(struct mmc_card *card, u8 *status)
 	 * return what is possible given the options
 	 */
 	mmc_host_clk_hold(card->host);
-	drive_strength = card->host->ops->select_drive_strength(
+	drive_strength = card->host->ops->select_drive_strength(card,
 		card->sw_caps.uhs_max_dtr,
 		host_drv_type, card_drv_type, &drv_type);
 	mmc_host_clk_release(card->host);
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 76e4dde..de92ffe 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -424,7 +424,7 @@ static void sdio_select_driver_type(struct mmc_card *card)
 	 * information and let the hardware specific code
 	 * return what is possible given the options
 	 */
-	drive_strength = card->host->ops->select_drive_strength(
+	drive_strength = card->host->ops->select_drive_strength(card,
 		card->sw_caps.uhs_max_dtr,
 		host_drv_type, card_drv_type, &drv_type);
 
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index d984c55..967e7db 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -138,7 +138,8 @@ struct mmc_host_ops {
 
 	/* Prepare HS400 target operating frequency depending host driver */
 	int	(*prepare_hs400_tuning)(struct mmc_host *host, struct mmc_ios *ios);
-	int	(*select_drive_strength)(unsigned int max_dtr, int host_drv,
+	int	(*select_drive_strength)(struct mmc_card *card,
+					 unsigned int max_dtr, int host_drv,
 					 int card_drv, int *drv_type);
 	void	(*hw_reset)(struct mmc_host *host);
 	void	(*card_event)(struct mmc_host *host);
-- 
1.9.1


  parent reply	other threads:[~2015-02-05 13:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-05 13:13 [PATCH 00/12] mmc: Add support for drive strength for eMMCs Adrian Hunter
2015-02-05 13:13 ` [PATCH 01/12] mmc: core: Reset driver type to default Adrian Hunter
2015-02-05 13:13 ` [PATCH 02/12] mmc: core: Allow card drive strength to be different to host Adrian Hunter
2015-02-05 13:13 ` [PATCH 03/12] mmc: core: Simplify card drive strength mask Adrian Hunter
2015-02-05 13:13 ` Adrian Hunter [this message]
2015-02-05 13:13 ` [PATCH 05/12] mmc: core: Factor out common code in drive strength selection Adrian Hunter
2015-02-05 13:13 ` [PATCH 06/12] mmc: core: Record card drive strength Adrian Hunter
2015-02-05 13:13 ` [PATCH 07/12] mmc: mmc: Read card's valid driver strength mask Adrian Hunter
2015-02-05 13:13 ` [PATCH 08/12] mmc: mmc: Add driver strength selection Adrian Hunter
2015-02-05 13:13 ` [PATCH 09/12] mmc: core: Add function to read driver-strength device property Adrian Hunter
2015-02-05 13:13 ` [PATCH 10/12] mmc: sdhci: Add a callback to select drive strength Adrian Hunter
2015-02-05 13:13 ` [PATCH 11/12] mmc: sdhci-pci: Add support for drive strength selection for SPT Adrian Hunter
2015-02-05 13:13 ` [PATCH 12/12] mmc: sdhci-pci: Enable HS400 for some Intel host controllers Adrian Hunter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1423142029-22521-5-git-send-email-adrian.hunter@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=chris@printf.net \
    --cc=linux-mmc@vger.kernel.org \
    --cc=prakity@nvidia.com \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.