gpio: nomadik: grab optional reset control and deassert it at probe

[linux-2.6-microblaze.git] / drivers / gpio / gpio-nomadik.c

diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c
index 6adb3c4..c9fd663 100644 (file)
--- a/drivers/gpio/gpio-nomadik.c
+++ b/drivers/gpio/gpio-nomadik.c
@@ -509,11 +509,13 @@ struct nmk_gpio_chip *nmk_gpio_populate_chip(struct device_node *np,
 {
        struct nmk_gpio_chip *nmk_chip;
        struct platform_device *gpio_pdev;
+       struct reset_control *reset;
        struct device *gpio_dev;
        struct gpio_chip *chip;
        struct clk *clk;
        void __iomem *base;
        u32 id, ngpio;
+       int ret;
 
        gpio_dev = bus_find_device_by_of_node(&platform_bus_type, np);
        if (!gpio_dev) {
@@ -572,6 +574,24 @@ struct nmk_gpio_chip *nmk_gpio_populate_chip(struct device_node *np,
        clk_prepare(clk);
        nmk_chip->clk = clk;
 
+       reset = devm_reset_control_get_optional_shared(gpio_dev, NULL);
+       if (IS_ERR(reset)) {
+               dev_err(&pdev->dev, "failed getting reset control: %ld\n",
+                       PTR_ERR(reset));
+               return ERR_CAST(reset);
+       }
+
+       /*
+        * Reset might be shared and asserts/deasserts calls are unbalanced. We
+        * only support sharing this reset with other gpio-nomadik devices that
+        * use this reset to ensure deassertion at probe.
+        */
+       ret = reset_control_deassert(reset);
+       if (ret) {
+               dev_err(&pdev->dev, "failed reset deassert: %d\n", ret);
+               return ERR_PTR(ret);
+       }
+
 #ifdef CONFIG_PINCTRL_NOMADIK
        BUG_ON(nmk_chip->bank >= ARRAY_SIZE(nmk_gpio_chips));
        nmk_gpio_chips[id] = nmk_chip;
@@ -690,6 +710,7 @@ static struct platform_driver nmk_gpio_driver = {
        .driver = {
                .name = "nomadik-gpio",
                .of_match_table = nmk_gpio_match,
+               .suppress_bind_attrs = true,
        },
        .probe = nmk_gpio_probe,
 };