diff options
| author | Graziano Misuraca <gmisuraca@nvidia.com> | 2013-12-12 15:59:54 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@nvidia.com> | 2013-12-15 13:44:35 -0800 |
| commit | 0c723058fe6f1f180f84d95fc5193e79c89cd0f5 (patch) | |
| tree | 80bb8feece0d75845aad9f149892ca1f87d0aaff | |
| parent | d8afefac05d8769adbf6334eadf2c9b028683c55 (diff) | |
Arm: Tegra: Add E1936 pmic support
Change-Id: I396bf6ee32c92bdf56d84033fc874abad44b61e7
Signed-off-by: Graziano Misuraca <gmisuraca@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-ardbeg-power.c | 15 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-ardbeg.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra-board-id.h | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-ardbeg-power.c b/arch/arm/mach-tegra/board-ardbeg-power.c index 61047ec4c738..37b3dfc84ae7 100644 --- a/arch/arm/mach-tegra/board-ardbeg-power.c +++ b/arch/arm/mach-tegra/board-ardbeg-power.c @@ -1147,6 +1147,7 @@ static int __init ardbeg_cl_dvfs_init(struct board_info *pmu_board_info) } if (pmu_board_id == BOARD_E1736 || + pmu_board_id == BOARD_E1936 || pmu_board_id == BOARD_E1769 || pmu_board_id == BOARD_P1761) { e1736_fill_reg_map(); @@ -1195,11 +1196,9 @@ int __init ardbeg_regulator_init(void) regulator_has_full_constraints(); ardbeg_tps65913_regulator_init(); } else if (pmu_board_info.board_id == BOARD_E1736 || - pmu_board_info.board_id == BOARD_E1769) { - tn8_regulator_init(); - ardbeg_cl_dvfs_init(&pmu_board_info); - return tn8_fixed_regulator_init(); - } else if (pmu_board_info.board_id == BOARD_P1761) { + pmu_board_info.board_id == BOARD_E1936 || + pmu_board_info.board_id == BOARD_E1769 || + pmu_board_info.board_id == BOARD_P1761) { tn8_regulator_init(); ardbeg_cl_dvfs_init(&pmu_board_info); return tn8_fixed_regulator_init(); @@ -1245,7 +1244,8 @@ static int __init ardbeg_fixed_regulator_init(void) return platform_add_devices(fixed_reg_devs_e1735, ARRAY_SIZE(fixed_reg_devs_e1735)); else if (pmu_board_info.board_id == BOARD_E1736 || - pmu_board_info.board_id == BOARD_P1761) + pmu_board_info.board_id == BOARD_P1761 || + pmu_board_info.board_id == BOARD_E1936) return 0; else pr_warn("The PMU board id 0x%04x is not supported\n", @@ -1452,7 +1452,8 @@ int __init ardbeg_soctherm_init(void) ardbeg_soctherm_data.tshut_pmu_trip_data = &tpdata_as3722; else if (pmu_board_info.board_id == BOARD_E1735 || pmu_board_info.board_id == BOARD_E1736 || - pmu_board_info.board_id == BOARD_E1769) + pmu_board_info.board_id == BOARD_E1769 || + pmu_board_info.board_id == BOARD_E1936) ;/* tpdata_palmas is default */ else pr_warn("soctherm THERMTRIP is not supported on this PMIC\n"); diff --git a/arch/arm/mach-tegra/board-ardbeg.c b/arch/arm/mach-tegra/board-ardbeg.c index 82ee3a18b81c..a8d370b46252 100644 --- a/arch/arm/mach-tegra/board-ardbeg.c +++ b/arch/arm/mach-tegra/board-ardbeg.c @@ -657,6 +657,7 @@ static void ardbeg_usb_init(void) case BOARD_E1736: case BOARD_E1769: case BOARD_E1735: + case BOARD_E1936: case BOARD_P1761: /* Device cable is detected through PMU Interrupt */ tegra_udc_pdata.support_pmu_vbus = true; diff --git a/arch/arm/mach-tegra/tegra-board-id.h b/arch/arm/mach-tegra/tegra-board-id.h index b0106b1d9a67..aa4615317e12 100644 --- a/arch/arm/mach-tegra/tegra-board-id.h +++ b/arch/arm/mach-tegra/tegra-board-id.h @@ -84,6 +84,7 @@ #define BOARD_E1735 0x6c7 #define BOARD_E1736 0x6c8 #define BOARD_E1769 0x6e9 +#define BOARD_E1936 0x790 #define BOARD_E2545 0x9f1 /* Board Fab version */ |