Restore __ALIGN_MASK()

[safe/jmp/linux-2.6] / drivers / mfd / t7l66xb.c

diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index 2d715fc..26d9176 100644 (file)
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -24,8 +24,10 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/err.h>
 #include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tmio.h>
@@ -36,6 +38,19 @@ enum {
        T7L66XB_CELL_MMC,
 };
 
+static const struct resource t7l66xb_mmc_resources[] = {
+       {
+               .start = 0x800,
+               .end    = 0x9ff,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = IRQ_T7L66XB_MMC,
+               .end    = IRQ_T7L66XB_MMC,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
 #define SCR_REVID      0x08            /* b Revision ID        */
 #define SCR_IMR                0x42            /* b Interrupt Mask     */
 #define SCR_DEV_CTL    0xe0            /* b Device control     */
@@ -56,6 +71,8 @@ struct t7l66xb {
        spinlock_t              lock;
 
        struct resource         rscr;
+       struct clk              *clk48m;
+       struct clk              *clk32k;
        int                     irq;
        int                     irq_base;
 };
@@ -65,13 +82,11 @@ struct t7l66xb {
 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);
+       clk_enable(t7l66xb->clk32k);
 
        spin_lock_irqsave(&t7l66xb->lock, flags);
 
@@ -81,13 +96,15 @@ static int t7l66xb_mmc_enable(struct platform_device *mmc)
 
        spin_unlock_irqrestore(&t7l66xb->lock, flags);
 
+       tmio_core_mmc_enable(t7l66xb->scr + 0x200, 0,
+               t7l66xb_mmc_resources[0].start & 0xfffe);
+
        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;
@@ -100,33 +117,36 @@ static int t7l66xb_mmc_disable(struct platform_device *mmc)
 
        spin_unlock_irqrestore(&t7l66xb->lock, flags);
 
-       if (pdata->disable_clk32k)
-               pdata->disable_clk32k(dev);
+       clk_disable(t7l66xb->clk32k);
 
        return 0;
 }
 
+static void t7l66xb_mmc_pwr(struct platform_device *mmc, int state)
+{
+       struct platform_device *dev = to_platform_device(mmc->dev.parent);
+       struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
+
+       tmio_core_mmc_pwr(t7l66xb->scr + 0x200, 0, state);
+}
+
+static void t7l66xb_mmc_clk_div(struct platform_device *mmc, int state)
+{
+       struct platform_device *dev = to_platform_device(mmc->dev.parent);
+       struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
+
+       tmio_core_mmc_clk_div(t7l66xb->scr + 0x200, 0, state);
+}
+
 /*--------------------------------------------------------------------------*/
 
-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,
-       },
+static struct tmio_mmc_data t7166xb_mmc_data = {
+       .hclk = 24000000,
+       .set_pwr = t7l66xb_mmc_pwr,
+       .set_clk_div = t7l66xb_mmc_clk_div,
 };
 
-const static struct resource t7l66xb_nand_resources[] = {
+static const struct resource t7l66xb_nand_resources[] = {
        {
                .start  = 0xc00,
                .end    = 0xc07,
@@ -149,6 +169,7 @@ static struct mfd_cell t7l66xb_cells[] = {
                .name = "tmio-mmc",
                .enable = t7l66xb_mmc_enable,
                .disable = t7l66xb_mmc_disable,
+               .driver_data = &t7166xb_mmc_data,
                .num_resources = ARRAY_SIZE(t7l66xb_mmc_resources),
                .resources = t7l66xb_mmc_resources,
        },
@@ -258,21 +279,28 @@ static void t7l66xb_detach_irq(struct platform_device *dev)
 #ifdef CONFIG_PM
 static int t7l66xb_suspend(struct platform_device *dev, pm_message_t state)
 {
+       struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
        struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
 
        if (pdata && pdata->suspend)
                pdata->suspend(dev);
+       clk_disable(t7l66xb->clk48m);
 
        return 0;
 }
 
 static int t7l66xb_resume(struct platform_device *dev)
 {
+       struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
        struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
 
+       clk_enable(t7l66xb->clk48m);
        if (pdata && pdata->resume)
                pdata->resume(dev);
 
+       tmio_core_mmc_enable(t7l66xb->scr + 0x200, 0,
+               t7l66xb_mmc_resources[0].start & 0xfffe);
+
        return 0;
 }
 #else
@@ -309,6 +337,19 @@ static int t7l66xb_probe(struct platform_device *dev)
 
        t7l66xb->irq_base = pdata->irq_base;
 
+       t7l66xb->clk32k = clk_get(&dev->dev, "CLK_CK32K");
+       if (IS_ERR(t7l66xb->clk32k)) {
+               ret = PTR_ERR(t7l66xb->clk32k);
+               goto err_clk32k_get;
+       }
+
+       t7l66xb->clk48m = clk_get(&dev->dev, "CLK_CK48M");
+       if (IS_ERR(t7l66xb->clk48m)) {
+               ret = PTR_ERR(t7l66xb->clk48m);
+               clk_put(t7l66xb->clk32k);
+               goto err_clk48m_get;
+       }
+
        rscr = &t7l66xb->rscr;
        rscr->name = "t7l66xb-core";
        rscr->start = iomem->start;
@@ -319,12 +360,14 @@ static int t7l66xb_probe(struct platform_device *dev)
        if (ret)
                goto err_request_scr;
 
-       t7l66xb->scr = ioremap(rscr->start, rscr->end - rscr->start + 1);
+       t7l66xb->scr = ioremap(rscr->start, resource_size(rscr));
        if (!t7l66xb->scr) {
                ret = -ENOMEM;
                goto err_ioremap;
        }
 
+       clk_enable(t7l66xb->clk48m);
+
        if (pdata && pdata->enable)
                pdata->enable(dev);
 
@@ -343,6 +386,11 @@ static int t7l66xb_probe(struct platform_device *dev)
        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);
@@ -354,8 +402,12 @@ static int t7l66xb_probe(struct platform_device *dev)
        iounmap(t7l66xb->scr);
 err_ioremap:
        release_resource(&t7l66xb->rscr);
-err_noirq:
 err_request_scr:
+       clk_put(t7l66xb->clk48m);
+err_clk48m_get:
+       clk_put(t7l66xb->clk32k);
+err_clk32k_get:
+err_noirq:
        kfree(t7l66xb);
        return ret;
 }
@@ -367,7 +419,8 @@ static int t7l66xb_remove(struct platform_device *dev)
        int ret;
 
        ret = pdata->disable(dev);
-
+       clk_disable(t7l66xb->clk48m);
+       clk_put(t7l66xb->clk48m);
        t7l66xb_detach_irq(dev);
        iounmap(t7l66xb->scr);
        release_resource(&t7l66xb->rscr);