Commit 2fd36c55 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Wolfram Sang

i2c: core: Map OF IRQ at probe time

I2C clients instantiated from OF get their IRQ mapped at device
registration time. This leads to the IRQ being silently ignored if the
related irqchip hasn't been proved yet.

Fix this by moving IRQ mapping at probe time using of_get_irq(). The
function operates as irq_of_parse_and_map() but additionally returns
-EPROBE_DEFER if the irqchip isn't available, allowing us to defer I2C
client probing.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 9eb08fb3
...@@ -626,6 +626,15 @@ static int i2c_device_probe(struct device *dev) ...@@ -626,6 +626,15 @@ static int i2c_device_probe(struct device *dev)
if (!client) if (!client)
return 0; return 0;
if (!client->irq && dev->of_node) {
int irq = of_irq_get(dev->of_node, 0);
if (irq < 0)
return irq;
client->irq = irq;
}
driver = to_i2c_driver(dev->driver); driver = to_i2c_driver(dev->driver);
if (!driver->probe || !driver->id_table) if (!driver->probe || !driver->id_table)
return -ENODEV; return -ENODEV;
...@@ -1407,7 +1416,6 @@ static void of_i2c_register_devices(struct i2c_adapter *adap) ...@@ -1407,7 +1416,6 @@ static void of_i2c_register_devices(struct i2c_adapter *adap)
continue; continue;
} }
info.irq = irq_of_parse_and_map(node, 0);
info.of_node = of_node_get(node); info.of_node = of_node_get(node);
info.archdata = &dev_ad; info.archdata = &dev_ad;
...@@ -1421,7 +1429,6 @@ static void of_i2c_register_devices(struct i2c_adapter *adap) ...@@ -1421,7 +1429,6 @@ static void of_i2c_register_devices(struct i2c_adapter *adap)
dev_err(&adap->dev, "of_i2c: Failure registering %s\n", dev_err(&adap->dev, "of_i2c: Failure registering %s\n",
node->full_name); node->full_name);
of_node_put(node); of_node_put(node);
irq_dispose_mapping(info.irq);
continue; continue;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment