diff options
author | Alistair Buxton <a.j.buxton@gmail.com> | 2009-09-17 23:09:39 -0400 |
---|---|---|
committer | Alistair Buxton <a.j.buxton@gmail.com> | 2009-10-07 18:14:06 -0400 |
commit | 372b1c32e7e7d7aa5f44e0eaed4ad8ae21e4e9da (patch) | |
tree | 32491b47873015ae75cf2e8bc675cb20e00ab259 /arch/arm/mach-omap1/pm.c | |
parent | b51988db94faec47d6e7c69c8e691cfc194f66db (diff) |
OMAP7XX: Replace omap730 references in irqs.h and all users
This patch is part of a series which removes references to omap730 in code
which is shared with omap850, replacing them with references to omap7xx.
Turns INT_730_* to INT_7XX_* for definitions in irqs.h and all users.
Signed-off-by: Alistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: Zebediah C. McClure <zmc@lurian.net>
Diffstat (limited to 'arch/arm/mach-omap1/pm.c')
-rw-r--r-- | arch/arm/mach-omap1/pm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 12f246e3cdca..58479c75cac4 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
@@ -184,8 +184,8 @@ static void omap_pm_wakeup_setup(void) | |||
184 | * wake up to a GPIO interrupt. | 184 | * wake up to a GPIO interrupt. |
185 | */ | 185 | */ |
186 | if (cpu_is_omap7xx()) | 186 | if (cpu_is_omap7xx()) |
187 | level1_wake = OMAP_IRQ_BIT(INT_730_GPIO_BANK1) | | 187 | level1_wake = OMAP_IRQ_BIT(INT_7XX_GPIO_BANK1) | |
188 | OMAP_IRQ_BIT(INT_730_IH2_IRQ); | 188 | OMAP_IRQ_BIT(INT_7XX_IH2_IRQ); |
189 | else if (cpu_is_omap15xx()) | 189 | else if (cpu_is_omap15xx()) |
190 | level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) | | 190 | level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) | |
191 | OMAP_IRQ_BIT(INT_1510_IH2_IRQ); | 191 | OMAP_IRQ_BIT(INT_1510_IH2_IRQ); |
@@ -197,8 +197,8 @@ static void omap_pm_wakeup_setup(void) | |||
197 | 197 | ||
198 | if (cpu_is_omap7xx()) { | 198 | if (cpu_is_omap7xx()) { |
199 | omap_writel(~level2_wake, OMAP_IH2_0_MIR); | 199 | omap_writel(~level2_wake, OMAP_IH2_0_MIR); |
200 | omap_writel(~(OMAP_IRQ_BIT(INT_730_WAKE_UP_REQ) | | 200 | omap_writel(~(OMAP_IRQ_BIT(INT_7XX_WAKE_UP_REQ) | |
201 | OMAP_IRQ_BIT(INT_730_MPUIO_KEYPAD)), | 201 | OMAP_IRQ_BIT(INT_7XX_MPUIO_KEYPAD)), |
202 | OMAP_IH2_1_MIR); | 202 | OMAP_IH2_1_MIR); |
203 | } else if (cpu_is_omap15xx()) { | 203 | } else if (cpu_is_omap15xx()) { |
204 | level2_wake |= OMAP_IRQ_BIT(INT_KEYBOARD); | 204 | level2_wake |= OMAP_IRQ_BIT(INT_KEYBOARD); |
@@ -687,7 +687,7 @@ static int __init omap_pm_init(void) | |||
687 | pm_idle = omap1_pm_idle; | 687 | pm_idle = omap1_pm_idle; |
688 | 688 | ||
689 | if (cpu_is_omap7xx()) | 689 | if (cpu_is_omap7xx()) |
690 | setup_irq(INT_730_WAKE_UP_REQ, &omap_wakeup_irq); | 690 | setup_irq(INT_7XX_WAKE_UP_REQ, &omap_wakeup_irq); |
691 | else if (cpu_is_omap16xx()) | 691 | else if (cpu_is_omap16xx()) |
692 | setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq); | 692 | setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq); |
693 | 693 | ||