linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / mach-integrator / core.c

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 42021fd..20071a2 100644 (file)
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -13,12 +13,9 @@
 #include <linux/device.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
-#include <linux/irq.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
-#include <linux/termios.h>
 #include <linux/amba/bus.h>
-#include <linux/amba/serial.h>
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
@@ -31,8 +28,6 @@
 
 #include "common.h"
 
-static struct amba_pl010_data integrator_uart_data;
-
 static struct amba_device rtc_device = {
        .dev            = {
                .bus_id = "mb:15",
@@ -49,7 +44,6 @@ static struct amba_device rtc_device = {
 static struct amba_device uart0_device = {
        .dev            = {
                .bus_id = "mb:16",
-               .platform_data = &integrator_uart_data,
        },
        .res            = {
                .start  = INTEGRATOR_UART0_BASE,
@@ -63,7 +57,6 @@ static struct amba_device uart0_device = {
 static struct amba_device uart1_device = {
        .dev            = {
                .bus_id = "mb:17",
-               .platform_data = &integrator_uart_data,
        },
        .res            = {
                .start  = INTEGRATOR_UART1_BASE,
@@ -122,46 +115,6 @@ static int __init integrator_init(void)
 
 arch_initcall(integrator_init);
 
-/*
- * On the Integrator platform, the port RTS and DTR are provided by
- * bits in the following SC_CTRLS register bits:
- *        RTS  DTR
- *  UART0  7    6
- *  UART1  5    4
- */
-#define SC_CTRLC       (IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLC_OFFSET)
-#define SC_CTRLS       (IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLS_OFFSET)
-
-static void integrator_uart_set_mctrl(struct amba_device *dev, void __iomem *base, unsigned int mctrl)
-{
-       unsigned int ctrls = 0, ctrlc = 0, rts_mask, dtr_mask;
-
-       if (dev == &uart0_device) {
-               rts_mask = 1 << 4;
-               dtr_mask = 1 << 5;
-       } else {
-               rts_mask = 1 << 6;
-               dtr_mask = 1 << 7;
-       }
-
-       if (mctrl & TIOCM_RTS)
-               ctrlc |= rts_mask;
-       else
-               ctrls |= rts_mask;
-
-       if (mctrl & TIOCM_DTR)
-               ctrlc |= dtr_mask;
-       else
-               ctrls |= dtr_mask;
-
-       __raw_writel(ctrls, SC_CTRLS);
-       __raw_writel(ctrlc, SC_CTRLC);
-}
-
-static struct amba_pl010_data integrator_uart_data = {
-       .set_mctrl = integrator_uart_set_mctrl,
-};
-
 #define CM_CTRL        IO_ADDRESS(INTEGRATOR_HDR_BASE) + INTEGRATOR_HDR_CTRL_OFFSET
 
 static DEFINE_SPINLOCK(cm_lock);
@@ -282,7 +235,7 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction integrator_timer_irq = {
        .name           = "Integrator Timer Tick",
-       .flags          = IRQF_DISABLED | IRQF_TIMER,
+       .flags          = SA_INTERRUPT | SA_TIMER,
        .handler        = integrator_timer_interrupt,
 };