ARM: defconfig: Enable H/W stat mon for ventana

Change-Id: I5ca8d77e29382e22c46deee7355e8ab59e6e4154
Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com>
Reviewed-on: http://git-master/r/43026
Reviewed-by: Niket Sirsi <nsirsi@nvidia.com>
Tested-by: Niket Sirsi <nsirsi@nvidia.com>

3 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig
index 172f2378312e..0f7184ea2c4a 100644
--- a/arch/arm/configs/tegra_android_defconfig
+++ b/arch/arm/configs/tegra_android_defconfig
@@ -30,6 +30,7 @@ CONFIG_MACH_VENTANA=y
 CONFIG_TEGRA_DEBUG_UARTD=y
 CONFIG_TEGRA_PWM=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+# CONFIG_TEGRA_CPU_DVFS is not set
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -193,7 +194,6 @@ CONFIG_BCM4329_FW_PATH="/system/vendor/firmware/fw_bcm4329.bin"
 CONFIG_BCM4329_NVRAM_PATH="/system/etc/nvram.txt"
 CONFIG_BCM4329_WIFI_CONTROL_FUNC=y
 CONFIG_USB_USBNET=y
-# CONFIG_USB_NET_AX8817X is not set
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_BELKIN is not set
 # CONFIG_USB_ARMLINUX is not set
@@ -255,6 +255,7 @@ CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_VIDEO_OV5650=y
 CONFIG_VIDEO_OV2710=y
+CONFIG_TORCH_SSL3250A=y
 CONFIG_VIDEO_SH532U=y
 CONFIG_USB_VIDEO_CLASS=y
 # CONFIG_USB_GSPCA is not set
@@ -294,13 +295,13 @@ CONFIG_USB_ANDROID_ADB=y
 CONFIG_USB_ANDROID_MASS_STORAGE=y
 CONFIG_USB_ANDROID_MTP=y
 CONFIG_USB_ANDROID_RNDIS=y
+CONFIG_USB_ANDROID_ACCESSORY=y
 CONFIG_USB_TEGRA_OTG=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set
-# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_TEGRA=y
 CONFIG_SWITCH=y
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 229c5fea6132..0e909b98c62d 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -32,6 +32,7 @@ CONFIG_TEGRA_PWM=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
 CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
 CONFIG_TEGRA_MC_PROFILE=y
+CONFIG_TEGRA_STAT_MON=y
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -295,15 +296,14 @@ CONFIG_USB_ANDROID=y
 CONFIG_USB_ANDROID_ADB=y
 CONFIG_USB_ANDROID_MASS_STORAGE=y
 CONFIG_USB_ANDROID_MTP=y
-CONFIG_USB_ANDROID_ACCESSORY=y
 CONFIG_USB_ANDROID_RNDIS=y
+CONFIG_USB_ANDROID_ACCESSORY=y
 CONFIG_USB_TEGRA_OTG=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set
-# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_TEGRA=y
 CONFIG_SWITCH=y
diff --git a/arch/arm/configs/tegra_secure_os_defconfig b/arch/arm/configs/tegra_secure_os_defconfig
index 27cc073cebd2..f2ba4f7990c6 100644
--- a/arch/arm/configs/tegra_secure_os_defconfig
+++ b/arch/arm/configs/tegra_secure_os_defconfig
@@ -30,6 +30,7 @@ CONFIG_MACH_VENTANA=y
 CONFIG_TEGRA_DEBUG_UARTD=y
 CONFIG_TEGRA_PWM=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+CONFIG_TEGRA_STAT_MON=y
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -193,7 +194,6 @@ CONFIG_BCM4329_FW_PATH="/system/vendor/firmware/fw_bcm4329.bin"
 CONFIG_BCM4329_NVRAM_PATH="/system/etc/nvram.txt"
 CONFIG_BCM4329_WIFI_CONTROL_FUNC=y
 CONFIG_USB_USBNET=y
-
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_BELKIN is not set
 # CONFIG_USB_ARMLINUX is not set
@@ -294,15 +294,14 @@ CONFIG_USB_ANDROID=y
 CONFIG_USB_ANDROID_ADB=y
 CONFIG_USB_ANDROID_MASS_STORAGE=y
 CONFIG_USB_ANDROID_MTP=y
-CONFIG_USB_ANDROID_ACCESSORY=y
 CONFIG_USB_ANDROID_RNDIS=y
+CONFIG_USB_ANDROID_ACCESSORY=y
 CONFIG_USB_TEGRA_OTG=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set
-# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_TEGRA=y
 CONFIG_SWITCH=y
@@ -347,8 +346,8 @@ CONFIG_TIMER_STATS=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_VM=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_TWOFISH=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_TEGRA_AES=y
-CONFIG_TRUSTED_FOUNDATIONS=y