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

Commit 804d2312 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Haojian Zhuang
Browse files

ARM: pxa: fix build failure for regulator consumer in em-x270.c 



Commit 737f360d

"regulator: Remove support for supplies specified by struct device"

caused this file to break, since it was still relying on the
device field to be present.  Map it onto dev_name appropriately

Since there are two consumers with the name "reg-userspace-consumer",
we have to supply the ID as a suffix in the REGULATOR_CONSUMER calls.

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
parent 3a569132

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)		\