ARM: config: tegra12: Re-generate defconfig

Bug 1365722

Change-Id: Ia29c3bc2bcb523d6850ae55cf15e86e3537ac272
Signed-off-by: Preetham Chandru R <pchandru@nvidia.com>
Reviewed-on: http://git-master/r/273220
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Tested-by: Matthew Pedro <mapedro@nvidia.com>

diff --git a/arch/arm/configs/tegra12_defconfig b/arch/arm/configs/tegra12_defconfig
index c3571cd33348fff9ce0e55df4db470625b25f787..17317da48e6ecbf6456ebd0944df196c496e659a 100644 (file)
--- a/arch/arm/configs/tegra12_defconfig
+++ b/arch/arm/configs/tegra12_defconfig
@@ -29,16 +29,15 @@ CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_TEGRA_12x_SOC=y
 CONFIG_TEGRA_PCI=y
 CONFIG_MACH_ARDBEG=y
+CONFIG_MACH_LOKI=y
 CONFIG_MACH_LAGUNA=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
 CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
 CONFIG_TEGRA_EDP_LIMITS=y
-CONFIG_USB_HOTPLUG=y
+CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ=1400
+CONFIG_TEGRA_EHCI_BOOST_CPU_FREQ=800
 CONFIG_TEGRA_DYNAMIC_PWRDET=y
-CONFIG_TEGRA_BB_XMM_POWER=y
-CONFIG_TEGRA_BB_XMM_POWER2=m
 CONFIG_TEGRA_PREPOWER_WIFI=y
-CONFIG_TEGRA_SKIN_THROTTLE=y
 CONFIG_TEGRA_PLLM_SCALED=y
 CONFIG_TEGRA_MC_DOMAINS=y
 # CONFIG_CACHE_L2X0 is not set
@@ -63,6 +62,7 @@ CONFIG_CPUQUIET_FRAMEWORK=y
 CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_PM_RUNTIME=y
+CONFIG_SUSPEND_TIME=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -89,6 +89,7 @@ CONFIG_INET6_IPCOMP=y
 CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_TUNNEL=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
@@ -140,6 +141,10 @@ CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_REJECT_SKERR=y
+CONFIG_NF_NAT_IPV4=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_NETMAP=y
+CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_MANGLE=y
 CONFIG_IP_NF_RAW=y
 CONFIG_IP_NF_ARPTABLES=y
@@ -173,9 +178,6 @@ CONFIG_RFKILL_GPIO=y
 CONFIG_CAIF=y
 CONFIG_NFC=y
 CONFIG_BCM2079X_NFC=y
-CONFIG_PN544_NFC=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_CMA=y
 CONFIG_PLATFORM_ENABLE_IOMMU=y
@@ -190,19 +192,14 @@ CONFIG_THERM_EST=y
 CONFIG_FAN_THERM_EST=y
 CONFIG_BLUEDROID_PM=y
 CONFIG_EEPROM_AT24=y
-CONFIG_TI_ST=y
-CONFIG_ST_GPS=m
 CONFIG_TEGRA_BB_SUPPORT=y
 CONFIG_TEGRA_USB_MODEM_POWER=y
-CONFIG_TEGRA_BB_POWER=y
-CONFIG_TEGRA_BB_OEM1=y
+CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_MULTI_LUN=y
-CONFIG_ATA=y
-CONFIG_SATA_AHCI_TEGRA=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=y
@@ -228,18 +225,11 @@ CONFIG_USB_NET_SMSC95XX=y
 # CONFIG_USB_NET_ZAURUS is not set
 CONFIG_USB_NET_RAW_IP=m
 CONFIG_BCMDHD=m
+CONFIG_BCM43241=y
 CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm4330/fw_bcmdhd.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/nvram_4330.txt"
-CONFIG_BCMDHD_CFG80211=y
 CONFIG_BCMDHD_HW_OOB=y
 CONFIG_BCMDHD_INSMOD_NO_FW_LOAD=y
-CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y
-CONFIG_BCM4335=m
-CONFIG_BCM4335_FW_PATH="/lib/firmware/bcm4335/fw_bcmdhd.bin"
-CONFIG_BCM4335_NVRAM_PATH="/lib/firmware/nvram_4335.txt"
-CONFIG_BCM4335_WIFI_CONTROL_FUNC=y
-CONFIG_BCM4335_HW_OOB=y
-CONFIG_SD8797=m
 # CONFIG_INPUT_MOUSEDEV is not set
 CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
@@ -260,6 +250,7 @@ CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_GPIO=y
 CONFIG_INV_AK8975=m
 CONFIG_INV_MPU=m
+CONFIG_INV_BMP180=m
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVKMEM is not set
@@ -276,7 +267,6 @@ CONFIG_I2C_TEGRA=y
 CONFIG_SPI=y
 CONFIG_SPI_TEGRA114=y
 CONFIG_PINCTRL_PALMAS=y
-CONFIG_PINCTRL_AS3722=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_AS3722=y
@@ -284,10 +274,11 @@ CONFIG_GPIO_MAX77663=y
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_MAX77660=y
-CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_SUPPLY_EXTCON=y
-CONFIG_CHARGER_MAX77665=y
+CONFIG_CHARGER_BQ2419X=y
+CONFIG_CHARGER_BQ2471X=y
 CONFIG_BATTERY_SBS=y
+CONFIG_BATTERY_BQ27441=y
 CONFIG_CHARGER_GPIO=y
 CONFIG_CHARGER_EXTCON_MAX77660=y
 CONFIG_POWER_RESET=y
@@ -302,17 +293,17 @@ CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_MAX77660_SYSTEM_WATCHDOG=y
-CONFIG_MFD_TPS6586X=y
-CONFIG_MFD_TPS65910=y
-CONFIG_MFD_TPS80031=y
+CONFIG_GPADC_TPS80031=y
 CONFIG_AIC3XXX_CORE=y
+CONFIG_MFD_RC5T583=y
 CONFIG_MFD_MAX8831=y
 CONFIG_MFD_AS3722=y
+CONFIG_MFD_PALMAS=y
 CONFIG_MFD_MAX77663=y
 CONFIG_MFD_TPS65090=y
-CONFIG_MFD_RC5T583=y
-CONFIG_GPADC_TPS80031=y
-CONFIG_MFD_PALMAS=y
+CONFIG_MFD_TPS6586X=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS80031=y
 CONFIG_MFD_MAX77660=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -333,13 +324,17 @@ CONFIG_REGULATOR_TPS80031=y
 CONFIG_REGULATOR_TPS6238X0=y
 CONFIG_REGULATOR_MAX77660=y
 CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
-# CONFIG_TEGRA_MEDIASERVER is not set
+# CONFIG_TEGRA_RPC is not set
 CONFIG_TEGRA_NVAVP=y
 CONFIG_TEGRA_NVAVP_AUDIO=y
 CONFIG_VIDEO_OV5640=y
 CONFIG_VIDEO_AR0832=y
 CONFIG_VIDEO_IMX091=y
+CONFIG_VIDEO_IMX135=y
+CONFIG_VIDEO_AR0261=y
 CONFIG_VIDEO_IMX132=y
 CONFIG_VIDEO_OV9772=y
 CONFIG_TORCH_SSL3250A=y
@@ -347,15 +342,17 @@ CONFIG_MAX77665_FLASH=y
 CONFIG_TORCH_MAX77387=y
 CONFIG_TORCH_AS364X=y
 CONFIG_VIDEO_AD5816=y
-# CONFIG_RADIO_ADAPTERS is not set
+CONFIG_VIDEO_DW9718=y
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
 CONFIG_TEGRA_GRHOST=y
+# CONFIG_TEGRA_GRHOST_SYNC is not set
 CONFIG_TEGRA_DC=y
 CONFIG_TEGRA_DSI=y
 CONFIG_TEGRA_DSI2EDP_SN65DSI86=y
 CONFIG_TEGRA_DP=y
 CONFIG_TEGRA_GK20A_PMU=y
+CONFIG_TEGRA_GK20A_PERFMON=y
 # CONFIG_TEGRA_CAMERA is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
@@ -363,22 +360,11 @@ CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_BACKLIGHT_TEGRA_PWM=y
 CONFIG_BACKLIGHT_MAX8831=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_PLATFORM_DRIVER=y
-CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=10
+# CONFIG_SND_PCI is not set
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_TEGRA=y
-CONFIG_SND_SOC_TEGRA_TLV320AIC326X=y
-CONFIG_SND_SOC_TEGRA_RT5639=y
-CONFIG_SND_SOC_TEGRA_RT5640=y
-CONFIG_SND_SOC_TEGRA_RT5645=y
-CONFIG_SND_SOC_TEGRA_CS42L73=y
 CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_ACRUX=y
@@ -445,7 +431,6 @@ CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=y
 CONFIG_I2C_HID=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_SUSPEND=y
 CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 CONFIG_USB_XHCI_HCD=y
@@ -459,12 +444,12 @@ CONFIG_USB_SERIAL_PL2303=y
 CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_SERIAL_BASEBAND=m
 CONFIG_USB_RENESAS_MODEM=y
+CONFIG_USB_TEGRA_OTG=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_TEGRA=y
 CONFIG_USB_ETH=m
 CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_TEGRA_OTG=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_BLOCK_MINORS=16
@@ -484,23 +469,21 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AS3722=y
 CONFIG_RTC_DRV_MAX77663=y
 CONFIG_RTC_DRV_TPS6586X=y
-CONFIG_RTC_DRV_RC5T583=y
 CONFIG_RTC_DRV_TPS80031=y
+CONFIG_RTC_DRV_RC5T583=y
 CONFIG_RTC_DRV_PALMAS=y
 CONFIG_RTC_DRV_MAX77660=y
 CONFIG_DMADEVICES=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_STAGING=y
-CONFIG_AS3722_ADC_EXTCON=y
 CONFIG_MAX77660_ADC=y
+CONFIG_AS3722_ADC_EXTCON=y
 CONFIG_PALMAS_GPADC=y
-CONFIG_SENSORS_ISL29028=y
-CONFIG_PALMAS_GPADC=y
-CONFIG_SENSORS_MAX44005=y
+CONFIG_SENSORS_CM3218=y
+CONFIG_SENSORS_JSA1127=y
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_EXTCON=y
-CONFIG_EXTCON_MAX77665=y
 CONFIG_EXTCON_PALMAS=y
 CONFIG_IIO=y
 CONFIG_PWM=y
@@ -520,10 +503,8 @@ CONFIG_FUSE_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_NTFS_FS=y
 CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_NFS_FS=y
 CONFIG_ROOT_NFS=y
-CONFIG_CIFS=m
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
@@ -542,8 +523,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
-CONFIG_TRACEDUMP=y
-CONFIG_TRACEDUMP_PROCFS=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TWOFISH=y