2013-10-17 10:47:16

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCHv3] mmc: atmel-mci: add vmmc-supply support

Other MMC hosts handle a regulator named vmmc-supply that allows to power the
MMC card or SDIO device before communicating on the bus.

Signed-off-by: Alexandre Belloni <[email protected]>
---

Changes in v2:
- use mmc_regulator_get_supply instead of devm_regulator_get

Changes in v3:
- en/disable the regulator in .set_ios using mmc_regulator_set_ocr

drivers/mmc/host/atmel-mci.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 69e438e..a9e1ba6 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -1385,8 +1385,14 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
clk_unprepare(host->mck);

switch (ios->power_mode) {
+ case MMC_POWER_OFF:
+ if (!IS_ERR(mmc->supply.vmmc))
+ mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
+ break;
case MMC_POWER_UP:
set_bit(ATMCI_CARD_NEED_INIT, &slot->flags);
+ if (!IS_ERR(mmc->supply.vmmc))
+ mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);
break;
default:
/*
@@ -2196,6 +2202,7 @@ static int __init atmci_init_slot(struct atmel_mci *host,
}

host->slot[id] = slot;
+ mmc_regulator_get_supply(mmc);
mmc_add_host(mmc);

if (gpio_is_valid(slot->detect_pin)) {
--
1.8.1.2


2013-10-17 13:56:53

by Ulf Hansson

[permalink] [raw]
Subject: Re: [PATCHv3] mmc: atmel-mci: add vmmc-supply support

On 17 October 2013 12:46, Alexandre Belloni
<[email protected]> wrote:
> Other MMC hosts handle a regulator named vmmc-supply that allows to power the
> MMC card or SDIO device before communicating on the bus.
>
> Signed-off-by: Alexandre Belloni <[email protected]>

Acked-by: Ulf Hansson <[email protected]>

> ---
>
> Changes in v2:
> - use mmc_regulator_get_supply instead of devm_regulator_get
>
> Changes in v3:
> - en/disable the regulator in .set_ios using mmc_regulator_set_ocr
>
> drivers/mmc/host/atmel-mci.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index 69e438e..a9e1ba6 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -1385,8 +1385,14 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> clk_unprepare(host->mck);
>
> switch (ios->power_mode) {
> + case MMC_POWER_OFF:
> + if (!IS_ERR(mmc->supply.vmmc))
> + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
> + break;
> case MMC_POWER_UP:
> set_bit(ATMCI_CARD_NEED_INIT, &slot->flags);
> + if (!IS_ERR(mmc->supply.vmmc))
> + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);
> break;
> default:
> /*
> @@ -2196,6 +2202,7 @@ static int __init atmci_init_slot(struct atmel_mci *host,
> }
>
> host->slot[id] = slot;
> + mmc_regulator_get_supply(mmc);
> mmc_add_host(mmc);
>
> if (gpio_is_valid(slot->detect_pin)) {
> --
> 1.8.1.2
>

2014-01-13 17:43:49

by Alexandre Belloni

[permalink] [raw]
Subject: Re: [PATCHv3] mmc: atmel-mci: add vmmc-supply support

Hi,

I still don't see that on mmc.git, Any issue with that patch ? I would
prefer not missing the 3.14 merge window.

Regards

On 18/12/2013 09:16, Ludovic Desroches wrote:
> Hi Alexandre,
>
> On Tue, Dec 17, 2013 at 08:03:12PM +0100, Alexandre Belloni wrote:
>> Hi,
>>
>> It seems that patch never made it to the mainline. Is it still missing
>> something ?
>
> No reason on my side, maybe because my ack is missing but I thought I
> gave it on a previous version, maybe I am wrong.
>
> So Acked-by: Ludovic Desroches <[email protected]>
>
>
> Regards
>
> Ludovic
>
>>
>> Regards,
>>
>> On 17/10/2013 15:56, Ulf Hansson wrote:
>>> On 17 October 2013 12:46, Alexandre Belloni
>>> <[email protected]> wrote:
>>>> Other MMC hosts handle a regulator named vmmc-supply that allows to power the
>>>> MMC card or SDIO device before communicating on the bus.
>>>>
>>>> Signed-off-by: Alexandre Belloni <[email protected]>
>>> Acked-by: Ulf Hansson <[email protected]>
>>>
>>>> ---
>>>>
>>>> Changes in v2:
>>>> - use mmc_regulator_get_supply instead of devm_regulator_get
>>>>
>>>> Changes in v3:
>>>> - en/disable the regulator in .set_ios using mmc_regulator_set_ocr
>>>>
>>>> drivers/mmc/host/atmel-mci.c | 7 +++++++
>>>> 1 file changed, 7 insertions(+)
>>>>
>>>> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
>>>> index 69e438e..a9e1ba6 100644
>>>> --- a/drivers/mmc/host/atmel-mci.c
>>>> +++ b/drivers/mmc/host/atmel-mci.c
>>>> @@ -1385,8 +1385,14 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>>>> clk_unprepare(host->mck);
>>>>
>>>> switch (ios->power_mode) {
>>>> + case MMC_POWER_OFF:
>>>> + if (!IS_ERR(mmc->supply.vmmc))
>>>> + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
>>>> + break;
>>>> case MMC_POWER_UP:
>>>> set_bit(ATMCI_CARD_NEED_INIT, &slot->flags);
>>>> + if (!IS_ERR(mmc->supply.vmmc))
>>>> + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);
>>>> break;
>>>> default:
>>>> /*
>>>> @@ -2196,6 +2202,7 @@ static int __init atmci_init_slot(struct atmel_mci *host,
>>>> }
>>>>
>>>> host->slot[id] = slot;
>>>> + mmc_regulator_get_supply(mmc);
>>>> mmc_add_host(mmc);
>>>>
>>>> if (gpio_is_valid(slot->detect_pin)) {
>>>> --
>>>> 1.8.1.2
>>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
>>> the body of a message to [email protected]
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>>
>> --
>> Alexandre Belloni, Free Electrons
>> Embedded Linux, Kernel and Android engineering
>> http://free-electrons.com
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>


--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

2014-01-13 17:59:20

by Chris Ball

[permalink] [raw]
Subject: Re: [PATCHv3] mmc: atmel-mci: add vmmc-supply support

Hi,

On Mon, Jan 13 2014, Alexandre Belloni wrote:
> I still don't see that on mmc.git, Any issue with that patch ? I would
> prefer not missing the 3.14 merge window.

Sorry about that -- just pushed to mmc-next for 3.14 with ACKs from
Ulf and Ludovic. Thanks,

- Chris.
--
Chris Ball <[email protected]> <http://printf.net/>