Merge tag 'sunxi-drivers-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/drivers

Pull "Allwinner drivers additions for 3.18" from Maxime Ripard:

Nothing major, just handling the RTC driver changes needed for the A31/A23.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'sunxi-drivers-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  rtc: sunxi: Depend on platforms sun4i/sun7i that actually have the rtc
  rtc: sun6i: Add sun6i RTC driver

3 files changed, 456 insertions, 1 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index a168e96142b9..6b34bc94a3f6 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1175,9 +1175,16 @@ config RTC_DRV_SUN4V
           If you say Y here you will get support for the Hypervisor
           based RTC on SUN4V systems.
 
+config RTC_DRV_SUN6I
+        tristate "Allwinner A31 RTC"
+        depends on MACH_SUN6I || MACH_SUN8I
+        help
+          If you say Y here you will get support for the RTC found on
+          Allwinner A31.
+
 config RTC_DRV_SUNXI
         tristate "Allwinner sun4i/sun7i RTC"
-        depends on ARCH_SUNXI
+        depends on MACH_SUN4I || MACH_SUN7I
         help
           If you say Y here you will get support for the RTC found on
           Allwinner A10/A20.
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 56f061c7c815..9055b7dd3dc5 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -128,6 +128,7 @@ obj-$(CONFIG_RTC_DRV_STARFIRE)	+= rtc-starfire.o
 obj-$(CONFIG_RTC_DRV_STK17TA8)  += rtc-stk17ta8.o
 obj-$(CONFIG_RTC_DRV_STMP)      += rtc-stmp3xxx.o
 obj-$(CONFIG_RTC_DRV_SUN4V)     += rtc-sun4v.o
+obj-$(CONFIG_RTC_DRV_SUN6I)     += rtc-sun6i.o
 obj-$(CONFIG_RTC_DRV_SUNXI)     += rtc-sunxi.o
 obj-$(CONFIG_RTC_DRV_TEGRA)     += rtc-tegra.o
 obj-$(CONFIG_RTC_DRV_TEST)      += rtc-test.o
diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
new file mode 100644
index 000000000000..c169a2cd4727
--- /dev/null
+++ b/drivers/rtc/rtc-sun6i.c
@@ -0,0 +1,447 @@
+/*
+ * An RTC driver for Allwinner A31/A23
+ *
+ * Copyright (c) 2014, Chen-Yu Tsai <wens@csie.org>
+ *
+ * based on rtc-sunxi.c
+ *
+ * An RTC driver for Allwinner A10/A20
+ *
+ * Copyright (c) 2013, Carlo Caione <carlo.caione@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.
+ */
+
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/rtc.h>
+#include <linux/types.h>
+
+/* Control register */
+#define SUN6I_LOSC_CTRL                         0x0000
+#define SUN6I_LOSC_CTRL_ALM_DHMS_ACC            BIT(9)
+#define SUN6I_LOSC_CTRL_RTC_HMS_ACC             BIT(8)
+#define SUN6I_LOSC_CTRL_RTC_YMD_ACC             BIT(7)
+#define SUN6I_LOSC_CTRL_ACC_MASK                GENMASK(9, 7)
+
+/* RTC */
+#define SUN6I_RTC_YMD                           0x0010
+#define SUN6I_RTC_HMS                           0x0014
+
+/* Alarm 0 (counter) */
+#define SUN6I_ALRM_COUNTER                      0x0020
+#define SUN6I_ALRM_CUR_VAL                      0x0024
+#define SUN6I_ALRM_EN                           0x0028
+#define SUN6I_ALRM_EN_CNT_EN                    BIT(0)
+#define SUN6I_ALRM_IRQ_EN                       0x002c
+#define SUN6I_ALRM_IRQ_EN_CNT_IRQ_EN            BIT(0)
+#define SUN6I_ALRM_IRQ_STA                      0x0030
+#define SUN6I_ALRM_IRQ_STA_CNT_IRQ_PEND         BIT(0)
+
+/* Alarm 1 (wall clock) */
+#define SUN6I_ALRM1_EN                          0x0044
+#define SUN6I_ALRM1_IRQ_EN                      0x0048
+#define SUN6I_ALRM1_IRQ_STA                     0x004c
+#define SUN6I_ALRM1_IRQ_STA_WEEK_IRQ_PEND       BIT(0)
+
+/* Alarm config */
+#define SUN6I_ALARM_CONFIG                      0x0050
+#define SUN6I_ALARM_CONFIG_WAKEUP               BIT(0)
+
+/*
+ * Get date values
+ */
+#define SUN6I_DATE_GET_DAY_VALUE(x)             ((x)  & 0x0000001f)
+#define SUN6I_DATE_GET_MON_VALUE(x)             (((x) & 0x00000f00) >> 8)
+#define SUN6I_DATE_GET_YEAR_VALUE(x)            (((x) & 0x003f0000) >> 16)
+#define SUN6I_LEAP_GET_VALUE(x)                 (((x) & 0x00400000) >> 22)
+
+/*
+ * Get time values
+ */
+#define SUN6I_TIME_GET_SEC_VALUE(x)             ((x)  & 0x0000003f)
+#define SUN6I_TIME_GET_MIN_VALUE(x)             (((x) & 0x00003f00) >> 8)
+#define SUN6I_TIME_GET_HOUR_VALUE(x)            (((x) & 0x001f0000) >> 16)
+
+/*
+ * Set date values
+ */
+#define SUN6I_DATE_SET_DAY_VALUE(x)             ((x)       & 0x0000001f)
+#define SUN6I_DATE_SET_MON_VALUE(x)             ((x) <<  8 & 0x00000f00)
+#define SUN6I_DATE_SET_YEAR_VALUE(x)            ((x) << 16 & 0x003f0000)
+#define SUN6I_LEAP_SET_VALUE(x)                 ((x) << 22 & 0x00400000)
+
+/*
+ * Set time values
+ */
+#define SUN6I_TIME_SET_SEC_VALUE(x)             ((x)       & 0x0000003f)
+#define SUN6I_TIME_SET_MIN_VALUE(x)             ((x) <<  8 & 0x00003f00)
+#define SUN6I_TIME_SET_HOUR_VALUE(x)            ((x) << 16 & 0x001f0000)
+
+/*
+ * The year parameter passed to the driver is usually an offset relative to
+ * the year 1900. This macro is used to convert this offset to another one
+ * relative to the minimum year allowed by the hardware.
+ *
+ * The year range is 1970 - 2033. This range is selected to match Allwinner's
+ * driver, even though it is somewhat limited.
+ */
+#define SUN6I_YEAR_MIN                          1970
+#define SUN6I_YEAR_MAX                          2033
+#define SUN6I_YEAR_OFF                          (SUN6I_YEAR_MIN - 1900)
+
+struct sun6i_rtc_dev {
+        struct rtc_device *rtc;
+        struct device *dev;
+        void __iomem *base;
+        int irq;
+        unsigned long alarm;
+};
+
+static irqreturn_t sun6i_rtc_alarmirq(int irq, void *id)
+{
+        struct sun6i_rtc_dev *chip = (struct sun6i_rtc_dev *) id;
+        u32 val;
+
+        val = readl(chip->base + SUN6I_ALRM_IRQ_STA);
+
+        if (val & SUN6I_ALRM_IRQ_STA_CNT_IRQ_PEND) {
+                val |= SUN6I_ALRM_IRQ_STA_CNT_IRQ_PEND;
+                writel(val, chip->base + SUN6I_ALRM_IRQ_STA);
+
+                rtc_update_irq(chip->rtc, 1, RTC_AF | RTC_IRQF);
+
+                return IRQ_HANDLED;
+        }
+
+        return IRQ_NONE;
+}
+
+static void sun6i_rtc_setaie(int to, struct sun6i_rtc_dev *chip)
+{
+        u32 alrm_val = 0;
+        u32 alrm_irq_val = 0;
+        u32 alrm_wake_val = 0;
+
+        if (to) {
+                alrm_val = SUN6I_ALRM_EN_CNT_EN;
+                alrm_irq_val = SUN6I_ALRM_IRQ_EN_CNT_IRQ_EN;
+                alrm_wake_val = SUN6I_ALARM_CONFIG_WAKEUP;
+        } else {
+                writel(SUN6I_ALRM_IRQ_STA_CNT_IRQ_PEND,
+                       chip->base + SUN6I_ALRM_IRQ_STA);
+        }
+
+        writel(alrm_val, chip->base + SUN6I_ALRM_EN);
+        writel(alrm_irq_val, chip->base + SUN6I_ALRM_IRQ_EN);