1 files changed, 47 insertions, 0 deletions

diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index 56c19319a7d2..36c528ff30f9 100644
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -25,6 +25,7 @@
 #include <mach/mux.h>
 #include <mach/edma.h>
 #include <mach/mmc.h>
+#include <mach/time.h>
 
 #define DAVINCI_I2C_BASE             0x01C21000
 #define DAVINCI_MMCSD0_BASE          0x01E10000
@@ -235,6 +236,52 @@ static void davinci_init_wdt(void)
 
 /*-------------------------------------------------------------------------*/
 
+struct davinci_timer_instance davinci_timer_instance[2] = {
+        {
+                .base           = IO_ADDRESS(DAVINCI_TIMER0_BASE),
+                .bottom_irq     = IRQ_TINT0_TINT12,
+                .top_irq        = IRQ_TINT0_TINT34,
+        },
+        {
+                .base           = IO_ADDRESS(DAVINCI_TIMER1_BASE),
+                .bottom_irq     = IRQ_TINT1_TINT12,
+                .top_irq        = IRQ_TINT1_TINT34,
+        },
+};
+
+/*-------------------------------------------------------------------------*/
+
+#if defined(CONFIG_TI_DAVINCI_EMAC) || defined(CONFIG_TI_DAVINCI_EMAC_MODULE)
+
+void davinci_init_emac(struct emac_platform_data *pdata)
+{
+        DECLARE_MAC_BUF(buf);
+
+        if (cpu_is_davinci_dm644x())
+                dm644x_init_emac(pdata);
+        else if (cpu_is_davinci_dm646x())
+                dm646x_init_emac(pdata);
+
+        /* if valid MAC exists, don't re-register */
+        if (is_valid_ether_addr(pdata->mac_addr))
+                return;
+        else {
+                /* Use random MAC if none passed */
+                random_ether_addr(pdata->mac_addr);
+
+                printk(KERN_WARNING "%s: using random MAC addr: %s\n",
+                       __func__, print_mac(buf, pdata->mac_addr));
+        }
+}
+
+#else
+
+void davinci_init_emac(struct emac_platform_data *unused) {}
+
+#endif
+
+/*-------------------------------------------------------------------------*/
+
 static int __init davinci_init_devices(void)
 {
         /* please keep these calls, and their implementations above,