diff options
author | Simon Glass <sjg@chromium.org> | 2020-11-28 17:50:00 -0700 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2020-12-13 07:58:17 -0700 |
commit | e12052b3227bb0d77125970dc9f731e052b1c730 (patch) | |
tree | 2374f34fa7540538316118f5403d1c4cf51ed579 /drivers/pinctrl | |
parent | 6ca5ff3f201ce52d4626fb39ad3658e262cac9ef (diff) | |
download | u-boot-e12052b3227bb0d77125970dc9f731e052b1c730.zip u-boot-e12052b3227bb0d77125970dc9f731e052b1c730.tar.gz u-boot-e12052b3227bb0d77125970dc9f731e052b1c730.tar.bz2 |
dm: core: Rename device_bind() to device_bind_offset()
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>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 5 | ||||
-rw-r--r-- | drivers/pinctrl/meson/pinctrl-meson.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/mscc/pinctrl-jr2.c | 4 | ||||
-rw-r--r-- | drivers/pinctrl/mscc/pinctrl-luton.c | 4 | ||||
-rw-r--r-- | drivers/pinctrl/mscc/pinctrl-ocelot.c | 4 | ||||
-rw-r--r-- | drivers/pinctrl/mscc/pinctrl-serval.c | 4 | ||||
-rw-r--r-- | drivers/pinctrl/mscc/pinctrl-servalt.c | 4 | ||||
-rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 4 |
8 files changed, 16 insertions, 15 deletions
diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c index 41da814..54928a6 100644 --- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c +++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c @@ -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 diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index d4539b0..45a1ccf 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -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; diff --git a/drivers/pinctrl/mscc/pinctrl-jr2.c b/drivers/pinctrl/mscc/pinctrl-jr2.c index 72a9470..fc730b7 100644 --- a/drivers/pinctrl/mscc/pinctrl-jr2.c +++ b/drivers/pinctrl/mscc/pinctrl-jr2.c @@ -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; diff --git a/drivers/pinctrl/mscc/pinctrl-luton.c b/drivers/pinctrl/mscc/pinctrl-luton.c index 17fbc53..4fb1798 100644 --- a/drivers/pinctrl/mscc/pinctrl-luton.c +++ b/drivers/pinctrl/mscc/pinctrl-luton.c @@ -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; } diff --git a/drivers/pinctrl/mscc/pinctrl-ocelot.c b/drivers/pinctrl/mscc/pinctrl-ocelot.c index 49e026b..12ecad7 100644 --- a/drivers/pinctrl/mscc/pinctrl-ocelot.c +++ b/drivers/pinctrl/mscc/pinctrl-ocelot.c @@ -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; } diff --git a/drivers/pinctrl/mscc/pinctrl-serval.c b/drivers/pinctrl/mscc/pinctrl-serval.c index d59f08d..93b31d20 100644 --- a/drivers/pinctrl/mscc/pinctrl-serval.c +++ b/drivers/pinctrl/mscc/pinctrl-serval.c @@ -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; diff --git a/drivers/pinctrl/mscc/pinctrl-servalt.c b/drivers/pinctrl/mscc/pinctrl-servalt.c index 592b7c5..9bbc769 100644 --- a/drivers/pinctrl/mscc/pinctrl-servalt.c +++ b/drivers/pinctrl/mscc/pinctrl-servalt.c @@ -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; diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c index fb49780..7bbeb41 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c @@ -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; |