]> asedeno.scripts.mit.edu Git - linux.git/blobdiff - drivers/irqchip/irq-sni-exiu.c
davinci_cpdma: make cpdma_chan_split_pool static
[linux.git] / drivers / irqchip / irq-sni-exiu.c
index 4e983bc6cf93c3cb67fa25a1efbd17fc5b77855b..1d027623c776080da8136ccf0611277e8d7ee780 100644 (file)
@@ -2,7 +2,7 @@
 /*
  * Driver for Socionext External Interrupt Unit (EXIU)
  *
- * Copyright (c) 2017 Linaro, Ltd. <ard.biesheuvel@linaro.org>
+ * Copyright (c) 2017-2019 Linaro, Ltd. <ard.biesheuvel@linaro.org>
  *
  * Based on irq-tegra.c:
  *   Copyright (C) 2011 Google, Inc.
@@ -17,6 +17,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
+#include <linux/platform_device.h>
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
@@ -131,9 +132,13 @@ static int exiu_domain_translate(struct irq_domain *domain,
 
                *hwirq = fwspec->param[1] - info->spi_base;
                *type = fwspec->param[2] & IRQ_TYPE_SENSE_MASK;
-               return 0;
+       } else {
+               if (fwspec->param_count != 2)
+                       return -EINVAL;
+               *hwirq = fwspec->param[0];
+               *type = fwspec->param[2] & IRQ_TYPE_SENSE_MASK;
        }
-       return -EINVAL;
+       return 0;
 }
 
 static int exiu_domain_alloc(struct irq_domain *dom, unsigned int virq,
@@ -144,16 +149,21 @@ static int exiu_domain_alloc(struct irq_domain *dom, unsigned int virq,
        struct exiu_irq_data *info = dom->host_data;
        irq_hw_number_t hwirq;
 
-       if (fwspec->param_count != 3)
-               return -EINVAL; /* Not GIC compliant */
-       if (fwspec->param[0] != GIC_SPI)
-               return -EINVAL; /* No PPI should point to this domain */
+       parent_fwspec = *fwspec;
+       if (is_of_node(dom->parent->fwnode)) {
+               if (fwspec->param_count != 3)
+                       return -EINVAL; /* Not GIC compliant */
+               if (fwspec->param[0] != GIC_SPI)
+                       return -EINVAL; /* No PPI should point to this domain */
 
+               hwirq = fwspec->param[1] - info->spi_base;
+       } else {
+               hwirq = fwspec->param[0];
+               parent_fwspec.param[0] = hwirq + info->spi_base + 32;
+       }
        WARN_ON(nr_irqs != 1);
-       hwirq = fwspec->param[1] - info->spi_base;
        irq_domain_set_hwirq_and_chip(dom, virq, hwirq, &exiu_irq_chip, info);
 
-       parent_fwspec = *fwspec;
        parent_fwspec.fwnode = dom->parent->fwnode;
        return irq_domain_alloc_irqs_parent(dom, virq, nr_irqs, &parent_fwspec);
 }
@@ -164,35 +174,23 @@ static const struct irq_domain_ops exiu_domain_ops = {
        .free           = irq_domain_free_irqs_common,
 };
 
-static int __init exiu_init(struct device_node *node,
-                           struct device_node *parent)
+static struct exiu_irq_data *exiu_init(const struct fwnode_handle *fwnode,
+                                      struct resource *res)
 {
-       struct irq_domain *parent_domain, *domain;
        struct exiu_irq_data *data;
        int err;
 
-       if (!parent) {
-               pr_err("%pOF: no parent, giving up\n", node);
-               return -ENODEV;
-       }
-
-       parent_domain = irq_find_host(parent);
-       if (!parent_domain) {
-               pr_err("%pOF: unable to obtain parent domain\n", node);
-               return -ENXIO;
-       }
-
        data = kzalloc(sizeof(*data), GFP_KERNEL);
        if (!data)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
-       if (of_property_read_u32(node, "socionext,spi-base", &data->spi_base)) {
-               pr_err("%pOF: failed to parse 'spi-base' property\n", node);
+       if (fwnode_property_read_u32_array(fwnode, "socionext,spi-base",
+                                          &data->spi_base, 1)) {
                err = -ENODEV;
                goto out_free;
        }
 
-       data->base = of_iomap(node, 0);
+       data->base = ioremap(res->start, resource_size(res));
        if (!data->base) {
                err = -ENODEV;
                goto out_free;
@@ -202,11 +200,44 @@ static int __init exiu_init(struct device_node *node,
        writel_relaxed(0xFFFFFFFF, data->base + EIREQCLR);
        writel_relaxed(0xFFFFFFFF, data->base + EIMASK);
 
+       return data;
+
+out_free:
+       kfree(data);
+       return ERR_PTR(err);
+}
+
+static int __init exiu_dt_init(struct device_node *node,
+                              struct device_node *parent)
+{
+       struct irq_domain *parent_domain, *domain;
+       struct exiu_irq_data *data;
+       struct resource res;
+
+       if (!parent) {
+               pr_err("%pOF: no parent, giving up\n", node);
+               return -ENODEV;
+       }
+
+       parent_domain = irq_find_host(parent);
+       if (!parent_domain) {
+               pr_err("%pOF: unable to obtain parent domain\n", node);
+               return -ENXIO;
+       }
+
+       if (of_address_to_resource(node, 0, &res)) {
+               pr_err("%pOF: failed to parse memory resource\n", node);
+               return -ENXIO;
+       }
+
+       data = exiu_init(of_node_to_fwnode(node), &res);
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
        domain = irq_domain_add_hierarchy(parent_domain, 0, NUM_IRQS, node,
                                          &exiu_domain_ops, data);
        if (!domain) {
                pr_err("%pOF: failed to allocate domain\n", node);
-               err = -ENOMEM;
                goto out_unmap;
        }
 
@@ -217,8 +248,57 @@ static int __init exiu_init(struct device_node *node,
 
 out_unmap:
        iounmap(data->base);
-out_free:
        kfree(data);
-       return err;
+       return -ENOMEM;
 }
-IRQCHIP_DECLARE(exiu, "socionext,synquacer-exiu", exiu_init);
+IRQCHIP_DECLARE(exiu, "socionext,synquacer-exiu", exiu_dt_init);
+
+#ifdef CONFIG_ACPI
+static int exiu_acpi_probe(struct platform_device *pdev)
+{
+       struct irq_domain *domain;
+       struct exiu_irq_data *data;
+       struct resource *res;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
+               dev_err(&pdev->dev, "failed to parse memory resource\n");
+               return -ENXIO;
+       }
+
+       data = exiu_init(dev_fwnode(&pdev->dev), res);
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
+       domain = acpi_irq_create_hierarchy(0, NUM_IRQS, dev_fwnode(&pdev->dev),
+                                          &exiu_domain_ops, data);
+       if (!domain) {
+               dev_err(&pdev->dev, "failed to create IRQ domain\n");
+               goto out_unmap;
+       }
+
+       dev_info(&pdev->dev, "%d interrupts forwarded\n", NUM_IRQS);
+
+       return 0;
+
+out_unmap:
+       iounmap(data->base);
+       kfree(data);
+       return -ENOMEM;
+}
+
+static const struct acpi_device_id exiu_acpi_ids[] = {
+       { "SCX0008" },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(acpi, exiu_acpi_ids);
+
+static struct platform_driver exiu_driver = {
+       .driver = {
+               .name = "exiu",
+               .acpi_match_table = exiu_acpi_ids,
+       },
+       .probe = exiu_acpi_probe,
+};
+builtin_platform_driver(exiu_driver);
+#endif