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

1 files changed, 8 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.