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

[u-boot] / drivers / gpio / pca953x_gpio.c

diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c
index 5ea1e05eed5a46f32a71fefc70df8ab1cff1cb9f..535b2f12eade9a920357518e6196da3e35ec0edd 100644 (file)
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Take linux kernel driver drivers/gpio/gpio-pca953x.c for reference.
  *
  * Copyright (C) 2016 Peng Fan <van.freenix@gmail.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  */
 
 /*
@@ -50,8 +49,6 @@ enum {
 #define MAX_BANK 5
 #define BANK_SZ 8
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /*
  * struct pca953x_info - Data for pca953x
  *
@@ -248,12 +245,14 @@ static int pca953x_probe(struct udevice *dev)
 {
        struct pca953x_info *info = dev_get_platdata(dev);
        struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
-       char name[32], *str;
+       char name[32], label[8], *str;
        int addr;
        ulong driver_data;
        int ret;
+       int size;
+       const u8 *tmp;
 
-       addr = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg", 0);
+       addr = dev_read_addr(dev);
        if (addr == 0)
                return -ENODEV;
 
@@ -287,7 +286,16 @@ static int pca953x_probe(struct udevice *dev)
                return ret;
        }
 
-       snprintf(name, sizeof(name), "gpio@%x_", info->addr);
+       tmp = dev_read_prop(dev, "label", &size);
+
+       if (tmp) {
+               memcpy(label, tmp, sizeof(label) - 1);
+               label[sizeof(label) - 1] = '\0';
+               snprintf(name, sizeof(name), "%s@%x_", label, info->addr);
+       } else {
+               snprintf(name, sizeof(name), "gpio@%x_", info->addr);
+       }
+
        str = strdup(name);
        if (!str)
                return -ENOMEM;