Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

watchdog: mtx1-wdt: fix GPIO toggling

Commit e391be76 (MIPS: Alchemy: Clean up GPIO registers and accessors)
changed the way the GPIO was toggled. Prior to this patch, we would
always actively drive the GPIO output to either 0 or 1, this patch
drove the GPIO active to 0, and put the GPIO in tristate to drive it
to 1, unfortunately this does not work, revert back to active driving.

Using a signed variable (gstate) to hold the gpio state and using a bit-
wise operation on it also resulted in toggling value from 1 to -2 since
the variable is signed. This value was then passed on to gpio_direction_
output, which always perform a if (value) ... to set the value to the
gpio, so we were always writing a 1 to this GPIO instead of 1 -> 0 -> 1 ...

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: stable <stable@kernel.org>

authored by

Florian Fainelli and committed by
Wim Van Sebroeck
2ea4e76e 9b19d40a

+5 -8
+5 -8
drivers/watchdog/mtx-1_wdt.c
··· 66 66 int default_ticks; 67 67 unsigned long inuse; 68 68 unsigned gpio; 69 - int gstate; 69 + unsigned int gstate; 70 70 } mtx1_wdt_device; 71 71 72 72 static void mtx1_wdt_trigger(unsigned long unused) ··· 78 78 ticks--; 79 79 80 80 /* toggle wdt gpio */ 81 - mtx1_wdt_device.gstate = ~mtx1_wdt_device.gstate; 82 - if (mtx1_wdt_device.gstate) 83 - gpio_direction_output(mtx1_wdt_device.gpio, 1); 84 - else 85 - gpio_direction_input(mtx1_wdt_device.gpio); 81 + mtx1_wdt_device.gstate = !mtx1_wdt_device.gstate; 82 + gpio_set_value(mtx1_wdt_device.gpio, mtx1_wdt_device.gstate); 86 83 87 84 if (mtx1_wdt_device.queue && ticks) 88 85 mod_timer(&mtx1_wdt_device.timer, jiffies + MTX1_WDT_INTERVAL); ··· 102 105 if (!mtx1_wdt_device.queue) { 103 106 mtx1_wdt_device.queue = 1; 104 107 mtx1_wdt_device.gstate = 1; 105 - gpio_direction_output(mtx1_wdt_device.gpio, 1); 108 + gpio_set_value(mtx1_wdt_device.gpio, 1); 106 109 mod_timer(&mtx1_wdt_device.timer, jiffies + MTX1_WDT_INTERVAL); 107 110 } 108 111 mtx1_wdt_device.running++; ··· 117 120 if (mtx1_wdt_device.queue) { 118 121 mtx1_wdt_device.queue = 0; 119 122 mtx1_wdt_device.gstate = 0; 120 - gpio_direction_output(mtx1_wdt_device.gpio, 0); 123 + gpio_set_value(mtx1_wdt_device.gpio, 0); 121 124 } 122 125 ticks = mtx1_wdt_device.default_ticks; 123 126 spin_unlock_irqrestore(&mtx1_wdt_device.lock, flags);