DaVinci: rename setup_usb() to davinci_setup_usb()

[safe/jmp/linux-2.6] / arch / arm / mach-davinci / include / mach / common.h

diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h
index c00d375..6ca2c9a 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -17,12 +17,22 @@ struct sys_timer;
 extern struct sys_timer davinci_timer;
 
 extern void davinci_irq_init(void);
+extern void __iomem *davinci_intc_base;
+extern int davinci_intc_type;
 
-/* parameters describe VBUS sourcing for host mode */
-extern void setup_usb(unsigned mA, unsigned potpgt_msec);
+struct davinci_timer_instance {
+       void __iomem    *base;
+       u32             bottom_irq;
+       u32             top_irq;
+       unsigned long   cmp_off;
+       unsigned int    cmp_irq;
+};
 
-/* parameters describe VBUS sourcing for host mode */
-extern void setup_usb(unsigned mA, unsigned potpgt_msec);
+struct davinci_timer_info {
+       struct davinci_timer_instance   *timers;
+       unsigned int                    clockevent_id;
+       unsigned int                    clocksource_id;
+};
 
 /* SoC specific init support */
 struct davinci_soc_info {
@@ -39,10 +49,27 @@ struct davinci_soc_info {
        void __iomem                    *pinmux_base;
        const struct mux_config         *pinmux_pins;
        unsigned long                   pinmux_pins_num;
+       void __iomem                    *intc_base;
+       int                             intc_type;
+       u8                              *intc_irq_prios;
+       unsigned long                   intc_irq_num;
+       struct davinci_timer_info       *timer_info;
+       void __iomem                    *gpio_base;
+       unsigned                        gpio_num;
+       unsigned                        gpio_irq;
+       unsigned                        gpio_unbanked;
+       struct platform_device          *serial_dev;
+       struct emac_platform_data       *emac_pdata;
+       dma_addr_t                      sram_dma;
+       unsigned                        sram_len;
 };
 
 extern struct davinci_soc_info davinci_soc_info;
 
 extern void davinci_common_init(struct davinci_soc_info *soc_info);
 
+/* standard place to map on-chip SRAMs; they *may* support DMA */
+#define SRAM_VIRT      0xfffe0000
+#define SRAM_SIZE      SZ_128K
+
 #endif /* __ARCH_ARM_MACH_DAVINCI_COMMON_H */