Skip to content

L
linux-davinci
Commit 3f1686a9 authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

omap: Fix gpio.c for multi-omap for omap4 

Set up METHOD_GPIO_44XX instead of trying to use the METHOD_GPIO_24XX.
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4751227d
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 91 deletions
arch/arm/plat-omap/gpio.c
View file @ 3f1686a9
...@@ -202,6 +202,7 @@ struct gpio_bank { ...@@ -202,6 +202,7 @@ struct gpio_bank {
#define METHOD_GPIO_1610 2 #define METHOD_GPIO_1610 2
#define METHOD_GPIO_7XX 3 #define METHOD_GPIO_7XX 3
#define METHOD_GPIO_24XX 5 #define METHOD_GPIO_24XX 5
#define METHOD_GPIO_44XX 6
#ifdef CONFIG_ARCH_OMAP16XX #ifdef CONFIG_ARCH_OMAP16XX
static struct gpio_bank gpio_bank_1610[5] = { static struct gpio_bank gpio_bank_1610[5] = {
...@@ -312,17 +313,17 @@ static struct omap3_gpio_regs gpio_context[OMAP34XX_NR_GPIOS]; ...@@ -312,17 +313,17 @@ static struct omap3_gpio_regs gpio_context[OMAP34XX_NR_GPIOS];
#ifdef CONFIG_ARCH_OMAP4 #ifdef CONFIG_ARCH_OMAP4
static struct gpio_bank gpio_bank_44xx[6] = { static struct gpio_bank gpio_bank_44xx[6] = {
{ OMAP44XX_GPIO1_BASE, NULL, INT_44XX_GPIO_BANK1, IH_GPIO_BASE, { OMAP44XX_GPIO1_BASE, NULL, INT_44XX_GPIO_BANK1, IH_GPIO_BASE,
METHOD_GPIO_24XX }, METHOD_GPIO_44XX },
{ OMAP44XX_GPIO2_BASE, NULL, INT_44XX_GPIO_BANK2, IH_GPIO_BASE + 32, { OMAP44XX_GPIO2_BASE, NULL, INT_44XX_GPIO_BANK2, IH_GPIO_BASE + 32,
METHOD_GPIO_24XX }, METHOD_GPIO_44XX },
{ OMAP44XX_GPIO3_BASE, NULL, INT_44XX_GPIO_BANK3, IH_GPIO_BASE + 64, { OMAP44XX_GPIO3_BASE, NULL, INT_44XX_GPIO_BANK3, IH_GPIO_BASE + 64,
METHOD_GPIO_24XX }, METHOD_GPIO_44XX },
{ OMAP44XX_GPIO4_BASE, NULL, INT_44XX_GPIO_BANK4, IH_GPIO_BASE + 96, { OMAP44XX_GPIO4_BASE, NULL, INT_44XX_GPIO_BANK4, IH_GPIO_BASE + 96,
METHOD_GPIO_24XX }, METHOD_GPIO_44XX },
{ OMAP44XX_GPIO5_BASE, NULL, INT_44XX_GPIO_BANK5, IH_GPIO_BASE + 128, { OMAP44XX_GPIO5_BASE, NULL, INT_44XX_GPIO_BANK5, IH_GPIO_BASE + 128,
METHOD_GPIO_24XX }, METHOD_GPIO_44XX },
{ OMAP44XX_GPIO6_BASE, NULL, INT_44XX_GPIO_BANK6, IH_GPIO_BASE + 160, { OMAP44XX_GPIO6_BASE, NULL, INT_44XX_GPIO_BANK6, IH_GPIO_BASE + 160,
METHOD_GPIO_24XX }, METHOD_GPIO_44XX },
}; };
#endif #endif
...@@ -430,7 +431,7 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input) ...@@ -430,7 +431,7 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP4) #if defined(CONFIG_ARCH_OMAP4)
case METHOD_GPIO_24XX: case METHOD_GPIO_44XX:
reg += OMAP4_GPIO_OE; reg += OMAP4_GPIO_OE;
break; break;
#endif #endif
...@@ -501,7 +502,7 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) ...@@ -501,7 +502,7 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
break; break;
#endif #endif
#ifdef CONFIG_ARCH_OMAP4 #ifdef CONFIG_ARCH_OMAP4
case METHOD_GPIO_24XX: case METHOD_GPIO_44XX:
if (enable) if (enable)
reg += OMAP4_GPIO_SETDATAOUT; reg += OMAP4_GPIO_SETDATAOUT;
else else
...@@ -550,7 +551,7 @@ static int _get_gpio_datain(struct gpio_bank *bank, int gpio) ...@@ -550,7 +551,7 @@ static int _get_gpio_datain(struct gpio_bank *bank, int gpio)
break; break;
#endif #endif
#ifdef CONFIG_ARCH_OMAP4 #ifdef CONFIG_ARCH_OMAP4
case METHOD_GPIO_24XX: case METHOD_GPIO_44XX:
reg += OMAP4_GPIO_DATAIN; reg += OMAP4_GPIO_DATAIN;
break; break;
#endif #endif
...@@ -592,6 +593,7 @@ static int _get_gpio_dataout(struct gpio_bank *bank, int gpio) ...@@ -592,6 +593,7 @@ static int _get_gpio_dataout(struct gpio_bank *bank, int gpio)
#endif #endif
#ifdef CONFIG_ARCH_OMAP2PLUS #ifdef CONFIG_ARCH_OMAP2PLUS
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
case METHOD_GPIO_44XX:
reg += OMAP24XX_GPIO_DATAOUT; reg += OMAP24XX_GPIO_DATAOUT;
break; break;
#endif #endif
...@@ -622,11 +624,12 @@ void omap_set_gpio_debounce(int gpio, int enable) ...@@ -622,11 +624,12 @@ void omap_set_gpio_debounce(int gpio, int enable)
bank = get_gpio_bank(gpio); bank = get_gpio_bank(gpio);
reg = bank->base; reg = bank->base;
#ifdef CONFIG_ARCH_OMAP4
reg += OMAP4_GPIO_DEBOUNCENABLE; if (cpu_is_omap44xx())
#else reg += OMAP4_GPIO_DEBOUNCENABLE;
reg += OMAP24XX_GPIO_DEBOUNCE_EN; else
#endif reg += OMAP24XX_GPIO_DEBOUNCE_EN;
if (!(bank->mod_usage & l)) { if (!(bank->mod_usage & l)) {
printk(KERN_ERR "GPIO %d not requested\n", gpio); printk(KERN_ERR "GPIO %d not requested\n", gpio);
return; return;
...@@ -672,11 +675,12 @@ void omap_set_gpio_debounce_time(int gpio, int enc_time) ...@@ -672,11 +675,12 @@ void omap_set_gpio_debounce_time(int gpio, int enc_time)
} }
enc_time &= 0xff; enc_time &= 0xff;
#ifdef CONFIG_ARCH_OMAP4
reg += OMAP4_GPIO_DEBOUNCINGTIME; if (cpu_is_omap44xx())
#else reg += OMAP4_GPIO_DEBOUNCINGTIME;
reg += OMAP24XX_GPIO_DEBOUNCE_VAL; else
#endif reg += OMAP24XX_GPIO_DEBOUNCE_VAL;
__raw_writel(enc_time, reg); __raw_writel(enc_time, reg);
} }
EXPORT_SYMBOL(omap_set_gpio_debounce_time); EXPORT_SYMBOL(omap_set_gpio_debounce_time);
...@@ -854,6 +858,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) ...@@ -854,6 +858,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
#endif #endif
#ifdef CONFIG_ARCH_OMAP2PLUS #ifdef CONFIG_ARCH_OMAP2PLUS
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
case METHOD_GPIO_44XX:
set_24xx_gpio_triggering(bank, gpio, trigger); set_24xx_gpio_triggering(bank, gpio, trigger);
break; break;
#endif #endif
...@@ -938,7 +943,7 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask) ...@@ -938,7 +943,7 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP4) #if defined(CONFIG_ARCH_OMAP4)
case METHOD_GPIO_24XX: case METHOD_GPIO_44XX:
reg += OMAP4_GPIO_IRQSTATUS0; reg += OMAP4_GPIO_IRQSTATUS0;
break; break;
#endif #endif
...@@ -949,12 +954,11 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask) ...@@ -949,12 +954,11 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
__raw_writel(gpio_mask, reg); __raw_writel(gpio_mask, reg);
/* Workaround for clearing DSP GPIO interrupts to allow retention */ /* Workaround for clearing DSP GPIO interrupts to allow retention */
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) if (cpu_is_omap24xx() || cpu_is_omap34xx())
reg = bank->base + OMAP24XX_GPIO_IRQSTATUS2; reg = bank->base + OMAP24XX_GPIO_IRQSTATUS2;
#endif else if (cpu_is_omap44xx())
#if defined(CONFIG_ARCH_OMAP4) reg = bank->base + OMAP4_GPIO_IRQSTATUS1;
reg = bank->base + OMAP4_GPIO_IRQSTATUS1;
#endif
if (cpu_is_omap24xx() || cpu_is_omap34xx() || cpu_is_omap44xx()) { if (cpu_is_omap24xx() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
__raw_writel(gpio_mask, reg); __raw_writel(gpio_mask, reg);
...@@ -1010,7 +1014,7 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank) ...@@ -1010,7 +1014,7 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank)
break; break;
#endif #endif
#if defined(CONFIG_ARCH_OMAP4) #if defined(CONFIG_ARCH_OMAP4)
case METHOD_GPIO_24XX: case METHOD_GPIO_44XX:
reg += OMAP4_GPIO_IRQSTATUSSET0; reg += OMAP4_GPIO_IRQSTATUSSET0;
mask = 0xffffffff; mask = 0xffffffff;
break; break;
...@@ -1082,7 +1086,7 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab ...@@ -1082,7 +1086,7 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab
break; break;
#endif #endif
#ifdef CONFIG_ARCH_OMAP4 #ifdef CONFIG_ARCH_OMAP4
case METHOD_GPIO_24XX: case METHOD_GPIO_44XX:
if (enable) if (enable)
reg += OMAP4_GPIO_IRQSTATUSSET0; reg += OMAP4_GPIO_IRQSTATUSSET0;
else else
...@@ -1128,6 +1132,7 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable) ...@@ -1128,6 +1132,7 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
#endif #endif
#ifdef CONFIG_ARCH_OMAP2PLUS #ifdef CONFIG_ARCH_OMAP2PLUS
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
case METHOD_GPIO_44XX:
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",
...@@ -1222,7 +1227,8 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) ...@@ -1222,7 +1227,8 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
} }
#endif #endif
#ifdef CONFIG_ARCH_OMAP2PLUS #ifdef CONFIG_ARCH_OMAP2PLUS
if (bank->method == METHOD_GPIO_24XX) { if ((bank->method == METHOD_GPIO_24XX) ||
(bank->method == METHOD_GPIO_44XX)) {
/* Disable wake-up during idle for dynamic tick */ /* Disable wake-up during idle for dynamic tick */
void __iomem *reg = bank->base + OMAP24XX_GPIO_CLEARWKUENA; void __iomem *reg = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
__raw_writel(1 << offset, reg); __raw_writel(1 << offset, reg);
...@@ -1284,7 +1290,7 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc) ...@@ -1284,7 +1290,7 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1; isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1;
#endif #endif
#if defined(CONFIG_ARCH_OMAP4) #if defined(CONFIG_ARCH_OMAP4)
if (bank->method == METHOD_GPIO_24XX) if (bank->method == METHOD_GPIO_44XX)
isr_reg = bank->base + OMAP4_GPIO_IRQSTATUS0; isr_reg = bank->base + OMAP4_GPIO_IRQSTATUS0;
#endif #endif
while(1) { while(1) {
...@@ -1564,6 +1570,7 @@ static int gpio_is_input(struct gpio_bank *bank, int mask) ...@@ -1564,6 +1570,7 @@ static int gpio_is_input(struct gpio_bank *bank, int mask)
reg += OMAP7XX_GPIO_DIR_CONTROL; reg += OMAP7XX_GPIO_DIR_CONTROL;
break; break;
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
case METHOD_GPIO_44XX:
reg += OMAP24XX_GPIO_OE; reg += OMAP24XX_GPIO_OE;
break; break;
} }
...@@ -1803,28 +1810,41 @@ static int __init _omap_gpio_init(void) ...@@ -1803,28 +1810,41 @@ static int __init _omap_gpio_init(void)
} }
#ifdef CONFIG_ARCH_OMAP2PLUS #ifdef CONFIG_ARCH_OMAP2PLUS
if (bank->method == METHOD_GPIO_24XX) { if ((bank->method == METHOD_GPIO_24XX) ||
(bank->method == METHOD_GPIO_44XX)) {
static const u32 non_wakeup_gpios[] = { static const u32 non_wakeup_gpios[] = {
0xe203ffc0, 0x08700040 0xe203ffc0, 0x08700040
}; };
if (cpu_is_omap44xx()) {
__raw_writel(0xffffffff, bank->base + if (cpu_is_omap44xx()) {
__raw_writel(0xffffffff, bank->base +
OMAP4_GPIO_IRQSTATUSCLR0); OMAP4_GPIO_IRQSTATUSCLR0);
__raw_writew(0x0015, bank->base + __raw_writew(0x0015, bank->base +
OMAP4_GPIO_SYSCONFIG); OMAP4_GPIO_SYSCONFIG);
__raw_writel(0x00000000, bank->base + __raw_writel(0x00000000, bank->base +
OMAP4_GPIO_DEBOUNCENABLE); OMAP4_GPIO_DEBOUNCENABLE);
/* Initialize interface clock ungated, module enabled */ /*
__raw_writel(0, bank->base + OMAP4_GPIO_CTRL); * Initialize interface clock ungated,
} else { * module enabled
__raw_writel(0x00000000, bank->base + OMAP24XX_GPIO_IRQENABLE1); */
__raw_writel(0xffffffff, bank->base + OMAP24XX_GPIO_IRQSTATUS1); __raw_writel(0, bank->base + OMAP4_GPIO_CTRL);
__raw_writew(0x0015, bank->base + OMAP24XX_GPIO_SYSCONFIG); } else {
__raw_writel(0x00000000, bank->base + OMAP24XX_GPIO_DEBOUNCE_EN); __raw_writel(0x00000000, bank->base +
OMAP24XX_GPIO_IRQENABLE1);
/* Initialize interface clock ungated, module enabled */ __raw_writel(0xffffffff, bank->base +
__raw_writel(0, bank->base + OMAP24XX_GPIO_CTRL); OMAP24XX_GPIO_IRQSTATUS1);
} __raw_writew(0x0015, bank->base +
OMAP24XX_GPIO_SYSCONFIG);
__raw_writel(0x00000000, bank->base +
OMAP24XX_GPIO_DEBOUNCE_EN);
/*
* Initialize interface clock ungated,
* module enabled
*/
__raw_writel(0, bank->base +
OMAP24XX_GPIO_CTRL);
}
if (i < ARRAY_SIZE(non_wakeup_gpios)) if (i < ARRAY_SIZE(non_wakeup_gpios))
bank->non_wakeup_gpios = non_wakeup_gpios[i]; bank->non_wakeup_gpios = non_wakeup_gpios[i];
gpio_count = 32; gpio_count = 32;
...@@ -1926,7 +1946,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) ...@@ -1926,7 +1946,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
break; break;
#endif #endif
#ifdef CONFIG_ARCH_OMAP4 #ifdef CONFIG_ARCH_OMAP4
case METHOD_GPIO_24XX: case METHOD_GPIO_44XX:
wake_status = bank->base + OMAP4_GPIO_IRQWAKEN0; wake_status = bank->base + OMAP4_GPIO_IRQWAKEN0;
wake_clear = bank->base + OMAP4_GPIO_IRQWAKEN0; wake_clear = bank->base + OMAP4_GPIO_IRQWAKEN0;
wake_set = bank->base + OMAP4_GPIO_IRQWAKEN0; wake_set = bank->base + OMAP4_GPIO_IRQWAKEN0;
...@@ -1973,7 +1993,7 @@ static int omap_gpio_resume(struct sys_device *dev) ...@@ -1973,7 +1993,7 @@ static int omap_gpio_resume(struct sys_device *dev)
break; break;
#endif #endif
#ifdef CONFIG_ARCH_OMAP4 #ifdef CONFIG_ARCH_OMAP4
case METHOD_GPIO_24XX: case METHOD_GPIO_44XX:
wake_clear = bank->base + OMAP4_GPIO_IRQWAKEN0; wake_clear = bank->base + OMAP4_GPIO_IRQWAKEN0;
wake_set = bank->base + OMAP4_GPIO_IRQWAKEN0; wake_set = bank->base + OMAP4_GPIO_IRQWAKEN0;
break; break;
...@@ -2020,29 +2040,42 @@ void omap2_gpio_prepare_for_retention(void) ...@@ -2020,29 +2040,42 @@ void omap2_gpio_prepare_for_retention(void)
if (!(bank->enabled_non_wakeup_gpios)) if (!(bank->enabled_non_wakeup_gpios))
continue; continue;
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
bank->saved_datain = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN); if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
l1 = __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT); bank->saved_datain = __raw_readl(bank->base +
l2 = __raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT); OMAP24XX_GPIO_DATAIN);
#endif l1 = __raw_readl(bank->base +
#ifdef CONFIG_ARCH_OMAP4 OMAP24XX_GPIO_FALLINGDETECT);
bank->saved_datain = __raw_readl(bank->base + l2 = __raw_readl(bank->base +
OMAP4_GPIO_DATAIN); OMAP24XX_GPIO_RISINGDETECT);
l1 = __raw_readl(bank->base + OMAP4_GPIO_FALLINGDETECT); }
l2 = __raw_readl(bank->base + OMAP4_GPIO_RISINGDETECT);
#endif if (cpu_is_omap44xx()) {
bank->saved_datain = __raw_readl(bank->base +
OMAP4_GPIO_DATAIN);
l1 = __raw_readl(bank->base +
OMAP4_GPIO_FALLINGDETECT);
l2 = __raw_readl(bank->base +
OMAP4_GPIO_RISINGDETECT);
}
bank->saved_fallingdetect = l1; bank->saved_fallingdetect = l1;
bank->saved_risingdetect = l2; bank->saved_risingdetect = l2;
l1 &= ~bank->enabled_non_wakeup_gpios; l1 &= ~bank->enabled_non_wakeup_gpios;
l2 &= ~bank->enabled_non_wakeup_gpios; l2 &= ~bank->enabled_non_wakeup_gpios;
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
__raw_writel(l1, bank->base + OMAP24XX_GPIO_FALLINGDETECT); if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
__raw_writel(l2, bank->base + OMAP24XX_GPIO_RISINGDETECT); __raw_writel(l1, bank->base +
#endif OMAP24XX_GPIO_FALLINGDETECT);
#ifdef CONFIG_ARCH_OMAP4 __raw_writel(l2, bank->base +
__raw_writel(l1, bank->base + OMAP4_GPIO_FALLINGDETECT); OMAP24XX_GPIO_RISINGDETECT);
__raw_writel(l2, bank->base + OMAP4_GPIO_RISINGDETECT); }
#endif
if (cpu_is_omap44xx()) {
__raw_writel(l1, bank->base + OMAP4_GPIO_FALLINGDETECT);
__raw_writel(l2, bank->base + OMAP4_GPIO_RISINGDETECT);
}
c++; c++;
} }
if (!c) { if (!c) {
...@@ -2064,20 +2097,23 @@ void omap2_gpio_resume_after_retention(void) ...@@ -2064,20 +2097,23 @@ void omap2_gpio_resume_after_retention(void)
if (!(bank->enabled_non_wakeup_gpios)) if (!(bank->enabled_non_wakeup_gpios))
continue; continue;
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
__raw_writel(bank->saved_fallingdetect, if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
__raw_writel(bank->saved_fallingdetect,
bank->base + OMAP24XX_GPIO_FALLINGDETECT); bank->base + OMAP24XX_GPIO_FALLINGDETECT);
__raw_writel(bank->saved_risingdetect, __raw_writel(bank->saved_risingdetect,
bank->base + OMAP24XX_GPIO_RISINGDETECT); bank->base + OMAP24XX_GPIO_RISINGDETECT);
l = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN); l = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN);
#endif }
#ifdef CONFIG_ARCH_OMAP4
__raw_writel(bank->saved_fallingdetect, if (cpu_is_omap44xx()) {
__raw_writel(bank->saved_fallingdetect,
bank->base + OMAP4_GPIO_FALLINGDETECT); bank->base + OMAP4_GPIO_FALLINGDETECT);
__raw_writel(bank->saved_risingdetect, __raw_writel(bank->saved_risingdetect,
bank->base + OMAP4_GPIO_RISINGDETECT); bank->base + OMAP4_GPIO_RISINGDETECT);
l = __raw_readl(bank->base + OMAP4_GPIO_DATAIN); l = __raw_readl(bank->base + OMAP4_GPIO_DATAIN);
#endif }
/* Check if any of the non-wakeup interrupt GPIOs have changed /* Check if any of the non-wakeup interrupt GPIOs have changed
* state. If so, generate an IRQ by software. This is * state. If so, generate an IRQ by software. This is
* horribly racy, but it's the best we can do to work around * horribly racy, but it's the best we can do to work around
...@@ -2103,30 +2139,36 @@ void omap2_gpio_resume_after_retention(void) ...@@ -2103,30 +2139,36 @@ void omap2_gpio_resume_after_retention(void)
if (gen) { if (gen) {
u32 old0, old1; u32 old0, old1;
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
old0 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0); if (cpu_is_omap24xx() || cpu_is_omap44xx()) {
old1 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1); old0 = __raw_readl(bank->base +
OMAP24XX_GPIO_LEVELDETECT0);
old1 = __raw_readl(bank->base +
OMAP24XX_GPIO_LEVELDETECT1);
__raw_writel(old0 | gen, bank->base + __raw_writel(old0 | gen, bank->base +
OMAP24XX_GPIO_LEVELDETECT0); OMAP24XX_GPIO_LEVELDETECT0);
__raw_writel(old1 | gen, bank->base + __raw_writel(old1 | gen, bank->base +
OMAP24XX_GPIO_LEVELDETECT1); OMAP24XX_GPIO_LEVELDETECT1);
__raw_writel(old0, bank->base + OMAP24XX_GPIO_LEVELDETECT0); __raw_writel(old0, bank->base +
__raw_writel(old1, bank->base + OMAP24XX_GPIO_LEVELDETECT1); OMAP24XX_GPIO_LEVELDETECT0);
#endif __raw_writel(old1, bank->base +
#ifdef CONFIG_ARCH_OMAP4 OMAP24XX_GPIO_LEVELDETECT1);
old0 = __raw_readl(bank->base + }
if (cpu_is_omap44xx()) {
old0 = __raw_readl(bank->base +
OMAP4_GPIO_LEVELDETECT0); OMAP4_GPIO_LEVELDETECT0);
old1 = __raw_readl(bank->base + old1 = __raw_readl(bank->base +
OMAP4_GPIO_LEVELDETECT1); OMAP4_GPIO_LEVELDETECT1);
__raw_writel(old0 | l, bank->base + __raw_writel(old0 | l, bank->base +
OMAP4_GPIO_LEVELDETECT0); OMAP4_GPIO_LEVELDETECT0);
__raw_writel(old1 | l, bank->base + __raw_writel(old1 | l, bank->base +
OMAP4_GPIO_LEVELDETECT1); OMAP4_GPIO_LEVELDETECT1);
__raw_writel(old0, bank->base + __raw_writel(old0, bank->base +
OMAP4_GPIO_LEVELDETECT0); OMAP4_GPIO_LEVELDETECT0);
__raw_writel(old1, bank->base + __raw_writel(old1, bank->base +
OMAP4_GPIO_LEVELDETECT1); OMAP4_GPIO_LEVELDETECT1);
#endif }
} }
} }
......
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