aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorKyungmin Park <kyungmin.park@samsung.com>2010-08-23 00:46:49 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2010-10-28 18:28:45 -0400
commitf8539ddcbbbca7b6a06e0c2cdfbd116ba43a2fe0 (patch)
treefbc128750d423e91aa3b876f45a723959b84f480 /drivers/mfd
parentb8e9cf0b28173fc25dae9f3ac44de6fc4e9fc385 (diff)
mfd: LP3974 PMIC support
LP3974 PMIC support. It has same functionality as max8998. Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/Kconfig11
-rw-r--r--drivers/mfd/max8998.c5
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index b3aedaaa7092..02cd6c0e59cb 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -294,14 +294,15 @@ config MFD_MAX8925
294 to use the functionality of the device. 294 to use the functionality of the device.
295 295
296config MFD_MAX8998 296config MFD_MAX8998
297 bool "Maxim Semiconductor MAX8998 PMIC Support" 297 bool "Maxim Semiconductor MAX8998/National LP3974 PMIC Support"
298 depends on I2C=y 298 depends on I2C=y
299 select MFD_CORE 299 select MFD_CORE
300 help 300 help
301 Say yes here to support for Maxim Semiconductor MAX8998. This is 301 Say yes here to support for Maxim Semiconductor MAX8998 and
302 a Power Management IC. This driver provies common support for 302 National Semiconductor LP3974. This is a Power Management IC.
303 accessing the device, additional drivers must be enabled in order 303 This driver provies common support for accessing the device,
304 to use the functionality of the device. 304 additional drivers must be enabled in order to use the functionality
305 of the device.
305 306
306config MFD_WM8400 307config MFD_WM8400
307 tristate "Support Wolfson Microelectronics WM8400" 308 tristate "Support Wolfson Microelectronics WM8400"
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index 73e6f5c4efc9..f1c928915880 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -125,8 +125,9 @@ static int max8998_i2c_remove(struct i2c_client *i2c)
125} 125}
126 126
127static const struct i2c_device_id max8998_i2c_id[] = { 127static const struct i2c_device_id max8998_i2c_id[] = {
128 { "max8998", 0 }, 128 { "max8998", 0 },
129 { } 129 { "lp3974", 0 },
130 { }
130}; 131};
131MODULE_DEVICE_TABLE(i2c, max8998_i2c_id); 132MODULE_DEVICE_TABLE(i2c, max8998_i2c_id);
132 133