From bd8ed930af7d3e325d53cb6c976c59abb885c1fc Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Thu, 28 Dec 2017 13:32:53 +0100
Subject: [PATCH] Revert "pinctrl: qcom: disable GPIO groups with no pins"
This reverts commit 93ebe8636bb0d95e2e711f2a53abbb72a9d9cf8d.
After discussion and review of the v11 patchset, a new approach
was found so that this patch is not needed.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/pinctrl/qcom/pinctrl-msm.c | 28 +++++-----------------------
1 file changed, 5 insertions(+), 23 deletions(-)
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
index d45b4c2b5af10..7a960590ecaae 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -507,11 +507,6 @@ static void msm_gpio_dbg_show_one(struct seq_file *s,
};
g = &pctrl->soc->groups[offset];
-
- /* If the GPIO group has no pins, then don't show it. */
- if (!g->npins)
- return;
-
ctl_reg = readl(pctrl->regs + g->ctl_reg);
is_out = !!(ctl_reg & BIT(g->oe_bit));
@@ -521,7 +516,7 @@ static void msm_gpio_dbg_show_one(struct seq_file *s,
seq_printf(s, " %-8s: %-3s %d", g->name, is_out ? "out" : "in", func);
seq_printf(s, " %dmA", msm_regval_to_drive(drive));
- seq_printf(s, " %s\n", pulls[pull]);
+ seq_printf(s, " %s", pulls[pull]);
}
static void msm_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
@@ -529,36 +524,23 @@ static void msm_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
unsigned gpio = chip->base;
unsigned i;
- for (i = 0; i < chip->ngpio; i++, gpio++)
+ for (i = 0; i < chip->ngpio; i++, gpio++) {
msm_gpio_dbg_show_one(s, NULL, chip, i, gpio);
+ seq_puts(s, "\n");
+ }
}
#else
#define msm_gpio_dbg_show NULL
#endif
-/*
- * If the requested GPIO has no pins, then treat it as unavailable.
- * Otherwise, call the standard request function.
- */
-static int msm_gpio_request(struct gpio_chip *chip, unsigned int offset)
-{
- struct msm_pinctrl *pctrl = gpiochip_get_data(chip);
- const struct msm_pingroup *g = &pctrl->soc->groups[offset];
-
- if (!g->npins)
- return -EACCES;
-
- return gpiochip_generic_request(chip, offset);
-}
-
static const struct gpio_chip msm_gpio_template = {
.direction_input = msm_gpio_direction_input,
.direction_output = msm_gpio_direction_output,
.get_direction = msm_gpio_get_direction,
.get = msm_gpio_get,
.set = msm_gpio_set,
- .request = msm_gpio_request,
+ .request = gpiochip_generic_request,
.free = gpiochip_generic_free,
.dbg_show = msm_gpio_dbg_show,
};
--
GitLab