diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-12-01 14:58:15 -0800 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-15 16:54:55 -0800 |
| commit | 87f8601c668d7a8b93953bb2623028452c6f8e58 (patch) | |
| tree | 52ea827ec4c95f21d727b52baeeaf50721a038f4 | |
| parent | d8d1a1ba8b469b1d177015ab2fe87a97a5af1c73 (diff) | |
ARM: tegra: enterprise: Update tps80031 power off
Opt into the tps80031 registering the pm_power_off handler instead of
doing it ourselves.
Change-Id: I7cf4bb576fa88969332cbe9e32165a4af2fee8f0
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/83593
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise-power.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-power.c b/arch/arm/mach-tegra/board-enterprise-power.c index 3a6ea00286e9..43bfe20c9818 100644 --- a/arch/arm/mach-tegra/board-enterprise-power.c +++ b/arch/arm/mach-tegra/board-enterprise-power.c @@ -323,6 +323,7 @@ static struct tps80031_platform_data tps_platform = { .gpio_base = ENT_TPS80031_GPIO_BASE, .clk32k_init_data = clk32k_idata, .clk32k_init_data_size = ARRAY_SIZE(clk32k_idata), + .use_power_off = true, }; static struct i2c_board_info __initdata enterprise_regulators[] = { @@ -573,16 +574,6 @@ static int __init enterprise_regulators_fixed_gpio_init(void) } subsys_initcall_sync(enterprise_regulators_fixed_gpio_init); -static void enterprise_power_off(void) -{ - int ret; - pr_info("enterprise: Powering off the device\n"); - ret = tps80031_power_off(); - if (ret) - pr_err("enterprise: failed to power off\n"); - while(1); -} - void __init enterprise_tsensor_init(void) { tegra3_tsensor_init(NULL); @@ -611,7 +602,6 @@ int __init enterprise_regulator_init(void) } i2c_register_board_info(4, enterprise_regulators, 1); - pm_power_off = enterprise_power_off; is_enterprise_machine = true; return 0; |