]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
m68k: mvme147, mvme16x: Adopt rtc-m48t59 platform driver
authorFinn Thain <fthain@linux-m68k.org>
Tue, 12 Nov 2024 22:32:15 +0000 (09:32 +1100)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Fri, 22 Nov 2024 19:59:40 +0000 (20:59 +0100)
Both mvme147 and mvme16x platforms have their own RTC driver
implementations that duplicate functionality provided by the rtc-m48t59
driver. Adopt the rtc-m48t59 driver and remove the other ones.

Tested-by: Daniel Palmer <daniel@0x0f.com>
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/19a16bcc94c42ea9c5397b37b1918c2937e3faab.1731450735.git.fthain@linux-m68k.org
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
arch/m68k/configs/multi_defconfig
arch/m68k/configs/mvme147_defconfig
arch/m68k/configs/mvme16x_defconfig
arch/m68k/include/asm/mvme147hw.h
arch/m68k/include/asm/mvme16xhw.h
arch/m68k/mvme147/config.c
arch/m68k/mvme16x/Makefile
arch/m68k/mvme16x/config.c
arch/m68k/mvme16x/rtc.c [deleted file]

index 6f5ca3f85ea1602866987e9cd2c7d93057881971..b34936391707db39b372e2ebc43a8c9a436b1eac 100644 (file)
@@ -503,6 +503,7 @@ CONFIG_UHID=m
 # CONFIG_USB_SUPPORT is not set
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MSM6242=m
 CONFIG_RTC_DRV_RP5C01=m
 CONFIG_RTC_DRV_GENERIC=m
index d16b328c71363f51a22d2dbf59f60a7c2bfa5eaa..0cf6d05b90137f386121fc4caa181d204303476d 100644 (file)
@@ -391,6 +391,7 @@ CONFIG_UHID=m
 # CONFIG_USB_SUPPORT is not set
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_DRV_M48T59=y
 CONFIG_RTC_DRV_GENERIC=m
 # CONFIG_VIRTIO_MENU is not set
 # CONFIG_VHOST_MENU is not set
index 80f6c15a5ed5c8f88a743cfbdbbd0408c3d2bade..a4f2169bcde822ca7cd1be5a2ecff6e84421a80a 100644 (file)
@@ -392,6 +392,7 @@ CONFIG_UHID=m
 # CONFIG_USB_SUPPORT is not set
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_NVMEM is not set
+CONFIG_RTC_DRV_M48T59=y
 CONFIG_RTC_DRV_GENERIC=m
 # CONFIG_VIRTIO_MENU is not set
 # CONFIG_VHOST_MENU is not set
index e28eb1c0e0bfb37986e520102214fd6e5e1cd5b3..2b147ab1d189e2c0bbc1704fd5ae63943f1a87f6 100644 (file)
@@ -4,24 +4,7 @@
 
 #include <asm/irq.h>
 
-typedef struct {
-       unsigned char
-               ctrl,
-               bcd_sec,
-               bcd_min,
-               bcd_hr,
-               bcd_dow,
-               bcd_dom,
-               bcd_mth,
-               bcd_year;
-} MK48T02;
-
-#define RTC_WRITE      0x80
-#define RTC_READ       0x40
-#define RTC_STOP       0x20
-
-#define m147_rtc ((MK48T02 * volatile)0xfffe07f8)
-
+#define MVME147_RTC_BASE       0xfffe0000
 
 struct pcc_regs {
    volatile u_long     dma_tadr;
index cc7f5ae1220ff73e898c58b9a56247fd118c515a..ff1126a51fbecadbab757dbcf7141cf4458328ce 100644 (file)
@@ -24,23 +24,7 @@ typedef struct {
 
 #define mvmelp   ((*(volatile MVMElpPtr)(MVME_LPR_BASE)))
 
-typedef struct {
-       unsigned char
-               ctrl,
-               bcd_sec,
-               bcd_min,
-               bcd_hr,
-               bcd_dow,
-               bcd_dom,
-               bcd_mth,
-               bcd_year;
-} MK48T08_t, *MK48T08ptr_t;
-
-#define RTC_WRITE      0x80
-#define RTC_READ       0x40
-#define RTC_STOP       0x20
-
-#define MVME_RTC_BASE  0xfffc1ff8
+#define MVME_RTC_BASE  0xfffc0000
 
 #define MVME_I596_BASE 0xfff46000
 
index 8b5dc07f0811f2fcfd954f22fdb39ecf77b702a4..2e8f41636efb15b6ee2787514ba144c3b3b3bf86 100644 (file)
@@ -19,8 +19,9 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/major.h>
-#include <linux/rtc.h>
 #include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/rtc/m48t59.h>
 
 #include <asm/bootinfo.h>
 #include <asm/bootinfo-vme.h>
 
 static void mvme147_get_model(char *model);
 extern void mvme147_sched_init(void);
-extern int mvme147_hwclk (int, struct rtc_time *);
 extern void mvme147_reset (void);
 
 
-static int bcd2int (unsigned char b);
-
-
 int __init mvme147_parse_bootinfo(const struct bi_record *bi)
 {
        uint16_t tag = be16_to_cpu(bi->tag);
@@ -79,7 +76,6 @@ void __init config_mvme147(void)
 {
        mach_sched_init         = mvme147_sched_init;
        mach_init_IRQ           = mvme147_init_IRQ;
-       mach_hwclk              = mvme147_hwclk;
        mach_reset              = mvme147_reset;
        mach_get_model          = mvme147_get_model;
 
@@ -88,6 +84,28 @@ void __init config_mvme147(void)
                vme_brdtype = VME_TYPE_MVME147;
 }
 
+static struct resource m48t59_rsrc[] = {
+       DEFINE_RES_MEM(MVME147_RTC_BASE, 0x800),
+};
+
+static struct m48t59_plat_data m48t59_data = {
+       .type = M48T59RTC_TYPE_M48T02,
+       .yy_offset = 70,
+};
+
+static int __init mvme147_platform_init(void)
+{
+       if (!MACH_IS_MVME147)
+               return 0;
+
+       platform_device_register_resndata(NULL, "rtc-m48t59", -1,
+                                         m48t59_rsrc, ARRAY_SIZE(m48t59_rsrc),
+                                         &m48t59_data, sizeof(m48t59_data));
+       return 0;
+}
+
+arch_initcall(mvme147_platform_init);
+
 static u64 mvme147_read_clk(struct clocksource *cs);
 
 static struct clocksource mvme147_clk = {
@@ -161,27 +179,3 @@ static u64 mvme147_read_clk(struct clocksource *cs)
        return ticks;
 }
 
-static int bcd2int (unsigned char b)
-{
-       return ((b>>4)*10 + (b&15));
-}
-
-int mvme147_hwclk(int op, struct rtc_time *t)
-{
-       if (!op) {
-               m147_rtc->ctrl = RTC_READ;
-               t->tm_year = bcd2int (m147_rtc->bcd_year);
-               t->tm_mon  = bcd2int(m147_rtc->bcd_mth) - 1;
-               t->tm_mday = bcd2int (m147_rtc->bcd_dom);
-               t->tm_hour = bcd2int (m147_rtc->bcd_hr);
-               t->tm_min  = bcd2int (m147_rtc->bcd_min);
-               t->tm_sec  = bcd2int (m147_rtc->bcd_sec);
-               m147_rtc->ctrl = 0;
-               if (t->tm_year < 70)
-                       t->tm_year += 100;
-       } else {
-               /* FIXME Setting the time is not yet supported */
-               return -EOPNOTSUPP;
-       }
-       return 0;
-}
index a8a368c2cbea5c5899932609e0365cf8def7687d..02f9e4ad8209a692aeb306ef52d3a59e6325026d 100644 (file)
@@ -3,4 +3,4 @@
 # Makefile for Linux arch/m68k/mvme16x source directory
 #
 
-obj-y          := config.o rtc.o
+obj-y          := config.o
index d1fbd1704d65822f7972c6f53c7adb66d268e7d5..99768fe8da73aa68b1a356cfbcf307cf360f0f70 100644 (file)
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/major.h>
-#include <linux/rtc.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/rtc/m48t59.h>
 
 #include <asm/bootinfo.h>
 #include <asm/bootinfo-vme.h>
 
 extern t_bdid mvme_bdid;
 
-static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE;
-
 static void mvme16x_get_model(char *model);
 extern void mvme16x_sched_init(void);
-extern int mvme16x_hwclk (int, struct rtc_time *);
 extern void mvme16x_reset (void);
 
-int bcd2int (unsigned char b);
-
-
 unsigned short mvme16x_config;
 EXPORT_SYMBOL(mvme16x_config);
 
@@ -268,7 +263,6 @@ void __init config_mvme16x(void)
 
     mach_sched_init      = mvme16x_sched_init;
     mach_init_IRQ        = mvme16x_init_IRQ;
-    mach_hwclk           = mvme16x_hwclk;
     mach_reset          = mvme16x_reset;
     mach_get_model       = mvme16x_get_model;
     mach_get_hardware_list = mvme16x_get_hardware_list;
@@ -312,6 +306,28 @@ void __init config_mvme16x(void)
     }
 }
 
+static struct resource m48t59_rsrc[] = {
+       DEFINE_RES_MEM(MVME_RTC_BASE, 0x2000),
+};
+
+static struct m48t59_plat_data m48t59_data = {
+       .type = M48T59RTC_TYPE_M48T08,
+       .yy_offset = 70,
+};
+
+static int __init mvme16x_platform_init(void)
+{
+       if (!MACH_IS_MVME16x)
+               return 0;
+
+       platform_device_register_resndata(NULL, "rtc-m48t59", -1,
+                                         m48t59_rsrc, ARRAY_SIZE(m48t59_rsrc),
+                                         &m48t59_data, sizeof(m48t59_data));
+       return 0;
+}
+
+arch_initcall(mvme16x_platform_init);
+
 static irqreturn_t mvme16x_abort_int (int irq, void *dev_id)
 {
        unsigned long *new = (unsigned long *)vectors;
@@ -426,28 +442,3 @@ static u64 mvme16x_read_clk(struct clocksource *cs)
 
        return ticks;
 }
-
-int bcd2int (unsigned char b)
-{
-       return ((b>>4)*10 + (b&15));
-}
-
-int mvme16x_hwclk(int op, struct rtc_time *t)
-{
-       if (!op) {
-               rtc->ctrl = RTC_READ;
-               t->tm_year = bcd2int (rtc->bcd_year);
-               t->tm_mon  = bcd2int(rtc->bcd_mth) - 1;
-               t->tm_mday = bcd2int (rtc->bcd_dom);
-               t->tm_hour = bcd2int (rtc->bcd_hr);
-               t->tm_min  = bcd2int (rtc->bcd_min);
-               t->tm_sec  = bcd2int (rtc->bcd_sec);
-               rtc->ctrl = 0;
-               if (t->tm_year < 70)
-                       t->tm_year += 100;
-       } else {
-               /* FIXME Setting the time is not yet supported */
-               return -EOPNOTSUPP;
-       }
-       return 0;
-}
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c
deleted file mode 100644 (file)
index ccbaae1..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- *     Real Time Clock interface for Linux on the MVME16x
- *
- * Based on the PC driver by Paul Gortmaker.
- */
-
-#define RTC_VERSION            "1.00"
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/miscdevice.h>
-#include <linux/ioport.h>
-#include <linux/capability.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/rtc.h> /* For struct rtc_time and ioctls, etc */
-#include <linux/bcd.h>
-#include <asm/mvme16xhw.h>
-
-#include <asm/io.h>
-#include <linux/uaccess.h>
-#include <asm/setup.h>
-
-/*
- *     We sponge a minor off of the misc major. No need slurping
- *     up another valuable major dev number for this. If you add
- *     an ioctl, make sure you don't conflict with SPARC's RTC
- *     ioctls.
- */
-
-static const unsigned char days_in_mo[] =
-{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-static atomic_t rtc_ready = ATOMIC_INIT(1);
-
-static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-{
-       volatile MK48T08ptr_t rtc = (MK48T08ptr_t)MVME_RTC_BASE;
-       unsigned long flags;
-       struct rtc_time wtime;
-       void __user *argp = (void __user *)arg;
-
-       switch (cmd) {
-       case RTC_RD_TIME:       /* Read the time/date from RTC  */
-       {
-               local_irq_save(flags);
-               /* Ensure clock and real-time-mode-register are accessible */
-               rtc->ctrl = RTC_READ;
-               memset(&wtime, 0, sizeof(struct rtc_time));
-               wtime.tm_sec =  bcd2bin(rtc->bcd_sec);
-               wtime.tm_min =  bcd2bin(rtc->bcd_min);
-               wtime.tm_hour = bcd2bin(rtc->bcd_hr);
-               wtime.tm_mday =  bcd2bin(rtc->bcd_dom);
-               wtime.tm_mon =  bcd2bin(rtc->bcd_mth)-1;
-               wtime.tm_year = bcd2bin(rtc->bcd_year);
-               if (wtime.tm_year < 70)
-                       wtime.tm_year += 100;
-               wtime.tm_wday = bcd2bin(rtc->bcd_dow)-1;
-               rtc->ctrl = 0;
-               local_irq_restore(flags);
-               return copy_to_user(argp, &wtime, sizeof wtime) ?
-                                                               -EFAULT : 0;
-       }
-       case RTC_SET_TIME:      /* Set the RTC */
-       {
-               struct rtc_time rtc_tm;
-               unsigned char mon, day, hrs, min, sec, leap_yr;
-               unsigned int yrs;
-
-               if (!capable(CAP_SYS_ADMIN))
-                       return -EACCES;
-
-               if (copy_from_user(&rtc_tm, argp, sizeof(struct rtc_time)))
-                       return -EFAULT;
-
-               yrs = rtc_tm.tm_year;
-               if (yrs < 1900)
-                       yrs += 1900;
-               mon = rtc_tm.tm_mon + 1;   /* tm_mon starts at zero */
-               day = rtc_tm.tm_mday;
-               hrs = rtc_tm.tm_hour;
-               min = rtc_tm.tm_min;
-               sec = rtc_tm.tm_sec;
-
-               leap_yr = ((!(yrs % 4) && (yrs % 100)) || !(yrs % 400));
-
-               if ((mon > 12) || (day == 0))
-                       return -EINVAL;
-
-               if (day > (days_in_mo[mon] + ((mon == 2) && leap_yr)))
-                       return -EINVAL;
-
-               if ((hrs >= 24) || (min >= 60) || (sec >= 60))
-                       return -EINVAL;
-
-               if (yrs >= 2070)
-                       return -EINVAL;
-
-               local_irq_save(flags);
-               rtc->ctrl     = RTC_WRITE;
-
-               rtc->bcd_sec  = bin2bcd(sec);
-               rtc->bcd_min  = bin2bcd(min);
-               rtc->bcd_hr   = bin2bcd(hrs);
-               rtc->bcd_dom  = bin2bcd(day);
-               rtc->bcd_mth  = bin2bcd(mon);
-               rtc->bcd_year = bin2bcd(yrs%100);
-
-               rtc->ctrl     = 0;
-               local_irq_restore(flags);
-               return 0;
-       }
-       default:
-               return -EINVAL;
-       }
-}
-
-/*
- * We enforce only one user at a time here with the open/close.
- */
-static int rtc_open(struct inode *inode, struct file *file)
-{
-       if( !atomic_dec_and_test(&rtc_ready) )
-       {
-               atomic_inc( &rtc_ready );
-               return -EBUSY;
-       }
-       return 0;
-}
-
-static int rtc_release(struct inode *inode, struct file *file)
-{
-       atomic_inc( &rtc_ready );
-       return 0;
-}
-
-/*
- *     The various file operations we support.
- */
-
-static const struct file_operations rtc_fops = {
-       .unlocked_ioctl = rtc_ioctl,
-       .open           = rtc_open,
-       .release        = rtc_release,
-       .llseek         = noop_llseek,
-};
-
-static struct miscdevice rtc_dev=
-{
-       .minor =        RTC_MINOR,
-       .name =         "rtc",
-       .fops =         &rtc_fops
-};
-
-static int __init rtc_MK48T08_init(void)
-{
-       if (!MACH_IS_MVME16x)
-               return -ENODEV;
-
-       pr_info("MK48T08 Real Time Clock Driver v%s\n", RTC_VERSION);
-       return misc_register(&rtc_dev);
-}
-device_initcall(rtc_MK48T08_init);