From 66c9fbb9895499ff3aede96845968138a5bec8ab Mon Sep 17 00:00:00 2001 From: Sangbeom Kim Date: Wed, 11 Jul 2012 21:06:40 +0900 Subject: [PATCH] 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 Signed-off-by: Samuel Ortiz --- drivers/mfd/Kconfig | 6 +++--- drivers/mfd/Makefile | 2 +- drivers/mfd/{s5m-core.c => sec-core.c} | 6 +++--- drivers/mfd/{s5m-irq.c => sec-irq.c} | 4 ++-- drivers/regulator/Kconfig | 2 +- drivers/regulator/s5m8767.c | 4 ++-- include/linux/mfd/{s5m87xx => samsung}/s5m-core.h | 2 +- include/linux/mfd/{s5m87xx => samsung}/s5m-pmic.h | 0 include/linux/mfd/{s5m87xx => samsung}/s5m-rtc.h | 0 9 files changed, 13 insertions(+), 13 deletions(-) rename drivers/mfd/{s5m-core.c => sec-core.c} (97%) rename drivers/mfd/{s5m-irq.c => sec-irq.c} (99%) rename include/linux/mfd/{s5m87xx => samsung}/s5m-core.h (99%) rename include/linux/mfd/{s5m87xx => samsung}/s5m-pmic.h (100%) rename include/linux/mfd/{s5m87xx => samsung}/s5m-rtc.h (100%) diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 9c3ab2ab7dc7..bad68f82772a 100644 --- a/drivers/mfd/Kconfig +++ b/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 - 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 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 diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 09674a99eb60..9c9727fe3f09 100644 --- a/drivers/mfd/Makefile +++ b/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 diff --git a/drivers/mfd/s5m-core.c b/drivers/mfd/sec-core.c similarity index 97% rename from drivers/mfd/s5m-core.c rename to drivers/mfd/sec-core.c index dd170307e60e..b09036022bca 100644 --- a/drivers/mfd/s5m-core.c +++ b/drivers/mfd/sec-core.c @@ -21,9 +21,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include static struct mfd_cell s5m8751_devs[] = { diff --git a/drivers/mfd/s5m-irq.c b/drivers/mfd/sec-irq.c similarity index 99% rename from drivers/mfd/s5m-irq.c rename to drivers/mfd/sec-irq.c index 0236676085cf..5e90cc1f0fd7 100644 --- a/drivers/mfd/s5m-irq.c +++ b/drivers/mfd/sec-irq.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include 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); diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index c86b8864e411..12c0c0ee989d 100644 --- a/drivers/regulator/Kconfig +++ b/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 diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c index 9caadb482178..a77895889f3a 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include struct s5m8767_info { struct device *dev; diff --git a/include/linux/mfd/s5m87xx/s5m-core.h b/include/linux/mfd/samsung/s5m-core.h similarity index 99% rename from include/linux/mfd/s5m87xx/s5m-core.h rename to include/linux/mfd/samsung/s5m-core.h index 21603b42f22f..7332ff608c85 100644 --- a/include/linux/mfd/s5m87xx/s5m-core.h +++ b/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; diff --git a/include/linux/mfd/s5m87xx/s5m-pmic.h b/include/linux/mfd/samsung/s5m-pmic.h similarity index 100% rename from include/linux/mfd/s5m87xx/s5m-pmic.h rename to include/linux/mfd/samsung/s5m-pmic.h diff --git a/include/linux/mfd/s5m87xx/s5m-rtc.h b/include/linux/mfd/samsung/s5m-rtc.h similarity index 100% rename from include/linux/mfd/s5m87xx/s5m-rtc.h rename to include/linux/mfd/samsung/s5m-rtc.h