summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2011-03-22 13:50:39 -0700
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-27 00:09:31 +0100
commitadfa4bd4a8bfc53ca7370c57be240d35c2ec28e2 (patch)
tree077f0fff75ca9b070aa76949900e7fe028c19901 /drivers/mfd
parentfa1df691688f34cbcd5bf77bd084bbe47e9d6bfe (diff)
downloadop-kernel-dev-adfa4bd4a8bfc53ca7370c57be240d35c2ec28e2.zip
op-kernel-dev-adfa4bd4a8bfc53ca7370c57be240d35c2ec28e2.tar.gz
mfd: OLPC: Clean up names to match what OLPC actually uses
The cs5535-pms cell doesn't actually need to be cloned, so we can drop that and simply have the olpc-xo1.c driver use "cs5535-pms" directly. Also, rename the cs5535-acpi clones to what we actually use for the (currently out-of-tree) SCI driver. In the process, that fixes a subtle bug in olpc-xo1.c which broke powerdown on XO-1s.. olpc-xo1-ac-acpi was a typo, not something that actually existed. Signed-off-by: Daniel Drake <dsd@laptop.org> Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/cs5535-mfd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
index 24959dd..155fa04 100644
--- a/drivers/mfd/cs5535-mfd.c
+++ b/drivers/mfd/cs5535-mfd.c
@@ -115,14 +115,12 @@ static __devinitdata struct mfd_cell cs5535_mfd_cells[] = {
#ifdef CONFIG_OLPC
static void __devinit cs5535_clone_olpc_cells(void)
{
- const char *acpi_clones[] = { "olpc-xo1-acpi" };
- const char *pms_clones[] = { "olpc-xo1-pms" };
+ const char *acpi_clones[] = { "olpc-xo1-pm-acpi", "olpc-xo1-sci-acpi" };
if (!machine_is_olpc())
return;
mfd_clone_cell("cs5535-acpi", acpi_clones, ARRAY_SIZE(acpi_clones));
- mfd_clone_cell("cs5535-pms", pms_clones, ARRAY_SIZE(pms_clones));
}
#else
static void cs5535_clone_olpc_cells(void) { }
OpenPOWER on IntegriCloud