udoo_neo: Move to DM for REGULATOR/PMIC/I2C drivers

This moves over the PMIC power init to DM and the associated i2c and
regulator bits.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Fabio Estevam <festevam@denx.de>

diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 5e40583..9e2a669 100644 (file)
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -51,11 +51,6 @@ enum {
        PAD_CTL_PUS_22K_UP  | PAD_CTL_SPEED_LOW |               \
        PAD_CTL_DSE_80ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
 
-#define I2C_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE |              \
-       PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |               \
-       PAD_CTL_DSE_40ohm | PAD_CTL_HYS |               \
-       PAD_CTL_ODE)
-
 #define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP | PAD_CTL_PUE |     \
        PAD_CTL_SPEED_MED   |                                   \
        PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST)
@@ -83,135 +78,25 @@ int dram_init(void)
        return 0;
 }
 
-#ifdef CONFIG_SYS_I2C_MXC
-#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
-/* I2C1 for PMIC */
-static struct i2c_pads_info i2c_pad_info1 = {
-       .scl = {
-               .i2c_mode = MX6_PAD_GPIO1_IO00__I2C1_SCL | PC,
-               .gpio_mode = MX6_PAD_GPIO1_IO00__GPIO1_IO_0 | PC,
-               .gp = IMX_GPIO_NR(1, 0),
-       },
-       .sda = {
-               .i2c_mode = MX6_PAD_GPIO1_IO01__I2C1_SDA | PC,
-               .gpio_mode = MX6_PAD_GPIO1_IO01__GPIO1_IO_1 | PC,
-               .gp = IMX_GPIO_NR(1, 1),
-       },
-};
-#endif
-
-#if CONFIG_IS_ENABLED(POWER_LEGACY)
 int power_init_board(void)
 {
-       struct pmic *p;
-       int ret;
-       unsigned int reg, rev_id;
-
-       ret = power_pfuze3000_init(PFUZE3000_I2C_BUS);
-       if (ret)
-               return ret;
-
-       p = pmic_get("PFUZE3000");
-       ret = pmic_probe(p);
-       if (ret)
-               return ret;
+       struct udevice *dev;
+       int ret, dev_id, rev_id;
 
-       pmic_reg_read(p, PFUZE3000_DEVICEID, &reg);
-       pmic_reg_read(p, PFUZE3000_REVID, &rev_id);
-       printf("PMIC:  PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", reg, rev_id);
-
-       /* disable Low Power Mode during standby mode */
-       pmic_reg_read(p, PFUZE3000_LDOGCTL, &reg);
-       reg |= 0x1;
-       ret = pmic_reg_write(p, PFUZE3000_LDOGCTL, reg);
-       if (ret)
+       ret = pmic_get("pfuze3000@8", &dev);
+       if (ret == -ENODEV)
+               return 0;
+       if (ret != 0)
                return ret;
 
-       ret = pmic_reg_write(p, PFUZE3000_SW1AMODE, 0xc);
-       if (ret)
-               return ret;
+       dev_id = pmic_reg_read(dev, PFUZE3000_DEVICEID);
+       rev_id = pmic_reg_read(dev, PFUZE3000_REVID);
+       printf("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", dev_id, rev_id);
 
-       ret = pmic_reg_write(p, PFUZE3000_SW1BMODE, 0xc);
-       if (ret)
-               return ret;
-
-       ret = pmic_reg_write(p, PFUZE3000_SW2MODE, 0xc);
-       if (ret)
-               return ret;
-
-       ret = pmic_reg_write(p, PFUZE3000_SW3MODE, 0xc);
-       if (ret)
-               return ret;
-
-       /* set SW1A standby voltage 0.975V */
-       pmic_reg_read(p, PFUZE3000_SW1ASTBY, &reg);
-       reg &= ~0x3f;
-       reg |= PFUZE3000_SW1AB_SETP(9750);
-       ret = pmic_reg_write(p, PFUZE3000_SW1ASTBY, reg);
-       if (ret)
-               return ret;
-
-       /* set SW1B standby voltage 0.975V */
-       pmic_reg_read(p, PFUZE3000_SW1BSTBY, &reg);
-       reg &= ~0x3f;
-       reg |= PFUZE3000_SW1AB_SETP(9750);
-       ret = pmic_reg_write(p, PFUZE3000_SW1BSTBY, reg);
-       if (ret)
-               return ret;
-
-       /* set SW1A/VDD_ARM_IN step ramp up time from 16us to 4us/25mV */
-       pmic_reg_read(p, PFUZE3000_SW1ACONF, &reg);
-       reg &= ~0xc0;
-       reg |= 0x40;
-       ret = pmic_reg_write(p, PFUZE3000_SW1ACONF, reg);
-       if (ret)
-               return ret;
-
-       /* set SW1B/VDD_SOC_IN step ramp up time from 16us to 4us/25mV */
-       pmic_reg_read(p, PFUZE3000_SW1BCONF, &reg);
-       reg &= ~0xc0;
-       reg |= 0x40;
-       ret = pmic_reg_write(p, PFUZE3000_SW1BCONF, reg);
-       if (ret)
-               return ret;
-
-       /* set VDD_ARM_IN to 1.350V */
-       pmic_reg_read(p, PFUZE3000_SW1AVOLT, &reg);
-       reg &= ~0x3f;
-       reg |= PFUZE3000_SW1AB_SETP(13500);
-       ret = pmic_reg_write(p, PFUZE3000_SW1AVOLT, reg);
-       if (ret)
-               return ret;
-
-       /* set VDD_SOC_IN to 1.350V */
-       pmic_reg_read(p, PFUZE3000_SW1BVOLT, &reg);
-       reg &= ~0x3f;
-       reg |= PFUZE3000_SW1AB_SETP(13500);
-       ret = pmic_reg_write(p, PFUZE3000_SW1BVOLT, reg);
-       if (ret)
-               return ret;
-
-       /* set DDR_1_5V to 1.350V */
-       pmic_reg_read(p, PFUZE3000_SW3VOLT, &reg);
-       reg &= ~0x0f;
-       reg |= PFUZE3000_SW3_SETP(13500);
-       ret = pmic_reg_write(p, PFUZE3000_SW3VOLT, reg);
-       if (ret)
-               return ret;
-
-       /* set VGEN2_1V5 to 1.5V */
-       pmic_reg_read(p, PFUZE3000_VLDO2CTL, &reg);
-       reg &= ~0x0f;
-       reg |= PFUZE3000_VLDO_SETP(15000);
-       /*  enable  */
-       reg |= 0x10;
-       ret = pmic_reg_write(p, PFUZE3000_VLDO2CTL, reg);
-       if (ret)
-               return ret;
+       pmic_clrsetbits(dev, PFUZE3000_LDOGCTL, 0, 1);
 
        return 0;
 }
-#endif
 
 static iomux_v3_cfg_t const uart1_pads[] = {
        MX6_PAD_GPIO1_IO04__UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
@@ -294,10 +179,6 @@ int board_init(void)
        gpio_request(IMX_GPIO_NR(4, 16), "ncp692");
        gpio_direction_output(IMX_GPIO_NR(4, 16) , 1);
 
-#ifdef CONFIG_SYS_I2C_MXC
-       setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
-#endif
-
        setup_fec();
 
        return 0;

diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig
index f62a585..a450482 100644 (file)
--- a/configs/udoo_neo_defconfig
+++ b/configs/udoo_neo_defconfig
@@ -10,7 +10,7 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x80000
 CONFIG_MX6SX=y
 CONFIG_TARGET_UDOO_NEO=y
-CONFIG_SYS_I2C_MXC_I2C1=y
+CONFIG_DM_I2C=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6sx-udoo-neo-basic"
 CONFIG_SPL_TEXT_BASE=0x00908000
@@ -44,8 +44,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_BOUNCE_BUFFER=y
-CONFIG_SYS_I2C_LEGACY=y
-CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MXC=y
 CONFIG_FSL_USDHC=y
 CONFIG_PHYLIB=y
@@ -56,12 +54,12 @@ CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
-CONFIG_POWER_LEGACY=y
-CONFIG_POWER_PFUZE3000=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_ANATOP=y
-CONFIG_POWER_I2C=y
+CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_MXC_UART=y
 CONFIG_IMX_THERMAL=y
 CONFIG_USB=y

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 8038641..4ecd71f 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -53,16 +53,10 @@
 
 #include <config_distro_bootcmd.h>
 
-/* Miscellaneous configurable options */
-
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
 #define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
 #define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
-/* PMIC */
-#define CFG_POWER_PFUZE3000_I2C_ADDR   0x08
-#define PFUZE3000_I2C_BUS      0
-
 #endif                         /* __CONFIG_H */