From: Lee Jones <lee.jones@linaro.org> To: Ulf Hansson <ulf.hansson@stericsson.com> Cc: linux-mmc@vger.kernel.org, Chris Ball <cjb@laptop.org>, linux-arm-kernel@lists.infradead.org, Russell King <linux@arm.linux.org.uk>, Linus Walleij <linus.walleij@linaro.org>, Ulf Hansson <ulf.hansson@linaro.org> Subject: Re: [PATCH V2 2/2] mmc: mmci: Move ios_handler functionality into the driver Date: Tue, 22 Jan 2013 09:00:00 +0000 [thread overview] Message-ID: <20130122090000.GH6857@gmail.com> (raw) In-Reply-To: <1355495429-12510-3-git-send-email-ulf.hansson@stericsson.com> > From: Lee Jones <lee.jones@linaro.org> > > There are currently two instances of the ios_handler being used. > Both of which mearly toy with some regulator settings. Now there > is a GPIO regulator API, we can use that instead, and lessen the > per platform burden. By doing this, we also become more Device > Tree compatible. Russell, Why is this patch in your tree with Ulf as the Author? > Cc: Chris Ball <cjb@laptop.org> > Cc: Russell King <linux@arm.linux.org.uk> > Signed-off-by: Lee Jones <lee.jones@linaro.org> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > drivers/mmc/host/mmci.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c > index 9da5f24..e56655a 100644 > --- a/drivers/mmc/host/mmci.c > +++ b/drivers/mmc/host/mmci.c > @@ -1097,6 +1097,11 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > case MMC_POWER_OFF: > if (!IS_ERR(mmc->supply.vmmc)) > mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); > + > + if (!IS_ERR(mmc->supply.vqmmc) && > + regulator_is_enabled(mmc->supply.vqmmc)) > + regulator_disable(mmc->supply.vqmmc); > + > break; > case MMC_POWER_UP: > if (!IS_ERR(mmc->supply.vmmc)) > @@ -1111,6 +1116,10 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > > break; > case MMC_POWER_ON: > + if (!IS_ERR(mmc->supply.vqmmc) && > + !regulator_is_enabled(mmc->supply.vqmmc)) > + regulator_enable(mmc->supply.vqmmc); > + > pwr |= MCI_PWR_ON; > break; > } -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
WARNING: multiple messages have this Message-ID (diff)
From: lee.jones@linaro.org (Lee Jones) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V2 2/2] mmc: mmci: Move ios_handler functionality into the driver Date: Tue, 22 Jan 2013 09:00:00 +0000 [thread overview] Message-ID: <20130122090000.GH6857@gmail.com> (raw) In-Reply-To: <1355495429-12510-3-git-send-email-ulf.hansson@stericsson.com> > From: Lee Jones <lee.jones@linaro.org> > > There are currently two instances of the ios_handler being used. > Both of which mearly toy with some regulator settings. Now there > is a GPIO regulator API, we can use that instead, and lessen the > per platform burden. By doing this, we also become more Device > Tree compatible. Russell, Why is this patch in your tree with Ulf as the Author? > Cc: Chris Ball <cjb@laptop.org> > Cc: Russell King <linux@arm.linux.org.uk> > Signed-off-by: Lee Jones <lee.jones@linaro.org> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > drivers/mmc/host/mmci.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c > index 9da5f24..e56655a 100644 > --- a/drivers/mmc/host/mmci.c > +++ b/drivers/mmc/host/mmci.c > @@ -1097,6 +1097,11 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > case MMC_POWER_OFF: > if (!IS_ERR(mmc->supply.vmmc)) > mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); > + > + if (!IS_ERR(mmc->supply.vqmmc) && > + regulator_is_enabled(mmc->supply.vqmmc)) > + regulator_disable(mmc->supply.vqmmc); > + > break; > case MMC_POWER_UP: > if (!IS_ERR(mmc->supply.vmmc)) > @@ -1111,6 +1116,10 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > > break; > case MMC_POWER_ON: > + if (!IS_ERR(mmc->supply.vqmmc) && > + !regulator_is_enabled(mmc->supply.vqmmc)) > + regulator_enable(mmc->supply.vqmmc); > + > pwr |= MCI_PWR_ON; > break; > } -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2013-01-22 9:00 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-12-14 14:30 [PATCH 0/2] mmc: mmci: Update regulator support Ulf Hansson 2012-12-14 14:30 ` Ulf Hansson 2012-12-14 14:30 ` [PATCH 1/2] mmc: mmci: Convert to use mmc_regulator_get_supply Ulf Hansson 2012-12-14 14:30 ` Ulf Hansson 2012-12-14 14:30 ` [PATCH V2 2/2] mmc: mmci: Move ios_handler functionality into the driver Ulf Hansson 2012-12-14 14:30 ` Ulf Hansson 2012-12-14 15:10 ` Russell King - ARM Linux 2012-12-14 15:10 ` Russell King - ARM Linux 2012-12-14 15:52 ` Ulf Hansson 2012-12-14 15:52 ` Ulf Hansson 2012-12-14 16:33 ` Lee Jones 2012-12-14 16:33 ` Lee Jones 2013-01-22 9:00 ` Lee Jones [this message] 2013-01-22 9:00 ` Lee Jones 2013-01-22 9:53 ` Linus Walleij 2013-01-22 9:53 ` Linus Walleij 2013-01-22 10:06 ` Russell King - ARM Linux 2013-01-22 10:06 ` Russell King - ARM Linux 2013-01-22 10:11 ` Linus Walleij 2013-01-22 10:11 ` Linus Walleij 2013-01-22 10:20 ` Lee Jones 2013-01-22 10:20 ` Lee Jones 2013-01-22 10:37 ` Russell King - ARM Linux 2013-01-22 10:37 ` Russell King - ARM Linux 2013-01-22 10:56 ` Lee Jones 2013-01-22 10:56 ` Lee Jones 2013-01-23 10:13 ` Lee Jones 2013-01-23 10:13 ` Lee Jones 2013-01-23 10:17 ` Russell King - ARM Linux 2013-01-23 10:17 ` Russell King - ARM Linux 2013-01-23 11:18 ` Lee Jones 2013-01-23 11:18 ` Lee Jones 2013-01-24 12:55 ` Ulf Hansson 2013-01-24 12:55 ` Ulf Hansson
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=20130122090000.GH6857@gmail.com \ --to=lee.jones@linaro.org \ --cc=cjb@laptop.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=ulf.hansson@linaro.org \ --cc=ulf.hansson@stericsson.com \ /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.