summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorSangbeom Kim <sbkim73@samsung.com>2012-07-11 21:07:16 +0900
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-16 14:28:11 +0200
commit54227bcf20fa0d8a0748c54747b9c39e8b16150d (patch)
tree714cc3d20de5fec08995c3e60ac59661b71380e1 /drivers/mfd
parent63063bfbffe997452e2ee4890f22dcde0119001e (diff)
downloadblackbird-op-linux-54227bcf20fa0d8a0748c54747b9c39e8b16150d.tar.gz
blackbird-op-linux-54227bcf20fa0d8a0748c54747b9c39e8b16150d.zip
mfd: Modify samsung mfd header
As Prefix of Samsung pmic changed from s5m to s2m, To make common mfd driver for s2m and s5m series, This patch rename header of Samsung mfd and modify mfd driver. Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/sec-core.c6
-rw-r--r--drivers/mfd/sec-irq.c5
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index 5dfe671f779b..3a9a467534e3 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -21,9 +21,9 @@
#include <linux/pm_runtime.h>
#include <linux/mutex.h>
#include <linux/mfd/core.h>
-#include <linux/mfd/samsung/s5m-core.h>
-#include <linux/mfd/samsung/s5m-pmic.h>
-#include <linux/mfd/samsung/s5m-rtc.h>
+#include <linux/mfd/samsung/core.h>
+#include <linux/mfd/samsung/irq.h>
+#include <linux/mfd/samsung/rtc.h>
#include <linux/regmap.h>
static struct mfd_cell s5m8751_devs[] = {
diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index d9c11374ad0f..da5ec5b2ecce 100644
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -14,7 +14,10 @@
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
-#include <linux/mfd/samsung/s5m-core.h>
+#include <linux/mfd/samsung/core.h>
+#include <linux/mfd/samsung/irq.h>
+#include <linux/mfd/samsung/s5m8763.h>
+#include <linux/mfd/samsung/s5m8767.h>
struct sec_irq_data {
int reg;
OpenPOWER on IntegriCloud