summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/magician_defconfig
diff options
context:
space:
mode:
authorHeiko Stübner <heiko@sntech.de>2012-03-02 13:56:38 +0100
committerHaojian Zhuang <haojian.zhuang@gmail.com>2012-03-06 07:01:15 +0100
commit6967cca8b431a181d3a02eee81f0c9f8b5e9e75a (patch)
treed8a6842c0b7766261ac48b1645f4b1d43f26f73b /arch/arm/configs/magician_defconfig
parentLinux 3.3-rc6 (diff)
downloadlinux-6967cca8b431a181d3a02eee81f0c9f8b5e9e75a.tar.xz
linux-6967cca8b431a181d3a02eee81f0c9f8b5e9e75a.zip
pxa: magician/hx4700: Convert to gpio-regulator from bq24022
The bq24022 on these machines is a very simple regulator using gpios. One provides the on/off functionality and a second one is used to change the current between 100 and 500 mA. This functionality can also be provided by the more generic gpio-regulator. Therefore convert both machines which makes it possible to remove the bq24022 driver later on. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Paul Parsons <lost.distance@yahoo.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/configs/magician_defconfig')
-rw-r--r--arch/arm/configs/magician_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig
index 443675d317e6..a691ef4c6008 100644
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
@@ -101,7 +101,7 @@ CONFIG_MFD_ASIC3=y
CONFIG_HTC_EGPIO=y
CONFIG_HTC_PASIC3=y
CONFIG_REGULATOR=y
-CONFIG_REGULATOR_BQ24022=y
+CONFIG_REGULATOR_GPIO=y
CONFIG_FB=y
CONFIG_FB_PXA=y
CONFIG_FB_PXA_OVERLAY=y