Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm: (31 commits)
  ARM: 7304/1: ioremap: fix boundary check when reusing static mapping
  ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts
  ARM: 7299/1: ftrace: clear zero bit in reported IPs for Thumb-2
  ARM: 7298/1: realview: fix mapping of MPCore private memory region
  PCMCIA: fix sa1111 oops on remove
  ARM: 7288/1: mach-sa1100: add missing module_init() call
  ARM: 7297/1: smp_twd: make sure timer is stopped before registering it
  ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards
  ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block
  ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
  ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs
  ARM: 7290/1: vmlinux.lds.S: align the exception fixup table to a 4-byte boundary
  ARM: 7289/1: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes
  MFD: ucb1x00-ts: fix resume failure
  MFD: ucb1x00-core: fix gpiolib direction_output handling
  MFD: ucb1x00-core: fix missing restore of io output data on resume
  MFD: mcp-core: fix mcp_priv() to be more type safe
  MFD: mcp-core: fix complaints from the genirq layer
  Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."
  Revert "ARM: sa1100: Refactor mcp-sa11x0 to use platform resources."
  ...

Fix up conflict due to arch/arm/mach-mx5/Kconfig having been merged into
mach-imx5 (commit 784a90c0a7d8: "ARM i.MX: Merge i.MX5 support into
mach-imx"), but the ARM_L1_CACHE_SHIFT_6 entry was moved to be driven by
the CPU_V7 logic from it in the old location in rmk's branch (commit
a092f2b15399: "ARM: 7291/1: cache: assume 64-byte L1 cachelines for
ARMv7 CPUs").

7 files changed, 213 insertions, 418 deletions

diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c
index 63be60bc3455..86cc3f7841cd 100644
--- a/drivers/mfd/mcp-core.c
+++ b/drivers/mfd/mcp-core.c
@@ -26,35 +26,9 @@
 #define to_mcp(d)               container_of(d, struct mcp, attached_device)
 #define to_mcp_driver(d)        container_of(d, struct mcp_driver, drv)
 
-static const struct mcp_device_id *mcp_match_id(const struct mcp_device_id *id,
-                                                const char *codec)
-{
-        while (id->name[0]) {
-                if (strcmp(codec, id->name) == 0)
-                        return id;
-                id++;
-        }
-        return NULL;
-}
-
-const struct mcp_device_id *mcp_get_device_id(const struct mcp *mcp)
-{
-        const struct mcp_driver *driver =
-                to_mcp_driver(mcp->attached_device.driver);
-
-        return mcp_match_id(driver->id_table, mcp->codec);
-}
-EXPORT_SYMBOL(mcp_get_device_id);
-
 static int mcp_bus_match(struct device *dev, struct device_driver *drv)
 {
-        const struct mcp *mcp = to_mcp(dev);
-        const struct mcp_driver *driver = to_mcp_driver(drv);
-
-        if (driver->id_table)
-                return !!mcp_match_id(driver->id_table, mcp->codec);
-
-        return 0;
+        return 1;
 }
 
 static int mcp_bus_probe(struct device *dev)
@@ -100,18 +74,9 @@ static int mcp_bus_resume(struct device *dev)
         return ret;
 }
 
-static int mcp_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-        struct mcp *mcp = to_mcp(dev);
-
-        add_uevent_var(env, "MODALIAS=%s%s", MCP_MODULE_PREFIX, mcp->codec);
-        return 0;
-}
-
 static struct bus_type mcp_bus_type = {
         .name           = "mcp",
         .match          = mcp_bus_match,
-        .uevent         = mcp_bus_uevent,
         .probe          = mcp_bus_probe,
         .remove         = mcp_bus_remove,
         .suspend        = mcp_bus_suspend,
@@ -128,9 +93,11 @@ static struct bus_type mcp_bus_type = {
  */
 void mcp_set_telecom_divisor(struct mcp *mcp, unsigned int div)
 {
-        spin_lock_irq(&mcp->lock);
+        unsigned long flags;
+
+        spin_lock_irqsave(&mcp->lock, flags);
         mcp->ops->set_telecom_divisor(mcp, div);
-        spin_unlock_irq(&mcp->lock);
+        spin_unlock_irqrestore(&mcp->lock, flags);
 }
 EXPORT_SYMBOL(mcp_set_telecom_divisor);
 
@@ -143,9 +110,11 @@ EXPORT_SYMBOL(mcp_set_telecom_divisor);
  */
 void mcp_set_audio_divisor(struct mcp *mcp, unsigned int div)
 {
-        spin_lock_irq(&mcp->lock);
+        unsigned long flags;
+
+        spin_lock_irqsave(&mcp->lock, flags);
         mcp->ops->set_audio_divisor(mcp, div);
-        spin_unlock_irq(&mcp->lock);
+        spin_unlock_irqrestore(&mcp->lock, flags);
 }
 EXPORT_SYMBOL(mcp_set_audio_divisor);
 
@@ -198,10 +167,11 @@ EXPORT_SYMBOL(mcp_reg_read);
  */
 void mcp_enable(struct mcp *mcp)
 {
-        spin_lock_irq(&mcp->lock);
+        unsigned long flags;
+        spin_lock_irqsave(&mcp->lock, flags);
         if (mcp->use_count++ == 0)
                 mcp->ops->enable(mcp);
-        spin_unlock_irq(&mcp->lock);
+        spin_unlock_irqrestore(&mcp->lock, flags);
 }
 EXPORT_SYMBOL(mcp_enable);
 
@@ -247,14 +217,9 @@ struct mcp *mcp_host_alloc(struct device *parent, size_t size)
 }
 EXPORT_SYMBOL(mcp_host_alloc);
 
-int mcp_host_register(struct mcp *mcp, void *pdata)
+int mcp_host_register(struct mcp *mcp)
 {
-        if (!mcp->codec)
-                return -EINVAL;
-
-        mcp->attached_device.platform_data = pdata;
         dev_set_name(&mcp->attached_device, "mcp0");
-        request_module("%s%s", MCP_MODULE_PREFIX, mcp->codec);
         return device_register(&mcp->attached_device);
 }
 EXPORT_SYMBOL(mcp_host_register);
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
index 9adc2eb69492..02c53a0766c4 100644
--- a/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@ -19,7 +19,6 @@
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/mcp.h>
-#include <linux/io.h>
 
 #include <mach/dma.h>
 #include <mach/hardware.h>
@@ -27,19 +26,12 @@
 #include <asm/system.h>
 #include <mach/mcp.h>
 
-/* Register offsets */
-#define MCCR0   0x00
-#define MCDR0   0x08
-#define MCDR1   0x0C
-#define MCDR2   0x10
-#define MCSR    0x18
-#define MCCR1   0x00
+#include <mach/assabet.h>
+
 
 struct mcp_sa11x0 {
-        u32             mccr0;
-        u32             mccr1;
-        unsigned char   *mccr0_base;
-        unsigned char   *mccr1_base;
+        u32     mccr0;
+        u32     mccr1;
 };
 
 #define priv(mcp)       ((struct mcp_sa11x0 *)mcp_priv(mcp))
@@ -47,25 +39,25 @@ struct mcp_sa11x0 {
 static void
 mcp_sa11x0_set_telecom_divisor(struct mcp *mcp, unsigned int divisor)
 {
-        struct mcp_sa11x0 *priv = priv(mcp);
+        unsigned int mccr0;
 
         divisor /= 32;
 
-        priv->mccr0 &= ~0x00007f00;
-        priv->mccr0 |= divisor << 8;
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
+        mccr0 = Ser4MCCR0 & ~0x00007f00;
+        mccr0 |= divisor << 8;
+        Ser4MCCR0 = mccr0;
 }
 
 static void
 mcp_sa11x0_set_audio_divisor(struct mcp *mcp, unsigned int divisor)
 {
-        struct mcp_sa11x0 *priv = priv(mcp);
+        unsigned int mccr0;
 
         divisor /= 32;
 
-        priv->mccr0 &= ~0x0000007f;
-        priv->mccr0 |= divisor;
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
+        mccr0 = Ser4MCCR0 & ~0x0000007f;
+        mccr0 |= divisor;
+        Ser4MCCR0 = mccr0;
 }
 
 /*
@@ -79,16 +71,12 @@ mcp_sa11x0_write(struct mcp *mcp, unsigned int reg, unsigned int val)
 {
         int ret = -ETIME;
         int i;
-        u32 mcpreg;
-        struct mcp_sa11x0 *priv = priv(mcp);
 
-        mcpreg = reg << 17 | MCDR2_Wr | (val & 0xffff);
-        __raw_writel(mcpreg, priv->mccr0_base + MCDR2);
+        Ser4MCDR2 = reg << 17 | MCDR2_Wr | (val & 0xffff);
 
         for (i = 0; i < 2; i++) {
                 udelay(mcp->rw_timeout);
-                mcpreg = __raw_readl(priv->mccr0_base + MCSR);
-                if (mcpreg & MCSR_CWC) {
+                if (Ser4MCSR & MCSR_CWC) {
                         ret = 0;
                         break;
                 }
@@ -109,18 +97,13 @@ mcp_sa11x0_read(struct mcp *mcp, unsigned int reg)
 {
         int ret = -ETIME;
         int i;
-        u32 mcpreg;
-        struct mcp_sa11x0 *priv = priv(mcp);
 
-        mcpreg = reg << 17 | MCDR2_Rd;
-        __raw_writel(mcpreg, priv->mccr0_base + MCDR2);
+        Ser4MCDR2 = reg << 17 | MCDR2_Rd;
 
         for (i = 0; i < 2; i++) {
                 udelay(mcp->rw_timeout);
-                mcpreg = __raw_readl(priv->mccr0_base + MCSR);
-                if (mcpreg & MCSR_CRC) {
-                        ret = __raw_readl(priv->mccr0_base + MCDR2)
-                                & 0xffff;
+                if (Ser4MCSR & MCSR_CRC) {
+                        ret = Ser4MCDR2 & 0xffff;
                         break;
                 }
         }
@@ -133,19 +116,13 @@ mcp_sa11x0_read(struct mcp *mcp, unsigned int reg)
 
 static void mcp_sa11x0_enable(struct mcp *mcp)
 {
-        struct mcp_sa11x0 *priv = priv(mcp);
-
-        __raw_writel(-1, priv->mccr0_base + MCSR);
-        priv->mccr0 |= MCCR0_MCE;
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
+        Ser4MCSR = -1;
+        Ser4MCCR0 |= MCCR0_MCE;
 }
 
 static void mcp_sa11x0_disable(struct mcp *mcp)
 {
-        struct mcp_sa11x0 *priv = priv(mcp);
-
-        priv->mccr0 &= ~MCCR0_MCE;
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
+        Ser4MCCR0 &= ~MCCR0_MCE;
 }
 
 /*
@@ -165,69 +142,50 @@ static int mcp_sa11x0_probe(struct platform_device *pdev)
         struct mcp_plat_data *data = pdev->dev.platform_data;
         struct mcp *mcp;
         int ret;
-        struct mcp_sa11x0 *priv;
-        struct resource *res_mem0, *res_mem1;
-        u32 size0, size1;
 
         if (!data)
                 return -ENODEV;
 
-        if (!data->codec)
-                return -ENODEV;
-
-        res_mem0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res_mem0)
-                return -ENODEV;
-        size0 = res_mem0->end - res_mem0->start + 1;
-
-        res_mem1 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        if (!res_mem1)
-                return -ENODEV;
-        size1 = res_mem1->end - res_mem1->start + 1;
-
-        if (!request_mem_region(res_mem0->start, size0, "sa11x0-mcp"))
+        if (!request_mem_region(0x80060000, 0x60, "sa11x0-mcp"))
                 return -EBUSY;
 
-        if (!request_mem_region(res_mem1->start, size1, "sa11x0-mcp")) {
-                ret = -EBUSY;
-                goto release;
-        }
-
         mcp = mcp_host_alloc(&pdev->dev, sizeof(struct mcp_sa11x0));
         if (!mcp) {
                 ret = -ENOMEM;
-                goto release2;
+                goto release;
         }
 
-        priv = priv(mcp);
-
         mcp->owner              = THIS_MODULE;
         mcp->ops                = &mcp_sa11x0;
         mcp->sclk_rate          = data->sclk_rate;
-        mcp->dma_audio_rd       = DDAR_DevAdd(res_mem0->start + MCDR0)
-                                + DDAR_DevRd + DDAR_Brst4 + DDAR_8BitDev;
-        mcp->dma_audio_wr       = DDAR_DevAdd(res_mem0->start + MCDR0)
-                                + DDAR_DevWr + DDAR_Brst4 + DDAR_8BitDev;
-        mcp->dma_telco_rd       = DDAR_DevAdd(res_mem0->start + MCDR1)
-                                + DDAR_DevRd + DDAR_Brst4 + DDAR_8BitDev;
-        mcp->dma_telco_wr       = DDAR_DevAdd(res_mem0->start + MCDR1)
-                                + DDAR_DevWr + DDAR_Brst4 + DDAR_8BitDev;
-        mcp->codec              = data->codec;
+        mcp->dma_audio_rd       = DMA_Ser4MCP0Rd;
+        mcp->dma_audio_wr       = DMA_Ser4MCP0Wr;
+        mcp->dma_telco_rd       = DMA_Ser4MCP1Rd;
+        mcp->dma_telco_wr       = DMA_Ser4MCP1Wr;
+        mcp->gpio_base          = data->gpio_base;
 
         platform_set_drvdata(pdev, mcp);
 
+        if (machine_is_assabet()) {
+                ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);
+        }
+
+        /*
+         * Setup the PPC unit correctly.
+         */
+        PPDR &= ~PPC_RXD4;
+        PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;
+        PSDR |= PPC_RXD4;
+        PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
+        PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
+
         /*
          * Initialise device.  Note that we initially
          * set the sampling rate to minimum.
          */
-        priv->mccr0_base = ioremap(res_mem0->start, size0);
-        priv->mccr1_base = ioremap(res_mem1->start, size1);
-
-        __raw_writel(-1, priv->mccr0_base + MCSR);
-        priv->mccr1 = data->mccr1;
-        priv->mccr0 = data->mccr0 | 0x7f7f;
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
-        __raw_writel(priv->mccr1, priv->mccr1_base + MCCR1);
+        Ser4MCSR = -1;
+        Ser4MCCR1 = data->mccr1;
+        Ser4MCCR0 = data->mccr0 | 0x7f7f;
 
         /*
          * Calculate the read/write timeout (us) from the bit clock
@@ -237,53 +195,36 @@ static int mcp_sa11x0_probe(struct platform_device *pdev)
         mcp->rw_timeout = (64 * 3 * 1000000 + mcp->sclk_rate - 1) /
                           mcp->sclk_rate;
 
-        ret = mcp_host_register(mcp, data->codec_pdata);
+        ret = mcp_host_register(mcp);
         if (ret == 0)
                 goto out;
 
- release2:
-        release_mem_region(res_mem1->start, size1);
  release:
-        release_mem_region(res_mem0->start, size0);
+        release_mem_region(0x80060000, 0x60);
         platform_set_drvdata(pdev, NULL);
 
  out:
         return ret;
 }
 
-static int mcp_sa11x0_remove(struct platform_device *pdev)
+static int mcp_sa11x0_remove(struct platform_device *dev)
 {
-        struct mcp *mcp = platform_get_drvdata(pdev);
-        struct mcp_sa11x0 *priv = priv(mcp);
-        struct resource *res_mem;
-        u32 size;
+        struct mcp *mcp = platform_get_drvdata(dev);
 
-        platform_set_drvdata(pdev, NULL);
+        platform_set_drvdata(dev, NULL);
         mcp_host_unregister(mcp);
+        release_mem_region(0x80060000, 0x60);
 
-        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res_mem) {
-                size = res_mem->end - res_mem->start + 1;
-                release_mem_region(res_mem->start, size);
-        }
-        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        if (res_mem) {
-                size = res_mem->end - res_mem->start + 1;
-                release_mem_region(res_mem->start, size);
-        }
-        iounmap(priv->mccr0_base);
-        iounmap(priv->mccr1_base);
         return 0;
 }
 
 static int mcp_sa11x0_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct mcp *mcp = platform_get_drvdata(dev);
-        struct mcp_sa11x0 *priv = priv(mcp);
-        u32 mccr0;
 
-        mccr0 = priv->mccr0 & ~MCCR0_MCE;
-        __raw_writel(mccr0, priv->mccr0_base + MCCR0);
+        priv(mcp)->mccr0 = Ser4MCCR0;
+        priv(mcp)->mccr1 = Ser4MCCR1;
+        Ser4MCCR0 &= ~MCCR0_MCE;
 
         return 0;
 }
@@ -291,10 +232,9 @@ static int mcp_sa11x0_suspend(struct platform_device *dev, pm_message_t state)
 static int mcp_sa11x0_resume(struct platform_device *dev)
 {
         struct mcp *mcp = platform_get_drvdata(dev);
-        struct mcp_sa11x0 *priv = priv(mcp);
 
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
-        __raw_writel(priv->mccr1, priv->mccr1_base + MCCR1);
+        Ser4MCCR1 = priv(mcp)->mccr1;
+        Ser4MCCR0 = priv(mcp)->mccr0;
 
         return 0;
 }
@@ -311,7 +251,6 @@ static struct platform_driver mcp_sa11x0_driver = {
         .resume         = mcp_sa11x0_resume,
         .driver         = {
                 .name   = "sa11x0-mcp",
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 91c4f25e0e55..febc90cdef7e 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -36,15 +36,6 @@ static DEFINE_MUTEX(ucb1x00_mutex);
 static LIST_HEAD(ucb1x00_drivers);
 static LIST_HEAD(ucb1x00_devices);
 
-static struct mcp_device_id ucb1x00_id[] = {
-        { "ucb1x00", 0 },  /* auto-detection */
-        { "ucb1200", UCB_ID_1200 },
-        { "ucb1300", UCB_ID_1300 },
-        { "tc35143", UCB_ID_TC35143 },
-        { }
-};
-MODULE_DEVICE_TABLE(mcp, ucb1x00_id);
-
 /**
  *      ucb1x00_io_set_dir - set IO direction
  *      @ucb: UCB1x00 structure describing chip
@@ -157,16 +148,22 @@ static int ucb1x00_gpio_direction_output(struct gpio_chip *chip, unsigned offset
 {
         struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
         unsigned long flags;
+        unsigned old, mask = 1 << offset;
 
         spin_lock_irqsave(&ucb->io_lock, flags);
-        ucb->io_dir |= (1 << offset);
-        ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir);
-
+        old = ucb->io_out;
         if (value)
-                ucb->io_out |= 1 << offset;
+                ucb->io_out |= mask;
         else
-                ucb->io_out &= ~(1 << offset);
-        ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out);
+                ucb->io_out &= ~mask;
+
+        if (old != ucb->io_out)
+                ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out);
+
+        if (!(ucb->io_dir & mask)) {
+                ucb->io_dir |= mask;
+                ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir);
+        }
         spin_unlock_irqrestore(&ucb->io_lock, flags);
 
         return 0;
@@ -536,33 +533,17 @@ static struct class ucb1x00_class = {
 
 static int ucb1x00_probe(struct mcp *mcp)
 {
-        const struct mcp_device_id *mid;
         struct ucb1x00 *ucb;
         struct ucb1x00_driver *drv;
-        struct ucb1x00_plat_data *pdata;
         unsigned int id;
         int ret = -ENODEV;
         int temp;
 
         mcp_enable(mcp);
         id = mcp_reg_read(mcp, UCB_ID);
-        mid = mcp_get_device_id(mcp);
 
-        if (mid && mid->driver_data) {
-                if (id != mid->driver_data) {
-                        printk(KERN_WARNING "%s wrong ID %04x found: %04x\n",
-                                mid->name, (unsigned int) mid->driver_data, id);
-                        goto err_disable;
-                }
-        } else {
-                mid = &ucb1x00_id[1];
-                while (mid->driver_data) {
-                        if (id == mid->driver_data)
-                                break;
-                        mid++;
-                }
-                printk(KERN_WARNING "%s ID not found: %04x\n",
-                        ucb1x00_id[0].name, id);
+        if (id != UCB_ID_1200 && id != UCB_ID_1300 && id != UCB_ID_TC35143) {
+                printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id);
                 goto err_disable;
         }
 
@@ -571,28 +552,28 @@ static int ucb1x00_probe(struct mcp *mcp)
         if (!ucb)
                 goto err_disable;
 
-        pdata = mcp->attached_device.platform_data;
+
         ucb->dev.class = &ucb1x00_class;
         ucb->dev.parent = &mcp->attached_device;
-        dev_set_name(&ucb->dev, mid->name);
+        dev_set_name(&ucb->dev, "ucb1x00");
 
         spin_lock_init(&ucb->lock);
         spin_lock_init(&ucb->io_lock);
         sema_init(&ucb->adc_sem, 1);
 
-        ucb->id  = mid;
+        ucb->id  = id;
         ucb->mcp = mcp;
         ucb->irq = ucb1x00_detect_irq(ucb);
         if (ucb->irq == NO_IRQ) {
-                printk(KERN_ERR "%s: IRQ probe failed\n", mid->name);
+                printk(KERN_ERR "UCB1x00: IRQ probe failed\n");
                 ret = -ENODEV;
                 goto err_free;
         }
 
         ucb->gpio.base = -1;
-        if (pdata && (pdata->gpio_base >= 0)) {
+        if (mcp->gpio_base != 0) {
                 ucb->gpio.label = dev_name(&ucb->dev);
-                ucb->gpio.base = pdata->gpio_base;
+                ucb->gpio.base = mcp->gpio_base;
                 ucb->gpio.ngpio = 10;
                 ucb->gpio.set = ucb1x00_gpio_set;
                 ucb->gpio.get = ucb1x00_gpio_get;
@@ -605,10 +586,10 @@ static int ucb1x00_probe(struct mcp *mcp)
                 dev_info(&ucb->dev, "gpio_base not set so no gpiolib support");
 
         ret = request_irq(ucb->irq, ucb1x00_irq, IRQF_TRIGGER_RISING,
-                          mid->name, ucb);
+                          "UCB1x00", ucb);
         if (ret) {
-                printk(KERN_ERR "%s: unable to grab irq%d: %d\n",
-                        mid->name, ucb->irq, ret);
+                printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n",
+                        ucb->irq, ret);
                 goto err_gpio;
         }
 
@@ -712,6 +693,7 @@ static int ucb1x00_resume(struct mcp *mcp)
         struct ucb1x00 *ucb = mcp_get_drvdata(mcp);
         struct ucb1x00_dev *dev;
 
+        ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out);
         ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir);
         mutex_lock(&ucb1x00_mutex);
         list_for_each_entry(dev, &ucb->devs, dev_node) {
@@ -730,7 +712,6 @@ static struct mcp_driver ucb1x00_driver = {
         .remove         = ucb1x00_remove,
         .suspend        = ucb1x00_suspend,
         .resume         = ucb1x00_resume,
-        .id_table       = ucb1x00_id,
 };
 
 static int __init ucb1x00_init(void)
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index 40ec3c118868..63a3cbdfa3f3 100644
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -47,7 +47,6 @@ struct ucb1x00_ts {
         u16                     x_res;
         u16                     y_res;
 
-        unsigned int            restart:1;
         unsigned int            adcsync:1;
 };
 
@@ -207,15 +206,17 @@ static int ucb1x00_thread(void *_ts)
 {
         struct ucb1x00_ts *ts = _ts;
         DECLARE_WAITQUEUE(wait, current);
+        bool frozen, ignore = false;
         int valid = 0;
 
         set_freezable();
         add_wait_queue(&ts->irq_wait, &wait);
-        while (!kthread_should_stop()) {
+        while (!kthread_freezable_should_stop(&frozen)) {
                 unsigned int x, y, p;
                 signed long timeout;
 
-                ts->restart = 0;
+                if (frozen)
+                        ignore = true;
 
                 ucb1x00_adc_enable(ts->ucb);
 
@@ -258,7 +259,7 @@ static int ucb1x00_thread(void *_ts)
                          * space.  We therefore leave it to user space
                          * to do any filtering they please.
                          */
-                        if (!ts->restart) {
+                        if (!ignore) {
                                 ucb1x00_ts_evt_add(ts, p, x, y);
                                 valid = 1;
                         }
@@ -267,8 +268,6 @@ static int ucb1x00_thread(void *_ts)
                         timeout = HZ / 100;
                 }
 
-                try_to_freeze();
-
                 schedule_timeout(timeout);
         }
 
@@ -340,26 +339,6 @@ static void ucb1x00_ts_close(struct input_dev *idev)
         ucb1x00_disable(ts->ucb);
 }
 
-#ifdef CONFIG_PM
-static int ucb1x00_ts_resume(struct ucb1x00_dev *dev)
-{
-        struct ucb1x00_ts *ts = dev->priv;
-
-        if (ts->rtask != NULL) {
-                /*
-                 * Restart the TS thread to ensure the
-                 * TS interrupt mode is set up again
-                 * after sleep.
-                 */
-                ts->restart = 1;
-                wake_up(&ts->irq_wait);
-        }
-        return 0;
-}
-#else
-#define ucb1x00_ts_resume NULL
-#endif
-
 
 /*
  * Initialisation.
@@ -382,7 +361,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
         ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;
 
         idev->name       = "Touchscreen panel";
-        idev->id.product = ts->ucb->id->driver_data;
+        idev->id.product = ts->ucb->id;
         idev->open       = ucb1x00_ts_open;
         idev->close      = ucb1x00_ts_close;
 
@@ -425,7 +404,6 @@ static void ucb1x00_ts_remove(struct ucb1x00_dev *dev)
 static struct ucb1x00_driver ucb1x00_ts_driver = {
         .add            = ucb1x00_ts_add,
         .remove         = ucb1x00_ts_remove,
-        .resume         = ucb1x00_ts_resume,
 };
 
 static int __init ucb1x00_ts_init(void)
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index 59866905ea37..27f2fe3b7fb4 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -205,7 +205,8 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev)
 
         dev_set_drvdata(&dev->dev, NULL);
 
-        for (; next = s->next, s; s = next) {
+        for (; s; s = next) {
+                next = s->next;
                 soc_pcmcia_remove_one(&s->soc);
                 kfree(s);
         }
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index e19a4031f45e..3a125b835546 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -774,7 +774,7 @@ config RTC_DRV_EP93XX
 
 config RTC_DRV_SA1100
         tristate "SA11x0/PXA2xx"
-        depends on ARCH_SA1100 || ARCH_PXA || ARCH_MMP
+        depends on ARCH_SA1100 || ARCH_PXA
         help
           If you say Y here you will get access to the real time clock
           built into your SA11x0 or PXA2xx CPU.
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 4595d3e645a7..cb9a585312cc 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -27,42 +27,34 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/interrupt.h>
+#include <linux/string.h>
 #include <linux/pm.h>
-#include <linux/slab.h>
-#include <linux/clk.h>
-#include <linux/io.h>
+#include <linux/bitops.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
 
+#ifdef CONFIG_ARCH_PXA
+#include <mach/regs-rtc.h>
+#endif
+
 #define RTC_DEF_DIVIDER         (32768 - 1)
 #define RTC_DEF_TRIM            0
-#define RTC_FREQ                1024
-
-#define RCNR            0x00    /* RTC Count Register */
-#define RTAR            0x04    /* RTC Alarm Register */
-#define RTSR            0x08    /* RTC Status Register */
-#define RTTR            0x0c    /* RTC Timer Trim Register */
-
-#define RTSR_HZE        (1 << 3)        /* HZ interrupt enable */
-#define RTSR_ALE        (1 << 2)        /* RTC alarm interrupt enable */
-#define RTSR_HZ         (1 << 1)        /* HZ rising-edge detected */
-#define RTSR_AL         (1 << 0)        /* RTC alarm detected */
-
-#define rtc_readl(sa1100_rtc, reg)      \
-        readl_relaxed((sa1100_rtc)->base + (reg))
-#define rtc_writel(sa1100_rtc, reg, value)      \
-        writel_relaxed((value), (sa1100_rtc)->base + (reg))
-
-struct sa1100_rtc {
-        struct resource         *ress;
-        void __iomem            *base;
-        struct clk              *clk;
-        int                     irq_1Hz;
-        int                     irq_Alrm;
-        struct rtc_device       *rtc;
-        spinlock_t              lock;           /* Protects this structure */
-};
+
+static const unsigned long RTC_FREQ = 1024;
+static struct rtc_time rtc_alarm;
+static DEFINE_SPINLOCK(sa1100_rtc_lock);
+
+static inline int rtc_periodic_alarm(struct rtc_time *tm)
+{
+        return  (tm->tm_year == -1) ||
+                ((unsigned)tm->tm_mon >= 12) ||
+                ((unsigned)(tm->tm_mday - 1) >= 31) ||
+                ((unsigned)tm->tm_hour > 23) ||
+                ((unsigned)tm->tm_min > 59) ||
+                ((unsigned)tm->tm_sec > 59);
+}
+
 /*
  * Calculate the next alarm time given the requested alarm time mask
  * and the current time.
@@ -90,26 +82,46 @@ static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now,
         }
 }
 
+static int rtc_update_alarm(struct rtc_time *alrm)
+{
+        struct rtc_time alarm_tm, now_tm;
+        unsigned long now, time;
+        int ret;
+
+        do {
+                now = RCNR;
+                rtc_time_to_tm(now, &now_tm);
+                rtc_next_alarm_time(&alarm_tm, &now_tm, alrm);
+                ret = rtc_tm_to_time(&alarm_tm, &time);
+                if (ret != 0)
+                        break;
+
+                RTSR = RTSR & (RTSR_HZE|RTSR_ALE|RTSR_AL);
+                RTAR = time;
+        } while (now != RCNR);
+
+        return ret;
+}
+
 static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
 {
         struct platform_device *pdev = to_platform_device(dev_id);
-        struct sa1100_rtc *sa1100_rtc = platform_get_drvdata(pdev);
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
         unsigned int rtsr;
         unsigned long events = 0;
 
-        spin_lock(&sa1100_rtc->lock);
+        spin_lock(&sa1100_rtc_lock);
 
+        rtsr = RTSR;
         /* clear interrupt sources */
-        rtsr = rtc_readl(sa1100_rtc, RTSR);
-        rtc_writel(sa1100_rtc, RTSR, 0);
-
+        RTSR = 0;
         /* Fix for a nasty initialization problem the in SA11xx RTSR register.
          * See also the comments in sa1100_rtc_probe(). */
         if (rtsr & (RTSR_ALE | RTSR_HZE)) {
                 /* This is the original code, before there was the if test
                  * above. This code does not clear interrupts that were not
                  * enabled. */
-                rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ) & (rtsr >> 2));
+                RTSR = (RTSR_AL | RTSR_HZ) & (rtsr >> 2);
         } else {
                 /* For some reason, it is possible to enter this routine
                  * without interruptions enabled, it has been tested with
@@ -118,13 +130,13 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
                  * This situation leads to an infinite "loop" of interrupt
                  * routine calling and as a result the processor seems to
                  * lock on its first call to open(). */
-                rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ));
+                RTSR = RTSR_AL | RTSR_HZ;
         }
 
         /* clear alarm interrupt if it has occurred */
         if (rtsr & RTSR_AL)
                 rtsr &= ~RTSR_ALE;
-        rtc_writel(sa1100_rtc, RTSR, rtsr & (RTSR_ALE | RTSR_HZE));
+        RTSR = rtsr & (RTSR_ALE | RTSR_HZE);
 
         /* update irq data & counter */
         if (rtsr & RTSR_AL)
@@ -132,100 +144,89 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
         if (rtsr & RTSR_HZ)
                 events |= RTC_UF | RTC_IRQF;
 
-        rtc_update_irq(sa1100_rtc->rtc, 1, events);
+        rtc_update_irq(rtc, 1, events);
 
-        spin_unlock(&sa1100_rtc->lock);
+        if (rtsr & RTSR_AL && rtc_periodic_alarm(&rtc_alarm))
+                rtc_update_alarm(&rtc_alarm);
+
+        spin_unlock(&sa1100_rtc_lock);
 
         return IRQ_HANDLED;
 }
 
 static int sa1100_rtc_open(struct device *dev)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
         int ret;
+        struct platform_device *plat_dev = to_platform_device(dev);
+        struct rtc_device *rtc = platform_get_drvdata(plat_dev);
 
-        ret = request_irq(sa1100_rtc->irq_1Hz, sa1100_rtc_interrupt,
-                                IRQF_DISABLED, "rtc 1Hz", dev);
+        ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED,
+                "rtc 1Hz", dev);
         if (ret) {
-                dev_err(dev, "IRQ %d already in use.\n", sa1100_rtc->irq_1Hz);
+                dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
                 goto fail_ui;
         }
-        ret = request_irq(sa1100_rtc->irq_Alrm, sa1100_rtc_interrupt,
-                                IRQF_DISABLED, "rtc Alrm", dev);
+        ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED,
+                "rtc Alrm", dev);
         if (ret) {
-                dev_err(dev, "IRQ %d already in use.\n", sa1100_rtc->irq_Alrm);
+                dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
                 goto fail_ai;
         }
-        sa1100_rtc->rtc->max_user_freq = RTC_FREQ;
-        rtc_irq_set_freq(sa1100_rtc->rtc, NULL, RTC_FREQ);
+        rtc->max_user_freq = RTC_FREQ;
+        rtc_irq_set_freq(rtc, NULL, RTC_FREQ);
 
         return 0;
 
  fail_ai:
-        free_irq(sa1100_rtc->irq_1Hz, dev);
+        free_irq(IRQ_RTC1Hz, dev);
  fail_ui:
         return ret;
 }
 
 static void sa1100_rtc_release(struct device *dev)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-
-        spin_lock_irq(&sa1100_rtc->lock);
-        rtc_writel(sa1100_rtc, RTSR, 0);
-        spin_unlock_irq(&sa1100_rtc->lock);
+        spin_lock_irq(&sa1100_rtc_lock);
+        RTSR = 0;
+        spin_unlock_irq(&sa1100_rtc_lock);
 
-        free_irq(sa1100_rtc->irq_Alrm, dev);
-        free_irq(sa1100_rtc->irq_1Hz, dev);
+        free_irq(IRQ_RTCAlrm, dev);
+        free_irq(IRQ_RTC1Hz, dev);
 }
 
 static int sa1100_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-        unsigned int rtsr;
-
-        spin_lock_irq(&sa1100_rtc->lock);
-
-        rtsr = rtc_readl(sa1100_rtc, RTSR);
+        spin_lock_irq(&sa1100_rtc_lock);
         if (enabled)
-                rtsr |= RTSR_ALE;
+                RTSR |= RTSR_ALE;
         else
-                rtsr &= ~RTSR_ALE;
-        rtc_writel(sa1100_rtc, RTSR, rtsr);
-
-        spin_unlock_irq(&sa1100_rtc->lock);
+                RTSR &= ~RTSR_ALE;
+        spin_unlock_irq(&sa1100_rtc_lock);
         return 0;
 }
 
 static int sa1100_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-
-        rtc_time_to_tm(rtc_readl(sa1100_rtc, RCNR), tm);
+        rtc_time_to_tm(RCNR, tm);
         return 0;
 }
 
 static int sa1100_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
         unsigned long time;
         int ret;
 
         ret = rtc_tm_to_time(tm, &time);
         if (ret == 0)
-                rtc_writel(sa1100_rtc, RCNR, time);
+                RCNR = time;
         return ret;
 }
 
 static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-        unsigned long time;
-        unsigned int rtsr;
+        u32     rtsr;
 
-        time = rtc_readl(sa1100_rtc, RCNR);
-        rtc_time_to_tm(time, &alrm->time);
-        rtsr = rtc_readl(sa1100_rtc, RTSR);
+        memcpy(&alrm->time, &rtc_alarm, sizeof(struct rtc_time));
+        rtsr = RTSR;
         alrm->enabled = (rtsr & RTSR_ALE) ? 1 : 0;
         alrm->pending = (rtsr & RTSR_AL) ? 1 : 0;
         return 0;
@@ -233,39 +234,26 @@ static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
 static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-        struct rtc_time now_tm, alarm_tm;
-        unsigned long time, alarm;
-        unsigned int rtsr;
-
-        spin_lock_irq(&sa1100_rtc->lock);
-
-        time = rtc_readl(sa1100_rtc, RCNR);
-        rtc_time_to_tm(time, &now_tm);
-        rtc_next_alarm_time(&alarm_tm, &now_tm, &alrm->time);
-        rtc_tm_to_time(&alarm_tm, &alarm);
-        rtc_writel(sa1100_rtc, RTAR, alarm);
-
-        rtsr = rtc_readl(sa1100_rtc, RTSR);
-        if (alrm->enabled)
-                rtsr |= RTSR_ALE;
-        else
-                rtsr &= ~RTSR_ALE;
-        rtc_writel(sa1100_rtc, RTSR, rtsr);
+        int ret;
 
-        spin_unlock_irq(&sa1100_rtc->lock);
+        spin_lock_irq(&sa1100_rtc_lock);
+        ret = rtc_update_alarm(&alrm->time);
+        if (ret == 0) {
+                if (alrm->enabled)
+                        RTSR |= RTSR_ALE;
+                else
+                        RTSR &= ~RTSR_ALE;
+        }
+        spin_unlock_irq(&sa1100_rtc_lock);
 
-        return 0;
+        return ret;
 }
 
 static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
+        seq_printf(seq, "trim/divider\t\t: 0x%08x\n", (u32) RTTR);
+        seq_printf(seq, "RTSR\t\t\t: 0x%08x\n", (u32)RTSR);
 
-        seq_printf(seq, "trim/divider\t\t: 0x%08x\n",
-                        rtc_readl(sa1100_rtc, RTTR));
-        seq_printf(seq, "RTSR\t\t\t: 0x%08x\n",
-                        rtc_readl(sa1100_rtc, RTSR));
         return 0;
 }
 
@@ -282,51 +270,7 @@ static const struct rtc_class_ops sa1100_rtc_ops = {
 
 static int sa1100_rtc_probe(struct platform_device *pdev)
 {
-        struct sa1100_rtc *sa1100_rtc;
-        unsigned int rttr;
-        int ret;
-
-        sa1100_rtc = kzalloc(sizeof(struct sa1100_rtc), GFP_KERNEL);
-        if (!sa1100_rtc)
-                return -ENOMEM;
-
-        spin_lock_init(&sa1100_rtc->lock);
-        platform_set_drvdata(pdev, sa1100_rtc);
-
-        ret = -ENXIO;
-        sa1100_rtc->ress = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!sa1100_rtc->ress) {
-                dev_err(&pdev->dev, "No I/O memory resource defined\n");
-                goto err_ress;
-        }
-
-        sa1100_rtc->irq_1Hz = platform_get_irq(pdev, 0);
-        if (sa1100_rtc->irq_1Hz < 0) {
-                dev_err(&pdev->dev, "No 1Hz IRQ resource defined\n");
-                goto err_ress;
-        }
-        sa1100_rtc->irq_Alrm = platform_get_irq(pdev, 1);
-        if (sa1100_rtc->irq_Alrm < 0) {
-                dev_err(&pdev->dev, "No alarm IRQ resource defined\n");
-                goto err_ress;
-        }
-
-        ret = -ENOMEM;
-        sa1100_rtc->base = ioremap(sa1100_rtc->ress->start,
-                                resource_size(sa1100_rtc->ress));
-        if (!sa1100_rtc->base) {
-                dev_err(&pdev->dev, "Unable to map pxa RTC I/O memory\n");
-                goto err_map;
-        }
-
-        sa1100_rtc->clk = clk_get(&pdev->dev, NULL);
-        if (IS_ERR(sa1100_rtc->clk)) {
-                dev_err(&pdev->dev, "failed to find rtc clock source\n");
-                ret = PTR_ERR(sa1100_rtc->clk);
-                goto err_clk;
-        }
-        clk_prepare(sa1100_rtc->clk);
-        clk_enable(sa1100_rtc->clk);
+        struct rtc_device *rtc;
 
         /*
          * According to the manual we should be able to let RTTR be zero
@@ -335,24 +279,24 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
          * If the clock divider is uninitialized then reset it to the
          * default value to get the 1Hz clock.
          */
-        if (rtc_readl(sa1100_rtc, RTTR) == 0) {
-                rttr = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16);
-                rtc_writel(sa1100_rtc, RTTR, rttr);
-                dev_warn(&pdev->dev, "warning: initializing default clock"
-                         " divider/trim value\n");
+        if (RTTR == 0) {
+                RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16);
+                dev_warn(&pdev->dev, "warning: "
+                        "initializing default clock divider/trim value\n");
                 /* The current RTC value probably doesn't make sense either */
-                rtc_writel(sa1100_rtc, RCNR, 0);
+                RCNR = 0;
         }
 
         device_init_wakeup(&pdev->dev, 1);
 
-        sa1100_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
-                                                &sa1100_rtc_ops, THIS_MODULE);
-        if (IS_ERR(sa1100_rtc->rtc)) {
-                dev_err(&pdev->dev, "Failed to register RTC device -> %d\n",
-                        ret);
-                goto err_rtc_reg;
-        }
+        rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,
+                THIS_MODULE);
+
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
+
+        platform_set_drvdata(pdev, rtc);
+
         /* Fix for a nasty initialization problem the in SA11xx RTSR register.
          * See also the comments in sa1100_rtc_interrupt().
          *
@@ -375,46 +319,33 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
          *
          * Notice that clearing bit 1 and 0 is accomplished by writting ONES to
          * the corresponding bits in RTSR. */
-        rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ));
+        RTSR = RTSR_AL | RTSR_HZ;
 
         return 0;
-
-err_rtc_reg:
-err_clk:
-        iounmap(sa1100_rtc->base);
-err_ress:
-err_map:
-        kfree(sa1100_rtc);
-        return ret;
 }
 
 static int sa1100_rtc_remove(struct platform_device *pdev)
 {
-        struct sa1100_rtc *sa1100_rtc = platform_get_drvdata(pdev);
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
+
+        if (rtc)
+                rtc_device_unregister(rtc);
 
-        rtc_device_unregister(sa1100_rtc->rtc);
-        clk_disable(sa1100_rtc->clk);
-        clk_unprepare(sa1100_rtc->clk);
-        iounmap(sa1100_rtc->base);
         return 0;
 }
 
 #ifdef CONFIG_PM
 static int sa1100_rtc_suspend(struct device *dev)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-
         if (device_may_wakeup(dev))
-                enable_irq_wake(sa1100_rtc->irq_Alrm);
+                enable_irq_wake(IRQ_RTCAlrm);
         return 0;
 }
 
 static int sa1100_rtc_resume(struct device *dev)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-
         if (device_may_wakeup(dev))
-                disable_irq_wake(sa1100_rtc->irq_Alrm);
+                disable_irq_wake(IRQ_RTCAlrm);
         return 0;
 }