env: Move env_set() to env.h
[oweals/u-boot.git] / board / ti / ti816x / evm.c
index b6bf16236f408aadc2003fcc880a747c608c5f6f..de9e91a685b9f22aadaeab1ece2223ed4fae3013 100644 (file)
@@ -1,13 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * evm.c
  *
  * Copyright (C) 2013, Adeneo Embedded <www.adeneo-embedded.com>
  * Antoine Tenart, <atenart@adeneo-embedded.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <env.h>
+#include <environment.h>
 #include <spl.h>
 #include <asm/cache.h>
 #include <asm/io.h>
@@ -24,12 +25,41 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-       gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
+       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+#if defined(CONFIG_NAND)
+       gpmc_init();
+#endif
        return 0;
 }
 
-#ifdef CONFIG_SPL_BUILD
+int board_eth_init(bd_t *bis)
+{
+       uint8_t mac_addr[6];
+       uint32_t mac_hi, mac_lo;
+       struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
+
+       if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
+               printf("<ethaddr> not set. Reading from E-fuse\n");
+               /* try reading mac address from efuse */
+               mac_lo = readl(&cdev->macid0l);
+               mac_hi = readl(&cdev->macid0h);
+               mac_addr[0] = mac_hi & 0xFF;
+               mac_addr[1] = (mac_hi & 0xFF00) >> 8;
+               mac_addr[2] = (mac_hi & 0xFF0000) >> 16;
+               mac_addr[3] = (mac_hi & 0xFF000000) >> 24;
+               mac_addr[4] = mac_lo & 0xFF;
+               mac_addr[5] = (mac_lo & 0xFF00) >> 8;
+
+               if (is_valid_ethaddr(mac_addr))
+                       eth_env_set_enetaddr("ethaddr", mac_addr);
+               else
+                       printf("Unable to read MAC address. Set <ethaddr>\n");
+       }
 
+       return 0;
+}
+
+#ifdef CONFIG_SPL_BUILD
 static struct module_pin_mux mmc_pin_mux[] = {
        { OFFSET(pincntl157), PULLDOWN_EN | PULLUDDIS | MODE(0x0) },
        { OFFSET(pincntl158), PULLDOWN_EN | PULLUDEN | MODE(0x0) },
@@ -41,176 +71,68 @@ static struct module_pin_mux mmc_pin_mux[] = {
        { -1 },
 };
 
-const struct dmm_lisa_map_regs evm_lisa_map_regs = {
-       .dmm_lisa_map_0 = 0x00000000,
-       .dmm_lisa_map_1 = 0x00000000,
-       .dmm_lisa_map_2 = 0x80640300,
-       .dmm_lisa_map_3 = 0xC0640320,
-};
-
-/*
- * DDR2 related definitions
- */
-#ifdef CONFIG_TI816X_EVM_DDR2
-static struct ddr_data ddr2_data = {
-       .datardsratio0          = ((0x40<<10) | (0x40<<0)),
-       .datawdsratio0          = ((0x4A<<10) | (0x4A<<0)),
-       .datawiratio0           = ((0x0<<10) | (0x0<<0)),
-       .datagiratio0           = ((0x0<<10) | (0x0<<0)),
-       .datafwsratio0          = ((0x13A<<10) | (0x13A<<0)),
-       .datawrsratio0          = ((0x8A<<10) | (0x8A<<0)),
-};
-
-static struct cmd_control ddr2_ctrl = {
-       .cmd0csratio    = 0x80,
-       .cmd0iclkout    = 0x00,
-
-       .cmd1csratio    = 0x80,
-       .cmd1iclkout    = 0x00,
-
-       .cmd2csratio    = 0x80,
-       .cmd2iclkout    = 0x00,
-
-};
-
-static struct emif_regs ddr2_emif0_regs = {
-       .sdram_config           = 0x43801A3A,
-       .ref_ctrl               = 0x10000C30,
-       .sdram_tim1             = 0x0AAB15E2,
-       .sdram_tim2             = 0x423631D2,
-       .sdram_tim3             = 0x0080032F,
-       .emif_ddr_phy_ctlr_1    = 0x0, /* depend on cpu rev, set later */
-};
+void set_uart_mux_conf(void) {}
 
-static struct emif_regs ddr2_emif1_regs = {
-       .sdram_config           = 0x43801A3A,
-       .ref_ctrl               = 0x10000C30,
-       .sdram_tim1             = 0x0AAB15E2,
-       .sdram_tim2             = 0x423631D2,
-       .sdram_tim3             = 0x0080032F,
-       .emif_ddr_phy_ctlr_1    = 0x0, /* depend on cpu rev, set later */
-};
-#endif
+void set_mux_conf_regs(void)
+{
+       configure_module_pin_mux(mmc_pin_mux);
+}
 
 /*
- * DDR3 related definitions
+ * EMIF Paramters.  Refer the EMIF register documentation and the
+ * memory datasheet for details.  This is for 796 MHz.
  */
-
-#if defined(CONFIG_TI816X_DDR_PLL_400)
-#define RD_DQS         0x03B
-#define WR_DQS         0x0A6
-#define RD_DQS_GATE    0x12A
-#define EMIF_SDCFG     0x62A41032
-#define EMIF_SDREF     0x10000C30
-#define EMIF_TIM1      0x0CCCE524
-#define EMIF_TIM2      0x30308023
-#define EMIF_TIM3      0x009F82CF
-#define EMIF_PHYCFG    0x0000010B
-#elif defined(CONFIG_TI816X_DDR_PLL_531)
-#define RD_DQS         0x039
-#define WR_DQS         0x0B4
-#define RD_DQS_GATE    0x13D
-#define EMIF_SDCFG     0x62A51832
-#define EMIF_SDREF     0x1000102E
-#define EMIF_TIM1      0x0EF136AC
-#define EMIF_TIM2      0x30408063
-#define EMIF_TIM3      0x009F83AF
-#define EMIF_PHYCFG    0x0000010C
-#elif defined(CONFIG_TI816X_DDR_PLL_675)
-#define RD_DQS         0x039
-#define WR_DQS         0x091
-#define RD_DQS_GATE    0x196
-#define EMIF_SDCFG     0x62A63032
-#define EMIF_SDREF     0x10001491
-#define EMIF_TIM1      0x13358875
-#define EMIF_TIM2      0x5051806C
-#define EMIF_TIM3      0x009F84AF
-#define EMIF_PHYCFG    0x0000010F
-#elif defined(CONFIG_TI816X_DDR_PLL_796)
-#define RD_DQS         0x035
-#define WR_DQS         0x093
-#define RD_DQS_GATE    0x1B3
-#define EMIF_SDCFG     0x62A73832
-#define EMIF_SDREF     0x10001841
-#define EMIF_TIM1      0x1779C9FE
-#define EMIF_TIM2      0x50608074
-#define EMIF_TIM3      0x009F857F
-#define EMIF_PHYCFG    0x00000110
-#endif
-
-static struct ddr_data ddr3_data = {
-       .datardsratio0          = ((RD_DQS<<10) | (RD_DQS<<0)),
-       .datawdsratio0          = ((WR_DQS<<10) | (WR_DQS<<0)),
-       .datawiratio0           = ((0x20<<10) | 0x20<<0),
-       .datagiratio0           = ((0x20<<10) | 0x20<<0),
-       .datafwsratio0          = ((RD_DQS_GATE<<10) | (RD_DQS_GATE<<0)),
-       .datawrsratio0          = (((WR_DQS+0x40)<<10) | ((WR_DQS+0x40)<<0)),
+#define EMIF_TIM1   0x1779C9FE
+#define EMIF_TIM2   0x50608074
+#define EMIF_TIM3   0x009F857F
+#define EMIF_SDREF  0x10001841
+#define EMIF_SDCFG  0x62A73832
+#define EMIF_PHYCFG 0x00000110
+static const struct emif_regs ddr3_emif_regs = {
+       .sdram_config           = EMIF_SDCFG,
+       .ref_ctrl               = EMIF_SDREF,
+       .sdram_tim1             = EMIF_TIM1,
+       .sdram_tim2             = EMIF_TIM2,
+       .sdram_tim3             = EMIF_TIM3,
+       .emif_ddr_phy_ctlr_1    = EMIF_PHYCFG,
 };
 
 static const struct cmd_control ddr3_ctrl = {
        .cmd0csratio    = 0x100,
        .cmd0iclkout    = 0x001,
-
        .cmd1csratio    = 0x100,
        .cmd1iclkout    = 0x001,
-
        .cmd2csratio    = 0x100,
        .cmd2iclkout    = 0x001,
 };
 
-static const struct emif_regs ddr3_emif0_regs = {
-       .sdram_config           = EMIF_SDCFG,
-       .ref_ctrl               = EMIF_SDREF,
-       .sdram_tim1             = EMIF_TIM1,
-       .sdram_tim2             = EMIF_TIM2,
-       .sdram_tim3             = EMIF_TIM3,
-       .emif_ddr_phy_ctlr_1    = EMIF_PHYCFG,
+/* These values are obtained from the CCS app */
+#define RD_DQS_GATE    (0x1B3)
+#define RD_DQS         (0x35)
+#define WR_DQS         (0x93)
+static struct ddr_data ddr3_data = {
+       .datardsratio0          = ((RD_DQS<<10) | (RD_DQS<<0)),
+       .datawdsratio0          = ((WR_DQS<<10) | (WR_DQS<<0)),
+       .datawiratio0           = ((0x20<<10) | 0x20<<0),
+       .datagiratio0           = ((0x20<<10) | 0x20<<0),
+       .datafwsratio0          = ((RD_DQS_GATE<<10) | (RD_DQS_GATE<<0)),
+       .datawrsratio0          = (((WR_DQS+0x40)<<10) | ((WR_DQS+0x40)<<0)),
 };
 
-static const struct emif_regs ddr3_emif1_regs = {
-       .sdram_config           = EMIF_SDCFG,
-       .ref_ctrl               = EMIF_SDREF,
-       .sdram_tim1             = EMIF_TIM1,
-       .sdram_tim2             = EMIF_TIM2,
-       .sdram_tim3             = EMIF_TIM3,
-       .emif_ddr_phy_ctlr_1    = EMIF_PHYCFG,
+static const struct dmm_lisa_map_regs evm_lisa_map_regs = {
+       .dmm_lisa_map_0 = 0x00000000,
+       .dmm_lisa_map_1 = 0x00000000,
+       .dmm_lisa_map_2 = 0x80640300,
+       .dmm_lisa_map_3 = 0xC0640320,
 };
 
-void set_uart_mux_conf(void) {}
-
-void set_mux_conf_regs(void)
-{
-       configure_module_pin_mux(mmc_pin_mux);
-}
-
 void sdram_init(void)
 {
-       config_dmm(&evm_lisa_map_regs);
-
-#ifdef CONFIG_TI816X_EVM_DDR2
-       if (CONFIG_TI816X_USE_EMIF0) {
-               ddr2_emif0_regs.emif_ddr_phy_ctlr_1 =
-                       (get_cpu_rev() == 0x1 ? 0x0000010B : 0x0000030B);
-               config_ddr(0, NULL, &ddr2_data, &ddr2_ctrl, &ddr2_emif0_regs,
-                          0);
-       }
-
-       if (CONFIG_TI816X_USE_EMIF1) {
-               ddr2_emif1_regs.emif_ddr_phy_ctlr_1 =
-                       (get_cpu_rev() == 0x1 ? 0x0000010B : 0x0000030B);
-               config_ddr(1, NULL, &ddr2_data, &ddr2_ctrl, &ddr2_emif1_regs,
-                          1);
-       }
-#endif
-
-#ifdef CONFIG_TI816X_EVM_DDR3
-       if (CONFIG_TI816X_USE_EMIF0)
-               config_ddr(0, NULL, &ddr3_data, &ddr3_ctrl, &ddr3_emif0_regs,
-                          0);
-
-       if (CONFIG_TI816X_USE_EMIF1)
-               config_ddr(1, NULL, &ddr3_data, &ddr3_ctrl, &ddr3_emif1_regs,
-                          1);
-#endif
+       /*
+        * Pass in our DDR3 config information and that we have 2 EMIFs to
+        * configure.
+        */
+       config_ddr(&ddr3_data, &ddr3_ctrl, &ddr3_emif_regs,
+                       &evm_lisa_map_regs, 2);
 }
 #endif /* CONFIG_SPL_BUILD */