Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
[pandora-kernel.git] / arch / arm / plat-omap / devices.c
index 95677d1..1e2383e 100644 (file)
 #include <asm/mach/map.h>
 
 #include <plat/tc.h>
-#include <plat/control.h>
 #include <plat/board.h>
 #include <plat/mmc.h>
-#include <plat/mux.h>
 #include <mach/gpio.h>
 #include <plat/menelaus.h>
 #include <plat/mcbsp.h>
-#include <plat/dsp_common.h>
 #include <plat/omap44xx.h>
 
-#if    defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-
-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);
-
-       spin_lock_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_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)
 
-static void omap_init_kp(void)
-{
-       /* 2430 and 34xx keypad is on TWL4030 */
-       if (cpu_is_omap2430() || cpu_is_omap34xx())
-               return;
-
-       if (machine_is_omap_h2() || machine_is_omap_h3()) {
-               omap_cfg_reg(F18_1610_KBC0);
-               omap_cfg_reg(D20_1610_KBC1);
-               omap_cfg_reg(D19_1610_KBC2);
-               omap_cfg_reg(E18_1610_KBC3);
-               omap_cfg_reg(C21_1610_KBC4);
-
-               omap_cfg_reg(G18_1610_KBR0);
-               omap_cfg_reg(F19_1610_KBR1);
-               omap_cfg_reg(H14_1610_KBR2);
-               omap_cfg_reg(E20_1610_KBR3);
-               omap_cfg_reg(E19_1610_KBR4);
-               omap_cfg_reg(N19_1610_KBR5);
-       } else if (machine_is_omap_perseus2() || machine_is_omap_fsample()) {
-               omap_cfg_reg(E2_7XX_KBR0);
-               omap_cfg_reg(J7_7XX_KBR1);
-               omap_cfg_reg(E1_7XX_KBR2);
-               omap_cfg_reg(F3_7XX_KBR3);
-               omap_cfg_reg(D2_7XX_KBR4);
-
-               omap_cfg_reg(C2_7XX_KBC0);
-               omap_cfg_reg(D3_7XX_KBC1);
-               omap_cfg_reg(E4_7XX_KBC2);
-               omap_cfg_reg(F4_7XX_KBC3);
-               omap_cfg_reg(E3_7XX_KBC4);
-       } else if (machine_is_omap_h4()) {
-               omap_cfg_reg(T19_24XX_KBR0);
-               omap_cfg_reg(R19_24XX_KBR1);
-               omap_cfg_reg(V18_24XX_KBR2);
-               omap_cfg_reg(M21_24XX_KBR3);
-               omap_cfg_reg(E5__24XX_KBR4);
-               if (omap_has_menelaus()) {
-                       omap_cfg_reg(B3__24XX_KBR5);
-                       omap_cfg_reg(AA4_24XX_KBC2);
-                       omap_cfg_reg(B13_24XX_KBC6);
-               } else {
-                       omap_cfg_reg(M18_24XX_KBR5);
-                       omap_cfg_reg(H19_24XX_KBC2);
-                       omap_cfg_reg(N19_24XX_KBC6);
-               }
-               omap_cfg_reg(R20_24XX_KBC0);
-               omap_cfg_reg(M14_24XX_KBC1);
-               omap_cfg_reg(V17_24XX_KBC3);
-               omap_cfg_reg(P21_24XX_KBC4);
-               omap_cfg_reg(L14_24XX_KBC5);
-       }
-}
-#else
-static inline void omap_init_kp(void) {}
-#endif
-
-/*-------------------------------------------------------------------------*/
 #if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
 
 static struct platform_device **omap_mcbsp_devices;
@@ -354,46 +231,6 @@ static void omap_init_uwire(void)
 static inline void omap_init_uwire(void) {}
 #endif
 
-/*-------------------------------------------------------------------------*/
-
-#if    defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)
-
-static struct resource wdt_resources[] = {
-       {
-               .flags          = IORESOURCE_MEM,
-       },
-};
-
-static struct platform_device omap_wdt_device = {
-       .name      = "omap_wdt",
-       .id          = -1,
-       .num_resources  = ARRAY_SIZE(wdt_resources),
-       .resource       = wdt_resources,
-};
-
-static void omap_init_wdt(void)
-{
-       if (cpu_is_omap16xx())
-               wdt_resources[0].start = 0xfffeb000;
-       else if (cpu_is_omap2420())
-               wdt_resources[0].start = 0x48022000; /* WDT2 */
-       else if (cpu_is_omap2430())
-               wdt_resources[0].start = 0x49016000; /* WDT2 */
-       else if (cpu_is_omap343x())
-               wdt_resources[0].start = 0x48314000; /* WDT2 */
-       else if (cpu_is_omap44xx())
-               wdt_resources[0].start = 0x4a314000;
-       else
-               return;
-
-       wdt_resources[0].end = wdt_resources[0].start + 0x4f;
-
-       (void) platform_device_register(&omap_wdt_device);
-}
-#else
-static inline void omap_init_wdt(void) {}
-#endif
-
 /*
  * This gets called after board-specific INIT_MACHINE, and initializes most
  * on-chip peripherals accessible on this board (except for few like USB):
@@ -419,12 +256,9 @@ 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_kp();
        omap_init_rng();
        omap_init_mcpdm();
        omap_init_uwire();
-       omap_init_wdt();
        return 0;
 }
 arch_initcall(omap_init_devices);