]> git.sur5r.net Git - u-boot/blobdiff - board/ti/am335x/board.c
board: ti: am57xx: Add support for the am571x idk
[u-boot] / board / ti / am335x / board.c
index 579b4ef8271a9c566ff067f8bbd3c333a32ab25e..111ed3556cc3c603107e796209c23ea7399b3873 100644 (file)
 #include <common.h>
 #include <errno.h>
 #include <spl.h>
+#include <serial.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/clock.h>
+#include <asm/arch/clk_synthesizer.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sys_proto.h>
@@ -23,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/emif.h>
 #include <asm/gpio.h>
+#include <asm/omap_sec_common.h>
 #include <i2c.h>
 #include <miiphy.h>
 #include <cpsw.h>
 DECLARE_GLOBAL_DATA_PTR;
 
 /* GPIO that controls power to DDR on EVM-SK */
-#define GPIO_DDR_VTT_EN                7
+#define GPIO_TO_PIN(bank, gpio)                (32 * (bank) + (gpio))
+#define GPIO_DDR_VTT_EN                GPIO_TO_PIN(0, 7)
+#define ICE_GPIO_DDR_VTT_EN    GPIO_TO_PIN(0, 18)
+#define GPIO_PR1_MII_CTRL      GPIO_TO_PIN(3, 4)
+#define GPIO_MUX_MII_CTRL      GPIO_TO_PIN(3, 10)
+#define GPIO_FET_SWITCH_CTRL   GPIO_TO_PIN(0, 7)
+#define GPIO_PHY_RESET         GPIO_TO_PIN(2, 5)
+#define GPIO_ETH0_MODE         GPIO_TO_PIN(0, 11)
+#define GPIO_ETH1_MODE         GPIO_TO_PIN(1, 26)
 
-#if defined(CONFIG_SPL_BUILD) || \
-       (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_DM_ETH))
 static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
-#endif
+
+#define GPIO0_RISINGDETECT     (AM33XX_GPIO0_BASE + OMAP_GPIO_RISINGDETECT)
+#define GPIO1_RISINGDETECT     (AM33XX_GPIO1_BASE + OMAP_GPIO_RISINGDETECT)
+
+#define GPIO0_IRQSTATUS1       (AM33XX_GPIO0_BASE + OMAP_GPIO_IRQSTATUS1)
+#define GPIO1_IRQSTATUS1       (AM33XX_GPIO1_BASE + OMAP_GPIO_IRQSTATUS1)
+
+#define GPIO0_IRQSTATUSRAW     (AM33XX_GPIO0_BASE + 0x024)
+#define GPIO1_IRQSTATUSRAW     (AM33XX_GPIO1_BASE + 0x024)
 
 /*
  * Read header information from EEPROM into global structure.
  */
-static inline int __maybe_unused read_eeprom(void)
+#ifdef CONFIG_TI_I2C_BOARD_DETECT
+void do_board_detect(void)
 {
-       return ti_i2c_eeprom_am_get(-1, CONFIG_SYS_I2C_EEPROM_ADDR);
+       enable_i2c0_pin_mux();
+       i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
+
+       if (ti_i2c_eeprom_am_get(-1, CONFIG_SYS_I2C_EEPROM_ADDR))
+               printf("ti_i2c_eeprom_init failed\n");
 }
+#endif
+
+#ifndef CONFIG_DM_SERIAL
+struct serial_device *default_serial_console(void)
+{
+       if (board_is_icev2())
+               return &eserial4_device;
+       else
+               return &eserial1_device;
+}
+#endif
 
 #ifndef CONFIG_SKIP_LOWLEVEL_INIT
 static const struct ddr_data ddr2_data = {
@@ -97,6 +130,13 @@ static const struct ddr_data ddr3_evm_data = {
        .datawrsratio0 = MT41J512M8RH125_PHY_WR_DATA,
 };
 
+static const struct ddr_data ddr3_icev2_data = {
+       .datardsratio0 = MT41J128MJT125_RD_DQS_400MHz,
+       .datawdsratio0 = MT41J128MJT125_WR_DQS_400MHz,
+       .datafwsratio0 = MT41J128MJT125_PHY_FIFO_WE_400MHz,
+       .datawrsratio0 = MT41J128MJT125_PHY_WR_DATA_400MHz,
+};
+
 static const struct cmd_control ddr3_cmd_ctrl_data = {
        .cmd0csratio = MT41J128MJT125_RATIO,
        .cmd0iclkout = MT41J128MJT125_INVERT_CLKOUT,
@@ -130,6 +170,17 @@ static const struct cmd_control ddr3_evm_cmd_ctrl_data = {
        .cmd2iclkout = MT41J512M8RH125_INVERT_CLKOUT,
 };
 
+static const struct cmd_control ddr3_icev2_cmd_ctrl_data = {
+       .cmd0csratio = MT41J128MJT125_RATIO_400MHz,
+       .cmd0iclkout = MT41J128MJT125_INVERT_CLKOUT_400MHz,
+
+       .cmd1csratio = MT41J128MJT125_RATIO_400MHz,
+       .cmd1iclkout = MT41J128MJT125_INVERT_CLKOUT_400MHz,
+
+       .cmd2csratio = MT41J128MJT125_RATIO_400MHz,
+       .cmd2iclkout = MT41J128MJT125_INVERT_CLKOUT_400MHz,
+};
+
 static struct emif_regs ddr3_emif_reg_data = {
        .sdram_config = MT41J128MJT125_EMIF_SDCFG,
        .ref_ctrl = MT41J128MJT125_EMIF_SDREF,
@@ -162,6 +213,17 @@ static struct emif_regs ddr3_evm_emif_reg_data = {
                                PHY_EN_DYN_PWRDN,
 };
 
+static struct emif_regs ddr3_icev2_emif_reg_data = {
+       .sdram_config = MT41J128MJT125_EMIF_SDCFG_400MHz,
+       .ref_ctrl = MT41J128MJT125_EMIF_SDREF_400MHz,
+       .sdram_tim1 = MT41J128MJT125_EMIF_TIM1_400MHz,
+       .sdram_tim2 = MT41J128MJT125_EMIF_TIM2_400MHz,
+       .sdram_tim3 = MT41J128MJT125_EMIF_TIM3_400MHz,
+       .zq_config = MT41J128MJT125_ZQ_CFG_400MHz,
+       .emif_ddr_phy_ctlr_1 = MT41J128MJT125_EMIF_READ_LATENCY_400MHz |
+                               PHY_EN_DYN_PWRDN,
+};
+
 #ifdef CONFIG_SPL_OS_BOOT
 int spl_start_uboot(void)
 {
@@ -192,9 +254,6 @@ void am33xx_spl_board_init(void)
 {
        int mpu_vdd;
 
-       if (read_eeprom() < 0)
-               puts("Could not get board ID.\n");
-
        /* Get the frequency */
        dpll_mpu_opp100.m = am335x_get_efuse_mpu_max_freq(cdev);
 
@@ -332,14 +391,9 @@ void am33xx_spl_board_init(void)
 
 const struct dpll_params *get_dpll_ddr_params(void)
 {
-       enable_i2c0_pin_mux();
-       i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
-       if (read_eeprom() < 0)
-               puts("Could not get board ID.\n");
-
        if (board_is_evm_sk())
                return &dpll_ddr_evm_sk;
-       else if (board_is_bone_lt())
+       else if (board_is_bone_lt() || board_is_icev2())
                return &dpll_ddr_bone_black;
        else if (board_is_evm_15_or_later())
                return &dpll_ddr_evm_sk;
@@ -366,9 +420,6 @@ void set_uart_mux_conf(void)
 
 void set_mux_conf_regs(void)
 {
-       if (read_eeprom() < 0)
-               puts("Could not get board ID.\n");
-
        enable_board_pin_mux();
 }
 
@@ -406,9 +457,6 @@ const struct ctrl_ioregs ioregs = {
 
 void sdram_init(void)
 {
-       if (read_eeprom() < 0)
-               puts("Could not get board ID.\n");
-
        if (board_is_evm_sk()) {
                /*
                 * EVM SK 1.2A and later use gpio0_7 to enable DDR3.
@@ -418,6 +466,11 @@ void sdram_init(void)
                gpio_direction_output(GPIO_DDR_VTT_EN, 1);
        }
 
+       if (board_is_icev2()) {
+               gpio_request(ICE_GPIO_DDR_VTT_EN, "ddr_vtt_en");
+               gpio_direction_output(ICE_GPIO_DDR_VTT_EN, 1);
+       }
+
        if (board_is_evm_sk())
                config_ddr(303, &ioregs_evmsk, &ddr3_data,
                           &ddr3_cmd_ctrl_data, &ddr3_emif_reg_data, 0);
@@ -429,12 +482,60 @@ void sdram_init(void)
        else if (board_is_evm_15_or_later())
                config_ddr(303, &ioregs_evm15, &ddr3_evm_data,
                           &ddr3_evm_cmd_ctrl_data, &ddr3_evm_emif_reg_data, 0);
+       else if (board_is_icev2())
+               config_ddr(400, &ioregs_evmsk, &ddr3_icev2_data,
+                          &ddr3_icev2_cmd_ctrl_data, &ddr3_icev2_emif_reg_data,
+                          0);
        else
                config_ddr(266, &ioregs, &ddr2_data,
                           &ddr2_cmd_ctrl_data, &ddr2_emif_reg_data, 0);
 }
 #endif
 
+#if !defined(CONFIG_SPL_BUILD) || \
+       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
+static void request_and_set_gpio(int gpio, char *name, int val)
+{
+       int ret;
+
+       ret = gpio_request(gpio, name);
+       if (ret < 0) {
+               printf("%s: Unable to request %s\n", __func__, name);
+               return;
+       }
+
+       ret = gpio_direction_output(gpio, 0);
+       if (ret < 0) {
+               printf("%s: Unable to set %s  as output\n", __func__, name);
+               goto err_free_gpio;
+       }
+
+       gpio_set_value(gpio, val);
+
+       return;
+
+err_free_gpio:
+       gpio_free(gpio);
+}
+
+#define REQUEST_AND_SET_GPIO(N)        request_and_set_gpio(N, #N, 1);
+#define REQUEST_AND_CLR_GPIO(N)        request_and_set_gpio(N, #N, 0);
+
+/**
+ * RMII mode on ICEv2 board needs 50MHz clock. Given the clock
+ * synthesizer With a capacitor of 18pF, and 25MHz input clock cycle
+ * PLL1 gives an output of 100MHz. So, configuring the div2/3 as 2 to
+ * give 50MHz output for Eth0 and 1.
+ */
+static struct clk_synth cdce913_data = {
+       .id = 0x81,
+       .capacitor = 0x90,
+       .mux = 0x6d,
+       .pdiv2 = 0x2,
+       .pdiv3 = 0x2,
+};
+#endif
+
 /*
  * Basic board specific setup.  Pinmux has been handled already.
  */
@@ -448,23 +549,136 @@ int board_init(void)
 #if defined(CONFIG_NOR) || defined(CONFIG_NAND)
        gpmc_init();
 #endif
+
+#if !defined(CONFIG_SPL_BUILD) || \
+       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
+       if (board_is_icev2()) {
+               int rv;
+               u32 reg;
+
+               REQUEST_AND_SET_GPIO(GPIO_PR1_MII_CTRL);
+               /* Make J19 status available on GPIO1_26 */
+               REQUEST_AND_CLR_GPIO(GPIO_MUX_MII_CTRL);
+
+               REQUEST_AND_SET_GPIO(GPIO_FET_SWITCH_CTRL);
+               /*
+                * Both ports can be set as RMII-CPSW or MII-PRU-ETH using
+                * jumpers near the port. Read the jumper value and set
+                * the pinmux, external mux and PHY clock accordingly.
+                * As jumper line is overridden by PHY RX_DV pin immediately
+                * after bootstrap (power-up/reset), we need to sample
+                * it during PHY reset using GPIO rising edge detection.
+                */
+               REQUEST_AND_SET_GPIO(GPIO_PHY_RESET);
+               /* Enable rising edge IRQ on GPIO0_11 and GPIO 1_26 */
+               reg = readl(GPIO0_RISINGDETECT) | BIT(11);
+               writel(reg, GPIO0_RISINGDETECT);
+               reg = readl(GPIO1_RISINGDETECT) | BIT(26);
+               writel(reg, GPIO1_RISINGDETECT);
+               /* Reset PHYs to capture the Jumper setting */
+               gpio_set_value(GPIO_PHY_RESET, 0);
+               udelay(2);      /* PHY datasheet states 1uS min. */
+               gpio_set_value(GPIO_PHY_RESET, 1);
+
+               reg = readl(GPIO0_IRQSTATUSRAW) & BIT(11);
+               if (reg) {
+                       writel(reg, GPIO0_IRQSTATUS1); /* clear irq */
+                       /* RMII mode */
+                       printf("ETH0, CPSW\n");
+               } else {
+                       /* MII mode */
+                       printf("ETH0, PRU\n");
+                       cdce913_data.pdiv3 = 4; /* 25MHz PHY clk */
+               }
+
+               reg = readl(GPIO1_IRQSTATUSRAW) & BIT(26);
+               if (reg) {
+                       writel(reg, GPIO1_IRQSTATUS1); /* clear irq */
+                       /* RMII mode */
+                       printf("ETH1, CPSW\n");
+                       gpio_set_value(GPIO_MUX_MII_CTRL, 1);
+               } else {
+                       /* MII mode */
+                       printf("ETH1, PRU\n");
+                       cdce913_data.pdiv2 = 4; /* 25MHz PHY clk */
+               }
+
+               /* disable rising edge IRQs */
+               reg = readl(GPIO0_RISINGDETECT) & ~BIT(11);
+               writel(reg, GPIO0_RISINGDETECT);
+               reg = readl(GPIO1_RISINGDETECT) & ~BIT(26);
+               writel(reg, GPIO1_RISINGDETECT);
+
+               rv = setup_clock_synthesizer(&cdce913_data);
+               if (rv) {
+                       printf("Clock synthesizer setup failed %d\n", rv);
+                       return rv;
+               }
+
+               /* reset PHYs */
+               gpio_set_value(GPIO_PHY_RESET, 0);
+               udelay(2);      /* PHY datasheet states 1uS min. */
+               gpio_set_value(GPIO_PHY_RESET, 1);
+       }
+#endif
+
        return 0;
 }
 
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {
+#if !defined(CONFIG_SPL_BUILD)
+       uint8_t mac_addr[6];
+       uint32_t mac_hi, mac_lo;
+#endif
+
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-       int rc;
        char *name = NULL;
 
-       rc = read_eeprom();
-       if (rc)
-               puts("Could not get board ID.\n");
-
        if (board_is_bbg1())
                name = "BBG1";
        set_board_info_env(name);
+
+       /*
+        * Default FIT boot on HS devices. Non FIT images are not allowed
+        * on HS devices.
+        */
+       if (get_device_type() == HS_DEVICE)
+               setenv("boot_fit", "1");
+#endif
+
+#if !defined(CONFIG_SPL_BUILD)
+       /* 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 (!getenv("ethaddr")) {
+               printf("<ethaddr> not set. Validating first E-fuse MAC\n");
+
+               if (is_valid_ethaddr(mac_addr))
+                       eth_setenv_enetaddr("ethaddr", mac_addr);
+       }
+
+       mac_lo = readl(&cdev->macid1l);
+       mac_hi = readl(&cdev->macid1h);
+       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 (!getenv("eth1addr")) {
+               if (is_valid_ethaddr(mac_addr))
+                       eth_setenv_enetaddr("eth1addr", mac_addr);
+       }
 #endif
 
        return 0;
@@ -515,6 +729,12 @@ static struct cpsw_platform_data cpsw_data = {
 };
 #endif
 
+#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\
+       defined(CONFIG_SPL_BUILD)) || \
+       ((defined(CONFIG_DRIVER_TI_CPSW) || \
+         defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \
+        !defined(CONFIG_SPL_BUILD))
+
 /*
  * This function will:
  * Read the eFuse for MAC addresses, and set ethaddr/eth1addr/usbnet_devaddr
@@ -526,19 +746,18 @@ static struct cpsw_platform_data cpsw_data = {
  * Build in only these cases to avoid warnings about unused variables
  * when we build an SPL that has neither option but full U-Boot will.
  */
-#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \
-               && defined(CONFIG_SPL_BUILD)) || \
-       ((defined(CONFIG_DRIVER_TI_CPSW) || \
-         defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
-        !defined(CONFIG_SPL_BUILD))
 int board_eth_init(bd_t *bis)
 {
        int rv, n = 0;
+#if defined(CONFIG_USB_ETHER) && \
+       (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT))
        uint8_t mac_addr[6];
        uint32_t mac_hi, mac_lo;
-       __maybe_unused struct ti_am_eeprom *header;
 
-       /* try reading mac address from efuse */
+       /*
+        * use efuse mac address for USB ethernet as we know that
+        * both CPSW and USB ethernet will never be active at the same time
+        */
        mac_lo = readl(&cdev->macid0l);
        mac_hi = readl(&cdev->macid0h);
        mac_addr[0] = mac_hi & 0xFF;
@@ -547,40 +766,24 @@ int board_eth_init(bd_t *bis)
        mac_addr[3] = (mac_hi & 0xFF000000) >> 24;
        mac_addr[4] = mac_lo & 0xFF;
        mac_addr[5] = (mac_lo & 0xFF00) >> 8;
+#endif
+
 
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
        (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
-       if (!getenv("ethaddr")) {
-               printf("<ethaddr> not set. Validating first E-fuse MAC\n");
-
-               if (is_valid_ethaddr(mac_addr))
-                       eth_setenv_enetaddr("ethaddr", mac_addr);
-       }
 
 #ifdef CONFIG_DRIVER_TI_CPSW
-
-       mac_lo = readl(&cdev->macid1l);
-       mac_hi = readl(&cdev->macid1h);
-       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 (!getenv("eth1addr")) {
-               if (is_valid_ethaddr(mac_addr))
-                       eth_setenv_enetaddr("eth1addr", mac_addr);
-       }
-
-       if (read_eeprom() < 0)
-               puts("Could not get board ID.\n");
-
        if (board_is_bone() || board_is_bone_lt() ||
            board_is_idk()) {
                writel(MII_MODE_ENABLE, &cdev->miisel);
                cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if =
                                PHY_INTERFACE_MODE_MII;
+       } else if (board_is_icev2()) {
+               writel(RMII_MODE_ENABLE | RMII_CHIPCKL_ENABLE, &cdev->miisel);
+               cpsw_slaves[0].phy_if = PHY_INTERFACE_MODE_RMII;
+               cpsw_slaves[1].phy_if = PHY_INTERFACE_MODE_RMII;
+               cpsw_slaves[0].phy_addr = 1;
+               cpsw_slaves[1].phy_addr = 3;
        } else {
                writel((RGMII_MODE_ENABLE | RGMII_INT_DELAY), &cdev->miisel);
                cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if =
@@ -646,7 +849,16 @@ int board_fit_config_name_match(const char *name)
                return 0;
        else if (board_is_bbg1() && !strcmp(name, "am335x-bonegreen"))
                return 0;
+       else if (board_is_icev2() && !strcmp(name, "am335x-icev2"))
+               return 0;
        else
                return -1;
 }
 #endif
+
+#ifdef CONFIG_TI_SECURE_DEVICE
+void board_fit_image_post_process(void **p_image, size_t *p_size)
+{
+       secure_boot_verify_image(p_image, p_size);
+}
+#endif