From: Denis OSTERLAND <denis.osterland@diehl.com>
To: "a.zummo@towertech.it" <a.zummo@towertech.it>,
"alexandre.belloni@bootlin.com" <alexandre.belloni@bootlin.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"robh+dt@kernel.org" <robh+dt@kernel.org>,
"m.grzeschik@pengutronix.de" <m.grzeschik@pengutronix.de>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"mark.rutland@arm.com" <mark.rutland@arm.com>,
"linux-rtc@vger.kernel.org" <linux-rtc@vger.kernel.org>,
"kernel@pengutronix.de" <kernel@pengutronix.de>,
Denis OSTERLAND <denis.osterland@diehl.com>
Subject: [PATCH v5 4/5] rtc: isl1208: set ev-evienb bit from device tree
Date: Tue, 24 Jul 2018 11:31:21 +0000 [thread overview]
Message-ID: <20180724095437.6016-5-Denis.Osterland@diehl.com> (raw)
In-Reply-To: <20180724095437.6016-1-Denis.Osterland@diehl.com>
From: Denis Osterland <Denis.Osterland@diehl.com>
Add support to disable event in pull-up.
Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com>
---
drivers/rtc/rtc-isl1208.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
index 0812a14c2d5c..fa744c7ad5b3 100644
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -44,6 +44,7 @@
#define ISL1208_REG_INT_IM (1<<7) /* interrupt/alarm mode */
#define ISL1219_REG_EV 0x09
#define ISL1219_REG_EV_EVEN (1<<4) /* event detection enable */
+#define ISL1219_REG_EV_EVIENB (1<<7) /* event in pull-up disable */
#define ISL1208_REG_ATR 0x0a
#define ISL1208_REG_DTR 0x0b
@@ -777,8 +778,22 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
"please set clock.\n");
if (id->driver_data == TYPE_ISL1219) {
- rc = i2c_smbus_write_byte_data(client, ISL1219_REG_EV,
- ISL1219_REG_EV_EVEN);
+ struct device_node *np = client->dev.of_node;
+ u32 evienb;
+
+ rc = i2c_smbus_read_byte_data(client, ISL1219_REG_EV);
+ if (rc < 0) {
+ dev_err(&client->dev, "failed to read EV reg\n");
+ return rc;
+ }
+ rc |= ISL1219_REG_EV_EVEN;
+ if (!of_property_read_u32(np, "isil,ev-evienb", &evienb)) {
+ if (evienb)
+ rc |= ISL1219_REG_EV_EVIENB;
+ else
+ rc &= ~ISL1219_REG_EV_EVIENB;
+ }
+ rc = i2c_smbus_write_byte_data(client, ISL1219_REG_EV, rc);
if (rc < 0) {
dev_err(&client->dev, "could not enable tamper detection\n");
return rc;
@@ -786,7 +801,7 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
rc = rtc_add_group(rtc, &isl1219_rtc_sysfs_files);
if (rc)
return rc;
- evdet_irq = of_irq_get_byname(client->dev.of_node, "evdet");
+ evdet_irq = of_irq_get_byname(np, "evdet");
}
rc = sysfs_create_group(&client->dev.kobj, &isl1208_rtc_sysfs_files);
--
2.18.0
Diehl Connectivity Solutions GmbH
Geschäftsführung: Horst Leonberger
Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
Nürnberg: HRB 32315
___________________________________________________________________________________________________
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht.
Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by
mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.
next prev parent reply other threads:[~2018-07-24 11:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-24 11:31 [PATCH v5 0/5] rtc: isl1208: fixes, documentation and isl1219 support Denis OSTERLAND
2018-07-24 11:31 ` [PATCH v5 3/5] rtc: isl1208: Add "evdet" interrupt source for isl1219 Denis OSTERLAND
2018-07-24 11:31 ` Denis OSTERLAND [this message]
2018-07-24 11:31 ` [PATCH v5 2/5] rtc: isl1208: add support for isl1219 with tamper detection Denis OSTERLAND
2018-07-24 11:31 ` [PATCH v5 1/5] rtc: sysfs: facilitate attribute add to rtc device Denis OSTERLAND
2018-07-24 11:31 ` [PATCH v5 5/5] rtc: isl1219: add device tree docu Denis OSTERLAND
2018-07-24 23:25 ` Rob Herring
2018-08-14 21:27 ` [PATCH v5 0/5] rtc: isl1208: fixes, documentation and isl1219 support Alexandre Belloni
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=20180724095437.6016-5-Denis.Osterland@diehl.com \
--to=denis.osterland@diehl.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=m.grzeschik@pengutronix.de \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
/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