ARM: tegra: name the supply name of regulator rails
[linux-2.6.git] / arch / arm / mach-tegra / board-dalmore-power.c
index 72719e0..699148a 100644 (file)
@@ -29,6 +29,8 @@
 #include <linux/regulator/max77663-regulator.h>
 #include <linux/regulator/tps51632-regulator.h>
 
+#include <asm/mach-types.h>
+
 #include <mach/iomap.h>
 #include <mach/irqs.h>
 #include <mach/gpio-tegra.h>
@@ -135,6 +137,7 @@ static struct max77663_regulator_platform_data max77663_regulator_pdata_##_id =\
 {                                                                      \
        .init_data = {                                                  \
                        .constraints = {                                \
+                               .name = max77663_rails(_id),            \
                                .min_uV = _min_uV,                      \
                                .max_uV = _max_uV,                      \
                                .valid_modes_mask = (REGULATOR_MODE_NORMAL |  \
@@ -551,6 +554,9 @@ static int __init dalmore_fixed_regulator_init(void)
        fixed_reg_devs = fixed_reg_devs_a00;
        nfixreg_devs = ARRAY_SIZE(fixed_reg_devs_a00);
 
+       if (!machine_is_dalmore())
+               return 0;
+
        for (i = 0; i < nfixreg_devs; ++i) {
                int gpio_nr;
                struct fixed_voltage_config *fixed_reg_pdata =