ARM: OMAP: Sync core code with linux-omap

This patch syncs omap specific core code with linux-omap.
Most of the changes are needed to fix bitrot caused by
driver updates in linux-omap tree.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 67 insertions, 3 deletions

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index eeb33fed6f7c..2fac7d3f2af3 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -25,7 +25,71 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/menelaus.h>
 
-#if     defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
+#if     defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
+
+#include "../plat-omap/dsp/dsp_common.h"
+
+static struct dsp_platform_data dsp_pdata = {
+        .kdev_list = LIST_HEAD_INIT(dsp_pdata.kdev_list),
+};
+
+static struct resource omap_dsp_resources[] = {
+        {
+                .name   = "dsp_mmu",
+                .start  = -1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device omap_dsp_device = {
+        .name           = "dsp",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(omap_dsp_resources),
+        .resource       = omap_dsp_resources,
+        .dev = {
+                .platform_data = &dsp_pdata,
+        },
+};
+
+static inline void omap_init_dsp(void)
+{
+        struct resource *res;
+        int irq;
+
+        if (cpu_is_omap15xx())
+                irq = INT_1510_DSP_MMU;
+        else if (cpu_is_omap16xx())
+                irq = INT_1610_DSP_MMU;
+        else if (cpu_is_omap24xx())
+                irq = INT_24XX_DSP_MMU;
+
+        res = platform_get_resource_byname(&omap_dsp_device,
+                                           IORESOURCE_IRQ, "dsp_mmu");
+        res->start = irq;
+
+        platform_device_register(&omap_dsp_device);
+}
+
+int dsp_kfunc_device_register(struct dsp_kfunc_device *kdev)
+{
+        static DEFINE_MUTEX(dsp_pdata_lock);
+
+        mutex_init(&kdev->lock);
+
+        mutex_lock(&dsp_pdata_lock);
+        list_add_tail(&kdev->entry, &dsp_pdata.kdev_list);
+        mutex_unlock(&dsp_pdata_lock);
+
+        return 0;
+}
+EXPORT_SYMBOL(dsp_kfunc_device_register);
+
+#else
+static inline void omap_init_dsp(void) { }
+#endif  /* CONFIG_OMAP_DSP */
+
+/*-------------------------------------------------------------------------*/
+#if     defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
 
 #define OMAP1_I2C_BASE          0xfffb3800
 #define OMAP2_I2C_BASE1         0x48070000
@@ -376,7 +440,7 @@ static inline void omap_init_wdt(void) {}
 
 /*-------------------------------------------------------------------------*/
 
-#if     defined(CONFIG_OMAP_RNG) || defined(CONFIG_OMAP_RNG_MODULE)
+#if defined(CONFIG_HW_RANDOM_OMAP) || defined(CONFIG_HW_RANDOM_OMAP_MODULE)
 
 #ifdef CONFIG_ARCH_OMAP24XX
 #define OMAP_RNG_BASE           0x480A0000
@@ -436,6 +500,7 @@ static int __init omap_init_devices(void)
         /* please keep these calls, and their implementations above,
          * in alphabetical order so they're easier to sort through.
          */
+        omap_init_dsp();
         omap_init_i2c();
         omap_init_kp();
         omap_init_mmc();
@@ -446,4 +511,3 @@ static int __init omap_init_devices(void)
         return 0;
 }
 arch_initcall(omap_init_devices);
-