On 07/09/2016 11:45, Matt Redfearn wrote: > This patch enables the MIPS CPS driver for MIPSr6 CPUs. > > Signed-off-by: Matt Redfearn <matt.redfearn@xxxxxxxxxx> > Reviewed-by: Paul Burton <paul.burton@xxxxxxxxxx> > Reviewed-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> > --- > > Changes in v2: None > > drivers/cpuidle/Kconfig.mips | 2 +- > drivers/cpuidle/cpuidle-cps.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/cpuidle/Kconfig.mips b/drivers/cpuidle/Kconfig.mips > index 4102be01d06a..512ee37b374b 100644 > --- a/drivers/cpuidle/Kconfig.mips > +++ b/drivers/cpuidle/Kconfig.mips > @@ -5,7 +5,7 @@ config MIPS_CPS_CPUIDLE > bool "CPU Idle driver for MIPS CPS platforms" > depends on CPU_IDLE && MIPS_CPS > depends on SYS_SUPPORTS_MIPS_CPS > - select ARCH_NEEDS_CPU_IDLE_COUPLED if MIPS_MT > + select ARCH_NEEDS_CPU_IDLE_COUPLED if MIPS_MT || CPU_MIPSR6 > select GENERIC_CLOCKEVENTS_BROADCAST if SMP > select MIPS_CPS_PM > default y > diff --git a/drivers/cpuidle/cpuidle-cps.c b/drivers/cpuidle/cpuidle-cps.c > index 1adb6980b707..926ba9871c62 100644 > --- a/drivers/cpuidle/cpuidle-cps.c > +++ b/drivers/cpuidle/cpuidle-cps.c > @@ -163,7 +163,7 @@ static int __init cps_cpuidle_init(void) > core = cpu_data[cpu].core; > device = &per_cpu(cpuidle_dev, cpu); > device->cpu = cpu; > -#ifdef CONFIG_MIPS_MT > +#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED > cpumask_copy(&device->coupled_cpus, &cpu_sibling_map[cpu]); > #endif > > -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
