Merge branch 'l4t/l4t-r16' into colibri

Merge with latest NVIDIA L4T R16.

Only real conflict concerning inverted VBUS gpio support.

6 files changed, 39 insertions, 12 deletions

diff --git a/arch/arm/configs/tegra3_android_defconfig b/arch/arm/configs/tegra3_android_defconfig
index 4aab2283e215..0ab4493d3205 100644
--- a/arch/arm/configs/tegra3_android_defconfig
+++ b/arch/arm/configs/tegra3_android_defconfig
@@ -26,6 +26,9 @@ CONFIG_ARCH_TEGRA=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_TEGRA_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_POWERSAVE=y
 CONFIG_MACH_CARDHU=y
 CONFIG_MACH_TEGRA_ENTERPRISE=y
 CONFIG_MACH_KAI=y
@@ -173,13 +176,13 @@ CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_BLUESLEEP=y
-CONFIG_BT_TIBLUESLEEP=y
 CONFIG_BT_WILINK=m
 CONFIG_CFG80211=m
 CONFIG_NL80211_TESTMODE=y
 CONFIG_LIB80211=m
 CONFIG_MAC80211=m
 CONFIG_RFKILL=y
+CONFIG_RFKILL_GPIO=y
 CONFIG_CAIF=y
 CONFIG_NFC=y
 CONFIG_PN544_NFC=y
@@ -191,7 +194,7 @@ CONFIG_AD525X_DPOT_I2C=y
 CONFIG_APDS9802ALS=y
 CONFIG_SENSORS_NCT1008=y
 CONFIG_UID_STAT=y
-CONFIG_BCM4329_RFKILL=y
+# CONFIG_BCM4329_RFKILL is not set
 CONFIG_TEGRA_CRYPTO_DEV=y
 CONFIG_MAX1749_VIBRATOR=y
 CONFIG_EEPROM_AT24=y
@@ -219,6 +222,7 @@ CONFIG_DM_CRYPT=y
 CONFIG_DM_UEVENT=y
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
+CONFIG_TUN=y
 # CONFIG_NETDEV_10000 is not set
 CONFIG_BCM4329=m
 CONFIG_BCM4329_FIRST_SCAN=y
@@ -229,6 +233,7 @@ CONFIG_BCM4329_HW_OOB=y
 CONFIG_BCM4329_OOB_INTR_ONLY=y
 CONFIG_BCM4329_CSCAN_ENABLE=y
 CONFIG_BCMDHD=m
+CONFIG_DHD_ENABLE_P2P=y
 CONFIG_BCMDHD_CFG80211=y
 CONFIG_BCMDHD_WIFI_CONTROL_FUNC=y
 CONFIG_BCMDHD_HW_OOB=y
@@ -292,6 +297,7 @@ CONFIG_SPI_TEGRA=y
 CONFIG_SPI_SLAVE_TEGRA=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_RC5T583=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_BATTERY_BQ20Z75=y
 CONFIG_BATTERY_BQ27x00=y
@@ -307,16 +313,22 @@ CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
 CONFIG_MFD_MAX77663=y
 CONFIG_MFD_TPS6591X=y
+CONFIG_MFD_RC5T583=y
 CONFIG_MFD_TPS80031=y
 CONFIG_GPADC_TPS80031=y
 CONFIG_MFD_RICOH583=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
+CONFIG_REGULATOR_USERSPACE_CONSUMER=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_MAX8973=y
 CONFIG_REGULATOR_MAX77663=y
+CONFIG_REGULATOR_RC5T583=y
 CONFIG_REGULATOR_TPS6586X=y
 CONFIG_REGULATOR_TPS65910=y
 CONFIG_REGULATOR_TPS62360=y
+CONFIG_REGULATOR_TPS6238X0=y
 CONFIG_REGULATOR_TPS6591X=y
 CONFIG_REGULATOR_TPS80031=y
 CONFIG_REGULATOR_RICOH583=y
@@ -328,13 +340,16 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 # CONFIG_TEGRA_AVP is not set
 # CONFIG_TEGRA_MEDIASERVER is not set
 CONFIG_TEGRA_NVAVP=y
+CONFIG_TEGRA_NVAVP_AUDIO=y
 CONFIG_VIDEO_OV5650=y
+CONFIG_VIDEO_OV5640=y
 CONFIG_VIDEO_OV9726=y
 CONFIG_VIDEO_OV2710=y
 CONFIG_VIDEO_AR0832=y
 CONFIG_TORCH_SSL3250A=y
 CONFIG_TORCH_TPS61050=y
 CONFIG_VIDEO_SH532U=y
+CONFIG_VIDEO_AD5816=y
 CONFIG_USB_VIDEO_CLASS=y
 # CONFIG_USB_GSPCA is not set
 # CONFIG_RADIO_ADAPTERS is not set
@@ -381,7 +396,7 @@ CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_SERIAL_BASEBAND=m
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_FSL_USB2=y
+CONFIG_USB_TEGRA=y
 CONFIG_USB_G_ANDROID=y
 CONFIG_USB_TEGRA_OTG=y
 CONFIG_MMC=y
@@ -436,6 +451,7 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DEBUG_FS=y
 CONFIG_LOCKUP_DETECTOR=y
 # CONFIG_DETECT_HUNG_TASK is not set
diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig
index 1243cb8ac51e..86d74c113a23 100644
--- a/arch/arm/configs/tegra3_defconfig
+++ b/arch/arm/configs/tegra3_defconfig
@@ -27,6 +27,9 @@ CONFIG_ARCH_TEGRA=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_TEGRA_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_POWERSAVE=y
 CONFIG_MACH_CARDHU=y
 CONFIG_MACH_TEGRA_ENTERPRISE=y
 CONFIG_TEGRA_PWM=y
@@ -180,6 +183,7 @@ CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_BLUESLEEP=y
+CONFIG_CFG80211=y
 CONFIG_RFKILL=y
 CONFIG_CAIF=y
 CONFIG_NFC=y
@@ -192,7 +196,6 @@ CONFIG_AD525X_DPOT=y
 CONFIG_AD525X_DPOT_I2C=y
 CONFIG_ICS932S401=y
 CONFIG_APDS9802ALS=y
-CONFIG_ISL29003=y
 CONFIG_SENSORS_NCT1008=y
 CONFIG_UID_STAT=y
 CONFIG_BCM4329_RFKILL=y
@@ -290,8 +293,8 @@ CONFIG_SENSORS_TEGRA_TSENSOR=y
 CONFIG_SENSORS_INA219=y
 CONFIG_THERMAL=y
 CONFIG_MFD_TPS6586X=y
-CONFIG_MFD_MAX8907C=y
 CONFIG_MFD_TPS65910=y
+CONFIG_MFD_MAX8907C=y
 CONFIG_MFD_MAX77663=y
 CONFIG_MFD_TPS6591X=y
 CONFIG_MFD_TPS80031=y
@@ -300,6 +303,7 @@ CONFIG_MFD_RICOH583=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
+CONFIG_REGULATOR_USERSPACE_CONSUMER=y
 CONFIG_REGULATOR_MAX8907C=y
 CONFIG_REGULATOR_MAX77663=y
 CONFIG_REGULATOR_TPS6586X=y
@@ -364,7 +368,7 @@ CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_SERIAL_BASEBAND=m
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_FSL_USB2=y
+CONFIG_USB_TEGRA=y
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_TEGRA_OTG=y
 CONFIG_MMC=y
@@ -383,6 +387,7 @@ CONFIG_RTC_DRV_TPS80031=y
 CONFIG_RTC_DRV_RC5T583=y
 CONFIG_STAGING=y
 CONFIG_IIO=y
+CONFIG_SENSORS_ISL29028=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
diff --git a/arch/arm/configs/tegra_android_defconfig b/arch/arm/configs/tegra_android_defconfig
index b679b4096996..eb6abec87b70 100644
--- a/arch/arm/configs/tegra_android_defconfig
+++ b/arch/arm/configs/tegra_android_defconfig
@@ -170,6 +170,7 @@ CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_BLUESLEEP=y
 CONFIG_CFG80211=y
 CONFIG_RFKILL=y
+CONFIG_RFKILL_GPIO=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_MISC_DEVICES=y
@@ -178,7 +179,7 @@ CONFIG_AD525X_DPOT_I2C=y
 CONFIG_APDS9802ALS=y
 CONFIG_SENSORS_NCT1008=y
 CONFIG_UID_STAT=y
-CONFIG_BCM4329_RFKILL=y
+# CONFIG_BCM4329_RFKILL is not set
 CONFIG_TEGRA_CRYPTO_DEV=y
 CONFIG_MAX1749_VIBRATOR=y
 CONFIG_MPU_SENSORS_TIMERIRQ=y
@@ -200,6 +201,7 @@ CONFIG_DM_CRYPT=y
 CONFIG_DM_UEVENT=y
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
+CONFIG_TUN=y
 CONFIG_R8169=y
 # CONFIG_NETDEV_10000 is not set
 CONFIG_BCM4329=m
@@ -324,7 +326,7 @@ CONFIG_USB_SERIAL_PL2303=y
 CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_FSL_USB2=y
+CONFIG_USB_TEGRA=y
 CONFIG_USB_G_ANDROID=y
 CONFIG_USB_TEGRA_OTG=y
 CONFIG_MMC=y
@@ -380,6 +382,7 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_VM=y
+CONFIG_FUNCTION_TRACER=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_TWOFISH=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 39a9d7314a12..e7b72881f054 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -271,6 +271,7 @@ CONFIG_BATTERY_BQ20Z75=y
 CONFIG_CHARGER_GPIO=y
 CONFIG_SENSORS_ADT7461=y
 CONFIG_SENSORS_LM90=y
+CONFIG_THERMAL=y
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_MAX8907C=y
 CONFIG_REGULATOR=y
@@ -328,7 +329,7 @@ CONFIG_USB_SERIAL_PL2303=y
 CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_FSL_USB2=y
+CONFIG_USB_TEGRA=y
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_TEGRA_OTG=y
 CONFIG_MMC=y
diff --git a/arch/arm/configs/tegra_p1852_gnu_linux_defconfig b/arch/arm/configs/tegra_p1852_gnu_linux_defconfig
index 1afacd7b3cb9..7a1435a4024a 100644
--- a/arch/arm/configs/tegra_p1852_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_p1852_gnu_linux_defconfig
@@ -31,9 +31,12 @@ CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_TEGRA_PCI=y
 CONFIG_MACH_P1852=y
 CONFIG_TEGRA_PWM=y
+CONFIG_TEGRA_P1852_TDM=y
 # CONFIG_TEGRA_CPU_DVFS is not set
 CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
 # CONFIG_TEGRA_MC_EARLY_ACK is not set
+CONFIG_NON_ALIASED_COHERENT_MEM=y
+CONFIG_ARM_ERRATA_742230=y
 CONFIG_ARM_ERRATA_743622=y
 CONFIG_ARM_ERRATA_751472=y
 CONFIG_ARM_ERRATA_752520=y
@@ -133,7 +136,6 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_TPS6591X=y
-CONFIG_REGULATOR_TPS6236X=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 # CONFIG_TEGRA_AVP is not set
@@ -144,8 +146,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
 CONFIG_TEGRA_GRHOST=y
 CONFIG_TEGRA_DC=y
-CONFIG_TEGRA_DC_EXTENSIONS=y
-CONFIG_NVMAP_SEARCH_GLOBAL_HANDLES=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -170,6 +170,7 @@ CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
+CONFIG_MMC_BKOPS=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_TEGRA=y
diff --git a/arch/arm/configs/tegra_p852_gnu_linux_defconfig b/arch/arm/configs/tegra_p852_gnu_linux_defconfig
index 7539158200c1..9f7e71711c4f 100644
--- a/arch/arm/configs/tegra_p852_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_p852_gnu_linux_defconfig
@@ -248,6 +248,7 @@ CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_PL2303=y
 CONFIG_USB_TEGRA_OTG=y
 CONFIG_MMC=y
+CONFIG_MMC_BKOPS=y
 CONFIG_MMC_UNSAFE_RESUME=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_SDHCI=y