diff options
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra20.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra30.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-harmony-power.c | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index 7a95e0bc4aba..e20b419d5983 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c | |||
@@ -131,11 +131,7 @@ static void __init tegra_dt_init(void) | |||
131 | } | 131 | } |
132 | 132 | ||
133 | static const char *tegra20_dt_board_compat[] = { | 133 | static const char *tegra20_dt_board_compat[] = { |
134 | "compulab,trimslice", | 134 | "nvidia,tegra20", |
135 | "nvidia,harmony", | ||
136 | "compal,paz00", | ||
137 | "nvidia,seaboard", | ||
138 | "nvidia,ventana", | ||
139 | NULL | 135 | NULL |
140 | }; | 136 | }; |
141 | 137 | ||
diff --git a/arch/arm/mach-tegra/board-dt-tegra30.c b/arch/arm/mach-tegra/board-dt-tegra30.c index b4124b12a779..96f6c0d030bd 100644 --- a/arch/arm/mach-tegra/board-dt-tegra30.c +++ b/arch/arm/mach-tegra/board-dt-tegra30.c | |||
@@ -69,7 +69,7 @@ static void __init tegra30_dt_init(void) | |||
69 | } | 69 | } |
70 | 70 | ||
71 | static const char *tegra30_dt_board_compat[] = { | 71 | static const char *tegra30_dt_board_compat[] = { |
72 | "nvidia,cardhu", | 72 | "nvidia,tegra30", |
73 | NULL | 73 | NULL |
74 | }; | 74 | }; |
75 | 75 | ||
diff --git a/arch/arm/mach-tegra/board-harmony-power.c b/arch/arm/mach-tegra/board-harmony-power.c index 21d1285731b3..c0298b3f7d63 100644 --- a/arch/arm/mach-tegra/board-harmony-power.c +++ b/arch/arm/mach-tegra/board-harmony-power.c | |||
@@ -36,13 +36,14 @@ static struct regulator_consumer_supply tps658621_ldo0_supply[] = { | |||
36 | 36 | ||
37 | static struct regulator_init_data ldo0_data = { | 37 | static struct regulator_init_data ldo0_data = { |
38 | .constraints = { | 38 | .constraints = { |
39 | .min_uV = 1250 * 1000, | 39 | .min_uV = 3300 * 1000, |
40 | .max_uV = 3300 * 1000, | 40 | .max_uV = 3300 * 1000, |
41 | .valid_modes_mask = (REGULATOR_MODE_NORMAL | | 41 | .valid_modes_mask = (REGULATOR_MODE_NORMAL | |
42 | REGULATOR_MODE_STANDBY), | 42 | REGULATOR_MODE_STANDBY), |
43 | .valid_ops_mask = (REGULATOR_CHANGE_MODE | | 43 | .valid_ops_mask = (REGULATOR_CHANGE_MODE | |
44 | REGULATOR_CHANGE_STATUS | | 44 | REGULATOR_CHANGE_STATUS | |
45 | REGULATOR_CHANGE_VOLTAGE), | 45 | REGULATOR_CHANGE_VOLTAGE), |
46 | .apply_uV = 1, | ||
46 | }, | 47 | }, |
47 | .num_consumer_supplies = ARRAY_SIZE(tps658621_ldo0_supply), | 48 | .num_consumer_supplies = ARRAY_SIZE(tps658621_ldo0_supply), |
48 | .consumer_supplies = tps658621_ldo0_supply, | 49 | .consumer_supplies = tps658621_ldo0_supply, |