sandbox: pmic: Correct i2c pmic emulator platdata method
authorSimon Glass <sjg@chromium.org>
Mon, 27 Jan 2020 15:49:53 +0000 (08:49 -0700)
committerSimon Glass <sjg@chromium.org>
Thu, 6 Feb 2020 02:33:46 +0000 (19:33 -0700)
This currently reads the uclass's private data in the ofdata_to_platdata
method which is not allowed, since the uclass has not read it from the
device tree. This happens in the probe method.

Fix it by adding a probe() method and moving the code there.

Signed-off-by: Simon Glass <sjg@chromium.org>
drivers/power/pmic/i2c_pmic_emul.c

index 80efc0265d9fa8096b9ce3cf46baedd6e0175229..b58c8302cf726ed92f349fad1636f6febc0e7cfb 100644 (file)
@@ -105,12 +105,21 @@ 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 = i2c_emul_get_device(emul);
-       struct uc_pmic_priv *priv = dev_get_uclass_priv(pmic_dev);
-       const u8 *reg_defaults;
 
        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 +158,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,
 };