ARM: tegra: p852: Update pm_power_off registration

Opt into the tps6586x registering the pm_power_off handler instead of
doing it ourselves.

Change-Id: Ia722505aa3ee6eba8dd5ebe7769d784045d76ec4
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/83604
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>

3 files changed, 1 insertions, 20 deletions

diff --git a/arch/arm/mach-tegra/p852/board-p852-power.c b/arch/arm/mach-tegra/p852/board-p852-power.c
index dce9bd7e83e2..71f6e85d25c5 100644
--- a/arch/arm/mach-tegra/p852/board-p852-power.c
+++ b/arch/arm/mach-tegra/p852/board-p852-power.c
@@ -150,6 +150,7 @@ static struct tps6586x_platform_data tps_platform = {
 	.num_subdevs = ARRAY_SIZE(tps_devs),
 	.subdevs = tps_devs,
 	.gpio_base = TEGRA_NR_GPIOS,
+	.use_power_off = true,
 };
 
 static struct i2c_board_info __initdata p852_regulators[] = {
@@ -170,23 +171,6 @@ static struct tegra_suspend_platform_data p852_suspend_data = {
 	.sysclkreq_high	= true,
 };
 
-static void p852_power_off(void)
-{
-	int ret;
-
-	ret = tps6586x_power_off();
-	if (ret)
-		pr_err("p852: failed to power off\n");
-
-	while (1)
-		;
-}
-
-void __init p852_power_off_init(void)
-{
-	pm_power_off = p852_power_off;
-}
-
 static void __init tps6586x_rtc_preinit(void)
 {
 	int i;
diff --git a/arch/arm/mach-tegra/p852/board-p852.c b/arch/arm/mach-tegra/p852/board-p852.c
index 44d86bee50e1..48c0dcdb04b9 100644
--- a/arch/arm/mach-tegra/p852/board-p852.c
+++ b/arch/arm/mach-tegra/p852/board-p852.c
@@ -678,8 +678,6 @@ void __init p852_common_init(void)
 	p852_sdhci_init();
 
 	p852_gpio_init();
-
-	p852_power_off_init();
 }
 
 void __init tegra_p852_init(void)
diff --git a/arch/arm/mach-tegra/p852/board-p852.h b/arch/arm/mach-tegra/p852/board-p852.h
index 6be80ca14d8f..bb43febb4a2c 100644
--- a/arch/arm/mach-tegra/p852/board-p852.h
+++ b/arch/arm/mach-tegra/p852/board-p852.h
@@ -83,7 +83,6 @@ void p852_i2c_init(void);
 void p852_i2c_set_default_clock(int adapter, unsigned long clock);
 void p852_pinmux_init(void);
 void p852_gpio_init(void);
-void p852_power_off_init(void);
 
 void p852_sku1_init(void);
 void p852_sku1_b00_init(void);