diff options
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/cpuidle-t3.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/pm.h | 2 | ||||
| -rw-r--r-- | chromeos/config/armel/config.flavour.chromeos-tegra3 | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 4b5a6c052ece..60c8ac9b82e1 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -64,7 +64,7 @@ config ARCH_TEGRA_3x_SOC select PINCTRL_TEGRA30 select PL310_ERRATA_769419 if CACHE_L2X0 select REPORT_PRESENT_CPUS if TEGRA_AUTO_HOTPLUG - select TEGRA_LP2_ARM_TWD if HAVE_ARM_TWD && !TEGRA_RAIL_OFF_MULTIPLE_CPUS + select TEGRA_LP2_CPU_TIMER if HAVE_ARM_TWD && !TEGRA_RAIL_OFF_MULTIPLE_CPUS select USB_ARCH_HAS_EHCI if USB_SUPPORT select USB_ULPI if USB_PHY select USB_ULPI_VIEWPORT if USB_PHY @@ -326,7 +326,7 @@ config TEGRA_WDT_RECOVERY Enables watchdog recovery mechanism to protect against suspend/resume hangs. -config TEGRA_LP2_ARM_TWD +config TEGRA_LP2_CPU_TIMER bool config TEGRA_RAIL_OFF_MULTIPLE_CPUS diff --git a/arch/arm/mach-tegra/cpuidle-t3.c b/arch/arm/mach-tegra/cpuidle-t3.c index a451b9302cd7..05e4b4a6313e 100644 --- a/arch/arm/mach-tegra/cpuidle-t3.c +++ b/arch/arm/mach-tegra/cpuidle-t3.c @@ -365,7 +365,7 @@ static bool tegra3_idle_enter_lp2_cpu_n(struct cpuidle_device *dev, struct tegra_twd_context twd_context; bool sleep_completed = false; struct tick_sched *ts = tick_get_tick_sched(dev->cpu); -#ifdef CONFIG_TEGRA_LP2_ARM_TWD +#ifdef CONFIG_TEGRA_LP2_CPU_TIMER void __iomem *twd_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x600); #endif @@ -376,7 +376,7 @@ static bool tegra3_idle_enter_lp2_cpu_n(struct cpuidle_device *dev, (twd_context.twd_ctrl & TWD_TIMER_CONTROL_IT_ENABLE)) { request = div_u64((u64)twd_context.twd_cnt * 1000000, twd_rate); -#ifdef CONFIG_TEGRA_LP2_ARM_TWD +#ifdef CONFIG_TEGRA_LP2_CPU_TIMER if (request >= state->target_residency) { twd_context.twd_cnt -= state->exit_latency * (twd_rate / 1000000); @@ -397,7 +397,7 @@ static bool tegra3_idle_enter_lp2_cpu_n(struct cpuidle_device *dev, return false; } -#ifndef CONFIG_TEGRA_LP2_ARM_TWD +#ifndef CONFIG_TEGRA_LP2_CPU_TIMER sleep_time = request - state->exit_latency; clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu); tegra_twd_suspend(&twd_context); @@ -425,7 +425,7 @@ static bool tegra3_idle_enter_lp2_cpu_n(struct cpuidle_device *dev, tegra_cpu_wake_by_time[dev->cpu] = LLONG_MAX; -#ifdef CONFIG_TEGRA_LP2_ARM_TWD +#ifdef CONFIG_TEGRA_LP2_CPU_TIMER if (!tegra_twd_get_state(&twd_context)) sleep_completed = (twd_context.twd_cnt == 0); #else diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h index 84a40006c507..d729d5d49bba 100644 --- a/arch/arm/mach-tegra/pm.h +++ b/arch/arm/mach-tegra/pm.h @@ -186,7 +186,7 @@ static inline unsigned long tegra_lp2_timer_remain(void) static inline int tegra_is_lp2_timer_ready(unsigned int cpu) { -#if defined(CONFIG_TEGRA_LP2_ARM_TWD) || defined(CONFIG_ARCH_TEGRA_2x_SOC) +#if defined(CONFIG_TEGRA_LP2_CPU_TIMER) || defined(CONFIG_ARCH_TEGRA_2x_SOC) return 1; #else return tegra3_is_lp2_timer_ready(cpu); diff --git a/chromeos/config/armel/config.flavour.chromeos-tegra3 b/chromeos/config/armel/config.flavour.chromeos-tegra3 index 1b6f87579921..25dffee58518 100644 --- a/chromeos/config/armel/config.flavour.chromeos-tegra3 +++ b/chromeos/config/armel/config.flavour.chromeos-tegra3 @@ -105,7 +105,7 @@ CONFIG_TEGRA_EDP_LIMITS=y CONFIG_TEGRA_EMC_TO_DDR_CLOCK=1 CONFIG_TEGRA_IOVMM_SMMU=y # CONFIG_TEGRA_IOVMM_SMMU_SYSFS is not set -CONFIG_TEGRA_LP2_ARM_TWD=y +CONFIG_TEGRA_LP2_CPU_TIMER=y # CONFIG_TEGRA_MC_EARLY_ACK is not set CONFIG_TEGRA_PCI=y CONFIG_TEGRA_PLLM_RESTRICTED=y |