mfd: Rename 88pm8607 to 88pm860x in mfd

Rename 88PM8607 to 88PM860X in both Makefile and Kconfig under mfd directory.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

3 files changed, 13 insertions, 12 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index d957373d77e4..815907eb70a4 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -9,6 +9,16 @@ config MFD_CORE
         tristate
         default n
 
+config MFD_88PM860X
+        bool "Support Marvell 88PM8606/88PM8607"
+        depends on I2C=y
+        select MFD_CORE
+        help
+          This supports for Marvell 88PM8606/88PM8607 Power Management IC.
+          This includes the I2C driver and the core APIs _only_, you have to
+          select individual components like voltage regulators, RTC and
+          battery-charger under the corresponding menus.
+
 config MFD_SM501
         tristate "Support for Silicon Motion SM501"
          ---help---
@@ -329,16 +339,6 @@ config EZX_PCAP
           This enables the PCAP ASIC present on EZX Phones. This is
           needed for MMC, TouchScreen, Sound, USB, etc..
 
-config MFD_88PM8607
-        bool "Support Marvell 88PM8607"
-        depends on I2C=y
-        select MFD_CORE
-        help
-          This supports for Marvell 88PM8607 Power Management IC. This includes
-          the I2C driver and the core APIs _only_, you have to select
-          individual components like voltage regulators, RTC and
-          battery-charger under the corresponding menus.
-
 config AB4500_CORE
         tristate "ST-Ericsson's AB4500 Mixed Signal Power management chip"
         depends on SPI
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 88fa200188cf..1e3ae062c1f6 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -2,7 +2,8 @@
 # Makefile for multifunction miscellaneous devices
 #
 
-obj-$(CONFIG_MFD_88PM8607)      += 88pm860x-core.o 88pm860x-i2c.o
+88pm860x-objs                   := 88pm860x-core.o 88pm860x-i2c.o
+obj-$(CONFIG_MFD_88PM860X)      += 88pm860x.o
 obj-$(CONFIG_MFD_SM501)         += sm501.o
 obj-$(CONFIG_MFD_ASIC3)         += asic3.o tmio_core.o
 obj-$(CONFIG_MFD_SH_MOBILE_SDHI)                += sh_mobile_sdhi.o
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 834b48441829..dbfe31a4a519 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -191,7 +191,7 @@ config REGULATOR_TPS6507X
 
 config REGULATOR_88PM8607
         bool "Marvell 88PM8607 Power regulators"
-        depends on MFD_88PM8607=y
+        depends on MFD_88PM860X=y
         help
           This driver supports 88PM8607 voltage regulator chips.