diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2009-01-31 12:13:57 +0100 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-04-04 02:24:38 +0200 |
| commit | eb650b9ed0f69be075a5a86ef9c4fc2cf7915293 (patch) | |
| tree | e616530198070f60581f093b64543e062b7981f4 /arch/arm/configs/magician_defconfig | |
| parent | Merge branch 'ext3-latency-fixes' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-eb650b9ed0f69be075a5a86ef9c4fc2cf7915293.tar.xz linux-eb650b9ed0f69be075a5a86ef9c4fc2cf7915293.zip | |
[ARM] pxa/magician: Enable bq24022 regulator for gpio_vbus and pda_power
With this patch, the bq24022 battery charger is controlled by the USB
gadget framework (via gpio_vbus) when connected to USB.
To compile, this patch depends on the "regulator: Allow init data to be
supplied for bq24022" patch (queued for next in the regulator tree) to
add the init_data field to struct bq24022_mach_info.
It also depends on the "add optional OTG transceiver and voltage
regulator support to pda_power" patch (queued for next in the power
supply tree) to enable charging when connected to the AC charger.
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/configs/magician_defconfig')
| -rw-r--r-- | arch/arm/configs/magician_defconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index 82428c2f234c..f56837f69ca7 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig @@ -1183,7 +1183,11 @@ CONFIG_RTC_INTF_DEV=y CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_PXA is not set # CONFIG_DMADEVICES is not set -# CONFIG_REGULATOR is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +CONFIG_REGULATOR_BQ24022=y # CONFIG_UIO is not set # CONFIG_STAGING is not set |