imx6: wandboard: convert to DM_I2C
[oweals/u-boot.git] / board / wandboard / wandboard.c
index adfcf485627d899f95f7101813ef3558a84c4603..c0902abe38be05b6e3009a68e04404b3069c96e3 100644 (file)
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013 Freescale Semiconductor, Inc.
  * Copyright (C) 2014 O.S. Systems Software LTDA.
  *
  * Author: Fabio Estevam <fabio.estevam@freescale.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <asm/arch/clock.h>
@@ -28,8 +27,9 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <phy.h>
-#include <input.h>
 #include <i2c.h>
+#include <power/pmic.h>
+#include <power/pfuze100_pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -51,8 +51,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 +110,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,7 +128,17 @@ 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_request(ETH_PHY_AR8035_POWER, "PHY_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_request(ETH_PHY_RESET, "PHY_RESET");
        gpio_direction_output(ETH_PHY_RESET, 0);
        mdelay(10);
        gpio_set_value(ETH_PHY_RESET, 1);
@@ -154,6 +172,11 @@ int board_mmc_init(bd_t *bis)
        int ret;
        u32 index = 0;
 
+#if !CONFIG_IS_ENABLED(DM_MMC)
+       gpio_request(USDHC1_CD_GPIO, "USDHC1_CD");
+       gpio_request(USDHC3_CD_GPIO, "USDHC3_CD");
+#endif
+
        /*
         * Following map is done:
         * (U-Boot device node)    (Physical Port)
@@ -192,6 +215,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 +223,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 +286,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 */
@@ -292,14 +355,29 @@ static void do_enable_hdmi(struct display_info_t const *dev)
 
 static int detect_i2c(struct display_info_t const *dev)
 {
+#ifdef CONFIG_DM_I2C
+       struct udevice *bus, *udev;
+       int rc;
+
+       rc = uclass_get_device_by_seq(UCLASS_I2C, dev->bus, &bus);
+       if (rc)
+               return rc;
+       rc = dm_i2c_probe(bus, dev->addr, 0, &udev);
+       if (rc)
+               return 0;
+       return 1;
+#else
        return (0 == i2c_set_bus_num(dev->bus)) &&
                        (0 == i2c_probe(dev->addr));
+#endif
 }
 
 static void enable_fwadapt_7wvga(struct display_info_t const *dev)
 {
        SETUP_IOMUX_PADS(fwadapt_7wvga_pads);
 
+       gpio_request(IMX_GPIO_NR(2, 10), "DISP0_BKLEN");
+       gpio_request(IMX_GPIO_NR(2, 11), "DISP0_VDDEN");
        gpio_direction_output(IMX_GPIO_NR(2, 10), 1);
        gpio_direction_output(IMX_GPIO_NR(2, 11), 1);
 }
@@ -362,6 +440,7 @@ static void setup_display(void)
 
        /* Disable LCD backlight */
        SETUP_IOMUX_PAD(PAD_DI0_PIN4__GPIO4_IO20);
+       gpio_request(IMX_GPIO_NR(4, 20), "LCD_BKLEN");
        gpio_direction_input(IMX_GPIO_NR(4, 20));
 }
 #endif /* CONFIG_VIDEO_IPUV3 */
@@ -376,18 +455,44 @@ 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_SATA
-       /* Only mx6q wandboard has SATA */
-       if (is_cpu_type(MXC_CPU_MX6Q))
-               setup_sata();
+       setup_sata();
 #endif
 
        return 0;
 }
 
+#define PMIC_I2C_BUS           2
+
+int power_init_board(void)
+{
+       struct udevice *dev;
+       int reg, ret;
+
+       puts("PMIC:  ");
+
+       ret = pmic_get("pfuze100", &dev);
+       if (ret < 0) {
+               printf("pmic_get() ret %d\n", ret);
+               return 0;
+       }
+
+       reg = pmic_reg_read(dev, PFUZE100_DEVICEID);
+       if (reg < 0) {
+               printf("pmic_reg_read() ret %d\n", reg);
+               return 0;
+       }
+       printf("PMIC:  PFUZE100 ID=0x%02x\n", reg);
+       with_pmic = true;
+
+       /* Set VGEN2 to 1.5V and enable */
+       reg = pmic_reg_read(dev, PFUZE100_VGEN2VOL);
+       reg &= ~(LDO_VOL_MASK);
+       reg |= (LDOA_1_50V | (1 << (LDO_EN)));
+       pmic_reg_write(dev, PFUZE100_VGEN2VOL, reg);
+       return 0;
+}
+
 /*
  * Do not overwrite the console
  * Use always serial for U-Boot console
@@ -417,6 +522,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
@@ -424,12 +537,16 @@ int board_late_init(void)
 #endif
 
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-       if (is_mx6dq())
+       if (is_mx6dqp())
+               env_set("board_rev", "MX6QP");
+       else if (is_mx6dq())
                env_set("board_rev", "MX6Q");
        else
                env_set("board_rev", "MX6DL");
 
-       if (is_revc1())
+       if (is_revd1())
+               env_set("board_name", "D1");
+       else if (is_revc1())
                env_set("board_name", "C1");
        else
                env_set("board_name", "B1");
@@ -443,11 +560,16 @@ int board_init(void)
        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())
-               setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c2_pad_info);
-       else
-               setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c2_pad_info);
+       setup_i2c(1, CONFIG_SYS_MXC_I2C1_SPEED, 0x7f, &mx6dl_i2c2_pad_info);
+       if (is_mx6dq() || is_mx6dqp()) {
+               setup_i2c(1, CONFIG_SYS_MXC_I2C1_SPEED, 0x7f, &mx6q_i2c2_pad_info);
+               setup_i2c(2, CONFIG_SYS_MXC_I2C2_SPEED, 0x7f, &mx6q_i2c3_pad_info);
+       } else {
+               setup_i2c(1, CONFIG_SYS_MXC_I2C1_SPEED, 0x7f, &mx6dl_i2c2_pad_info);
+               setup_i2c(2, CONFIG_SYS_MXC_I2C2_SPEED, 0x7f, &mx6dl_i2c3_pad_info);
+       }
+
+       setup_display();
 #endif
 
        return 0;
@@ -455,7 +577,11 @@ int board_init(void)
 
 int checkboard(void)
 {
-       if (is_revc1())
+       gpio_request(REV_DETECTION, "REV_DETECT");
+
+       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");