diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2012-02-13 16:02:33 -0800 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-15 17:25:13 -0800 |
| commit | 02aaae51e68c924ef0b7b8da2add7fde082c0fdf (patch) | |
| tree | a4c477f78df174a8620805937cac390d4c4412e9 /arch | |
| parent | c5d3077ad0d936b332ecbcfef9de97329fe95337 (diff) | |
ARM: tegra: kai: Update pm_power_off registration
Opt in to the max77663 registering the pm_power_off handler instead of
doing it ourselves.
Change-Id: Ic3efbce21e12337a3f435fbc257950fb977628a0
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/83603
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-kai-power.c | 21 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-kai.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-kai.h | 1 |
3 files changed, 2 insertions, 21 deletions
diff --git a/arch/arm/mach-tegra/board-kai-power.c b/arch/arm/mach-tegra/board-kai-power.c index b9b341155f91..70db4427a094 100644 --- a/arch/arm/mach-tegra/board-kai-power.c +++ b/arch/arm/mach-tegra/board-kai-power.c @@ -317,6 +317,8 @@ static struct max77663_platform_data max7763_pdata = { .sub_devices = max77663_subdevs, .rtc_i2c_addr = 0x68, + + .use_power_off = true, }; static struct i2c_board_info __initdata max77663_regulators[] = { @@ -626,25 +628,6 @@ int __init kai_suspend_init(void) return 0; } -static void kai_power_off(void) -{ - int ret; - pr_err("kai: Powering off the device\n"); - ret = max77663_power_off(); - if (ret) - pr_err("kai: failed to power off\n"); - - while (1) - ; -} - -int __init kai_power_off_init(void) -{ - pm_power_off = kai_power_off; - - return 0; -} - static struct tegra_tsensor_pmu_data tpdata = { .poweroff_reg_addr = 0x3F, .poweroff_reg_data = 0x80, diff --git a/arch/arm/mach-tegra/board-kai.c b/arch/arm/mach-tegra/board-kai.c index a1b7c8c9abfe..cb09e4fe83b6 100644 --- a/arch/arm/mach-tegra/board-kai.c +++ b/arch/arm/mach-tegra/board-kai.c @@ -681,7 +681,6 @@ static void __init tegra_kai_init(void) kai_sdhci_init(); kai_regulator_init(); kai_suspend_init(); - kai_power_off_init(); kai_touch_init(); kai_keys_init(); kai_panel_init(); diff --git a/arch/arm/mach-tegra/board-kai.h b/arch/arm/mach-tegra/board-kai.h index 183fa3821dbf..39f5dfd4a157 100644 --- a/arch/arm/mach-tegra/board-kai.h +++ b/arch/arm/mach-tegra/board-kai.h @@ -69,7 +69,6 @@ int kai_panel_init(void); int kai_sensors_init(void); int kai_keys_init(void); int kai_pins_state_init(void); -int kai_power_off_init(void); int kai_edp_init(void); void __init kai_tsensor_init(void); int __init touch_init_raydium(void); |