zynqmp: gpio: Add support for zynqmp gpio modepin driver

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

diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c
index 0302979..a3c3cd7 100644 (file)
--- a/drivers/gpio/msm_gpio.c
+++ b/drivers/gpio/msm_gpio.c
@@ -1,14 +1,14 @@
+// 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>
 #include <dm.h>
 #include <errno.h>
+#include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 
@@ -97,18 +97,18 @@ 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 = dev_read_addr(dev);
 
        return priv->base == FDT_ADDR_T_NONE ? -EINVAL : 0;
 }
 
-static int msm_gpio_ofdata_to_platdata(struct udevice *dev)
+static int msm_gpio_of_to_plat(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";
@@ -119,6 +119,8 @@ static int msm_gpio_ofdata_to_platdata(struct udevice *dev)
 static const struct udevice_id msm_gpio_ids[] = {
        { .compatible = "qcom,msm8916-pinctrl" },
        { .compatible = "qcom,apq8016-pinctrl" },
+       { .compatible = "qcom,ipq4019-pinctrl" },
+       { .compatible = "qcom,sdm845-pinctrl" },
        { }
 };
 
@@ -126,8 +128,8 @@ U_BOOT_DRIVER(gpio_msm) = {
        .name   = "gpio_msm",
        .id     = UCLASS_GPIO,
        .of_match = msm_gpio_ids,
-       .ofdata_to_platdata = msm_gpio_ofdata_to_platdata,
+       .of_to_plat = msm_gpio_of_to_plat,
        .probe  = msm_gpio_probe,
        .ops    = &gpio_msm_ops,
-       .priv_auto_alloc_size = sizeof(struct msm_gpio_bank),
+       .priv_auto      = sizeof(struct msm_gpio_bank),
 };