Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
[safe/jmp/linux-2.6] / drivers / mfd / asic3.c
index f6f2d96..7de708d 100644 (file)
@@ -9,21 +9,84 @@
  *
  * Copyright 2001 Compaq Computer Corporation.
  * Copyright 2004-2005 Phil Blundell
- * Copyright 2007 OpenedHand Ltd.
+ * Copyright 2007-2008 OpenedHand Ltd.
  *
  * Authors: Phil Blundell <pb@handhelds.org>,
  *         Samuel Ortiz <sameo@openedhand.com>
  *
  */
 
-#include <linux/version.h>
 #include <linux/kernel.h>
+#include <linux/delay.h>
 #include <linux/irq.h>
+#include <linux/gpio.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
 
 #include <linux/mfd/asic3.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/ds1wm.h>
+#include <linux/mfd/tmio.h>
+
+enum {
+       ASIC3_CLOCK_SPI,
+       ASIC3_CLOCK_OWM,
+       ASIC3_CLOCK_PWM0,
+       ASIC3_CLOCK_PWM1,
+       ASIC3_CLOCK_LED0,
+       ASIC3_CLOCK_LED1,
+       ASIC3_CLOCK_LED2,
+       ASIC3_CLOCK_SD_HOST,
+       ASIC3_CLOCK_SD_BUS,
+       ASIC3_CLOCK_SMBUS,
+       ASIC3_CLOCK_EX0,
+       ASIC3_CLOCK_EX1,
+};
+
+struct asic3_clk {
+       int enabled;
+       unsigned int cdex;
+       unsigned long rate;
+};
+
+#define INIT_CDEX(_name, _rate)        \
+       [ASIC3_CLOCK_##_name] = {               \
+               .cdex = CLOCK_CDEX_##_name,     \
+               .rate = _rate,                  \
+       }
+
+struct asic3_clk asic3_clk_init[] __initdata = {
+       INIT_CDEX(SPI, 0),
+       INIT_CDEX(OWM, 5000000),
+       INIT_CDEX(PWM0, 0),
+       INIT_CDEX(PWM1, 0),
+       INIT_CDEX(LED0, 0),
+       INIT_CDEX(LED1, 0),
+       INIT_CDEX(LED2, 0),
+       INIT_CDEX(SD_HOST, 24576000),
+       INIT_CDEX(SD_BUS, 12288000),
+       INIT_CDEX(SMBUS, 0),
+       INIT_CDEX(EX0, 32768),
+       INIT_CDEX(EX1, 24576000),
+};
+
+struct asic3 {
+       void __iomem *mapping;
+       unsigned int bus_shift;
+       unsigned int irq_nr;
+       unsigned int irq_base;
+       spinlock_t lock;
+       u16 irq_bothedge[4];
+       struct gpio_chip gpio;
+       struct device *dev;
+       void __iomem *tmio_cnf;
+
+       struct asic3_clk clocks[ARRAY_SIZE(asic3_clk_init)];
+};
+
+static int asic3_gpio_get(struct gpio_chip *chip, unsigned offset);
 
 static inline void asic3_write_register(struct asic3 *asic,
                                 unsigned int reg, u32 value)
@@ -39,10 +102,25 @@ static inline u32 asic3_read_register(struct asic3 *asic,
                        (reg >> asic->bus_shift));
 }
 
+void asic3_set_register(struct asic3 *asic, u32 reg, u32 bits, bool set)
+{
+       unsigned long flags;
+       u32 val;
+
+       spin_lock_irqsave(&asic->lock, flags);
+       val = asic3_read_register(asic, reg);
+       if (set)
+               val |= bits;
+       else
+               val &= ~bits;
+       asic3_write_register(asic, reg, val);
+       spin_unlock_irqrestore(&asic->lock, flags);
+}
+
 /* IRQs */
 #define MAX_ASIC_ISR_LOOPS    20
-#define ASIC3_GPIO_Base_INCR \
-       (ASIC3_GPIO_B_Base - ASIC3_GPIO_A_Base)
+#define ASIC3_GPIO_BASE_INCR \
+       (ASIC3_GPIO_B_BASE - ASIC3_GPIO_A_BASE)
 
 static void asic3_irq_flip_edge(struct asic3 *asic,
                                u32 base, int bit)
@@ -52,10 +130,10 @@ static void asic3_irq_flip_edge(struct asic3 *asic,
 
        spin_lock_irqsave(&asic->lock, flags);
        edge = asic3_read_register(asic,
-                                  base + ASIC3_GPIO_EdgeTrigger);
+                                  base + ASIC3_GPIO_EDGE_TRIGGER);
        edge ^= bit;
        asic3_write_register(asic,
-                            base + ASIC3_GPIO_EdgeTrigger, edge);
+                            base + ASIC3_GPIO_EDGE_TRIGGER, edge);
        spin_unlock_irqrestore(&asic->lock, flags);
 }
 
@@ -75,7 +153,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
 
                spin_lock_irqsave(&asic->lock, flags);
                status = asic3_read_register(asic,
-                                            ASIC3_OFFSET(INTR, PIntStat));
+                                            ASIC3_OFFSET(INTR, P_INT_STAT));
                spin_unlock_irqrestore(&asic->lock, flags);
 
                /* Check all ten register bits */
@@ -87,17 +165,17 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
                        if (status & (1 << bank)) {
                                unsigned long base, istat;
 
-                               base = ASIC3_GPIO_A_Base
-                                      + bank * ASIC3_GPIO_Base_INCR;
+                               base = ASIC3_GPIO_A_BASE
+                                      + bank * ASIC3_GPIO_BASE_INCR;
 
                                spin_lock_irqsave(&asic->lock, flags);
                                istat = asic3_read_register(asic,
                                                            base +
-                                                           ASIC3_GPIO_IntStatus);
+                                                           ASIC3_GPIO_INT_STATUS);
                                /* Clearing IntStatus */
                                asic3_write_register(asic,
                                                     base +
-                                                    ASIC3_GPIO_IntStatus, 0);
+                                                    ASIC3_GPIO_INT_STATUS, 0);
                                spin_unlock_irqrestore(&asic->lock, flags);
 
                                for (i = 0; i < ASIC3_GPIOS_PER_BANK; i++) {
@@ -110,7 +188,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
                                        irqnr = asic->irq_base +
                                                (ASIC3_GPIOS_PER_BANK * bank)
                                                + i;
-                                       desc = irq_desc + irqnr;
+                                       desc = irq_to_desc(irqnr);
                                        desc->handle_irq(irqnr, desc);
                                        if (asic->irq_bothedge[bank] & bit)
                                                asic3_irq_flip_edge(asic, base,
@@ -123,7 +201,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
                for (i = ASIC3_NUM_GPIOS; i < ASIC3_NR_IRQS; i++) {
                        /* They start at bit 4 and go up */
                        if (status & (1 << (i - ASIC3_NUM_GPIOS + 4))) {
-                               desc = irq_desc +  + i;
+                               desc = irq_to_desc(asic->irq_base + i);
                                desc->handle_irq(asic->irq_base + i,
                                                 desc);
                        }
@@ -131,8 +209,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)
        }
 
        if (iter >= MAX_ASIC_ISR_LOOPS)
-               printk(KERN_ERR "%s: interrupt processing overrun\n",
-                      __FUNCTION__);
+               dev_err(asic->dev, "interrupt processing overrun\n");
 }
 
 static inline int asic3_irq_to_bank(struct asic3 *asic, int irq)
@@ -141,7 +218,7 @@ static inline int asic3_irq_to_bank(struct asic3 *asic, int irq)
 
        n = (irq - asic->irq_base) >> 4;
 
-       return (n * (ASIC3_GPIO_B_Base - ASIC3_GPIO_A_Base));
+       return (n * (ASIC3_GPIO_B_BASE - ASIC3_GPIO_A_BASE));
 }
 
 static inline int asic3_irq_to_index(struct asic3 *asic, int irq)
@@ -159,9 +236,9 @@ static void asic3_mask_gpio_irq(unsigned int irq)
        index = asic3_irq_to_index(asic, irq);
 
        spin_lock_irqsave(&asic->lock, flags);
-       val = asic3_read_register(asic, bank + ASIC3_GPIO_Mask);
+       val = asic3_read_register(asic, bank + ASIC3_GPIO_MASK);
        val |= 1 << index;
-       asic3_write_register(asic, bank + ASIC3_GPIO_Mask, val);
+       asic3_write_register(asic, bank + ASIC3_GPIO_MASK, val);
        spin_unlock_irqrestore(&asic->lock, flags);
 }
 
@@ -173,15 +250,15 @@ static void asic3_mask_irq(unsigned int irq)
 
        spin_lock_irqsave(&asic->lock, flags);
        regval = asic3_read_register(asic,
-                                    ASIC3_INTR_Base +
-                                    ASIC3_INTR_IntMask);
+                                    ASIC3_INTR_BASE +
+                                    ASIC3_INTR_INT_MASK);
 
        regval &= ~(ASIC3_INTMASK_MASK0 <<
                    (irq - (asic->irq_base + ASIC3_NUM_GPIOS)));
 
        asic3_write_register(asic,
-                            ASIC3_INTR_Base +
-                            ASIC3_INTR_IntMask,
+                            ASIC3_INTR_BASE +
+                            ASIC3_INTR_INT_MASK,
                             regval);
        spin_unlock_irqrestore(&asic->lock, flags);
 }
@@ -196,9 +273,9 @@ static void asic3_unmask_gpio_irq(unsigned int irq)
        index = asic3_irq_to_index(asic, irq);
 
        spin_lock_irqsave(&asic->lock, flags);
-       val = asic3_read_register(asic, bank + ASIC3_GPIO_Mask);
+       val = asic3_read_register(asic, bank + ASIC3_GPIO_MASK);
        val &= ~(1 << index);
-       asic3_write_register(asic, bank + ASIC3_GPIO_Mask, val);
+       asic3_write_register(asic, bank + ASIC3_GPIO_MASK, val);
        spin_unlock_irqrestore(&asic->lock, flags);
 }
 
@@ -210,15 +287,15 @@ static void asic3_unmask_irq(unsigned int irq)
 
        spin_lock_irqsave(&asic->lock, flags);
        regval = asic3_read_register(asic,
-                                    ASIC3_INTR_Base +
-                                    ASIC3_INTR_IntMask);
+                                    ASIC3_INTR_BASE +
+                                    ASIC3_INTR_INT_MASK);
 
        regval |= (ASIC3_INTMASK_MASK0 <<
                   (irq - (asic->irq_base + ASIC3_NUM_GPIOS)));
 
        asic3_write_register(asic,
-                            ASIC3_INTR_Base +
-                            ASIC3_INTR_IntMask,
+                            ASIC3_INTR_BASE +
+                            ASIC3_INTR_INT_MASK,
                             regval);
        spin_unlock_irqrestore(&asic->lock, flags);
 }
@@ -236,45 +313,45 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type)
 
        spin_lock_irqsave(&asic->lock, flags);
        level = asic3_read_register(asic,
-                                   bank + ASIC3_GPIO_LevelTrigger);
+                                   bank + ASIC3_GPIO_LEVEL_TRIGGER);
        edge = asic3_read_register(asic,
-                                  bank + ASIC3_GPIO_EdgeTrigger);
+                                  bank + ASIC3_GPIO_EDGE_TRIGGER);
        trigger = asic3_read_register(asic,
-                                     bank + ASIC3_GPIO_TriggerType);
+                                     bank + ASIC3_GPIO_TRIGGER_TYPE);
        asic->irq_bothedge[(irq - asic->irq_base) >> 4] &= ~bit;
 
-       if (type == IRQT_RISING) {
+       if (type == IRQ_TYPE_EDGE_RISING) {
                trigger |= bit;
                edge |= bit;
-       } else if (type == IRQT_FALLING) {
+       } else if (type == IRQ_TYPE_EDGE_FALLING) {
                trigger |= bit;
                edge &= ~bit;
-       } else if (type == IRQT_BOTHEDGE) {
+       } else if (type == IRQ_TYPE_EDGE_BOTH) {
                trigger |= bit;
-               if (asic3_gpio_get_value(asic, irq - asic->irq_base))
+               if (asic3_gpio_get(&asic->gpio, irq - asic->irq_base))
                        edge &= ~bit;
                else
                        edge |= bit;
                asic->irq_bothedge[(irq - asic->irq_base) >> 4] |= bit;
-       } else if (type == IRQT_LOW) {
+       } else if (type == IRQ_TYPE_LEVEL_LOW) {
                trigger &= ~bit;
                level &= ~bit;
-       } else if (type == IRQT_HIGH) {
+       } else if (type == IRQ_TYPE_LEVEL_HIGH) {
                trigger &= ~bit;
                level |= bit;
        } else {
                /*
-                * if type == IRQT_NOEDGE, we should mask interrupts, but
+                * if type == IRQ_TYPE_NONE, we should mask interrupts, but
                 * be careful to not unmask them if mask was also called.
                 * Probably need internal state for mask.
                 */
-               printk(KERN_NOTICE "asic3: irq type not changed.\n");
+               dev_notice(asic->dev, "irq type not changed\n");
        }
-       asic3_write_register(asic, bank + ASIC3_GPIO_LevelTrigger,
+       asic3_write_register(asic, bank + ASIC3_GPIO_LEVEL_TRIGGER,
                             level);
-       asic3_write_register(asic, bank + ASIC3_GPIO_EdgeTrigger,
+       asic3_write_register(asic, bank + ASIC3_GPIO_EDGE_TRIGGER,
                             edge);
-       asic3_write_register(asic, bank + ASIC3_GPIO_TriggerType,
+       asic3_write_register(asic, bank + ASIC3_GPIO_TRIGGER_TYPE,
                             trigger);
        spin_unlock_irqrestore(&asic->lock, flags);
        return 0;
@@ -295,15 +372,17 @@ static struct irq_chip asic3_irq_chip = {
        .unmask         = asic3_unmask_irq,
 };
 
-static int asic3_irq_probe(struct platform_device *pdev)
+static int __init asic3_irq_probe(struct platform_device *pdev)
 {
        struct asic3 *asic = platform_get_drvdata(pdev);
        unsigned long clksel = 0;
        unsigned int irq, irq_base;
+       int ret;
 
-       asic->irq_nr = platform_get_irq(pdev, 0);
-       if (asic->irq_nr < 0)
-               return asic->irq_nr;
+       ret = platform_get_irq(pdev, 0);
+       if (ret < 0)
+               return ret;
+       asic->irq_nr = ret;
 
        /* turn on clock to IRQ controller */
        clksel |= CLOCK_SEL_CX;
@@ -323,11 +402,11 @@ static int asic3_irq_probe(struct platform_device *pdev)
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
        }
 
-       asic3_write_register(asic, ASIC3_OFFSET(INTR, IntMask),
+       asic3_write_register(asic, ASIC3_OFFSET(INTR, INT_MASK),
                             ASIC3_INTMASK_GINTMASK);
 
        set_irq_chained_handler(asic->irq_nr, asic3_irq_demux);
-       set_irq_type(asic->irq_nr, IRQT_RISING);
+       set_irq_type(asic->irq_nr, IRQ_TYPE_EDGE_RISING);
        set_irq_data(asic->irq_nr, asic);
 
        return 0;
@@ -350,149 +429,439 @@ static void asic3_irq_remove(struct platform_device *pdev)
 }
 
 /* GPIOs */
-static inline u32 asic3_get_gpio(struct asic3 *asic, unsigned int base,
-                                unsigned int function)
-{
-       return asic3_read_register(asic, base + function);
-}
-
-static void asic3_set_gpio(struct asic3 *asic, unsigned int base,
-                          unsigned int function, u32 bits, u32 val)
+static int asic3_gpio_direction(struct gpio_chip *chip,
+                               unsigned offset, int out)
 {
+       u32 mask = ASIC3_GPIO_TO_MASK(offset), out_reg;
+       unsigned int gpio_base;
        unsigned long flags;
+       struct asic3 *asic;
+
+       asic = container_of(chip, struct asic3, gpio);
+       gpio_base = ASIC3_GPIO_TO_BASE(offset);
+
+       if (gpio_base > ASIC3_GPIO_D_BASE) {
+               dev_err(asic->dev, "Invalid base (0x%x) for gpio %d\n",
+                       gpio_base, offset);
+               return -EINVAL;
+       }
 
        spin_lock_irqsave(&asic->lock, flags);
-       val |= (asic3_read_register(asic, base + function) & ~bits);
 
-       asic3_write_register(asic, base + function, val);
+       out_reg = asic3_read_register(asic, gpio_base + ASIC3_GPIO_DIRECTION);
+
+       /* Input is 0, Output is 1 */
+       if (out)
+               out_reg |= mask;
+       else
+               out_reg &= ~mask;
+
+       asic3_write_register(asic, gpio_base + ASIC3_GPIO_DIRECTION, out_reg);
+
        spin_unlock_irqrestore(&asic->lock, flags);
+
+       return 0;
+
+}
+
+static int asic3_gpio_direction_input(struct gpio_chip *chip,
+                                     unsigned offset)
+{
+       return asic3_gpio_direction(chip, offset, 0);
+}
+
+static int asic3_gpio_direction_output(struct gpio_chip *chip,
+                                      unsigned offset, int value)
+{
+       return asic3_gpio_direction(chip, offset, 1);
 }
 
-#define asic3_get_gpio_a(asic, fn) \
-       asic3_get_gpio(asic, ASIC3_GPIO_A_Base, ASIC3_GPIO_##fn)
-#define asic3_get_gpio_b(asic, fn) \
-       asic3_get_gpio(asic, ASIC3_GPIO_B_Base, ASIC3_GPIO_##fn)
-#define asic3_get_gpio_c(asic, fn) \
-       asic3_get_gpio(asic, ASIC3_GPIO_C_Base, ASIC3_GPIO_##fn)
-#define asic3_get_gpio_d(asic, fn) \
-       asic3_get_gpio(asic, ASIC3_GPIO_D_Base, ASIC3_GPIO_##fn)
-
-#define asic3_set_gpio_a(asic, fn, bits, val) \
-       asic3_set_gpio(asic, ASIC3_GPIO_A_Base, ASIC3_GPIO_##fn, bits, val)
-#define asic3_set_gpio_b(asic, fn, bits, val) \
-       asic3_set_gpio(asic, ASIC3_GPIO_B_Base, ASIC3_GPIO_##fn, bits, val)
-#define asic3_set_gpio_c(asic, fn, bits, val) \
-       asic3_set_gpio(asic, ASIC3_GPIO_C_Base, ASIC3_GPIO_##fn, bits, val)
-#define asic3_set_gpio_d(asic, fn, bits, val) \
-       asic3_set_gpio(asic, ASIC3_GPIO_D_Base, ASIC3_GPIO_##fn, bits, val)
-
-#define asic3_set_gpio_banks(asic, fn, bits, pdata, field)               \
-       do {                                                              \
-            asic3_set_gpio_a((asic), fn, (bits), (pdata)->gpio_a.field); \
-            asic3_set_gpio_b((asic), fn, (bits), (pdata)->gpio_b.field); \
-            asic3_set_gpio_c((asic), fn, (bits), (pdata)->gpio_c.field); \
-            asic3_set_gpio_d((asic), fn, (bits), (pdata)->gpio_d.field); \
-       } while (0)
-
-int asic3_gpio_get_value(struct asic3 *asic, unsigned gpio)
-{
-       u32 mask = ASIC3_GPIO_bit(gpio);
-
-       switch (gpio >> 4) {
-       case ASIC3_GPIO_BANK_A:
-               return asic3_get_gpio_a(asic, Status) & mask;
-       case ASIC3_GPIO_BANK_B:
-               return asic3_get_gpio_b(asic, Status) & mask;
-       case ASIC3_GPIO_BANK_C:
-               return asic3_get_gpio_c(asic, Status) & mask;
-       case ASIC3_GPIO_BANK_D:
-               return asic3_get_gpio_d(asic, Status) & mask;
-       default:
-               printk(KERN_ERR "%s: invalid GPIO value 0x%x",
-                      __FUNCTION__, gpio);
+static int asic3_gpio_get(struct gpio_chip *chip,
+                         unsigned offset)
+{
+       unsigned int gpio_base;
+       u32 mask = ASIC3_GPIO_TO_MASK(offset);
+       struct asic3 *asic;
+
+       asic = container_of(chip, struct asic3, gpio);
+       gpio_base = ASIC3_GPIO_TO_BASE(offset);
+
+       if (gpio_base > ASIC3_GPIO_D_BASE) {
+               dev_err(asic->dev, "Invalid base (0x%x) for gpio %d\n",
+                       gpio_base, offset);
                return -EINVAL;
        }
+
+       return asic3_read_register(asic, gpio_base + ASIC3_GPIO_STATUS) & mask;
 }
-EXPORT_SYMBOL(asic3_gpio_get_value);
 
-void asic3_gpio_set_value(struct asic3 *asic, unsigned gpio, int val)
+static void asic3_gpio_set(struct gpio_chip *chip,
+                          unsigned offset, int value)
 {
-       u32 mask = ASIC3_GPIO_bit(gpio);
-       u32 bitval = 0;
-       if (val)
-               bitval = mask;
+       u32 mask, out_reg;
+       unsigned int gpio_base;
+       unsigned long flags;
+       struct asic3 *asic;
 
-       switch (gpio >> 4) {
-       case ASIC3_GPIO_BANK_A:
-               asic3_set_gpio_a(asic, Out, mask, bitval);
-               return;
-       case ASIC3_GPIO_BANK_B:
-               asic3_set_gpio_b(asic, Out, mask, bitval);
-               return;
-       case ASIC3_GPIO_BANK_C:
-               asic3_set_gpio_c(asic, Out, mask, bitval);
-               return;
-       case ASIC3_GPIO_BANK_D:
-               asic3_set_gpio_d(asic, Out, mask, bitval);
-               return;
-       default:
-               printk(KERN_ERR "%s: invalid GPIO value 0x%x",
-                      __FUNCTION__, gpio);
+       asic = container_of(chip, struct asic3, gpio);
+       gpio_base = ASIC3_GPIO_TO_BASE(offset);
+
+       if (gpio_base > ASIC3_GPIO_D_BASE) {
+               dev_err(asic->dev, "Invalid base (0x%x) for gpio %d\n",
+                       gpio_base, offset);
                return;
        }
+
+       mask = ASIC3_GPIO_TO_MASK(offset);
+
+       spin_lock_irqsave(&asic->lock, flags);
+
+       out_reg = asic3_read_register(asic, gpio_base + ASIC3_GPIO_OUT);
+
+       if (value)
+               out_reg |= mask;
+       else
+               out_reg &= ~mask;
+
+       asic3_write_register(asic, gpio_base + ASIC3_GPIO_OUT, out_reg);
+
+       spin_unlock_irqrestore(&asic->lock, flags);
+
+       return;
 }
-EXPORT_SYMBOL(asic3_gpio_set_value);
 
-static int asic3_gpio_probe(struct platform_device *pdev)
+static __init int asic3_gpio_probe(struct platform_device *pdev,
+                                  u16 *gpio_config, int num)
 {
-       struct asic3_platform_data *pdata = pdev->dev.platform_data;
        struct asic3 *asic = platform_get_drvdata(pdev);
+       u16 alt_reg[ASIC3_NUM_GPIO_BANKS];
+       u16 out_reg[ASIC3_NUM_GPIO_BANKS];
+       u16 dir_reg[ASIC3_NUM_GPIO_BANKS];
+       int i;
+
+       memset(alt_reg, 0, ASIC3_NUM_GPIO_BANKS * sizeof(u16));
+       memset(out_reg, 0, ASIC3_NUM_GPIO_BANKS * sizeof(u16));
+       memset(dir_reg, 0, ASIC3_NUM_GPIO_BANKS * sizeof(u16));
+
+       /* Enable all GPIOs */
+       asic3_write_register(asic, ASIC3_GPIO_OFFSET(A, MASK), 0xffff);
+       asic3_write_register(asic, ASIC3_GPIO_OFFSET(B, MASK), 0xffff);
+       asic3_write_register(asic, ASIC3_GPIO_OFFSET(C, MASK), 0xffff);
+       asic3_write_register(asic, ASIC3_GPIO_OFFSET(D, MASK), 0xffff);
+
+       for (i = 0; i < num; i++) {
+               u8 alt, pin, dir, init, bank_num, bit_num;
+               u16 config = gpio_config[i];
+
+               pin = ASIC3_CONFIG_GPIO_PIN(config);
+               alt = ASIC3_CONFIG_GPIO_ALT(config);
+               dir = ASIC3_CONFIG_GPIO_DIR(config);
+               init = ASIC3_CONFIG_GPIO_INIT(config);
+
+               bank_num = ASIC3_GPIO_TO_BANK(pin);
+               bit_num = ASIC3_GPIO_TO_BIT(pin);
+
+               alt_reg[bank_num] |= (alt << bit_num);
+               out_reg[bank_num] |= (init << bit_num);
+               dir_reg[bank_num] |= (dir << bit_num);
+       }
 
-       asic3_write_register(asic, ASIC3_GPIO_OFFSET(A, Mask), 0xffff);
-       asic3_write_register(asic, ASIC3_GPIO_OFFSET(B, Mask), 0xffff);
-       asic3_write_register(asic, ASIC3_GPIO_OFFSET(C, Mask), 0xffff);
-       asic3_write_register(asic, ASIC3_GPIO_OFFSET(D, Mask), 0xffff);
-
-       asic3_set_gpio_a(asic, SleepMask, 0xffff, 0xffff);
-       asic3_set_gpio_b(asic, SleepMask, 0xffff, 0xffff);
-       asic3_set_gpio_c(asic, SleepMask, 0xffff, 0xffff);
-       asic3_set_gpio_d(asic, SleepMask, 0xffff, 0xffff);
-
-       if (pdata) {
-               asic3_set_gpio_banks(asic, Out, 0xffff, pdata, init);
-               asic3_set_gpio_banks(asic, Direction, 0xffff, pdata, dir);
-               asic3_set_gpio_banks(asic, SleepMask, 0xffff, pdata,
-                                    sleep_mask);
-               asic3_set_gpio_banks(asic, SleepOut, 0xffff, pdata, sleep_out);
-               asic3_set_gpio_banks(asic, BattFaultOut, 0xffff, pdata,
-                                    batt_fault_out);
-               asic3_set_gpio_banks(asic, SleepConf, 0xffff, pdata,
-                                    sleep_conf);
-               asic3_set_gpio_banks(asic, AltFunction, 0xffff, pdata,
-                                    alt_function);
+       for (i = 0; i < ASIC3_NUM_GPIO_BANKS; i++) {
+               asic3_write_register(asic,
+                                    ASIC3_BANK_TO_BASE(i) +
+                                    ASIC3_GPIO_DIRECTION,
+                                    dir_reg[i]);
+               asic3_write_register(asic,
+                                    ASIC3_BANK_TO_BASE(i) + ASIC3_GPIO_OUT,
+                                    out_reg[i]);
+               asic3_write_register(asic,
+                                    ASIC3_BANK_TO_BASE(i) +
+                                    ASIC3_GPIO_ALT_FUNCTION,
+                                    alt_reg[i]);
        }
 
+       return gpiochip_add(&asic->gpio);
+}
+
+static int asic3_gpio_remove(struct platform_device *pdev)
+{
+       struct asic3 *asic = platform_get_drvdata(pdev);
+
+       return gpiochip_remove(&asic->gpio);
+}
+
+static int asic3_clk_enable(struct asic3 *asic, struct asic3_clk *clk)
+{
+       unsigned long flags;
+       u32 cdex;
+
+       spin_lock_irqsave(&asic->lock, flags);
+       if (clk->enabled++ == 0) {
+               cdex = asic3_read_register(asic, ASIC3_OFFSET(CLOCK, CDEX));
+               cdex |= clk->cdex;
+               asic3_write_register(asic, ASIC3_OFFSET(CLOCK, CDEX), cdex);
+       }
+       spin_unlock_irqrestore(&asic->lock, flags);
+
        return 0;
 }
 
-static void asic3_gpio_remove(struct platform_device *pdev)
+static void asic3_clk_disable(struct asic3 *asic, struct asic3_clk *clk)
 {
-       return;
+       unsigned long flags;
+       u32 cdex;
+
+       WARN_ON(clk->enabled == 0);
+
+       spin_lock_irqsave(&asic->lock, flags);
+       if (--clk->enabled == 0) {
+               cdex = asic3_read_register(asic, ASIC3_OFFSET(CLOCK, CDEX));
+               cdex &= ~clk->cdex;
+               asic3_write_register(asic, ASIC3_OFFSET(CLOCK, CDEX), cdex);
+       }
+       spin_unlock_irqrestore(&asic->lock, flags);
 }
 
+/* MFD cells (SPI, PWM, LED, DS1WM, MMC) */
+static struct ds1wm_driver_data ds1wm_pdata = {
+       .active_high = 1,
+};
+
+static struct resource ds1wm_resources[] = {
+       {
+               .start = ASIC3_OWM_BASE,
+               .end   = ASIC3_OWM_BASE + 0x13,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = ASIC3_IRQ_OWM,
+               .start = ASIC3_IRQ_OWM,
+               .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
+       },
+};
+
+static int ds1wm_enable(struct platform_device *pdev)
+{
+       struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
+
+       /* Turn on external clocks and the OWM clock */
+       asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_EX0]);
+       asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_EX1]);
+       asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_OWM]);
+       msleep(1);
+
+       /* Reset and enable DS1WM */
+       asic3_set_register(asic, ASIC3_OFFSET(EXTCF, RESET),
+                          ASIC3_EXTCF_OWM_RESET, 1);
+       msleep(1);
+       asic3_set_register(asic, ASIC3_OFFSET(EXTCF, RESET),
+                          ASIC3_EXTCF_OWM_RESET, 0);
+       msleep(1);
+       asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT),
+                          ASIC3_EXTCF_OWM_EN, 1);
+       msleep(1);
+
+       return 0;
+}
+
+static int ds1wm_disable(struct platform_device *pdev)
+{
+       struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
+
+       asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT),
+                          ASIC3_EXTCF_OWM_EN, 0);
+
+       asic3_clk_disable(asic, &asic->clocks[ASIC3_CLOCK_OWM]);
+       asic3_clk_disable(asic, &asic->clocks[ASIC3_CLOCK_EX0]);
+       asic3_clk_disable(asic, &asic->clocks[ASIC3_CLOCK_EX1]);
+
+       return 0;
+}
+
+static struct mfd_cell asic3_cell_ds1wm = {
+       .name          = "ds1wm",
+       .enable        = ds1wm_enable,
+       .disable       = ds1wm_disable,
+       .driver_data   = &ds1wm_pdata,
+       .num_resources = ARRAY_SIZE(ds1wm_resources),
+       .resources     = ds1wm_resources,
+};
+
+static void asic3_mmc_pwr(struct platform_device *pdev, int state)
+{
+       struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
+
+       tmio_core_mmc_pwr(asic->tmio_cnf, 1 - asic->bus_shift, state);
+}
+
+static void asic3_mmc_clk_div(struct platform_device *pdev, int state)
+{
+       struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
+
+       tmio_core_mmc_clk_div(asic->tmio_cnf, 1 - asic->bus_shift, state);
+}
+
+static struct tmio_mmc_data asic3_mmc_data = {
+       .hclk           = 24576000,
+       .set_pwr        = asic3_mmc_pwr,
+       .set_clk_div    = asic3_mmc_clk_div,
+};
+
+static struct resource asic3_mmc_resources[] = {
+       {
+               .start = ASIC3_SD_CTRL_BASE,
+               .end   = ASIC3_SD_CTRL_BASE + 0x3ff,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = 0,
+               .end   = 0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static int asic3_mmc_enable(struct platform_device *pdev)
+{
+       struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
+
+       /* Not sure if it must be done bit by bit, but leaving as-is */
+       asic3_set_register(asic, ASIC3_OFFSET(SDHWCTRL, SDCONF),
+                          ASIC3_SDHWCTRL_LEVCD, 1);
+       asic3_set_register(asic, ASIC3_OFFSET(SDHWCTRL, SDCONF),
+                          ASIC3_SDHWCTRL_LEVWP, 1);
+       asic3_set_register(asic, ASIC3_OFFSET(SDHWCTRL, SDCONF),
+                          ASIC3_SDHWCTRL_SUSPEND, 0);
+       asic3_set_register(asic, ASIC3_OFFSET(SDHWCTRL, SDCONF),
+                          ASIC3_SDHWCTRL_PCLR, 0);
+
+       asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_EX0]);
+       /* CLK32 used for card detection and for interruption detection
+        * when HCLK is stopped.
+        */
+       asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_EX1]);
+       msleep(1);
+
+       /* HCLK 24.576 MHz, BCLK 12.288 MHz: */
+       asic3_write_register(asic, ASIC3_OFFSET(CLOCK, SEL),
+               CLOCK_SEL_CX | CLOCK_SEL_SD_HCLK_SEL);
+
+       asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_SD_HOST]);
+       asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_SD_BUS]);
+       msleep(1);
+
+       asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT),
+                          ASIC3_EXTCF_SD_MEM_ENABLE, 1);
+
+       /* Enable SD card slot 3.3V power supply */
+       asic3_set_register(asic, ASIC3_OFFSET(SDHWCTRL, SDCONF),
+                          ASIC3_SDHWCTRL_SDPWR, 1);
+
+       /* ASIC3_SD_CTRL_BASE assumes 32-bit addressing, TMIO is 16-bit */
+       tmio_core_mmc_enable(asic->tmio_cnf, 1 - asic->bus_shift,
+                            ASIC3_SD_CTRL_BASE >> 1);
+
+       return 0;
+}
+
+static int asic3_mmc_disable(struct platform_device *pdev)
+{
+       struct asic3 *asic = dev_get_drvdata(pdev->dev.parent);
+
+       /* Put in suspend mode */
+       asic3_set_register(asic, ASIC3_OFFSET(SDHWCTRL, SDCONF),
+                          ASIC3_SDHWCTRL_SUSPEND, 1);
+
+       /* Disable clocks */
+       asic3_clk_disable(asic, &asic->clocks[ASIC3_CLOCK_SD_HOST]);
+       asic3_clk_disable(asic, &asic->clocks[ASIC3_CLOCK_SD_BUS]);
+       asic3_clk_disable(asic, &asic->clocks[ASIC3_CLOCK_EX0]);
+       asic3_clk_disable(asic, &asic->clocks[ASIC3_CLOCK_EX1]);
+       return 0;
+}
+
+static struct mfd_cell asic3_cell_mmc = {
+       .name          = "tmio-mmc",
+       .enable        = asic3_mmc_enable,
+       .disable       = asic3_mmc_disable,
+       .driver_data   = &asic3_mmc_data,
+       .num_resources = ARRAY_SIZE(asic3_mmc_resources),
+       .resources     = asic3_mmc_resources,
+};
+
+static int __init asic3_mfd_probe(struct platform_device *pdev,
+                                 struct resource *mem)
+{
+       struct asic3 *asic = platform_get_drvdata(pdev);
+       struct resource *mem_sdio;
+       int irq, ret;
+
+       mem_sdio = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+       if (!mem_sdio)
+               dev_dbg(asic->dev, "no SDIO MEM resource\n");
+
+       irq = platform_get_irq(pdev, 1);
+       if (irq < 0)
+               dev_dbg(asic->dev, "no SDIO IRQ resource\n");
+
+       /* DS1WM */
+       asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT),
+                          ASIC3_EXTCF_OWM_SMB, 0);
+
+       ds1wm_resources[0].start >>= asic->bus_shift;
+       ds1wm_resources[0].end   >>= asic->bus_shift;
+
+       asic3_cell_ds1wm.platform_data = &asic3_cell_ds1wm;
+       asic3_cell_ds1wm.data_size = sizeof(asic3_cell_ds1wm);
+
+       /* MMC */
+       asic->tmio_cnf = ioremap((ASIC3_SD_CONFIG_BASE >> asic->bus_shift) +
+                                mem_sdio->start, 0x400 >> asic->bus_shift);
+       if (!asic->tmio_cnf) {
+               ret = -ENOMEM;
+               dev_dbg(asic->dev, "Couldn't ioremap SD_CONFIG\n");
+               goto out;
+       }
+       asic3_mmc_resources[0].start >>= asic->bus_shift;
+       asic3_mmc_resources[0].end   >>= asic->bus_shift;
+
+       asic3_cell_mmc.platform_data = &asic3_cell_mmc;
+       asic3_cell_mmc.data_size = sizeof(asic3_cell_mmc);
+
+       ret = mfd_add_devices(&pdev->dev, pdev->id,
+                       &asic3_cell_ds1wm, 1, mem, asic->irq_base);
+       if (ret < 0)
+               goto out;
+
+       if (mem_sdio && (irq >= 0))
+               ret = mfd_add_devices(&pdev->dev, pdev->id,
+                       &asic3_cell_mmc, 1, mem_sdio, irq);
+
+ out:
+       return ret;
+}
+
+static void asic3_mfd_remove(struct platform_device *pdev)
+{
+       struct asic3 *asic = platform_get_drvdata(pdev);
+
+       mfd_remove_devices(&pdev->dev);
+       iounmap(asic->tmio_cnf);
+}
 
 /* Core */
-static int asic3_probe(struct platform_device *pdev)
+static int __init asic3_probe(struct platform_device *pdev)
 {
        struct asic3_platform_data *pdata = pdev->dev.platform_data;
        struct asic3 *asic;
        struct resource *mem;
        unsigned long clksel;
-       int ret;
+       int ret = 0;
 
        asic = kzalloc(sizeof(struct asic3), GFP_KERNEL);
-       if (!asic)
+       if (asic == NULL) {
+               printk(KERN_ERR "kzalloc failed\n");
                return -ENOMEM;
+       }
 
        spin_lock_init(&asic->lock);
        platform_set_drvdata(pdev, asic);
@@ -501,59 +870,79 @@ static int asic3_probe(struct platform_device *pdev)
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!mem) {
                ret = -ENOMEM;
-               printk(KERN_ERR "asic3: no MEM resource\n");
-               goto err_out_1;
+               dev_err(asic->dev, "no MEM resource\n");
+               goto out_free;
        }
 
-       asic->mapping = ioremap(mem->start, PAGE_SIZE);
+       asic->mapping = ioremap(mem->start, resource_size(mem));
        if (!asic->mapping) {
                ret = -ENOMEM;
-               printk(KERN_ERR "asic3: couldn't ioremap\n");
-               goto err_out_1;
+               dev_err(asic->dev, "Couldn't ioremap\n");
+               goto out_free;
        }
 
        asic->irq_base = pdata->irq_base;
 
-       if (pdata && pdata->bus_shift)
-               asic->bus_shift = 2 - pdata->bus_shift;
-       else
-               asic->bus_shift = 0;
+       /* calculate bus shift from mem resource */
+       asic->bus_shift = 2 - (resource_size(mem) >> 12);
 
        clksel = 0;
        asic3_write_register(asic, ASIC3_OFFSET(CLOCK, SEL), clksel);
 
        ret = asic3_irq_probe(pdev);
        if (ret < 0) {
-               printk(KERN_ERR "asic3: couldn't probe IRQs\n");
-               goto err_out_2;
+               dev_err(asic->dev, "Couldn't probe IRQs\n");
+               goto out_unmap;
        }
-       asic3_gpio_probe(pdev);
 
-       if (pdata->children) {
-               int i;
-               for (i = 0; i < pdata->n_children; i++) {
-                       pdata->children[i]->dev.parent = &pdev->dev;
-                       platform_device_register(pdata->children[i]);
-               }
+       asic->gpio.base = pdata->gpio_base;
+       asic->gpio.ngpio = ASIC3_NUM_GPIOS;
+       asic->gpio.get = asic3_gpio_get;
+       asic->gpio.set = asic3_gpio_set;
+       asic->gpio.direction_input = asic3_gpio_direction_input;
+       asic->gpio.direction_output = asic3_gpio_direction_output;
+
+       ret = asic3_gpio_probe(pdev,
+                              pdata->gpio_config,
+                              pdata->gpio_config_num);
+       if (ret < 0) {
+               dev_err(asic->dev, "GPIO probe failed\n");
+               goto out_irq;
        }
 
-       printk(KERN_INFO "ASIC3 Core driver\n");
+       /* Making a per-device copy is only needed for the
+        * theoretical case of multiple ASIC3s on one board:
+        */
+       memcpy(asic->clocks, asic3_clk_init, sizeof(asic3_clk_init));
+
+       asic3_mfd_probe(pdev, mem);
+
+       dev_info(asic->dev, "ASIC3 Core driver\n");
 
        return 0;
 
- err_out_2:
+ out_irq:
+       asic3_irq_remove(pdev);
+
+ out_unmap:
        iounmap(asic->mapping);
- err_out_1:
+
+ out_free:
        kfree(asic);
 
        return ret;
 }
 
-static int asic3_remove(struct platform_device *pdev)
+static int __devexit asic3_remove(struct platform_device *pdev)
 {
+       int ret;
        struct asic3 *asic = platform_get_drvdata(pdev);
 
-       asic3_gpio_remove(pdev);
+       asic3_mfd_remove(pdev);
+
+       ret = asic3_gpio_remove(pdev);
+       if (ret < 0)
+               return ret;
        asic3_irq_remove(pdev);
 
        asic3_write_register(asic, ASIC3_OFFSET(CLOCK, SEL), 0);
@@ -573,7 +962,6 @@ static struct platform_driver asic3_device_driver = {
        .driver         = {
                .name   = "asic3",
        },
-       .probe          = asic3_probe,
        .remove         = __devexit_p(asic3_remove),
        .shutdown       = asic3_shutdown,
 };
@@ -581,7 +969,7 @@ static struct platform_driver asic3_device_driver = {
 static int __init asic3_init(void)
 {
        int retval = 0;
-       retval = platform_driver_register(&asic3_device_driver);
+       retval = platform_driver_probe(&asic3_device_driver, asic3_probe);
        return retval;
 }