Merge commit 'v2.6.30-rc1' into core/urgent

Merge reason: need latest upstream to queue up dependent fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>

9 files changed, 427 insertions, 197 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 09d5cd33a3f6..ffe34a12f446 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -225,11 +225,11 @@ config RTC_DRV_PCF8583
           will be called rtc-pcf8583.
 
 config RTC_DRV_M41T80
-        tristate "ST M41T65/M41T80/81/82/83/84/85/87"
+        tristate "ST M41T62/65/M41T80/81/82/83/84/85/87"
         help
           If you say Y here you will get support for the ST M41T60
           and M41T80 RTC chips series. Currently, the following chips are
-          supported: M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84,
+          supported: M41T62, M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84,
           M41ST85, and M41ST87.
 
           This driver can also be built as a module. If so, the module
@@ -688,22 +688,16 @@ config RTC_DRV_RS5C313
         help
           If you say yes here you get support for the Ricoh RS5C313 RTC chips.
 
-config RTC_DRV_PARISC
-        tristate "PA-RISC firmware RTC support"
-        depends on PARISC
+config RTC_DRV_GENERIC
+        tristate "Generic RTC support"
+        # Please consider writing a new RTC driver instead of using the generic
+        # RTC abstraction
+        depends on PARISC || M68K || PPC
         help
-          Say Y or M here to enable RTC support on PA-RISC systems using
-          firmware calls. If you do not know what you are doing, you should
+          Say Y or M here to enable RTC support on systems using the generic
+          RTC abstraction. If you do not know what you are doing, you should
           just say Y.
 
-config RTC_DRV_PPC
-       tristate "PowerPC machine dependent RTC support"
-       depends on PPC
-       help
-         The PowerPC kernel has machine-specific functions for accessing
-         the RTC. This exposes that functionality through the generic RTC
-         class.
-
 config RTC_DRV_PXA
        tristate "PXA27x/PXA3xx"
        depends on ARCH_PXA
@@ -747,4 +741,13 @@ config RTC_DRV_MV
           This driver can also be built as a module. If so, the module
           will be called rtc-mv.
 
+config RTC_DRV_PS3
+        tristate "PS3 RTC"
+        depends on PPC_PS3
+        help
+          If you say yes here you will get support for the RTC on PS3.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-ps3.
+
 endif # RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index e7b09986d26e..6c0639a14f09 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -56,8 +56,7 @@ obj-$(CONFIG_RTC_DRV_PCF8563)	+= rtc-pcf8563.o
 obj-$(CONFIG_RTC_DRV_PCF8583)   += rtc-pcf8583.o
 obj-$(CONFIG_RTC_DRV_PL030)     += rtc-pl030.o
 obj-$(CONFIG_RTC_DRV_PL031)     += rtc-pl031.o
-obj-$(CONFIG_RTC_DRV_PARISC)    += rtc-parisc.o
-obj-$(CONFIG_RTC_DRV_PPC)       += rtc-ppc.o
+obj-$(CONFIG_RTC_DRV_GENERIC)   += rtc-generic.o
 obj-$(CONFIG_RTC_DRV_PXA)       += rtc-pxa.o
 obj-$(CONFIG_RTC_DRV_R9701)     += rtc-r9701.o
 obj-$(CONFIG_RTC_DRV_RS5C313)   += rtc-rs5c313.o
@@ -77,3 +76,4 @@ obj-$(CONFIG_RTC_DRV_VR41XX)	+= rtc-vr41xx.o
 obj-$(CONFIG_RTC_DRV_WM8350)    += rtc-wm8350.o
 obj-$(CONFIG_RTC_DRV_X1205)     += rtc-x1205.o
 obj-$(CONFIG_RTC_DRV_PCF50633)  += rtc-pcf50633.o
+obj-$(CONFIG_RTC_DRV_PS3)       += rtc-ps3.o
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
new file mode 100644
index 000000000000..98322004ad2e
--- /dev/null
+++ b/drivers/rtc/rtc-generic.c
@@ -0,0 +1,84 @@
+/* rtc-generic: RTC driver using the generic RTC abstraction
+ *
+ * Copyright (C) 2008 Kyle McMartin <kyle@mcmartin.ca>
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/time.h>
+#include <linux/platform_device.h>
+#include <linux/rtc.h>
+
+#include <asm/rtc.h>
+
+static int generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+        unsigned int ret = get_rtc_time(tm);
+
+        if (ret & RTC_BATT_BAD)
+                return -EOPNOTSUPP;
+
+        return rtc_valid_tm(tm);
+}
+
+static int generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+        if (set_rtc_time(tm) < 0)
+                return -EOPNOTSUPP;
+
+        return 0;
+}
+
+static const struct rtc_class_ops generic_rtc_ops = {
+        .read_time = generic_get_time,
+        .set_time = generic_set_time,
+};
+
+static int __init generic_rtc_probe(struct platform_device *dev)
+{
+        struct rtc_device *rtc;
+
+        rtc = rtc_device_register("rtc-generic", &dev->dev, &generic_rtc_ops,
+                                  THIS_MODULE);
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
+
+        platform_set_drvdata(dev, rtc);
+
+        return 0;
+}
+
+static int __exit generic_rtc_remove(struct platform_device *dev)
+{
+        struct rtc_device *rtc = platform_get_drvdata(dev);
+
+        rtc_device_unregister(rtc);
+
+        return 0;
+}
+
+static struct platform_driver generic_rtc_driver = {
+        .driver = {
+                .name = "rtc-generic",
+                .owner = THIS_MODULE,
+        },
+        .remove = __exit_p(generic_rtc_remove),
+};
+
+static int __init generic_rtc_init(void)
+{
+        return platform_driver_probe(&generic_rtc_driver, generic_rtc_probe);
+}
+
+static void __exit generic_rtc_fini(void)
+{
+        platform_driver_unregister(&generic_rtc_driver);
+}
+
+module_init(generic_rtc_init);
+module_exit(generic_rtc_fini);
+
+MODULE_AUTHOR("Kyle McMartin <kyle@mcmartin.ca>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Generic RTC driver");
+MODULE_ALIAS("platform:rtc-generic");
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 893f7dece239..60fe266f0f49 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -64,10 +64,12 @@
 #define M41T80_FEATURE_BL       (1 << 1)        /* Battery low indicator */
 #define M41T80_FEATURE_SQ       (1 << 2)        /* Squarewave feature */
 #define M41T80_FEATURE_WD       (1 << 3)        /* Extra watchdog resolution */
+#define M41T80_FEATURE_SQ_ALT   (1 << 4)        /* RSx bits are in reg 4 */
 
 #define DRV_VERSION "0.05"
 
 static const struct i2c_device_id m41t80_id[] = {
+        { "m41t62", M41T80_FEATURE_SQ | M41T80_FEATURE_SQ_ALT },
         { "m41t65", M41T80_FEATURE_HT | M41T80_FEATURE_WD },
         { "m41t80", M41T80_FEATURE_SQ },
         { "m41t81", M41T80_FEATURE_HT | M41T80_FEATURE_SQ},
@@ -393,12 +395,15 @@ static ssize_t m41t80_sysfs_show_sqwfreq(struct device *dev,
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct m41t80_data *clientdata = i2c_get_clientdata(client);
-        int val;
+        int val, reg_sqw;
 
         if (!(clientdata->features & M41T80_FEATURE_SQ))
                 return -EINVAL;
 
-        val = i2c_smbus_read_byte_data(client, M41T80_REG_SQW);
+        reg_sqw = M41T80_REG_SQW;
+        if (clientdata->features & M41T80_FEATURE_SQ_ALT)
+                reg_sqw = M41T80_REG_WDAY;
+        val = i2c_smbus_read_byte_data(client, reg_sqw);
         if (val < 0)
                 return -EIO;
         val = (val >> 4) & 0xf;
@@ -419,7 +424,7 @@ static ssize_t m41t80_sysfs_set_sqwfreq(struct device *dev,
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct m41t80_data *clientdata = i2c_get_clientdata(client);
-        int almon, sqw;
+        int almon, sqw, reg_sqw;
         int val = simple_strtoul(buf, NULL, 0);
 
         if (!(clientdata->features & M41T80_FEATURE_SQ))
@@ -440,13 +445,16 @@ static ssize_t m41t80_sysfs_set_sqwfreq(struct device *dev,
         almon = i2c_smbus_read_byte_data(client, M41T80_REG_ALARM_MON);
         if (almon < 0)
                 return -EIO;
-        sqw = i2c_smbus_read_byte_data(client, M41T80_REG_SQW);
+        reg_sqw = M41T80_REG_SQW;
+        if (clientdata->features & M41T80_FEATURE_SQ_ALT)
+                reg_sqw = M41T80_REG_WDAY;
+        sqw = i2c_smbus_read_byte_data(client, reg_sqw);
         if (sqw < 0)
                 return -EIO;
         sqw = (sqw & 0x0f) | (val << 4);
         if (i2c_smbus_write_byte_data(client, M41T80_REG_ALARM_MON,
                                       almon & ~M41T80_ALMON_SQWE) < 0 ||
-            i2c_smbus_write_byte_data(client, M41T80_REG_SQW, sqw) < 0)
+            i2c_smbus_write_byte_data(client, reg_sqw, sqw) < 0)
                 return -EIO;
         if (val && i2c_smbus_write_byte_data(client, M41T80_REG_ALARM_MON,
                                              almon | M41T80_ALMON_SQWE) < 0)
diff --git a/drivers/rtc/rtc-parisc.c b/drivers/rtc/rtc-parisc.c
deleted file mode 100644
index b966f56da976..000000000000
--- a/drivers/rtc/rtc-parisc.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* rtc-parisc: RTC for HP PA-RISC firmware
- *
- * Copyright (C) 2008 Kyle McMartin <kyle@mcmartin.ca>
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/time.h>
-#include <linux/platform_device.h>
-#include <linux/rtc.h>
-
-#include <asm/rtc.h>
-
-static int parisc_get_time(struct device *dev, struct rtc_time *tm)
-{
-        unsigned long ret;
-
-        ret = get_rtc_time(tm);
-
-        if (ret & RTC_BATT_BAD)
-                return -EOPNOTSUPP;
-
-        return rtc_valid_tm(tm);
-}
-
-static int parisc_set_time(struct device *dev, struct rtc_time *tm)
-{
-        if (set_rtc_time(tm) < 0)
-                return -EOPNOTSUPP;
-
-        return 0;
-}
-
-static const struct rtc_class_ops parisc_rtc_ops = {
-        .read_time = parisc_get_time,
-        .set_time = parisc_set_time,
-};
-
-static int __init parisc_rtc_probe(struct platform_device *dev)
-{
-        struct rtc_device *rtc;
-
-        rtc = rtc_device_register("rtc-parisc", &dev->dev, &parisc_rtc_ops,
-                                  THIS_MODULE);
-        if (IS_ERR(rtc))
-                return PTR_ERR(rtc);
-
-        platform_set_drvdata(dev, rtc);
-
-        return 0;
-}
-
-static int __exit parisc_rtc_remove(struct platform_device *dev)
-{
-        struct rtc_device *rtc = platform_get_drvdata(dev);
-
-        rtc_device_unregister(rtc);
-
-        return 0;
-}
-
-static struct platform_driver parisc_rtc_driver = {
-        .driver = {
-                .name = "rtc-parisc",
-                .owner = THIS_MODULE,
-        },
-        .probe = parisc_rtc_probe,
-        .remove = __devexit_p(parisc_rtc_remove),
-};
-
-static int __init parisc_rtc_init(void)
-{
-        return platform_driver_probe(&parisc_rtc_driver, parisc_rtc_probe);
-}
-
-static void __exit parisc_rtc_fini(void)
-{
-        platform_driver_unregister(&parisc_rtc_driver);
-}
-
-module_init(parisc_rtc_init);
-module_exit(parisc_rtc_fini);
-
-MODULE_AUTHOR("Kyle McMartin <kyle@mcmartin.ca>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("HP PA-RISC RTC driver");
diff --git a/drivers/rtc/rtc-ppc.c b/drivers/rtc/rtc-ppc.c
deleted file mode 100644
index c8e97e25ef7e..000000000000
--- a/drivers/rtc/rtc-ppc.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * RTC driver for ppc_md RTC functions
- *
- * © 2007 Red Hat, Inc.
- *
- * Author: David Woodhouse <dwmw2@infradead.org>
- *
- * 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/err.h>
-#include <linux/rtc.h>
-#include <linux/platform_device.h>
-#include <asm/machdep.h>
-
-static int ppc_rtc_read_time(struct device *dev, struct rtc_time *tm)
-{
-        ppc_md.get_rtc_time(tm);
-        return 0;
-}
-
-static int ppc_rtc_set_time(struct device *dev, struct rtc_time *tm)
-{
-        return ppc_md.set_rtc_time(tm);
-}
-
-static const struct rtc_class_ops ppc_rtc_ops = {
-        .set_time = ppc_rtc_set_time,
-        .read_time = ppc_rtc_read_time,
-};
-
-static struct rtc_device *rtc;
-static struct platform_device *ppc_rtc_pdev;
-
-static int __init ppc_rtc_init(void)
-{
-        if (!ppc_md.get_rtc_time || !ppc_md.set_rtc_time)
-                return -ENODEV;
-
-        ppc_rtc_pdev = platform_device_register_simple("ppc-rtc", 0, NULL, 0);
-        if (IS_ERR(ppc_rtc_pdev))
-                return PTR_ERR(ppc_rtc_pdev);
-
-        rtc = rtc_device_register("ppc_md", &ppc_rtc_pdev->dev,
-                                  &ppc_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                platform_device_unregister(ppc_rtc_pdev);
-                return PTR_ERR(rtc);
-        }
-
-        return 0;
-}
-
-static void __exit ppc_rtc_exit(void)
-{
-        rtc_device_unregister(rtc);
-        platform_device_unregister(ppc_rtc_pdev);
-}
-
-module_init(ppc_rtc_init);
-module_exit(ppc_rtc_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
-MODULE_DESCRIPTION("Generic RTC class driver for PowerPC");
diff --git a/drivers/rtc/rtc-ps3.c b/drivers/rtc/rtc-ps3.c
new file mode 100644
index 000000000000..968133ce1ee8
--- /dev/null
+++ b/drivers/rtc/rtc-ps3.c
@@ -0,0 +1,104 @@
+/*
+ * PS3 RTC Driver
+ *
+ * Copyright 2009 Sony Corporation
+ *
+ * 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; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/rtc.h>
+
+#include <asm/lv1call.h>
+#include <asm/ps3.h>
+
+
+static u64 read_rtc(void)
+{
+        int result;
+        u64 rtc_val;
+        u64 tb_val;
+
+        result = lv1_get_rtc(&rtc_val, &tb_val);
+        BUG_ON(result);
+
+        return rtc_val;
+}
+
+static int ps3_get_time(struct device *dev, struct rtc_time *tm)
+{
+        rtc_time_to_tm(read_rtc() + ps3_os_area_get_rtc_diff(), tm);
+        return rtc_valid_tm(tm);
+}
+
+static int ps3_set_time(struct device *dev, struct rtc_time *tm)
+{
+        unsigned long now;
+
+        rtc_tm_to_time(tm, &now);
+        ps3_os_area_set_rtc_diff(now - read_rtc());
+        return 0;
+}
+
+static const struct rtc_class_ops ps3_rtc_ops = {
+        .read_time = ps3_get_time,
+        .set_time = ps3_set_time,
+};
+
+static int __init ps3_rtc_probe(struct platform_device *dev)
+{
+        struct rtc_device *rtc;
+
+        rtc = rtc_device_register("rtc-ps3", &dev->dev, &ps3_rtc_ops,
+                                  THIS_MODULE);
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
+
+        platform_set_drvdata(dev, rtc);
+        return 0;
+}
+
+static int __exit ps3_rtc_remove(struct platform_device *dev)
+{
+        rtc_device_unregister(platform_get_drvdata(dev));
+        return 0;
+}
+
+static struct platform_driver ps3_rtc_driver = {
+        .driver = {
+                .name = "rtc-ps3",
+                .owner = THIS_MODULE,
+        },
+        .remove = __exit_p(ps3_rtc_remove),
+};
+
+static int __init ps3_rtc_init(void)
+{
+        return platform_driver_probe(&ps3_rtc_driver, ps3_rtc_probe);
+}
+
+static void __exit ps3_rtc_fini(void)
+{
+        platform_driver_unregister(&ps3_rtc_driver);
+}
+
+module_init(ps3_rtc_init);
+module_exit(ps3_rtc_fini);
+
+MODULE_AUTHOR("Sony Corporation");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("ps3 RTC driver");
+MODULE_ALIAS("platform:rtc-ps3");
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 4898f7fe8518..9b1ff12bf947 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -795,10 +795,46 @@ static int __devexit sh_rtc_remove(struct platform_device *pdev)
 
         return 0;
 }
+
+static void sh_rtc_set_irq_wake(struct device *dev, int enabled)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct sh_rtc *rtc = platform_get_drvdata(pdev);
+
+        set_irq_wake(rtc->periodic_irq, enabled);
+        if (rtc->carry_irq > 0) {
+                set_irq_wake(rtc->carry_irq, enabled);
+                set_irq_wake(rtc->alarm_irq, enabled);
+        }
+
+}
+
+static int sh_rtc_suspend(struct device *dev)
+{
+        if (device_may_wakeup(dev))
+                sh_rtc_set_irq_wake(dev, 1);
+
+        return 0;
+}
+
+static int sh_rtc_resume(struct device *dev)
+{
+        if (device_may_wakeup(dev))
+                sh_rtc_set_irq_wake(dev, 0);
+
+        return 0;
+}
+
+static struct dev_pm_ops sh_rtc_dev_pm_ops = {
+        .suspend = sh_rtc_suspend,
+        .resume = sh_rtc_resume,
+};
+
 static struct platform_driver sh_rtc_platform_driver = {
         .driver         = {
                 .name   = DRV_NAME,
                 .owner  = THIS_MODULE,
+                .pm     = &sh_rtc_dev_pm_ops,
         },
         .probe          = sh_rtc_probe,
         .remove         = __devexit_p(sh_rtc_remove),
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index 66955cc9c746..ad164056feb6 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -27,17 +27,162 @@
 #include <linux/bcd.h>
 #include <linux/rtc-v3020.h>
 #include <linux/delay.h>
+#include <linux/gpio.h>
 
 #include <linux/io.h>
 
 #undef DEBUG
 
+struct v3020;
+
+struct v3020_chip_ops {
+        int (*map_io)(struct v3020 *chip, struct platform_device *pdev,
+                      struct v3020_platform_data *pdata);
+        void (*unmap_io)(struct v3020 *chip);
+        unsigned char (*read_bit)(struct v3020 *chip);
+        void (*write_bit)(struct v3020 *chip, unsigned char bit);
+};
+
+#define V3020_CS        0
+#define V3020_WR        1
+#define V3020_RD        2
+#define V3020_IO        3
+
+struct v3020_gpio {
+        const char *name;
+        unsigned int gpio;
+};
+
 struct v3020 {
+        /* MMIO access */
         void __iomem *ioaddress;
         int leftshift;
+
+        /* GPIO access */
+        struct v3020_gpio *gpio;
+
+        struct v3020_chip_ops *ops;
+
         struct rtc_device *rtc;
 };
 
+
+static int v3020_mmio_map(struct v3020 *chip, struct platform_device *pdev,
+                          struct v3020_platform_data *pdata)
+{
+        if (pdev->num_resources != 1)
+                return -EBUSY;
+
+        if (pdev->resource[0].flags != IORESOURCE_MEM)
+                return -EBUSY;
+
+        chip->leftshift = pdata->leftshift;
+        chip->ioaddress = ioremap(pdev->resource[0].start, 1);
+        if (chip->ioaddress == NULL)
+                return -EBUSY;
+
+        return 0;
+}
+
+static void v3020_mmio_unmap(struct v3020 *chip)
+{
+        iounmap(chip->ioaddress);
+}
+
+static void v3020_mmio_write_bit(struct v3020 *chip, unsigned char bit)
+{
+        writel(bit << chip->leftshift, chip->ioaddress);
+}
+
+static unsigned char v3020_mmio_read_bit(struct v3020 *chip)
+{
+        return readl(chip->ioaddress) & (1 << chip->leftshift);
+}
+
+static struct v3020_chip_ops v3020_mmio_ops = {
+        .map_io         = v3020_mmio_map,
+        .unmap_io       = v3020_mmio_unmap,
+        .read_bit       = v3020_mmio_read_bit,
+        .write_bit      = v3020_mmio_write_bit,
+};
+
+static struct v3020_gpio v3020_gpio[] = {
+        { "RTC CS", 0 },
+        { "RTC WR", 0 },
+        { "RTC RD", 0 },
+        { "RTC IO", 0 },
+};
+
+static int v3020_gpio_map(struct v3020 *chip, struct platform_device *pdev,
+                          struct v3020_platform_data *pdata)
+{
+        int i, err;
+
+        v3020_gpio[V3020_CS].gpio = pdata->gpio_cs;
+        v3020_gpio[V3020_WR].gpio = pdata->gpio_wr;
+        v3020_gpio[V3020_RD].gpio = pdata->gpio_rd;
+        v3020_gpio[V3020_IO].gpio = pdata->gpio_io;
+
+        for (i = 0; i < ARRAY_SIZE(v3020_gpio); i++) {
+                err = gpio_request(v3020_gpio[i].gpio, v3020_gpio[i].name);
+                if (err)
+                        goto err_request;
+
+                gpio_direction_output(v3020_gpio[i].gpio, 1);
+        }
+
+        chip->gpio = v3020_gpio;
+
+        return 0;
+
+err_request:
+        while (--i >= 0)
+                gpio_free(v3020_gpio[i].gpio);
+
+        return err;
+}
+
+static void v3020_gpio_unmap(struct v3020 *chip)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(v3020_gpio); i++)
+                gpio_free(v3020_gpio[i].gpio);
+}
+
+static void v3020_gpio_write_bit(struct v3020 *chip, unsigned char bit)
+{
+        gpio_direction_output(chip->gpio[V3020_IO].gpio, bit);
+        gpio_set_value(chip->gpio[V3020_CS].gpio, 0);
+        gpio_set_value(chip->gpio[V3020_WR].gpio, 0);
+        udelay(1);
+        gpio_set_value(chip->gpio[V3020_WR].gpio, 1);
+        gpio_set_value(chip->gpio[V3020_CS].gpio, 1);
+}
+
+static unsigned char v3020_gpio_read_bit(struct v3020 *chip)
+{
+        int bit;
+
+        gpio_direction_input(chip->gpio[V3020_IO].gpio);
+        gpio_set_value(chip->gpio[V3020_CS].gpio, 0);
+        gpio_set_value(chip->gpio[V3020_RD].gpio, 0);
+        udelay(1);
+        bit = !!gpio_get_value(chip->gpio[V3020_IO].gpio);
+        udelay(1);
+        gpio_set_value(chip->gpio[V3020_RD].gpio, 1);
+        gpio_set_value(chip->gpio[V3020_CS].gpio, 1);
+
+        return bit;
+}
+
+static struct v3020_chip_ops v3020_gpio_ops = {
+        .map_io         = v3020_gpio_map,
+        .unmap_io       = v3020_gpio_unmap,
+        .read_bit       = v3020_gpio_read_bit,
+        .write_bit      = v3020_gpio_write_bit,
+};
+
 static void v3020_set_reg(struct v3020 *chip, unsigned char address,
                         unsigned char data)
 {
@@ -46,7 +191,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,
 
         tmp = address;
         for (i = 0; i < 4; i++) {
-                writel((tmp & 1) << chip->leftshift, chip->ioaddress);
+                chip->ops->write_bit(chip, (tmp & 1));
                 tmp >>= 1;
                 udelay(1);
         }
@@ -54,7 +199,7 @@ static void v3020_set_reg(struct v3020 *chip, unsigned char address,
         /* Commands dont have data */
         if (!V3020_IS_COMMAND(address)) {
                 for (i = 0; i < 8; i++) {
-                        writel((data & 1) << chip->leftshift, chip->ioaddress);
+                        chip->ops->write_bit(chip, (data & 1));
                         data >>= 1;
                         udelay(1);
                 }
@@ -67,14 +212,14 @@ static unsigned char v3020_get_reg(struct v3020 *chip, unsigned char address)
         int i;
 
         for (i = 0; i < 4; i++) {
-                writel((address & 1) << chip->leftshift, chip->ioaddress);
+                chip->ops->write_bit(chip, (address & 1));
                 address >>= 1;
                 udelay(1);
         }
 
         for (i = 0; i < 8; i++) {
                 data >>= 1;
-                if (readl(chip->ioaddress) & (1 << chip->leftshift))
+                if (chip->ops->read_bit(chip))
                         data |= 0x80;
                 udelay(1);
         }
@@ -164,25 +309,23 @@ static int rtc_probe(struct platform_device *pdev)
         int i;
         int temp;
 
-        if (pdev->num_resources != 1)
-                return -EBUSY;
-
-        if (pdev->resource[0].flags != IORESOURCE_MEM)
-                return -EBUSY;
-
         chip = kzalloc(sizeof *chip, GFP_KERNEL);
         if (!chip)
                 return -ENOMEM;
 
-        chip->leftshift = pdata->leftshift;
-        chip->ioaddress = ioremap(pdev->resource[0].start, 1);
-        if (chip->ioaddress == NULL)
+        if (pdata->use_gpio)
+                chip->ops = &v3020_gpio_ops;
+        else
+                chip->ops = &v3020_mmio_ops;
+
+        retval = chip->ops->map_io(chip, pdev, pdata);
+        if (retval)
                 goto err_chip;
 
         /* Make sure the v3020 expects a communication cycle
          * by reading 8 times */
         for (i = 0; i < 8; i++)
-                temp = readl(chip->ioaddress);
+                temp = chip->ops->read_bit(chip);
 
         /* Test chip by doing a write/read sequence
          * to the chip ram */
@@ -196,10 +339,17 @@ static int rtc_probe(struct platform_device *pdev)
          * are all disabled */
         v3020_set_reg(chip, V3020_STATUS_0, 0x0);
 
-        dev_info(&pdev->dev, "Chip available at physical address 0x%llx,"
-                "data connected to D%d\n",
-                (unsigned long long)pdev->resource[0].start,
-                chip->leftshift);
+        if (pdata->use_gpio)
+                dev_info(&pdev->dev, "Chip available at GPIOs "
+                         "%d, %d, %d, %d\n",
+                         chip->gpio[V3020_CS].gpio, chip->gpio[V3020_WR].gpio,
+                         chip->gpio[V3020_RD].gpio, chip->gpio[V3020_IO].gpio);
+        else
+                dev_info(&pdev->dev, "Chip available at "
+                         "physical address 0x%llx,"
+                         "data connected to D%d\n",
+                         (unsigned long long)pdev->resource[0].start,
+                         chip->leftshift);
 
         platform_set_drvdata(pdev, chip);
 
@@ -214,7 +364,7 @@ static int rtc_probe(struct platform_device *pdev)
         return 0;
 
 err_io:
-        iounmap(chip->ioaddress);
+        chip->ops->unmap_io(chip);
 err_chip:
         kfree(chip);
 
@@ -229,7 +379,7 @@ static int rtc_remove(struct platform_device *dev)
         if (rtc)
                 rtc_device_unregister(rtc);
 
-        iounmap(chip->ioaddress);
+        chip->ops->unmap_io(chip);
         kfree(chip);
 
         return 0;