LINARO: Turn on and enforce PM CONFIG options

As requested by PM team turn on:
    CONFIG_PM
    CONFIG_REGULATOR
    CONFIG_PM_DEBUG
    CONFIG_DEBUG_FS
for all flavours.

Also add these to debian.linaro/config/enforce to ensure they
are always left on.

BugLink: https://bugs.launchpad.net/bugs/672791

Turn off CONFIG_SUSPEND for vexpress because that turns on
CONFIG_HOTSWAP_CPU which is not supported on vexpress.

Turn on CONFIG_NEON for vexpress

Signed-off-by: John Rigby <john.rigby@linaro.org>

5 files changed, 15 insertions, 15 deletions

diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 9b5560de4fc..80f2d93242b 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -114,7 +114,6 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_DAVICOM_PHY=y
 # CONFIG_DCB is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DEBUG_FS=y
 # CONFIG_DECNET is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
@@ -297,7 +296,6 @@ CONFIG_MOUSE_PS2_ELANTECH=y
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_NATIONAL_PHY=y
 # CONFIG_NCP_FS is not set
-CONFIG_NEON=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
@@ -369,8 +367,6 @@ CONFIG_NO_HZ=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPS is not set
@@ -387,7 +383,6 @@ CONFIG_QUOTA=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_RDS is not set
 CONFIG_REALTEK_PHY=y
-# CONFIG_REGULATOR is not set
 # CONFIG_REISERFS_FS is not set
 CONFIG_RELAY=y
 # CONFIG_RFD_FTL is not set
@@ -456,6 +451,7 @@ CONFIG_SND_TIMER=m
 # CONFIG_STAGING is not set
 # CONFIG_STANDALONE is not set
 CONFIG_STE10XP=y
+CONFIG_SUSPEND=y
 # CONFIG_SWP_EMULATE is not set
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
 # CONFIG_SYSV_FS is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index bd0eeb08df6..a78cb08d146 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -116,7 +116,6 @@ CONFIG_CRYPTO_ZLIB=m
 CONFIG_DAVICOM_PHY=y
 CONFIG_DCB=y
 CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_FS=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
@@ -314,7 +313,6 @@ CONFIG_MTD_UBI=m
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_NATIONAL_PHY=y
 CONFIG_NCP_FS=m
-CONFIG_NEON=y
 CONFIG_NETCONSOLE=m
 CONFIG_NETDEV_1000=y
 CONFIG_NETDEV_10000=y
@@ -386,8 +384,6 @@ CONFIG_PERF_EVENTS=y
 CONFIG_PHONE=m
 CONFIG_PHONET=m
 CONFIG_PID_NS=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PPS=m
@@ -404,7 +400,6 @@ CONFIG_RAMOOPS=m
 CONFIG_RAW_DRIVER=m
 CONFIG_RDS=m
 CONFIG_REALTEK_PHY=y
-CONFIG_REGULATOR=y
 CONFIG_REISERFS_FS=m
 CONFIG_RELAY=y
 CONFIG_RFD_FTL=m
@@ -479,6 +474,7 @@ CONFIG_SSFDC=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
 CONFIG_STE10XP=y
+CONFIG_SUSPEND=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_SYSV_FS=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 2f2474c9470..d6f3984a1c4 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -116,7 +116,6 @@ CONFIG_CRYPTO_WORKQUEUE=m
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCB is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DECNET is not set
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_DEADLINE=y
@@ -312,7 +311,6 @@ CONFIG_MTD_GEN_PROBE=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_NCP_FS is not set
-# CONFIG_NEON is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
@@ -384,7 +382,6 @@ CONFIG_OABI_COMPAT=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PID_NS is not set
-# CONFIG_PM is not set
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_PPS is not set
@@ -400,7 +397,6 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_RDS is not set
 # CONFIG_REALTEK_PHY is not set
-# CONFIG_REGULATOR is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_RELAY is not set
 # CONFIG_RFD_FTL is not set
@@ -475,6 +471,7 @@ CONFIG_SOUND_OSS_CORE=y
 # CONFIG_STAGING is not set
 CONFIG_STANDALONE=y
 # CONFIG_STE10XP is not set
+# CONFIG_SUSPEND is not set
 CONFIG_SWP_EMULATE=y
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
 # CONFIG_SYSV_FS is not set
@@ -521,6 +518,7 @@ CONFIG_USB_ISP1760_HCD=y
 # CONFIG_USB_MICROTEK is not set
 CONFIG_USB_MON=y
 # CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_OTG is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 4cd53548fe6..d5a5716f3f9 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -435,6 +435,7 @@ CONFIG_DAB=y
 # CONFIG_DEBUG_DRIVER is not set
 CONFIG_DEBUG_ERRORS=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_ICEDCC is not set
@@ -1510,6 +1511,7 @@ CONFIG_NCPFS_PACKET_SIGNING=y
 # CONFIG_NCPFS_SMALLDOS is not set
 CONFIG_NCPFS_STRONG=y
 CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEON=y
 CONFIG_NET=y
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETDEVICES=y
@@ -1782,9 +1784,11 @@ CONFIG_PHYLIB=y
 # CONFIG_PLAT_SPEAR is not set
 CONFIG_PLAT_VERSATILE=y
 CONFIG_PLIP=m
+CONFIG_PM=y
 CONFIG_PMIC_ADP5520=y
 CONFIG_PMIC_DA903X=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
+CONFIG_PM_DEBUG=y
 CONFIG_PM_OPS=y
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_SLEEP=y
@@ -1852,6 +1856,7 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_88PM8607=y
 CONFIG_REGULATOR_AB3100=m
 CONFIG_REGULATOR_BQ24022=m
@@ -2285,7 +2290,6 @@ CONFIG_ST_BT=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUN_PARTITION=y
-CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND_NVS=y
 CONFIG_SWAP=y
diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce
index a1204508b99..efdebeced41 100644
--- a/debian.linaro/config/enforce
+++ b/debian.linaro/config/enforce
@@ -55,3 +55,9 @@ value CONFIG_FRAMEBUFFER_CONSOLE y
 # UbuntuSpec:foundations-m-grub2-boot-framebuffer
 (( arch i386 | arch amd64 ) & value CONFIG_FB_VESA y) | \
 	value CONFIG_FB_VESA m | !exists CONFIG_FB_VESA
+
+# standard Linaro kernel power management options
+value CONFIG_PM y
+value CONFIG_REGULATOR y
+value CONFIG_PM_DEBUG y
+value CONFIG_DEBUG_FS y