chromeos: config: enable PM_DEVFREQ

Recent kernel changes have made it required to enable PM_DEVFREQ which
is used for scaling in nvhost. This is required to be enabled otherwise
the kernel build fails with warnings about unused functions. This only
occurs if PM_DEVFREQ isn't enabled AND T114 support (which uses devfreq)
is also not enabled.

Also, renormalized configs to tot 3.4 today which pulled in a couple
more options.

Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Change-Id: I9986836c43d3bbda5ba7597c4fba64ff38f06f1c
Reviewed-on: http://git-master/r/132287
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Allen Martin <amartin@nvidia.com>

Rebase-Id: R7254099f0d05d7fe5cb9d2fee13cc65c17858daf

7 files changed, 18 insertions, 1 deletions

diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index 73ac0a13a9a5..2292d092fa9e 100644
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -434,6 +434,7 @@ CONFIG_PLAT_S5P=y
 CONFIG_PLAT_SAMSUNG=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
 CONFIG_PM_DEBUG=y
+# CONFIG_PM_DEVFREQ is not set
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PPP=m
 # CONFIG_PPPOLAC is not set
diff --git a/chromeos/config/armel/chromeos-tegra2.flavour.config b/chromeos/config/armel/chromeos-tegra2.flavour.config
index e84cbf6cd90b..a807f3eaa759 100644
--- a/chromeos/config/armel/chromeos-tegra2.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra2.flavour.config
@@ -612,6 +612,7 @@ CONFIG_PL310_ERRATA_753970=y
 CONFIG_PL310_ERRATA_769419=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
 CONFIG_PM_DEBUG=y
+# CONFIG_PM_DEVFREQ is not set
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PPP=m
 # CONFIG_PPPOLAC is not set
@@ -891,6 +892,7 @@ CONFIG_TEGRA_CORE_DVFS=y
 CONFIG_TEGRA_CPU_DVFS=y
 # CONFIG_TEGRA_CRYPTO_DEV is not set
 # CONFIG_TEGRA_DC_CMU is not set
+# CONFIG_TEGRA_DC_SCAN_COLUMN is not set
 # CONFIG_TEGRA_DEBUG_UARTA is not set
 CONFIG_TEGRA_DEBUG_UARTB=y
 # CONFIG_TEGRA_DEBUG_UARTC is not set
diff --git a/chromeos/config/armel/chromeos-tegra3.flavour.config b/chromeos/config/armel/chromeos-tegra3.flavour.config
index 5f57102db921..51a8e26b7cd3 100644
--- a/chromeos/config/armel/chromeos-tegra3.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra3.flavour.config
@@ -198,6 +198,10 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_DEFAULT_NOOP=y
 CONFIG_DEFAULT_RENO=y
 CONFIG_DEFAULT_TCP_CONG="reno"
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+# CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND is not set
+# CONFIG_DEVFREQ_GOV_USERSPACE is not set
 CONFIG_DEVPORT=y
 # CONFIG_DHD_USE_SCHED_SCAN is not set
 # CONFIG_DHD_USE_STATIC_BUF is not set
@@ -780,6 +784,7 @@ CONFIG_PL310_ERRATA_727915=y
 # CONFIG_PL310_ERRATA_753970 is not set
 CONFIG_PL310_ERRATA_769419=y
 # CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEVFREQ=y
 CONFIG_PN544_NFC=y
 CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_FILE_LAYOUT=y
@@ -1093,6 +1098,7 @@ CONFIG_TEGRA_CRYPTO_DEV=y
 CONFIG_TEGRA_DC=y
 # CONFIG_TEGRA_DC_CMU is not set
 CONFIG_TEGRA_DC_EXTENSIONS=y
+# CONFIG_TEGRA_DC_SCAN_COLUMN is not set
 # CONFIG_TEGRA_DC_USE_HW_BPP is not set
 CONFIG_TEGRA_DEBUG_UARTA=y
 # CONFIG_TEGRA_DEBUG_UARTB is not set
@@ -1122,6 +1128,7 @@ CONFIG_TEGRA_IOVMM_SMMU=y
 # CONFIG_TEGRA_IOVMM_SMMU_SYSFS is not set
 CONFIG_TEGRA_IRDA=y
 CONFIG_TEGRA_LATENCY_ALLOWANCE=y
+CONFIG_TEGRA_LATENCY_ALLOWANCE_SCALING=y
 # CONFIG_TEGRA_LP1_950 is not set
 CONFIG_TEGRA_LP2_CPU_TIMER=y
 CONFIG_TEGRA_MC_EARLY_ACK=y
@@ -1328,6 +1335,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 # CONFIG_VIDEO_HEXIUM_GEMINI is not set
 # CONFIG_VIDEO_HEXIUM_ORION is not set
 # CONFIG_VIDEO_IMX091 is not set
+# CONFIG_VIDEO_IMX132 is not set
 CONFIG_VIDEO_IR_I2C=y
 # CONFIG_VIDEO_IVTV is not set
 CONFIG_VIDEO_MEDIA=y
diff --git a/chromeos/config/armel/chromiumos-arm.flavour.config b/chromeos/config/armel/chromiumos-arm.flavour.config
index b972de3ee5a2..365602e5f272 100644
--- a/chromeos/config/armel/chromiumos-arm.flavour.config
+++ b/chromeos/config/armel/chromiumos-arm.flavour.config
@@ -612,6 +612,7 @@ CONFIG_PL310_ERRATA_727915=y
 CONFIG_PL310_ERRATA_769419=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
 CONFIG_PM_DEBUG=y
+# CONFIG_PM_DEVFREQ is not set
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PPP=m
 # CONFIG_PPPOLAC is not set
@@ -891,6 +892,7 @@ CONFIG_TEGRA_CORE_DVFS=y
 CONFIG_TEGRA_CPU_DVFS=y
 # CONFIG_TEGRA_CRYPTO_DEV is not set
 # CONFIG_TEGRA_DC_CMU is not set
+# CONFIG_TEGRA_DC_SCAN_COLUMN is not set
 # CONFIG_TEGRA_DEBUG_UARTA is not set
 CONFIG_TEGRA_DEBUG_UARTB=y
 # CONFIG_TEGRA_DEBUG_UARTC is not set
diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index 4fb8b00ae72a..3f24236a3f5e 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -354,6 +354,7 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS_XATTR=y
+# CONFIG_EXTCON is not set
 # CONFIG_EZX_PCAP is not set
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_FANOTIFY is not set
@@ -711,6 +712,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_MAX8831 is not set
 # CONFIG_LEDS_OT200 is not set
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_PCA955X is not set
@@ -751,6 +753,7 @@ CONFIG_MD=y
 # CONFIG_MFD_DA9052_I2C is not set
 # CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_MAX77665 is not set
+# CONFIG_MFD_MAX8831 is not set
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
@@ -922,7 +925,6 @@ CONFIG_PM=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_DEVFREQ is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 943a85939e2d..3f0f116a2bbe 100644
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -946,6 +946,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PID_NS=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
 CONFIG_PM_DEBUG=y
+# CONFIG_PM_DEVFREQ is not set
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index 0c4964421b6a..c2f84a544cdb 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -967,6 +967,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PID_NS=y
 # CONFIG_PM_ADVANCED_DEBUG is not set
 CONFIG_PM_DEBUG=y
+# CONFIG_PM_DEVFREQ is not set
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y