Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes

[pandora-kernel.git] / arch / arm / mach-ux500 / cpu-db8500.c

diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 1748fbc..516126c 100644 (file)
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -12,21 +12,21 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/amba/bus.h>
+#include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
 #include <asm/mach/map.h>
+#include <asm/pmu.h>
 #include <mach/hardware.h>
 #include <mach/setup.h>
 #include <mach/devices.h>
+#include <mach/usb.h>
 
 #include "devices-db8500.h"
-
-static struct platform_device *platform_devs[] __initdata = {
-       &u8500_dma40_device,
-};
+#include "ste-dma40-db8500.h"
 
 /* minimum static i/o mapping required to boot U8500 platforms */
 static struct map_desc u8500_uart_io_desc[] __initdata = {
@@ -89,6 +89,51 @@ void __init u8500_map_io(void)
                iotable_init(u8500_v2_io_desc, ARRAY_SIZE(u8500_v2_io_desc));
 }
 
+static struct resource db8500_pmu_resources[] = {
+       [0] = {
+               .start          = IRQ_DB8500_PMU,
+               .end            = IRQ_DB8500_PMU,
+               .flags          = IORESOURCE_IRQ,
+       },
+};
+
+/*
+ * The PMU IRQ lines of two cores are wired together into a single interrupt.
+ * Bounce the interrupt to the other core if it's not ours.
+ */
+static irqreturn_t db8500_pmu_handler(int irq, void *dev, irq_handler_t handler)
+{
+       irqreturn_t ret = handler(irq, dev);
+       int other = !smp_processor_id();
+
+       if (ret == IRQ_NONE && cpu_online(other))
+               irq_set_affinity(irq, cpumask_of(other));
+
+       /*
+        * We should be able to get away with the amount of IRQ_NONEs we give,
+        * while still having the spurious IRQ detection code kick in if the
+        * interrupt really starts hitting spuriously.
+        */
+       return ret;
+}
+
+static struct arm_pmu_platdata db8500_pmu_platdata = {
+       .handle_irq             = db8500_pmu_handler,
+};
+
+static struct platform_device db8500_pmu_device = {
+       .name                   = "arm-pmu",
+       .id                     = ARM_PMU_DEVICE_CPU,
+       .num_resources          = ARRAY_SIZE(db8500_pmu_resources),
+       .resource               = db8500_pmu_resources,
+       .dev.platform_data      = &db8500_pmu_platdata,
+};
+
+static struct platform_device *platform_devs[] __initdata = {
+       &u8500_dma40_device,
+       &db8500_pmu_device,
+};
+
 static resource_size_t __initdata db8500_gpio_base[] = {
        U8500_GPIOBANK0_BASE,
        U8500_GPIOBANK1_BASE,
@@ -111,6 +156,28 @@ static void __init db8500_add_gpios(void)
                         IRQ_DB8500_GPIO0, &pdata);
 }
 
+static int usb_db8500_rx_dma_cfg[] = {
+       DB8500_DMA_DEV38_USB_OTG_IEP_1_9,
+       DB8500_DMA_DEV37_USB_OTG_IEP_2_10,
+       DB8500_DMA_DEV36_USB_OTG_IEP_3_11,
+       DB8500_DMA_DEV19_USB_OTG_IEP_4_12,
+       DB8500_DMA_DEV18_USB_OTG_IEP_5_13,
+       DB8500_DMA_DEV17_USB_OTG_IEP_6_14,
+       DB8500_DMA_DEV16_USB_OTG_IEP_7_15,
+       DB8500_DMA_DEV39_USB_OTG_IEP_8
+};
+
+static int usb_db8500_tx_dma_cfg[] = {
+       DB8500_DMA_DEV38_USB_OTG_OEP_1_9,
+       DB8500_DMA_DEV37_USB_OTG_OEP_2_10,
+       DB8500_DMA_DEV36_USB_OTG_OEP_3_11,
+       DB8500_DMA_DEV19_USB_OTG_OEP_4_12,
+       DB8500_DMA_DEV18_USB_OTG_OEP_5_13,
+       DB8500_DMA_DEV17_USB_OTG_OEP_6_14,
+       DB8500_DMA_DEV16_USB_OTG_OEP_7_15,
+       DB8500_DMA_DEV39_USB_OTG_OEP_8
+};
+
 /*
  * This function is called from the board init
  */
@@ -121,6 +188,7 @@ void __init u8500_init_devices(void)
 
        db8500_add_rtc();
        db8500_add_gpios();
+       db8500_add_usb(usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg);
 
        platform_device_register_simple("cpufreq-u8500", -1, NULL, 0);
        platform_add_devices(platform_devs, ARRAY_SIZE(platform_devs));