8 files changed, 105 insertions, 241 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 37c4bd1cacd5..d0c41188d4e5 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -87,6 +87,7 @@ config GPIO_GENERIC_PLATFORM
 
 config GPIO_IT8761E
         tristate "IT8761E GPIO support"
+        depends on X86  # unconditional access to IO space.
         help
           Say yes here to support GPIO functionality of IT8761E super I/O chip.
 
diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c
index 461958fc2264..03d6dd5dcb77 100644
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@ -248,7 +248,7 @@ static void ioh_gpio_setup(struct ioh_gpio *chip, int num_port)
 static int ioh_irq_type(struct irq_data *d, unsigned int type)
 {
         u32 im;
-        u32 *im_reg;
+        void __iomem *im_reg;
         u32 ien;
         u32 im_pos;
         int ch;
@@ -412,7 +412,7 @@ static int __devinit ioh_gpio_probe(struct pci_dev *pdev,
         int i, j;
         struct ioh_gpio *chip;
         void __iomem *base;
-        void __iomem *chip_save;
+        void *chip_save;
         int irq_base;
 
         ret = pci_enable_device(pdev);
@@ -428,7 +428,7 @@ static int __devinit ioh_gpio_probe(struct pci_dev *pdev,
         }
 
         base = pci_iomap(pdev, 1, 0);
-        if (base == 0) {
+        if (!base) {
                 dev_err(&pdev->dev, "%s : pci_iomap failed", __func__);
                 ret = -ENOMEM;
                 goto err_iomap;
@@ -521,7 +521,7 @@ static void __devexit ioh_gpio_remove(struct pci_dev *pdev)
         int err;
         int i;
         struct ioh_gpio *chip = pci_get_drvdata(pdev);
-        void __iomem *chip_save;
+        void *chip_save;
 
         chip_save = chip;
 
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index f0603297f829..68fa55e86eb1 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -231,7 +231,7 @@ static void pch_gpio_setup(struct pch_gpio *chip)
 static int pch_irq_type(struct irq_data *d, unsigned int type)
 {
         u32 im;
-        u32 *im_reg;
+        u32 __iomem *im_reg;
         u32 ien;
         u32 im_pos;
         int ch;
@@ -376,7 +376,7 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
         }
 
         chip->base = pci_iomap(pdev, 1, 0);
-        if (chip->base == 0) {
+        if (!chip->base) {
                 dev_err(&pdev->dev, "%s : pci_iomap FAILED", __func__);
                 ret = -ENOMEM;
                 goto err_iomap;
diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c
index b9c1c297669e..91f45b965d1e 100644
--- a/drivers/gpio/gpio-tps65910.c
+++ b/drivers/gpio/gpio-tps65910.c
@@ -52,7 +52,7 @@ static int tps65910_gpio_output(struct gpio_chip *gc, unsigned offset,
         struct tps65910 *tps65910 = container_of(gc, struct tps65910, gpio);
 
         /* Set the initial value */
-        tps65910_gpio_set(gc, 0, value);
+        tps65910_gpio_set(gc, offset, value);
 
         return tps65910_set_bits(tps65910, TPS65910_GPIO0 + offset,
                                                 GPIO_CFG_MASK);
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)