mfd: driver for the TC6387XB TMIO controller.

This patch adds support for the TC6387XB. Unlike other TMIO devices this one
has only one subdevice and no interrupt mux, however using the MFD framework
allows it to share the TMIO MMC driver.

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

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index fc7c919..5beff5b 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -56,6 +56,12 @@ config MFD_T7L66XB
        help
          Support for Toshiba Mobile IO Controller T7L66XB
 
+config MFD_TC6387XB
+       bool "Support Toshiba TC6387XB"
+       select MFD_CORE
+       help
+         Support for Toshiba Mobile IO Controller TC6387XB
+
 config MFD_TC6393XB
        bool "Support Toshiba TC6393XB"
        depends on GPIOLIB && ARM

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 3531ad2..03ad239 100644 (file)
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_HTC_EGPIO)         += htc-egpio.o
 obj-$(CONFIG_HTC_PASIC3)       += htc-pasic3.o
 
 obj-$(CONFIG_MFD_T7L66XB)      += t7l66xb.o
+obj-$(CONFIG_MFD_TC6387XB)     += tc6387xb.o
 obj-$(CONFIG_MFD_TC6393XB)     += tc6393xb.o
 
 obj-$(CONFIG_MFD_CORE)         += mfd-core.o

diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
new file mode 100644 (file)
index 0000000..03718fe
--- /dev/null
+++ b/drivers/mfd/tc6387xb.c
@@ -0,0 +1,172 @@
+/*
+ * Toshiba TC6387XB support
+ * Copyright (c) 2005 Ian Molton
+ *
+ * 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.
+ *
+ * This file contains TC6387XB base support.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/err.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/tmio.h>
+#include <linux/mfd/tc6387xb.h>
+
+#ifdef CONFIG_PM
+static int tc6387xb_suspend(struct platform_device *dev, pm_message_t state)
+{
+       struct tc6387xb_platform_data *pdata = platform_get_drvdata(dev);
+
+       if (pdata && pdata->suspend)
+               pdata->suspend(dev);
+
+       return 0;
+}
+
+static int tc6387xb_resume(struct platform_device *dev)
+{
+       struct tc6387xb_platform_data *pdata = platform_get_drvdata(dev);
+
+       if (pdata && pdata->resume)
+               pdata->resume(dev);
+
+       return 0;
+}
+#else
+#define tc6387xb_suspend  NULL
+#define tc6387xb_resume   NULL
+#endif
+
+/*--------------------------------------------------------------------------*/
+
+static int tc6387xb_mmc_enable(struct platform_device *mmc)
+{
+       struct platform_device *dev      = to_platform_device(mmc->dev.parent);
+       struct tc6387xb_platform_data *tc6387xb = dev->dev.platform_data;
+
+       if (tc6387xb->enable_clk32k)
+               tc6387xb->enable_clk32k(dev);
+
+       return 0;
+}
+
+static int tc6387xb_mmc_disable(struct platform_device *mmc)
+{
+       struct platform_device *dev      = to_platform_device(mmc->dev.parent);
+       struct tc6387xb_platform_data *tc6387xb = dev->dev.platform_data;
+
+       if (tc6387xb->disable_clk32k)
+               tc6387xb->disable_clk32k(dev);
+
+       return 0;
+}
+
+/*--------------------------------------------------------------------------*/
+
+static struct resource tc6387xb_mmc_resources[] = {
+       {
+               .start = 0x800,
+               .end   = 0x9ff,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = 0x200,
+               .end   = 0x2ff,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = 0,
+               .end   = 0,
+               .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct mfd_cell tc6387xb_cells[] = {
+       {
+               .name = "tmio-mmc",
+               .enable = tc6387xb_mmc_enable,
+               .disable = tc6387xb_mmc_disable,
+               .num_resources = ARRAY_SIZE(tc6387xb_mmc_resources),
+               .resources = tc6387xb_mmc_resources,
+       },
+};
+
+static int tc6387xb_probe(struct platform_device *dev)
+{
+       struct tc6387xb_platform_data *data = platform_get_drvdata(dev);
+       struct resource *iomem;
+       int irq, ret;
+
+       iomem = platform_get_resource(dev, IORESOURCE_MEM, 0);
+       if (!iomem) {
+               ret = -EINVAL;
+               goto err_resource;
+       }
+
+       ret  = platform_get_irq(dev, 0);
+       if (ret >= 0)
+               irq = ret;
+       else
+               goto err_resource;
+
+       if (data && data->enable)
+               data->enable(dev);
+
+       printk(KERN_INFO "Toshiba tc6387xb initialised\n");
+
+       ret = mfd_add_devices(dev, tc6387xb_cells,
+               ARRAY_SIZE(tc6387xb_cells), iomem, irq);
+
+       if (!ret)
+               return 0;
+
+err_resource:
+       return ret;
+}
+
+static int tc6387xb_remove(struct platform_device *dev)
+{
+       struct tc6387xb_platform_data *data = platform_get_drvdata(dev);
+
+       if (data && data->disable)
+               data->disable(dev);
+
+       /* FIXME - free the resources! */
+
+       return 0;
+}
+
+
+static struct platform_driver tc6387xb_platform_driver = {
+       .driver = {
+               .name           = "tc6387xb",
+       },
+       .probe          = tc6387xb_probe,
+       .remove         = tc6387xb_remove,
+       .suspend        = tc6387xb_suspend,
+       .resume         = tc6387xb_resume,
+};
+
+
+static int __init tc6387xb_init(void)
+{
+       return platform_driver_register(&tc6387xb_platform_driver);
+}
+
+static void __exit tc6387xb_exit(void)
+{
+       platform_driver_unregister(&tc6387xb_platform_driver);
+}
+
+module_init(tc6387xb_init);
+module_exit(tc6387xb_exit);
+
+MODULE_DESCRIPTION("Toshiba TC6387XB core driver");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Ian Molton");
+MODULE_ALIAS("platform:tc6387xb");

diff --git a/include/linux/mfd/tc6387xb.h b/include/linux/mfd/tc6387xb.h
new file mode 100644 (file)
index 0000000..fa06e06
--- /dev/null
+++ b/include/linux/mfd/tc6387xb.h
@@ -0,0 +1,23 @@
+/*
+ * This file contains the definitions for the TC6387XB
+ *
+ * (C) Copyright 2005 Ian Molton <spyro@f2s.com>
+ *
+ * May be copied or modified under the terms of the GNU General Public
+ * License.  See linux/COPYING for more information.
+ *
+ */
+#ifndef MFD_TC6387XB_H
+#define MFD_TC6387XB_H
+
+struct tc6387xb_platform_data {
+       int (*enable_clk32k)(struct platform_device *dev);
+       void (*disable_clk32k)(struct platform_device *dev);
+
+       int (*enable)(struct platform_device *dev);
+       int (*disable)(struct platform_device *dev);
+       int (*suspend)(struct platform_device *dev);
+       int (*resume)(struct platform_device *dev);
+};
+
+#endif