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
  ...

1 files changed, 95 insertions, 0 deletions

diff --git a/drivers/rtc/proc.c b/drivers/rtc/proc.c
new file mode 100644
index 000000000000..4d74e4f4ff30
--- /dev/null
+++ b/drivers/rtc/proc.c
@@ -0,0 +1,95 @@
+/*
+ * RTC subsystem, proc interface
+ *
+ * Copyright (C) 2005-06 Tower Technologies
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * based on arch/arm/common/rtctime.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/module.h>
+#include <linux/rtc.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+
+#include "rtc-core.h"
+
+#define NAME_SIZE       10
+
+#if defined(CONFIG_RTC_HCTOSYS_DEVICE)
+static bool is_rtc_hctosys(struct rtc_device *rtc)
+{
+        int size;
+        char name[NAME_SIZE];
+
+        size = scnprintf(name, NAME_SIZE, "rtc%d", rtc->id);
+        if (size > NAME_SIZE)
+                return false;
+
+        return !strncmp(name, CONFIG_RTC_HCTOSYS_DEVICE, NAME_SIZE);
+}
+#else
+static bool is_rtc_hctosys(struct rtc_device *rtc)
+{
+        return (rtc->id == 0);
+}
+#endif
+
+static int rtc_proc_show(struct seq_file *seq, void *offset)
+{
+        int err;
+        struct rtc_device *rtc = seq->private;
+        const struct rtc_class_ops *ops = rtc->ops;
+        struct rtc_wkalrm alrm;
+        struct rtc_time tm;
+
+        err = rtc_read_time(rtc, &tm);
+        if (err == 0) {
+                seq_printf(seq,
+                           "rtc_time\t: %ptRt\n"
+                           "rtc_date\t: %ptRd\n",
+                           &tm, &tm);
+        }
+
+        err = rtc_read_alarm(rtc, &alrm);
+        if (err == 0) {
+                seq_printf(seq, "alrm_time\t: %ptRt\n", &alrm.time);
+                seq_printf(seq, "alrm_date\t: %ptRd\n", &alrm.time);
+                seq_printf(seq, "alarm_IRQ\t: %s\n",
+                                alrm.enabled ? "yes" : "no");
+                seq_printf(seq, "alrm_pending\t: %s\n",
+                                alrm.pending ? "yes" : "no");
+                seq_printf(seq, "update IRQ enabled\t: %s\n",
+                        (rtc->uie_rtctimer.enabled) ? "yes" : "no");
+                seq_printf(seq, "periodic IRQ enabled\t: %s\n",
+                        (rtc->pie_enabled) ? "yes" : "no");
+                seq_printf(seq, "periodic IRQ frequency\t: %d\n",
+                        rtc->irq_freq);
+                seq_printf(seq, "max user IRQ frequency\t: %d\n",
+                        rtc->max_user_freq);
+        }
+
+        seq_printf(seq, "24hr\t\t: yes\n");
+
+        if (ops->proc)
+                ops->proc(rtc->dev.parent, seq);
+
+        return 0;
+}
+
+void rtc_proc_add_device(struct rtc_device *rtc)
+{
+        if (is_rtc_hctosys(rtc))
+                proc_create_single_data("driver/rtc", 0, NULL, rtc_proc_show,
+                                rtc);
+}
+
+void rtc_proc_del_device(struct rtc_device *rtc)
+{
+        if (is_rtc_hctosys(rtc))
+                remove_proc_entry("driver/rtc", NULL);
+}