Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

treewide: Simply conditions with the new OF_REAL

Browse source 
Use this new Kconfig to simplify the compilation conditions where
appropriate.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-08-07 07:24:03 -06:00
parent eaad01a3d0
commit 414cc15144
38 changed files with 71 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/lib/lpc-uclass.c
View file

@ -10,7 +10,7 @@
UCLASS_DRIVER(lpc) = { UCLASS_DRIVER(lpc) = {
.id = UCLASS_LPC, .id = UCLASS_LPC,
.name = "lpc", .name = "lpc",
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.post_bind = dm_scan_fdt_dev, .post_bind = dm_scan_fdt_dev,
#endif #endif
}; };

2
common/spl/spl.c
View file

@ -489,7 +489,7 @@ static int spl_common_init(bool setup_malloc)
return ret; return ret;
} }
#endif #endif
if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) { if (CONFIG_IS_ENABLED(OF_REAL)) {
ret = fdtdec_setup(); ret = fdtdec_setup();
if (ret) { if (ret) {
debug("fdtdec_setup() returned error %d\n", ret); debug("fdtdec_setup() returned error %d\n", ret);

4
common/spl/spl_spi.c
View file

@ -102,10 +102,10 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
header = spl_get_load_buffer(-sizeof(*header), sizeof(*header)); header = spl_get_load_buffer(-sizeof(*header), sizeof(*header));
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) if (CONFIG_IS_ENABLED(OF_REAL)) {
payload_offs = ofnode_conf_read_int("u-boot,spl-payload-offset", payload_offs = ofnode_conf_read_int("u-boot,spl-payload-offset",
payload_offs); payload_offs);
#endif }
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT
if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header)) if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header))

8
drivers/clk/clk-uclass.c
View file

@ -35,7 +35,6 @@ struct clk *dev_get_clk_ptr(struct udevice *dev)
return (struct clk *)dev_get_uclass_priv(dev); return (struct clk *)dev_get_uclass_priv(dev);
} }
#if CONFIG_IS_ENABLED(OF_CONTROL)
#if CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_PLATDATA)
int clk_get_by_driver_info(struct udevice *dev, struct phandle_1_arg *cells, int clk_get_by_driver_info(struct udevice *dev, struct phandle_1_arg *cells,
struct clk *clk) struct clk *clk)
@ -49,7 +48,9 @@ int clk_get_by_driver_info(struct udevice *dev, struct phandle_1_arg *cells,
return 0; return 0;
} }
# else #endif
#if CONFIG_IS_ENABLED(OF_REAL)
static int clk_of_xlate_default(struct clk *clk, static int clk_of_xlate_default(struct clk *clk,
struct ofnode_phandle_args *args) struct ofnode_phandle_args *args)
{ {
@ -412,7 +413,6 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
return clk_get_by_index(dev, index, clk); return clk_get_by_index(dev, index, clk);
} }
# endif /* OF_PLATDATA */
int clk_get_by_name_nodev(ofnode node, const char *name, struct clk *clk) int clk_get_by_name_nodev(ofnode node, const char *name, struct clk *clk)
{ {
@ -465,7 +465,7 @@ int clk_release_all(struct clk *clk, int count)
return 0; return 0;
} }
#endif /* OF_CONTROL */ #endif /* OF_REAL */
int clk_request(struct udevice *dev, struct clk *clk) int clk_request(struct udevice *dev, struct clk *clk)
{ {

4
drivers/clk/rockchip/clk_px30.c
View file

@ -1367,7 +1367,7 @@ static ulong px30_clk_set_rate(struct clk *clk, ulong rate)
return ret; return ret;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static int px30_gmac_set_parent(struct clk *clk, struct clk *parent) static int px30_gmac_set_parent(struct clk *clk, struct clk *parent)
{ {
struct px30_clk_priv *priv = dev_get_priv(clk->dev); struct px30_clk_priv *priv = dev_get_priv(clk->dev);
@ -1418,7 +1418,7 @@ static int px30_clk_enable(struct clk *clk)
static struct clk_ops px30_clk_ops = { static struct clk_ops px30_clk_ops = {
.get_rate = px30_clk_get_rate, .get_rate = px30_clk_get_rate,
.set_rate = px30_clk_set_rate, .set_rate = px30_clk_set_rate,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.set_parent = px30_clk_set_parent, .set_parent = px30_clk_set_parent,
#endif #endif
.enable = px30_clk_enable, .enable = px30_clk_enable,

2
drivers/clk/rockchip/clk_rk3288.c
View file

@ -950,7 +950,7 @@ static int __maybe_unused rk3288_clk_set_parent(struct clk *clk, struct clk *par
static struct clk_ops rk3288_clk_ops = { static struct clk_ops rk3288_clk_ops = {
.get_rate = rk3288_clk_get_rate, .get_rate = rk3288_clk_get_rate,
.set_rate = rk3288_clk_set_rate, .set_rate = rk3288_clk_set_rate,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.set_parent = rk3288_clk_set_parent, .set_parent = rk3288_clk_set_parent,
#endif #endif
}; };

4
drivers/clk/rockchip/clk_rk3308.c
View file

@ -939,7 +939,7 @@ static ulong rk3308_clk_set_rate(struct clk *clk, ulong rate)
return ret; return ret;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static int __maybe_unused rk3308_mac_set_parent(struct clk *clk, struct clk *parent) static int __maybe_unused rk3308_mac_set_parent(struct clk *clk, struct clk *parent)
{ {
struct rk3308_clk_priv *priv = dev_get_priv(clk->dev); struct rk3308_clk_priv *priv = dev_get_priv(clk->dev);
@ -976,7 +976,7 @@ static int __maybe_unused rk3308_clk_set_parent(struct clk *clk, struct clk *par
static struct clk_ops rk3308_clk_ops = { static struct clk_ops rk3308_clk_ops = {
.get_rate = rk3308_clk_get_rate, .get_rate = rk3308_clk_get_rate,
.set_rate = rk3308_clk_set_rate, .set_rate = rk3308_clk_set_rate,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.set_parent = rk3308_clk_set_parent, .set_parent = rk3308_clk_set_parent,
#endif #endif
}; };

2
drivers/clk/rockchip/clk_rk3368.c
View file

@ -574,7 +574,7 @@ static int __maybe_unused rk3368_clk_set_parent(struct clk *clk, struct clk *par
static struct clk_ops rk3368_clk_ops = { static struct clk_ops rk3368_clk_ops = {
.get_rate = rk3368_clk_get_rate, .get_rate = rk3368_clk_get_rate,
.set_rate = rk3368_clk_set_rate, .set_rate = rk3368_clk_set_rate,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.set_parent = rk3368_clk_set_parent, .set_parent = rk3368_clk_set_parent,
#endif #endif
}; };

2
drivers/clk/rockchip/clk_rk3399.c
View file

@ -1289,7 +1289,7 @@ static int rk3399_clk_disable(struct clk *clk)
static struct clk_ops rk3399_clk_ops = { static struct clk_ops rk3399_clk_ops = {
.get_rate = rk3399_clk_get_rate, .get_rate = rk3399_clk_get_rate,
.set_rate = rk3399_clk_set_rate, .set_rate = rk3399_clk_set_rate,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.set_parent = rk3399_clk_set_parent, .set_parent = rk3399_clk_set_parent,
#endif #endif
.enable = rk3399_clk_enable, .enable = rk3399_clk_enable,

4
drivers/core/device.c
View file

@ -670,7 +670,7 @@ static int device_get_device_tail(struct udevice *dev, int ret,
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
/** /**
* device_find_by_ofnode() - Return device associated with given ofnode * device_find_by_ofnode() - Return device associated with given ofnode
* *
@ -1074,7 +1074,7 @@ void dev_set_uclass_plat(struct udevice *dev, void *uclass_plat)
dev->uclass_plat_ = uclass_plat; dev->uclass_plat_ = uclass_plat;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
bool device_is_compatible(const struct udevice *dev, const char *compat) bool device_is_compatible(const struct udevice *dev, const char *compat)
{ {
return ofnode_device_is_compatible(dev_ofnode(dev), compat); return ofnode_device_is_compatible(dev_ofnode(dev), compat);

2
drivers/core/fdtaddr.c
View file

@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR;
fdt_addr_t devfdt_get_addr_index(const struct udevice *dev, int index) fdt_addr_t devfdt_get_addr_index(const struct udevice *dev, int index)
{ {
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
fdt_addr_t addr; fdt_addr_t addr;
if (CONFIG_IS_ENABLED(OF_TRANSLATE)) { if (CONFIG_IS_ENABLED(OF_TRANSLATE)) {

2
drivers/core/lists.c
View file

@ -154,7 +154,7 @@ int device_bind_driver_to_node(struct udevice *parent, const char *drv_name,
return ret; return ret;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
/** /**
* driver_check_compatible() - Check if a driver matches a compatible string * driver_check_compatible() - Check if a driver matches a compatible string
* *

4
drivers/core/root.c
View file

@ -245,7 +245,7 @@ int dm_scan_plat(bool pre_reloc_only)
return ret; return ret;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
/** /**
* dm_scan_fdt_node() - Scan the device tree and bind drivers for a node * dm_scan_fdt_node() - Scan the device tree and bind drivers for a node
* *
@ -372,7 +372,7 @@ static int dm_scan(bool pre_reloc_only)
return ret; return ret;
} }
if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) { if (CONFIG_IS_ENABLED(OF_REAL)) {
ret = dm_extended_scan(pre_reloc_only); ret = dm_extended_scan(pre_reloc_only);
if (ret) { if (ret) {
debug("dm_extended_scan() failed: %d\n", ret); debug("dm_extended_scan() failed: %d\n", ret);

2
drivers/core/uclass.c
View file

@ -397,7 +397,7 @@ done:
return ret; return ret;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
int uclass_find_device_by_phandle(enum uclass_id id, struct udevice *parent, int uclass_find_device_by_phandle(enum uclass_id id, struct udevice *parent,
const char *name, struct udevice **devp) const char *name, struct udevice **devp)
{ {

2
drivers/firmware/firmware-uclass.c
View file

@ -9,7 +9,7 @@
UCLASS_DRIVER(firmware) = { UCLASS_DRIVER(firmware) = {
.id = UCLASS_FIRMWARE, .id = UCLASS_FIRMWARE,
.name = "firmware", .name = "firmware",
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.post_bind = dm_scan_fdt_dev, .post_bind = dm_scan_fdt_dev,
#endif #endif
}; };

4
drivers/gpio/mxs_gpio.c
View file

@ -262,7 +262,7 @@ static int mxs_gpio_probe(struct udevice *dev)
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static int mxs_of_to_plat(struct udevice *dev) static int mxs_of_to_plat(struct udevice *dev)
{ {
struct mxs_gpio_plat *plat = dev_get_plat(dev); struct mxs_gpio_plat *plat = dev_get_plat(dev);
@ -301,7 +301,7 @@ U_BOOT_DRIVER(fsl_imx23_gpio) = {
.probe = mxs_gpio_probe, .probe = mxs_gpio_probe,
.priv_auto = sizeof(struct mxs_gpio_priv), .priv_auto = sizeof(struct mxs_gpio_priv),
.plat_auto = sizeof(struct mxs_gpio_plat), .plat_auto = sizeof(struct mxs_gpio_plat),
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.of_match = mxs_gpio_ids, .of_match = mxs_gpio_ids,
.of_to_plat = mxs_of_to_plat, .of_to_plat = mxs_of_to_plat,
#endif #endif

2
drivers/gpio/omap_gpio.c
View file

@ -336,7 +336,7 @@ static int omap_gpio_bind(struct udevice *dev)
} }
#endif #endif
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static const struct udevice_id omap_gpio_ids[] = { static const struct udevice_id omap_gpio_ids[] = {
{ .compatible = "ti,omap3-gpio" }, { .compatible = "ti,omap3-gpio" },
{ .compatible = "ti,omap4-gpio" }, { .compatible = "ti,omap4-gpio" },

10
drivers/i2c/i2c-uclass.c
View file

@ -633,7 +633,7 @@ int i2c_deblock(struct udevice *bus)
return ops->deblock(bus); return ops->deblock(bus);
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
int i2c_chip_of_to_plat(struct udevice *dev, struct dm_i2c_chip *chip) int i2c_chip_of_to_plat(struct udevice *dev, struct dm_i2c_chip *chip)
{ {
int addr; int addr;
@ -655,7 +655,7 @@ int i2c_chip_of_to_plat(struct udevice *dev, struct dm_i2c_chip *chip)
static int i2c_pre_probe(struct udevice *dev) static int i2c_pre_probe(struct udevice *dev)
{ {
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
struct dm_i2c_bus *i2c = dev_get_uclass_priv(dev); struct dm_i2c_bus *i2c = dev_get_uclass_priv(dev);
unsigned int max = 0; unsigned int max = 0;
ofnode node; ofnode node;
@ -678,7 +678,7 @@ static int i2c_pre_probe(struct udevice *dev)
static int i2c_post_probe(struct udevice *dev) static int i2c_post_probe(struct udevice *dev)
{ {
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
struct dm_i2c_bus *i2c = dev_get_uclass_priv(dev); struct dm_i2c_bus *i2c = dev_get_uclass_priv(dev);
i2c->speed_hz = dev_read_u32_default(dev, "clock-frequency", i2c->speed_hz = dev_read_u32_default(dev, "clock-frequency",
@ -692,7 +692,7 @@ static int i2c_post_probe(struct udevice *dev)
static int i2c_child_post_bind(struct udevice *dev) static int i2c_child_post_bind(struct udevice *dev)
{ {
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
struct dm_i2c_chip *plat = dev_get_parent_plat(dev); struct dm_i2c_chip *plat = dev_get_parent_plat(dev);
if (!dev_has_ofnode(dev)) if (!dev_has_ofnode(dev))
@ -709,7 +709,7 @@ static int i2c_post_bind(struct udevice *dev)
debug("%s: %s, seq=%d\n", __func__, dev->name, dev_seq(dev)); debug("%s: %s, seq=%d\n", __func__, dev->name, dev_seq(dev));
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
ret = dm_scan_fdt_dev(dev); ret = dm_scan_fdt_dev(dev);
#endif #endif
return ret; return ret;

4
drivers/i2c/omap24xx_i2c.c
View file

@ -1034,7 +1034,7 @@ static int omap_i2c_probe(struct udevice *bus)
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static int omap_i2c_of_to_plat(struct udevice *bus) static int omap_i2c_of_to_plat(struct udevice *bus)
{ {
struct omap_i2c_plat *plat = dev_get_plat(bus); struct omap_i2c_plat *plat = dev_get_plat(bus);
@ -1063,7 +1063,7 @@ static const struct dm_i2c_ops omap_i2c_ops = {
U_BOOT_DRIVER(i2c_omap) = { U_BOOT_DRIVER(i2c_omap) = {
.name = "i2c_omap", .name = "i2c_omap",
.id = UCLASS_I2C, .id = UCLASS_I2C,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.of_match = omap_i2c_ids, .of_match = omap_i2c_ids,
.of_to_plat = omap_i2c_of_to_plat, .of_to_plat = omap_i2c_of_to_plat,
.plat_auto = sizeof(struct omap_i2c_plat), .plat_auto = sizeof(struct omap_i2c_plat),

2
drivers/misc/misc-uclass.c
View file

@ -70,7 +70,7 @@ int misc_set_enabled(struct udevice *dev, bool val)
UCLASS_DRIVER(misc) = { UCLASS_DRIVER(misc) = {
.id = UCLASS_MISC, .id = UCLASS_MISC,
.name = "misc", .name = "misc",
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.post_bind = dm_scan_fdt_dev, .post_bind = dm_scan_fdt_dev,
#endif #endif
}; };

4
drivers/mmc/mxsmmc.c
View file

@ -665,7 +665,7 @@ static const struct dm_mmc_ops mxsmmc_ops = {
.set_ios = mxsmmc_set_ios, .set_ios = mxsmmc_set_ios,
}; };
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static int mxsmmc_of_to_plat(struct udevice *bus) static int mxsmmc_of_to_plat(struct udevice *bus)
{ {
struct mxsmmc_plat *plat = dev_get_plat(bus); struct mxsmmc_plat *plat = dev_get_plat(bus);
@ -709,7 +709,7 @@ static const struct udevice_id mxsmmc_ids[] = {
U_BOOT_DRIVER(fsl_imx23_mmc) = { U_BOOT_DRIVER(fsl_imx23_mmc) = {
.name = "fsl_imx23_mmc", .name = "fsl_imx23_mmc",
.id = UCLASS_MMC, .id = UCLASS_MMC,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.of_match = mxsmmc_ids, .of_match = mxsmmc_ids,
.of_to_plat = mxsmmc_of_to_plat, .of_to_plat = mxsmmc_of_to_plat,
#endif #endif

6
drivers/mmc/omap_hsmmc.c
View file

@ -1891,7 +1891,7 @@ static int omap_hsmmc_get_pinctrl_state(struct mmc *mmc)
} }
#endif #endif
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
#ifdef CONFIG_OMAP54XX #ifdef CONFIG_OMAP54XX
__weak const struct mmc_platform_fixups *platform_fixups_mmc(uint32_t addr) __weak const struct mmc_platform_fixups *platform_fixups_mmc(uint32_t addr)
{ {
@ -2009,7 +2009,7 @@ static int omap_hsmmc_probe(struct udevice *dev)
return omap_hsmmc_init_setup(mmc); return omap_hsmmc_init_setup(mmc);
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static const struct omap_mmc_of_data dra7_mmc_of_data = { static const struct omap_mmc_of_data dra7_mmc_of_data = {
.controller_flags = OMAP_HSMMC_REQUIRE_IODELAY, .controller_flags = OMAP_HSMMC_REQUIRE_IODELAY,
@ -2027,7 +2027,7 @@ static const struct udevice_id omap_hsmmc_ids[] = {
U_BOOT_DRIVER(omap_hsmmc) = { U_BOOT_DRIVER(omap_hsmmc) = {
.name = "omap_hsmmc", .name = "omap_hsmmc",
.id = UCLASS_MMC, .id = UCLASS_MMC,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.of_match = omap_hsmmc_ids, .of_match = omap_hsmmc_ids,
.of_to_plat = omap_hsmmc_of_to_plat, .of_to_plat = omap_hsmmc_of_to_plat,
.plat_auto = sizeof(struct omap_hsmmc_plat), .plat_auto = sizeof(struct omap_hsmmc_plat),

2
drivers/pch/pch-uclass.c
View file

@ -66,7 +66,7 @@ int pch_ioctl(struct udevice *dev, ulong req, void *data, int size)
UCLASS_DRIVER(pch) = { UCLASS_DRIVER(pch) = {
.id = UCLASS_PCH, .id = UCLASS_PCH,
.name = "pch", .name = "pch",
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.post_bind = dm_scan_fdt_dev, .post_bind = dm_scan_fdt_dev,
#endif #endif
}; };

2
drivers/pinctrl/pinctrl-qe-io.c
View file

@ -248,7 +248,7 @@ U_BOOT_DRIVER(par_io_pinctrl) = {
.of_to_plat = qe_io_of_to_plat, .of_to_plat = qe_io_of_to_plat,
.plat_auto = sizeof(struct qe_io_plat), .plat_auto = sizeof(struct qe_io_plat),
.ops = &par_io_pinctrl_ops, .ops = &par_io_pinctrl_ops,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.flags = DM_FLAG_PRE_RELOC, .flags = DM_FLAG_PRE_RELOC,
#endif #endif
}; };

4
drivers/power/domain/power-domain-uclass.c
View file

@ -112,7 +112,7 @@ int power_domain_off(struct power_domain *power_domain)
return ops->off(power_domain); return ops->off(power_domain);
} }
#if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) #if CONFIG_IS_ENABLED(OF_REAL)
static int dev_power_domain_ctrl(struct udevice *dev, bool on) static int dev_power_domain_ctrl(struct udevice *dev, bool on)
{ {
struct power_domain pd; struct power_domain pd;
@ -162,7 +162,7 @@ int dev_power_domain_off(struct udevice *dev)
{ {
return dev_power_domain_ctrl(dev, false); return dev_power_domain_ctrl(dev, false);
} }
#endif #endif /* OF_REAL */
UCLASS_DRIVER(power_domain) = { UCLASS_DRIVER(power_domain) = {
.id = UCLASS_POWER_DOMAIN, .id = UCLASS_POWER_DOMAIN,

8
drivers/serial/ns16550.c
View file

@ -533,7 +533,7 @@ enum {
}; };
#endif #endif
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
int ns16550_serial_of_to_plat(struct udevice *dev) int ns16550_serial_of_to_plat(struct udevice *dev)
{ {
struct ns16550_plat *plat = dev_get_plat(dev); struct ns16550_plat *plat = dev_get_plat(dev);
@ -588,7 +588,7 @@ const struct dm_serial_ops ns16550_serial_ops = {
.getinfo = ns16550_serial_getinfo, .getinfo = ns16550_serial_getinfo,
}; };
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
/* /*
* Please consider existing compatible strings before adding a new * Please consider existing compatible strings before adding a new
* one to keep this table compact. Or you may add a generic "ns16550" * one to keep this table compact. Or you may add a generic "ns16550"
@ -602,7 +602,7 @@ static const struct udevice_id ns16550_serial_ids[] = {
{ .compatible = "snps,dw-apb-uart", .data = PORT_NS16550 }, { .compatible = "snps,dw-apb-uart", .data = PORT_NS16550 },
{} {}
}; };
#endif /* OF_CONTROL && !OF_PLATDATA */ #endif /* OF_REAL */
#if CONFIG_IS_ENABLED(SERIAL_PRESENT) #if CONFIG_IS_ENABLED(SERIAL_PRESENT)
@ -611,7 +611,7 @@ static const struct udevice_id ns16550_serial_ids[] = {
U_BOOT_DRIVER(ns16550_serial) = { U_BOOT_DRIVER(ns16550_serial) = {
.name = "ns16550_serial", .name = "ns16550_serial",
.id = UCLASS_SERIAL, .id = UCLASS_SERIAL,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.of_match = ns16550_serial_ids, .of_match = ns16550_serial_ids,
.of_to_plat = ns16550_serial_of_to_plat, .of_to_plat = ns16550_serial_of_to_plat,
.plat_auto = sizeof(struct ns16550_plat), .plat_auto = sizeof(struct ns16550_plat),

6
drivers/serial/serial_omap.c
View file

@ -98,7 +98,7 @@ DEBUG_UART_FUNCS
#if CONFIG_IS_ENABLED(DM_SERIAL) #if CONFIG_IS_ENABLED(DM_SERIAL)
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static int omap_serial_of_to_plat(struct udevice *dev) static int omap_serial_of_to_plat(struct udevice *dev)
{ {
struct ns16550_plat *plat = dev_get_plat(dev); struct ns16550_plat *plat = dev_get_plat(dev);
@ -149,13 +149,13 @@ static const struct udevice_id omap_serial_ids[] = {
{ .compatible = "ti,am654-uart", }, { .compatible = "ti,am654-uart", },
{} {}
}; };
#endif /* OF_CONTROL && !OF_PLATDATA */ #endif /* OF_REAL */
#if CONFIG_IS_ENABLED(SERIAL_PRESENT) #if CONFIG_IS_ENABLED(SERIAL_PRESENT)
U_BOOT_DRIVER(omap_serial) = { U_BOOT_DRIVER(omap_serial) = {
.name = "omap_serial", .name = "omap_serial",
.id = UCLASS_SERIAL, .id = UCLASS_SERIAL,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.of_match = omap_serial_ids, .of_match = omap_serial_ids,
.of_to_plat = omap_serial_of_to_plat, .of_to_plat = omap_serial_of_to_plat,
.plat_auto = sizeof(struct ns16550_plat), .plat_auto = sizeof(struct ns16550_plat),

4
drivers/spi/cf_spi.c
View file

@ -384,7 +384,7 @@ static int coldfire_spi_probe(struct udevice *bus)
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static int coldfire_dspi_of_to_plat(struct udevice *bus) static int coldfire_dspi_of_to_plat(struct udevice *bus)
{ {
fdt_addr_t addr; fdt_addr_t addr;
@ -450,7 +450,7 @@ static const struct dm_spi_ops coldfire_spi_ops = {
U_BOOT_DRIVER(coldfire_spi) = { U_BOOT_DRIVER(coldfire_spi) = {
.name = "spi_coldfire", .name = "spi_coldfire",
.id = UCLASS_SPI, .id = UCLASS_SPI,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.of_match = coldfire_spi_ids, .of_match = coldfire_spi_ids,
.of_to_plat = coldfire_dspi_of_to_plat, .of_to_plat = coldfire_dspi_of_to_plat,
.plat_auto = sizeof(struct coldfire_spi_plat), .plat_auto = sizeof(struct coldfire_spi_plat),

4
drivers/spi/davinci_spi.c
View file

@ -391,7 +391,7 @@ static int davinci_spi_probe(struct udevice *bus)
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static int davinci_ofdata_to_platadata(struct udevice *bus) static int davinci_ofdata_to_platadata(struct udevice *bus)
{ {
struct davinci_spi_plat *plat = dev_get_plat(bus); struct davinci_spi_plat *plat = dev_get_plat(bus);
@ -418,7 +418,7 @@ static const struct udevice_id davinci_spi_ids[] = {
U_BOOT_DRIVER(davinci_spi) = { U_BOOT_DRIVER(davinci_spi) = {
.name = "davinci_spi", .name = "davinci_spi",
.id = UCLASS_SPI, .id = UCLASS_SPI,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.of_match = davinci_spi_ids, .of_match = davinci_spi_ids,
.of_to_plat = davinci_ofdata_to_platadata, .of_to_plat = davinci_ofdata_to_platadata,
.plat_auto = sizeof(struct davinci_spi_plat), .plat_auto = sizeof(struct davinci_spi_plat),

4
drivers/spi/fsl_espi.c
View file

@ -541,7 +541,7 @@ static const struct dm_spi_ops fsl_espi_ops = {
.set_mode = fsl_espi_set_mode, .set_mode = fsl_espi_set_mode,
}; };
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static int fsl_espi_of_to_plat(struct udevice *bus) static int fsl_espi_of_to_plat(struct udevice *bus)
{ {
fdt_addr_t addr; fdt_addr_t addr;
@ -572,7 +572,7 @@ static const struct udevice_id fsl_espi_ids[] = {
U_BOOT_DRIVER(fsl_espi) = { U_BOOT_DRIVER(fsl_espi) = {
.name = "fsl_espi", .name = "fsl_espi",
.id = UCLASS_SPI, .id = UCLASS_SPI,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.of_match = fsl_espi_ids, .of_match = fsl_espi_ids,
.of_to_plat = fsl_espi_of_to_plat, .of_to_plat = fsl_espi_of_to_plat,
#endif #endif

4
drivers/spi/mxs_spi.c
View file

@ -440,7 +440,7 @@ static const struct dm_spi_ops mxs_spi_ops = {
*/ */
}; };
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static int mxs_of_to_plat(struct udevice *bus) static int mxs_of_to_plat(struct udevice *bus)
{ {
struct mxs_spi_plat *plat = dev_get_plat(bus); struct mxs_spi_plat *plat = dev_get_plat(bus);
@ -483,7 +483,7 @@ static const struct udevice_id mxs_spi_ids[] = {
U_BOOT_DRIVER(fsl_imx23_spi) = { U_BOOT_DRIVER(fsl_imx23_spi) = {
.name = "fsl_imx23_spi", .name = "fsl_imx23_spi",
.id = UCLASS_SPI, .id = UCLASS_SPI,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.of_match = mxs_spi_ids, .of_match = mxs_spi_ids,
.of_to_plat = mxs_of_to_plat, .of_to_plat = mxs_of_to_plat,
#endif #endif

4
drivers/spi/omap3_spi.c
View file

@ -481,7 +481,7 @@ static const struct dm_spi_ops omap3_spi_ops = {
*/ */
}; };
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
static struct omap2_mcspi_platform_config omap2_pdata = { static struct omap2_mcspi_platform_config omap2_pdata = {
.regs_offset = 0, .regs_offset = 0,
}; };
@ -516,7 +516,7 @@ U_BOOT_DRIVER(omap3_spi) = {
.name = "omap3_spi", .name = "omap3_spi",
.id = UCLASS_SPI, .id = UCLASS_SPI,
.flags = DM_FLAG_PRE_RELOC, .flags = DM_FLAG_PRE_RELOC,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.of_match = omap3_spi_ids, .of_match = omap3_spi_ids,
.of_to_plat = omap3_spi_of_to_plat, .of_to_plat = omap3_spi_of_to_plat,
.plat_auto = sizeof(struct omap3_spi_plat), .plat_auto = sizeof(struct omap3_spi_plat),

2
drivers/spi/spi-uclass.c
View file

@ -531,7 +531,7 @@ UCLASS_DRIVER(spi) = {
.id = UCLASS_SPI, .id = UCLASS_SPI,
.name = "spi", .name = "spi",
.flags = DM_UC_FLAG_SEQ_ALIAS, .flags = DM_UC_FLAG_SEQ_ALIAS,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.post_bind = dm_scan_fdt_dev, .post_bind = dm_scan_fdt_dev,
#endif #endif
.post_probe = spi_post_probe, .post_probe = spi_post_probe,

2
drivers/tpm/tpm-uclass.c
View file

@ -140,7 +140,7 @@ UCLASS_DRIVER(tpm) = {
.id = UCLASS_TPM, .id = UCLASS_TPM,
.name = "tpm", .name = "tpm",
.flags = DM_UC_FLAG_SEQ_ALIAS, .flags = DM_UC_FLAG_SEQ_ALIAS,
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
.post_bind = dm_scan_fdt_dev, .post_bind = dm_scan_fdt_dev,
#endif #endif
.per_device_auto = sizeof(struct tpm_chip_priv), .per_device_auto = sizeof(struct tpm_chip_priv),

3
dts/Kconfig
View file

@ -44,12 +44,13 @@ config OF_CONTROL
bool "Run-time configuration via Device Tree" bool "Run-time configuration via Device Tree"
select DTC select DTC
select OF_LIBFDT if !OF_PLATDATA select OF_LIBFDT if !OF_PLATDATA
select OF_REAL if !OF_PLATDATA
help help
This feature provides for run-time configuration of U-Boot This feature provides for run-time configuration of U-Boot
via a flattened device tree. via a flattened device tree.
config OF_REAL config OF_REAL
def_bool y bool
help help
Indicates that a real devicetree is available which can be accessed Indicates that a real devicetree is available which can be accessed
at runtime. This means that dev_read_...() functions can be used to at runtime. This means that dev_read_...() functions can be used to

4
include/clk.h
View file

@ -300,9 +300,7 @@ enum clk_defaults_stage {
CLK_DEFAULTS_POST_FORCE, CLK_DEFAULTS_POST_FORCE,
}; };
#if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) && \ #if CONFIG_IS_ENABLED(OF_REAL) && CONFIG_IS_ENABLED(CLK)
CONFIG_IS_ENABLED(CLK)
/** /**
* clk_set_defaults - Process 'assigned-{clocks/clock-parents/clock-rates}' * clk_set_defaults - Process 'assigned-{clocks/clock-parents/clock-rates}'
* properties to configure clocks * properties to configure clocks

2
include/dm/device.h
View file

@ -300,7 +300,7 @@ struct udevice_id {
ulong data; ulong data;
}; };
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) #if CONFIG_IS_ENABLED(OF_REAL)
#define of_match_ptr(_ptr) (_ptr) #define of_match_ptr(_ptr) (_ptr)
#else #else
#define of_match_ptr(_ptr) NULL #define of_match_ptr(_ptr) NULL

6
include/power-domain.h
View file

@ -162,8 +162,7 @@ static inline int power_domain_off(struct power_domain *power_domain)
* *
* @return 0 if OK, or a negative error code. * @return 0 if OK, or a negative error code.
*/ */
#if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) && \ #if CONFIG_IS_ENABLED(OF_REAL) && CONFIG_IS_ENABLED(POWER_DOMAIN)
CONFIG_IS_ENABLED(POWER_DOMAIN)
int dev_power_domain_on(struct udevice *dev); int dev_power_domain_on(struct udevice *dev);
#else #else
static inline int dev_power_domain_on(struct udevice *dev) static inline int dev_power_domain_on(struct udevice *dev)
@ -179,8 +178,7 @@ static inline int dev_power_domain_on(struct udevice *dev)
* *
* @return 0 if OK, or a negative error code. * @return 0 if OK, or a negative error code.
*/ */
#if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) && \ #if CONFIG_IS_ENABLED(OF_REAL) && CONFIG_IS_ENABLED(POWER_DOMAIN)
CONFIG_IS_ENABLED(POWER_DOMAIN)
int dev_power_domain_off(struct udevice *dev); int dev_power_domain_off(struct udevice *dev);
#else #else
static inline int dev_power_domain_off(struct udevice *dev) static inline int dev_power_domain_off(struct udevice *dev)