diff options
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index d80c0ba9a095..b88e11cd75ed 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -1083,19 +1083,19 @@ static void __init em_x270_userspace_consumers_init(void) | |||
1083 | } | 1083 | } |
1084 | 1084 | ||
1085 | /* DA9030 related initializations */ | 1085 | /* DA9030 related initializations */ |
1086 | #define REGULATOR_CONSUMER(_name, _dev, _supply) \ | 1086 | #define REGULATOR_CONSUMER(_name, _dev_name, _supply) \ |
1087 | static struct regulator_consumer_supply _name##_consumers[] = { \ | 1087 | static struct regulator_consumer_supply _name##_consumers[] = { \ |
1088 | { \ | 1088 | { \ |
1089 | .dev = _dev, \ | 1089 | .dev_name = _dev_name, \ |
1090 | .supply = _supply, \ | 1090 | .supply = _supply, \ |
1091 | }, \ | 1091 | }, \ |
1092 | } | 1092 | } |
1093 | 1093 | ||
1094 | REGULATOR_CONSUMER(ldo3, &em_x270_gps_userspace_consumer.dev, "vcc gps"); | 1094 | REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps"); |
1095 | REGULATOR_CONSUMER(ldo5, NULL, "vcc cam"); | 1095 | REGULATOR_CONSUMER(ldo5, NULL, "vcc cam"); |
1096 | REGULATOR_CONSUMER(ldo10, &pxa_device_mci.dev, "vcc sdio"); | 1096 | REGULATOR_CONSUMER(ldo10, "pxa2xx-mci", "vcc sdio"); |
1097 | REGULATOR_CONSUMER(ldo12, NULL, "vcc usb"); | 1097 | REGULATOR_CONSUMER(ldo12, NULL, "vcc usb"); |
1098 | REGULATOR_CONSUMER(ldo19, &em_x270_gprs_userspace_consumer.dev, "vcc gprs"); | 1098 | REGULATOR_CONSUMER(ldo19, "reg-userspace-consumer.1", "vcc gprs"); |
1099 | REGULATOR_CONSUMER(buck2, NULL, "vcc_core"); | 1099 | REGULATOR_CONSUMER(buck2, NULL, "vcc_core"); |
1100 | 1100 | ||
1101 | #define REGULATOR_INIT(_ldo, _min_uV, _max_uV, _ops_mask) \ | 1101 | #define REGULATOR_INIT(_ldo, _min_uV, _max_uV, _ops_mask) \ |