git://ftp.safe.ca / safe / jmp / linux-2.6 / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rtc-isl1208: use sysfs_{create/remove}_group
[safe/jmp/linux-2.6] / drivers / mfd / tc6393xb.c
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 6197db7..fcf9068 100644 (file)
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -25,6 +25,7 @@
 #include <linux/mfd/tmio.h>
 #include <linux/mfd/tc6393xb.h>
 #include <linux/gpio.h>
+#include <linux/slab.h>
 
 #define SCR_REVID      0x08            /* b Revision ID        */
 #define SCR_ISR                0x50            /* b Interrupt Status   */
@@ -114,6 +115,7 @@ enum {
        TC6393XB_CELL_NAND,
        TC6393XB_CELL_MMC,
        TC6393XB_CELL_OHCI,
+       TC6393XB_CELL_FB,
 };
 
 /*--------------------------------------------------------------------------*/
@@ -160,18 +162,13 @@ static struct resource __devinitdata tc6393xb_mmc_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        {
-               .start  = 0x200,
-               .end    = 0x2ff,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
                .start  = IRQ_TC6393_MMC,
                .end    = IRQ_TC6393_MMC,
                .flags  = IORESOURCE_IRQ,
        },
 };
 
-const static struct resource tc6393xb_ohci_resources[] = {
+static const struct resource tc6393xb_ohci_resources[] = {
        {
                .start  = 0x3000,
                .end    = 0x31ff,
@@ -199,6 +196,29 @@ const static struct resource tc6393xb_ohci_resources[] = {
        },
 };
 
+static struct resource __devinitdata tc6393xb_fb_resources[] = {
+       {
+               .start  = 0x5000,
+               .end    = 0x51ff,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = 0x0500,
+               .end    = 0x05ff,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = 0x100000,
+               .end    = 0x1fffff,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = IRQ_TC6393_FB,
+               .end    = IRQ_TC6393_FB,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
 static int tc6393xb_ohci_enable(struct platform_device *dev)
 {
        struct tc6393xb *tc6393xb = dev_get_drvdata(dev->dev.parent);
@@ -243,6 +263,125 @@ static int tc6393xb_ohci_disable(struct platform_device *dev)
        return 0;
 }
 
+static int tc6393xb_fb_enable(struct platform_device *dev)
+{
+       struct tc6393xb *tc6393xb = dev_get_drvdata(dev->dev.parent);
+       unsigned long flags;
+       u16 ccr;
+
+       spin_lock_irqsave(&tc6393xb->lock, flags);
+
+       ccr = tmio_ioread16(tc6393xb->scr + SCR_CCR);
+       ccr &= ~SCR_CCR_MCLK_MASK;
+       ccr |= SCR_CCR_MCLK_48;
+       tmio_iowrite16(ccr, tc6393xb->scr + SCR_CCR);
+
+       spin_unlock_irqrestore(&tc6393xb->lock, flags);
+
+       return 0;
+}
+
+static int tc6393xb_fb_disable(struct platform_device *dev)
+{
+       struct tc6393xb *tc6393xb = dev_get_drvdata(dev->dev.parent);
+       unsigned long flags;
+       u16 ccr;
+
+       spin_lock_irqsave(&tc6393xb->lock, flags);
+
+       ccr = tmio_ioread16(tc6393xb->scr + SCR_CCR);
+       ccr &= ~SCR_CCR_MCLK_MASK;
+       ccr |= SCR_CCR_MCLK_OFF;
+       tmio_iowrite16(ccr, tc6393xb->scr + SCR_CCR);
+
+       spin_unlock_irqrestore(&tc6393xb->lock, flags);
+
+       return 0;
+}
+
+int tc6393xb_lcd_set_power(struct platform_device *fb, bool on)
+{
+       struct platform_device *dev = to_platform_device(fb->dev.parent);
+       struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
+       u8 fer;
+       unsigned long flags;
+
+       spin_lock_irqsave(&tc6393xb->lock, flags);
+
+       fer = ioread8(tc6393xb->scr + SCR_FER);
+       if (on)
+               fer |= SCR_FER_SLCDEN;
+       else
+               fer &= ~SCR_FER_SLCDEN;
+       iowrite8(fer, tc6393xb->scr + SCR_FER);
+
+       spin_unlock_irqrestore(&tc6393xb->lock, flags);
+
+       return 0;
+}
+EXPORT_SYMBOL(tc6393xb_lcd_set_power);
+
+int tc6393xb_lcd_mode(struct platform_device *fb,
+                                       const struct fb_videomode *mode) {
+       struct platform_device *dev = to_platform_device(fb->dev.parent);
+       struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
+       unsigned long flags;
+
+       spin_lock_irqsave(&tc6393xb->lock, flags);
+
+       iowrite16(mode->pixclock, tc6393xb->scr + SCR_PLL1CR + 0);
+       iowrite16(mode->pixclock >> 16, tc6393xb->scr + SCR_PLL1CR + 2);
+
+       spin_unlock_irqrestore(&tc6393xb->lock, flags);
+
+       return 0;
+}
+EXPORT_SYMBOL(tc6393xb_lcd_mode);
+
+static int tc6393xb_mmc_enable(struct platform_device *mmc)
+{
+       struct platform_device *dev = to_platform_device(mmc->dev.parent);
+       struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
+
+       tmio_core_mmc_enable(tc6393xb->scr + 0x200, 0,
+               tc6393xb_mmc_resources[0].start & 0xfffe);
+
+       return 0;
+}
+
+static int tc6393xb_mmc_resume(struct platform_device *mmc)
+{
+       struct platform_device *dev = to_platform_device(mmc->dev.parent);
+       struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
+
+       tmio_core_mmc_resume(tc6393xb->scr + 0x200, 0,
+               tc6393xb_mmc_resources[0].start & 0xfffe);
+
+       return 0;
+}
+
+static void tc6393xb_mmc_pwr(struct platform_device *mmc, int state)
+{
+       struct platform_device *dev = to_platform_device(mmc->dev.parent);
+       struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
+
+       tmio_core_mmc_pwr(tc6393xb->scr + 0x200, 0, state);
+}
+
+static void tc6393xb_mmc_clk_div(struct platform_device *mmc, int state)
+{
+       struct platform_device *dev = to_platform_device(mmc->dev.parent);
+       struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
+
+       tmio_core_mmc_clk_div(tc6393xb->scr + 0x200, 0, state);
+}
+
+static struct tmio_mmc_data tc6393xb_mmc_data = {
+       .hclk = 24000000,
+       .set_pwr = tc6393xb_mmc_pwr,
+       .set_clk_div = tc6393xb_mmc_clk_div,
+};
+
 static struct mfd_cell __devinitdata tc6393xb_cells[] = {
        [TC6393XB_CELL_NAND] = {
                .name = "tmio-nand",
@@ -252,6 +391,9 @@ static struct mfd_cell __devinitdata tc6393xb_cells[] = {
        },
        [TC6393XB_CELL_MMC] = {
                .name = "tmio-mmc",
+               .enable = tc6393xb_mmc_enable,
+               .resume = tc6393xb_mmc_resume,
+               .driver_data = &tc6393xb_mmc_data,
                .num_resources = ARRAY_SIZE(tc6393xb_mmc_resources),
                .resources = tc6393xb_mmc_resources,
        },
@@ -264,6 +406,15 @@ static struct mfd_cell __devinitdata tc6393xb_cells[] = {
                .resume = tc6393xb_ohci_enable,
                .disable = tc6393xb_ohci_disable,
        },
+       [TC6393XB_CELL_FB] = {
+               .name = "tmio-fb",
+               .num_resources = ARRAY_SIZE(tc6393xb_fb_resources),
+               .resources = tc6393xb_fb_resources,
+               .enable = tc6393xb_fb_enable,
+               .suspend = tc6393xb_fb_disable,
+               .resume = tc6393xb_fb_enable,
+               .disable = tc6393xb_fb_disable,
+       },
 };
 
 /*--------------------------------------------------------------------------*/
@@ -497,7 +648,7 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)
        if (ret)
                goto err_request_scr;
 
-       tc6393xb->scr = ioremap(rscr->start, rscr->end - rscr->start + 1);
+       tc6393xb->scr = ioremap(rscr->start, resource_size(rscr));
        if (!tc6393xb->scr) {
                ret = -ENOMEM;
                goto err_ioremap;
@@ -547,6 +698,7 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)
                &tc6393xb_cells[TC6393XB_CELL_NAND];
        tc6393xb_cells[TC6393XB_CELL_NAND].data_size =
                sizeof(tc6393xb_cells[TC6393XB_CELL_NAND]);
+
        tc6393xb_cells[TC6393XB_CELL_MMC].platform_data =
                &tc6393xb_cells[TC6393XB_CELL_MMC];
        tc6393xb_cells[TC6393XB_CELL_MMC].data_size =
@@ -557,6 +709,11 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)
        tc6393xb_cells[TC6393XB_CELL_OHCI].data_size =
                sizeof(tc6393xb_cells[TC6393XB_CELL_OHCI]);
 
+       tc6393xb_cells[TC6393XB_CELL_FB].driver_data = tcpd->fb_data;
+       tc6393xb_cells[TC6393XB_CELL_FB].platform_data =
+               &tc6393xb_cells[TC6393XB_CELL_FB];
+       tc6393xb_cells[TC6393XB_CELL_FB].data_size =
+               sizeof(tc6393xb_cells[TC6393XB_CELL_FB]);
 
        ret = mfd_add_devices(&dev->dev, dev->id,
                        tc6393xb_cells, ARRAY_SIZE(tc6393xb_cells),
@@ -717,3 +874,4 @@ MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Ian Molton, Dmitry Baryshkov and Dirk Opfer");
 MODULE_DESCRIPTION("tc6393xb Toshiba Mobile IO Controller");
 MODULE_ALIAS("platform:tc6393xb");
+
Full containers within linux kernel