aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBalaji T K <balajitk@ti.com>2011-02-07 10:29:59 -0500
committerTony Lindgren <tony@atomide.com>2011-02-22 11:37:03 -0500
commit530a5a50168e5e14ba2fedd5e66796156b1df565 (patch)
treec73a6b10a3fa21e122dec07f88cc153255bf218a /arch
parent73a92aa4f1d6786eaa5b4e637eee648db0dfd7a7 (diff)
OMAP4: Fix -EINVAL for vana, vcxio, vdac
Fixed regulators in twl6030 do not have set_voltage hook. Regulator core returns -22 if set_voltage is NULL and apply_uV is set while applying the constraint to set voltage resulting in failure during probe of these regulators. Do not set apply_uV for fixed regulators which don't have set_voltage. machine_constraints_voltage: VANA: failed to apply 2100000uV constraint twl_reg twl_reg.43: can't register VANA, -22 twl_reg: probe of twl_reg.43 failed with error -22 machine_constraints_voltage: VCXIO: failed to apply 1800000uV constraint twl_reg twl_reg.44: can't register VCXIO, -22 twl_reg: probe of twl_reg.44 failed with error -22 machine_constraints_voltage: VDAC: failed to apply 1800000uV constraint twl_reg twl_reg.45: can't register VDAC, -22 twl_reg: probe of twl_reg.45 failed with error -22 Signed-off-by: Balaji T K <balajitk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/board-4430sdp.c3
-rw-r--r--arch/arm/mach-omap2/board-omap4panda.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 12d99e582cd6..27d9583811c2 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -433,7 +433,6 @@ static struct regulator_init_data sdp4430_vana = {
433 .constraints = { 433 .constraints = {
434 .min_uV = 2100000, 434 .min_uV = 2100000,
435 .max_uV = 2100000, 435 .max_uV = 2100000,
436 .apply_uV = true,
437 .valid_modes_mask = REGULATOR_MODE_NORMAL 436 .valid_modes_mask = REGULATOR_MODE_NORMAL
438 | REGULATOR_MODE_STANDBY, 437 | REGULATOR_MODE_STANDBY,
439 .valid_ops_mask = REGULATOR_CHANGE_MODE 438 .valid_ops_mask = REGULATOR_CHANGE_MODE
@@ -445,7 +444,6 @@ static struct regulator_init_data sdp4430_vcxio = {
445 .constraints = { 444 .constraints = {
446 .min_uV = 1800000, 445 .min_uV = 1800000,
447 .max_uV = 1800000, 446 .max_uV = 1800000,
448 .apply_uV = true,
449 .valid_modes_mask = REGULATOR_MODE_NORMAL 447 .valid_modes_mask = REGULATOR_MODE_NORMAL
450 | REGULATOR_MODE_STANDBY, 448 | REGULATOR_MODE_STANDBY,
451 .valid_ops_mask = REGULATOR_CHANGE_MODE 449 .valid_ops_mask = REGULATOR_CHANGE_MODE
@@ -457,7 +455,6 @@ static struct regulator_init_data sdp4430_vdac = {
457 .constraints = { 455 .constraints = {
458 .min_uV = 1800000, 456 .min_uV = 1800000,
459 .max_uV = 1800000, 457 .max_uV = 1800000,
460 .apply_uV = true,
461 .valid_modes_mask = REGULATOR_MODE_NORMAL 458 .valid_modes_mask = REGULATOR_MODE_NORMAL
462 | REGULATOR_MODE_STANDBY, 459 | REGULATOR_MODE_STANDBY,
463 .valid_ops_mask = REGULATOR_CHANGE_MODE 460 .valid_ops_mask = REGULATOR_CHANGE_MODE
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index fca5b9e80c18..220d3b85431b 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -304,7 +304,6 @@ static struct regulator_init_data omap4_panda_vana = {
304 .constraints = { 304 .constraints = {
305 .min_uV = 2100000, 305 .min_uV = 2100000,
306 .max_uV = 2100000, 306 .max_uV = 2100000,
307 .apply_uV = true,
308 .valid_modes_mask = REGULATOR_MODE_NORMAL 307 .valid_modes_mask = REGULATOR_MODE_NORMAL
309 | REGULATOR_MODE_STANDBY, 308 | REGULATOR_MODE_STANDBY,
310 .valid_ops_mask = REGULATOR_CHANGE_MODE 309 .valid_ops_mask = REGULATOR_CHANGE_MODE
@@ -316,7 +315,6 @@ static struct regulator_init_data omap4_panda_vcxio = {
316 .constraints = { 315 .constraints = {
317 .min_uV = 1800000, 316 .min_uV = 1800000,
318 .max_uV = 1800000, 317 .max_uV = 1800000,
319 .apply_uV = true,
320 .valid_modes_mask = REGULATOR_MODE_NORMAL 318 .valid_modes_mask = REGULATOR_MODE_NORMAL
321 | REGULATOR_MODE_STANDBY, 319 | REGULATOR_MODE_STANDBY,
322 .valid_ops_mask = REGULATOR_CHANGE_MODE 320 .valid_ops_mask = REGULATOR_CHANGE_MODE
@@ -328,7 +326,6 @@ static struct regulator_init_data omap4_panda_vdac = {
328 .constraints = { 326 .constraints = {
329 .min_uV = 1800000, 327 .min_uV = 1800000,
330 .max_uV = 1800000, 328 .max_uV = 1800000,
331 .apply_uV = true,
332 .valid_modes_mask = REGULATOR_MODE_NORMAL 329 .valid_modes_mask = REGULATOR_MODE_NORMAL
333 | REGULATOR_MODE_STANDBY, 330 | REGULATOR_MODE_STANDBY,
334 .valid_ops_mask = REGULATOR_CHANGE_MODE 331 .valid_ops_mask = REGULATOR_CHANGE_MODE