Platform: OLPC: turn EC driver into a platform_driver

The 1.75-based OLPC EC driver already does this; let's do it for all EC
drivers.  This gives us nice suspend/resume hooks, amongst other things.

We want to run the EC's suspend hooks later than other drivers (which may
be setting wakeup masks or be running EC commands).  We also want to run
the EC's resume hooks earlier than other drivers (which may want to run EC
commands).

Signed-off-by: Andres Salomon <dilinger@queued.net>
Acked-by: Paul Fox <pgf@laptop.org>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc-ec.c
index 44e6a4fae79b60c36bcac75c0a74b327ff7d4dd0..d00523c65191a9978adcd7b6f97efa8335fcfea2 100644 (file)
--- a/drivers/platform/olpc/olpc-ec.c
+++ b/drivers/platform/olpc/olpc-ec.c
@@ -8,6 +8,7 @@
 #include <linux/completion.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
+#include <linux/platform_device.h>
 #include <linux/workqueue.h>
 #include <linux/module.h>
 #include <linux/list.h>
@@ -122,3 +123,50 @@ int olpc_ec_cmd(u8 cmd, u8 *inbuf, size_t inlen, u8 *outbuf, size_t outlen)
        return desc.err;
 }
 EXPORT_SYMBOL_GPL(olpc_ec_cmd);
+
+static int olpc_ec_probe(struct platform_device *pdev)
+{
+       int err;
+
+       if (!ec_driver)
+               return -ENODEV;
+
+       err = ec_driver->probe ? ec_driver->probe(pdev) : 0;
+
+       return err;
+}
+
+static int olpc_ec_suspend(struct device *dev)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       return ec_driver->suspend ? ec_driver->suspend(pdev) : 0;
+}
+
+static int olpc_ec_resume(struct device *dev)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       return ec_driver->resume ? ec_driver->resume(pdev) : 0;
+}
+
+static const struct dev_pm_ops olpc_ec_pm_ops = {
+       .suspend_late = olpc_ec_suspend,
+       .resume_early = olpc_ec_resume,
+};
+
+static struct platform_driver olpc_ec_plat_driver = {
+       .probe = olpc_ec_probe,
+       .driver = {
+               .name = "olpc-ec",
+               .pm = &olpc_ec_pm_ops,
+       },
+};
+
+static int __init olpc_ec_init_module(void)
+{
+       return platform_driver_register(&olpc_ec_plat_driver);
+}
+
+module_init(olpc_ec_init_module);
+
+MODULE_AUTHOR("Andres Salomon <dilinger@queued.net>");
+MODULE_LICENSE("GPL");

diff --git a/include/linux/olpc-ec.h b/include/linux/olpc-ec.h
index 231e96f5dfe268046868083b75c3bed7f851534a..5bb6e760aa61220813ac8e1c29b47cf29660f37c 100644 (file)
--- a/include/linux/olpc-ec.h
+++ b/include/linux/olpc-ec.h
@@ -14,7 +14,13 @@
 #define EC_SCI_QUERY                   0x84
 #define EC_EXT_SCI_QUERY               0x85
 
+struct platform_device;
+
 struct olpc_ec_driver {
+       int (*probe)(struct platform_device *);
+       int (*suspend)(struct platform_device *);
+       int (*resume)(struct platform_device *);
+
        int (*ec_cmd)(u8, u8 *, size_t, u8 *, size_t, void *);
 };