diff options
| author |   Ryan Mallon <ryan@bluewatersys.com> | 2011-03-24 23:46:46 +0100 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2011-03-25 00:02:51 +0100 |
| commit | 778b548ced16b4bdca7ee2b694796f22ac24437f (patch) | |
| tree | b4bcac4e3b61b0a5d1ddd242dfbc6ef502035a7c /arch/arm/mach-ep93xx | |
| parent | arm/gpio: Remove three copies of broken and racy debug code (diff) | |
| download | linux-dev-778b548ced16b4bdca7ee2b694796f22ac24437f.tar.xz linux-dev-778b548ced16b4bdca7ee2b694796f22ac24437f.zip | |
arm: ep93xx: Add basic interrupt info
For the time being can we fix up the ep93xx gpio code with the amended
patch below. It keeps the information that the pin is also configured
as an interrupt and cleans the code up a bit.
[ tglx: Rebased it on the removal patch ]
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/mach-ep93xx')
| -rw-r--r-- | arch/arm/mach-ep93xx/gpio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c index e327fd107c3f..34e071d79761 100644 --- a/arch/arm/mach-ep93xx/gpio.c +++ b/arch/arm/mach-ep93xx/gpio.c @@ -360,13 +360,14 @@ static void ep93xx_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) gpio = ep93xx_chip->chip.base; for (i = 0; i < chip->ngpio; i++, gpio++) { int is_out = data_dir_reg & (1 << i); + int irq = gpio_to_irq(gpio); - seq_printf(s, " %s%d gpio-%-3d (%-12s) %s %s", + seq_printf(s, " %s%d gpio-%-3d (%-12s) %s %s %s\n", chip->label, i, gpio, gpiochip_is_requested(chip, i) ? : "", is_out ? "out" : "in ", - (data_reg & (1 << i)) ? "hi" : "lo"); - seq_printf(s, "\n"); + (data_reg & (1<< i)) ? "hi" : "lo", + (!is_out && irq>= 0) ? "(interrupt)" : ""); } } |