From: Matthieu Crapet <[email protected]>
When a pin is configured as GPIO, print also direction (input or output).
Signed-off-by: Matthieu Crapet <[email protected]>
Signed-off-by: Nicolas Ferre <[email protected]>
---
drivers/pinctrl/pinctrl-at91.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 354a81d40925..a6b29ebc3cc3 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -1344,7 +1344,6 @@ static void at91_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
for (i = 0; i < chip->ngpio; i++) {
unsigned mask = pin_to_mask(i);
const char *gpio_label;
- u32 pdsr;
gpio_label = gpiochip_is_requested(chip, i);
if (!gpio_label)
@@ -1353,11 +1352,13 @@ static void at91_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
seq_printf(s, "[%s] GPIO%s%d: ",
gpio_label, chip->label, i);
if (mode == AT91_MUX_GPIO) {
- pdsr = readl_relaxed(pio + PIO_PDSR);
-
- seq_printf(s, "[gpio] %s\n",
- pdsr & mask ?
- "set" : "clear");
+ seq_printf(s, "[gpio] ");
+ seq_printf(s, "%s ",
+ readl_relaxed(pio + PIO_OSR) & mask ?
+ "output" : "input");
+ seq_printf(s, "%s\n",
+ readl_relaxed(pio + PIO_PDSR) & mask ?
+ "set" : "clear");
} else {
seq_printf(s, "[periph %c]\n",
mode + 'A' - 1);
--
2.1.3
Le 18/11/2014 15:43, Nicolas Ferre a ?crit :
> From: Matthieu Crapet <[email protected]>
>
> When a pin is configured as GPIO, print also direction (input or output).
>
> Signed-off-by: Matthieu Crapet <[email protected]>
> Signed-off-by: Nicolas Ferre <[email protected]>
> ---
> drivers/pinctrl/pinctrl-at91.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
Linus, ping?
> diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
> index 354a81d40925..a6b29ebc3cc3 100644
> --- a/drivers/pinctrl/pinctrl-at91.c
> +++ b/drivers/pinctrl/pinctrl-at91.c
> @@ -1344,7 +1344,6 @@ static void at91_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
> for (i = 0; i < chip->ngpio; i++) {
> unsigned mask = pin_to_mask(i);
> const char *gpio_label;
> - u32 pdsr;
>
> gpio_label = gpiochip_is_requested(chip, i);
> if (!gpio_label)
> @@ -1353,11 +1352,13 @@ static void at91_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
> seq_printf(s, "[%s] GPIO%s%d: ",
> gpio_label, chip->label, i);
> if (mode == AT91_MUX_GPIO) {
> - pdsr = readl_relaxed(pio + PIO_PDSR);
> -
> - seq_printf(s, "[gpio] %s\n",
> - pdsr & mask ?
> - "set" : "clear");
> + seq_printf(s, "[gpio] ");
> + seq_printf(s, "%s ",
> + readl_relaxed(pio + PIO_OSR) & mask ?
> + "output" : "input");
> + seq_printf(s, "%s\n",
> + readl_relaxed(pio + PIO_PDSR) & mask ?
> + "set" : "clear");
> } else {
> seq_printf(s, "[periph %c]\n",
> mode + 'A' - 1);
>
--
Nicolas Ferre
On Tue, Nov 18, 2014 at 3:43 PM, Nicolas Ferre <[email protected]> wrote:
> From: Matthieu Crapet <[email protected]>
>
> When a pin is configured as GPIO, print also direction (input or output).
>
> Signed-off-by: Matthieu Crapet <[email protected]>
> Signed-off-by: Nicolas Ferre <[email protected]>
Patch applied.
Yours,
Linus Walleij