git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
viafb: Convert GPIO and i2c to the new indexed port ops
[pandora-kernel.git]
/
drivers
/
video
/
via
/
via-gpio.c
diff --git
a/drivers/video/via/via-gpio.c
b/drivers/video/via/via-gpio.c
index
e119d21
..
6b36117
100644
(file)
--- a/
drivers/video/via/via-gpio.c
+++ b/
drivers/video/via/via-gpio.c
@@
-91,13
+91,13
@@
static void via_gpio_set(struct gpio_chip *chip, unsigned int nr,
spin_lock_irqsave(&cfg->vdev->reg_lock, flags);
gpio = cfg->active_gpios[nr];
spin_lock_irqsave(&cfg->vdev->reg_lock, flags);
gpio = cfg->active_gpios[nr];
- reg = via
fb
_read_reg(VIASR, gpio->vg_port_index);
+ reg = via_read_reg(VIASR, gpio->vg_port_index);
reg |= 0x40 << gpio->vg_mask_shift; /* output enable */
if (value)
reg |= 0x10 << gpio->vg_mask_shift;
else
reg &= ~(0x10 << gpio->vg_mask_shift);
reg |= 0x40 << gpio->vg_mask_shift; /* output enable */
if (value)
reg |= 0x10 << gpio->vg_mask_shift;
else
reg &= ~(0x10 << gpio->vg_mask_shift);
- via
fb_write_reg(gpio->vg_port_index, VIASR
, reg);
+ via
_write_reg(VIASR, gpio->vg_port_index
, reg);
spin_unlock_irqrestore(&cfg->vdev->reg_lock, flags);
}
spin_unlock_irqrestore(&cfg->vdev->reg_lock, flags);
}
@@
-122,8
+122,8
@@
static int via_gpio_dir_input(struct gpio_chip *chip, unsigned int nr)
spin_lock_irqsave(&cfg->vdev->reg_lock, flags);
gpio = cfg->active_gpios[nr];
spin_lock_irqsave(&cfg->vdev->reg_lock, flags);
gpio = cfg->active_gpios[nr];
- via
fb_write_reg_mask(gpio->vg_port_index, VIASR
, 0,
-
0x40 << gpio->vg_mask_shift);
+ via
_write_reg_mask(VIASR, gpio->vg_port_index
, 0,
+ 0x40 << gpio->vg_mask_shift);
spin_unlock_irqrestore(&cfg->vdev->reg_lock, flags);
return 0;
}
spin_unlock_irqrestore(&cfg->vdev->reg_lock, flags);
return 0;
}
@@
-139,7
+139,7
@@
static int via_gpio_get(struct gpio_chip *chip, unsigned int nr)
spin_lock_irqsave(&cfg->vdev->reg_lock, flags);
gpio = cfg->active_gpios[nr];
spin_lock_irqsave(&cfg->vdev->reg_lock, flags);
gpio = cfg->active_gpios[nr];
- reg = via
fb
_read_reg(VIASR, gpio->vg_port_index);
+ reg = via_read_reg(VIASR, gpio->vg_port_index);
spin_unlock_irqrestore(&cfg->vdev->reg_lock, flags);
return reg & (0x04 << gpio->vg_mask_shift);
}
spin_unlock_irqrestore(&cfg->vdev->reg_lock, flags);
return reg & (0x04 << gpio->vg_mask_shift);
}
@@
-164,12
+164,12
@@
static struct viafb_gpio_cfg gpio_config = {
*/
static void viafb_gpio_enable(struct viafb_gpio *gpio)
{
*/
static void viafb_gpio_enable(struct viafb_gpio *gpio)
{
- via
fb_write_reg_mask(gpio->vg_port_index, VIASR
, 0x02, 0x02);
+ via
_write_reg_mask(VIASR, gpio->vg_port_index
, 0x02, 0x02);
}
static void viafb_gpio_disable(struct viafb_gpio *gpio)
{
}
static void viafb_gpio_disable(struct viafb_gpio *gpio)
{
- via
fb_write_reg_mask(gpio->vg_port_index, VIASR
, 0, 0x02);
+ via
_write_reg_mask(VIASR, gpio->vg_port_index
, 0, 0x02);
}
}