Merge tag 'v3.10.91' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / gpio / gpio-em.c

diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index deca78f99316571e594d6bbab5e103ca1138886b..5cba855638bf93b47e72c64ccd508f11db42f771 100644 (file)
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -231,10 +231,12 @@ static int em_gio_irq_domain_map(struct irq_domain *h, unsigned int virq,
 
 static struct irq_domain_ops em_gio_irq_domain_ops = {
        .map    = em_gio_irq_domain_map,
+       .xlate  = irq_domain_xlate_twocell,
 };
 
 static int em_gio_probe(struct platform_device *pdev)
 {
+       struct gpio_em_config pdata_dt;
        struct gpio_em_config *pdata = pdev->dev.platform_data;
        struct em_gio_priv *p;
        struct resource *io[2], *irq[2];
@@ -243,7 +245,7 @@ static int em_gio_probe(struct platform_device *pdev)
        const char *name = dev_name(&pdev->dev);
        int ret;
 
-       p = kzalloc(sizeof(*p), GFP_KERNEL);
+       p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL);
        if (!p) {
                dev_err(&pdev->dev, "failed to allocate driver data\n");
                ret = -ENOMEM;
@@ -259,24 +261,45 @@ static int em_gio_probe(struct platform_device *pdev)
        irq[0] = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        irq[1] = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
 
-       if (!io[0] || !io[1] || !irq[0] || !irq[1] || !pdata) {
-               dev_err(&pdev->dev, "missing IRQ, IOMEM or configuration\n");
+       if (!io[0] || !io[1] || !irq[0] || !irq[1]) {
+               dev_err(&pdev->dev, "missing IRQ or IOMEM\n");
                ret = -EINVAL;
-               goto err1;
+               goto err0;
        }
 
-       p->base0 = ioremap_nocache(io[0]->start, resource_size(io[0]));
+       p->base0 = devm_ioremap_nocache(&pdev->dev, io[0]->start,
+                                       resource_size(io[0]));
        if (!p->base0) {
                dev_err(&pdev->dev, "failed to remap low I/O memory\n");
                ret = -ENXIO;
-               goto err1;
+               goto err0;
        }
 
-       p->base1 = ioremap_nocache(io[1]->start, resource_size(io[1]));
+       p->base1 = devm_ioremap_nocache(&pdev->dev, io[1]->start,
+                                  resource_size(io[1]));
        if (!p->base1) {
                dev_err(&pdev->dev, "failed to remap high I/O memory\n");
                ret = -ENXIO;
-               goto err2;
+               goto err0;
+       }
+
+       if (!pdata) {
+               memset(&pdata_dt, 0, sizeof(pdata_dt));
+               pdata = &pdata_dt;
+
+               if (of_property_read_u32(pdev->dev.of_node, "ngpios",
+                                        &pdata->number_of_pins)) {
+                       dev_err(&pdev->dev, "Missing ngpios OF property\n");
+                       ret = -EINVAL;
+                       goto err0;
+               }
+
+               ret = of_alias_get_id(pdev->dev.of_node, "gpio");
+               if (ret < 0) {
+                       dev_err(&pdev->dev, "Couldn't get OF id\n");
+                       goto err0;
+               }
+               pdata->gpio_base = ret * 32; /* 32 GPIOs per instance */
        }
 
        gpio_chip = &p->gpio_chip;
@@ -306,40 +329,32 @@ static int em_gio_probe(struct platform_device *pdev)
        if (!p->irq_domain) {
                ret = -ENXIO;
                dev_err(&pdev->dev, "cannot initialize irq domain\n");
-               goto err3;
+               goto err0;
        }
 
-       if (request_irq(irq[0]->start, em_gio_irq_handler, 0, name, p)) {
+       if (devm_request_irq(&pdev->dev, irq[0]->start,
+                            em_gio_irq_handler, 0, name, p)) {
                dev_err(&pdev->dev, "failed to request low IRQ\n");
                ret = -ENOENT;
-               goto err4;
+               goto err1;
        }
 
-       if (request_irq(irq[1]->start, em_gio_irq_handler, 0, name, p)) {
+       if (devm_request_irq(&pdev->dev, irq[1]->start,
+                            em_gio_irq_handler, 0, name, p)) {
                dev_err(&pdev->dev, "failed to request high IRQ\n");
                ret = -ENOENT;
-               goto err5;
+               goto err1;
        }
 
        ret = gpiochip_add(gpio_chip);
        if (ret) {
                dev_err(&pdev->dev, "failed to add GPIO controller\n");
-               goto err6;
+               goto err1;
        }
        return 0;
 
-err6:
-       free_irq(irq[1]->start, pdev);
-err5:
-       free_irq(irq[0]->start, pdev);
-err4:
-       irq_domain_remove(p->irq_domain);
-err3:
-       iounmap(p->base1);
-err2:
-       iounmap(p->base0);
 err1:
-       kfree(p);
+       irq_domain_remove(p->irq_domain);
 err0:
        return ret;
 }
@@ -347,34 +362,43 @@ err0:
 static int em_gio_remove(struct platform_device *pdev)
 {
        struct em_gio_priv *p = platform_get_drvdata(pdev);
-       struct resource *irq[2];
        int ret;
 
        ret = gpiochip_remove(&p->gpio_chip);
        if (ret)
                return ret;
 
-       irq[0] = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       irq[1] = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
-
-       free_irq(irq[1]->start, pdev);
-       free_irq(irq[0]->start, pdev);
        irq_domain_remove(p->irq_domain);
-       iounmap(p->base1);
-       iounmap(p->base0);
-       kfree(p);
        return 0;
 }
 
+static const struct of_device_id em_gio_dt_ids[] = {
+       { .compatible = "renesas,em-gio", },
+       {},
+};
+MODULE_DEVICE_TABLE(of, em_gio_dt_ids);
+
 static struct platform_driver em_gio_device_driver = {
        .probe          = em_gio_probe,
        .remove         = em_gio_remove,
        .driver         = {
                .name   = "em_gio",
+               .of_match_table = em_gio_dt_ids,
+               .owner          = THIS_MODULE,
        }
 };
 
-module_platform_driver(em_gio_device_driver);
+static int __init em_gio_init(void)
+{
+       return platform_driver_register(&em_gio_device_driver);
+}
+postcore_initcall(em_gio_init);
+
+static void __exit em_gio_exit(void)
+{
+       platform_driver_unregister(&em_gio_device_driver);
+}
+module_exit(em_gio_exit);
 
 MODULE_AUTHOR("Magnus Damm");
 MODULE_DESCRIPTION("Renesas Emma Mobile GIO Driver");