From: John Crispin <blogic@openwrt.org>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-kernel@vger.kernel.org, John Crispin <blogic@openwrt.org>
Subject: [PATCH 01/11] PINCTRL: lantiq: pinconf uses port instead of pin
Date: Fri, 1 Feb 2013 13:04:55 +0100 [thread overview]
Message-ID: <1359720305-31933-1-git-send-email-blogic@openwrt.org> (raw)
The XWAY pinctrl driver invalidly uses the port and not the pin number to work
out the registeres and bits to be set for the opendrain and pullup/down
resistors.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
drivers/pinctrl/pinctrl-xway.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
index 5f0eb04..69dec9b 100644
--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
@@ -441,17 +441,17 @@ static int xway_pinconf_get(struct pinctrl_dev *pctldev,
if (port == PORT3)
reg = GPIO3_OD;
else
- reg = GPIO_OD(port);
+ reg = GPIO_OD(pin);
*config = LTQ_PINCONF_PACK(param,
- !!gpio_getbit(info->membase[0], reg, PORT_PIN(port)));
+ !!gpio_getbit(info->membase[0], reg, PORT_PIN(pin)));
break;
case LTQ_PINCONF_PARAM_PULL:
if (port == PORT3)
reg = GPIO3_PUDEN;
else
- reg = GPIO_PUDEN(port);
- if (!gpio_getbit(info->membase[0], reg, PORT_PIN(port))) {
+ reg = GPIO_PUDEN(pin);
+ if (!gpio_getbit(info->membase[0], reg, PORT_PIN(pin))) {
*config = LTQ_PINCONF_PACK(param, 0);
break;
}
@@ -459,8 +459,8 @@ static int xway_pinconf_get(struct pinctrl_dev *pctldev,
if (port == PORT3)
reg = GPIO3_PUDSEL;
else
- reg = GPIO_PUDSEL(port);
- if (!gpio_getbit(info->membase[0], reg, PORT_PIN(port)))
+ reg = GPIO_PUDSEL(pin);
+ if (!gpio_getbit(info->membase[0], reg, PORT_PIN(pin)))
*config = LTQ_PINCONF_PACK(param, 2);
else
*config = LTQ_PINCONF_PACK(param, 1);
@@ -488,29 +488,29 @@ static int xway_pinconf_set(struct pinctrl_dev *pctldev,
if (port == PORT3)
reg = GPIO3_OD;
else
- reg = GPIO_OD(port);
- gpio_setbit(info->membase[0], reg, PORT_PIN(port));
+ reg = GPIO_OD(pin);
+ gpio_setbit(info->membase[0], reg, PORT_PIN(pin));
break;
case LTQ_PINCONF_PARAM_PULL:
if (port == PORT3)
reg = GPIO3_PUDEN;
else
- reg = GPIO_PUDEN(port);
+ reg = GPIO_PUDEN(pin);
if (arg == 0) {
- gpio_clearbit(info->membase[0], reg, PORT_PIN(port));
+ gpio_clearbit(info->membase[0], reg, PORT_PIN(pin));
break;
}
- gpio_setbit(info->membase[0], reg, PORT_PIN(port));
+ gpio_setbit(info->membase[0], reg, PORT_PIN(pin));
if (port == PORT3)
reg = GPIO3_PUDSEL;
else
- reg = GPIO_PUDSEL(port);
+ reg = GPIO_PUDSEL(pin);
if (arg == 1)
- gpio_clearbit(info->membase[0], reg, PORT_PIN(port));
+ gpio_clearbit(info->membase[0], reg, PORT_PIN(pin));
else if (arg == 2)
- gpio_setbit(info->membase[0], reg, PORT_PIN(port));
+ gpio_setbit(info->membase[0], reg, PORT_PIN(pin));
else
dev_err(pctldev->dev, "Invalid pull value %d\n", arg);
break;
--
1.7.10.4
next reply other threads:[~2013-02-01 12:10 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-01 12:04 John Crispin [this message]
2013-02-01 12:04 ` [PATCH 02/11] PINCTRL: lantiq: faulty bit inversion John Crispin
2013-02-05 14:39 ` Linus Walleij
2013-02-01 12:04 ` [PATCH 03/11] PINCTRL: lantiq: add pin_config_group_set support John Crispin
2013-02-05 14:42 ` Linus Walleij
2013-02-01 12:04 ` [PATCH 04/11] PINCTRL: lantiq: add output pinconf parameter John Crispin
2013-02-05 14:46 ` Linus Walleij
2013-02-05 14:46 ` John Crispin
2013-02-01 12:04 ` [PATCH 05/11] PINCTRL: lantiq: the pinconf OD parameter argument was ignored John Crispin
2013-02-05 14:50 ` Linus Walleij
2013-02-01 12:05 ` [PATCH 06/11] PINCTRL: lantiq: only probe available pad controllers John Crispin
2013-02-05 14:58 ` Linus Walleij
2013-02-01 12:05 ` [PATCH 07/11] PINCTRL: lantiq: one of the boot leds was defined incorrectly John Crispin
2013-02-05 14:53 ` Linus Walleij
2013-02-01 12:05 ` [PATCH 08/11] PINCTRL: lantiq: fix pinconfig parameters John Crispin
2013-02-05 14:57 ` Linus Walleij
2013-02-01 12:05 ` [PATCH 09/11] PINCTRL: lantiq: add functionality to falcon_pinconf_dbg_show John Crispin
2013-02-05 14:55 ` Linus Walleij
2013-02-01 12:05 ` [PATCH 10/11] PINCTRL: lantiq: fix pin availability check John Crispin
2013-02-01 12:05 ` [PATCH 11/11] PINCTRL: lantiq: fix pin number in ltq_pmx_gpio_request_enable John Crispin
2013-02-05 15:13 ` Linus Walleij
2013-02-05 14:39 ` [PATCH 01/11] PINCTRL: lantiq: pinconf uses port instead of pin Linus Walleij
2013-02-05 14:59 ` Linus Walleij
2013-02-05 15:00 ` John Crispin
2013-02-05 15:14 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359720305-31933-1-git-send-email-blogic@openwrt.org \
--to=blogic@openwrt.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®