Commit 2e3f1ff6 authored by Simon Glass's avatar Simon Glass

dm: Convert users from dm_scan_fdt_node() to dm_scan_fdt_dev()

This new function is more convenient for callers, and handles pre-relocation
situations automatically.
Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
parent cc7f66f7
......@@ -7,7 +7,6 @@
#include <common.h>
#include <dm.h>
#include <dm/root.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -19,8 +18,7 @@ static int lpc_uclass_post_bind(struct udevice *bus)
* Before relocation, only bind devices marked for pre-relocation
* use.
*/
return dm_scan_fdt_node(bus, gd->fdt_blob, bus->of_offset,
gd->flags & GD_FLG_RELOC ? false : true);
return dm_scan_fdt_dev(bus);
}
UCLASS_DRIVER(lpc) = {
......
......@@ -36,7 +36,6 @@
#include <asm/state.h>
#endif
#include <asm/unaligned.h>
#include <dm/root.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -758,7 +757,7 @@ int usb_hub_scan(struct udevice *hub)
static int usb_hub_post_bind(struct udevice *dev)
{
/* Scan the bus for devices */
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
static int usb_hub_post_probe(struct udevice *dev)
......
......@@ -6,7 +6,6 @@
#include <common.h>
#include <dm.h>
#include <dm/root.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -41,7 +40,7 @@ static int simple_bus_post_bind(struct udevice *dev)
plat->size = cell[2];
}
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
UCLASS_DRIVER(simple_bus) = {
......
......@@ -12,7 +12,6 @@
#include <malloc.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
#include <dm/root.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -503,7 +502,7 @@ static int i2c_post_bind(struct udevice *dev)
{
#if CONFIG_IS_ENABLED(OF_CONTROL)
/* Scan the bus for devices */
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
#else
return 0;
#endif
......
......@@ -14,7 +14,6 @@
#include <asm/test.h>
#include <dm/lists.h>
#include <dm/device-internal.h>
#include <dm/root.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -33,8 +32,7 @@ static int get_emul(struct udevice *dev, struct udevice **devp,
*opsp = NULL;
plat = dev_get_parent_platdata(dev);
if (!plat->emul) {
ret = dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset,
false);
ret = dm_scan_fdt_dev(dev);
if (ret)
return ret;
......
......@@ -26,7 +26,6 @@
#include <asm/io.h>
#include <asm-generic/gpio.h>
#include <dm/device-internal.h>
#include <dm/root.h>
#include <dm/uclass-internal.h>
#ifdef DEBUG_TRACE
......@@ -1453,7 +1452,7 @@ static int do_cros_ec(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
int cros_ec_post_bind(struct udevice *dev)
{
/* Scan for available EC devices (e.g. I2C tunnel) */
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
U_BOOT_CMD(
......
......@@ -8,7 +8,6 @@
#include <common.h>
#include <dm.h>
#include <pch.h>
#include <dm/root.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -63,8 +62,7 @@ static int pch_uclass_post_bind(struct udevice *bus)
* Before relocation, only bind devices marked for pre-relocation
* use.
*/
return dm_scan_fdt_node(bus, gd->fdt_blob, bus->of_offset,
gd->flags & GD_FLG_RELOC ? false : true);
return dm_scan_fdt_dev(bus);
}
UCLASS_DRIVER(pch) = {
......
......@@ -13,7 +13,6 @@
#include <pci.h>
#include <asm/io.h>
#include <dm/lists.h>
#include <dm/root.h>
#include <dm/device-internal.h>
#if defined(CONFIG_X86) && defined(CONFIG_HAVE_FSP)
#include <asm/fsp/fsp_support.h>
......@@ -755,13 +754,6 @@ error:
static int pci_uclass_post_bind(struct udevice *bus)
{
/*
* If there is no pci device listed in the device tree,
* don't bother scanning the device tree.
*/
if (bus->of_offset == -1)
return 0;
/*
* Scan the device tree for devices. This does not probe the PCI bus,
* as this is not permitted while binding. It just finds devices
......@@ -770,8 +762,7 @@ static int pci_uclass_post_bind(struct udevice *bus)
* Before relocation, only bind devices marked for pre-relocation
* use.
*/
return dm_scan_fdt_node(bus, gd->fdt_blob, bus->of_offset,
gd->flags & GD_FLG_RELOC ? false : true);
return dm_scan_fdt_dev(bus);
}
static int decode_regions(struct pci_controller *hose, const void *blob,
......
......@@ -10,7 +10,6 @@
#include <fdtdec.h>
#include <inttypes.h>
#include <pci.h>
#include <dm/root.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -55,7 +54,7 @@ static int sandbox_pci_read_config(struct udevice *bus, pci_dev_t devfn,
static int sandbox_pci_child_post_bind(struct udevice *dev)
{
/* Attach an emulator if we can */
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
static const struct dm_pci_ops sandbox_pci_ops = {
......
......@@ -10,7 +10,6 @@
#include <errno.h>
#include <asm/io.h>
#include <dm/pinctrl.h>
#include <dm/root.h>
#include <mach/pic32.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -344,7 +343,7 @@ static int pic32_pinctrl_probe(struct udevice *dev)
static int pic32_pinctrl_bind(struct udevice *dev)
{
/* scan child GPIO banks */
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
static const struct udevice_id pic32_pinctrl_ids[] = {
......
......@@ -15,7 +15,6 @@
#include <asm/arch/hardware.h>
#include <asm/arch/periph.h>
#include <dm/pinctrl.h>
#include <dm/root.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -256,7 +255,7 @@ static struct pinctrl_ops rk3036_pinctrl_ops = {
static int rk3036_pinctrl_bind(struct udevice *dev)
{
/* scan child GPIO banks */
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
static int rk3036_pinctrl_probe(struct udevice *dev)
......
......@@ -17,7 +17,6 @@
#include <asm/arch/periph.h>
#include <asm/arch/pmu_rk3288.h>
#include <dm/pinctrl.h>
#include <dm/root.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -669,8 +668,7 @@ static int rk3288_pinctrl_bind(struct udevice *dev)
#if CONFIG_IS_ENABLED(OF_PLATDATA)
return 0;
#else
/* scan child GPIO banks */
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
#endif
}
......
......@@ -7,7 +7,6 @@
*/
#include <common.h>
#include <dm.h>
#include <dm/root.h>
#include <power/pmic.h>
#include <spmi/spmi.h>
......@@ -82,7 +81,7 @@ static int pm8916_probe(struct udevice *dev)
static int pm8916_bind(struct udevice *dev)
{
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
U_BOOT_DRIVER(pmic_pm8916) = {
......
......@@ -13,7 +13,7 @@ config DM_REGULATOR
- 'drivers/power/pmic/regulator-uclass.c'
It's important to call the device_bind() with the proper node offset,
when binding the regulator devices. The pmic_bind_childs() can be used
for this purpose if PMIC I/O driver is implemented or dm_scan_fdt_node()
for this purpose if PMIC I/O driver is implemented or dm_scan_fdt_dev()
otherwise. Detailed information can be found in the header file.
config SPL_DM_REGULATOR
......
......@@ -12,7 +12,6 @@
#include <spi.h>
#include <dm/device-internal.h>
#include <dm/uclass-internal.h>
#include <dm/root.h>
#include <dm/lists.h>
#include <dm/util.h>
......@@ -112,7 +111,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
static int spi_post_bind(struct udevice *dev)
{
/* Scan the bus for devices */
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
static int spi_child_post_bind(struct udevice *dev)
......
......@@ -9,7 +9,6 @@
#include <common.h>
#include <dm.h>
#include <errno.h>
#include <dm/root.h>
#include <spmi/spmi.h>
#include <linux/ctype.h>
......@@ -38,7 +37,7 @@ int spmi_reg_write(struct udevice *dev, int usid, int pid, int reg,
static int spmi_post_bind(struct udevice *dev)
{
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
UCLASS_DRIVER(spmi) = {
......
......@@ -8,7 +8,6 @@
#include <common.h>
#include <dm.h>
#include <usb.h>
#include <dm/root.h>
#include <dm/device-internal.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -268,7 +267,7 @@ int usb_emul_setup_device(struct udevice *dev, int maxpacketsize,
int usb_emul_post_bind(struct udevice *dev)
{
/* Scan the bus for devices */
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
void usb_emul_reset(struct udevice *dev)
......
......@@ -14,7 +14,6 @@
#include <usb.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
#include <dm/root.h>
#include <dm/uclass-internal.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -351,8 +350,7 @@ struct usb_device *usb_get_dev_index(struct udevice *bus, int index)
int usb_post_bind(struct udevice *dev)
{
/* Scan the bus for devices */
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp)
......
......@@ -54,7 +54,7 @@
* which does the scan on the device node, for the 'regulator-name' constraint.
* If the parent is not a PMIC device, and the child is not bind by function:
* 'pmic_bind_childs()', then it's recommended to bind the device by call to
* dm_scan_fdt_node() - this is usually done automatically for bus devices,
* dm_scan_fdt_dev() - this is usually done automatically for bus devices,
* as a post bind method.
*
* Regulator get:
......
......@@ -7,7 +7,6 @@
#include <common.h>
#include <dm.h>
#include <dm/device-internal.h>
#include <dm/root.h>
#include <dm/test.h>
#include <dm/uclass-internal.h>
#include <dm/util.h>
......@@ -30,7 +29,7 @@ static struct dm_test_state *test_state;
static int testbus_drv_probe(struct udevice *dev)
{
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
return dm_scan_fdt_dev(dev);
}
static int testbus_child_post_bind(struct udevice *dev)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment