diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 23:10:13 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 23:10:14 +0300 |
| commit | c43ff6a81402c7c9847e14d1606598982fc6696e (patch) | |
| tree | 7065be39019136ba07f70eabf5b325f1364e16a0 /include/soc | |
| parent | 880e19294cd208775bee74e6edba0ee9c6518d88 (diff) | |
| parent | 382ac8e22b90e6334d373da03c17b319458b258e (diff) | |
| download | linux-c43ff6a81402c7c9847e14d1606598982fc6696e.tar.xz | |
Merge tag 'tegra-for-5.7-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/soc
cpuidle: tegra: Changes for v5.7-rc1
These changes unify CPU idle support for Tegra20, Tegra30 and Tegra114.
* tag 'tegra-for-5.7-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
cpuidle: tegra: Disable CC6 state if LP2 unavailable
cpuidle: tegra: Squash Tegra114 driver into the common driver
cpuidle: tegra: Squash Tegra30 driver into the common driver
cpuidle: Refactor and move out NVIDIA Tegra20 driver into drivers/cpuidle
Link: https://lore.kernel.org/r/20200313165848.2915133-9-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/soc')
| -rw-r--r-- | include/soc/tegra/cpuidle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/soc/tegra/cpuidle.h b/include/soc/tegra/cpuidle.h index 029ba1f4b2cc..5665975015d8 100644 --- a/include/soc/tegra/cpuidle.h +++ b/include/soc/tegra/cpuidle.h @@ -6,7 +6,7 @@ #ifndef __SOC_TEGRA_CPUIDLE_H__ #define __SOC_TEGRA_CPUIDLE_H__ -#if defined(CONFIG_ARM) && defined(CONFIG_ARCH_TEGRA) && defined(CONFIG_CPU_IDLE) +#ifdef CONFIG_ARM_TEGRA_CPUIDLE void tegra_cpuidle_pcie_irqs_in_use(void); #else static inline void tegra_cpuidle_pcie_irqs_in_use(void) |