diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-01 16:24:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-01 16:24:31 -0500 |
| commit | 28e8c4bc8eb483c22d977e147a0b98fc63efadf7 (patch) | |
| tree | 8006dd759601c70d4dd1fc644ed817e9597cec55 /drivers/rtc/rtc-omap.c | |
| parent | c9bef4a651769927445900564781a9c99fdf6258 (diff) | |
| parent | 36e14f5fdfdf7cec8887b7ff69cd9bb5051ecf62 (diff) | |
Merge tag 'rtc-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni:
"Subsystem:
- new %ptR printk format
- rename core files
- allow registration of multiple nvmem devices
New driver:
- i.MX system controller RTC
Driver updates:
- abx80x: handle voltage ioctls, correct binding doc
- m41t80: correct month in alarm reads
- pcf85363: add pcf85263 support
- pcf8523: properly handle battery low flag
- s3c: limit alarm to one year in the future as ALMYEAR is broken
- sun6i: rework clock output binding"
* tag 'rtc-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (54 commits)
rtc: rename core files
rtc: nvmem: fix possible use after free
rtc: add i.MX system controller RTC support
dt-bindings: fsl: scu: add rtc binding
rtc: pcf2123: Add Microcrystal rv2123
rtc: class: reimplement devm_rtc_device_register
rtc: enforce rtc_timer_init private_data type
rtc: abx80x: Implement RTC_VL_READ,CLR ioctls
rtc: pcf85363: Add support for NXP pcf85263 rtc
dt-bindings: rtc: pcf85363: Document pcf85263 real-time clock
rtc: pcf8523: don't return invalid date when battery is low
dt-bindings: rtc: use a generic node name for ds1307
PM: Switch to use %ptR
m68k/mac: Switch to use %ptR
Input: hp_sdc_rtc - Switch to use %ptR
rtc: tegra: Switch to use %ptR
rtc: s5m: Switch to use %ptR
rtc: s3c: Switch to use %ptR
rtc: rx8025: Switch to use %ptR
rtc: rx6110: Switch to use %ptR
...
Diffstat (limited to 'drivers/rtc/rtc-omap.c')
| -rw-r--r-- | drivers/rtc/rtc-omap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index 320b4a520eb3..bbff0e2deb84 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c | |||
| @@ -566,9 +566,7 @@ static const struct pinctrl_ops rtc_pinctrl_ops = { | |||
| 566 | .dt_free_map = pinconf_generic_dt_free_map, | 566 | .dt_free_map = pinconf_generic_dt_free_map, |
| 567 | }; | 567 | }; |
| 568 | 568 | ||
| 569 | enum rtc_pin_config_param { | 569 | #define PIN_CONFIG_ACTIVE_HIGH (PIN_CONFIG_END + 1) |
| 570 | PIN_CONFIG_ACTIVE_HIGH = PIN_CONFIG_END + 1, | ||
| 571 | }; | ||
| 572 | 570 | ||
| 573 | static const struct pinconf_generic_params rtc_params[] = { | 571 | static const struct pinconf_generic_params rtc_params[] = { |
| 574 | {"ti,active-high", PIN_CONFIG_ACTIVE_HIGH, 0}, | 572 | {"ti,active-high", PIN_CONFIG_ACTIVE_HIGH, 0}, |