Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / board / wandboard / wandboard.c

diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index b3f3b34f44091e98e0fef824057492cc75a379d1..6d2609ce119639fd1e916cc16ed854369cca4af6 100644 (file)
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -15,11 +15,11 @@
 #include <asm/arch/mxc_hdmi.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
-#include <asm/imx-common/sata.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
+#include <asm/mach-imx/sata.h>
 #include <asm/io.h>
 #include <linux/sizes.h>
 #include <common.h>
@@ -30,6 +30,8 @@
 #include <phy.h>
 #include <input.h>
 #include <i2c.h>
+#include <power/pmic.h>
+#include <power/pfuze100_pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -51,8 +53,11 @@ DECLARE_GLOBAL_DATA_PTR;
 #define USDHC1_CD_GPIO         IMX_GPIO_NR(1, 2)
 #define USDHC3_CD_GPIO         IMX_GPIO_NR(3, 9)
 #define ETH_PHY_RESET          IMX_GPIO_NR(3, 29)
+#define ETH_PHY_AR8035_POWER   IMX_GPIO_NR(7, 13)
 #define REV_DETECTION          IMX_GPIO_NR(2, 28)
 
+static bool with_pmic;
+
 int dram_init(void)
 {
        gd->ram_size = imx_ddr_size();
@@ -107,6 +112,11 @@ static iomux_v3_cfg_t const enet_pads[] = {
        IOMUX_PADS(PAD_EIM_D29__GPIO3_IO29    | MUX_PAD_CTRL(NO_PAD_CTRL)),
 };
 
+static iomux_v3_cfg_t const enet_ar8035_power_pads[] = {
+       /* AR8035 POWER */
+       IOMUX_PADS(PAD_GPIO_18__GPIO7_IO13    | MUX_PAD_CTRL(NO_PAD_CTRL)),
+};
+
 static iomux_v3_cfg_t const rev_detection_pad[] = {
        IOMUX_PADS(PAD_EIM_EB0__GPIO2_IO28  | MUX_PAD_CTRL(NO_PAD_CTRL)),
 };
@@ -120,6 +130,14 @@ static void setup_iomux_enet(void)
 {
        SETUP_IOMUX_PADS(enet_pads);
 
+       if (with_pmic) {
+               SETUP_IOMUX_PADS(enet_ar8035_power_pads);
+               /* enable AR8035 POWER */
+               gpio_direction_output(ETH_PHY_AR8035_POWER, 0);
+       }
+       /* wait until 3.3V of PHY and clock become stable */
+       mdelay(10);
+
        /* Reset AR8031 PHY */
        gpio_direction_output(ETH_PHY_RESET, 0);
        mdelay(10);
@@ -192,6 +210,7 @@ int board_mmc_init(bd_t *bis)
 static int ar8031_phy_fixup(struct phy_device *phydev)
 {
        unsigned short val;
+       int mask;
 
        /* To enable AR8031 ouput a 125MHz clk from CLK_25M */
        phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x7);
@@ -199,7 +218,12 @@ static int ar8031_phy_fixup(struct phy_device *phydev)
        phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x4007);
 
        val = phy_read(phydev, MDIO_DEVAD_NONE, 0xe);
-       val &= 0xffe3;
+       if (with_pmic)
+               mask = 0xffe7;  /* AR8035 */
+       else
+               mask = 0xffe3;  /* AR8031 */
+
+       val &= mask;
        val |= 0x18;
        phy_write(phydev, MDIO_DEVAD_NONE, 0xe, val);
 
@@ -257,6 +281,40 @@ struct i2c_pads_info mx6dl_i2c2_pad_info = {
        }
 };
 
+struct i2c_pads_info mx6q_i2c3_pad_info = {
+       .scl = {
+               .i2c_mode = MX6Q_PAD_GPIO_5__I2C3_SCL
+                       | MUX_PAD_CTRL(I2C_PAD_CTRL),
+               .gpio_mode = MX6Q_PAD_GPIO_5__GPIO1_IO05
+                       | MUX_PAD_CTRL(I2C_PAD_CTRL),
+               .gp = IMX_GPIO_NR(1, 5)
+       },
+       .sda = {
+               .i2c_mode = MX6Q_PAD_GPIO_16__I2C3_SDA
+                       | MUX_PAD_CTRL(I2C_PAD_CTRL),
+               .gpio_mode = MX6Q_PAD_GPIO_16__GPIO7_IO11
+                       | MUX_PAD_CTRL(I2C_PAD_CTRL),
+               .gp = IMX_GPIO_NR(7, 11)
+       }
+};
+
+struct i2c_pads_info mx6dl_i2c3_pad_info = {
+       .scl = {
+               .i2c_mode = MX6DL_PAD_GPIO_5__I2C3_SCL
+                       | MUX_PAD_CTRL(I2C_PAD_CTRL),
+               .gpio_mode = MX6DL_PAD_GPIO_5__GPIO1_IO05
+                       | MUX_PAD_CTRL(I2C_PAD_CTRL),
+               .gp = IMX_GPIO_NR(1, 5)
+       },
+       .sda = {
+               .i2c_mode = MX6DL_PAD_GPIO_16__I2C3_SDA
+                       | MUX_PAD_CTRL(I2C_PAD_CTRL),
+               .gpio_mode = MX6DL_PAD_GPIO_16__GPIO7_IO11
+                       | MUX_PAD_CTRL(I2C_PAD_CTRL),
+               .gp = IMX_GPIO_NR(7, 11)
+       }
+};
+
 static iomux_v3_cfg_t const fwadapt_7wvga_pads[] = {
        IOMUX_PADS(PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK),
        IOMUX_PADS(PAD_DI0_PIN2__IPU1_DI0_PIN02), /* HSync */
@@ -376,10 +434,7 @@ int board_eth_init(bd_t *bis)
 int board_early_init_f(void)
 {
        setup_iomux_uart();
-#if defined(CONFIG_VIDEO_IPUV3)
-       setup_display();
-#endif
-#ifdef CONFIG_CMD_SATA
+#ifdef CONFIG_SATA
        /* Only mx6q wandboard has SATA */
        if (is_cpu_type(MXC_CPU_MX6Q))
                setup_sata();
@@ -388,6 +443,31 @@ int board_early_init_f(void)
        return 0;
 }
 
+#define PMIC_I2C_BUS           2
+
+int power_init_board(void)
+{
+       struct pmic *p;
+       u32 reg;
+
+       /* configure PFUZE100 PMIC */
+       power_pfuze100_init(PMIC_I2C_BUS);
+       p = pmic_get("PFUZE100");
+       if (p && !pmic_probe(p)) {
+               pmic_reg_read(p, PFUZE100_DEVICEID, &reg);
+               printf("PMIC:  PFUZE100 ID=0x%02x\n", reg);
+               with_pmic = true;
+
+               /* Set VGEN2 to 1.5V and enable */
+               pmic_reg_read(p, PFUZE100_VGEN2VOL, &reg);
+               reg &= ~(LDO_VOL_MASK);
+               reg |= (LDOA_1_50V | (1 << (LDO_EN)));
+               pmic_reg_write(p, PFUZE100_VGEN2VOL, reg);
+       }
+
+       return 0;
+}
+
 /*
  * Do not overwrite the console
  * Use always serial for U-Boot console
@@ -417,6 +497,14 @@ static bool is_revc1(void)
                return false;
 }
 
+static bool is_revd1(void)
+{
+       if (with_pmic)
+               return true;
+       else
+               return false;
+}
+
 int board_late_init(void)
 {
 #ifdef CONFIG_CMD_BMODE
@@ -425,14 +513,16 @@ int board_late_init(void)
 
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
        if (is_mx6dq())
-               setenv("board_rev", "MX6Q");
+               env_set("board_rev", "MX6Q");
        else
-               setenv("board_rev", "MX6DL");
+               env_set("board_rev", "MX6DL");
 
-       if (is_revc1())
-               setenv("board_name", "C1");
+       if (is_revd1())
+               env_set("board_name", "D1");
+       else if (is_revc1())
+               env_set("board_name", "C1");
        else
-               setenv("board_name", "B1");
+               env_set("board_name", "B1");
 #endif
        return 0;
 }
@@ -442,18 +532,27 @@ int board_init(void)
        /* address of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
+#if defined(CONFIG_VIDEO_IPUV3)
        setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c2_pad_info);
-       if (is_mx6dq())
+       if (is_mx6dq()) {
                setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c2_pad_info);
-       else
+               setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c3_pad_info);
+       } else {
                setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c2_pad_info);
+               setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c3_pad_info);
+       }
+
+       setup_display();
+#endif
 
        return 0;
 }
 
 int checkboard(void)
 {
-       if (is_revc1())
+       if (is_revd1())
+               puts("Board: Wandboard rev D1\n");
+       else if (is_revc1())
                puts("Board: Wandboard rev C1\n");
        else
                puts("Board: Wandboard rev B1\n");