diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-12-01 15:18:59 -0800 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-15 17:04:23 -0800 |
| commit | 462c38a63cd5beca12e2f6e8ca27bcf250888e49 (patch) | |
| tree | aff7f9b8d64592ebe83c7dc4bfdd502c095ac80c /arch | |
| parent | 5ce373d219536927c2121ab397a4cf01ecf9fc28 (diff) | |
ARM: tegra: whistler: Update max8907c power off
Opt into max8907c registering a pm_power_off handler instead of doing it
ourselves.
Change-Id: Ie4eb76e3b7e05d1393815ace18458ce37d8a0c7c
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/83601
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler-power.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.c | 17 |
2 files changed, 1 insertions, 17 deletions
diff --git a/arch/arm/mach-tegra/board-whistler-power.c b/arch/arm/mach-tegra/board-whistler-power.c index 89ca697b92ba..10f8c3824d0b 100644 --- a/arch/arm/mach-tegra/board-whistler-power.c +++ b/arch/arm/mach-tegra/board-whistler-power.c @@ -228,6 +228,7 @@ static struct max8907c_platform_data max8907c_pdata = { .subdevs = whistler_max8907c_power_devices, .irq_base = TEGRA_NR_IRQS, .max8907c_setup = whistler_max8907c_setup, + .use_power_off = true, }; static struct i2c_board_info __initdata whistler_regulators[] = { diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index 046b327e976a..041c4dde53fe 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -538,22 +538,6 @@ static int __init whistler_gps_init(void) return 0; } -static void whistler_power_off(void) -{ - int ret; - - ret = max8907c_power_off(); - if (ret) - pr_err("whistler: failed to power off\n"); - - while (1); -} - -static void __init whistler_power_off_init(void) -{ - pm_power_off = whistler_power_off; -} - static void whistler_usb_init(void) { tegra_usb_phy_init(tegra_usb_phy_pdata, ARRAY_SIZE(tegra_usb_phy_pdata)); @@ -581,7 +565,6 @@ static void __init tegra_whistler_init(void) whistler_gps_init(); whistler_usb_init(); whistler_scroll_init(); - whistler_power_off_init(); whistler_emc_init(); if (modem_id == 0x1) whistler_baseband_init(); |