Prev: linux-next: manual merge of the staging-next tree with the pcmcia tree
Next: linux-next: build warnings after merge of the final tree
From: Kyungmin Park on 2 Aug 2010 00:00
From: Kyungmin Park <kyungmin.park(a)samsung.com>

LP3974 PMIC support. It has same functionality with max8998.

Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com>
---
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index db63d40..50383b1 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -303,6 +303,18 @@ config MFD_MAX8998
accessing the device, additional drivers must be enabled in order
to use the functionality of the device.

+config MFD_LP3974
+ bool "National Semiconductor LP3974 PMIC Support"
+ depends on I2C=y
+ select MFD_CORE
+ select MFD_MAX8998
+ help
+ Say yes here to support for National Semiconductor LP3974. This is
+ a Power Management IC. This driver provies common support for
+ accessing the device, additional drivers must be enabled in order
+ to use the functionality of the device.
+ Note that it has same functionality with max8998.
+
config MFD_WM8400
tristate "Support Wolfson Microelectronics WM8400"
select MFD_CORE
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index 0d68de2..cea9f48 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -30,6 +30,11 @@
#include <linux/mfd/max8998.h>
#include <linux/mfd/max8998-private.h>

+enum max8998_type {
+ TYPE_MAX8998,
+ TYPE_LP3974,
+};
+
static struct mfd_cell max8998_devs[] = {
{
.name = "max8998-pmic",
@@ -127,8 +132,8 @@ static int max8998_i2c_remove(struct i2c_client *i2c)
}

static const struct i2c_device_id max8998_i2c_id[] = {
- { "max8998", 0 },
- { }
+ { "max8998", TYPE_MAX8998 },
+ { "lp3974", TYPE_LP3974 },
};
MODULE_DEVICE_TABLE(i2c, max8998_i2c_id);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: linux-next: manual merge of the staging-next tree with the pcmcia tree
Next: linux-next: build warnings after merge of the final tree