diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2012-02-13 16:00:28 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-23 21:03:36 -0700 |
| commit | 57e3de2ad837f072fe5ce31aa6178f2b30c2ad64 (patch) | |
| tree | 5fdd8527e83e9ef19cec4037fa81a7f90f567303 /arch/arm | |
| parent | 0ba87fc954fb6901b48f6e38d75b0b89843012f8 (diff) | |
ARM: tegra: harmony: Update pm_power_off registration
Opt into the tps6586x registering the pm_power_off handler instead of
doing it ourselves.
Change-Id: I7859530c0c88de860c617a1a185f9cf6e8f046c5
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/83602
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Rebase-Id: R0f3fdf1de70279a847a906f911e9faaf1a39d58a
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony-power.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 18 |
2 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/mach-tegra/board-harmony-power.c b/arch/arm/mach-tegra/board-harmony-power.c index e46f7a2ae19f..6d9217fed0dd 100644 --- a/arch/arm/mach-tegra/board-harmony-power.c +++ b/arch/arm/mach-tegra/board-harmony-power.c @@ -164,6 +164,7 @@ static struct tps6586x_platform_data tps_platform = { .num_subdevs = ARRAY_SIZE(tps_devs), .subdevs = tps_devs, .gpio_base = HARMONY_GPIO_TPS6586X(0), + .use_power_off = true, }; static struct i2c_board_info __initdata harmony_regulators[] = { diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index 0cc477de0ed1..01bea8e680ca 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c @@ -30,7 +30,6 @@ #include <linux/gpio_keys.h> #include <linux/i2c.h> #include <linux/memblock.h> -#include <linux/mfd/tps6586x.h> #include <sound/wm8903.h> @@ -427,22 +426,6 @@ static struct tegra_sdhci_platform_data sdhci_pdata4 = { .is_8bit = 1, }; -static void harmony_power_off(void) -{ - int ret; - - ret = tps6586x_power_off(); - if (ret) - pr_err("harmony: failed to power off\n"); - - while (1); -} - -static void __init harmony_power_off_init(void) -{ - pm_power_off = harmony_power_off; -} - static void __init tegra_harmony_init(void) { tegra_clk_init_from_table(harmony_clk_init_table); @@ -468,7 +451,6 @@ static void __init tegra_harmony_init(void) harmony_kbc_init(); #endif harmony_pcie_init(); - harmony_power_off_init(); } void __init tegra_harmony_reserve(void) |