diff options
author | Tony Lindgren <tony@atomide.com> | 2012-06-28 03:09:26 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-06-28 03:09:26 -0400 |
commit | 0810048713c829f626d8323519f69091ad2480b0 (patch) | |
tree | 7af441293e72ea68f4eb7a6de6c7250a242119bb /arch/arm/mach-omap2/twl-common.c | |
parent | 4348be7a589d587cf0a314bdd1d848e1b9cf9c0b (diff) | |
parent | 3e7b706ca5151849e4ca91f7f3d8d6d8d8f7b667 (diff) |
Merge branch 'for_3.6/cleanup/twl-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes-non-critical
Diffstat (limited to 'arch/arm/mach-omap2/twl-common.c')
-rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 5447c135633f..afafd83c84c0 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c | |||
@@ -213,10 +213,6 @@ static struct twl_regulator_driver_data omap3_vdd2_drvdata = { | |||
213 | void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data, | 213 | void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data, |
214 | u32 pdata_flags, u32 regulators_flags) | 214 | u32 pdata_flags, u32 regulators_flags) |
215 | { | 215 | { |
216 | if (!pmic_data->irq_base) | ||
217 | pmic_data->irq_base = TWL4030_IRQ_BASE; | ||
218 | if (!pmic_data->irq_end) | ||
219 | pmic_data->irq_end = TWL4030_IRQ_END; | ||
220 | if (!pmic_data->vdd1) { | 216 | if (!pmic_data->vdd1) { |
221 | omap3_vdd1.driver_data = &omap3_vdd1_drvdata; | 217 | omap3_vdd1.driver_data = &omap3_vdd1_drvdata; |
222 | omap3_vdd1_drvdata.data = voltdm_lookup("mpu_iva"); | 218 | omap3_vdd1_drvdata.data = voltdm_lookup("mpu_iva"); |
@@ -481,11 +477,6 @@ static struct regulator_init_data omap4_v2v1_idata = { | |||
481 | void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data, | 477 | void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data, |
482 | u32 pdata_flags, u32 regulators_flags) | 478 | u32 pdata_flags, u32 regulators_flags) |
483 | { | 479 | { |
484 | if (!pmic_data->irq_base) | ||
485 | pmic_data->irq_base = TWL6030_IRQ_BASE; | ||
486 | if (!pmic_data->irq_end) | ||
487 | pmic_data->irq_end = TWL6030_IRQ_END; | ||
488 | |||
489 | if (!pmic_data->vdd1) { | 480 | if (!pmic_data->vdd1) { |
490 | omap4_vdd1.driver_data = &omap4_vdd1_drvdata; | 481 | omap4_vdd1.driver_data = &omap4_vdd1_drvdata; |
491 | omap4_vdd1_drvdata.data = voltdm_lookup("mpu"); | 482 | omap4_vdd1_drvdata.data = voltdm_lookup("mpu"); |