imx6: wandboard: convert to DM_I2C

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

diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 1e7c11e670f95e7c913a02ea4dbe593b3adf46b7..c0902abe38be05b6e3009a68e04404b3069c96e3 100644 (file)
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -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,7 +27,6 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <phy.h>
-#include <input.h>
 #include <i2c.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
@@ -133,12 +131,14 @@ static void setup_iomux_enet(void)
        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);
@@ -172,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)
@@ -350,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);
 }
@@ -420,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 */
@@ -445,24 +466,30 @@ int board_early_init_f(void)
 
 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);
+       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;
 }
 
@@ -533,13 +560,13 @@ 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);
+       setup_i2c(1, CONFIG_SYS_MXC_I2C1_SPEED, 0x7f, &mx6dl_i2c2_pad_info);
        if (is_mx6dq() || is_mx6dqp()) {
-               setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c2_pad_info);
-               setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c3_pad_info);
+               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_I2C_SPEED, 0x7f, &mx6dl_i2c2_pad_info);
-               setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c3_pad_info);
+               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();
@@ -550,6 +577,8 @@ int board_init(void)
 
 int checkboard(void)
 {
+       gpio_request(REV_DETECTION, "REV_DETECT");
+
        if (is_revd1())
                puts("Board: Wandboard rev D1\n");
        else if (is_revc1())