Merge branch 'master' of git://git.denx.de/u-boot-spi

[platform/kernel/u-boot.git] / drivers / power / pmic / max77686.c

diff --git a/drivers/power/pmic/max77686.c b/drivers/power/pmic/max77686.c
index 3523b4a..8e3a8cf 100644 (file)
--- a/drivers/power/pmic/max77686.c
+++ b/drivers/power/pmic/max77686.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  Copyright (C) 2014-2015 Samsung Electronics
  *  Przemyslaw Marczak  <p.marczak@samsung.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -14,11 +13,9 @@
 #include <power/regulator.h>
 #include <power/max77686_pmic.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 static const struct pmic_child_info pmic_children_info[] = {
-       { .prefix = "ldo", .driver = MAX77686_LDO_DRIVER },
-       { .prefix = "buck", .driver = MAX77686_BUCK_DRIVER },
+       { .prefix = "LDO", .driver = MAX77686_LDO_DRIVER },
+       { .prefix = "BUCK", .driver = MAX77686_BUCK_DRIVER },
        { },
 };
 
@@ -31,7 +28,7 @@ static int max77686_write(struct udevice *dev, uint reg, const uint8_t *buff,
                          int len)
 {
        if (dm_i2c_write(dev, reg, buff, len)) {
-               error("write error to device: %p register: %#x!", dev, reg);
+               pr_err("write error to device: %p register: %#x!\n", dev, reg);
                return -EIO;
        }
 
@@ -41,7 +38,7 @@ static int max77686_write(struct udevice *dev, uint reg, const uint8_t *buff,
 static int max77686_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
 {
        if (dm_i2c_read(dev, reg, buff, len)) {
-               error("read error from device: %p register: %#x!", dev, reg);
+               pr_err("read error from device: %p register: %#x!\n", dev, reg);
                return -EIO;
        }
 
@@ -50,15 +47,13 @@ static int max77686_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
 
 static int max77686_bind(struct udevice *dev)
 {
-       int regulators_node;
-       const void *blob = gd->fdt_blob;
+       ofnode regulators_node;
        int children;
 
-       regulators_node = fdt_subnode_offset(blob, dev->of_offset,
-                                            "voltage-regulators");
-       if (regulators_node <= 0) {
-               debug("%s: %s regulators subnode not found!", __func__,
-                                                            dev->name);
+       regulators_node = dev_read_subnode(dev, "voltage-regulators");
+       if (!ofnode_valid(regulators_node)) {
+               debug("%s: %s regulators subnode not found!\n", __func__,
+                     dev->name);
                return -ENXIO;
        }
 
@@ -84,7 +79,7 @@ static const struct udevice_id max77686_ids[] = {
 };
 
 U_BOOT_DRIVER(pmic_max77686) = {
-       .name = "max77686 pmic",
+       .name = "max77686_pmic",
        .id = UCLASS_PMIC,
        .of_match = max77686_ids,
        .bind = max77686_bind,