Commit dd3e3f23 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-5.2-arm-soc' of... 

Merge tag 'tegra-for-5.2-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers

ARM: tegra: Core changes for v5.2-rc1

One of these patches enables PM by default on 32-bit ARM, following the
same default that we already have on 64-bit ARM. The other patch fixes a
cosmetic issue in the cpuidle driver for Tegra20 and Tegra30.

* tag 'tegra-for-5.2-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  ARM: tegra: cpuidle: Handle tick broadcasting within cpuidle core on Tegra20/30
  ARM: tegra: enforce PM requirement

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 21954712 36841ba2

arch/arm/mach-tegra/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ menuconfig ARCH_TEGRA 
	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select PINCTRL

	select PM

	select PM_OPP

	select ARCH_HAS_RESET_CONTROLLER

	select RESET_CONTROLLER

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

+2 −9
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ static struct cpuidle_driver tegra_idle_driver = { 
			.exit_latency     = 5000,

			.target_residency = 10000,

			.power_usage      = 0,

			.flags            = CPUIDLE_FLAG_COUPLED,

			.flags            = CPUIDLE_FLAG_COUPLED |

			                    CPUIDLE_FLAG_TIMER_STOP,

			.name             = "powered-down",

			.desc             = "CPU power gated",

		},
@@ -136,12 +137,8 @@ static bool tegra20_cpu_cluster_power_down(struct cpuidle_device *dev, 
	if (tegra20_reset_cpu_1() || !tegra_cpu_rail_off_ready())

		return false;



	tick_broadcast_enter();



	tegra_idle_lp2_last();



	tick_broadcast_exit();



	if (cpu_online(1))

		tegra20_wake_cpu1_from_reset();
@@ -153,14 +150,10 @@ static bool tegra20_idle_enter_lp2_cpu_1(struct cpuidle_device *dev, 
					 struct cpuidle_driver *drv,

					 int index)

{

	tick_broadcast_enter();



	cpu_suspend(0, tegra20_sleep_cpu_secondary_finish);



	tegra20_cpu_clear_resettable();



	tick_broadcast_exit();



	return true;

}

#else

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

+1 −8
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ static struct cpuidle_driver tegra_idle_driver = { 
			.exit_latency		= 2000,

			.target_residency	= 2200,

			.power_usage		= 0,

			.flags			= CPUIDLE_FLAG_TIMER_STOP,

			.name			= "powered-down",

			.desc			= "CPU power gated",

		},
@@ -76,12 +77,8 @@ static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev, 
		return false;

	}



	tick_broadcast_enter();



	tegra_idle_lp2_last();



	tick_broadcast_exit();



	return true;

}
@@ -90,14 +87,10 @@ static bool tegra30_cpu_core_power_down(struct cpuidle_device *dev, 
					struct cpuidle_driver *drv,

					int index)

{

	tick_broadcast_enter();



	smp_wmb();



	cpu_suspend(0, tegra30_sleep_cpu_secondary_finish);



	tick_broadcast_exit();



	return true;

}

#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE