aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Meng2018-10-24 08:36:31 -0500
committerSimon Glass2018-11-14 11:16:28 -0600
commite0cfc20984a7ffbe5cb86a0c95ab5bf6287602b4 (patch)
treec2d35484447f7bdd21d2206a12f53e51b11abee1 /drivers
parent695c4994ac1d997b34e278e4e04ffd63b2aa6aed (diff)
downloadu-boot-e0cfc20984a7ffbe5cb86a0c95ab5bf6287602b4.tar.gz
u-boot-e0cfc20984a7ffbe5cb86a0c95ab5bf6287602b4.tar.xz
u-boot-e0cfc20984a7ffbe5cb86a0c95ab5bf6287602b4.zip
i2c: omap24xx: Surround DM_FLAG_PRE_RELOC flag with OF_CONTROL check
When a driver declares DM_FLAG_PRE_RELOC flag, it wishes to be bound before relocation. However due to a bug in the DM core, the flag only takes effect when devices are statically declared via U_BOOT_DEVICE(). This bug has been fixed recently by commit "dm: core: Respect drivers with the DM_FLAG_PRE_RELOC flag in lists_bind_fdt()", but with the fix, it has a side effect that all existing drivers that declared DM_FLAG_PRE_RELOC flag will be bound before relocation now. This may expose potential boot failure on some boards due to insufficient memory during the pre-relocation stage. To mitigate this potential impact, the following changes are implemented: - Remove DM_FLAG_PRE_RELOC flag in the driver, if the driver only supports configuration from device tree (OF_CONTROL) - Keep DM_FLAG_PRE_RELOC flag in the driver only if the device is statically declared via U_BOOT_DEVICE() - Surround DM_FLAG_PRE_RELOC flag with OF_CONTROL check, for drivers that support both statically declared devices and configuration from device tree Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/omap24xx_i2c.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 54bf35e552..51f923752c 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -925,7 +925,9 @@ U_BOOT_DRIVER(i2c_omap) = {
925 .probe = omap_i2c_probe, 925 .probe = omap_i2c_probe,
926 .priv_auto_alloc_size = sizeof(struct omap_i2c), 926 .priv_auto_alloc_size = sizeof(struct omap_i2c),
927 .ops = &omap_i2c_ops, 927 .ops = &omap_i2c_ops,
928#if !CONFIG_IS_ENABLED(OF_CONTROL)
928 .flags = DM_FLAG_PRE_RELOC, 929 .flags = DM_FLAG_PRE_RELOC,
930#endif
929}; 931};
930 932
931#endif /* CONFIG_DM_I2C */ 933#endif /* CONFIG_DM_I2C */