Merge tag 'ti-v2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti

[oweals/u-boot.git] / drivers / power / pmic / i2c_pmic_emul.c

diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c
index 61fa76a5619948b81b56e3e59738fb05143d77ea..404fe008fe6b9161c93056b6234324257b2c19a3 100644 (file)
--- a/drivers/power/pmic/i2c_pmic_emul.c
+++ b/drivers/power/pmic/i2c_pmic_emul.c
@@ -8,6 +8,8 @@
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
+#include <log.h>
+#include <malloc.h>
 #include <power/pmic.h>
 #include <power/sandbox_pmic.h>
 
@@ -104,13 +106,22 @@ static int sandbox_i2c_pmic_xfer(struct udevice *emul, struct i2c_msg *msg,
 static int sandbox_i2c_pmic_ofdata_to_platdata(struct udevice *emul)
 {
        struct sandbox_i2c_pmic_plat_data *plat = dev_get_platdata(emul);
-       struct udevice *pmic_dev = dev_get_parent(emul);
-       struct uc_pmic_priv *priv = dev_get_uclass_priv(pmic_dev);
-       const u8 *reg_defaults;
+       struct udevice *pmic_dev = i2c_emul_get_device(emul);
 
        debug("%s:%d Setting PMIC default registers\n", __func__, __LINE__);
        plat->reg_count = pmic_reg_count(pmic_dev);
-       plat->trans_len = priv->trans_len;
+
+       return 0;
+}
+
+static int sandbox_i2c_pmic_probe(struct udevice *emul)
+{
+       struct sandbox_i2c_pmic_plat_data *plat = dev_get_platdata(emul);
+       struct udevice *pmic_dev = i2c_emul_get_device(emul);
+       struct uc_pmic_priv *upriv = dev_get_uclass_priv(pmic_dev);
+       const u8 *reg_defaults;
+
+       plat->trans_len = upriv->trans_len;
        plat->buf_size = plat->reg_count * plat->trans_len;
 
        plat->reg = calloc(1, plat->buf_size);
@@ -149,6 +160,7 @@ U_BOOT_DRIVER(sandbox_i2c_pmic_emul) = {
        .id             = UCLASS_I2C_EMUL,
        .of_match       = sandbox_i2c_pmic_ids,
        .ofdata_to_platdata = sandbox_i2c_pmic_ofdata_to_platdata,
+       .probe          = sandbox_i2c_pmic_probe,
        .platdata_auto_alloc_size = sizeof(struct sandbox_i2c_pmic_plat_data),
        .ops            = &sandbox_i2c_pmic_emul_ops,
 };