github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 07:03:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

linux3.10:pwm:modify config rk30_PWM_RERGULATOR to ROCKCHIP_PWM_REGULATOR

Browse Source
This commit is contained in:
张晴 2014-03-17 11:11:08 +08:00
parent 63b8874120
commit 44931817e5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/rockchip_defconfig
View File

@ -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

6
drivers/regulator/Kconfig
View File

@ -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"

2
drivers/regulator/Makefile
View File

@ -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