projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[linux-2.6-microblaze.git]
/
drivers
/
gpio
/
gpio-xilinx.c
diff --git
a/drivers/gpio/gpio-xilinx.c
b/drivers/gpio/gpio-xilinx.c
index
77fe5d3
..
d5284df
100644
(file)
--- a/
drivers/gpio/gpio-xilinx.c
+++ b/
drivers/gpio/gpio-xilinx.c
@@
-220,9
+220,9
@@
static void xgpio_save_regs(struct of_mm_gpio_chip *mm_gc)
if (!chip->gpio_width[1])
return;
if (!chip->gpio_width[1])
return;
- xgpio_writereg(mm_gc->regs + XGPIO_DATA_OFFSET + XGPIO_
TRI
_OFFSET,
+ xgpio_writereg(mm_gc->regs + XGPIO_DATA_OFFSET + XGPIO_
CHANNEL
_OFFSET,
chip->gpio_state[1]);
chip->gpio_state[1]);
- xgpio_writereg(mm_gc->regs + XGPIO_TRI_OFFSET + XGPIO_
TRI
_OFFSET,
+ xgpio_writereg(mm_gc->regs + XGPIO_TRI_OFFSET + XGPIO_
CHANNEL
_OFFSET,
chip->gpio_dir[1]);
}
chip->gpio_dir[1]);
}