brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

dm: core: Rename device_bind() to device_bind_offset()

Browse Source 
This function is not necessary anymore, since device_bind_ofnode() does
the same thing and works with both flattree and livetree.

Rename it to indicate that it is special.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-11-28 17:50:00 -07:00
parent 6ca5ff3f20
commit e12052b322
20 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/cpu/apollolake/spl.c
View File

@ -86,7 +86,7 @@ static int apl_flash_probe(struct udevice *dev)
/*
* Manually set the parent of the SPI flash to SPI, since dtoc doesn't. We also
* need to allocate the parent_platdata since by the time this function is
* called device_bind() has already gone past that step.
* called device_bind_offset() has already gone past that step.
*/
static int apl_flash_bind(struct udevice *dev)
{

2
drivers/clk/clk.c
View File

@ -36,7 +36,7 @@ int clk_register(struct clk *clk, const char *drv_name,
return -ENOENT;
}
ret = device_bind(parent, drv, name, NULL, -1, &clk->dev);
ret = device_bind_offset(parent, drv, name, NULL, -1, &clk->dev);
if (ret) {
printf("%s: CLK: %s driver bind error [%d]!\n", __func__, name,
ret);

6
drivers/core/device.c
View File

@ -232,9 +232,9 @@ int device_bind_with_driver_data(struct udevice *parent,
0, devp);
}
int device_bind(struct udevice *parent, const struct driver *drv,
const char *name, void *platdata, int of_offset,
struct udevice **devp)
int device_bind_offset(struct udevice *parent, const struct driver *drv,
const char *name, void *platdata, int of_offset,
struct udevice **devp)
{
return device_bind_common(parent, drv, name, platdata, 0,
offset_to_ofnode(of_offset), 0, devp);

4
drivers/gpio/mt7621_gpio.c
View File

@ -157,8 +157,8 @@ static int gpio_mediatek_bind(struct udevice *parent)
plat->gpio_count = MTK_BANK_WIDTH;
plat->bank = bank;
ret = device_bind(parent, parent->driver,
plat->bank_name, plat, -1, &dev);
ret = device_bind_offset(parent, parent->driver,
plat->bank_name, plat, -1, &dev);
if (ret)
return ret;

4
drivers/gpio/s5p_gpio.c
View File

@ -332,8 +332,8 @@ static int gpio_exynos_bind(struct udevice *parent)
return -ENOMEM;
plat->bank_name = fdt_get_name(blob, node, NULL);
ret = device_bind(parent, parent->driver,
plat->bank_name, plat, -1, &dev);
ret = device_bind_offset(parent, parent->driver,
plat->bank_name, plat, -1, &dev);
if (ret)
return ret;

4
drivers/gpio/sunxi_gpio.c
View File

@ -305,8 +305,8 @@ static int gpio_sunxi_bind(struct udevice *parent)
plat->bank_name = gpio_bank_name(soc_data->start + bank);
plat->gpio_count = SUNXI_GPIOS_PER_BANK;
ret = device_bind(parent, parent->driver,
plat->bank_name, plat, -1, &dev);
ret = device_bind_offset(parent, parent->driver,
plat->bank_name, plat, -1, &dev);
if (ret)
return ret;
dev_set_of_offset(dev, dev_of_offset(parent));

4
drivers/gpio/tegra186_gpio.c
View File

@ -190,8 +190,8 @@ static int tegra186_gpio_bind(struct udevice *parent)
plat->name = ctlr_data->ports[port].name;
plat->regs = &(regs[ctlr_data->ports[port].offset / 4]);
ret = device_bind(parent, parent->driver, plat->name, plat,
-1, &dev);
ret = device_bind_offset(parent, parent->driver, plat->name,
plat, -1, &dev);
if (ret)
return ret;
dev_set_of_offset(dev, dev_of_offset(parent));

5
drivers/gpio/tegra_gpio.c
View File

@ -360,8 +360,9 @@ static int gpio_tegra_bind(struct udevice *parent)
plat->base_gpio = TEGRA_GPIOS_PER_PORT * base_port;
plat->port_name = gpio_port_name(base_port);
ret = device_bind(parent, parent->driver,
plat->port_name, plat, -1, &dev);
ret = device_bind_offset(parent, parent->driver,
plat->port_name, plat, -1,
&dev);
if (ret)
return ret;
dev_set_of_offset(dev, dev_of_offset(parent));

2
drivers/net/mvpp2.c
View File

@ -5477,7 +5477,7 @@ static int mvpp2_base_bind(struct udevice *parent)
sprintf(name, "mvpp2-%d", id);
/* Create child device UCLASS_ETH and bind it */
device_bind(parent, &mvpp2_driver, name, plat, subnode, &dev);
device_bind_offset(parent, &mvpp2_driver, name, plat, subnode, &dev);
dev_set_of_offset(dev, subnode);
}

5
drivers/pinctrl/broadcom/pinctrl-bcm283x.c
View File

@ -125,8 +125,9 @@ int bcm283x_pinctl_probe(struct udevice *dev)
struct udevice *pdev;
/* Create GPIO device as well */
ret = device_bind(dev, lists_driver_lookup_name("gpio_bcm2835"),
"gpio_bcm2835", NULL, dev_of_offset(dev), &pdev);
ret = device_bind_offset(dev, lists_driver_lookup_name("gpio_bcm2835"),
"gpio_bcm2835", NULL, dev_of_offset(dev),
&pdev);
if (ret) {
/*
* While we really want the pinctrl driver to work to make

2
drivers/pinctrl/meson/pinctrl-meson.c
View File

@ -419,7 +419,7 @@ int meson_pinctrl_probe(struct udevice *dev)
sprintf(name, "meson-gpio");
/* Create child device UCLASS_GPIO and bind it */
device_bind(dev, priv->data->gpio_driver, name, NULL, gpio, &gpio_dev);
device_bind_offset(dev, priv->data->gpio_driver, name, NULL, gpio, &gpio_dev);
dev_set_of_offset(gpio_dev, gpio);
return 0;

4
drivers/pinctrl/mscc/pinctrl-jr2.c
View File

@ -299,8 +299,8 @@ static int jr2_pinctrl_probe(struct udevice *dev)
if (ret)
return ret;
ret = device_bind(dev, &jr2_gpio_driver, "jr2-gpio", NULL,
dev_of_offset(dev), NULL);
ret = device_bind_offset(dev, &jr2_gpio_driver, "jr2-gpio", NULL,
dev_of_offset(dev), NULL);
if (ret)
return ret;

4
drivers/pinctrl/mscc/pinctrl-luton.c
View File

@ -165,8 +165,8 @@ int luton_pinctrl_probe(struct udevice *dev)
if (ret)
return ret;
ret = device_bind(dev, &luton_gpio_driver, "luton-gpio", NULL,
dev_of_offset(dev), NULL);
ret = device_bind_offset(dev, &luton_gpio_driver, "luton-gpio", NULL,
dev_of_offset(dev), NULL);
return 0;
}

4
drivers/pinctrl/mscc/pinctrl-ocelot.c
View File

@ -181,8 +181,8 @@ int ocelot_pinctrl_probe(struct udevice *dev)
if (ret)
return ret;
ret = device_bind(dev, &ocelot_gpio_driver, "ocelot-gpio", NULL,
dev_of_offset(dev), NULL);
ret = device_bind_offset(dev, &ocelot_gpio_driver, "ocelot-gpio", NULL,
dev_of_offset(dev), NULL);
return ret;
}

4
drivers/pinctrl/mscc/pinctrl-serval.c
View File

@ -209,8 +209,8 @@ static int serval_pinctrl_probe(struct udevice *dev)
if (ret)
return ret;
ret = device_bind(dev, &serval_gpio_driver, "serval-gpio", NULL,
dev_of_offset(dev), NULL);
ret = device_bind_offset(dev, &serval_gpio_driver, "serval-gpio", NULL,
dev_of_offset(dev), NULL);
if (ret)
return ret;

4
drivers/pinctrl/mscc/pinctrl-servalt.c
View File

@ -245,8 +245,8 @@ static int servalt_pinctrl_probe(struct udevice *dev)
if (ret)
return ret;
ret = device_bind(dev, &servalt_gpio_driver, "servalt-gpio", NULL,
dev_of_offset(dev), NULL);
ret = device_bind_offset(dev, &servalt_gpio_driver, "servalt-gpio", NULL,
dev_of_offset(dev), NULL);
if (ret)
return ret;

4
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
View File

@ -567,8 +567,8 @@ static int armada_37xx_gpiochip_register(struct udevice *parent,
sprintf(name, "armada-37xx-gpio");
/* Create child device UCLASS_GPIO and bind it */
device_bind(parent, &armada_37xx_gpio_driver, name, NULL, subnode,
&dev);
device_bind_offset(parent, &armada_37xx_gpio_driver, name, NULL,
subnode, &dev);
dev_set_of_offset(dev, subnode);
return 0;

2
drivers/power/regulator/Kconfig
View File

@ -11,7 +11,7 @@ config DM_REGULATOR
- 'include/power/regulator.h'
- 'drivers/power/pmic/pmic-uclass.c'
- 'drivers/power/pmic/regulator-uclass.c'
It's important to call the device_bind() with the proper node offset,
It's important to call the device_bind_offset() 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_dev()
otherwise. Detailed information can be found in the header file.

8
include/dm/device-internal.h
View File

@ -16,7 +16,7 @@ struct device_node;
struct udevice;
/**
* device_bind() - Create a device and bind it to a driver
* device_bind_offset() - Create a device and bind it to a driver
*
* Called to set up a new device attached to a driver. The device will either
* have platdata, or a device tree node which can be used to create the
@ -36,9 +36,9 @@ struct udevice;
* @devp: if non-NULL, returns a pointer to the bound device
* @return 0 if OK, -ve on error
*/
int device_bind(struct udevice *parent, const struct driver *drv,
const char *name, void *platdata, int of_offset,
struct udevice **devp);
int device_bind_offset(struct udevice *parent, const struct driver *drv,
const char *name, void *platdata, int of_offset,
struct udevice **devp);
int device_bind_ofnode(struct udevice *parent, const struct driver *drv,
const char *name, void *platdata, ofnode node,

2
include/power/regulator.h
View File

@ -48,7 +48,7 @@
* If regulator-name property is not provided, node name will be chosen.
*
* Regulator bind:
* For each regulator device, the device_bind() should be called with passed
* For each regulator device, the device_bind_offset() should be called with passed
* device tree offset. This is required for this uclass's '.post_bind' method,
* 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: