Merge branch 'omap-for-v5.7/omap1' into omap-for-v5.7/soc

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index d068958d6f8a44e45ff24d1049e98de43823efeb..2c1e2b32b9b36f26507ecbbae13ea5c1de978143 100644 (file)
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -596,11 +596,6 @@ static irqreturn_t omap_wakeup_interrupt(int irq, void *dev)
        return IRQ_HANDLED;
 }
 
-static struct irqaction omap_wakeup_irq = {
-       .name           = "peripheral wakeup",
-       .handler        = omap_wakeup_interrupt
-};
-
 
 
 static const struct platform_suspend_ops omap_pm_ops = {
@@ -613,6 +608,7 @@ static const struct platform_suspend_ops omap_pm_ops = {
 static int __init omap_pm_init(void)
 {
        int error = 0;
+       int irq;
 
        if (!cpu_class_is_omap1())
                return -ENODEV;
@@ -656,9 +652,12 @@ static int __init omap_pm_init(void)
        arm_pm_idle = omap1_pm_idle;
 
        if (cpu_is_omap7xx())
-               setup_irq(INT_7XX_WAKE_UP_REQ, &omap_wakeup_irq);
+               irq = INT_7XX_WAKE_UP_REQ;
        else if (cpu_is_omap16xx())
-               setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq);
+               irq = INT_1610_WAKE_UP_REQ;
+       if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup",
+                       NULL))
+               pr_err("Failed to request irq %d (peripheral wakeup)\n", irq);
 
        /* Program new power ramp-up time
         * (0 for most boards since we don't lower voltage when in deep sleep)

diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index 524977a31a49c1f2f43eb781e629742d8f724f85..de590a85a42b3707a959611e87b6f51b9e5c2dd0 100644 (file)
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -155,15 +155,11 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static struct irqaction omap_mpu_timer1_irq = {
-       .name           = "mpu_timer1",
-       .flags          = IRQF_TIMER | IRQF_IRQPOLL,
-       .handler        = omap_mpu_timer1_interrupt,
-};
-
 static __init void omap_init_mpu_timer(unsigned long rate)
 {
-       setup_irq(INT_TIMER1, &omap_mpu_timer1_irq);
+       if (request_irq(INT_TIMER1, omap_mpu_timer1_interrupt,
+                       IRQF_TIMER | IRQF_IRQPOLL, "mpu_timer1", NULL))
+               pr_err("Failed to request irq %d (mpu_timer1)\n", INT_TIMER1);
        omap_mpu_timer_start(0, (rate / HZ) - 1, 1);
 
        clockevent_mpu_timer1.cpumask = cpumask_of(0);

diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c
index 0ae6c52a7d70bccb7f7919e4f237c7870cf872a7..780fdf03c3ceea9a1e62c5e82092dcb9fed93b31 100644 (file)
--- a/arch/arm/mach-omap1/timer32k.c
+++ b/arch/arm/mach-omap1/timer32k.c
@@ -148,15 +148,11 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static struct irqaction omap_32k_timer_irq = {
-       .name           = "32KHz timer",
-       .flags          = IRQF_TIMER | IRQF_IRQPOLL,
-       .handler        = omap_32k_timer_interrupt,
-};
-
 static __init void omap_init_32k_timer(void)
 {
-       setup_irq(INT_OS_TIMER, &omap_32k_timer_irq);
+       if (request_irq(INT_OS_TIMER, omap_32k_timer_interrupt,
+                       IRQF_TIMER | IRQF_IRQPOLL, "32KHz timer", NULL))
+               pr_err("Failed to request irq %d(32KHz timer)\n", INT_OS_TIMER);
 
        clockevent_32k_timer.cpumask = cpumask_of(0);
        clockevents_config_and_register(&clockevent_32k_timer,

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 0d0a731cb47691dc0ae7ed572052097e19f77910..8b09cdacc30df3b360797f5b2133e4530d273f0d 100644 (file)
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -91,12 +91,6 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static struct irqaction omap2_gp_timer_irq = {
-       .name           = "gp_timer",
-       .flags          = IRQF_TIMER | IRQF_IRQPOLL,
-       .handler        = omap2_gp_timer_interrupt,
-};
-
 static int omap2_gp_timer_set_next_event(unsigned long cycles,
                                         struct clock_event_device *evt)
 {
@@ -382,8 +376,9 @@ static void __init omap2_gp_clockevent_init(int gptimer_id,
                                     &clockevent_gpt.name, OMAP_TIMER_POSTED);
        BUG_ON(res);
 
-       omap2_gp_timer_irq.dev_id = &clkev;
-       setup_irq(clkev.irq, &omap2_gp_timer_irq);
+       if (request_irq(clkev.irq, omap2_gp_timer_interrupt,
+                       IRQF_TIMER | IRQF_IRQPOLL, "gp_timer", &clkev))
+               pr_err("Failed to request irq %d (gp_timer)\n", clkev.irq);
 
        __omap_dm_timer_int_enable(&clkev, OMAP_TIMER_INT_OVERFLOW);