Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""

[J-u-boot.git] / drivers / power / pmic / pmic_tps65910.c

diff --git a/drivers/power/pmic/pmic_tps65910.c b/drivers/power/pmic/pmic_tps65910.c
index f4d2aa1b7a44c9be954b4e5d295fb402499d489e..e3de73082150244ef58e92a633db596b486c25e8 100644 (file)
--- a/drivers/power/pmic/pmic_tps65910.c
+++ b/drivers/power/pmic/pmic_tps65910.c
@@ -8,9 +8,50 @@
 #include <i2c.h>
 #include <power/tps65910.h>
 
+struct udevice *tps65910_dev __section(".data") = NULL;
+
+static inline int tps65910_read_reg(int addr, uchar *buf)
+{
+#if !CONFIG_IS_ENABLED(DM_I2C)
+       return i2c_read(TPS65910_CTRL_I2C_ADDR, addr, 1, buf, 1);
+#else
+       int rc;
+
+       rc = dm_i2c_reg_read(tps65910_dev, addr);
+       if (rc < 0)
+               return rc;
+       *buf = (uchar)rc;
+       return 0;
+#endif
+}
+
+static inline int tps65910_write_reg(int addr, uchar *buf)
+{
+#if !CONFIG_IS_ENABLED(DM_I2C)
+       return i2c_write(TPS65910_CTRL_I2C_ADDR, addr, 1, buf, 1);
+#else
+       return dm_i2c_reg_write(tps65910_dev, addr, *buf);
+#endif
+}
+
+int power_tps65910_init(unsigned char bus)
+{
+#if CONFIG_IS_ENABLED(DM_I2C)
+       struct udevice *dev = NULL;
+       int rc;
+
+       rc = i2c_get_chip_for_busnum(bus, TPS65910_CTRL_I2C_ADDR, 1, &dev);
+
+       if (rc)
+               return rc;
+       tps65910_dev = dev;
+#endif
+       return 0;
+}
+
 /*
  * tps65910_set_i2c_control() - Set the TPS65910 to be controlled via the I2C
- *                             interface.
+ *                             interface.
  * @return:                   0 on success, not 0 on failure
  */
 int tps65910_set_i2c_control(void)
@@ -19,16 +60,14 @@ int tps65910_set_i2c_control(void)
        uchar buf;
 
        /* VDD1/2 voltage selection register access by control i/f */
-       ret = i2c_read(TPS65910_CTRL_I2C_ADDR, TPS65910_DEVCTRL_REG, 1,
-                      &buf, 1);
+       ret = tps65910_read_reg(TPS65910_DEVCTRL_REG, &buf);
 
        if (ret)
                return ret;
 
        buf |= TPS65910_DEVCTRL_REG_SR_CTL_I2C_SEL_CTL_I2C;
 
-       return i2c_write(TPS65910_CTRL_I2C_ADDR, TPS65910_DEVCTRL_REG, 1,
-                        &buf, 1);
+       return tps65910_write_reg(TPS65910_DEVCTRL_REG, &buf);
 }
 
 /*
@@ -49,29 +88,29 @@ int tps65910_voltage_update(unsigned int module, unsigned char vddx_op_vol_sel)
                reg_offset = TPS65910_VDD2_OP_REG;
 
        /* Select VDDx OP   */
-       ret = i2c_read(TPS65910_CTRL_I2C_ADDR, reg_offset, 1, &buf, 1);
+       ret = tps65910_read_reg(reg_offset, &buf);
        if (ret)
                return ret;
 
        buf &= ~TPS65910_OP_REG_CMD_MASK;
 
-       ret = i2c_write(TPS65910_CTRL_I2C_ADDR, reg_offset, 1, &buf, 1);
+       ret = tps65910_write_reg(reg_offset, &buf);
        if (ret)
                return ret;
 
        /* Configure VDDx OP  Voltage */
-       ret = i2c_read(TPS65910_CTRL_I2C_ADDR, reg_offset, 1, &buf, 1);
+       ret = tps65910_read_reg(reg_offset, &buf);
        if (ret)
                return ret;
 
        buf &= ~TPS65910_OP_REG_SEL_MASK;
        buf |= vddx_op_vol_sel;
 
-       ret = i2c_write(TPS65910_CTRL_I2C_ADDR, reg_offset, 1, &buf, 1);
+       ret = tps65910_write_reg(reg_offset, &buf);
        if (ret)
                return ret;
 
-       ret = i2c_read(TPS65910_CTRL_I2C_ADDR, reg_offset, 1, &buf, 1);
+       ret = tps65910_read_reg(reg_offset, &buf);
        if (ret)
                return ret;