From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 27 Mar 2018 13:26:32 +0000 (+0200)
Subject: Merge tag 'qcom-arm64-defconfig-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b899e522612d2a82bbb5d2a557c77ba4dcb0fbaf;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'qcom-arm64-defconfig-for-4.17' of ssh://gitolite./linux/kernel/git/agross/linux into next/soc

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>
---

b899e522612d2a82bbb5d2a557c77ba4dcb0fbaf
diff --cc arch/arm64/configs/defconfig
index 3fdaf10eaa2b,a37130b54fae..1d3b40615efb
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -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
@@@ -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
@@@ -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