mfd: Rename s5m file and directories to samsung

Previously, Samsung PMIC naming rule start with prefix of s5m.
But Naming rule is changed.
From now on, Prefix will be changed to s2m.
So, To support pmic series of s5m and s2m, change mfd file and directory name.

Signed-off-by: Sangbeom Kim <sbkim73@samsung.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

drivers/mfd/Kconfig

@@ -508,13 +508,13 @@ config MFD_MAX8998
 	  additional drivers must be enabled in order to use the functionality
 	  of the device.
 
-config MFD_S5M_CORE
+config MFD_SEC_CORE
-	bool "SAMSUNG S5M Series Support"
+	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 MFD 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

@@ -126,6 +126,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/sec-core.c

@@ -21,9 +21,9 @@
 #include <linux/pm_runtime.h>
 #include <linux/mutex.h>
 #include <linux/mfd/core.h>
-#include <linux/mfd/s5m87xx/s5m-core.h>
+#include <linux/mfd/samsung/s5m-core.h>
-#include <linux/mfd/s5m87xx/s5m-pmic.h>
+#include <linux/mfd/samsung/s5m-pmic.h>
-#include <linux/mfd/s5m87xx/s5m-rtc.h>
+#include <linux/mfd/samsung/s5m-rtc.h>
 #include <linux/regmap.h>
 
 static struct mfd_cell s5m8751_devs[] = {

drivers/mfd/sec-irq.c

@@ -14,7 +14,7 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/mfd/s5m87xx/s5m-core.h>
+#include <linux/mfd/samsung/s5m-core.h>
 
 struct s5m_irq_data {
 	int reg;
@@ -333,7 +333,7 @@ static irqreturn_t s5m8763_irq_thread(int irq, void *data)
 
 int s5m_irq_resume(struct s5m87xx_dev *s5m87xx)
 {
-	if (s5m87xx->irq && s5m87xx->irq_base){
+	if (s5m87xx->irq && s5m87xx->irq_base) {
 		switch (s5m87xx->device_type) {
 		case S5M8763X:
 			s5m8763_irq_thread(s5m87xx->irq_base, s5m87xx);

drivers/regulator/Kconfig

@@ -235,7 +235,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

@@ -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/samsung/s5m-core.h>
-#include <linux/mfd/s5m87xx/s5m-pmic.h>
+#include <linux/mfd/samsung/s5m-pmic.h>
 
 struct s5m8767_info {
 	struct device *dev;

include/linux/mfd/samsung/s5m-core.h

@@ -340,7 +340,7 @@ struct s5m_platform_data {
 	int				num_regulators;
 
 	int				irq_base;
-	int 				(*cfg_pmic_irq)(void);
+	int				(*cfg_pmic_irq)(void);
 
 	int				ono;
 	bool				wakeup;