Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[pandora-kernel.git] / arch / arm / plat-omap / include / plat / common.h

diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h
index abda2c7..3ff3e36 100644 (file)
--- a/arch/arm/plat-omap/include/plat/common.h
+++ b/arch/arm/plat-omap/include/plat/common.h
@@ -30,6 +30,7 @@
 #include <linux/delay.h>
 
 #include <plat/i2c.h>
+#include <plat/omap_hwmod.h>
 
 struct sys_timer;
 
@@ -50,10 +51,15 @@ void omap2430_init_early(void);
 void omap3430_init_early(void);
 void omap35xx_init_early(void);
 void omap3630_init_early(void);
+void omap3_init_early(void);   /* Do not use this one */
 void am35xx_init_early(void);
 void ti816x_init_early(void);
 void omap4430_init_early(void);
 
+extern int omap_dss_reset(struct omap_hwmod *);
+
+void omap_sram_init(void);
+
 /*
  * IO bases for various OMAP processors
  * Except the tap base, rest all the io bases
@@ -62,13 +68,13 @@ void omap4430_init_early(void);
 struct omap_globals {
        u32             class;          /* OMAP class to detect */
        void __iomem    *tap;           /* Control module ID code */
-       unsigned long   sdrc;           /* SDRAM Controller */
-       unsigned long   sms;            /* SDRAM Memory Scheduler */
-       unsigned long   ctrl;           /* System Control Module */
-       unsigned long   ctrl_pad;       /* PAD Control Module */
-       unsigned long   prm;            /* Power and Reset Management */
-       unsigned long   cm;             /* Clock Management */
-       unsigned long   cm2;
+       void __iomem    *sdrc;           /* SDRAM Controller */
+       void __iomem    *sms;            /* SDRAM Memory Scheduler */
+       void __iomem    *ctrl;           /* System Control Module */
+       void __iomem    *ctrl_pad;      /* PAD Control Module */
+       void __iomem    *prm;            /* Power and Reset Management */
+       void __iomem    *cm;             /* Clock Management */
+       void __iomem    *cm2;
 };
 
 void omap2_set_globals_242x(void);