Commit afbbd2338176 ("irqchip/gic: Document optional Clock and Power Domain properties") updated the device-tree binding documentation for the GIC to add optional clock and power domain information. Currently, the GIC driver does support these optional properties and there do not appear to be any GIC instances that define these. To support GICs that require runtime power management and hence, define the clock and/or power-domain properties, a platform driver for GICs using power management will be added. However, this presents a problem because by adding a platform driver in addition to the current GIC driver, we will have two places where we can match the GIC compatibility string to initialise the GIC and these are: 1. By the IRQCHIP_DECLARE macro for early initialisation of GICs. 2. By the platform driver's device-tree match table. To prevent a GIC which requires power management from being initialised early (by matching the compatibility string specified by IRQCHIP_DECLARE), during early inialisation, if we detect the GIC has either the 'clocks' or 'power-domains' property present bail out of the early initialisation and allow the platform driver to initialise the device. Signed-off-by: Jon Hunter <jonathanh@xxxxxxxxxx> --- drivers/irqchip/irq-gic.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 30666f349649..a10274926690 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -1205,6 +1205,15 @@ gic_of_init(struct device_node *node, struct device_node *parent) if (WARN_ON(!node)) return -ENODEV; + /* + * If the GIC device has either a 'clocks' node or a 'power-domains' + * node populated, then bail out now because this driver is currently + * unable to support devices which require power management. + */ + if (of_property_read_bool(node, "clocks") || + of_property_read_bool(node, "power-domains")) + return 0; + dist_base = of_iomap(node, 0); if (WARN(!dist_base, "unable to map gic dist registers\n")) return -ENOMEM; -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html