Commit d5f46247 authored by Kevin Hilman's avatar Kevin Hilman

gpio/omap: move bank width into struct gpio_bank

Rather than having a file-global bank_width variable, move it into
struct gpio_bank so it can be bank-specific.   Note the bank width
is already passed per-bank via platform_data, so current code would
be incorrect if any banks had different width.
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent bdba15db
...@@ -54,6 +54,7 @@ struct gpio_bank { ...@@ -54,6 +54,7 @@ struct gpio_bank {
struct device *dev; struct device *dev;
bool dbck_flag; bool dbck_flag;
int stride; int stride;
u32 width;
}; };
#ifdef CONFIG_ARCH_OMAP3 #ifdef CONFIG_ARCH_OMAP3
...@@ -79,8 +80,6 @@ static struct omap3_gpio_regs gpio_context[OMAP34XX_NR_GPIOS]; ...@@ -79,8 +80,6 @@ static struct omap3_gpio_regs gpio_context[OMAP34XX_NR_GPIOS];
*/ */
static struct gpio_bank *gpio_bank; static struct gpio_bank *gpio_bank;
static int bank_width;
/* TODO: Analyze removing gpio_bank_count usage from driver code */ /* TODO: Analyze removing gpio_bank_count usage from driver code */
int gpio_bank_count; int gpio_bank_count;
...@@ -870,7 +869,7 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable) ...@@ -870,7 +869,7 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
if (bank->non_wakeup_gpios & (1 << gpio)) { if (bank->non_wakeup_gpios & (1 << gpio)) {
printk(KERN_ERR "Unable to modify wakeup on " printk(KERN_ERR "Unable to modify wakeup on "
"non-wakeup GPIO%d\n", "non-wakeup GPIO%d\n",
(bank - gpio_bank) * 32 + gpio); (bank - gpio_bank) * bank->width + gpio);
return -EINVAL; return -EINVAL;
} }
spin_lock_irqsave(&bank->lock, flags); spin_lock_irqsave(&bank->lock, flags);
...@@ -1545,14 +1544,14 @@ static void __devinit omap_gpio_chip_init(struct gpio_bank *bank) ...@@ -1545,14 +1544,14 @@ static void __devinit omap_gpio_chip_init(struct gpio_bank *bank)
} else { } else {
bank->chip.label = "gpio"; bank->chip.label = "gpio";
bank->chip.base = gpio; bank->chip.base = gpio;
gpio += bank_width; gpio += bank->width;
} }
bank->chip.ngpio = bank_width; bank->chip.ngpio = bank->width;
gpiochip_add(&bank->chip); gpiochip_add(&bank->chip);
for (j = bank->virtual_irq_start; for (j = bank->virtual_irq_start;
j < bank->virtual_irq_start + bank_width; j++) { j < bank->virtual_irq_start + bank->width; j++) {
irq_set_lockdep_class(j, &gpio_lock_class); irq_set_lockdep_class(j, &gpio_lock_class);
irq_set_chip_data(j, bank); irq_set_chip_data(j, bank);
if (bank_is_mpuio(bank)) if (bank_is_mpuio(bank))
...@@ -1602,7 +1601,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev) ...@@ -1602,7 +1601,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev)
bank->dev = &pdev->dev; bank->dev = &pdev->dev;
bank->dbck_flag = pdata->dbck_flag; bank->dbck_flag = pdata->dbck_flag;
bank->stride = pdata->bank_stride; bank->stride = pdata->bank_stride;
bank_width = pdata->bank_width; bank->width = pdata->bank_width;
spin_lock_init(&bank->lock); spin_lock_init(&bank->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment