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

Commit f00e9b11 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes 

* 'fixes' of git://github.com/hzhuang1/linux:
  ARM: pxa: fix build issue on stargate2
  ARM: pxa: fix build issue on cm-x300
  ARM: pxa: fix build failure for regulator consumer in em-x270.c
  ARM: pxa: fix regulator related build fail in magician_defconfig
parents a92e7023 5616131d

arch/arm/mach-pxa/cm-x300.c

+0 −1
Original line number Diff line number Diff line
@@ -714,7 +714,6 @@ struct da9030_battery_info cm_x300_battery_info = { 


static struct regulator_consumer_supply buck2_consumers[] = {

	{

		.dev = NULL,

		.supply = "vcc_core",

	},

};

arch/arm/mach-pxa/em-x270.c

+5 −5
Original line number Diff line number Diff line
@@ -1083,19 +1083,19 @@ static void __init em_x270_userspace_consumers_init(void) 
}



/* DA9030 related initializations */

#define REGULATOR_CONSUMER(_name, _dev, _supply)			       \

#define REGULATOR_CONSUMER(_name, _dev_name, _supply)		        \

	static struct regulator_consumer_supply _name##_consumers[] = {	\

		{							\

			.dev = _dev,					\

			.dev_name = _dev_name,				\

			.supply = _supply,				\

		},							\

	}



REGULATOR_CONSUMER(ldo3, &em_x270_gps_userspace_consumer.dev, "vcc gps");

REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps");

REGULATOR_CONSUMER(ldo5, NULL, "vcc cam");

REGULATOR_CONSUMER(ldo10, &pxa_device_mci.dev, "vcc sdio");

REGULATOR_CONSUMER(ldo10, "pxa2xx-mci", "vcc sdio");

REGULATOR_CONSUMER(ldo12, NULL, "vcc usb");

REGULATOR_CONSUMER(ldo19, &em_x270_gprs_userspace_consumer.dev, "vcc gprs");

REGULATOR_CONSUMER(ldo19, "reg-userspace-consumer.1", "vcc gprs");

REGULATOR_CONSUMER(buck2, NULL, "vcc_core");



#define REGULATOR_INIT(_ldo, _min_uV, _max_uV, _ops_mask)		\

arch/arm/mach-pxa/hx4700.c

+0 −2
Original line number Diff line number Diff line
@@ -681,11 +681,9 @@ static struct platform_device power_supply = { 


static struct regulator_consumer_supply bq24022_consumers[] = {

	{

		.dev = &gpio_vbus.dev,

		.supply = "vbus_draw",

	},

	{

		.dev = &power_supply.dev,

		.supply = "ac_draw",

	},

};

arch/arm/mach-pxa/magician.c

+0 −2
Original line number Diff line number Diff line
@@ -580,11 +580,9 @@ static struct platform_device power_supply = { 


static struct regulator_consumer_supply bq24022_consumers[] = {

	{

		.dev = &gpio_vbus.dev,

		.supply = "vbus_draw",

	},

	{

		.dev = &power_supply.dev,

		.supply = "ac_draw",

	},

};

arch/arm/mach-pxa/stargate2.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static struct platform_device sht15 = { 


static struct regulator_consumer_supply stargate2_sensor_3_con[] = {

	{

		.dev = &sht15.dev,

		.dev_name = "sht15",

		.supply = "vcc",

	},

};