ad0e804843
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>
47 lines
1.0 KiB
C
47 lines
1.0 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
|
|
/*
|
|
* Copyright (C) 2016 Peng Fan <van.freenix@gmail.com>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <dm/pinctrl.h>
|
|
|
|
#include "pinctrl-imx.h"
|
|
|
|
static struct imx_pinctrl_soc_info imx5_pinctrl_soc_info;
|
|
|
|
static int imx5_pinctrl_probe(struct udevice *dev)
|
|
{
|
|
struct imx_pinctrl_soc_info *info =
|
|
(struct imx_pinctrl_soc_info *)dev_get_driver_data(dev);
|
|
|
|
return imx_pinctrl_probe(dev, info);
|
|
}
|
|
|
|
static const struct udevice_id imx5_pinctrl_match[] = {
|
|
{
|
|
.compatible = "fsl,imx53-iomuxc",
|
|
.data = (ulong)&imx5_pinctrl_soc_info
|
|
},
|
|
{
|
|
.compatible = "fsl,imx53-iomuxc-gpr",
|
|
.data = (ulong)&imx5_pinctrl_soc_info
|
|
},
|
|
{ /* sentinel */ }
|
|
};
|
|
|
|
U_BOOT_DRIVER(imx5_pinctrl) = {
|
|
.name = "imx5-pinctrl",
|
|
.id = UCLASS_PINCTRL,
|
|
.of_match = of_match_ptr(imx5_pinctrl_match),
|
|
.probe = imx5_pinctrl_probe,
|
|
.remove = imx_pinctrl_remove,
|
|
.priv_auto_alloc_size = sizeof(struct imx_pinctrl_priv),
|
|
.ops = &imx_pinctrl_ops,
|
|
#if !CONFIG_IS_ENABLED(OF_CONTROL)
|
|
.flags = DM_FLAG_PRE_RELOC,
|
|
#endif
|
|
};
|