mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-28 21:46:02 -04:00
Merge tag 'rtc-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni: "RTC subsystem update: - Add OF device ID table for i2c drivers New RTC driver: - Motorola CPCAP PMIC RTC RTC driver updates: - cmos: fix IRQ selection - ds1307: Add ST m41t0 support - ds1374: fix watchdog configuration - sh: Add rza series support" * tag 'rtc-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (33 commits) rtc: gemini: add return value validation rtc: snvs: fix an incorrect check of return value rtc: ds1374: wdt: Fix stop/start ioctl always returning -EINVAL rtc: ds1374: wdt: Fix issue with timeout scaling from secs to wdt ticks rtc: sh: mark PM functions as unused rtc: hid-sensor-time: remove some dead code rtc: m41t80: Add proper compatible for rv4162 rtc: ds1307: Add m41t0 to OF device ID table rtc: ds1307: support m41t0 variant rtc: cpcap: fix improper use of IRQ_NONE for request_threaded_irq rtc: cmos: Do not assume irq 8 for rtc when there are no legacy irqs x86: i8259: export legacy_pic symbol dt-bindings: rtc: document the rtc-sh bindings rtc: sh: add support for rza series rtc: cpcap: kfreeing devm allocated memory rtc: wm8350: Remove unused to_wm8350_from_rtc_dev rtc: cpcap: new rtc driver dt-bindings: Add vendor prefix for Motorola rtc: omap: mark PM methods as __maybe_unused rtc: omap: remove incorrect __exit markups ...
This commit is contained in:
18
Documentation/devicetree/bindings/rtc/cpcap-rtc.txt
Normal file
18
Documentation/devicetree/bindings/rtc/cpcap-rtc.txt
Normal file
@@ -0,0 +1,18 @@
|
||||
Motorola CPCAP PMIC RTC
|
||||
-----------------------
|
||||
|
||||
This module is part of the CPCAP. For more details about the whole
|
||||
chip see Documentation/devicetree/bindings/mfd/motorola-cpcap.txt.
|
||||
|
||||
Requires node properties:
|
||||
- compatible: should contain "motorola,cpcap-rtc"
|
||||
- interrupts: An interrupt specifier for alarm and 1 Hz irq
|
||||
|
||||
Example:
|
||||
|
||||
&cpcap {
|
||||
cpcap_rtc: rtc {
|
||||
compatible = "motorola,cpcap-rtc";
|
||||
interrupts = <39 IRQ_TYPE_NONE>, <26 IRQ_TYPE_NONE>;
|
||||
};
|
||||
};
|
||||
28
Documentation/devicetree/bindings/rtc/rtc-sh.txt
Normal file
28
Documentation/devicetree/bindings/rtc/rtc-sh.txt
Normal file
@@ -0,0 +1,28 @@
|
||||
* Real Time Clock for Renesas SH and ARM SoCs
|
||||
|
||||
Required properties:
|
||||
- compatible: Should be "renesas,r7s72100-rtc" and "renesas,sh-rtc" as a
|
||||
fallback.
|
||||
- reg: physical base address and length of memory mapped region.
|
||||
- interrupts: 3 interrupts for alarm, period, and carry.
|
||||
- interrupt-names: The interrupts should be labeled as "alarm", "period", and
|
||||
"carry".
|
||||
- clocks: The functional clock source for the RTC controller must be listed
|
||||
first (if exists). Additionally, potential clock counting sources are to be
|
||||
listed.
|
||||
- clock-names: The functional clock must be labeled as "fck". Other clocks
|
||||
may be named in accordance to the SoC hardware manuals.
|
||||
|
||||
|
||||
Example:
|
||||
rtc: rtc@fcff1000 {
|
||||
compatible = "renesas,r7s72100-rtc", "renesas,sh-rtc";
|
||||
reg = <0xfcff1000 0x2e>;
|
||||
interrupts = <GIC_SPI 276 IRQ_TYPE_EDGE_RISING
|
||||
GIC_SPI 277 IRQ_TYPE_EDGE_RISING
|
||||
GIC_SPI 278 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "alarm", "period", "carry";
|
||||
clocks = <&mstp6_clks R7S72100_CLK_RTC>, <&rtc_x1_clk>,
|
||||
<&rtc_x3_clk>, <&extal_clk>;
|
||||
clock-names = "fck", "rtc_x1", "rtc_x3", "extal";
|
||||
};
|
||||
@@ -160,6 +160,7 @@ sii,s35390a 2-wire CMOS real-time clock
|
||||
silabs,si7020 Relative Humidity and Temperature Sensors
|
||||
skyworks,sky81452 Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply
|
||||
st,24c256 i2c serial eeprom (24cxx)
|
||||
st,m41t0 Serial real-time clock (RTC)
|
||||
st,m41t00 Serial real-time clock (RTC)
|
||||
st,m41t62 Serial real-time clock (RTC) with alarm
|
||||
st,m41t80 M41T80 - SERIAL ACCESS RTC WITH ALARMS
|
||||
|
||||
@@ -197,6 +197,7 @@ minix MINIX Technology Ltd.
|
||||
miramems MiraMEMS Sensing Technology Co., Ltd.
|
||||
mitsubishi Mitsubishi Electric Corporation
|
||||
mosaixtech Mosaix Technologies, Inc.
|
||||
motorola Motorola, Inc.
|
||||
moxa Moxa
|
||||
mpl MPL AG
|
||||
mqmaker mqmaker Inc.
|
||||
|
||||
Reference in New Issue
Block a user