[PATCHv2] mmc: atmel-mci: add vmmc-supply support

[PATCHv2] mmc: atmel-mci: add vmmc-supply support

[Alexandre Belloni]

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 <alexandre.belloni@free-electrons.com>
---

Changes in v2:
 - use mmc_regulator_get_supply instead of devm_regulator_get

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

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 69e438e..4ea5333 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -23,6 +23,7 @@
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
 #include <linux/scatterlist.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
@@ -2198,6 +2199,14 @@ static int __init atmci_init_slot(struct atmel_mci *host,
 	host->slot[id] = slot;
 	mmc_add_host(mmc);
 
+	mmc_regulator_get_supply(mmc);
+	if (!IS_ERR(mmc->supply.vmmc)) {
+		int ret = regulator_enable(mmc->supply.vmmc);
+		if (ret)
+			dev_err(&mmc->class_dev,
+				"failed to enable regulator: %d\n", ret);
+	}
+
 	if (gpio_is_valid(slot->detect_pin)) {
 		int ret;
 
-- 
1.8.1.2

Re: [PATCHv2] mmc: atmel-mci: add vmmc-supply support

[Ulf Hansson]

On 17 October 2013 00:19, Alexandre Belloni
<alexandre.belloni@free-electrons.com> 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 <alexandre.belloni@free-electrons.com>
> ---
>
> Changes in v2:
>  - use mmc_regulator_get_supply instead of devm_regulator_get
>
>  drivers/mmc/host/atmel-mci.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index 69e438e..4ea5333 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -23,6 +23,7 @@
>  #include <linux/of_device.h>
>  #include <linux/of_gpio.h>
>  #include <linux/platform_device.h>
> +#include <linux/regulator/consumer.h>
>  #include <linux/scatterlist.h>
>  #include <linux/seq_file.h>
>  #include <linux/slab.h>
> @@ -2198,6 +2199,14 @@ static int __init atmci_init_slot(struct atmel_mci *host,
>         host->slot[id] = slot;
>         mmc_add_host(mmc);
>
> +       mmc_regulator_get_supply(mmc);
> +       if (!IS_ERR(mmc->supply.vmmc)) {
> +               int ret = regulator_enable(mmc->supply.vmmc);

You should not enable the regulator here, instead handle that from the
.set_ios function. This complete code chunk must also be moved prior
to mmc_add_host above.

When enabling/disabling the regulator from the .set_ios, I suppose you
want to use mmc_regulator_set_ocr API instead.

Kind regards
Ulf Hansson

> +               if (ret)
> +                       dev_err(&mmc->class_dev,
> +                               "failed to enable regulator: %d\n", ret);
> +       }
> +
>         if (gpio_is_valid(slot->detect_pin)) {
>                 int ret;
>
> --
> 1.8.1.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCHv2] mmc: atmel-mci: add vmmc-supply support

[Alexandre Belloni]

On 17/10/2013 10:34, Ulf Hansson wrote:
> On 17 October 2013 00:19, Alexandre Belloni
> <alexandre.belloni@free-electrons.com> 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 <alexandre.belloni@free-electrons.com>
>> ---
>>
>> Changes in v2:
>>  - use mmc_regulator_get_supply instead of devm_regulator_get
>>
>>  drivers/mmc/host/atmel-mci.c | 9 +++++++++
>>  1 file changed, 9 insertions(+)
>>
>> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
>> index 69e438e..4ea5333 100644
>> --- a/drivers/mmc/host/atmel-mci.c
>> +++ b/drivers/mmc/host/atmel-mci.c
>> @@ -23,6 +23,7 @@
>>  #include <linux/of_device.h>
>>  #include <linux/of_gpio.h>
>>  #include <linux/platform_device.h>
>> +#include <linux/regulator/consumer.h>
>>  #include <linux/scatterlist.h>
>>  #include <linux/seq_file.h>
>>  #include <linux/slab.h>
>> @@ -2198,6 +2199,14 @@ static int __init atmci_init_slot(struct atmel_mci *host,
>>         host->slot[id] = slot;
>>         mmc_add_host(mmc);
>>
>> +       mmc_regulator_get_supply(mmc);
>> +       if (!IS_ERR(mmc->supply.vmmc)) {
>> +               int ret = regulator_enable(mmc->supply.vmmc);
> You should not enable the regulator here, instead handle that from the
> .set_ios function. This complete code chunk must also be moved prior
> to mmc_add_host above.

Right, I was wondering about that. I actually had a version where it was
before mmc_add_host
>
> When enabling/disabling the regulator from the .set_ios, I suppose you
> want to use mmc_regulator_set_ocr API instead.

Oh right, I pretty new to the mmc subsystem and I was probably to tired
to find that one yesterday. I actually looked for regulator_enable in
mmc/core/core.c and didn't see it ...

Thank you for your prompt reviews.


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