arm64: versal: Rename versal_pm_request to xilinx_pm_request

[oweals/u-boot.git] / drivers / gpio / msm_gpio.c

diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c
index 03029792c2a7dcb72866a1423183cac794d23464..ac5d20c1b95f66dfb58add6084cae65adb9953a3 100644 (file)
--- a/drivers/gpio/msm_gpio.c
+++ b/drivers/gpio/msm_gpio.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Qualcomm GPIO driver
  *
  * (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -97,7 +96,7 @@ static int msm_gpio_probe(struct udevice *dev)
 {
        struct msm_gpio_bank *priv = dev_get_priv(dev);
 
-       priv->base = dev_get_addr(dev);
+       priv->base = devfdt_get_addr(dev);
 
        return priv->base == FDT_ADDR_T_NONE ? -EINVAL : 0;
 }
@@ -106,9 +105,9 @@ static int msm_gpio_ofdata_to_platdata(struct udevice *dev)
 {
        struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
 
-       uc_priv->gpio_count = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+       uc_priv->gpio_count = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
                                             "gpio-count", 0);
-       uc_priv->bank_name = fdt_getprop(gd->fdt_blob, dev->of_offset,
+       uc_priv->bank_name = fdt_getprop(gd->fdt_blob, dev_of_offset(dev),
                                         "gpio-bank-name", NULL);
        if (uc_priv->bank_name == NULL)
                uc_priv->bank_name = "soc";