From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 15/16] OMAP: hsmmc: add platform data for eMMC hardware reset gpio
Date: Thu, 12 May 2011 03:38:27 -0700 [thread overview]
Message-ID: <20110512103827.GK31483@atomide.com> (raw)
In-Reply-To: <1304673255-31634-16-git-send-email-adrian.hunter@nokia.com>
* Adrian Hunter <adrian.hunter@nokia.com> [110506 02:11]:
> eMMC may have a hardware reset line connected to a gpio,
> so pass it to the driver.
>
> Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
This looks safe to merge via MMC list:
Acked-by: Tony Lindgren <tony@atomide.com>
> ---
> arch/arm/mach-omap2/hsmmc.c | 5 +++++
> arch/arm/mach-omap2/hsmmc.h | 1 +
> arch/arm/plat-omap/include/plat/mmc.h | 1 +
> 3 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
> index c37ba4f..a8078c1 100644
> --- a/arch/arm/mach-omap2/hsmmc.c
> +++ b/arch/arm/mach-omap2/hsmmc.c
> @@ -472,6 +472,11 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
> mmc->slots[0].switch_pin = c->gpio_cd;
> mmc->slots[0].gpio_wp = c->gpio_wp;
>
> + if (c->gpio_hw_reset)
> + mmc->slots[0].gpio_hw_reset = c->gpio_hw_reset;
> + else
> + mmc->slots[0].gpio_hw_reset = -EINVAL;
> +
> mmc->slots[0].remux = c->remux;
> mmc->slots[0].init_card = c->init_card;
>
> diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h
> index 0f2a87e..b78ed41 100644
> --- a/arch/arm/mach-omap2/hsmmc.h
> +++ b/arch/arm/mach-omap2/hsmmc.h
> @@ -22,6 +22,7 @@ struct omap2_hsmmc_info {
> bool nomux; /* No default muxing for this slot */
> int gpio_cd; /* or -EINVAL */
> int gpio_wp; /* or -EINVAL */
> + int gpio_hw_reset; /* hardware reset */
> char *name; /* or NULL for default */
> struct device *dev; /* returned: pointer to mmc adapter */
> int ocr_mask; /* temporary HACK */
> diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h
> index e3c9b20..9b69b7e 100644
> --- a/arch/arm/plat-omap/include/plat/mmc.h
> +++ b/arch/arm/plat-omap/include/plat/mmc.h
> @@ -119,6 +119,7 @@ struct omap_mmc_platform_data {
>
> int switch_pin; /* gpio (card detect) */
> int gpio_wp; /* gpio (write protect) */
> + int gpio_hw_reset; /* gpio (hardware reset) */
>
> int (*set_bus_mode)(struct device *dev, int slot, int bus_mode);
> int (*set_power)(struct device *dev, int slot,
> --
> 1.7.0.4
>
next prev parent reply other threads:[~2011-05-12 10:38 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-06 9:13 [PATCH V2 00/16] omap_hsmmc patches Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 01/16] mmc: omap_hsmmc: fix missing mmc_release_host() in no_off case Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 02/16] mmc: omap_hsmmc: correct debug report error status mnemonics Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 03/16] mmc: omap_hsmmc: move hardcoded frequency constants to definition block Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 04/16] mmc: omap_hsmmc: reduce a bit the error handlers in probe() Adrian Hunter
2011-05-06 11:34 ` Varadarajan, Charulatha
2011-05-06 11:38 ` Andy Shevchenko
2011-05-06 9:14 ` [PATCH V2 05/16] mmc: omap_hsmmc: split duplicate code to calc_divisor() function Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 06/16] mmc: omap_hsmmc: introduce start_clock and re-use stop_clock Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 07/16] mmc: omap_hsmmc: fix few bugs when set the clock divisor Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 08/16] mmc: omap_hsmmc: split same pieces of code to separate functions Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 09/16] OMAP: hsmmc: Do not mux the slot if non default muxing is already done Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 10/16] OMAP: board-rm680: set MMC nomux flag Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 11/16] mmc: omap_hsmmc: ensure pbias configuration is always done Adrian Hunter
2011-09-29 13:40 ` T Krishnamoorthy, Balaji
2011-10-14 14:01 ` Chris Ball
2011-05-06 9:14 ` [PATCH V2 12/16] mmc: omap_hsmmc: fix oops in omap_hsmmc_dma_cb Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 13/16] OMAP: hsmmc: implement clock switcher Adrian Hunter
2011-05-12 10:37 ` Tony Lindgren
2011-05-06 9:14 ` [PATCH V2 14/16] mmc: omap_hsmmc: adjust host controller clock in regard to current OPP Adrian Hunter
2011-05-06 9:14 ` [PATCH V2 15/16] OMAP: hsmmc: add platform data for eMMC hardware reset gpio Adrian Hunter
2011-05-12 10:38 ` Tony Lindgren [this message]
2011-05-06 9:14 ` [PATCH V2 16/16] mmc: omap_hsmmc: add a hardware reset before initialization Adrian Hunter
2011-05-06 13:26 ` Varadarajan, Charulatha
2011-07-13 10:48 ` [PATCH V2 00/16] omap_hsmmc patches Grazvydas Ignotas
2011-07-13 15:36 ` Chris Ball
2011-07-15 9:32 ` Grazvydas Ignotas
2011-09-02 10:53 ` Tony Lindgren
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=20110512103827.GK31483@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).