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 ...
This commit is contained in:
Linus Torvalds
@@ -25,6 +25,7 @@ properties:
|
||||
- items:
|
||||
- const: allwinner,sun50i-a64-rtc
|
||||
- const: allwinner,sun8i-h3-rtc
|
||||
- const: allwinner,sun50i-h6-rtc
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
@@ -92,6 +93,18 @@ allOf:
|
||||
minItems: 3
|
||||
maxItems: 3
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
contains:
|
||||
const: allwinner,sun50i-h6-rtc
|
||||
|
||||
then:
|
||||
properties:
|
||||
clock-output-names:
|
||||
minItems: 3
|
||||
maxItems: 3
|
||||
|
||||
- if:
|
||||
properties:
|
||||
compatible:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
NXP PCF2123 SPI Real Time Clock
|
||||
|
||||
Required properties:
|
||||
- compatible: should be: "nxp,rtc-pcf2123"
|
||||
- compatible: should be: "nxp,pcf2123"
|
||||
or "microcrystal,rv2123"
|
||||
- reg: should be the SPI slave chipselect address
|
||||
|
||||
@@ -11,7 +11,7 @@ Optional properties:
|
||||
Example:
|
||||
|
||||
pcf2123: rtc@3 {
|
||||
compatible = "nxp,rtc-pcf2123"
|
||||
compatible = "nxp,pcf2123"
|
||||
reg = <3>
|
||||
spi-cs-high;
|
||||
};
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
Philips PCF8563/Epson RTC8564 Real Time Clock
|
||||
|
||||
Required properties:
|
||||
- compatible: Should contain "nxp,pcf8563".
|
||||
- compatible: Should contain "nxp,pcf8563",
|
||||
"epson,rtc8564" or
|
||||
"microcrystal,rv8564"
|
||||
- reg: I2C address for chip.
|
||||
|
||||
Optional property:
|
||||
|
||||
@@ -19,6 +19,7 @@ Required properties:
|
||||
"pericom,pt7c4338",
|
||||
"epson,rx8025",
|
||||
"isil,isl12057"
|
||||
"epson,rx8130"
|
||||
- reg: I2C bus address of the device
|
||||
|
||||
Optional properties:
|
||||
|
||||
@@ -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>;
|
||||
};
|
||||
@@ -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>;
|
||||
};
|
||||
@@ -52,8 +52,6 @@ properties:
|
||||
- nxp,pcf2127
|
||||
# Real-time clock
|
||||
- nxp,pcf2129
|
||||
# Real-time clock/calendar
|
||||
- nxp,pcf8563
|
||||
# Real-time Clock Module
|
||||
- pericom,pt7c4338
|
||||
# I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
|
||||
|
||||
Reference in New Issue
Block a user