Skip to content

L
linux-davinci
Commit e5c56ed3 authored by David Brownell's avatar David Brownell Committed by Russell King
Browse files
Options

ARM: OMAP: gpio object shrinkage, cleanup 

More GPIO/IRQ cleanup:

  - compile-time removal of much useless code
      * mpuio support on non-OMAP1.
      * 15xx/730/24xx gpio support on 1610
      * 15xx/730/16xx gpio support on 24xx
      * etc

  - remove all BUG() calls, which are always bad news ... replaced some
    with normal fault reports for that call, others with WARN_ON(1).

  - small mpuio bugfix:  add missing set_type() method

Oh, and fix a minor merge issue: inode->u.generic_ip is now gone.
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b9772a22
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 36 deletions
arch/arm/plat-omap/gpio.c
View file @ e5c56ed3
...@@ -267,21 +267,34 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input) ...@@ -267,21 +267,34 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
u32 l; u32 l;
switch (bank->method) { switch (bank->method) {
#ifdef CONFIG_ARCH_OMAP1
case METHOD_MPUIO: case METHOD_MPUIO:
reg += OMAP_MPUIO_IO_CNTL; reg += OMAP_MPUIO_IO_CNTL;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP15XX
case METHOD_GPIO_1510: case METHOD_GPIO_1510:
reg += OMAP1510_GPIO_DIR_CONTROL; reg += OMAP1510_GPIO_DIR_CONTROL;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP16XX
case METHOD_GPIO_1610: case METHOD_GPIO_1610:
reg += OMAP1610_GPIO_DIRECTION; reg += OMAP1610_GPIO_DIRECTION;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP730
case METHOD_GPIO_730: case METHOD_GPIO_730:
reg += OMAP730_GPIO_DIR_CONTROL; reg += OMAP730_GPIO_DIR_CONTROL;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP24XX
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_OE; reg += OMAP24XX_GPIO_OE;
break; break;
#endif
default:
WARN_ON(1);
return;
} }
l = __raw_readl(reg); l = __raw_readl(reg);
if (is_input) if (is_input)
...@@ -309,6 +322,7 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) ...@@ -309,6 +322,7 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
u32 l = 0; u32 l = 0;
switch (bank->method) { switch (bank->method) {
#ifdef CONFIG_ARCH_OMAP1
case METHOD_MPUIO: case METHOD_MPUIO:
reg += OMAP_MPUIO_OUTPUT; reg += OMAP_MPUIO_OUTPUT;
l = __raw_readl(reg); l = __raw_readl(reg);
...@@ -317,6 +331,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) ...@@ -317,6 +331,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
else else
l &= ~(1 << gpio); l &= ~(1 << gpio);
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP15XX
case METHOD_GPIO_1510: case METHOD_GPIO_1510:
reg += OMAP1510_GPIO_DATA_OUTPUT; reg += OMAP1510_GPIO_DATA_OUTPUT;
l = __raw_readl(reg); l = __raw_readl(reg);
...@@ -325,6 +341,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) ...@@ -325,6 +341,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
else else
l &= ~(1 << gpio); l &= ~(1 << gpio);
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP16XX
case METHOD_GPIO_1610: case METHOD_GPIO_1610:
if (enable) if (enable)
reg += OMAP1610_GPIO_SET_DATAOUT; reg += OMAP1610_GPIO_SET_DATAOUT;
...@@ -332,6 +350,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) ...@@ -332,6 +350,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
reg += OMAP1610_GPIO_CLEAR_DATAOUT; reg += OMAP1610_GPIO_CLEAR_DATAOUT;
l = 1 << gpio; l = 1 << gpio;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP730
case METHOD_GPIO_730: case METHOD_GPIO_730:
reg += OMAP730_GPIO_DATA_OUTPUT; reg += OMAP730_GPIO_DATA_OUTPUT;
l = __raw_readl(reg); l = __raw_readl(reg);
...@@ -340,6 +360,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) ...@@ -340,6 +360,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
else else
l &= ~(1 << gpio); l &= ~(1 << gpio);
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP24XX
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
if (enable) if (enable)
reg += OMAP24XX_GPIO_SETDATAOUT; reg += OMAP24XX_GPIO_SETDATAOUT;
...@@ -347,8 +369,9 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) ...@@ -347,8 +369,9 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
reg += OMAP24XX_GPIO_CLEARDATAOUT; reg += OMAP24XX_GPIO_CLEARDATAOUT;
l = 1 << gpio; l = 1 << gpio;
break; break;
#endif
default: default:
BUG(); WARN_ON(1);
return; return;
} }
__raw_writel(l, reg); __raw_writel(l, reg);
...@@ -372,28 +395,37 @@ int omap_get_gpio_datain(int gpio) ...@@ -372,28 +395,37 @@ int omap_get_gpio_datain(int gpio)
void __iomem *reg; void __iomem *reg;
if (check_gpio(gpio) < 0) if (check_gpio(gpio) < 0)
return -1; return -EINVAL;
bank = get_gpio_bank(gpio); bank = get_gpio_bank(gpio);
reg = bank->base; reg = bank->base;
switch (bank->method) { switch (bank->method) {
#ifdef CONFIG_ARCH_OMAP1
case METHOD_MPUIO: case METHOD_MPUIO:
reg += OMAP_MPUIO_INPUT_LATCH; reg += OMAP_MPUIO_INPUT_LATCH;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP15XX
case METHOD_GPIO_1510: case METHOD_GPIO_1510:
reg += OMAP1510_GPIO_DATA_INPUT; reg += OMAP1510_GPIO_DATA_INPUT;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP16XX
case METHOD_GPIO_1610: case METHOD_GPIO_1610:
reg += OMAP1610_GPIO_DATAIN; reg += OMAP1610_GPIO_DATAIN;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP730
case METHOD_GPIO_730: case METHOD_GPIO_730:
reg += OMAP730_GPIO_DATA_INPUT; reg += OMAP730_GPIO_DATA_INPUT;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP24XX
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_DATAIN; reg += OMAP24XX_GPIO_DATAIN;
break; break;
#endif
default: default:
BUG(); return -EINVAL;
return -1;
} }
return (__raw_readl(reg) return (__raw_readl(reg)
& (1 << get_gpio_index(gpio))) != 0; & (1 << get_gpio_index(gpio))) != 0;
...@@ -443,6 +475,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) ...@@ -443,6 +475,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
u32 l = 0; u32 l = 0;
switch (bank->method) { switch (bank->method) {
#ifdef CONFIG_ARCH_OMAP1
case METHOD_MPUIO: case METHOD_MPUIO:
reg += OMAP_MPUIO_GPIO_INT_EDGE; reg += OMAP_MPUIO_GPIO_INT_EDGE;
l = __raw_readl(reg); l = __raw_readl(reg);
...@@ -453,6 +486,8 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) ...@@ -453,6 +486,8 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
else else
goto bad; goto bad;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP15XX
case METHOD_GPIO_1510: case METHOD_GPIO_1510:
reg += OMAP1510_GPIO_INT_CONTROL; reg += OMAP1510_GPIO_INT_CONTROL;
l = __raw_readl(reg); l = __raw_readl(reg);
...@@ -463,6 +498,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) ...@@ -463,6 +498,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
else else
goto bad; goto bad;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP16XX #ifdef CONFIG_ARCH_OMAP16XX
case METHOD_GPIO_1610: case METHOD_GPIO_1610:
if (gpio & 0x08) if (gpio & 0x08)
...@@ -470,9 +506,6 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) ...@@ -470,9 +506,6 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
else else
reg += OMAP1610_GPIO_EDGE_CTRL1; reg += OMAP1610_GPIO_EDGE_CTRL1;
gpio &= 0x07; gpio &= 0x07;
/* We allow only edge triggering, i.e. two lowest bits */
if (trigger & (__IRQT_LOWLVL | __IRQT_HIGHLVL))
BUG();
l = __raw_readl(reg); l = __raw_readl(reg);
l &= ~(3 << (gpio << 1)); l &= ~(3 << (gpio << 1));
if (trigger & __IRQT_RISEDGE) if (trigger & __IRQT_RISEDGE)
...@@ -504,7 +537,6 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) ...@@ -504,7 +537,6 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
break; break;
#endif #endif
default: default:
BUG();
goto bad; goto bad;
} }
__raw_writel(l, reg); __raw_writel(l, reg);
...@@ -519,7 +551,7 @@ static int gpio_irq_type(unsigned irq, unsigned type) ...@@ -519,7 +551,7 @@ static int gpio_irq_type(unsigned irq, unsigned type)
unsigned gpio; unsigned gpio;
int retval; int retval;
if (irq > IH_MPUIO_BASE) if (!cpu_is_omap24xx() && irq > IH_MPUIO_BASE)
gpio = OMAP_MPUIO(irq - IH_MPUIO_BASE); gpio = OMAP_MPUIO(irq - IH_MPUIO_BASE);
else else
gpio = irq - IH_GPIO_BASE; gpio = irq - IH_GPIO_BASE;
...@@ -527,9 +559,12 @@ static int gpio_irq_type(unsigned irq, unsigned type) ...@@ -527,9 +559,12 @@ static int gpio_irq_type(unsigned irq, unsigned type)
if (check_gpio(gpio) < 0) if (check_gpio(gpio) < 0)
return -EINVAL; return -EINVAL;
if (type & IRQT_PROBE) if (type & ~IRQ_TYPE_SENSE_MASK)
return -EINVAL; return -EINVAL;
if (!cpu_is_omap24xx() && (type & (__IRQT_LOWLVL|__IRQT_HIGHLVL)))
/* OMAP1 allows only only edge triggering */
if (!cpu_is_omap24xx()
&& (type & (IRQ_TYPE_LEVEL_LOW|IRQ_TYPE_LEVEL_HIGH)))
return -EINVAL; return -EINVAL;
bank = get_gpio_bank(gpio); bank = get_gpio_bank(gpio);
...@@ -548,24 +583,34 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask) ...@@ -548,24 +583,34 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
void __iomem *reg = bank->base; void __iomem *reg = bank->base;
switch (bank->method) { switch (bank->method) {
#ifdef CONFIG_ARCH_OMAP1
case METHOD_MPUIO: case METHOD_MPUIO:
/* MPUIO irqstatus is reset by reading the status register, /* MPUIO irqstatus is reset by reading the status register,
* so do nothing here */ * so do nothing here */
return; return;
#endif
#ifdef CONFIG_ARCH_OMAP15XX
case METHOD_GPIO_1510: case METHOD_GPIO_1510:
reg += OMAP1510_GPIO_INT_STATUS; reg += OMAP1510_GPIO_INT_STATUS;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP16XX
case METHOD_GPIO_1610: case METHOD_GPIO_1610:
reg += OMAP1610_GPIO_IRQSTATUS1; reg += OMAP1610_GPIO_IRQSTATUS1;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP730
case METHOD_GPIO_730: case METHOD_GPIO_730:
reg += OMAP730_GPIO_INT_STATUS; reg += OMAP730_GPIO_INT_STATUS;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP24XX
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_IRQSTATUS1; reg += OMAP24XX_GPIO_IRQSTATUS1;
break; break;
#endif
default: default:
BUG(); WARN_ON(1);
return; return;
} }
__raw_writel(gpio_mask, reg); __raw_writel(gpio_mask, reg);
...@@ -588,31 +633,41 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank) ...@@ -588,31 +633,41 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank)
u32 mask; u32 mask;
switch (bank->method) { switch (bank->method) {
#ifdef CONFIG_ARCH_OMAP1
case METHOD_MPUIO: case METHOD_MPUIO:
reg += OMAP_MPUIO_GPIO_MASKIT; reg += OMAP_MPUIO_GPIO_MASKIT;
mask = 0xffff; mask = 0xffff;
inv = 1; inv = 1;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP15XX
case METHOD_GPIO_1510: case METHOD_GPIO_1510:
reg += OMAP1510_GPIO_INT_MASK; reg += OMAP1510_GPIO_INT_MASK;
mask = 0xffff; mask = 0xffff;
inv = 1; inv = 1;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP16XX
case METHOD_GPIO_1610: case METHOD_GPIO_1610:
reg += OMAP1610_GPIO_IRQENABLE1; reg += OMAP1610_GPIO_IRQENABLE1;
mask = 0xffff; mask = 0xffff;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP730
case METHOD_GPIO_730: case METHOD_GPIO_730:
reg += OMAP730_GPIO_INT_MASK; reg += OMAP730_GPIO_INT_MASK;
mask = 0xffffffff; mask = 0xffffffff;
inv = 1; inv = 1;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP24XX
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
reg += OMAP24XX_GPIO_IRQENABLE1; reg += OMAP24XX_GPIO_IRQENABLE1;
mask = 0xffffffff; mask = 0xffffffff;
break; break;
#endif
default: default:
BUG(); WARN_ON(1);
return 0; return 0;
} }
...@@ -629,6 +684,7 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab ...@@ -629,6 +684,7 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab
u32 l; u32 l;
switch (bank->method) { switch (bank->method) {
#ifdef CONFIG_ARCH_OMAP1
case METHOD_MPUIO: case METHOD_MPUIO:
reg += OMAP_MPUIO_GPIO_MASKIT; reg += OMAP_MPUIO_GPIO_MASKIT;
l = __raw_readl(reg); l = __raw_readl(reg);
...@@ -637,6 +693,8 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab ...@@ -637,6 +693,8 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab
else else
l |= gpio_mask; l |= gpio_mask;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP15XX
case METHOD_GPIO_1510: case METHOD_GPIO_1510:
reg += OMAP1510_GPIO_INT_MASK; reg += OMAP1510_GPIO_INT_MASK;
l = __raw_readl(reg); l = __raw_readl(reg);
...@@ -645,6 +703,8 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab ...@@ -645,6 +703,8 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab
else else
l |= gpio_mask; l |= gpio_mask;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP16XX
case METHOD_GPIO_1610: case METHOD_GPIO_1610:
if (enable) if (enable)
reg += OMAP1610_GPIO_SET_IRQENABLE1; reg += OMAP1610_GPIO_SET_IRQENABLE1;
...@@ -652,6 +712,8 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab ...@@ -652,6 +712,8 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab
reg += OMAP1610_GPIO_CLEAR_IRQENABLE1; reg += OMAP1610_GPIO_CLEAR_IRQENABLE1;
l = gpio_mask; l = gpio_mask;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP730
case METHOD_GPIO_730: case METHOD_GPIO_730:
reg += OMAP730_GPIO_INT_MASK; reg += OMAP730_GPIO_INT_MASK;
l = __raw_readl(reg); l = __raw_readl(reg);
...@@ -660,6 +722,8 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab ...@@ -660,6 +722,8 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab
else else
l |= gpio_mask; l |= gpio_mask;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP24XX
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
if (enable) if (enable)
reg += OMAP24XX_GPIO_SETIRQENABLE1; reg += OMAP24XX_GPIO_SETIRQENABLE1;
...@@ -667,8 +731,9 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab ...@@ -667,8 +731,9 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab
reg += OMAP24XX_GPIO_CLEARIRQENABLE1; reg += OMAP24XX_GPIO_CLEARIRQENABLE1;
l = gpio_mask; l = gpio_mask;
break; break;
#endif
default: default:
BUG(); WARN_ON(1);
return; return;
} }
__raw_writel(l, reg); __raw_writel(l, reg);
...@@ -837,8 +902,10 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc) ...@@ -837,8 +902,10 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
desc->chip->ack(irq); desc->chip->ack(irq);
bank = get_irq_data(irq); bank = get_irq_data(irq);
#ifdef CONFIG_ARCH_OMAP1
if (bank->method == METHOD_MPUIO) if (bank->method == METHOD_MPUIO)
isr_reg = bank->base + OMAP_MPUIO_GPIO_INT; isr_reg = bank->base + OMAP_MPUIO_GPIO_INT;
#endif
#ifdef CONFIG_ARCH_OMAP15XX #ifdef CONFIG_ARCH_OMAP15XX
if (bank->method == METHOD_GPIO_1510) if (bank->method == METHOD_GPIO_1510)
isr_reg = bank->base + OMAP1510_GPIO_INT_STATUS; isr_reg = bank->base + OMAP1510_GPIO_INT_STATUS;
...@@ -984,6 +1051,22 @@ static void gpio_unmask_irq(unsigned int irq) ...@@ -984,6 +1051,22 @@ static void gpio_unmask_irq(unsigned int irq)
_set_gpio_irqenable(bank, gpio_idx, 1); _set_gpio_irqenable(bank, gpio_idx, 1);
} }
static struct irq_chip gpio_irq_chip = {
.name = "GPIO",
.shutdown = gpio_irq_shutdown,
.ack = gpio_ack_irq,
.mask = gpio_mask_irq,
.unmask = gpio_unmask_irq,
.set_type = gpio_irq_type,
.set_wake = gpio_wake_enable,
};
/*---------------------------------------------------------------------*/
#ifdef CONFIG_ARCH_OMAP1
/* MPUIO uses the always-on 32k clock */
static void mpuio_ack_irq(unsigned int irq) static void mpuio_ack_irq(unsigned int irq)
{ {
/* The ISR is reset automatically, so do nothing here. */ /* The ISR is reset automatically, so do nothing here. */
...@@ -1005,16 +1088,6 @@ static void mpuio_unmask_irq(unsigned int irq) ...@@ -1005,16 +1088,6 @@ static void mpuio_unmask_irq(unsigned int irq)
_set_gpio_irqenable(bank, gpio, 1); _set_gpio_irqenable(bank, gpio, 1);
} }
static struct irq_chip gpio_irq_chip = {
.name = "GPIO",
.shutdown = gpio_irq_shutdown,
.ack = gpio_ack_irq,
.mask = gpio_mask_irq,
.unmask = gpio_unmask_irq,
.set_type = gpio_irq_type,
.set_wake = gpio_wake_enable,
};
static struct irq_chip mpuio_irq_chip = { static struct irq_chip mpuio_irq_chip = {
.name = "MPUIO", .name = "MPUIO",
.ack = mpuio_ack_irq, .ack = mpuio_ack_irq,
...@@ -1023,6 +1096,19 @@ static struct irq_chip mpuio_irq_chip = { ...@@ -1023,6 +1096,19 @@ static struct irq_chip mpuio_irq_chip = {
.set_type = gpio_irq_type, .set_type = gpio_irq_type,
}; };
#define bank_is_mpuio(bank) ((bank)->method == METHOD_MPUIO)
#else
extern struct irq_chip mpuio_irq_chip;
#define bank_is_mpuio(bank) 0
#endif
/*---------------------------------------------------------------------*/
static int initialized; static int initialized;
static struct clk * gpio_ick; static struct clk * gpio_ick;
static struct clk * gpio_fck; static struct clk * gpio_fck;
...@@ -1097,9 +1183,8 @@ static int __init _omap_gpio_init(void) ...@@ -1097,9 +1183,8 @@ static int __init _omap_gpio_init(void)
bank->reserved_map = 0; bank->reserved_map = 0;
bank->base = IO_ADDRESS(bank->base); bank->base = IO_ADDRESS(bank->base);
spin_lock_init(&bank->lock); spin_lock_init(&bank->lock);
if (bank->method == METHOD_MPUIO) { if (bank_is_mpuio(bank))
omap_writew(0xFFFF, OMAP_MPUIO_BASE + OMAP_MPUIO_GPIO_MASKIT); omap_writew(0xFFFF, OMAP_MPUIO_BASE + OMAP_MPUIO_GPIO_MASKIT);
}
#ifdef CONFIG_ARCH_OMAP15XX #ifdef CONFIG_ARCH_OMAP15XX
if (bank->method == METHOD_GPIO_1510) { if (bank->method == METHOD_GPIO_1510) {
__raw_writew(0xffff, bank->base + OMAP1510_GPIO_INT_MASK); __raw_writew(0xffff, bank->base + OMAP1510_GPIO_INT_MASK);
...@@ -1140,7 +1225,7 @@ static int __init _omap_gpio_init(void) ...@@ -1140,7 +1225,7 @@ static int __init _omap_gpio_init(void)
#endif #endif
for (j = bank->virtual_irq_start; for (j = bank->virtual_irq_start;
j < bank->virtual_irq_start + gpio_count; j++) { j < bank->virtual_irq_start + gpio_count; j++) {
if (bank->method == METHOD_MPUIO) if (bank_is_mpuio(bank))
set_irq_chip(j, &mpuio_irq_chip); set_irq_chip(j, &mpuio_irq_chip);
else else
set_irq_chip(j, &gpio_irq_chip); set_irq_chip(j, &gpio_irq_chip);
...@@ -1180,16 +1265,20 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) ...@@ -1180,16 +1265,20 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
void __iomem *wake_set; void __iomem *wake_set;
switch (bank->method) { switch (bank->method) {
#ifdef CONFIG_ARCH_OMAP16XX
case METHOD_GPIO_1610: case METHOD_GPIO_1610:
wake_status = bank->base + OMAP1610_GPIO_WAKEUPENABLE; wake_status = bank->base + OMAP1610_GPIO_WAKEUPENABLE;
wake_clear = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA; wake_clear = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA;
wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP24XX
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
wake_status = bank->base + OMAP24XX_GPIO_SETWKUENA; wake_status = bank->base + OMAP24XX_GPIO_SETWKUENA;
wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
break; break;
#endif
default: default:
continue; continue;
} }
...@@ -1217,14 +1306,18 @@ static int omap_gpio_resume(struct sys_device *dev) ...@@ -1217,14 +1306,18 @@ static int omap_gpio_resume(struct sys_device *dev)
void __iomem *wake_set; void __iomem *wake_set;
switch (bank->method) { switch (bank->method) {
#ifdef CONFIG_ARCH_OMAP16XX
case METHOD_GPIO_1610: case METHOD_GPIO_1610:
wake_clear = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA; wake_clear = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA;
wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
break; break;
#endif
#ifdef CONFIG_ARCH_OMAP24XX
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
break; break;
#endif
default: default:
continue; continue;
} }
...@@ -1404,7 +1497,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused) ...@@ -1404,7 +1497,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused)
unsigned bankwidth = 16; unsigned bankwidth = 16;
u32 mask = 1; u32 mask = 1;
if (!cpu_is_omap24xx() && bank->method == METHOD_MPUIO) if (bank_is_mpuio(bank))
gpio = OMAP_MPUIO(0); gpio = OMAP_MPUIO(0);
else if (cpu_is_omap24xx() || cpu_is_omap730()) else if (cpu_is_omap24xx() || cpu_is_omap730())
bankwidth = 32; bankwidth = 32;
...@@ -1419,7 +1512,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused) ...@@ -1419,7 +1512,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused)
value = omap_get_gpio_datain(gpio); value = omap_get_gpio_datain(gpio);
is_in = gpio_is_input(bank, mask); is_in = gpio_is_input(bank, mask);
if (!cpu_is_omap24xx() && bank->method == METHOD_MPUIO) if (bank_is_mpuio(bank))
seq_printf(s, "MPUIO %2d: ", j); seq_printf(s, "MPUIO %2d: ", j);
else else
seq_printf(s, "GPIO %3d: ", gpio); seq_printf(s, "GPIO %3d: ", gpio);
...@@ -1460,7 +1553,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused) ...@@ -1460,7 +1553,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused)
seq_printf(s, "\n"); seq_printf(s, "\n");
} }
if (!cpu_is_omap24xx() && bank->method == METHOD_MPUIO) { if (bank_is_mpuio(bank)) {
seq_printf(s, "\n"); seq_printf(s, "\n");
gpio = 0; gpio = 0;
} }
...@@ -1470,7 +1563,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused) ...@@ -1470,7 +1563,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused)
static int dbg_gpio_open(struct inode *inode, struct file *file) static int dbg_gpio_open(struct inode *inode, struct file *file)
{ {
return single_open(file, dbg_gpio_show, inode->u.generic_ip/*i_private*/); return single_open(file, dbg_gpio_show, &inode->i_private);
} }
static const struct file_operations debug_fops = { static const struct file_operations debug_fops = {
...@@ -1482,7 +1575,8 @@ static const struct file_operations debug_fops = { ...@@ -1482,7 +1575,8 @@ static const struct file_operations debug_fops = {
static int __init omap_gpio_debuginit(void) static int __init omap_gpio_debuginit(void)
{ {
(void) debugfs_create_file("omap_gpio", S_IRUGO, NULL, NULL, &debug_fops); (void) debugfs_create_file("omap_gpio", S_IRUGO,
NULL, NULL, &debug_fops);
return 0; return 0;
} }
late_initcall(omap_gpio_debuginit); late_initcall(omap_gpio_debuginit);
......
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