diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-30 17:09:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-30 17:09:50 -0500 |
| commit | 172e3c11901229f0fb88317ac73a47d944a74f46 (patch) | |
| tree | 15b0252705fe2ee78d7501c79a2161a172e2c75b /drivers/power/pmic/i2c_pmic_emul.c | |
| parent | daec1fd482b5ea735d70676a1909aec4355bbf86 (diff) | |
| parent | 1678754f5e2cbc14f9612e953b39cc08ada66866 (diff) | |
Merge tag 'pull-30nov18' of git://git.denx.de/u-boot-dm
Fix sound on sandbox
Convert TPM fully to DM
Tidy up sandbox I2C emulation
Add a 'make qcheck' target for faster testing
A few other misc things
(dropped the final patch which breaks clang for some reason)
Diffstat (limited to 'drivers/power/pmic/i2c_pmic_emul.c')
| -rw-r--r-- | drivers/power/pmic/i2c_pmic_emul.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c index 61fa76a561..80efc0265d 100644 --- a/drivers/power/pmic/i2c_pmic_emul.c +++ b/drivers/power/pmic/i2c_pmic_emul.c @@ -104,7 +104,7 @@ 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 udevice *pmic_dev = i2c_emul_get_device(emul); struct uc_pmic_priv *priv = dev_get_uclass_priv(pmic_dev); const u8 *reg_defaults; |