Skip to contentSkip to conversation

PATCH V2 1/7] mfd: samsung: Rename and Replace file and directory

PATCH Sangbeom Kim 1 participant 1 message Jul 7, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Previously, Samsung PMIC naming rule start with prefix of s5m. But Naming rule is changed.

Quoted 1 line

From now on, Prefix will be changed to s2m.

So, To support pmic series of s5m and s2m, change mfd file and directory name.

---
 drivers/mfd/Kconfig                  |    6 +-
 drivers/mfd/Makefile                 |    2 +-
 drivers/mfd/s5m-core.c               |  206 --------------
 drivers/mfd/s5m-irq.c                |  495 ----------------------------------
 drivers/mfd/sec-core.c               |  206 ++++++++++++++
 drivers/mfd/sec-irq.c                |  495 ++++++++++++++++++++++++++++++++++
 drivers/regulator/Kconfig            |    2 +-
 drivers/regulator/s5m8767.c          |    4 +-
 include/linux/mfd/s5m87xx/s5m-core.h |  379 --------------------------
 include/linux/mfd/s5m87xx/s5m-pmic.h |  129 ---------
 include/linux/mfd/s5m87xx/s5m-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 ++++++
 14 files changed, 1300 insertions(+), 1300 deletions(-)
 delete mode 100644 drivers/mfd/s5m-core.c
 delete mode 100644 drivers/mfd/s5m-irq.c
 create mode 100644 drivers/mfd/sec-core.c
 create mode 100644 drivers/mfd/sec-irq.c
 delete mode 100644 include/linux/mfd/s5m87xx/s5m-core.h
 delete mode 100644 include/linux/mfd/s5m87xx/s5m-pmic.h
 delete mode 100644 include/linux/mfd/s5m87xx/s5m-rtc.h
 create mode 100644 include/linux/mfd/samsung/s5m-core.h
 create mode 100644 include/linux/mfd/samsung/s5m-pmic.h
 create mode 100644 include/linux/mfd/samsung/s5m-rtc.h
drivers/mfd/Kconfig +3 -3
index e129c82..28c134c 100644
@@ -468,13 +468,13 @@ config MFD_MAX8998
 	  additional drivers must be enabled in order to use the functionality
 	  of the device.
 
-config MFD_S5M_CORE
-	bool "SAMSUNG S5M Series Support"
+config MFD_SEC_CORE
+	bool "SAMSUNG Electronics PMIC Series Support"
 	depends on I2C=y && GENERIC_HARDIRQS
 	select MFD_CORE
 	select REGMAP_I2C
 	help
-	 Support for the Samsung Electronics S5M MFD series.
+	 Support for the Samsung Electronics PMIC series.
 	 This driver provides common support for accessing the device,
 	 additional drivers must be enabled in order to use the functionality
 	 of the device
drivers/mfd/Makefile +1 -1
index 75f6ed6..46e414b 100644
@@ -116,6 +116,6 @@ obj-$(CONFIG_MFD_AAT2870_CORE)	+= aat2870-core.o
 obj-$(CONFIG_MFD_INTEL_MSIC)	+= intel_msic.o
 obj-$(CONFIG_MFD_PALMAS)	+= palmas.o
 obj-$(CONFIG_MFD_RC5T583)	+= rc5t583.o rc5t583-irq.o
-obj-$(CONFIG_MFD_S5M_CORE)	+= s5m-core.o s5m-irq.o
+obj-$(CONFIG_MFD_SEC_CORE)	+= sec-core.o sec-irq.o
 obj-$(CONFIG_MFD_ANATOP)	+= anatop-mfd.o
 obj-$(CONFIG_MFD_LM3533)	+= lm3533-core.o lm3533-ctrlbank.o
drivers/mfd/s5m-core.c deleted +0 -206

206 lines not on this page · raw message

drivers/mfd/s5m-irq.c deleted +0 -495

495 lines not on this page · raw message

drivers/mfd/sec-core.c new file +206 -0

206 lines not on this page · raw message

drivers/mfd/sec-irq.c new file +495 -0

495 lines not on this page · raw message

drivers/regulator/Kconfig +1 -1
index 27fe52f..357752d 100644
@@ -258,7 +258,7 @@ config REGULATOR_RC5T583
 
 config REGULATOR_S5M8767
 	tristate "Samsung S5M8767A voltage regulator"
-	depends on MFD_S5M_CORE
+	depends on MFD_SEC_CORE
 	help
 	 This driver supports a Samsung S5M8767A voltage output regulator
 	 via I2C bus. S5M8767A have 9 Bucks and 28 LDOs output and
drivers/regulator/s5m8767.c +2 -2
index 1ad9c3c..f292e56 100644
@@ -19,8 +19,8 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
-#include <linux/mfd/s5m87xx/s5m-core.h>
-#include <linux/mfd/s5m87xx/s5m-pmic.h>
+#include <linux/mfd/samsung/s5m-core.h>
+#include <linux/mfd/samsung/s5m-pmic.h>
 
 struct s5m8767_info {
 	struct device *dev;
include/linux/mfd/s5m87xx/s5m-core.h deleted +0 -379

379 lines not on this page · raw message

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

129 lines not on this page · raw message

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

84 lines not on this page · raw message

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

379 lines not on this page · raw message

include/linux/mfd/samsung/s5m-pmic.h new file +129 -0

129 lines not on this page · raw message

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

84 lines not on this page · raw message

Signature · 1 line
1.7.5.4