Am 06.08.2018 um 08:42 schrieb Michal Simek:

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

Changes in v2:

• Use strdup

  drivers/gpio/xilinx_gpio.c | 10 +++++++++- drivers/gpio/zynq_gpio.c | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c index fc460c343efe..2389abee3777 100644 --- 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 6fbaafb3fa3c..55a5cba0688e 100644 --- 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;

Reviewed-by: Stefan Herbrechtsmeier stefan@herbrechtsmeier.net