forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'rtc-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/…
…abelloni/linux Pull RTC updates from Alexandre Belloni: "Two new drivers and the new pcf2127 feature make the bulk of the additions. The rest are the usual fixes and new features. Subsystem: - add debug message when registration fails New drivers: - Amlogic Virtual Wake - Freescale FlexTimer Module alarm Drivers: - remove superfluous error messages - convert to i2c_new_dummy_device and devm_i2c_new_dummy_device - Remove dev_err() usage after platform_get_irq() - Set RTC range for: pcf2123, pcf8563, snvs. - pcf2127: tamper detection and watchdog support - pcf85363: fix regmap issue - sun6i: H6 support - remove w90x900/nuc900 driver" * tag 'rtc-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (51 commits) rtc: meson: mark PM functions as __maybe_unused rtc: sc27xx: Remove clearing SPRD_RTC_POWEROFF_ALM_FLAG flag dt-bindings: rtc: ds1307: add rx8130 compatible rtc: sun6i: Allow using as wakeup source from suspend rtc: pcf8563: let the core handle range offsetting rtc: pcf8563: remove useless indirection rtc: pcf8563: convert to devm_rtc_allocate_device rtc: pcf8563: add Microcrystal RV8564 compatible rtc: pcf8563: add Epson RTC8564 compatible rtc: s35390a: convert to devm_i2c_new_dummy_device() rtc: max77686: convert to devm_i2c_new_dummy_device() rtc: pcf85363/pcf85263: fix regmap error in set_time rtc: snvs: switch to rtc_time64_to_tm/rtc_tm_to_time64 rtc: snvs: set range rtc: snvs: fix possible race condition rtc: pcf2127: bugfix: watchdog build dependency rtc: pcf2127: add tamper detection support rtc: pcf2127: add watchdog feature support rtc: pcf2127: bugfix: read rtc disables watchdog rtc: pcf2127: cleanup register and bit defines ...
- Loading branch information
Showing
66 changed files
with
1,214 additions
and
727 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
Documentation/devicetree/bindings/rtc/rtc-fsl-ftm-alarm.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
Freescale FlexTimer Module (FTM) Alarm | ||
|
||
Required properties: | ||
- compatible : Should be "fsl,<chip>-ftm-alarm", the | ||
supported chips include | ||
"fsl,ls1012a-ftm-alarm" | ||
"fsl,ls1021a-ftm-alarm" | ||
"fsl,ls1028a-ftm-alarm" | ||
"fsl,ls1043a-ftm-alarm" | ||
"fsl,ls1046a-ftm-alarm" | ||
"fsl,ls1088a-ftm-alarm" | ||
"fsl,ls208xa-ftm-alarm" | ||
"fsl,lx2160a-ftm-alarm" | ||
- reg : Specifies base physical address and size of the register sets for the | ||
FlexTimer Module. | ||
- interrupts : Should be the FlexTimer Module interrupt. | ||
- fsl,rcpm-wakeup property and rcpm node : Please refer | ||
Documentation/devicetree/bindings/soc/fsl/rcpm.txt | ||
|
||
Optional properties: | ||
- big-endian: If the host controller is big-endian mode, specify this property. | ||
The default endian mode is little-endian. | ||
|
||
Example: | ||
rcpm: rcpm@1e34040 { | ||
compatible = "fsl,ls1088a-rcpm", "fsl,qoriq-rcpm-2.1+"; | ||
reg = <0x0 0x1e34040 0x0 0x18>; | ||
#fsl,rcpm-wakeup-cells = <6>; | ||
}; | ||
|
||
ftm_alarm0: timer@2800000 { | ||
compatible = "fsl,ls1088a-ftm-alarm"; | ||
reg = <0x0 0x2800000 0x0 0x10000>; | ||
fsl,rcpm-wakeup = <&rcpm 0x0 0x0 0x0 0x0 0x4000 0x0>; | ||
interrupts = <0 44 4>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
* Amlogic Virtual RTC (VRTC) | ||
|
||
This is a Linux interface to an RTC managed by firmware, hence it's | ||
virtual from a Linux perspective. The interface is 1 register where | ||
an alarm time (in seconds) is to be written. | ||
|
||
Required properties: | ||
- compatible: should be "amlogic,meson-vrtc" | ||
- reg: physical address for the alarm register | ||
|
||
The alarm register is a simple scratch register shared between the | ||
application processors (AP) and the secure co-processor (SCP.) When | ||
the AP suspends, the SCP will use the value of this register to | ||
program an always-on timer before going sleep. When the timer expires, | ||
the SCP will wake up and will then wake the AP. | ||
|
||
Example: | ||
|
||
vrtc: rtc@0a8 { | ||
compatible = "amlogic,meson-vrtc"; | ||
reg = <0x0 0x000a8 0x0 0x4>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.