ARM: config: tegra11: Re-generate defconfig

Re-generated the defconfig to reflect the current kconfigs.
Also made sure that the tegra11_defconfig is similar to that
of tegra11_android_defconfig.
Removed CONFIG_TEGRA_GRHOST_SYNC as it depends on CONFIG_ANDROID

Bug 1342028

Change-Id: I26d76b1605d76a93cf4414e51362ab182299e351
Signed-off-by: Preetham Chandru R <pchandru@nvidia.com>
Reviewed-on: http://git-master/r/270078
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Tested-by: Dan Willemsen <dwillemsen@nvidia.com>

diff --git a/arch/arm/configs/tegra11_defconfig b/arch/arm/configs/tegra11_defconfig
index 28c28bb5284aa0e1e721a1076b28e689f825bb94..25d85770c040906ecc47387e38b8c27fce4e9c9b 100644 (file)
--- a/arch/arm/configs/tegra11_defconfig
+++ b/arch/arm/configs/tegra11_defconfig
@@ -240,16 +240,8 @@ CONFIG_BCM43241=y
 CONFIG_BCM43341=y
 CONFIG_BCMDHD_FW_PATH="/lib/firmware/fw_bcmdhd.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/nvram.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/fw_bcmdhd.bin"
-CONFIG_BCM4335_NVRAM_PATH="/lib/firmware/nvram.txt"
-CONFIG_BCM4335_WIFI_CONTROL_FUNC=y
-CONFIG_BCM4335_HW_OOB=y
-CONFIG_SD8797=m
 CONFIG_INPUT_FF_MEMLESS=y
 # CONFIG_INPUT_MOUSEDEV is not set
 CONFIG_INPUT_JOYDEV=y
@@ -286,6 +278,7 @@ CONFIG_I2C_TEGRA=y
 CONFIG_SPI=y
 CONFIG_SPI_TEGRA114=y
 CONFIG_PINMUX=y
+CONFIG_PINCONF=y
 CONFIG_PINCTRL_MAX77660=y
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_DEBUG_GPIO=y
@@ -295,8 +288,8 @@ CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_MAX77660=y
 CONFIG_POWER_SUPPLY_EXTCON=y
-CONFIG_TEST_POWER=y
 CONFIG_CHARGER_MAX77665=y
+CONFIG_TEST_POWER=y
 CONFIG_BATTERY_SBS=y
 CONFIG_BATTERY_BQ27x00=y
 CONFIG_CHARGER_TPS8003X=y
@@ -320,17 +313,17 @@ CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_PALMAS_WATCHDOG=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_PALMAS=y
 CONFIG_MFD_MAX77663=y
 CONFIG_MFD_TPS65090=y
-CONFIG_MFD_RC5T583=y
+CONFIG_MFD_TPS6586X=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS80031=y
 CONFIG_MFD_RICOH583=y
-CONFIG_MFD_PALMAS=y
 CONFIG_MFD_MAX77660=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -354,7 +347,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=y
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_TEGRA_MEDIASERVER is not set
 CONFIG_TEGRA_NVAVP=y
@@ -375,10 +367,11 @@ CONFIG_VIDEO_AR0833=y
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
 CONFIG_TEGRA_GRHOST=y
-CONFIG_TEGRA_GRHOST_VI=y
+# CONFIG_TEGRA_GRHOST_SYNC is not set
 CONFIG_TEGRA_DC=y
 CONFIG_TEGRA_DSI=y
-# CONFIG_TEGRA_NVHDCP is not set
+CONFIG_TEGRA_DSI2EDP_SN65DSI86=y
+CONFIG_TEGRA_NVHDCP=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -389,7 +382,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
 CONFIG_UHID=y
@@ -457,7 +450,6 @@ CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
 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
@@ -470,12 +462,12 @@ CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_PL2303=y
 CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_SERIAL_BASEBAND=m
+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_EMBEDDED_SDIO=y
@@ -503,9 +495,9 @@ CONFIG_DMADEVICES=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_STAGING=y
 CONFIG_MAX77660_ADC=y
+CONFIG_SENSORS_CM3218=y
 CONFIG_SENSORS_ISL29028=y
 CONFIG_SENSORS_MAX44005=y
-CONFIG_SENSORS_CM3218=y
 CONFIG_SENSORS_CM3217=y
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_PM_DEVFREQ=y