gpio: xilinx: Add support for using label property

Add support for reading label property from DT and set up bank name
based on that. If label property is not present full device node name is
used.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>

diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
index fc460c343efe849ff511072311f259208981a72b..2389abee3777e8ed773c8bb01e6593d346e62a93 100644 (file)
--- a/drivers/gpio/xilinx_gpio.c
+++ b/drivers/gpio/xilinx_gpio.c
@@ -241,8 +241,16 @@ static int xilinx_gpio_probe(struct udevice *dev)
        struct xilinx_gpio_platdata *platdata = dev_get_platdata(dev);
        struct xilinx_gpio_privdata *priv = dev_get_priv(dev);
        struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+       const void *label_ptr;
 
-       uc_priv->bank_name = dev->name;
+       label_ptr = dev_read_prop(dev, "label", NULL);
+       if (label_ptr) {
+               uc_priv->bank_name = strdup(label_ptr);
+               if (!uc_priv->bank_name)
+                       return -ENOMEM;
+       } else {
+               uc_priv->bank_name = dev->name;
+       }
 
        uc_priv->gpio_count = platdata->bank_max[0] + platdata->bank_max[1];
 

diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c
index 6fbaafb3fa3c57ecb8596b0bddd980be38594721..55a5cba0688ed77ab549d18456d4cd59fa848b2d 100644 (file)
--- a/drivers/gpio/zynq_gpio.c
+++ b/drivers/gpio/zynq_gpio.c
@@ -336,8 +336,16 @@ static int zynq_gpio_probe(struct udevice *dev)
 {
        struct zynq_gpio_platdata *platdata = dev_get_platdata(dev);
        struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+       const void *label_ptr;
 
-       uc_priv->bank_name = dev->name;
+       label_ptr = dev_read_prop(dev, "label", NULL);
+       if (label_ptr) {
+               uc_priv->bank_name = strdup(label_ptr);
+               if (!uc_priv->bank_name)
+                       return -ENOMEM;
+       } else {
+               uc_priv->bank_name = dev->name;
+       }
 
        if (platdata->p_data)
                uc_priv->gpio_count = platdata->p_data->ngpio;