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

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

diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c
index 2f9e44b620996a135ed56d685d5f9215f578d077..965becf77ab3c2fcdcde2531aea4271428257ed5 100644 (file)
--- a/drivers/gpio/at91_gpio.c
+++ b/drivers/gpio/at91_gpio.c
@@ -1,15 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013 Bo Shen <voice.shen@atmel.com>
  *
  * Copyright (C) 2009 Jens Scharsig (js_at_ng@scharsoft.de)
  *
  *  Copyright (C) 2005 HP Labs
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
 #include <common.h>
+#include <clk.h>
 #include <dm.h>
 #include <asm/io.h>
 #include <linux/sizes.h>
@@ -569,17 +569,44 @@ static int at91_gpio_probe(struct udevice *dev)
        struct at91_port_priv *port = dev_get_priv(dev);
        struct at91_port_platdata *plat = dev_get_platdata(dev);
        struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct clk clk;
+       int ret;
+
+       ret = clk_get_by_index(dev, 0, &clk);
+       if (ret)
+               return ret;
+
+       ret = clk_enable(&clk);
+       if (ret)
+               return ret;
+
+       clk_free(&clk);
 
        uc_priv->bank_name = plat->bank_name;
        uc_priv->gpio_count = GPIO_PER_BANK;
+
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+       plat->base_addr = (uint32_t)devfdt_get_addr_ptr(dev);
+#endif
        port->regs = (struct at91_port *)plat->base_addr;
 
        return 0;
 }
 
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+static const struct udevice_id at91_gpio_ids[] = {
+       { .compatible = "atmel,at91rm9200-gpio" },
+       { }
+};
+#endif
+
 U_BOOT_DRIVER(gpio_at91) = {
        .name   = "gpio_at91",
        .id     = UCLASS_GPIO,
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+       .of_match = at91_gpio_ids,
+       .platdata_auto_alloc_size = sizeof(struct at91_port_platdata),
+#endif
        .ops    = &gpio_at91_ops,
        .probe  = at91_gpio_probe,
        .priv_auto_alloc_size = sizeof(struct at91_port_priv),