rtc: gemini/ftrtc010: rename driver and symbols
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 30 May 2017 07:53:32 +0000 (09:53 +0200)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Thu, 6 Jul 2017 20:37:15 +0000 (22:37 +0200)
The Gemini RTC is actually a generic IP block from Faraday
Technology names FTRTC010. Rename the driver file and all
symbols to match this IP name.

The relationship can be clearly seen in the U-Boot driver
posted by Po-Yu Chuang for the Faraday A320 board:
https://lists.denx.de/pipermail/u-boot/2009-September/061326.html

Remove the dependency on ARCH_GEMINI but select the driver
for ARCH_GEMINI so we get a smooth transition. The IP block
is synthsized on different silicon and architectures.

Cc: Po-Yu Chuang <ratbert@faraday-tech.com>
Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
MAINTAINERS
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/rtc/rtc-ftrtc010.c [new file with mode: 0644]
drivers/rtc/rtc-gemini.c [deleted file]

index f7d568b8f133d9919e3823c102d7ac78f89c894a..c6f0f412b32ef152a1d054fdb416b394c67fbda9 100644 (file)
@@ -1226,7 +1226,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://github.com/ulli-kroll/linux.git
 S:     Maintained
 F:     arch/arm/mach-gemini/
-F:     drivers/rtc/rtc-gemini.c
+F:     drivers/rtc/rtc-ftrtc010.c
 
 ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
 M:     Barry Song <baohua@kernel.org>
index 8e1aa67fe533f546774abc2556e630120350c414..0e5044cd84ddafb8a01a4df781f9b5d6cbe79b41 100644 (file)
@@ -1495,16 +1495,16 @@ config RTC_DRV_ARMADA38X
          This driver can also be built as a module. If so, the module
          will be called armada38x-rtc.
 
-config RTC_DRV_GEMINI
-       tristate "Gemini SoC RTC"
-       depends on ARCH_GEMINI || COMPILE_TEST
+config RTC_DRV_FTRTC010
+       tristate "Faraday Technology FTRTC010 RTC"
        depends on HAS_IOMEM
+       default ARCH_GEMINI
        help
          If you say Y here you will get support for the
-         RTC found on Gemini SoC's.
+         Faraday Technolog FTRTC010 found on e.g. Gemini SoC's.
 
          This driver can also be built as a module. If so, the module
-         will be called rtc-gemini.
+         will be called rtc-ftrtc010.
 
 config RTC_DRV_PS3
        tristate "PS3 RTC"
index df89cac1f9ae75c3bf799c899d8d6002d005026c..4050fc8b9271b7bdbf874c2ac92cdab9837a2bca 100644 (file)
@@ -68,7 +68,7 @@ obj-$(CONFIG_RTC_DRV_EFI)     += rtc-efi.o
 obj-$(CONFIG_RTC_DRV_EM3027)   += rtc-em3027.o
 obj-$(CONFIG_RTC_DRV_EP93XX)   += rtc-ep93xx.o
 obj-$(CONFIG_RTC_DRV_FM3130)   += rtc-fm3130.o
-obj-$(CONFIG_RTC_DRV_GEMINI)   += rtc-gemini.o
+obj-$(CONFIG_RTC_DRV_FTRTC010) += rtc-ftrtc010.o
 obj-$(CONFIG_RTC_DRV_GENERIC)  += rtc-generic.o
 obj-$(CONFIG_RTC_DRV_HID_SENSOR_TIME) += rtc-hid-sensor-time.o
 obj-$(CONFIG_RTC_DRV_HYM8563)  += rtc-hym8563.o
diff --git a/drivers/rtc/rtc-ftrtc010.c b/drivers/rtc/rtc-ftrtc010.c
new file mode 100644 (file)
index 0000000..af8d6be
--- /dev/null
@@ -0,0 +1,208 @@
+/*
+ *  Faraday Technology FTRTC010 driver
+ *
+ *  Copyright (C) 2009 Janos Laube <janos.dev@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Original code for older kernel 2.6.15 are from Stormlinksemi
+ * first update from Janos Laube for > 2.6.29 kernels
+ *
+ * checkpatch fixes and usage of rtc-lib code
+ * Hans Ulli Kroll <ulli.kroll@googlemail.com>
+ */
+
+#include <linux/rtc.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/clk.h>
+
+#define DRV_NAME        "rtc-ftrtc010"
+
+MODULE_AUTHOR("Hans Ulli Kroll <ulli.kroll@googlemail.com>");
+MODULE_DESCRIPTION("RTC driver for Gemini SoC");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
+
+struct ftrtc010_rtc {
+       struct rtc_device       *rtc_dev;
+       void __iomem            *rtc_base;
+       int                     rtc_irq;
+       struct clk              *pclk;
+       struct clk              *extclk;
+};
+
+enum ftrtc010_rtc_offsets {
+       FTRTC010_RTC_SECOND             = 0x00,
+       FTRTC010_RTC_MINUTE             = 0x04,
+       FTRTC010_RTC_HOUR               = 0x08,
+       FTRTC010_RTC_DAYS               = 0x0C,
+       FTRTC010_RTC_ALARM_SECOND       = 0x10,
+       FTRTC010_RTC_ALARM_MINUTE       = 0x14,
+       FTRTC010_RTC_ALARM_HOUR         = 0x18,
+       FTRTC010_RTC_RECORD             = 0x1C,
+       FTRTC010_RTC_CR                 = 0x20,
+};
+
+static irqreturn_t ftrtc010_rtc_interrupt(int irq, void *dev)
+{
+       return IRQ_HANDLED;
+}
+
+/*
+ * Looks like the RTC in the Gemini SoC is (totaly) broken
+ * We can't read/write directly the time from RTC registers.
+ * We must do some "offset" calculation to get the real time
+ *
+ * This FIX works pretty fine and Stormlinksemi aka Cortina-Networks does
+ * the same thing, without the rtc-lib.c calls.
+ */
+
+static int ftrtc010_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+       struct ftrtc010_rtc *rtc = dev_get_drvdata(dev);
+
+       unsigned int  days, hour, min, sec;
+       unsigned long offset, time;
+
+       sec  = readl(rtc->rtc_base + FTRTC010_RTC_SECOND);
+       min  = readl(rtc->rtc_base + FTRTC010_RTC_MINUTE);
+       hour = readl(rtc->rtc_base + FTRTC010_RTC_HOUR);
+       days = readl(rtc->rtc_base + FTRTC010_RTC_DAYS);
+       offset = readl(rtc->rtc_base + FTRTC010_RTC_RECORD);
+
+       time = offset + days * 86400 + hour * 3600 + min * 60 + sec;
+
+       rtc_time_to_tm(time, tm);
+
+       return 0;
+}
+
+static int ftrtc010_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+       struct ftrtc010_rtc *rtc = dev_get_drvdata(dev);
+       unsigned int sec, min, hour, day;
+       unsigned long offset, time;
+
+       if (tm->tm_year >= 2148)        /* EPOCH Year + 179 */
+               return -EINVAL;
+
+       rtc_tm_to_time(tm, &time);
+
+       sec = readl(rtc->rtc_base + FTRTC010_RTC_SECOND);
+       min = readl(rtc->rtc_base + FTRTC010_RTC_MINUTE);
+       hour = readl(rtc->rtc_base + FTRTC010_RTC_HOUR);
+       day = readl(rtc->rtc_base + FTRTC010_RTC_DAYS);
+
+       offset = time - (day * 86400 + hour * 3600 + min * 60 + sec);
+
+       writel(offset, rtc->rtc_base + FTRTC010_RTC_RECORD);
+       writel(0x01, rtc->rtc_base + FTRTC010_RTC_CR);
+
+       return 0;
+}
+
+static const struct rtc_class_ops ftrtc010_rtc_ops = {
+       .read_time     = ftrtc010_rtc_read_time,
+       .set_time      = ftrtc010_rtc_set_time,
+};
+
+static int ftrtc010_rtc_probe(struct platform_device *pdev)
+{
+       struct ftrtc010_rtc *rtc;
+       struct device *dev = &pdev->dev;
+       struct resource *res;
+       int ret;
+
+       rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
+       if (unlikely(!rtc))
+               return -ENOMEM;
+       platform_set_drvdata(pdev, rtc);
+
+       rtc->pclk = devm_clk_get(dev, "PCLK");
+       if (IS_ERR(rtc->pclk)) {
+               dev_err(dev, "could not get PCLK\n");
+       } else {
+               ret = clk_prepare_enable(rtc->pclk);
+               if (ret) {
+                       dev_err(dev, "failed to enable PCLK\n");
+                       return ret;
+               }
+       }
+       rtc->extclk = devm_clk_get(dev, "EXTCLK");
+       if (IS_ERR(rtc->extclk)) {
+               dev_err(dev, "could not get EXTCLK\n");
+       } else {
+               ret = clk_prepare_enable(rtc->extclk);
+               if (ret) {
+                       dev_err(dev, "failed to enable EXTCLK\n");
+                       return ret;
+               }
+       }
+
+       res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+       if (!res)
+               return -ENODEV;
+
+       rtc->rtc_irq = res->start;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res)
+               return -ENODEV;
+
+       rtc->rtc_base = devm_ioremap(dev, res->start,
+                                    resource_size(res));
+       if (!rtc->rtc_base)
+               return -ENOMEM;
+
+       ret = devm_request_irq(dev, rtc->rtc_irq, ftrtc010_rtc_interrupt,
+                              IRQF_SHARED, pdev->name, dev);
+       if (unlikely(ret))
+               return ret;
+
+       rtc->rtc_dev = rtc_device_register(pdev->name, dev,
+                                          &ftrtc010_rtc_ops, THIS_MODULE);
+       return PTR_ERR_OR_ZERO(rtc->rtc_dev);
+}
+
+static int ftrtc010_rtc_remove(struct platform_device *pdev)
+{
+       struct ftrtc010_rtc *rtc = platform_get_drvdata(pdev);
+
+       if (!IS_ERR(rtc->extclk))
+               clk_disable_unprepare(rtc->extclk);
+       if (!IS_ERR(rtc->pclk))
+               clk_disable_unprepare(rtc->pclk);
+       rtc_device_unregister(rtc->rtc_dev);
+
+       return 0;
+}
+
+static const struct of_device_id ftrtc010_rtc_dt_match[] = {
+       { .compatible = "cortina,gemini-rtc" },
+       { .compatible = "faraday,ftrtc010" },
+       { }
+};
+MODULE_DEVICE_TABLE(of, ftrtc010_rtc_dt_match);
+
+static struct platform_driver ftrtc010_rtc_driver = {
+       .driver         = {
+               .name   = DRV_NAME,
+               .of_match_table = ftrtc010_rtc_dt_match,
+       },
+       .probe          = ftrtc010_rtc_probe,
+       .remove         = ftrtc010_rtc_remove,
+};
+
+module_platform_driver_probe(ftrtc010_rtc_driver, ftrtc010_rtc_probe);
diff --git a/drivers/rtc/rtc-gemini.c b/drivers/rtc/rtc-gemini.c
deleted file mode 100644 (file)
index cf766e0..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *  Gemini OnChip RTC
- *
- *  Copyright (C) 2009 Janos Laube <janos.dev@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Original code for older kernel 2.6.15 are from Stormlinksemi
- * first update from Janos Laube for > 2.6.29 kernels
- *
- * checkpatch fixes and usage of rtc-lib code
- * Hans Ulli Kroll <ulli.kroll@googlemail.com>
- */
-
-#include <linux/rtc.h>
-#include <linux/io.h>
-#include <linux/slab.h>
-#include <linux/platform_device.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/clk.h>
-
-#define DRV_NAME        "rtc-gemini"
-
-MODULE_AUTHOR("Hans Ulli Kroll <ulli.kroll@googlemail.com>");
-MODULE_DESCRIPTION("RTC driver for Gemini SoC");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:" DRV_NAME);
-
-struct gemini_rtc {
-       struct rtc_device       *rtc_dev;
-       void __iomem            *rtc_base;
-       int                     rtc_irq;
-       struct clk              *pclk;
-       struct clk              *extclk;
-};
-
-enum gemini_rtc_offsets {
-       GEMINI_RTC_SECOND       = 0x00,
-       GEMINI_RTC_MINUTE       = 0x04,
-       GEMINI_RTC_HOUR         = 0x08,
-       GEMINI_RTC_DAYS         = 0x0C,
-       GEMINI_RTC_ALARM_SECOND = 0x10,
-       GEMINI_RTC_ALARM_MINUTE = 0x14,
-       GEMINI_RTC_ALARM_HOUR   = 0x18,
-       GEMINI_RTC_RECORD       = 0x1C,
-       GEMINI_RTC_CR           = 0x20
-};
-
-static irqreturn_t gemini_rtc_interrupt(int irq, void *dev)
-{
-       return IRQ_HANDLED;
-}
-
-/*
- * Looks like the RTC in the Gemini SoC is (totaly) broken
- * We can't read/write directly the time from RTC registers.
- * We must do some "offset" calculation to get the real time
- *
- * This FIX works pretty fine and Stormlinksemi aka Cortina-Networks does
- * the same thing, without the rtc-lib.c calls.
- */
-
-static int gemini_rtc_read_time(struct device *dev, struct rtc_time *tm)
-{
-       struct gemini_rtc *rtc = dev_get_drvdata(dev);
-
-       unsigned int  days, hour, min, sec;
-       unsigned long offset, time;
-
-       sec  = readl(rtc->rtc_base + GEMINI_RTC_SECOND);
-       min  = readl(rtc->rtc_base + GEMINI_RTC_MINUTE);
-       hour = readl(rtc->rtc_base + GEMINI_RTC_HOUR);
-       days = readl(rtc->rtc_base + GEMINI_RTC_DAYS);
-       offset = readl(rtc->rtc_base + GEMINI_RTC_RECORD);
-
-       time = offset + days * 86400 + hour * 3600 + min * 60 + sec;
-
-       rtc_time_to_tm(time, tm);
-
-       return 0;
-}
-
-static int gemini_rtc_set_time(struct device *dev, struct rtc_time *tm)
-{
-       struct gemini_rtc *rtc = dev_get_drvdata(dev);
-       unsigned int sec, min, hour, day;
-       unsigned long offset, time;
-
-       if (tm->tm_year >= 2148)        /* EPOCH Year + 179 */
-               return -EINVAL;
-
-       rtc_tm_to_time(tm, &time);
-
-       sec = readl(rtc->rtc_base + GEMINI_RTC_SECOND);
-       min = readl(rtc->rtc_base + GEMINI_RTC_MINUTE);
-       hour = readl(rtc->rtc_base + GEMINI_RTC_HOUR);
-       day = readl(rtc->rtc_base + GEMINI_RTC_DAYS);
-
-       offset = time - (day * 86400 + hour * 3600 + min * 60 + sec);
-
-       writel(offset, rtc->rtc_base + GEMINI_RTC_RECORD);
-       writel(0x01, rtc->rtc_base + GEMINI_RTC_CR);
-
-       return 0;
-}
-
-static const struct rtc_class_ops gemini_rtc_ops = {
-       .read_time     = gemini_rtc_read_time,
-       .set_time      = gemini_rtc_set_time,
-};
-
-static int gemini_rtc_probe(struct platform_device *pdev)
-{
-       struct gemini_rtc *rtc;
-       struct device *dev = &pdev->dev;
-       struct resource *res;
-       int ret;
-
-       rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
-       if (unlikely(!rtc))
-               return -ENOMEM;
-       platform_set_drvdata(pdev, rtc);
-
-       rtc->pclk = devm_clk_get(dev, "PCLK");
-       if (IS_ERR(rtc->pclk)) {
-               dev_err(dev, "could not get PCLK\n");
-       } else {
-               ret = clk_prepare_enable(rtc->pclk);
-               if (ret) {
-                       dev_err(dev, "failed to enable PCLK\n");
-                       return ret;
-               }
-       }
-       rtc->extclk = devm_clk_get(dev, "EXTCLK");
-       if (IS_ERR(rtc->extclk)) {
-               dev_err(dev, "could not get EXTCLK\n");
-       } else {
-               ret = clk_prepare_enable(rtc->extclk);
-               if (ret) {
-                       dev_err(dev, "failed to enable EXTCLK\n");
-                       return ret;
-               }
-       }
-
-       res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (!res)
-               return -ENODEV;
-
-       rtc->rtc_irq = res->start;
-
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res)
-               return -ENODEV;
-
-       rtc->rtc_base = devm_ioremap(dev, res->start,
-                                    resource_size(res));
-       if (!rtc->rtc_base)
-               return -ENOMEM;
-
-       ret = devm_request_irq(dev, rtc->rtc_irq, gemini_rtc_interrupt,
-                              IRQF_SHARED, pdev->name, dev);
-       if (unlikely(ret))
-               return ret;
-
-       rtc->rtc_dev = rtc_device_register(pdev->name, dev,
-                                          &gemini_rtc_ops, THIS_MODULE);
-       return PTR_ERR_OR_ZERO(rtc->rtc_dev);
-}
-
-static int gemini_rtc_remove(struct platform_device *pdev)
-{
-       struct gemini_rtc *rtc = platform_get_drvdata(pdev);
-
-       if (!IS_ERR(rtc->extclk))
-               clk_disable_unprepare(rtc->extclk);
-       if (!IS_ERR(rtc->pclk))
-               clk_disable_unprepare(rtc->pclk);
-       rtc_device_unregister(rtc->rtc_dev);
-
-       return 0;
-}
-
-static const struct of_device_id gemini_rtc_dt_match[] = {
-       { .compatible = "cortina,gemini-rtc" },
-       { }
-};
-MODULE_DEVICE_TABLE(of, gemini_rtc_dt_match);
-
-static struct platform_driver gemini_rtc_driver = {
-       .driver         = {
-               .name   = DRV_NAME,
-               .of_match_table = gemini_rtc_dt_match,
-       },
-       .probe          = gemini_rtc_probe,
-       .remove         = gemini_rtc_remove,
-};
-
-module_platform_driver_probe(gemini_rtc_driver, gemini_rtc_probe);