[PATCH 1/2] mmc: pwrseq: Add support to control multiple gpios in simple pwrseq

Srinivas Kandagatla
2015-01-28T20:29:15Z

This patch adds support to reset/powerup multiple gpio pins on a given
sdio bus. The use case is simple, on sdio we could have multiple devices
like WLAN, BT which are controlled by there own reset lines. So having
multiple reset is something more useful in such cases.

Without this patch I could not get BT and WLAN working at same time on IFC6410.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
drivers/mmc/core/pwrseq_simple.c | 64 ++++++++++++++++++++++++++++------------
1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/drivers/mmc/core/pwrseq_simple.c b/drivers/mmc/core/pwrseq_simple.c
index 0958c69..bb9aadd 100644
--- a/drivers/mmc/core/pwrseq_simple.c
+++ b/drivers/mmc/core/pwrseq_simple.c
@@ -10,6 +10,7 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/device.h>
+#include <linux/of.h>
#include <linux/err.h>
#include <linux/gpio/consumer.h>

@@ -19,34 +20,44 @@

struct mmc_pwrseq_simple {
struct mmc_pwrseq pwrseq;
- struct gpio_desc *reset_gpio;
+ int ngpios;
+ struct gpio_desc *reset_gpios[0];
};

-static void mmc_pwrseq_simple_pre_power_on(struct mmc_host *host)
+static void __mmc_pwrseq_simple_pre_post_power_on_off(struct mmc_host *host,
+ bool on)
{
struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq,
struct mmc_pwrseq_simple, pwrseq);
+ int i;

- if (!IS_ERR(pwrseq->reset_gpio))
- gpiod_set_value_cansleep(pwrseq->reset_gpio, 1);
+ if (!IS_ERR(pwrseq->reset_gpios)) {
+ for (i = 0; i < pwrseq->ngpios; i++)
+ gpiod_set_value_cansleep(pwrseq->reset_gpios[i],
+ on ? : 0);
+ }
}

-static void mmc_pwrseq_simple_post_power_on(struct mmc_host *host)
+static void mmc_pwrseq_simple_pre_power_on(struct mmc_host *host)
{
- struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq,
- struct mmc_pwrseq_simple, pwrseq);
+ __mmc_pwrseq_simple_pre_post_power_on_off(host, true);
+}

- if (!IS_ERR(pwrseq->reset_gpio))
- gpiod_set_value_cansleep(pwrseq->reset_gpio, 0);
+static void mmc_pwrseq_simple_post_power_on(struct mmc_host *host)
+{
+ __mmc_pwrseq_simple_pre_post_power_on_off(host, false);
}

static void mmc_pwrseq_simple_free(struct mmc_host *host)
{
struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq,
struct mmc_pwrseq_simple, pwrseq);
+ int i;

- if (!IS_ERR(pwrseq->reset_gpio))
- gpiod_put(pwrseq->reset_gpio);
+ if (!IS_ERR(pwrseq->reset_gpios)) {
+ for (i = 0; i < pwrseq->ngpios; i++)
+ gpiod_put(pwrseq->reset_gpios[i]);
+ }

kfree(pwrseq);
host->pwrseq = NULL;
@@ -62,20 +73,35 @@ static struct mmc_pwrseq_ops mmc_pwrseq_simple_ops = {
int mmc_pwrseq_simple_alloc(struct mmc_host *host, struct device *dev)
{
struct mmc_pwrseq_simple *pwrseq;
- int ret = 0;
+ int ngpios, i, ret = 0;
+
+ ngpios = of_count_phandle_with_args(dev->of_node,
+ "reset-gpios", "#gpio-cells");

- pwrseq = kzalloc(sizeof(struct mmc_pwrseq_simple), GFP_KERNEL);
+ if (!ngpios)
+ return -ENOENT;
+
+ pwrseq = kzalloc(sizeof(struct mmc_pwrseq_simple) +
+ ngpios * sizeof(struct gpio_desc *), GFP_KERNEL);
if (!pwrseq)
return -ENOMEM;

- pwrseq->reset_gpio = gpiod_get_index(dev, "reset", 0, GPIOD_OUT_HIGH);
- if (IS_ERR(pwrseq->reset_gpio) &&
- PTR_ERR(pwrseq->reset_gpio) != -ENOENT &&
- PTR_ERR(pwrseq->reset_gpio) != -ENOSYS) {
- ret = PTR_ERR(pwrseq->reset_gpio);
- goto free;
+ for (i = 0; i < ngpios; i++) {
+ pwrseq->reset_gpios[i] = gpiod_get_index(dev, "reset",
+ i, GPIOD_OUT_HIGH);
+ if (IS_ERR(pwrseq->reset_gpios[i]) &&
+ PTR_ERR(pwrseq->reset_gpios[i]) != -ENOENT &&
+ PTR_ERR(pwrseq->reset_gpios[i]) != -ENOSYS) {
+ ret = PTR_ERR(pwrseq->reset_gpios[i]);
+
+ while (--i)
+ gpiod_put(pwrseq->reset_gpios[i]);
+
+ goto free;
+ }
}

+ pwrseq->ngpios = ngpios;
pwrseq->pwrseq.ops = &mmc_pwrseq_simple_ops;
host->pwrseq = &pwrseq->pwrseq;

--
1.9.1