Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux.git] / drivers / pinctrl / pinctrl-at91.c

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 50f0ec42c63723528576b4498df84fa147428250..3d49bbbcdbc7dcad74e0d51c9784d94e322df7cb 100644 (file)
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -16,7 +16,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinctrl.h>
@@ -263,8 +263,8 @@ static int at91_dt_node_to_map(struct pinctrl_dev *pctldev,
         */
        grp = at91_pinctrl_find_group_by_name(info, np->name);
        if (!grp) {
-               dev_err(info->dev, "unable to find group for node %s\n",
-                       np->name);
+               dev_err(info->dev, "unable to find group for node %pOFn\n",
+                       np);
                return -EINVAL;
        }
 
@@ -1071,7 +1071,7 @@ static int at91_pinctrl_parse_groups(struct device_node *np,
        const __be32 *list;
        int i, j;
 
-       dev_dbg(info->dev, "group(%d): %s\n", index, np->name);
+       dev_dbg(info->dev, "group(%d): %pOFn\n", index, np);
 
        /* Initialise group */
        grp->name = np->name;
@@ -1122,7 +1122,7 @@ static int at91_pinctrl_parse_functions(struct device_node *np,
        static u32 grp_index;
        u32 i = 0;
 
-       dev_dbg(info->dev, "parse function(%d): %s\n", index, np->name);
+       dev_dbg(info->dev, "parse function(%d): %pOFn\n", index, np);
 
        func = &info->functions[index];
 
@@ -1487,7 +1487,7 @@ static int alt_gpio_irq_type(struct irq_data *d, unsigned type)
                return 0;
        case IRQ_TYPE_NONE:
        default:
-               pr_warn("AT91: No type for irq %d\n", gpio_to_irq(d->irq));
+               pr_warn("AT91: No type for GPIO irq offset %d\n", d->irq);
                return -EINVAL;
        }
 
@@ -1574,16 +1574,6 @@ void at91_pinctrl_gpio_resume(void)
 #define gpio_irq_set_wake      NULL
 #endif /* CONFIG_PM */
 
-static struct irq_chip gpio_irqchip = {
-       .name           = "GPIO",
-       .irq_ack        = gpio_irq_ack,
-       .irq_disable    = gpio_irq_mask,
-       .irq_mask       = gpio_irq_mask,
-       .irq_unmask     = gpio_irq_unmask,
-       /* .irq_set_type is set dynamically */
-       .irq_set_wake   = gpio_irq_set_wake,
-};
-
 static void gpio_irq_handler(struct irq_desc *desc)
 {
        struct irq_chip *chip = irq_desc_get_chip(desc);
@@ -1624,12 +1614,22 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,
        struct gpio_chip        *gpiochip_prev = NULL;
        struct at91_gpio_chip   *prev = NULL;
        struct irq_data         *d = irq_get_irq_data(at91_gpio->pioc_virq);
+       struct irq_chip         *gpio_irqchip;
        int ret, i;
 
+       gpio_irqchip = devm_kzalloc(&pdev->dev, sizeof(*gpio_irqchip), GFP_KERNEL);
+       if (!gpio_irqchip)
+               return -ENOMEM;
+
        at91_gpio->pioc_hwirq = irqd_to_hwirq(d);
 
-       /* Setup proper .irq_set_type function */
-       gpio_irqchip.irq_set_type = at91_gpio->ops->irq_type;
+       gpio_irqchip->name = "GPIO";
+       gpio_irqchip->irq_ack = gpio_irq_ack;
+       gpio_irqchip->irq_disable = gpio_irq_mask;
+       gpio_irqchip->irq_mask = gpio_irq_mask;
+       gpio_irqchip->irq_unmask = gpio_irq_unmask;
+       gpio_irqchip->irq_set_wake = gpio_irq_set_wake,
+       gpio_irqchip->irq_set_type = at91_gpio->ops->irq_type;
 
        /* Disable irqs of this PIO controller */
        writel_relaxed(~0, at91_gpio->regbase + PIO_IDR);
@@ -1640,7 +1640,7 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,
         * interrupt.
         */
        ret = gpiochip_irqchip_add(&at91_gpio->chip,
-                                  &gpio_irqchip,
+                                  gpio_irqchip,
                                   0,
                                   handle_edge_irq,
                                   IRQ_TYPE_NONE);
@@ -1658,7 +1658,7 @@ static int at91_gpio_of_irq_setup(struct platform_device *pdev,
        if (!gpiochip_prev) {
                /* Then register the chain on the parent IRQ */
                gpiochip_set_chained_irqchip(&at91_gpio->chip,
-                                            &gpio_irqchip,
+                                            gpio_irqchip,
                                             at91_gpio->pioc_virq,
                                             gpio_irq_handler);
                return 0;