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

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

diff --git a/drivers/power/pmic/s5m8767.c b/drivers/power/pmic/s5m8767.c
index 075fe7e..b5ddd49 100644 (file)
--- a/drivers/power/pmic/s5m8767.c
+++ b/drivers/power/pmic/s5m8767.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -13,8 +12,6 @@
 #include <power/regulator.h>
 #include <power/s5m8767.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 static const struct pmic_child_info pmic_children_info[] = {
        { .prefix = "LDO", .driver = S5M8767_LDO_DRIVER },
        { .prefix = "BUCK", .driver = S5M8767_BUCK_DRIVER },
@@ -30,7 +27,7 @@ static int s5m8767_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;
        }
 
@@ -40,7 +37,7 @@ static int s5m8767_write(struct udevice *dev, uint reg, const uint8_t *buff,
 static int s5m8767_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;
        }
 
@@ -54,13 +51,12 @@ int s5m8767_enable_32khz_cp(struct udevice *dev)
 
 static int s5m8767_bind(struct udevice *dev)
 {
-       int node;
-       const void *blob = gd->fdt_blob;
        int children;
+       ofnode node;
 
-       node = fdt_subnode_offset(blob, dev->of_offset, "regulators");
-       if (node <= 0) {
-               debug("%s: %s regulators subnode not found!", __func__,
+       node = dev_read_subnode(dev, "regulators");
+       if (!ofnode_valid(node)) {
+               debug("%s: %s regulators subnode not found!\n", __func__,
                      dev->name);
                return -ENXIO;
        }