From: Rabin Vincent <rabin.vincent@stericsson.com> To: linux-arm-kernel@lists.infradead.org Cc: linux-mmc@vger.kernel.org, STEricsson_nomadik_linux@list.st.com, Rabin Vincent <rabin.vincent@stericsson.com>, Linus Walleij <linus.walleij@stericsson.com> Subject: [PATCH 07/12] mmci: pass power_mode to the translate_vdd callback Date: Tue, 22 Jun 2010 14:47:42 +0530 [thread overview] Message-ID: <1277198267-10860-7-git-send-email-rabin.vincent@stericsson.com> (raw) In-Reply-To: <1277198267-10860-1-git-send-email-rabin.vincent@stericsson.com> Platforms may have some external power control which need to be controlled from board specific code. This is the case for some versions of the MOP500 board (U8500 platform). Acked-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> --- drivers/mmc/host/mmci.c | 3 ++- include/linux/amba/mmci.h | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 322958f..63eb7f4 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -483,7 +483,8 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) * power control behind this translate function. */ if (!host->vcc && host->plat->translate_vdd) - pwr |= host->plat->translate_vdd(mmc_dev(mmc), ios->vdd); + pwr |= host->plat->translate_vdd(mmc_dev(mmc), ios->vdd, + ios->power_mode); /* The ST version does not have this, fall through to POWER_ON */ if (host->hw_designer != AMBA_VENDOR_ST) { pwr |= MCI_PWR_UP; diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index f9d1bb5..61b5810 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h @@ -17,7 +17,8 @@ * mmc/host.h * @translate_vdd: a callback function to translate a MMC_VDD_* * mask into a value to be binary or:ed and written into the - * MMCIPWR register of the block + * MMCIPWR register of the block. May also control external power + * based on the power_mode. * @status: if no GPIO read function was given to the block in * gpio_wp (below) this function will be called to determine * whether a card is present in the MMC slot or not @@ -30,7 +31,8 @@ struct mmci_platform_data { unsigned int f_max; unsigned int ocr_mask; - u32 (*translate_vdd)(struct device *, unsigned int); + u32 (*translate_vdd)(struct device *, unsigned int vdd, + unsigned char power_mode); unsigned int (*status)(struct device *); int gpio_wp; int gpio_cd; -- 1.7.0
WARNING: multiple messages have this Message-ID (diff)
From: rabin.vincent@stericsson.com (Rabin Vincent) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/12] mmci: pass power_mode to the translate_vdd callback Date: Tue, 22 Jun 2010 14:47:42 +0530 [thread overview] Message-ID: <1277198267-10860-7-git-send-email-rabin.vincent@stericsson.com> (raw) In-Reply-To: <1277198267-10860-1-git-send-email-rabin.vincent@stericsson.com> Platforms may have some external power control which need to be controlled from board specific code. This is the case for some versions of the MOP500 board (U8500 platform). Acked-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> --- drivers/mmc/host/mmci.c | 3 ++- include/linux/amba/mmci.h | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 322958f..63eb7f4 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -483,7 +483,8 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) * power control behind this translate function. */ if (!host->vcc && host->plat->translate_vdd) - pwr |= host->plat->translate_vdd(mmc_dev(mmc), ios->vdd); + pwr |= host->plat->translate_vdd(mmc_dev(mmc), ios->vdd, + ios->power_mode); /* The ST version does not have this, fall through to POWER_ON */ if (host->hw_designer != AMBA_VENDOR_ST) { pwr |= MCI_PWR_UP; diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index f9d1bb5..61b5810 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h @@ -17,7 +17,8 @@ * mmc/host.h * @translate_vdd: a callback function to translate a MMC_VDD_* * mask into a value to be binary or:ed and written into the - * MMCIPWR register of the block + * MMCIPWR register of the block. May also control external power + * based on the power_mode. * @status: if no GPIO read function was given to the block in * gpio_wp (below) this function will be called to determine * whether a card is present in the MMC slot or not @@ -30,7 +31,8 @@ struct mmci_platform_data { unsigned int f_max; unsigned int ocr_mask; - u32 (*translate_vdd)(struct device *, unsigned int); + u32 (*translate_vdd)(struct device *, unsigned int vdd, + unsigned char power_mode); unsigned int (*status)(struct device *); int gpio_wp; int gpio_cd; -- 1.7.0
next prev parent reply other threads:[~2010-06-22 9:18 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-06-22 9:17 [PATCH 01/12] mmci: use sg_miter API to fix multi-page sg handling Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent 2010-06-22 9:17 ` [PATCH 02/12] mmci: fix multi block transfers Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent 2010-07-29 13:18 ` Russell King - ARM Linux 2010-07-29 13:18 ` Russell King - ARM Linux 2010-07-29 13:31 ` Colin Tuckley 2010-07-29 13:36 ` Russell King - ARM Linux 2010-07-29 13:42 ` Colin Tuckley 2010-07-29 13:55 ` Russell King - ARM Linux 2010-07-29 14:14 ` Russell King - ARM Linux 2010-06-22 9:17 ` [PATCH 03/12] mmci: let core poll for card detection Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent 2010-06-22 9:17 ` [PATCH 04/12] mmci: allow the card detect status not to be inverted Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent 2010-07-29 12:34 ` Russell King - ARM Linux 2010-07-29 12:34 ` Russell King - ARM Linux 2010-07-29 13:53 ` Linus Walleij 2010-07-29 13:53 ` Linus Walleij 2010-07-29 14:20 ` Russell King - ARM Linux 2010-07-29 14:20 ` Russell King - ARM Linux 2010-08-05 6:14 ` Rabin VINCENT 2010-08-05 6:14 ` Rabin VINCENT 2010-08-05 9:25 ` Russell King - ARM Linux 2010-08-05 9:25 ` Russell King - ARM Linux 2010-08-09 10:37 ` Rabin VINCENT 2010-08-09 10:37 ` Rabin VINCENT 2010-08-09 11:25 ` Russell King - ARM Linux 2010-08-09 11:25 ` Russell King - ARM Linux 2010-06-22 9:17 ` [PATCH 05/12] mmci: support card detection interrupts Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent 2010-06-22 9:17 ` [PATCH 06/12] mmci: allow neither ->status nor gpio_cd to be specified Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent [this message] 2010-06-22 9:17 ` [PATCH 07/12] mmci: pass power_mode to the translate_vdd callback Rabin Vincent 2010-06-22 22:03 ` Linus Walleij 2010-06-22 22:03 ` Linus Walleij 2010-06-24 8:27 ` Rabin VINCENT 2010-06-24 8:27 ` Rabin VINCENT 2010-06-24 8:56 ` Linus WALLEIJ 2010-06-24 8:56 ` Linus WALLEIJ 2010-07-19 12:57 ` [PATCHv2 " Rabin Vincent 2010-07-19 12:57 ` Rabin Vincent 2010-06-22 9:17 ` [PATCH 08/12] mmci: add variant data and default MCICLOCK support Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent 2010-06-22 9:17 ` [PATCH 09/12] mmci: enable hardware flow control on Ux500 variants Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent 2010-06-22 9:17 ` [PATCH 10/12] mmci: support larger MMCIDATALENGTH register Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent 2010-06-22 9:17 ` [PATCH 11/12] mmci: support different FIFO sizes Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent 2010-06-22 9:17 ` [PATCH 12/12] mmci: support variants with only one irq Rabin Vincent 2010-06-22 9:17 ` Rabin Vincent 2010-09-23 20:04 ` Linus Walleij 2010-09-23 20:04 ` Linus Walleij 2010-10-11 0:06 ` [PATCHv2] mmci: work " Rabin Vincent 2010-10-11 9:13 ` Linus Walleij 2010-10-11 9:44 ` Russell King - ARM Linux 2010-10-11 11:10 ` Linus Walleij 2010-10-19 12:52 ` Linus Walleij 2010-07-07 20:34 ` [PATCH 01/12] mmci: use sg_miter API to fix multi-page sg handling Linus Walleij 2010-07-07 20:34 ` Linus Walleij 2010-07-19 13:23 ` [PATCHv2 " Rabin Vincent 2010-07-19 13:23 ` Rabin Vincent
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=1277198267-10860-7-git-send-email-rabin.vincent@stericsson.com \ --to=rabin.vincent@stericsson.com \ --cc=STEricsson_nomadik_linux@list.st.com \ --cc=linus.walleij@stericsson.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-mmc@vger.kernel.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: linkBe 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.