]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - board/freescale/mx51evk/mx51evk.c
Merge 'u-boot-atmel/master' into 'u-boot-arm/master'
[karo-tx-uboot.git] / board / freescale / mx51evk / mx51evk.c
index 8754563802353622b458103c1c97098460e74f00..d1ef431895a0786f72eb4ae42413202ee9200e97 100644 (file)
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/arch/mx51_pins.h>
+#include <asm/arch/mx5x_pins.h>
 #include <asm/arch/iomux.h>
 #include <asm/errno.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/arch/crm_regs.h>
+#include <asm/arch/clock.h>
+#include <asm/imx-common/mx5_video.h>
 #include <i2c.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
-#include "mx51evk.h"
+#include <power/pmic.h>
+#include <fsl_pmic.h>
+#include <mc13892.h>
+#include <usb/ehci-fsl.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static u32 system_rev;
-struct io_board_ctrl *mx51_io_board;
-
 #ifdef CONFIG_FSL_ESDHC
 struct fsl_esdhc_cfg esdhc_cfg[2] = {
-       {MMC_SDHC1_BASE_ADDR, 1, 1},
-       {MMC_SDHC2_BASE_ADDR, 1, 1},
+       {MMC_SDHC1_BASE_ADDR},
+       {MMC_SDHC2_BASE_ADDR},
 };
 #endif
 
-u32 get_board_rev(void)
+int dram_init(void)
 {
-       return system_rev;
+       /* dram_init must store complete ramsize in gd->ram_size */
+       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+                               PHYS_SDRAM_1_SIZE);
+       return 0;
 }
 
-int dram_init(void)
+u32 get_board_rev(void)
 {
-       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-       gd->bd->bi_dram[0].size = get_ram_size((long *)PHYS_SDRAM_1,
-                       PHYS_SDRAM_1_SIZE);
-       return 0;
+       u32 rev = get_cpu_rev();
+       if (!gpio_get_value(IMX_GPIO_NR(1, 22)))
+               rev |= BOARD_REV_2_0 << BOARD_VER_OFFSET;
+       return rev;
 }
 
 static void setup_iomux_uart(void)
@@ -72,72 +79,6 @@ static void setup_iomux_uart(void)
        mxc_iomux_set_pad(MX51_PIN_UART1_CTS, pad);
 }
 
-static void setup_expio(void)
-{
-       u32 reg;
-       struct weim *pweim = (struct weim *)WEIM_BASE_ADDR;
-       struct clkctl *pclkctl = (struct clkctl *)CCM_BASE_ADDR;
-
-       /* CS5 setup */
-       mxc_request_iomux(MX51_PIN_EIM_CS5, IOMUX_CONFIG_ALT0);
-       writel(0x00410089, &pweim[5].csgcr1);
-       writel(0x00000002, &pweim[5].csgcr2);
-
-       /* RWSC=50, RADVA=2, RADVN=6, OEA=0, OEN=0, RCSA=0, RCSN=0 */
-       writel(0x32260000, &pweim[5].csrcr1);
-
-       /* APR = 0 */
-       writel(0x00000000, &pweim[5].csrcr2);
-
-       /*
-        * WAL=0, WBED=1, WWSC=50, WADVA=2, WADVN=6, WEA=0, WEN=0,
-        * WCSA=0, WCSN=0
-        */
-       writel(0x72080F00, &pweim[5].cswcr1);
-
-       mx51_io_board = (struct io_board_ctrl *)(CS5_BASE_ADDR +
-                                               IO_BOARD_OFFSET);
-       if ((readw(&mx51_io_board->id1) == 0xAAAA) &&
-               (readw(&mx51_io_board->id2) == 0x5555)) {
-               if (is_soc_rev(CHIP_REV_2_0) < 0) {
-                       reg = readl(&pclkctl->cbcdr);
-                       reg = (reg & (~0x70000)) | 0x30000;
-                       writel(reg, &pclkctl->cbcdr);
-                       /* make sure divider effective */
-                       while (readl(&pclkctl->cdhipr) != 0)
-                               ;
-                       writel(0x0, &pclkctl->ccdr);
-               }
-       } else {
-               /* CS1 */
-               writel(0x00410089, &pweim[1].csgcr1);
-               writel(0x00000002, &pweim[1].csgcr2);
-               /*  RWSC=50, RADVA=2, RADVN=6, OEA=0, OEN=0, RCSA=0, RCSN=0 */
-               writel(0x32260000, &pweim[1].csrcr1);
-               /* APR=0 */
-               writel(0x00000000, &pweim[1].csrcr2);
-               /*
-                * WAL=0, WBED=1, WWSC=50, WADVA=2, WADVN=6, WEA=0,
-                * WEN=0, WCSA=0, WCSN=0
-                */
-               writel(0x72080F00, &pweim[1].cswcr1);
-               mx51_io_board = (struct io_board_ctrl *)(CS1_BASE_ADDR +
-                                               IO_BOARD_OFFSET);
-       }
-
-       /* Reset interrupt status reg */
-       writew(0x1F, &(mx51_io_board->int_rest));
-       writew(0x00, &(mx51_io_board->int_rest));
-       writew(0xFFFF, &(mx51_io_board->int_mask));
-
-       /* Reset the XUART and Ethernet controllers */
-       reg = readw(&(mx51_io_board->sw_reset));
-       reg |= 0x9;
-       writew(reg, &(mx51_io_board->sw_reset));
-       reg &= ~0x9;
-       writew(reg, &(mx51_io_board->sw_reset));
-}
-
 static void setup_iomux_fec(void)
 {
        /*FEC_MDIO*/
@@ -213,17 +154,205 @@ static void setup_iomux_fec(void)
        mxc_iomux_set_pad(MX51_PIN_NANDF_D11, 0x2180);
 }
 
+#ifdef CONFIG_MXC_SPI
+static void setup_iomux_spi(void)
+{
+       /* 000: Select mux mode: ALT0 mux port: MOSI of instance: ecspi1 */
+       mxc_request_iomux(MX51_PIN_CSPI1_MOSI, IOMUX_CONFIG_ALT0);
+       mxc_iomux_set_pad(MX51_PIN_CSPI1_MOSI, 0x105);
+
+       /* 000: Select mux mode: ALT0 mux port: MISO of instance: ecspi1. */
+       mxc_request_iomux(MX51_PIN_CSPI1_MISO, IOMUX_CONFIG_ALT0);
+       mxc_iomux_set_pad(MX51_PIN_CSPI1_MISO, 0x105);
+
+       /* de-select SS1 of instance: ecspi1. */
+       mxc_request_iomux(MX51_PIN_CSPI1_SS1, IOMUX_CONFIG_ALT3);
+       mxc_iomux_set_pad(MX51_PIN_CSPI1_SS1, 0x85);
+
+       /* 000: Select mux mode: ALT0 mux port: SS0 ecspi1 */
+       mxc_request_iomux(MX51_PIN_CSPI1_SS0, IOMUX_CONFIG_ALT0);
+       mxc_iomux_set_pad(MX51_PIN_CSPI1_SS0, 0x185);
+
+       /* 000: Select mux mode: ALT0 mux port: RDY of instance: ecspi1. */
+       mxc_request_iomux(MX51_PIN_CSPI1_RDY, IOMUX_CONFIG_ALT0);
+       mxc_iomux_set_pad(MX51_PIN_CSPI1_RDY, 0x180);
+
+       /* 000: Select mux mode: ALT0 mux port: SCLK of instance: ecspi1. */
+       mxc_request_iomux(MX51_PIN_CSPI1_SCLK, IOMUX_CONFIG_ALT0);
+       mxc_iomux_set_pad(MX51_PIN_CSPI1_SCLK, 0x105);
+}
+#endif
+
+#ifdef CONFIG_USB_EHCI_MX5
+#define MX51EVK_USBH1_HUB_RST  IOMUX_TO_GPIO(MX51_PIN_GPIO1_7) /* GPIO1_7 */
+#define MX51EVK_USBH1_STP      IOMUX_TO_GPIO(MX51_PIN_USBH1_STP) /* GPIO1_27 */
+#define MX51EVK_USB_CLK_EN_B   IOMUX_TO_GPIO(MX51_PIN_EIM_D18) /* GPIO2_1 */
+#define MX51EVK_USB_PHY_RESET  IOMUX_TO_GPIO(MX51_PIN_EIM_D21) /* GPIO2_5 */
+
+#define USBH1_PAD      (PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH |          \
+                        PAD_CTL_100K_PU | PAD_CTL_PUE_PULL |           \
+                        PAD_CTL_PKE_ENABLE | PAD_CTL_HYS_ENABLE)
+#define GPIO_PAD       (PAD_CTL_DRV_HIGH | PAD_CTL_PKE_ENABLE |        \
+                        PAD_CTL_SRE_FAST)
+#define NO_PAD         (1 << 16)
+
+static void setup_usb_h1(void)
+{
+       setup_iomux_usb_h1();
+
+       /* GPIO_1_7 for USBH1 hub reset */
+       mxc_request_iomux(MX51_PIN_GPIO1_7, IOMUX_CONFIG_ALT0);
+       mxc_iomux_set_pad(MX51_PIN_GPIO1_7, NO_PAD);
+
+       /* GPIO_2_1 */
+       mxc_request_iomux(MX51_PIN_EIM_D17, IOMUX_CONFIG_ALT1);
+       mxc_iomux_set_pad(MX51_PIN_EIM_D17, GPIO_PAD);
+
+       /* GPIO_2_5 for USB PHY reset */
+       mxc_request_iomux(MX51_PIN_EIM_D21, IOMUX_CONFIG_ALT1);
+       mxc_iomux_set_pad(MX51_PIN_EIM_D21, GPIO_PAD);
+}
+
+int board_ehci_hcd_init(int port)
+{
+       /* Set USBH1_STP to GPIO and toggle it */
+       mxc_request_iomux(MX51_PIN_USBH1_STP, IOMUX_CONFIG_GPIO);
+       mxc_iomux_set_pad(MX51_PIN_USBH1_STP, USBH1_PAD);
+
+       gpio_direction_output(MX51EVK_USBH1_STP, 0);
+       gpio_direction_output(MX51EVK_USB_PHY_RESET, 0);
+       mdelay(10);
+       gpio_set_value(MX51EVK_USBH1_STP, 1);
+
+       /* Set back USBH1_STP to be function */
+       mxc_request_iomux(MX51_PIN_USBH1_STP, IOMUX_CONFIG_ALT0);
+       mxc_iomux_set_pad(MX51_PIN_USBH1_STP, USBH1_PAD);
+
+       /* De-assert USB PHY RESETB */
+       gpio_set_value(MX51EVK_USB_PHY_RESET, 1);
+
+       /* Drive USB_CLK_EN_B line low */
+       gpio_direction_output(MX51EVK_USB_CLK_EN_B, 0);
+
+       /* Reset USB hub */
+       gpio_direction_output(MX51EVK_USBH1_HUB_RST, 0);
+       mdelay(2);
+       gpio_set_value(MX51EVK_USBH1_HUB_RST, 1);
+       return 0;
+}
+#endif
+
+static void power_init(void)
+{
+       unsigned int val;
+       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
+       struct pmic *p;
+       int ret;
+
+       ret = pmic_init(I2C_PMIC);
+       if (ret)
+               return;
+
+       p = pmic_get("FSL_PMIC");
+       if (!p)
+               return;
+
+       /* Write needed to Power Gate 2 register */
+       pmic_reg_read(p, REG_POWER_MISC, &val);
+       val &= ~PWGT2SPIEN;
+       pmic_reg_write(p, REG_POWER_MISC, val);
+
+       /* Externally powered */
+       pmic_reg_read(p, REG_CHARGE, &val);
+       val |= ICHRG0 | ICHRG1 | ICHRG2 | ICHRG3 | CHGAUTOB;
+       pmic_reg_write(p, REG_CHARGE, val);
+
+       /* power up the system first */
+       pmic_reg_write(p, REG_POWER_MISC, PWUP);
+
+       /* Set core voltage to 1.1V */
+       pmic_reg_read(p, REG_SW_0, &val);
+       val = (val & ~SWx_VOLT_MASK) | SWx_1_100V;
+       pmic_reg_write(p, REG_SW_0, val);
+
+       /* Setup VCC (SW2) to 1.25 */
+       pmic_reg_read(p, REG_SW_1, &val);
+       val = (val & ~SWx_VOLT_MASK) | SWx_1_250V;
+       pmic_reg_write(p, REG_SW_1, val);
+
+       /* Setup 1V2_DIG1 (SW3) to 1.25 */
+       pmic_reg_read(p, REG_SW_2, &val);
+       val = (val & ~SWx_VOLT_MASK) | SWx_1_250V;
+       pmic_reg_write(p, REG_SW_2, val);
+       udelay(50);
+
+       /* Raise the core frequency to 800MHz */
+       writel(0x0, &mxc_ccm->cacrr);
+
+       /* Set switchers in Auto in NORMAL mode & STANDBY mode */
+       /* Setup the switcher mode for SW1 & SW2*/
+       pmic_reg_read(p, REG_SW_4, &val);
+       val = (val & ~((SWMODE_MASK << SWMODE1_SHIFT) |
+               (SWMODE_MASK << SWMODE2_SHIFT)));
+       val |= (SWMODE_AUTO_AUTO << SWMODE1_SHIFT) |
+               (SWMODE_AUTO_AUTO << SWMODE2_SHIFT);
+       pmic_reg_write(p, REG_SW_4, val);
+
+       /* Setup the switcher mode for SW3 & SW4 */
+       pmic_reg_read(p, REG_SW_5, &val);
+       val = (val & ~((SWMODE_MASK << SWMODE3_SHIFT) |
+               (SWMODE_MASK << SWMODE4_SHIFT)));
+       val |= (SWMODE_AUTO_AUTO << SWMODE3_SHIFT) |
+               (SWMODE_AUTO_AUTO << SWMODE4_SHIFT);
+       pmic_reg_write(p, REG_SW_5, val);
+
+       /* Set VDIG to 1.65V, VGEN3 to 1.8V, VCAM to 2.6V */
+       pmic_reg_read(p, REG_SETTING_0, &val);
+       val &= ~(VCAM_MASK | VGEN3_MASK | VDIG_MASK);
+       val |= VDIG_1_65 | VGEN3_1_8 | VCAM_2_6;
+       pmic_reg_write(p, REG_SETTING_0, val);
+
+       /* Set VVIDEO to 2.775V, VAUDIO to 3V, VSD to 3.15V */
+       pmic_reg_read(p, REG_SETTING_1, &val);
+       val &= ~(VVIDEO_MASK | VSD_MASK | VAUDIO_MASK);
+       val |= VSD_3_15 | VAUDIO_3_0 | VVIDEO_2_775;
+       pmic_reg_write(p, REG_SETTING_1, val);
+
+       /* Configure VGEN3 and VCAM regulators to use external PNP */
+       val = VGEN3CONFIG | VCAMCONFIG;
+       pmic_reg_write(p, REG_MODE_1, val);
+       udelay(200);
+
+       /* Enable VGEN3, VCAM, VAUDIO, VVIDEO, VSD regulators */
+       val = VGEN3EN | VGEN3CONFIG | VCAMEN | VCAMCONFIG |
+               VVIDEOEN | VAUDIOEN  | VSDEN;
+       pmic_reg_write(p, REG_MODE_1, val);
+
+       mxc_request_iomux(MX51_PIN_EIM_A20, IOMUX_CONFIG_ALT1);
+       gpio_direction_output(IMX_GPIO_NR(2, 14), 0);
+
+       udelay(500);
+
+       gpio_set_value(IMX_GPIO_NR(2, 14), 1);
+}
+
 #ifdef CONFIG_FSL_ESDHC
-int board_mmc_getcd(u8 *cd, struct mmc *mmc)
+int board_mmc_getcd(struct mmc *mmc)
 {
        struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
+       int ret;
+
+       mxc_request_iomux(MX51_PIN_GPIO1_0, IOMUX_CONFIG_ALT1);
+       gpio_direction_input(IMX_GPIO_NR(1, 0));
+       mxc_request_iomux(MX51_PIN_GPIO1_6, IOMUX_CONFIG_ALT0);
+       gpio_direction_input(IMX_GPIO_NR(1, 6));
 
        if (cfg->esdhc_base == MMC_SDHC1_BASE_ADDR)
-               *cd = readl(GPIO1_BASE_ADDR) & 0x01;
+               ret = !gpio_get_value(IMX_GPIO_NR(1, 0));
        else
-               *cd = readl(GPIO1_BASE_ADDR) & 0x40;
+               ret = !gpio_get_value(IMX_GPIO_NR(1, 6));
 
-       return 0;
+       return ret;
 }
 
 int board_mmc_init(bd_t *bis)
@@ -231,6 +360,9 @@ int board_mmc_init(bd_t *bis)
        u32 index;
        s32 status = 0;
 
+       esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
+       esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
+
        for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM;
                        index++) {
                switch (index) {
@@ -340,57 +472,52 @@ int board_mmc_init(bd_t *bis)
 }
 #endif
 
-int board_init(void)
+int board_early_init_f(void)
 {
-       system_rev = get_cpu_rev();
+       setup_iomux_uart();
+       setup_iomux_fec();
+#ifdef CONFIG_USB_EHCI_MX5
+       setup_usb_h1();
+#endif
+       setup_iomux_lcd();
 
-       gd->bd->bi_arch_number = MACH_TYPE_MX51_BABBAGE;
+       return 0;
+}
+
+int board_init(void)
+{
        /* address of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
-       setup_iomux_uart();
-       setup_expio();
-       setup_iomux_fec();
+       lcd_enable();
+
+       return 0;
+}
+
+#ifdef CONFIG_BOARD_LATE_INIT
+int board_late_init(void)
+{
+#ifdef CONFIG_MXC_SPI
+       setup_iomux_spi();
+       power_init();
+#endif
+
        return 0;
 }
+#endif
+
+/*
+ * Do not overwrite the console
+ * Use always serial for U-Boot console
+ */
+int overwrite_console(void)
+{
+       return 1;
+}
 
 int checkboard(void)
 {
-       puts("Board: MX51EVK ");
-
-       switch (system_rev & 0xff) {
-       case CHIP_REV_3_0:
-               puts("3.0 [");
-               break;
-       case CHIP_REV_2_5:
-               puts("2.5 [");
-               break;
-       case CHIP_REV_2_0:
-               puts("2.0 [");
-               break;
-       case CHIP_REV_1_1:
-               puts("1.1 [");
-               break;
-       case CHIP_REV_1_0:
-       default:
-               puts("1.0 [");
-               break;
-       }
+       puts("Board: MX51EVK\n");
 
-       switch (__raw_readl(SRC_BASE_ADDR + 0x8)) {
-       case 0x0001:
-               puts("POR");
-               break;
-       case 0x0009:
-               puts("RST");
-               break;
-       case 0x0010:
-       case 0x0011:
-               puts("WDOG");
-               break;
-       default:
-               puts("unknown");
-       }
-       puts("]\n");
        return 0;
 }