From: Phil Reid <preid@electromag.com.au>
To: wsa@the-dreams.de, robh+dt@kernel.org, mark.rutland@arm.com,
sre@kernel.org, peda@axentia.se, preid@electromag.com.au,
linux-i2c@vger.kernel.org, devicetree@vger.kernel.org,
linux-pm@vger.kernel.org
Subject: [PATCH v5 3/9] i2c: i2c-smbus: add of_i2c_setup_smbus_alert
Date: Mon, 1 May 2017 16:49:53 +0800 [thread overview]
Message-ID: <1493628599-30552-4-git-send-email-preid@electromag.com.au> (raw)
In-Reply-To: <1493628599-30552-1-git-send-email-preid@electromag.com.au>
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>
---
Documentation/devicetree/bindings/i2c/i2c.txt | 4 +--
drivers/i2c/i2c-smbus.c | 35 +++++++++++++++++++++++++++
include/linux/i2c-smbus.h | 9 +++++++
3 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/i2c/i2c.txt b/Documentation/devicetree/bindings/i2c/i2c.txt
index cee9d50..1126398 100644
--- 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-smbus.c b/drivers/i2c/i2c-smbus.c
index df0e2fa..a8f8439 100644
--- 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>
@@ -238,6 +239,40 @@ struct i2c_client *i2c_setup_smbus_alert(struct i2c_adapter *adapter,
}
EXPORT_SYMBOL_GPL(i2c_setup_smbus_alert);
+int of_i2c_setup_smbus_alert(struct i2c_adapter *adap)
+{
+ struct i2c_client *client;
+ struct i2c_smbus_alert_setup *setup;
+ struct i2c_board_info info = {
+ I2C_BOARD_INFO("smbus_alert", 0x0c),
+ };
+ int irq;
+
+ if (!adap->dev.of_node)
+ return 0;
+
+ irq = of_irq_get_byname(adap->dev.of_node, "smbus_alert");
+ if (irq == -EINVAL || irq == -ENODATA)
+ return 0;
+ else if (irq < 0)
+ return irq;
+
+ setup = devm_kzalloc(&adap->dev, sizeof(struct i2c_smbus_alert_setup),
+ GFP_KERNEL);
+ if (!setup)
+ return -ENOMEM;
+
+ setup->irq = irq;
+ info.platform_data = setup;
+
+ client = i2c_new_device(adap, &info);
+ if (!client)
+ return -ENODEV;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(of_i2c_setup_smbus_alert);
+
/**
* i2c_handle_smbus_alert - Handle an SMBus alert
* @ara: the ARA client on the relevant adapter
diff --git a/include/linux/i2c-smbus.h b/include/linux/i2c-smbus.h
index a138502..4732d09 100644
--- a/include/linux/i2c-smbus.h
+++ b/include/linux/i2c-smbus.h
@@ -50,4 +50,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)
+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 */
--
1.8.3.1
next prev parent reply other threads:[~2017-05-01 8:49 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-01 8:49 [PATCH v5 0/9] Add sbs-manager with smbalert support Phil Reid
2017-05-01 8:49 ` [PATCH v5 1/9] i2c: i2c-smbus: Support threaded irqs Phil Reid
2017-05-01 8:49 ` [PATCH v5 2/9] i2c: i2c-smbus: Add null ptr guard in smb_alert_probe Phil Reid
2017-05-01 8:49 ` Phil Reid [this message]
2017-05-01 8:49 ` [PATCH v5 4/9] i2c: core: call of_i2c_setup_smbus_alert in i2c_register_adapter Phil Reid
[not found] ` <1493628599-30552-5-git-send-email-preid-qgqNFa1JUf/o2iN0hyhwsIdd74u8MsAO@public.gmane.org>
2017-05-02 17:42 ` kbuild test robot
2017-05-01 8:49 ` [PATCH v5 5/9] i2c: mux: pca954x: Call request irq after adding mux segments Phil Reid
2017-05-01 8:49 ` [PATCH v5 6/9] Documentation: Add sbs-manager device tree node documentation Phil Reid
[not found] ` <1493628599-30552-7-git-send-email-preid-qgqNFa1JUf/o2iN0hyhwsIdd74u8MsAO@public.gmane.org>
2017-05-01 11:49 ` Sebastian Reichel
2017-05-01 8:49 ` [PATCH v5 7/9] power: Adds support for Smart Battery System Manager Phil Reid
[not found] ` <1493628599-30552-8-git-send-email-preid-qgqNFa1JUf/o2iN0hyhwsIdd74u8MsAO@public.gmane.org>
2017-05-01 13:41 ` Sebastian Reichel
2017-05-02 2:20 ` Phil Reid
[not found] ` <bf4cf813-609c-1d92-2329-35e9176d0d28-qgqNFa1JUf/o2iN0hyhwsIdd74u8MsAO@public.gmane.org>
2017-05-02 7:12 ` Sebastian Reichel
2017-05-01 8:49 ` [PATCH v5 8/9] power: supply: sbs-battery: Add alert callback Phil Reid
[not found] ` <1493628599-30552-9-git-send-email-preid-qgqNFa1JUf/o2iN0hyhwsIdd74u8MsAO@public.gmane.org>
2017-05-01 12:32 ` Sebastian Reichel
2017-05-01 8:49 ` [PATCH v5 9/9] power: supply: sbs-manager: Add alert callback and battery change notification Phil Reid
[not found] ` <1493628599-30552-10-git-send-email-preid-qgqNFa1JUf/o2iN0hyhwsIdd74u8MsAO@public.gmane.org>
2017-05-01 13:50 ` Sebastian Reichel
2017-05-01 9:08 ` [PATCH v5 0/9] Add sbs-manager with smbalert support Wolfram Sang
2017-05-02 10:24 ` Benjamin Tissoires
[not found] ` <20170502102440.GC2382-/m+UfqrgI5QNLKR9yMNcA1aTQe2KTcn/@public.gmane.org>
2017-05-02 10:29 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1493628599-30552-4-git-send-email-preid@electromag.com.au \
--to=preid@electromag.com.au \
--cc=devicetree@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=peda@axentia.se \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).