[PATCH] UBUNTU: [Config] highbank: ecx1000: CPU_IDLE causes instabilities, disable it

[Paolo Pisati]

The highbank cpuidle driver has some stability problems. Disable it for
now.

Signed-off-by: Rob Herring <rob.herring at calxeda.com>
Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/config/armhf/config.flavour.generic      | 1 +
 debian.master/config/armhf/config.flavour.generic-lpae | 1 +
 debian.master/config/config.common.ubuntu              | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic
index a9d43f1..4259a57 100644
--- a/debian.master/config/armhf/config.flavour.generic
+++ b/debian.master/config/armhf/config.flavour.generic
@@ -12,6 +12,7 @@ CONFIG_ARCH_TEGRA=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 # CONFIG_ARM_LPAE is not set
 # CONFIG_COMPACTION is not set
+# CONFIG_CPU_IDLE_CALXEDA is not set
 CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_DDC=m
 CONFIG_FB_SVGALIB=m
diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae
index 2c655c4..8ea0d6e 100644
--- a/debian.master/config/armhf/config.flavour.generic-lpae
+++ b/debian.master/config/armhf/config.flavour.generic-lpae
@@ -12,6 +12,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 # CONFIG_ARM_ATAG_DTB_COMPAT is not set
 CONFIG_ARM_LPAE=y
 CONFIG_COMPACTION=y
+CONFIG_CPU_IDLE_CALXEDA=y
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_SVGALIB is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index cccb684..1c14ee5 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1133,7 +1133,6 @@ CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_HAS_ASID=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_CALXEDA=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
-- 
1.8.3.2