Tegra: fdt: Remove memreserve line from Cardhu/Seaboard DT files

[u-boot] / board / davinci / dm365evm / dm365evm.c

diff --git a/board/davinci/dm365evm/dm365evm.c b/board/davinci/dm365evm/dm365evm.c
index 1e3a14f490d5c769ebe55fdf8f496f7740a50523..ac541062514a0d5ab18d34fc5957e5ffb65fd38e 100644 (file)
--- a/board/davinci/dm365evm/dm365evm.c
+++ b/board/davinci/dm365evm/dm365evm.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2009 Texas Instruments Incorporated
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,9 +22,13 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/emif_defs.h>
 #include <asm/arch/nand_defs.h>
-#include <asm/arch/gpio_defs.h>
+#include <asm/arch/gpio.h>
 #include <netdev.h>
-#include "../common/misc.h"
+#include <asm/arch/davinci_misc.h>
+#ifdef CONFIG_DAVINCI_MMC
+#include <mmc.h>
+#include <asm/arch/sdmmc_defs.h>
+#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -67,7 +72,7 @@ int board_eth_init(bd_t *bis)
 
        /* Read Ethernet MAC address from EEPROM */
        if (dvevm_read_mac_address(eeprom_enetaddr))
-               dv_configure_mac_address(eeprom_enetaddr);
+               davinci_sync_env_enetaddr(eeprom_enetaddr);
 
        davinci_emac_initialize();
 
@@ -100,3 +105,48 @@ int board_nand_init(struct nand_chip *nand)
        return 0;
 }
 #endif
+
+#ifdef CONFIG_DAVINCI_MMC
+static struct davinci_mmc mmc_sd0 = {
+       .reg_base       = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE,
+       .input_clk      = 121500000,
+       .host_caps      = MMC_MODE_4BIT,
+       .voltages       = MMC_VDD_32_33 | MMC_VDD_33_34,
+       .version        = MMC_CTLR_VERSION_2,
+};
+
+#ifdef CONFIG_DAVINCI_MMC_SD1
+static struct davinci_mmc mmc_sd1 = {
+       .reg_base       = (struct davinci_mmc_regs *)DAVINCI_MMC_SD1_BASE,
+       .input_clk      = 121500000,
+       .host_caps      = MMC_MODE_4BIT,
+       .voltages       = MMC_VDD_32_33 | MMC_VDD_33_34,
+       .version        = MMC_CTLR_VERSION_2,
+};
+#endif
+
+int board_mmc_init(bd_t *bis)
+{
+       int err;
+
+       /* Add slot-0 to mmc subsystem */
+       err = davinci_mmc_init(bis, &mmc_sd0);
+       if (err)
+               return err;
+
+#ifdef CONFIG_DAVINCI_MMC_SD1
+#define PUPDCTL1               0x01c4007c
+       /* PINMUX(4)-DAT0-3/CMD;  PINMUX(0)-CLK */
+       writel((readl(PINMUX4) | 0x55400000), PINMUX4);
+       writel((readl(PINMUX0) | 0x00010000), PINMUX0);
+
+       /* Configure MMC/SD pins as pullup */
+       writel((readl(PUPDCTL1) & ~0x07c0), PUPDCTL1);
+
+       /* Add slot-1 to mmc subsystem */
+       err = davinci_mmc_init(bis, &mmc_sd1);
+#endif
+
+       return err;
+}
+#endif