diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2011-11-08 16:24:13 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:59 -0800 |
| commit | fe1b6e548edcdb0dd7786189e570593ed9073c0d (patch) | |
| tree | 76d771dc80da5ce84e037e95b8d093f7bbb55be7 /arch/arm/mach-tegra/board-cardhu-power.c | |
| parent | f060b7365bf227bfd71584f4e24bdd27796eadbd (diff) | |
arm: tegra: cardhu: Register ricoh583 pmu driver
Registering the ricoh583 pmu driver.
Change-Id: I3547522d661852826185e50b6958234a04ca0b4b
Reviewed-on: http://git-master/r/62948
Reviewed-by: Lokesh Pathak <lpathak@nvidia.com>
Tested-by: Lokesh Pathak <lpathak@nvidia.com>
Rebase-Id: R458057614dd9db4aeb34d37de20c6753e78b3e51
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-power.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-power.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c index 447f193baab3..ab791e61c98d 100644 --- a/arch/arm/mach-tegra/board-cardhu-power.c +++ b/arch/arm/mach-tegra/board-cardhu-power.c @@ -382,12 +382,15 @@ int __init cardhu_regulator_init(void) pmc_ctrl = readl(pmc + PMC_CTRL); writel(pmc_ctrl | PMC_CTRL_INTR_LOW, pmc + PMC_CTRL); - /* The regulator details have complete constraints */ - regulator_has_full_constraints(); - tegra_get_board_info(&board_info); tegra_get_pmu_board_info(&pmu_board_info); + if (pmu_board_info.board_id == BOARD_PMU_PM299) + return cardhu_pm299_regulator_init(); + + /* The regulator details have complete constraints */ + regulator_has_full_constraints(); + /* PMU-E1208, the ldo2 should be set to 1200mV */ if (pmu_board_info.board_id == BOARD_E1208) { pdata_ldo2_0.regulator.constraints.min_uV = 1200000; @@ -947,11 +950,16 @@ int __init cardhu_gpio_switch_regulator_init(void) { int i; struct board_info board_info; + struct board_info pmu_board_info; struct board_info display_board_info; tegra_get_board_info(&board_info); + tegra_get_pmu_board_info(&pmu_board_info); tegra_get_display_board_info(&display_board_info); + if (pmu_board_info.board_id == BOARD_PMU_PM299) + return cardhu_pm299_gpio_switch_regulator_init(); + switch (board_info.board_id) { case BOARD_E1198: if (board_info.fab <= BOARD_FAB_A01) { |