From: 张晴 <zhangqing@rock-chips.com>
Date: Mon, 17 Mar 2014 03:11:08 +0000 (+0800)
Subject: linux3.10:pwm:modify config rk30_PWM_RERGULATOR to ROCKCHIP_PWM_REGULATOR
X-Git-Tag: firefly_0821_release~6062
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=44931817e52f4dcedae0b7900503ecb02c14810c;p=firefly-linux-kernel-4.4.55.git

linux3.10:pwm:modify config rk30_PWM_RERGULATOR to ROCKCHIP_PWM_REGULATOR
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index d62e7cce96d5..c6a6f1da0847 100755
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -309,7 +309,7 @@ CONFIG_MFD_RK808=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_ACT8846=y
-CONFIG_RK30_PWM_REGULATOR=y
+CONFIG_ROCKCHIP_PWM_REGULATOR=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 0788f8470dd1..3afbb5d2adea 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -262,10 +262,10 @@ config ACT8846_SUPPORT_RESET
 	help
 	  Support short press key to restart.
 
-config RK30_PWM_REGULATOR
-	tristate "rk30 pwm voltage regulator for discrete dcdc or ldo"
+config ROCKCHIP_PWM_REGULATOR
+	tristate "rockchip pwm voltage regulator for discrete dcdc or ldo"
 	help
-	  Say Y to enable support for the voltage regulators control on the RK30 .
+	  Say Y to enable support for the voltage regulators control on the ROCKCHIP.
 
 config REGULATOR_PCAP
 	tristate "Motorola PCAP2 regulator driver"
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index bc1815fd5672..74658dbb3d3f 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -52,7 +52,7 @@ obj-$(CONFIG_REGULATOR_RC5T583)  += rc5t583-regulator.o
 obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o
 obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
 
-obj-$(CONFIG_RK30_PWM_REGULATOR) += rk30-pwm-regulator.o
+obj-$(CONFIG_ROCKCHIP_PWM_REGULATOR) += rk30-pwm-regulator.o
 
 obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o
 obj-$(CONFIG_REGULATOR_TPS62360) += tps62360-regulator.o