Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf91add4 authored by Joseph Lo's avatar Joseph Lo Committed by Stephen Warren
Browse files

ARM: tegra: hook tegra_tear_down_cpu function in the PM suspend init function 



The tegra_tear_down_cpu was used to cut off the CPU rail for various Tegra
SoCs. Hooking it in the PM suspend init function and making the CPUidle
driver more generic.

Signed-off-by: default avatarJoseph Lo <josephl@nvidia.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent e22dc2b2

arch/arm/mach-tegra/cpuidle-tegra20.c

+0 −3
Original line number Diff line number Diff line
@@ -214,8 +214,5 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev, 


int __init tegra20_cpuidle_init(void)

{

#ifdef CONFIG_PM_SLEEP

	tegra_tear_down_cpu = tegra20_tear_down_cpu;

#endif

	return cpuidle_register(&tegra_idle_driver, cpu_possible_mask);

}

arch/arm/mach-tegra/cpuidle-tegra30.c

+0 −3
Original line number Diff line number Diff line
@@ -146,8 +146,5 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev, 


int __init tegra30_cpuidle_init(void)

{

#ifdef CONFIG_PM_SLEEP

	tegra_tear_down_cpu = tegra30_tear_down_cpu;

#endif

	return cpuidle_register(&tegra_idle_driver, NULL);

}

arch/arm/mach-tegra/pm.c

+15 −0
Original line number Diff line number Diff line
@@ -44,6 +44,20 @@ 
static DEFINE_SPINLOCK(tegra_lp2_lock);

void (*tegra_tear_down_cpu)(void);



static void tegra_tear_down_cpu_init(void)

{

	switch (tegra_chip_id) {

	case TEGRA20:

		if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))

			tegra_tear_down_cpu = tegra20_tear_down_cpu;

		break;

	case TEGRA30:

		if (IS_ENABLED(CONFIG_ARCH_TEGRA_3x_SOC))

			tegra_tear_down_cpu = tegra30_tear_down_cpu;

		break;

	}

}



/*

 * restore_cpu_complex

 *
@@ -224,6 +238,7 @@ void __init tegra_init_suspend(void) 
	if (tegra_pmc_get_suspend_mode() == TEGRA_SUSPEND_NONE)

		return;



	tegra_tear_down_cpu_init();

	tegra_pmc_suspend_init();



	suspend_set_ops(&tegra_suspend_ops);