Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 23:20:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gpio-sch: Allow for more than 8 lines in the resume well

Browse Source 
The E6xx (TunnelCreek) CPUs have 9 GPIO lines in the resume well. Update
the resume functions to allow for more than 8 GPIO lines, using the core
functions as a template.

Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Darren Hart 2013-03-06 13:49:36 -08:00 committed by Linus Walleij
parent 021304907b
commit 3cbf1822b5
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/gpio/gpio-sch.c
View File

@ -125,13 +125,17 @@ static int sch_gpio_resume_direction_in(struct gpio_chip *gc,
unsigned gpio_num) unsigned gpio_num)
{ {
u8 curr_dirs; u8 curr_dirs;
unsigned short offset, bit;
spin_lock(&gpio_lock); spin_lock(&gpio_lock);
curr_dirs = inb(gpio_ba + RGIO); offset = RGIO + gpio_num / 8;
bit = gpio_num % 8;
if (!(curr_dirs & (1 << gpio_num))) curr_dirs = inb(gpio_ba + offset);
outb(curr_dirs | (1 << gpio_num) , gpio_ba + RGIO);
if (!(curr_dirs & (1 << bit)))
outb(curr_dirs | (1 << bit), gpio_ba + offset);
spin_unlock(&gpio_lock); spin_unlock(&gpio_lock);
return 0; return 0;
@ -139,22 +143,31 @@ static int sch_gpio_resume_direction_in(struct gpio_chip *gc,
static int sch_gpio_resume_get(struct gpio_chip *gc, unsigned gpio_num) static int sch_gpio_resume_get(struct gpio_chip *gc, unsigned gpio_num)
{ {
return !!(inb(gpio_ba + RGLV) & (1 << gpio_num)); unsigned short offset, bit;
offset = RGLV + gpio_num / 8;
bit = gpio_num % 8;
return !!(inb(gpio_ba + offset) & (1 << bit));
} }
static void sch_gpio_resume_set(struct gpio_chip *gc, static void sch_gpio_resume_set(struct gpio_chip *gc,
unsigned gpio_num, int val) unsigned gpio_num, int val)
{ {
u8 curr_vals; u8 curr_vals;
unsigned short offset, bit;
spin_lock(&gpio_lock); spin_lock(&gpio_lock);
curr_vals = inb(gpio_ba + RGLV); offset = RGLV + gpio_num / 8;
bit = gpio_num % 8;
curr_vals = inb(gpio_ba + offset);
if (val) if (val)
outb(curr_vals | (1 << gpio_num), gpio_ba + RGLV); outb(curr_vals | (1 << bit), gpio_ba + offset);
else else
outb((curr_vals & ~(1 << gpio_num)), gpio_ba + RGLV); outb((curr_vals & ~(1 << bit)), gpio_ba + offset);
spin_unlock(&gpio_lock); spin_unlock(&gpio_lock);
} }
@ -163,14 +176,18 @@ static int sch_gpio_resume_direction_out(struct gpio_chip *gc,
unsigned gpio_num, int val) unsigned gpio_num, int val)
{ {
u8 curr_dirs; u8 curr_dirs;
unsigned short offset, bit;
sch_gpio_resume_set(gc, gpio_num, val); sch_gpio_resume_set(gc, gpio_num, val);
offset = RGIO + gpio_num / 8;
bit = gpio_num % 8;
spin_lock(&gpio_lock); spin_lock(&gpio_lock);
curr_dirs = inb(gpio_ba + RGIO); curr_dirs = inb(gpio_ba + offset);
if (curr_dirs & (1 << gpio_num)) if (curr_dirs & (1 << bit))
outb(curr_dirs & ~(1 << gpio_num), gpio_ba + RGIO); outb(curr_dirs & ~(1 << bit), gpio_ba + offset);
spin_unlock(&gpio_lock); spin_unlock(&gpio_lock);
return 0; return 0;