Merge git://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / drivers / power / pmic / pm8916.c

diff --git a/drivers/power/pmic/pm8916.c b/drivers/power/pmic/pm8916.c
index d4c7d4adff1fd53fb1db33ec495ac175a84f4a81..a048bbe7ce1dfb53bd22ffd0b9910dcc02a42add 100644 (file)
--- a/drivers/power/pmic/pm8916.c
+++ b/drivers/power/pmic/pm8916.c
@@ -7,7 +7,6 @@
  */
 #include <common.h>
 #include <dm.h>
-#include <dm/root.h>
 #include <power/pmic.h>
 #include <spmi/spmi.h>
 
@@ -71,7 +70,7 @@ static int pm8916_probe(struct udevice *dev)
 {
        struct pm8916_priv *priv = dev_get_priv(dev);
 
-       priv->usid = dev_get_addr(dev);
+       priv->usid = dev_read_addr(dev);
 
        if (priv->usid == FDT_ADDR_T_NONE)
                return -EINVAL;
@@ -79,17 +78,11 @@ static int pm8916_probe(struct udevice *dev)
        return 0;
 }
 
-
-static int pm8916_bind(struct udevice *dev)
-{
-       return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
-}
-
 U_BOOT_DRIVER(pmic_pm8916) = {
        .name = "pmic_pm8916",
        .id = UCLASS_PMIC,
        .of_match = pm8916_ids,
-       .bind = pm8916_bind,
+       .bind = dm_scan_fdt_dev,
        .probe = pm8916_probe,
        .ops = &pm8916_ops,
        .priv_auto_alloc_size = sizeof(struct pm8916_priv),