summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinconf.c
diff options
context:
space:
mode:
authorChanho Park <chanho61.park@samsung.com>2012-01-03 02:47:50 -0500
committerLinus Walleij <linus.walleij@linaro.org>2012-01-03 03:10:09 -0500
commit706e8520e8450a631ca6f798f8c811faf56f0a59 (patch)
tree68b0f77fc1f3b92be3e905e36f14e184403d0b67 /drivers/pinctrl/pinconf.c
parente6337c3c96a7ee5cfd5e7afed825f894d4576f58 (diff)
pinctrl: correct a offset while enumerating pins
This patch modifies a offset while enumerating pins to support a partial pin space. If we use a pin number for enumerating pins, the pin space always starts with zero base. Indeed, we always check the pin is in the pin space. An extreme example, there is only two pins. One is 0. Another is 1000. We always enumerate whole offsets until 1000. For solving this problem, we use the offset of the pin array instead of the zero-based pin number. Signed-off-by: Chanho Park <chanho61.park@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [Restored sparse pin space comment] Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinconf.c')
-rw-r--r--drivers/pinctrl/pinconf.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c
index 57dbb4b478db..1259872b0a1d 100644
--- a/drivers/pinctrl/pinconf.c
+++ b/drivers/pinctrl/pinconf.c
@@ -230,17 +230,18 @@ static void pinconf_dump_pin(struct pinctrl_dev *pctldev,
230static int pinconf_pins_show(struct seq_file *s, void *what) 230static int pinconf_pins_show(struct seq_file *s, void *what)
231{ 231{
232 struct pinctrl_dev *pctldev = s->private; 232 struct pinctrl_dev *pctldev = s->private;
233 unsigned pin; 233 unsigned i, pin;
234 234
235 seq_puts(s, "Pin config settings per pin\n"); 235 seq_puts(s, "Pin config settings per pin\n");
236 seq_puts(s, "Format: pin (name): pinmux setting array\n"); 236 seq_puts(s, "Format: pin (name): pinmux setting array\n");
237 237
238 /* The highest pin number need to be included in the loop, thus <= */ 238 /* The pin number can be retrived from the pin controller descriptor */
239 for (pin = 0; pin <= pctldev->desc->maxpin; pin++) { 239 for (i = 0; pin < pctldev->desc->npins; i++) {
240 struct pin_desc *desc; 240 struct pin_desc *desc;
241 241
242 pin = pctldev->desc->pins[i].number;
242 desc = pin_desc_get(pctldev, pin); 243 desc = pin_desc_get(pctldev, pin);
243 /* Pin space may be sparse */ 244 /* Skip if we cannot search the pin */
244 if (desc == NULL) 245 if (desc == NULL)
245 continue; 246 continue;
246 247