Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 252180
b: refs/heads/master
c: 11ad14f
h: refs/heads/master
v: v3
  • Loading branch information
Jorge Eduardo Candelaria authored and Liam Girdwood committed May 27, 2011
1 parent a0d5d6a commit f60c861
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 87 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 83545d836cf12a6381b530c5c7aeacf057f86aa9
refs/heads/master: 11ad14f86a7847b084d3e3f114180be39b1c7322
29 changes: 19 additions & 10 deletions trunk/drivers/gpio/tps65910-gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ static int tps65910_gpio_get(struct gpio_chip *gc, unsigned offset)
struct tps65910 *tps65910 = container_of(gc, struct tps65910, gpio);
uint8_t val;

tps65910->read(tps65910, TPS65910_GPIO0, 1, &val);
tps65910->read(tps65910, TPS65910_GPIO0 + offset, 1, &val);

if (val & GPIO0_GPIO_STS_MASK)
if (val & GPIO_STS_MASK)
return 1;

return 0;
Expand All @@ -39,11 +39,11 @@ static void tps65910_gpio_set(struct gpio_chip *gc, unsigned offset,
struct tps65910 *tps65910 = container_of(gc, struct tps65910, gpio);

if (value)
tps65910_set_bits(tps65910, TPS65910_GPIO0,
GPIO0_GPIO_SET_MASK);
tps65910_set_bits(tps65910, TPS65910_GPIO0 + offset,
GPIO_SET_MASK);
else
tps65910_clear_bits(tps65910, TPS65910_GPIO0,
GPIO0_GPIO_SET_MASK);
tps65910_clear_bits(tps65910, TPS65910_GPIO0 + offset,
GPIO_SET_MASK);
}

static int tps65910_gpio_output(struct gpio_chip *gc, unsigned offset,
Expand All @@ -54,15 +54,16 @@ static int tps65910_gpio_output(struct gpio_chip *gc, unsigned offset,
/* Set the initial value */
tps65910_gpio_set(gc, 0, value);

return tps65910_set_bits(tps65910, TPS65910_GPIO0, GPIO0_GPIO_CFG_MASK);
return tps65910_set_bits(tps65910, TPS65910_GPIO0 + offset,
GPIO_CFG_MASK);
}

static int tps65910_gpio_input(struct gpio_chip *gc, unsigned offset)
{
struct tps65910 *tps65910 = container_of(gc, struct tps65910, gpio);

return tps65910_clear_bits(tps65910, TPS65910_GPIO0,
GPIO0_GPIO_CFG_MASK);
return tps65910_clear_bits(tps65910, TPS65910_GPIO0 + offset,
GPIO_CFG_MASK);
}

void tps65910_gpio_init(struct tps65910 *tps65910, int gpio_base)
Expand All @@ -76,7 +77,15 @@ void tps65910_gpio_init(struct tps65910 *tps65910, int gpio_base)
tps65910->gpio.label = tps65910->i2c_client->name;
tps65910->gpio.dev = tps65910->dev;
tps65910->gpio.base = gpio_base;
tps65910->gpio.ngpio = 1;

switch(tps65910_chip_id(tps65910)) {
case TPS65910:
tps65910->gpio.ngpio = 6;
case TPS65911:
tps65910->gpio.ngpio = 9;
default:
return;
}
tps65910->gpio.can_sleep = 1;

tps65910->gpio.direction_input = tps65910_gpio_input;
Expand Down
90 changes: 14 additions & 76 deletions trunk/include/linux/mfd/tps65910.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@
#define TPS65910_GPIO3 0x63
#define TPS65910_GPIO4 0x64
#define TPS65910_GPIO5 0x65
#define TPS65910_GPIO6 0x66
#define TPS65910_GPIO7 0x67
#define TPS65910_GPIO8 0x68
#define TPS65910_JTAGVERNUM 0x80
#define TPS65910_MAX_REGISTER 0x80

Expand Down Expand Up @@ -650,82 +653,17 @@
#define INT_MSK3_GPIO4_R_IT_MSK_SHIFT 0


/*Register GPIO0 (0x80) register.RegisterDescription */
#define GPIO0_GPIO_DEB_MASK 0x10
#define GPIO0_GPIO_DEB_SHIFT 4
#define GPIO0_GPIO_PUEN_MASK 0x08
#define GPIO0_GPIO_PUEN_SHIFT 3
#define GPIO0_GPIO_CFG_MASK 0x04
#define GPIO0_GPIO_CFG_SHIFT 2
#define GPIO0_GPIO_STS_MASK 0x02
#define GPIO0_GPIO_STS_SHIFT 1
#define GPIO0_GPIO_SET_MASK 0x01
#define GPIO0_GPIO_SET_SHIFT 0


/*Register GPIO1 (0x80) register.RegisterDescription */
#define GPIO1_GPIO_DEB_MASK 0x10
#define GPIO1_GPIO_DEB_SHIFT 4
#define GPIO1_GPIO_PUEN_MASK 0x08
#define GPIO1_GPIO_PUEN_SHIFT 3
#define GPIO1_GPIO_CFG_MASK 0x04
#define GPIO1_GPIO_CFG_SHIFT 2
#define GPIO1_GPIO_STS_MASK 0x02
#define GPIO1_GPIO_STS_SHIFT 1
#define GPIO1_GPIO_SET_MASK 0x01
#define GPIO1_GPIO_SET_SHIFT 0


/*Register GPIO2 (0x80) register.RegisterDescription */
#define GPIO2_GPIO_DEB_MASK 0x10
#define GPIO2_GPIO_DEB_SHIFT 4
#define GPIO2_GPIO_PUEN_MASK 0x08
#define GPIO2_GPIO_PUEN_SHIFT 3
#define GPIO2_GPIO_CFG_MASK 0x04
#define GPIO2_GPIO_CFG_SHIFT 2
#define GPIO2_GPIO_STS_MASK 0x02
#define GPIO2_GPIO_STS_SHIFT 1
#define GPIO2_GPIO_SET_MASK 0x01
#define GPIO2_GPIO_SET_SHIFT 0


/*Register GPIO3 (0x80) register.RegisterDescription */
#define GPIO3_GPIO_DEB_MASK 0x10
#define GPIO3_GPIO_DEB_SHIFT 4
#define GPIO3_GPIO_PUEN_MASK 0x08
#define GPIO3_GPIO_PUEN_SHIFT 3
#define GPIO3_GPIO_CFG_MASK 0x04
#define GPIO3_GPIO_CFG_SHIFT 2
#define GPIO3_GPIO_STS_MASK 0x02
#define GPIO3_GPIO_STS_SHIFT 1
#define GPIO3_GPIO_SET_MASK 0x01
#define GPIO3_GPIO_SET_SHIFT 0


/*Register GPIO4 (0x80) register.RegisterDescription */
#define GPIO4_GPIO_DEB_MASK 0x10
#define GPIO4_GPIO_DEB_SHIFT 4
#define GPIO4_GPIO_PUEN_MASK 0x08
#define GPIO4_GPIO_PUEN_SHIFT 3
#define GPIO4_GPIO_CFG_MASK 0x04
#define GPIO4_GPIO_CFG_SHIFT 2
#define GPIO4_GPIO_STS_MASK 0x02
#define GPIO4_GPIO_STS_SHIFT 1
#define GPIO4_GPIO_SET_MASK 0x01
#define GPIO4_GPIO_SET_SHIFT 0


/*Register GPIO5 (0x80) register.RegisterDescription */
#define GPIO5_GPIO_DEB_MASK 0x10
#define GPIO5_GPIO_DEB_SHIFT 4
#define GPIO5_GPIO_PUEN_MASK 0x08
#define GPIO5_GPIO_PUEN_SHIFT 3
#define GPIO5_GPIO_CFG_MASK 0x04
#define GPIO5_GPIO_CFG_SHIFT 2
#define GPIO5_GPIO_STS_MASK 0x02
#define GPIO5_GPIO_STS_SHIFT 1
#define GPIO5_GPIO_SET_MASK 0x01
#define GPIO5_GPIO_SET_SHIFT 0
/*Register GPIO (0x80) register.RegisterDescription */
#define GPIO_DEB_MASK 0x10
#define GPIO_DEB_SHIFT 4
#define GPIO_PUEN_MASK 0x08
#define GPIO_PUEN_SHIFT 3
#define GPIO_CFG_MASK 0x04
#define GPIO_CFG_SHIFT 2
#define GPIO_STS_MASK 0x02
#define GPIO_STS_SHIFT 1
#define GPIO_SET_MASK 0x01
#define GPIO_SET_SHIFT 0


/*Register JTAGVERNUM (0x80) register.RegisterDescription */
Expand Down

0 comments on commit f60c861

Please sign in to comment.