Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 30 Mar 2012 03:36:18 +0000 (20:36 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 30 Mar 2012 03:36:18 +0000 (20:36 -0700)
* '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

arch/arm/mach-pxa/cm-x300.c
arch/arm/mach-pxa/em-x270.c
arch/arm/mach-pxa/hx4700.c
arch/arm/mach-pxa/magician.c
arch/arm/mach-pxa/stargate2.c

index 895ee8c45009ff1388ebdbfaf3fb8a2b60ab0887..0c920fccb79e9861b7dfff4cacf3387c34c1921f 100644 (file)
@@ -714,7 +714,6 @@ struct da9030_battery_info cm_x300_battery_info = {
 
 static struct regulator_consumer_supply buck2_consumers[] = {
        {
-               .dev = NULL,
                .supply = "vcc_core",
        },
 };
index d80c0ba9a0955613a2f393f5fefd1d882483ad52..b88e11cd75ed0f830e8c7e95bcdbf910d7876cda 100644 (file)
@@ -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)              \
index 3fa929d4a4f5b748ec9885c11d255d33aa00b6cd..b83b95a2950342b298a8693b753217feacb4b5ab 100644 (file)
@@ -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",
        },
 };
index 6f4785b347c25f44af25b49a6786f7ad1cec4e6e..8de0651d7efbdffb3c509814f7ded4bab8149ec6 100644 (file)
@@ -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",
        },
 };
index b0656e158d90409f249cc4a6965483bb68e1dc52..227a6309dba747b50a8a0ca89a63ec261468c3e5 100644 (file)
@@ -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",
        },
 };