| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1499975665-14581-1-git-send-email-mdf@kernel.org>
Date: Thu, 13 Jul 2017 12:54:24 -0700
From: Moritz Fischer <mdf@...nel.org>
To: lee.jones@...aro.org
Cc: robh+dt@...nel.org, mark.rutland@....com, a.zummo@...ertech.it,
alexandre.belloni@...e-electrons.com, wim@...ana.be,
linux@...ck-us.net, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-watchdog@...r.kernel.org,
linux-rtc@...r.kernel.org, Moritz Fischer <mdf@...nel.org>
Subject: [PATCH 1/2] dt-binding: mfd: Add Maxim/Dallas DS1374 MFD device binding
This adds a binding for the Maxim/Dallas DS1374 MFD.
Signed-off-by: Moritz Fischer <mdf@...nel.org>
---
Changes from RFC:
- dallas,ds1374-mode -> dallas,mode
- Clarified examples
- dallas,remap-reset property
On second thoughts the solution for the remapping found in the
discussion did not seem to be a good solution, since the INT
pin indicating watchdog reset does not necessarily have to be
connected to an interrupt line on the machine, it could equally
well be hooked up to a PMIC reset input or similar.
In that case using the presence of an 'interrupt' phandle is not
a good choice.
Cheers,
Moritz
---
Documentation/devicetree/bindings/mfd/ds1374.txt | 88 ++++++++++++++++++++++
.../devicetree/bindings/trivial-devices.txt | 1 -
drivers/rtc/Kconfig | 2 +
3 files changed, 90 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/mfd/ds1374.txt
diff --git a/Documentation/devicetree/bindings/mfd/ds1374.txt b/Documentation/devicetree/bindings/mfd/ds1374.txt
new file mode 100644
index 0000000..d558b87
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/ds1374.txt
@@ -0,0 +1,88 @@
+* Device tree bindings for Maxim/Dallas DS1374 Multi Function Device (MFD)
+
+The Maxim/Dallas DS1374 is a multi function device that combines rtc,
+watchdog or alarm, as well as trickle charger.
+
+The DS1374 is connected via I2C.
+
+Required properties:
+- compatible: "dallas,ds1374"
+- reg: I2C slave address
+- dallas,mode: Should be one of the following values:
+ <0> for RTC
+ <1> for RTC + Alarm (Interrupt)
+ <2> for RTC + Watchdog
+
+For convenience there's an include file with constants avaialable
+at include/dt-bindings/mfd/ds1374.h
+
+Required child:
+A single available child device of type matching the "dallas,mode"
+property.
+
+See ../watchdog/* for generic watchdog bindings.
+
+Optional properties (real time clock):
+- interrupt: phandle to interrupt cell for the rtc's alarm feature
+
+See ../rtc/* for generic rtc bindings.
+
+Optional properties (trickle-charger):
+- dallas,trickle-resistor-ohms : Selected resistor for trickle charger
+ Values usable for ds1374 are 250, 2000, 4000
+ Should be given if trickle charger should be enabled
+- dallas,trickle-diode-disable : Do not use internal trickle charger diode
+ Should be given if internal trickle charger diode should be disabled
+
+Optional properties (watchdog):
+- dallas,remap-reset : If present, the INT pin of the device will toggle on
+ watchdog timeout instead of the RST pin. This effectively muxes the
+ INT pin to the RST pin.
+
+Example for just rtc:
+
+i2c@...a0000 {
+ rtc@68 {
+ compatible = "ds1374";
+ reg = <0x68>;
+ dallas,mode = <0>
+ };
+};
+
+Example for rtc with alarm mode and interrupt (and trickle charging):
+
+i2c@...a0000 {
+ rtc@68 {
+ compatible = "ds1374";
+ reg = <0x68>;
+ interrupts = <&gpio0 62>;
+ dallas,mode = <1>
+
+ dallas,trickle-resistor-ohms = <250>;
+ dallas,trickle-diode-disable;
+ };
+};
+
+Example for rtc with watchdog and reset on timeout, with watchdog reset
+remapped to the INT pin (also no trickle charging):
+
+i2c@...a0000 {
+ rtc@68 {
+ compatible = "ds1374";
+ reg = <0x68>;
+ dallas,mode = <2>
+ dallas,remap-reset;
+ reset-on-timeout;
+ };
+};
+
+Example for rtc with watchdog and reset on timeout, with reset not
+remapped to the INT pin (also no trickle charging):
+
+i2c@...a0000 {
+ rtc@68 {
+ compatible = "ds1374";
+ reg = <0x68>;
+ dallas,mode = <2>
+ };
+};
diff --git a/Documentation/devicetree/bindings/trivial-devices.txt b/Documentation/devicetree/bindings/trivial-devices.txt
index ad10fbe..42d99d1 100644
--- a/Documentation/devicetree/bindings/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/trivial-devices.txt
@@ -29,7 +29,6 @@ cirrus,cs42l51 Cirrus Logic CS42L51 audio codec
dallas,ds1307 64 x 8, Serial, I2C Real-Time Clock
dallas,ds1338 I2C RTC with 56-Byte NV RAM
dallas,ds1340 I2C RTC with Trickle Charger
-dallas,ds1374 I2C, 32-Bit Binary Counter Watchdog RTC with Trickle Charger and Reset Input/Output
dallas,ds1631 High-Precision Digital Thermometer
dallas,ds1682 Total-Elapsed-Time Recorder with Alarm
dallas,ds1775 Tiny Digital Thermometer and Thermostat
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index ee1b0e9..20dde9b 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -250,6 +250,8 @@ config RTC_DRV_DS1307_CENTURY
config RTC_DRV_DS1374
tristate "Dallas/Maxim DS1374"
+ depends on MFD_DS1374
+ depends on REGMAP_I2C
help
If you say yes here you get support for Dallas Semiconductor
DS1374 real-time clock chips. If an interrupt is associated
--
2.7.4
Powered by blists - more mailing lists