Linux v4.9.4 rebase

1 files changed, 40 insertions, 10 deletions

diff --git a/config-arm64 b/config-arm64
index 0bc9b30bd..8cca6201c 100644
--- a/config-arm64
+++ b/config-arm64
@@ -23,6 +23,7 @@ CONFIG_ARCH_THUNDER=y
 # CONFIG_ARCH_ZYNQMP is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_LG1K is not set
+# CONFIG_ARCH_ZX is not set
 
 # Erratum
 CONFIG_ARM64_ERRATUM_826319=y
@@ -36,6 +37,7 @@ CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
+CONFIG_FSL_ERRATUM_A008585=y
 
 # AMBA / VExpress
 # CONFIG_RTC_DRV_PL030 is not set
@@ -45,9 +47,11 @@ CONFIG_ARM_SMMU_V3=y
 CONFIG_NR_CPUS=256
 
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARM64_64K_PAGES=y
 
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_ARM64_VA_BITS=48
+
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
 CONFIG_ARM64_LSE_ATOMICS=y
@@ -59,6 +63,7 @@ CONFIG_ARM64_UAO=y
 # CONFIG_RANDOMIZE_BASE is not set
 
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
+CONFIG_ACPI_WATCHDOG=y
 
 CONFIG_BCMA_POSSIBLE=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
@@ -75,7 +80,6 @@ CONFIG_HVC_DRIVER=y
 CONFIG_HZ=100
 
 CONFIG_KVM=y
-CONFIG_KVM_NEW_VGIC=y
 
 CONFIG_RCU_FANOUT=64
 CONFIG_SPARSE_IRQ=y
@@ -135,6 +139,7 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 # APM Xgene
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_COMMON_CLK_XGENE=y
+CONFIG_XGENE_PMU=y
 CONFIG_AHCI_XGENE=y
 CONFIG_PHY_XGENE=y
 CONFIG_NET_XGENE=m
@@ -149,6 +154,7 @@ CONFIG_PCI_XGENE_MSI=y
 CONFIG_I2C_XGENE_SLIMPRO=m
 CONFIG_XGENE_SLIMPRO_MBOX=m
 CONFIG_MDIO_XGENE=m
+CONFIG_SENSORS_XGENE=m
 
 # AMD Seattle
 CONFIG_NET_SB1000=y
@@ -175,6 +181,8 @@ CONFIG_DRM_HISI_KIRIN=m
 CONFIG_HISI_KIRIN_DW_DSI=m
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_INPUT_HISI_POWERKEY=m
+# CONFIG_K3_DMA is not set
+# CONFIG_I2C_HIX5HD2 is not set
 
 # Tegra
 CONFIG_ARCH_TEGRA_132_SOC=y
@@ -184,19 +192,20 @@ CONFIG_MFD_MAX77620=y
 CONFIG_PINCTRL_MAX77620=m
 CONFIG_REGULATOR_MAX77620=m
 CONFIG_GPIO_MAX77620=m
-CONFIG_TEGRA_ACONNECT=y
+CONFIG_TEGRA_ACONNECT=m
 
 # AllWinner
-CONFIG_MACH_SUN50I=y
-CONFIG_SUNXI_RSB=m
 CONFIG_AHCI_SUNXI=m
 CONFIG_NET_VENDOR_ALLWINNER=y
-# CONFIG_SUN4I_EMAC is not set
 CONFIG_SUN8I_EMAC=m
+# CONFIG_SUN4I_EMAC is not set
 # CONFIG_MDIO_SUN4I is not set
 # CONFIG_KEYBOARD_SUN4I_LRADC is not set
 # CONFIG_TOUCHSCREEN_SUN4I is not set
 # CONFIG_SERIO_SUN4I_PS2 is not set
+CONFIG_SUNXI_RSB=y
+CONFIG_MFD_AC100=m
+CONFIG_RTC_DRV_AC100=m
 CONFIG_SUNXI_WATCHDOG=m
 CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_IR_SUNXI=m
@@ -224,9 +233,26 @@ CONFIG_MFD_QCOM_RPM=m
 CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_MSM8916=y
 CONFIG_PINCTRL_MSM8996=y
+CONFIG_PINCTRL_QDF2XXX=y
+CONFIG_COMMON_CLK_QCOM=m
+# CONFIG_MSM_GCC_8916 is not set
+# CONFIG_MSM_LCC_8960 is not set
+CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_MMCC_8084=m
+CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_MMCC_8960=m
+CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_MMCC_8974=m
+CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_MMCC_8996=m
+# CONFIG_MDM_GCC_9615 is not set
+# CONFIG_MDM_LCC_9615 is not set
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_QCOM_BAM_DMA=y
+CONFIG_QCOM_HIDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_HWSPINLOCK_QCOM=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_CRYPTO_DEV_QCE=m
@@ -264,12 +290,14 @@ CONFIG_QCOM_COINCELL=m
 # CONFIG_PINCTRL_MSM8960 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
 # CONFIG_PINCTRL_MSM8X74 is not set
-# CONFIG_PINCTRL_QDF2XXX is not set
 # CONFIG_INPUT_PM8941_PWRKEY is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
 # CONFIG_QCOM_Q6V5_PIL is not set
+# CONFIG_QCOM_WCNSS_PIL is not set
+# CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_TSENS is not set
 
 # mvebu
 # CONFIG_MV_XOR_V2 is not set
@@ -283,7 +311,11 @@ CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
 CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
 # CONFIG_LIQUIDIO is not set
+CONFIG_SPI_THUNDERX=m
+CONFIG_I2C_THUNDERX=m
+CONFIG_HW_RANDOM_CAVIUM=m
 
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SATA_AHCI_SEATTLE=m
@@ -294,7 +326,7 @@ CONFIG_ND_BTT=m
 CONFIG_ND_BLK=m
 
 # CONFIG_PMIC_OPREGION is not set
-# CONFIG_DEBUG_RODATA is not set
+# CONFIG_DEBUG_ALIGN_RODATA is not set
 
 CONFIG_DEBUG_SECTION_MISMATCH=y
 
@@ -310,9 +342,7 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
 # CONFIG_VGA_CONSOLE is not set
 
 # CONFIG_HOTPLUG_PCI_SHPC is not set
-
 # CONFIG_FSL_MC_BUS is not set
 # CONFIG_FUJITSU_ES is not set
-# CONFIG_IMX_THERMAL is not set
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 # CONFIG_BCM_PDC_MBOX is not set