diff options
| author | Alexander Van Brunt <avanbrunt@nvidia.com> | 2014-04-05 09:21:54 -0700 |
|---|---|---|
| committer | Sridhar Lavu <slavu@nvidia.com> | 2014-04-05 12:45:14 -0700 |
| commit | 545c8757a046f3f884292d86c0aa23034a45a874 (patch) | |
| tree | e4d2d1679c0088366ec011b281e2f272e3806e23 /arch/arm/mach-tegra/board-loki-power.c | |
| parent | f04f1e7034651bf43d71765303c95a9bebc19b3f (diff) | |
Revert "ARM: tegra: prepare base for power tree support from DT for Loki"
This reverts commit f04f1e7034651bf43d71765303c95a9bebc19b3f.
bug 1440861
Change-Id: Ibdc0f8f3531a1a88f7dc777df1992c58cbf915ce
Signed-off-by: Alex Van Brunt <avanbrunt@nvidia.com>
Reviewed-on: http://git-master/r/392609
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sridhar Lavu <slavu@nvidia.com>
Tested-by: Sridhar Lavu <slavu@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-loki-power.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-loki-power.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/arch/arm/mach-tegra/board-loki-power.c b/arch/arm/mach-tegra/board-loki-power.c index e279c0dfb251..798207414553 100644 --- a/arch/arm/mach-tegra/board-loki-power.c +++ b/arch/arm/mach-tegra/board-loki-power.c @@ -774,7 +774,6 @@ int __init loki_regulator_init(void) { int i; struct board_info bi; - struct device_node *np; tegra_pmc_pmu_interrupt_polarity(true); @@ -807,6 +806,9 @@ int __init loki_regulator_init(void) } } + + i2c_register_board_info(4, palma_device, + ARRAY_SIZE(palma_device)); if (bi.board_id == BOARD_P2530 && bi.fab >= 0xa1) { pmic_platform.reg_data[PALMAS_REG_SMPS7] = PALMAS_REG_PDATA(smps7_a01); @@ -822,16 +824,6 @@ int __init loki_regulator_init(void) PALMAS_REG_INIT_DATA(ldo5_a01); } - - np = of_find_compatible_node(NULL, NULL, "ti,palmas"); - if (np) { - pr_info("Palmas registration from DT power tree\n"); - } else { - pr_info("Palmas registration from board power tree\n"); - i2c_register_board_info(4, palma_device, - ARRAY_SIZE(palma_device)); - } - platform_device_register(&power_supply_extcon_device); loki_cl_dvfs_init(); @@ -842,19 +834,12 @@ static int __init loki_fixed_regulator_init(void) { struct board_info pmu_board_info; struct board_info bi; - struct device_node *np; if ((!of_machine_is_compatible("nvidia,loki")) && (!of_machine_is_compatible("nvidia,t132loki"))) return 0; - np = of_find_compatible_node(NULL, "fixed-regulators", "simple-bus"); - if (np) { - pr_info("Fixed Regulator is from the DT\n"); - return 0; - } - tegra_get_board_info(&bi); tegra_get_pmu_board_info(&pmu_board_info); @@ -868,8 +853,8 @@ static int __init loki_fixed_regulator_init(void) return 0; } -subsys_initcall_sync(loki_fixed_regulator_init); +subsys_initcall_sync(loki_fixed_regulator_init); int __init loki_edp_init(void) { unsigned int regulator_mA; |