mfd: samsung: Modify samsung mfd header

PATCH Superseded Sangbeom Kim 1 participant 1 message Jul 7, 2012

Subsystems (3)

Multifunction devices (MFD) Voltage and current regulator framework Samsung multifunction PMIC device drivers

lore

Share & tools

lore

Sangbeom Kim

author

2012-07-07 09:40 UTC #0 lore raw

PATCH v2 4/7 mfd: samsung: 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 <[email protected]>

---
 drivers/mfd/sec-core.c               |    6 +-
 drivers/mfd/sec-irq.c                |    5 +-
 drivers/regulator/s5m8767.c          |    4 +-
 include/linux/mfd/samsung/core.h     |  147 +++++++++++++
 include/linux/mfd/samsung/irq.h      |  113 ++++++++++
 include/linux/mfd/samsung/rtc.h      |   84 ++++++++
 include/linux/mfd/samsung/s5m-core.h |  379 ----------------------------------
 include/linux/mfd/samsung/s5m-pmic.h |  129 ------------
 include/linux/mfd/samsung/s5m-rtc.h  |   84 --------
 include/linux/mfd/samsung/s5m8763.h  |   97 +++++++++
 include/linux/mfd/samsung/s5m8767.h  |  189 +++++++++++++++++
 11 files changed, 639 insertions(+), 598 deletions(-)
 create mode 100644 include/linux/mfd/samsung/core.h
 create mode 100644 include/linux/mfd/samsung/irq.h
 create mode 100644 include/linux/mfd/samsung/rtc.h
 delete mode 100644 include/linux/mfd/samsung/s5m-core.h
 delete mode 100644 include/linux/mfd/samsung/s5m-pmic.h
 delete mode 100644 include/linux/mfd/samsung/s5m-rtc.h
 create mode 100644 include/linux/mfd/samsung/s5m8763.h
 create mode 100644 include/linux/mfd/samsung/s5m8767.h

drivers/mfd/sec-core.c +3 -3

index 6684e77..5bf33cd 100644
@@ -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[] = {

drivers/mfd/sec-irq.c +4 -1

index c1e2a59..370cc4f 100644
@@ -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;

drivers/regulator/s5m8767.c +2 -2

index 79b0659..667fb1e 100644
@@ -19,8 +19,8 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
-#include <linux/mfd/samsung/s5m-core.h>
-#include <linux/mfd/samsung/s5m-pmic.h>
+#include <linux/mfd/samsung/core.h>
+#include <linux/mfd/samsung/s5m8767.h>
 
 struct s5m8767_info {
 	struct device *dev;

include/linux/mfd/samsung/core.h new file +147 -0

147 lines not on this page · raw message

include/linux/mfd/samsung/irq.h new file +113 -0

113 lines not on this page · raw message

include/linux/mfd/samsung/rtc.h new file +84 -0

84 lines not on this page · raw message

include/linux/mfd/samsung/s5m-core.h deleted +0 ~~-379~~

379 lines not on this page · raw message

include/linux/mfd/samsung/s5m-pmic.h deleted +0 ~~-129~~

129 lines not on this page · raw message

include/linux/mfd/samsung/s5m-rtc.h deleted +0 ~~-84~~

84 lines not on this page · raw message

include/linux/mfd/samsung/s5m8763.h new file +97 -0

97 lines not on this page · raw message

include/linux/mfd/samsung/s5m8767.h new file +189 -0

189 lines not on this page · raw message

Signature · 1 line

1.7.5.4