Merge branch 'x86/asm' into x86/urgent

[mv-sheeva.git] / arch / arm / mach-nomadik / cpu-8815.c

diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
index dec42da6956ae5312bf8c648210c1b9094b4d000..f93c596341914f48954d35e04dd2cbc384814e54 100644 (file)
--- a/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -19,12 +19,90 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/amba/bus.h>
+#include <linux/gpio.h>
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <asm/mach/map.h>
 #include <asm/hardware/vic.h>
 
+#include <asm/cacheflush.h>
+#include <asm/hardware/cache-l2x0.h>
+
+/* The 8815 has 4 GPIO blocks, let's register them immediately */
+static struct nmk_gpio_platform_data cpu8815_gpio[] = {
+       {
+               .name = "GPIO-0-31",
+               .first_gpio = 0,
+               .first_irq = NOMADIK_GPIO_TO_IRQ(0),
+               .parent_irq = IRQ_GPIO0,
+       }, {
+               .name = "GPIO-32-63",
+               .first_gpio = 32,
+               .first_irq = NOMADIK_GPIO_TO_IRQ(32),
+               .parent_irq = IRQ_GPIO1,
+       }, {
+               .name = "GPIO-64-95",
+               .first_gpio = 64,
+               .first_irq = NOMADIK_GPIO_TO_IRQ(64),
+               .parent_irq = IRQ_GPIO2,
+       }, {
+               .name = "GPIO-96-127", /* 124..127 not routed to pin */
+               .first_gpio = 96,
+               .first_irq = NOMADIK_GPIO_TO_IRQ(96),
+               .parent_irq = IRQ_GPIO3,
+       }
+};
+
+#define __MEM_4K_RESOURCE(x) \
+       .res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM}
+
+static struct amba_device cpu8815_amba_gpio[] = {
+       {
+               .dev = {
+                       .init_name = "gpio0",
+                       .platform_data = cpu8815_gpio + 0,
+               },
+               __MEM_4K_RESOURCE(NOMADIK_GPIO0_BASE),
+       }, {
+               .dev = {
+                       .init_name = "gpio1",
+                       .platform_data = cpu8815_gpio + 1,
+               },
+               __MEM_4K_RESOURCE(NOMADIK_GPIO1_BASE),
+       }, {
+               .dev = {
+                       .init_name = "gpio2",
+                       .platform_data = cpu8815_gpio + 2,
+               },
+               __MEM_4K_RESOURCE(NOMADIK_GPIO2_BASE),
+       }, {
+               .dev = {
+                       .init_name = "gpio3",
+                       .platform_data = cpu8815_gpio + 3,
+               },
+               __MEM_4K_RESOURCE(NOMADIK_GPIO3_BASE),
+       },
+};
+
+static struct amba_device *amba_devs[] __initdata = {
+       cpu8815_amba_gpio + 0,
+       cpu8815_amba_gpio + 1,
+       cpu8815_amba_gpio + 2,
+       cpu8815_amba_gpio + 3,
+};
+
+static int __init cpu8815_init(void)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(amba_devs); i++)
+               amba_device_register(amba_devs[i], &iomem_resource);
+       return 0;
+}
+arch_initcall(cpu8815_init);
+
 /* All SoC devices live in the same area (see hardware.h) */
 static struct map_desc nomadik_io_desc[] __initdata = {
        {
@@ -50,9 +128,12 @@ void __init cpu8815_init_irq(void)
 
 /*
  * This function is called from the board init ("init_machine").
- * Currently nothing is done as we can't register amba devs so early.
  */
  void __init cpu8815_platform_init(void)
 {
+#ifdef CONFIG_CACHE_L2X0
+       /* At full speed latency must be >=2, so 0x249 in low bits */
+       l2x0_init(io_p2v(NOMADIK_L2CC_BASE), 0x00730249, 0xfe000fff);
+#endif
         return;
 }