diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-12-01 15:14:40 -0800 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-15 17:03:49 -0800 |
| commit | 0fc5f9bad189e49d473da8e9ddd08a9bd45eac4d (patch) | |
| tree | 933e0d70d26655c430239dc5f576144741b68321 /arch/arm | |
| parent | 88b5905d67d7ba03e98008fdcb4bf7874bcade18 (diff) | |
ARM: tegra: ventana: Update pm_power_off registration
Opt into the tps6586x registering the pm_power_off handler instead of
doing it ourselves.
Change-Id: I8363a3b4f5626bb45b2118559c3ab67e247e3172
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/83599
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana-power.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana.c | 17 |
2 files changed, 1 insertions, 17 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-power.c b/arch/arm/mach-tegra/board-ventana-power.c index 3ab178d8ebf8..7cdafcb3c05a 100644 --- a/arch/arm/mach-tegra/board-ventana-power.c +++ b/arch/arm/mach-tegra/board-ventana-power.c @@ -203,6 +203,7 @@ static struct tps6586x_platform_data tps_platform = { .num_subdevs = ARRAY_SIZE(tps_devs), .subdevs = tps_devs, .gpio_base = TPS6586X_GPIO_BASE, + .use_power_off = true, }; static struct i2c_board_info __initdata ventana_regulators[] = { diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 21278d1f4417..a7f051a6c726 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -554,22 +554,6 @@ static int __init ventana_gps_init(void) return 0; } -static void ventana_power_off(void) -{ - int ret; - - ret = tps6586x_power_off(); - if (ret) - pr_err("ventana: failed to power off\n"); - - while(1); -} - -static void __init ventana_power_off_init(void) -{ - pm_power_off = ventana_power_off; -} - static void ventana_usb_init(void) { tegra_usb_phy_init(tegra_usb_phy_pdata, ARRAY_SIZE(tegra_usb_phy_pdata)); @@ -621,7 +605,6 @@ static void __init tegra_ventana_init(void) ventana_panel_init(); ventana_sensors_init(); ventana_bt_rfkill(); - ventana_power_off_init(); ventana_emc_init(); ventana_setup_bluesleep(); |