Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/

[firefly-linux-kernel-4.4.55.git] / drivers / char / nsc_gpio.c

diff --git a/drivers/char/nsc_gpio.c b/drivers/char/nsc_gpio.c
index d0b5d65a73fbfb829181c4b69f3514da69686e5d..5b91e4e25641d281916ea16b1e1a57371ff0bebd 100644 (file)
--- a/drivers/char/nsc_gpio.c
+++ b/drivers/char/nsc_gpio.c
@@ -26,7 +26,7 @@ void nsc_gpio_dump(struct nsc_gpio_ops *amp, unsigned index)
        u32 config = amp->gpio_config(index, ~0, 0);
 
        /* user requested via 'v' command, so its INFO */
-       dev_info(amp->dev, "io%02u: 0x%04x %s %s %s %s %s %s %s\n",
+       dev_info(amp->dev, "io%02u: 0x%04x %s %s %s %s %s %s %s\tio:%d/%d\n",
                 index, config,
                 (config & 1) ? "OE" : "TS",      /* output-enabled/tristate */
                 (config & 2) ? "PP" : "OD",      /* push pull / open drain */
@@ -34,7 +34,9 @@ void nsc_gpio_dump(struct nsc_gpio_ops *amp, unsigned index)
                 (config & 8) ? "LOCKED" : "",    /* locked / unlocked */
                 (config & 16) ? "LEVEL" : "EDGE",/* level/edge input */
                 (config & 32) ? "HI" : "LO",     /* trigger on rise/fall edge */
-                (config & 64) ? "DEBOUNCE" : "");        /* debounce */
+                (config & 64) ? "DEBOUNCE" : "", /* debounce */
+
+                amp->gpio_get(index), amp->gpio_current(index));
 }
 
 ssize_t nsc_gpio_write(struct file *file, const char __user *data,