Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...

[cascardo/linux.git] / arch / x86 / platform / olpc / olpc-xo1.c

diff --git a/arch/x86/platform/olpc/olpc-xo1.c b/arch/x86/platform/olpc/olpc-xo1.c
index 1277756..ab81fb2 100644 (file)
--- a/arch/x86/platform/olpc/olpc-xo1.c
+++ b/arch/x86/platform/olpc/olpc-xo1.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
+#include <linux/mfd/core.h>
 
 #include <asm/io.h>
 #include <asm/olpc.h>
@@ -56,25 +57,24 @@ static void xo1_power_off(void)
 static int __devinit olpc_xo1_probe(struct platform_device *pdev)
 {
        struct resource *res;
+       int err;
 
        /* don't run on non-XOs */
        if (!machine_is_olpc())
                return -ENODEV;
 
+       err = mfd_cell_enable(pdev);
+       if (err)
+               return err;
+
        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
        if (!res) {
                dev_err(&pdev->dev, "can't fetch device resource info\n");
                return -EIO;
        }
-
-       if (!request_region(res->start, resource_size(res), DRV_NAME)) {
-               dev_err(&pdev->dev, "can't request region\n");
-               return -EIO;
-       }
-
        if (strcmp(pdev->name, "cs5535-pms") == 0)
                pms_base = res->start;
-       else if (strcmp(pdev->name, "cs5535-acpi") == 0)
+       else if (strcmp(pdev->name, "olpc-xo1-pm-acpi") == 0)
                acpi_base = res->start;
 
        /* If we have both addresses, we can override the poweroff hook */
@@ -88,14 +88,11 @@ static int __devinit olpc_xo1_probe(struct platform_device *pdev)
 
 static int __devexit olpc_xo1_remove(struct platform_device *pdev)
 {
-       struct resource *r;
-
-       r = platform_get_resource(pdev, IORESOURCE_IO, 0);
-       release_region(r->start, resource_size(r));
+       mfd_cell_disable(pdev);
 
        if (strcmp(pdev->name, "cs5535-pms") == 0)
                pms_base = 0;
-       else if (strcmp(pdev->name, "cs5535-acpi") == 0)
+       else if (strcmp(pdev->name, "olpc-xo1-pm-acpi") == 0)
                acpi_base = 0;
 
        pm_power_off = NULL;
@@ -113,7 +110,7 @@ static struct platform_driver cs5535_pms_drv = {
 
 static struct platform_driver cs5535_acpi_drv = {
        .driver = {
-               .name = "cs5535-acpi",
+               .name = "olpc-xo1-pm-acpi",
                .owner = THIS_MODULE,
        },
        .probe = olpc_xo1_probe,
@@ -143,7 +140,7 @@ static void __exit olpc_xo1_exit(void)
 
 MODULE_AUTHOR("Daniel Drake <dsd@laptop.org>");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:olpc-xo1");
+MODULE_ALIAS("platform:cs5535-pms");
 
 module_init(olpc_xo1_init);
 module_exit(olpc_xo1_exit);