Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb650b9e authored by Philipp Zabel's avatar Philipp Zabel Committed by Eric Miao
Browse files

[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: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 20bec8ab

arch/arm/configs/magician_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-pxa/include/mach/magician.h

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define GPIO22_MAGICIAN_VIBRA_EN		22

#define GPIO26_MAGICIAN_GSM_POWER		26

#define GPIO27_MAGICIAN_USBC_PUEN		27

#define GPIO30_MAGICIAN_nCHARGE_EN		30

#define GPIO30_MAGICIAN_BQ24022_nCHARGE_EN	30

#define GPIO37_MAGICIAN_KEY_HANGUP		37

#define GPIO38_MAGICIAN_KEY_CONTACTS		38

#define GPIO40_MAGICIAN_GSM_OUT2		40
@@ -98,7 +98,7 @@ 
#define EGPIO_MAGICIAN_UNKNOWN_WAVEDEV_DLL	MAGICIAN_EGPIO(2, 2)

#define EGPIO_MAGICIAN_FLASH_VPP		MAGICIAN_EGPIO(2, 3)

#define EGPIO_MAGICIAN_BL_POWER2		MAGICIAN_EGPIO(2, 4)

#define EGPIO_MAGICIAN_CHARGE_EN		MAGICIAN_EGPIO(2, 5)

#define EGPIO_MAGICIAN_BQ24022_ISET2		MAGICIAN_EGPIO(2, 5)

#define EGPIO_MAGICIAN_GSM_POWER		MAGICIAN_EGPIO(2, 7)



/* input */

arch/arm/mach-pxa/magician.c

+41 −43
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <linux/mtd/physmap.h>

#include <linux/pda_power.h>

#include <linux/pwm_backlight.h>

#include <linux/regulator/bq24022.h>

#include <linux/regulator/machine.h>

#include <linux/usb/gpio_vbus.h>



#include <mach/hardware.h>
@@ -553,33 +555,7 @@ static struct platform_device gpio_vbus = { 


static int power_supply_init(struct device *dev)

{

	int ret;



	ret = gpio_request(EGPIO_MAGICIAN_CABLE_STATE_AC, "CABLE_STATE_AC");

	if (ret)

		goto err_cs_ac;

	ret = gpio_request(EGPIO_MAGICIAN_CABLE_STATE_USB, "CABLE_STATE_USB");

	if (ret)

		goto err_cs_usb;

	ret = gpio_request(EGPIO_MAGICIAN_CHARGE_EN, "CHARGE_EN");

	if (ret)

		goto err_chg_en;

	ret = gpio_request(GPIO30_MAGICIAN_nCHARGE_EN, "nCHARGE_EN");

	if (!ret)

		ret = gpio_direction_output(GPIO30_MAGICIAN_nCHARGE_EN, 0);

	if (ret)

		goto err_nchg_en;



	return 0;



err_nchg_en:

	gpio_free(EGPIO_MAGICIAN_CHARGE_EN);

err_chg_en:

	gpio_free(EGPIO_MAGICIAN_CABLE_STATE_USB);

err_cs_usb:

	gpio_free(EGPIO_MAGICIAN_CABLE_STATE_AC);

err_cs_ac:

	return ret;

	return gpio_request(EGPIO_MAGICIAN_CABLE_STATE_AC, "CABLE_STATE_AC");

}



static int magician_is_ac_online(void)
@@ -587,22 +563,8 @@ static int magician_is_ac_online(void) 
	return gpio_get_value(EGPIO_MAGICIAN_CABLE_STATE_AC);

}



static int magician_is_usb_online(void)

{

	return gpio_get_value(EGPIO_MAGICIAN_CABLE_STATE_USB);

}



static void magician_set_charge(int flags)

{

	gpio_set_value(GPIO30_MAGICIAN_nCHARGE_EN, !flags);

	gpio_set_value(EGPIO_MAGICIAN_CHARGE_EN, flags);

}



static void power_supply_exit(struct device *dev)

{

	gpio_free(GPIO30_MAGICIAN_nCHARGE_EN);

	gpio_free(EGPIO_MAGICIAN_CHARGE_EN);

	gpio_free(EGPIO_MAGICIAN_CABLE_STATE_USB);

	gpio_free(EGPIO_MAGICIAN_CABLE_STATE_AC);

}
@@ -613,8 +575,6 @@ static char *magician_supplicants[] = { 
static struct pda_power_pdata power_supply_info = {

	.init            = power_supply_init,

	.is_ac_online    = magician_is_ac_online,

	.is_usb_online   = magician_is_usb_online,

	.set_charge      = magician_set_charge,

	.exit            = power_supply_exit,

	.supplied_to     = magician_supplicants,

	.num_supplicants = ARRAY_SIZE(magician_supplicants),
@@ -647,6 +607,43 @@ static struct platform_device power_supply = { 
	.num_resources = ARRAY_SIZE(power_supply_resources),

};



/*

 * Battery charger

 */



static struct regulator_consumer_supply bq24022_consumers[] = {

	{

		.dev = &gpio_vbus.dev,

		.supply = "vbus_draw",

	},

	{

		.dev = &power_supply.dev,

		.supply = "ac_draw",

	},

};



static struct regulator_init_data bq24022_init_data = {

	.constraints = {

		.max_uA         = 500000,

		.valid_ops_mask = REGULATOR_CHANGE_CURRENT,

	},

	.num_consumer_supplies  = ARRAY_SIZE(bq24022_consumers),

	.consumer_supplies      = bq24022_consumers,

};



static struct bq24022_mach_info bq24022_info = {

	.gpio_nce   = GPIO30_MAGICIAN_BQ24022_nCHARGE_EN,

	.gpio_iset2 = EGPIO_MAGICIAN_BQ24022_ISET2,

	.init_data  = &bq24022_init_data,

};



static struct platform_device bq24022 = {

	.name = "bq24022",

	.id   = -1,

	.dev  = {

		.platform_data = &bq24022_info,

	},

};



/*

 * MMC/SD
@@ -757,6 +754,7 @@ static struct platform_device *devices[] __initdata = { 
	&egpio,

	&backlight,

	&pasic3,

	&bq24022,

	&gpio_vbus,

	&power_supply,

	&strataflash,