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-tegra.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-tegra.c')
-rw-r--r-- | drivers/rtc/rtc-tegra.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c index c9e77a83cd1b..c6b0a99aa3a9 100644 --- a/drivers/rtc/rtc-tegra.c +++ b/drivers/rtc/rtc-tegra.c | |||
@@ -125,15 +125,7 @@ static int tegra_rtc_read_time(struct device *dev, struct rtc_time *tm) | |||
125 | 125 | ||
126 | rtc_time_to_tm(sec, tm); | 126 | rtc_time_to_tm(sec, tm); |
127 | 127 | ||
128 | dev_vdbg(dev, "time read as %lu. %d/%d/%d %d:%02u:%02u\n", | 128 | dev_vdbg(dev, "time read as %lu. %ptR\n", sec, tm); |
129 | sec, | ||
130 | tm->tm_mon + 1, | ||
131 | tm->tm_mday, | ||
132 | tm->tm_year + 1900, | ||
133 | tm->tm_hour, | ||
134 | tm->tm_min, | ||
135 | tm->tm_sec | ||
136 | ); | ||
137 | 129 | ||
138 | return 0; | 130 | return 0; |
139 | } | 131 | } |
@@ -147,15 +139,7 @@ static int tegra_rtc_set_time(struct device *dev, struct rtc_time *tm) | |||
147 | /* convert tm to seconds. */ | 139 | /* convert tm to seconds. */ |
148 | rtc_tm_to_time(tm, &sec); | 140 | rtc_tm_to_time(tm, &sec); |
149 | 141 | ||
150 | dev_vdbg(dev, "time set to %lu. %d/%d/%d %d:%02u:%02u\n", | 142 | dev_vdbg(dev, "time set to %lu. %ptR\n", sec, tm); |
151 | sec, | ||
152 | tm->tm_mon+1, | ||
153 | tm->tm_mday, | ||
154 | tm->tm_year+1900, | ||
155 | tm->tm_hour, | ||
156 | tm->tm_min, | ||
157 | tm->tm_sec | ||
158 | ); | ||
159 | 143 | ||
160 | /* seconds only written if wait succeeded. */ | 144 | /* seconds only written if wait succeeded. */ |
161 | ret = tegra_rtc_wait_while_busy(dev); | 145 | ret = tegra_rtc_wait_while_busy(dev); |
@@ -232,15 +216,7 @@ static int tegra_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) | |||
232 | /* if successfully written and alarm is enabled ... */ | 216 | /* if successfully written and alarm is enabled ... */ |
233 | if (sec) { | 217 | if (sec) { |
234 | tegra_rtc_alarm_irq_enable(dev, 1); | 218 | tegra_rtc_alarm_irq_enable(dev, 1); |
235 | 219 | dev_vdbg(dev, "alarm set as %lu. %ptR\n", sec, &alarm->time); | |
236 | dev_vdbg(dev, "alarm set as %lu. %d/%d/%d %d:%02u:%02u\n", | ||
237 | sec, | ||
238 | alarm->time.tm_mon+1, | ||
239 | alarm->time.tm_mday, | ||
240 | alarm->time.tm_year+1900, | ||
241 | alarm->time.tm_hour, | ||
242 | alarm->time.tm_min, | ||
243 | alarm->time.tm_sec); | ||
244 | } else { | 220 | } else { |
245 | /* disable alarm if 0 or write error. */ | 221 | /* disable alarm if 0 or write error. */ |
246 | dev_vdbg(dev, "alarm disabled\n"); | 222 | dev_vdbg(dev, "alarm disabled\n"); |