i2c: i2c-smbus: add of_i2c_setup_smbus_alert

This commit adds of_i2c_setup_smbus_alert which allows the smbalert
driver to be attached to an i2c adapter via the device tree.

Signed-off-by: Phil Reid <preid@electromag.com.au>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/Documentation/devicetree/bindings/i2c/i2c.txt b/Documentation/devicetree/bindings/i2c/i2c.txt
index cee9d5055fa27c7593f5a9da09661c4f7eed9647..11263982470e548316e0038e202d8dfc05ab9b07 100644 (file)
--- a/Documentation/devicetree/bindings/i2c/i2c.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c.txt
@@ -59,8 +59,8 @@ wants to support one of the below features, it should adapt the bindings below.
        interrupts used by the device.
 
 - interrupt-names
-       "irq" and "wakeup" names are recognized by I2C core, other names are
-       left to individual drivers.
+       "irq", "wakeup" and "smbus_alert" names are recognized by I2C core,
+       other names are left to individual drivers.
 
 - host-notify
        device uses SMBus host notify protocol instead of interrupt line.

diff --git a/drivers/i2c/i2c-core-smbus.c b/drivers/i2c/i2c-core-smbus.c
index 7f3ec02f085a82c50af4b778276d42fa68588c43..4bb9927afd0106f6cf6de9fd433c0b66b18173aa 100644 (file)
--- a/drivers/i2c/i2c-core-smbus.c
+++ b/drivers/i2c/i2c-core-smbus.c
@@ -625,3 +625,25 @@ struct i2c_client *i2c_setup_smbus_alert(struct i2c_adapter *adapter,
        return i2c_new_device(adapter, &ara_board_info);
 }
 EXPORT_SYMBOL_GPL(i2c_setup_smbus_alert);
+
+#if IS_ENABLED(CONFIG_I2C_SMBUS) && IS_ENABLED(CONFIG_OF)
+int of_i2c_setup_smbus_alert(struct i2c_adapter *adapter)
+{
+       struct i2c_client *client;
+       int irq;
+
+       irq = of_property_match_string(adapter->dev.of_node, "interrupt-names",
+                                      "smbus_alert");
+       if (irq == -EINVAL || irq == -ENODATA)
+               return 0;
+       else if (irq < 0)
+               return irq;
+
+       client = i2c_setup_smbus_alert(adapter, NULL);
+       if (!client)
+               return -ENODEV;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(of_i2c_setup_smbus_alert);
+#endif

diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c
index d0bb0358b578cba8edb9f0ba7178842cfbd75c27..5a1dd7f13bacb2027fc301a561f7065536bc52ef 100644 (file)
--- a/drivers/i2c/i2c-smbus.c
+++ b/drivers/i2c/i2c-smbus.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of_irq.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 
@@ -139,7 +140,14 @@ static int smbalert_probe(struct i2c_client *ara,
        if (!alert)
                return -ENOMEM;
 
-       irq = setup->irq;
+       if (setup) {
+               irq = setup->irq;
+       } else {
+               irq = of_irq_get_byname(adapter->dev.of_node, "smbus_alert");
+               if (irq <= 0)
+                       return irq;
+       }
+
        INIT_WORK(&alert->alert, smbalert_work);
        alert->ara = ara;
 

diff --git a/include/linux/i2c-smbus.h b/include/linux/i2c-smbus.h
index 19efbd14e812a3f4236f1b6a55afa5067c07fec2..fb0e040b1abbb6de83dd70f7de5c907ab59f1819 100644 (file)
--- a/include/linux/i2c-smbus.h
+++ b/include/linux/i2c-smbus.h
@@ -49,4 +49,13 @@ struct i2c_client *i2c_setup_smbus_alert(struct i2c_adapter *adapter,
                                         struct i2c_smbus_alert_setup *setup);
 int i2c_handle_smbus_alert(struct i2c_client *ara);
 
+#if IS_ENABLED(CONFIG_I2C_SMBUS) && IS_ENABLED(CONFIG_OF)
+int of_i2c_setup_smbus_alert(struct i2c_adapter *adap);
+#else
+static inline int of_i2c_setup_smbus_alert(struct i2c_adapter *adap)
+{
+       return 0;
+}
+#endif
+
 #endif /* _LINUX_I2C_SMBUS_H */