mfd: driver for the T7L66XB TMIO SoC

This patchset provides support for the core functinality of the T7L66XB
SoC from Toshiba. Supported in this patchset is the IRQ MUX, MMC controller
and NAND flash controller.

Signed-off-by: Ian Molton <spyro@f2s.com>
Signed-off-by: Samuel Ortiz <sameo@openedhand.com>

4 files changed, 452 insertions, 0 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 883e7ea31de2..fc7c919693bf 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -50,6 +50,12 @@ config HTC_PASIC3
           HTC Magician devices, respectively. Actual functionality is
           handled by the leds-pasic3 and ds1wm drivers.
 
+config MFD_T7L66XB
+        bool "Support Toshiba T7L66XB"
+        select MFD_CORE
+        help
+          Support for Toshiba Mobile IO Controller T7L66XB
+
 config MFD_TC6393XB
         bool "Support Toshiba TC6393XB"
         depends on GPIOLIB && ARM
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 33daa2f45dd8..3531ad2a276c 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_MFD_ASIC3)		+= asic3.o
 obj-$(CONFIG_HTC_EGPIO)         += htc-egpio.o
 obj-$(CONFIG_HTC_PASIC3)        += htc-pasic3.o
 
+obj-$(CONFIG_MFD_T7L66XB)       += t7l66xb.o
 obj-$(CONFIG_MFD_TC6393XB)      += tc6393xb.o
 
 obj-$(CONFIG_MFD_CORE)          += mfd-core.o
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
new file mode 100644
index 000000000000..5be42054f739
--- /dev/null
+++ b/drivers/mfd/t7l66xb.c
@@ -0,0 +1,409 @@
+/*
+ *
+ * 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;