Merge commit 'v2.6.27-rc3' into core/urgent

1 files changed, 419 insertions, 0 deletions

diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
new file mode 100644
index 000000000000..49a0fffc02af
--- /dev/null
+++ b/drivers/mfd/t7l66xb.c
@@ -0,0 +1,419 @@
+/*
+ *
+ * Toshiba T7L66XB core mfd support
+ *
+ * Copyright (c) 2005, 2007, 2008 Ian Molton
+ * Copyright (c) 2008 Dmitry Baryshkov
+ *
+ * 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.
+ *
+ * T7L66 features:
+ *
+ * Supported in this driver:
+ * SD/MMC
+ * SM/NAND flash controller
+ *
+ * As yet not supported
+ * GPIO interface (on NAND pins)
+ * Serial interface
+ * TFT 'interface converter'
+ * PCMCIA interface logic
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/platform_device.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/tmio.h>
+#include <linux/mfd/t7l66xb.h>
+
+enum {
+        T7L66XB_CELL_NAND,
+        T7L66XB_CELL_MMC,
+};
+
+#define SCR_REVID       0x08            /* b Revision ID        */
+#define SCR_IMR         0x42            /* b Interrupt Mask     */
+#define SCR_DEV_CTL     0xe0            /* b Device control     */
+#define SCR_ISR         0xe1            /* b Interrupt Status   */
+#define SCR_GPO_OC      0xf0            /* b GPO output control */
+#define SCR_GPO_OS      0xf1            /* b GPO output enable  */
+#define SCR_GPI_S       0xf2            /* w GPI status         */
+#define SCR_APDC        0xf8            /* b Active pullup down ctrl */
+
+#define SCR_DEV_CTL_USB         BIT(0)  /* USB enable           */
+#define SCR_DEV_CTL_MMC         BIT(1)  /* MMC enable           */
+
+/*--------------------------------------------------------------------------*/
+
+struct t7l66xb {
+        void __iomem            *scr;
+        /* Lock to protect registers requiring read/modify/write ops. */
+        spinlock_t              lock;
+
+        struct resource         rscr;
+        int                     irq;
+        int                     irq_base;
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int t7l66xb_mmc_enable(struct platform_device *mmc)
+{
+        struct platform_device *dev = to_platform_device(mmc->dev.parent);
+        struct t7l66xb_platform_data   *pdata = dev->dev.platform_data;
+        struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
+        unsigned long flags;
+        u8 dev_ctl;
+
+        if (pdata->enable_clk32k)
+                pdata->enable_clk32k(dev);
+
+        spin_lock_irqsave(&t7l66xb->lock, flags);
+
+        dev_ctl = tmio_ioread8(t7l66xb->scr + SCR_DEV_CTL);
+        dev_ctl |= SCR_DEV_CTL_MMC;
+        tmio_iowrite8(dev_ctl, t7l66xb->scr + SCR_DEV_CTL);
+
+        spin_unlock_irqrestore(&t7l66xb->lock, flags);
+
+        return 0;
+}
+
+static int t7l66xb_mmc_disable(struct platform_device *mmc)
+{
+        struct platform_device *dev = to_platform_device(mmc->dev.parent);
+        struct t7l66xb_platform_data   *pdata = dev->dev.platform_data;
+        struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
+        unsigned long flags;
+        u8 dev_ctl;
+
+        spin_lock_irqsave(&t7l66xb->lock, flags);
+
+        dev_ctl = tmio_ioread8(t7l66xb->scr + SCR_DEV_CTL);
+        dev_ctl &= ~SCR_DEV_CTL_MMC;
+        tmio_iowrite8(dev_ctl, t7l66xb->scr + SCR_DEV_CTL);
+
+        spin_unlock_irqrestore(&t7l66xb->lock, flags);
+
+        if (pdata->disable_clk32k)
+                pdata->disable_clk32k(dev);
+
+        return 0;
+}
+
+/*--------------------------------------------------------------------------*/
+
+const static struct resource t7l66xb_mmc_resources[] = {
+        {
+                .start = 0x800,
+                .end    = 0x9ff,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = 0x200,
+                .end    = 0x2ff,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = IRQ_T7L66XB_MMC,
+                .end    = IRQ_T7L66XB_MMC,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+const static struct resource t7l66xb_nand_resources[] = {
+        {
+                .start  = 0xc00,
+                .end    = 0xc07,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = 0x0100,
+                .end    = 0x01ff,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = IRQ_T7L66XB_NAND,
+                .end    = IRQ_T7L66XB_NAND,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct mfd_cell t7l66xb_cells[] = {
+        [T7L66XB_CELL_MMC] = {
+                .name = "tmio-mmc",
+                .enable = t7l66xb_mmc_enable,
+                .disable = t7l66xb_mmc_disable,
+                .num_resources = ARRAY_SIZE(t7l66xb_mmc_resources),
+                .resources = t7l66xb_mmc_resources,
+        },
+        [T7L66XB_CELL_NAND] = {
+                .name = "tmio-nand",
+                .num_resources = ARRAY_SIZE(t7l66xb_nand_resources),
+                .resources = t7l66xb_nand_resources,
+        },
+};
+
+/*--------------------------------------------------------------------------*/
+
+/* Handle the T7L66XB interrupt mux */
+static void t7l66xb_irq(unsigned int irq, struct irq_desc *desc)
+{
+        struct t7l66xb *t7l66xb = get_irq_data(irq);
+        unsigned int isr;
+        unsigned int i, irq_base;
+
+        irq_base = t7l66xb->irq_base;
+
+        while ((isr = tmio_ioread8(t7l66xb->scr + SCR_ISR) &
+                                ~tmio_ioread8(t7l66xb->scr + SCR_IMR)))
+                for (i = 0; i < T7L66XB_NR_IRQS; i++)
+                        if (isr & (1 << i))
+                                generic_handle_irq(irq_base + i);
+}
+
+static void t7l66xb_irq_mask(unsigned int irq)
+{
+        struct t7l66xb *t7l66xb = get_irq_chip_data(irq);
+        unsigned long                   flags;
+        u8 imr;
+
+        spin_lock_irqsave(&t7l66xb->lock, flags);
+        imr = tmio_ioread8(t7l66xb->scr + SCR_IMR);
+        imr |= 1 << (irq - t7l66xb->irq_base);
+        tmio_iowrite8(imr, t7l66xb->scr + SCR_IMR);
+        spin_unlock_irqrestore(&t7l66xb->lock, flags);
+}
+
+static void t7l66xb_irq_unmask(unsigned int irq)
+{
+        struct t7l66xb *t7l66xb = get_irq_chip_data(irq);
+        unsigned long flags;
+        u8 imr;
+
+        spin_lock_irqsave(&t7l66xb->lock, flags);
+        imr = tmio_ioread8(t7l66xb->scr + SCR_IMR);
+        imr &= ~(1 << (irq - t7l66xb->irq_base));
+        tmio_iowrite8(imr, t7l66xb->scr + SCR_IMR);
+        spin_unlock_irqrestore(&t7l66xb->lock, flags);
+}
+
+static struct irq_chip t7l66xb_chip = {
+        .name   = "t7l66xb",
+        .ack    = t7l66xb_irq_mask,
+        .mask   = t7l66xb_irq_mask,
+        .unmask = t7l66xb_irq_unmask,
+};
+
+/*--------------------------------------------------------------------------*/
+
+/* Install the IRQ handler */
+static void t7l66xb_attach_irq(struct platform_device *dev)
+{
+        struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
+        unsigned int irq, irq_base;
+
+        irq_base = t7l66xb->irq_base;
+
+        for (irq = irq_base; irq < irq_base + T7L66XB_NR_IRQS; irq++) {
+                set_irq_chip(irq, &t7l66xb_chip);
+                set_irq_chip_data(irq, t7l66xb);
+                set_irq_handler(irq, handle_level_irq);
+#ifdef CONFIG_ARM
+                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+#endif
+        }
+
+        set_irq_type(t7l66xb->irq, IRQ_TYPE_EDGE_FALLING);
+        set_irq_data(t7l66xb->irq, t7l66xb);
+        set_irq_chained_handler(t7l66xb->irq, t7l66xb_irq);
+}
+
+static void t7l66xb_detach_irq(struct platform_device *dev)
+{
+        struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
+        unsigned int irq, irq_base;
+
+        irq_base = t7l66xb->irq_base;
+
+        set_irq_chained_handler(t7l66xb->irq, NULL);
+        set_irq_data(t7l66xb->irq, NULL);
+
+        for (irq = irq_base; irq < irq_base + T7L66XB_NR_IRQS; irq++) {
+#ifdef CONFIG_ARM
+                set_irq_flags(irq, 0);
+#endif
+                set_irq_chip(irq, NULL);
+                set_irq_chip_data(irq, NULL);
+        }
+}
+
+/*--------------------------------------------------------------------------*/
+
+#ifdef CONFIG_PM
+static int t7l66xb_suspend(struct platform_device *dev, pm_message_t state)
+{
+        struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
+
+        if (pdata && pdata->suspend)
+                pdata->suspend(dev);
+
+        return 0;
+}
+
+static int t7l66xb_resume(struct platform_device *dev)
+{
+        struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
+
+        if (pdata && pdata->resume)
+                pdata->resume(dev);
+
+        return 0;
+}
+#else
+#define t7l66xb_suspend NULL
+#define t7l66xb_resume  NULL
+#endif
+
+/*--------------------------------------------------------------------------*/
+
+static int t7l66xb_probe(struct platform_device *dev)
+{
+        struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
+        struct t7l66xb *t7l66xb;
+        struct resource *iomem, *rscr;
+        int ret;
+
+        iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        if (!iomem)
+                return -EINVAL;
+
+        t7l66xb = kzalloc(sizeof *t7l66xb, GFP_KERNEL);
+        if (!t7l66xb)
+                return -ENOMEM;
+
+        spin_lock_init(&t7l66xb->lock);
+
+        platform_set_drvdata(dev, t7l66xb);
+
+        ret = platform_get_irq(dev, 0);
+        if (ret >= 0)
+                t7l66xb->irq = ret;
+        else
+                goto err_noirq;
+
+        t7l66xb->irq_base = pdata->irq_base;
+
+        rscr = &t7l66xb->rscr;
+        rscr->name = "t7l66xb-core";
+        rscr->start = iomem->start;
+        rscr->end = iomem->start + 0xff;
+        rscr->flags = IORESOURCE_MEM;
+
+        ret = request_resource(iomem, rscr);
+        if (ret)
+                goto err_request_scr;
+
+        t7l66xb->scr = ioremap(rscr->start, rscr->end - rscr->start + 1);
+        if (!t7l66xb->scr) {
+                ret = -ENOMEM;
+                goto err_ioremap;
+        }
+
+        if (pdata && pdata->enable)
+                pdata->enable(dev);
+
+        /* Mask all interrupts */
+        tmio_iowrite8(0xbf, t7l66xb->scr + SCR_IMR);
+
+        printk(KERN_INFO "%s rev %d @ 0x%08lx, irq %d\n",
+                dev->name, tmio_ioread8(t7l66xb->scr + SCR_REVID),
+                (unsigned long)iomem->start, t7l66xb->irq);
+
+        t7l66xb_attach_irq(dev);
+
+        t7l66xb_cells[T7L66XB_CELL_NAND].driver_data = pdata->nand_data;
+        t7l66xb_cells[T7L66XB_CELL_NAND].platform_data =
+                &t7l66xb_cells[T7L66XB_CELL_NAND];
+        t7l66xb_cells[T7L66XB_CELL_NAND].data_size =
+                sizeof(t7l66xb_cells[T7L66XB_CELL_NAND]);
+
+        t7l66xb_cells[T7L66XB_CELL_MMC].platform_data =
+                &t7l66xb_cells[T7L66XB_CELL_MMC];
+        t7l66xb_cells[T7L66XB_CELL_MMC].data_size =
+                sizeof(t7l66xb_cells[T7L66XB_CELL_MMC]);
+
+        ret = mfd_add_devices(&dev->dev, dev->id,
+                              t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells),
+                              iomem, t7l66xb->irq_base);
+
+        if (!ret)
+                return 0;
+
+        t7l66xb_detach_irq(dev);
+        iounmap(t7l66xb->scr);
+err_ioremap:
+        release_resource(&t7l66xb->rscr);
+err_noirq:
+err_request_scr:
+        kfree(t7l66xb);
+        return ret;
+}
+
+static int t7l66xb_remove(struct platform_device *dev)
+{
+        struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
+        struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
+        int ret;
+
+        ret = pdata->disable(dev);
+
+        t7l66xb_detach_irq(dev);
+        iounmap(t7l66xb->scr);
+        release_resource(&t7l66xb->rscr);
+        mfd_remove_devices(&dev->dev);
+        platform_set_drvdata(dev, NULL);
+        kfree(t7l66xb);
+
+        return ret;
+
+}
+
+static struct platform_driver t7l66xb_platform_driver = {
+        .driver = {
+                .name   = "t7l66xb",
+                .owner  = THIS_MODULE,
+        },
+        .suspend        = t7l66xb_suspend,
+        .resume         = t7l66xb_resume,
+        .probe          = t7l66xb_probe,
+        .remove         = t7l66xb_remove,
+};
+
+/*--------------------------------------------------------------------------*/
+
+static int __init t7l66xb_init(void)
+{
+        int retval = 0;
+
+        retval = platform_driver_register(&t7l66xb_platform_driver);
+        return retval;
+}
+
+static void __exit t7l66xb_exit(void)
+{
+        platform_driver_unregister(&t7l66xb_platform_driver);
+}
+
+module_init(t7l66xb_init);
+module_exit(t7l66xb_exit);
+
+MODULE_DESCRIPTION("Toshiba T7L66XB core driver");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Ian Molton");
+MODULE_ALIAS("platform:t7l66xb");