Merge branch 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git] / arch / arm / mach-ep93xx / core.c
index f831f74..a87a784 100644 (file)
@@ -13,7 +13,6 @@
  * your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
@@ -30,7 +29,9 @@
 #include <linux/time.h>
 #include <linux/timex.h>
 #include <linux/delay.h>
+#include <linux/termios.h>
 #include <linux/amba/bus.h>
+#include <linux/amba/serial.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -45,6 +46,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
+#include <asm/arch/gpio.h>
 
 #include <asm/hardware/vic.h>
 
@@ -100,7 +102,8 @@ static int ep93xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        write_seqlock(&xtime_lock);
 
        __raw_writel(1, EP93XX_TIMER1_CLEAR);
-       while (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time
+       while ((signed long)
+               (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time)
                                                >= TIMER4_TICKS_PER_JIFFY) {
                last_jiffy_time += TIMER4_TICKS_PER_JIFFY;
                timer_tick(regs);
@@ -113,7 +116,7 @@ static int ep93xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 static struct irqaction ep93xx_timer_irq = {
        .name           = "ep93xx timer",
-       .flags          = SA_INTERRUPT | SA_TIMER,
+       .flags          = IRQF_DISABLED | IRQF_TIMER,
        .handler        = ep93xx_timer_interrupt,
 };
 
@@ -121,7 +124,7 @@ static void __init ep93xx_timer_init(void)
 {
        /* Enable periodic HZ timer.  */
        __raw_writel(0x48, EP93XX_TIMER1_CONTROL);
-       __raw_writel((508000 / HZ) - 1, EP93XX_TIMER1_LOAD);
+       __raw_writel((508469 / HZ) - 1, EP93XX_TIMER1_LOAD);
        __raw_writel(0xc8, EP93XX_TIMER1_CONTROL);
 
        /* Enable lost jiffy timer.  */
@@ -146,23 +149,320 @@ struct sys_timer ep93xx_timer = {
 };
 
 
+/*************************************************************************
+ * GPIO handling for EP93xx
+ *************************************************************************/
+static unsigned char gpio_int_enable[2];
+static unsigned char gpio_int_type1[2];
+static unsigned char gpio_int_type2[2];
+
+static void update_gpio_ab_int_params(int port)
+{
+       if (port == 0) {
+               __raw_writeb(0, EP93XX_GPIO_A_INT_ENABLE);
+               __raw_writeb(gpio_int_type2[0], EP93XX_GPIO_A_INT_TYPE2);
+               __raw_writeb(gpio_int_type1[0], EP93XX_GPIO_A_INT_TYPE1);
+               __raw_writeb(gpio_int_enable[0], EP93XX_GPIO_A_INT_ENABLE);
+       } else if (port == 1) {
+               __raw_writeb(0, EP93XX_GPIO_B_INT_ENABLE);
+               __raw_writeb(gpio_int_type2[1], EP93XX_GPIO_B_INT_TYPE2);
+               __raw_writeb(gpio_int_type1[1], EP93XX_GPIO_B_INT_TYPE1);
+               __raw_writeb(gpio_int_enable[1], EP93XX_GPIO_B_INT_ENABLE);
+       }
+}
+
+
+static unsigned char data_register_offset[8] = {
+       0x00, 0x04, 0x08, 0x0c, 0x20, 0x30, 0x38, 0x40,
+};
+
+static unsigned char data_direction_register_offset[8] = {
+       0x10, 0x14, 0x18, 0x1c, 0x24, 0x34, 0x3c, 0x44,
+};
+
+void gpio_line_config(int line, int direction)
+{
+       unsigned int data_direction_register;
+       unsigned long flags;
+       unsigned char v;
+
+       data_direction_register =
+               EP93XX_GPIO_REG(data_direction_register_offset[line >> 3]);
+
+       local_irq_save(flags);
+       if (direction == GPIO_OUT) {
+               if (line >= 0 && line < 16) {
+                       gpio_int_enable[line >> 3] &= ~(1 << (line & 7));
+                       update_gpio_ab_int_params(line >> 3);
+               }
+
+               v = __raw_readb(data_direction_register);
+               v |= 1 << (line & 7);
+               __raw_writeb(v, data_direction_register);
+       } else if (direction == GPIO_IN) {
+               v = __raw_readb(data_direction_register);
+               v &= ~(1 << (line & 7));
+               __raw_writeb(v, data_direction_register);
+       }
+       local_irq_restore(flags);
+}
+EXPORT_SYMBOL(gpio_line_config);
+
+int gpio_line_get(int line)
+{
+       unsigned int data_register;
+
+       data_register = EP93XX_GPIO_REG(data_register_offset[line >> 3]);
+
+       return !!(__raw_readb(data_register) & (1 << (line & 7)));
+}
+EXPORT_SYMBOL(gpio_line_get);
+
+void gpio_line_set(int line, int value)
+{
+       unsigned int data_register;
+       unsigned long flags;
+       unsigned char v;
+
+       data_register = EP93XX_GPIO_REG(data_register_offset[line >> 3]);
+
+       local_irq_save(flags);
+       if (value == EP93XX_GPIO_HIGH) {
+               v = __raw_readb(data_register);
+               v |= 1 << (line & 7);
+               __raw_writeb(v, data_register);
+       } else if (value == EP93XX_GPIO_LOW) {
+               v = __raw_readb(data_register);
+               v &= ~(1 << (line & 7));
+               __raw_writeb(v, data_register);
+       }
+       local_irq_restore(flags);
+}
+EXPORT_SYMBOL(gpio_line_set);
+
+
 /*************************************************************************
  * EP93xx IRQ handling
  *************************************************************************/
+static void ep93xx_gpio_ab_irq_handler(unsigned int irq,
+               struct irqdesc *desc, struct pt_regs *regs)
+{
+       unsigned char status;
+       int i;
+
+       status = __raw_readb(EP93XX_GPIO_A_INT_STATUS);
+       for (i = 0; i < 8; i++) {
+               if (status & (1 << i)) {
+                       desc = irq_desc + IRQ_EP93XX_GPIO(0) + i;
+                       desc_handle_irq(IRQ_EP93XX_GPIO(0) + i, desc, regs);
+               }
+       }
+
+       status = __raw_readb(EP93XX_GPIO_B_INT_STATUS);
+       for (i = 0; i < 8; i++) {
+               if (status & (1 << i)) {
+                       desc = irq_desc + IRQ_EP93XX_GPIO(8) + i;
+                       desc_handle_irq(IRQ_EP93XX_GPIO(8) + i, desc, regs);
+               }
+       }
+}
+
+static void ep93xx_gpio_ab_irq_mask_ack(unsigned int irq)
+{
+       int line = irq - IRQ_EP93XX_GPIO(0);
+       int port = line >> 3;
+
+       gpio_int_enable[port] &= ~(1 << (line & 7));
+       update_gpio_ab_int_params(port);
+
+       if (line >> 3) {
+               __raw_writel(1 << (line & 7), EP93XX_GPIO_B_INT_ACK);
+       } else {
+               __raw_writel(1 << (line & 7), EP93XX_GPIO_A_INT_ACK);
+       }
+}
+
+static void ep93xx_gpio_ab_irq_mask(unsigned int irq)
+{
+       int line = irq - IRQ_EP93XX_GPIO(0);
+       int port = line >> 3;
+
+       gpio_int_enable[port] &= ~(1 << (line & 7));
+       update_gpio_ab_int_params(port);
+}
+
+static void ep93xx_gpio_ab_irq_unmask(unsigned int irq)
+{
+       int line = irq - IRQ_EP93XX_GPIO(0);
+       int port = line >> 3;
+
+       gpio_int_enable[port] |= 1 << (line & 7);
+       update_gpio_ab_int_params(port);
+}
+
+
+/*
+ * gpio_int_type1 controls whether the interrupt is level (0) or
+ * edge (1) triggered, while gpio_int_type2 controls whether it
+ * triggers on low/falling (0) or high/rising (1).
+ */
+static int ep93xx_gpio_ab_irq_type(unsigned int irq, unsigned int type)
+{
+       int port;
+       int line;
+
+       line = irq - IRQ_EP93XX_GPIO(0);
+       gpio_line_config(line, GPIO_IN);
+
+       port = line >> 3;
+       line &= 7;
+
+       if (type & IRQT_RISING) {
+               gpio_int_type1[port] |= 1 << line;
+               gpio_int_type2[port] |= 1 << line;
+       } else if (type & IRQT_FALLING) {
+               gpio_int_type1[port] |= 1 << line;
+               gpio_int_type2[port] &= ~(1 << line);
+       } else if (type & IRQT_HIGH) {
+               gpio_int_type1[port] &= ~(1 << line);
+               gpio_int_type2[port] |= 1 << line;
+       } else if (type & IRQT_LOW) {
+               gpio_int_type1[port] &= ~(1 << line);
+               gpio_int_type2[port] &= ~(1 << line);
+       }
+       update_gpio_ab_int_params(port);
+
+       return 0;
+}
+
+static struct irqchip ep93xx_gpio_ab_irq_chip = {
+       .ack            = ep93xx_gpio_ab_irq_mask_ack,
+       .mask           = ep93xx_gpio_ab_irq_mask,
+       .unmask         = ep93xx_gpio_ab_irq_unmask,
+       .set_type       = ep93xx_gpio_ab_irq_type,
+};
+
+
 void __init ep93xx_init_irq(void)
 {
+       int irq;
+
        vic_init((void *)EP93XX_VIC1_BASE, 0, EP93XX_VIC1_VALID_IRQ_MASK);
        vic_init((void *)EP93XX_VIC2_BASE, 32, EP93XX_VIC2_VALID_IRQ_MASK);
+
+       for (irq = IRQ_EP93XX_GPIO(0) ; irq <= IRQ_EP93XX_GPIO(15); irq++) {
+               set_irq_chip(irq, &ep93xx_gpio_ab_irq_chip);
+               set_irq_handler(irq, do_level_IRQ);
+               set_irq_flags(irq, IRQF_VALID);
+       }
+       set_irq_chained_handler(IRQ_EP93XX_GPIO_AB, ep93xx_gpio_ab_irq_handler);
 }
 
 
 /*************************************************************************
  * EP93xx peripheral handling
  *************************************************************************/
+#define EP93XX_UART_MCR_OFFSET         (0x0100)
+
+static void ep93xx_uart_set_mctrl(struct amba_device *dev,
+                                 void __iomem *base, unsigned int mctrl)
+{
+       unsigned int mcr;
+
+       mcr = 0;
+       if (!(mctrl & TIOCM_RTS))
+               mcr |= 2;
+       if (!(mctrl & TIOCM_DTR))
+               mcr |= 1;
+
+       __raw_writel(mcr, base + EP93XX_UART_MCR_OFFSET);
+}
+
+static struct amba_pl010_data ep93xx_uart_data = {
+       .set_mctrl      = ep93xx_uart_set_mctrl,
+};
+
+static struct amba_device uart1_device = {
+       .dev            = {
+               .bus_id         = "apb:uart1",
+               .platform_data  = &ep93xx_uart_data,
+       },
+       .res            = {
+               .start  = EP93XX_UART1_PHYS_BASE,
+               .end    = EP93XX_UART1_PHYS_BASE + 0x0fff,
+               .flags  = IORESOURCE_MEM,
+       },
+       .irq            = { IRQ_EP93XX_UART1, NO_IRQ },
+       .periphid       = 0x00041010,
+};
+
+static struct amba_device uart2_device = {
+       .dev            = {
+               .bus_id         = "apb:uart2",
+               .platform_data  = &ep93xx_uart_data,
+       },
+       .res            = {
+               .start  = EP93XX_UART2_PHYS_BASE,
+               .end    = EP93XX_UART2_PHYS_BASE + 0x0fff,
+               .flags  = IORESOURCE_MEM,
+       },
+       .irq            = { IRQ_EP93XX_UART2, NO_IRQ },
+       .periphid       = 0x00041010,
+};
+
+static struct amba_device uart3_device = {
+       .dev            = {
+               .bus_id         = "apb:uart3",
+               .platform_data  = &ep93xx_uart_data,
+       },
+       .res            = {
+               .start  = EP93XX_UART3_PHYS_BASE,
+               .end    = EP93XX_UART3_PHYS_BASE + 0x0fff,
+               .flags  = IORESOURCE_MEM,
+       },
+       .irq            = { IRQ_EP93XX_UART3, NO_IRQ },
+       .periphid       = 0x00041010,
+};
+
+
+static struct platform_device ep93xx_rtc_device = {
+       .name           = "ep93xx-rtc",
+       .id             = -1,
+       .num_resources  = 0,
+};
+
+
+static struct resource ep93xx_ohci_resources[] = {
+       [0] = {
+               .start  = EP93XX_USB_PHYS_BASE,
+               .end    = EP93XX_USB_PHYS_BASE + 0x0fff,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = IRQ_EP93XX_USB,
+               .end    = IRQ_EP93XX_USB,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device ep93xx_ohci_device = {
+       .name           = "ep93xx-ohci",
+       .id             = -1,
+       .dev            = {
+               .dma_mask               = (void *)0xffffffff,
+               .coherent_dma_mask      = 0xffffffff,
+       },
+       .num_resources  = ARRAY_SIZE(ep93xx_ohci_resources),
+       .resource       = ep93xx_ohci_resources,
+};
+
+
 void __init ep93xx_init_devices(void)
 {
        unsigned int v;
 
+       ep93xx_clock_init();
+
        /*
         * Disallow access to MaverickCrunch initially.
         */
@@ -170,4 +470,11 @@ void __init ep93xx_init_devices(void)
        v &= ~EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE;
        __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK);
        __raw_writel(v, EP93XX_SYSCON_DEVICE_CONFIG);
+
+       amba_device_register(&uart1_device, &iomem_resource);
+       amba_device_register(&uart2_device, &iomem_resource);
+       amba_device_register(&uart3_device, &iomem_resource);
+
+       platform_device_register(&ep93xx_rtc_device);
+       platform_device_register(&ep93xx_ohci_device);
 }