Merge tag 'qcom-arm64-defconfig-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux...

Pull "Qualcomm ARM64 Based defconfig Updates for v4.17" from Andy Gross:

* Enable cpufreq governors, QCOM TSENS, and QCOM APCS driver

* tag 'qcom-arm64-defconfig-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: defconfig: enable more cpufreq governors
  arm64: defconfig: enable thermal sensor on QCOM platforms
  arm64: defconfig: Enable the APCS IPC driver on Qualcomm platforms

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm64/configs/defconfig
index 3fdaf10eaa2ba1e15169819108cfa8a6421d2a5d,a37130b54faed6b025306485f4906ec2bb6a9300..1d3b40615efbb2cddae9f1531d94c638bd668848
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -31,6 -31,7 +31,6 @@@ CONFIG_PROFILING=
  CONFIG_JUMP_LABEL=y
  CONFIG_MODULES=y
  CONFIG_MODULE_UNLOAD=y
 -# CONFIG_IOSCHED_DEADLINE is not set
  CONFIG_ARCH_SUNXI=y
  CONFIG_ARCH_ALPINE=y
  CONFIG_ARCH_BCM2835=y
@@@ -50,14 -51,11 +50,14 @@@ CONFIG_ARCH_SEATTLE=
  CONFIG_ARCH_RENESAS=y
  CONFIG_ARCH_R8A7795=y
  CONFIG_ARCH_R8A7796=y
 +CONFIG_ARCH_R8A77965=y
  CONFIG_ARCH_R8A77970=y
 +CONFIG_ARCH_R8A77980=y
  CONFIG_ARCH_R8A77995=y
  CONFIG_ARCH_STRATIX10=y
  CONFIG_ARCH_TEGRA=y
  CONFIG_ARCH_SPRD=y
 +CONFIG_ARCH_SYNQUACER=y
  CONFIG_ARCH_THUNDER=y
  CONFIG_ARCH_THUNDER2=y
  CONFIG_ARCH_UNIPHIER=y
@@@ -101,11 -99,18 +101,19 @@@ CONFIG_HIBERNATION=
  CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
  CONFIG_ARM_CPUIDLE=y
  CONFIG_CPU_FREQ=y
+ CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+ CONFIG_CPU_FREQ_GOV_COMMON=y
+ CONFIG_CPU_FREQ_STAT=y
+ CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+ CONFIG_CPU_FREQ_GOV_USERSPACE=y
+ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
  CONFIG_CPUFREQ_DT=y
  CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
  CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
  CONFIG_ARM_SCPI_CPUFREQ=y
 +CONFIG_ARM_TEGRA186_CPUFREQ=y
  CONFIG_ACPI_CPPC_CPUFREQ=m
  CONFIG_NET=y
  CONFIG_PACKET=y
@@@ -212,7 -217,6 +220,7 @@@ CONFIG_QCOM_EMAC=
  CONFIG_RAVB=y
  CONFIG_SMC91X=y
  CONFIG_SMSC911X=y
 +CONFIG_SNI_NETSEC=y
  CONFIG_STMMAC_ETH=m
  CONFIG_MDIO_BUS_MUX_MMIOREG=y
  CONFIG_AT803X_PHY=m
@@@ -309,7 -313,6 +317,7 @@@ CONFIG_PINCTRL_MSM8996=
  CONFIG_PINCTRL_QDF2XXX=y
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_GPIO_DWAPB=y
 +CONFIG_GPIO_MB86S7X=y
  CONFIG_GPIO_PL061=y
  CONFIG_GPIO_RCAR=y
  CONFIG_GPIO_UNIPHIER=y
@@@ -332,8 -335,8 +340,9 @@@ CONFIG_THERMAL_EMULATION=
  CONFIG_BRCMSTB_THERMAL=m
  CONFIG_EXYNOS_THERMAL=y
  CONFIG_RCAR_GEN3_THERMAL=y
+ CONFIG_QCOM_TSENS=y
  CONFIG_ROCKCHIP_THERMAL=m
 +CONFIG_TEGRA_BPMP_THERMAL=m
  CONFIG_WATCHDOG=y
  CONFIG_S3C2410_WATCHDOG=y
  CONFIG_MESON_GXBB_WATCHDOG=m
@@@ -450,14 -453,12 +459,14 @@@ CONFIG_NOP_USB_XCEIV=
  CONFIG_USB_ULPI=y
  CONFIG_USB_GADGET=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
 +CONFIG_USB_RENESAS_USB3=m
  CONFIG_USB_ULPI_BUS=y
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
  CONFIG_MMC_ARMMMCI=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_ACPI=y
 +CONFIG_MMC_SDHCI_F_SDH30=y
  CONFIG_MMC_SDHCI_PLTFM=y
  CONFIG_MMC_SDHCI_OF_ARASAN=y
  CONFIG_MMC_SDHCI_OF_ESDHC=y
@@@ -508,7 -509,6 +517,7 @@@ CONFIG_QCOM_BAM_DMA=
  CONFIG_QCOM_HIDMA_MGMT=y
  CONFIG_QCOM_HIDMA=y
  CONFIG_RCAR_DMAC=y
 +CONFIG_RENESAS_USB_DMAC=m
  CONFIG_VFIO=y
  CONFIG_VFIO_PCI=y
  CONFIG_VIRTIO_PCI=y
@@@ -534,8 -534,8 +543,9 @@@ CONFIG_ARM_MHU=
  CONFIG_PLATFORM_MHU=y
  CONFIG_BCM2835_MBOX=y
  CONFIG_HI6220_MBOX=y
+ CONFIG_QCOM_APCS_IPC=y
  CONFIG_ROCKCHIP_IOMMU=y
 +CONFIG_TEGRA_IOMMU_SMMU=y
  CONFIG_ARM_SMMU=y
  CONFIG_ARM_SMMU_V3=y
  CONFIG_QCOM_IOMMU=y
@@@ -549,10 -549,7 +559,10 @@@ CONFIG_ROCKCHIP_PM_DOMAINS=
  CONFIG_ARCH_TEGRA_132_SOC=y
  CONFIG_ARCH_TEGRA_210_SOC=y
  CONFIG_ARCH_TEGRA_186_SOC=y
 +CONFIG_ARCH_TEGRA_194_SOC=y
  CONFIG_EXTCON_USB_GPIO=y
 +CONFIG_MEMORY=y
 +CONFIG_TEGRA_MC=y
  CONFIG_IIO=y
  CONFIG_EXYNOS_ADC=y
  CONFIG_ROCKCHIP_SARADC=m
@@@ -560,12 -557,10 +570,12 @@@ CONFIG_PWM=
  CONFIG_PWM_BCM2835=m
  CONFIG_PWM_CROS_EC=m
  CONFIG_PWM_MESON=m
 +CONFIG_PWM_RCAR=m
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_PWM_SAMSUNG=y
  CONFIG_PWM_TEGRA=m
  CONFIG_PHY_RCAR_GEN3_USB2=y
 +CONFIG_PHY_RCAR_GEN3_USB3=m
  CONFIG_PHY_HI6220_USB=y
  CONFIG_PHY_QCOM_USB_HS=y
  CONFIG_PHY_SUN4I_USB=y
@@@ -577,7 -572,7 +587,8 @@@ CONFIG_PHY_XGENE=
  CONFIG_PHY_TEGRA_XUSB=y
  CONFIG_QCOM_L2_PMU=y
  CONFIG_QCOM_L3_PMU=y
 +CONFIG_MESON_EFUSE=m
+ CONFIG_QCOM_QFPROM=y
  CONFIG_UNIPHIER_EFUSE=y
  CONFIG_TEE=y
  CONFIG_OPTEE=y
@@@ -645,6 -640,3 +656,6 @@@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=
  CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
  CONFIG_CRYPTO_CHACHA20_NEON=m
  CONFIG_CRYPTO_AES_ARM64_BS=m
 +CONFIG_CRYPTO_SHA512_ARM64_CE=m
 +CONFIG_CRYPTO_SHA3_ARM64=m
 +CONFIG_CRYPTO_SM3_ARM64_CE=m