Merge tag 'qcom-arm64-defconfig-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel...

Qualcomm ARM64 Based defconfig Updates for v4.8

* Enable PM8xxx pwrkey support
* Enable MSM8996 support

* tag 'qcom-arm64-defconfig-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: defconfig: enable msm8996 pinctrl support
  arm64: defconfig: Enable qcom msm8996 clk drivers
  arm: defconfig: Enable PM8941 pwr key

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm64/configs/defconfig
index e8a99ee,0f19eed..d0a7359
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -63,7 -63,6 +63,7 @@@ CONFIG_PCI_XGENE=
  CONFIG_PCI_LAYERSCAPE=y
  CONFIG_PCI_HISI=y
  CONFIG_PCIE_QCOM=y
 +CONFIG_PCIE_ARMADA_8K=y
  CONFIG_ARM64_VA_BITS_48=y
  CONFIG_SCHED_MC=y
  CONFIG_PREEMPT=y
@@@ -102,7 -101,6 +102,7 @@@ CONFIG_MTD_M25P80=
  CONFIG_MTD_SPI_NOR=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_VIRTIO_BLK=y
 +CONFIG_SRAM=y
  # CONFIG_SCSI_PROC_FS is not set
  CONFIG_BLK_DEV_SD=y
  # CONFIG_SCSI_LOWLEVEL is not set
@@@ -122,7 -120,6 +122,7 @@@ CONFIG_TUN=
  CONFIG_VIRTIO_NET=y
  CONFIG_AMD_XGBE=y
  CONFIG_NET_XGENE=y
 +CONFIG_MACB=y
  CONFIG_E1000E=y
  CONFIG_IGB=y
  CONFIG_IGBVF=y
@@@ -130,8 -127,6 +130,8 @@@ CONFIG_SKY2=
  CONFIG_RAVB=y
  CONFIG_SMC91X=y
  CONFIG_SMSC911X=y
 +CONFIG_STMMAC_ETH=m
 +CONFIG_REALTEK_PHY=m
  CONFIG_MICREL_PHY=y
  CONFIG_USB_PEGASUS=m
  CONFIG_USB_RTL8150=m
@@@ -147,6 -142,8 +147,8 @@@ CONFIG_WL18XX=
  CONFIG_WLCORE_SDIO=m
  CONFIG_INPUT_EVDEV=y
  CONFIG_KEYBOARD_GPIO=y
+ CONFIG_INPUT_MISC=y
+ CONFIG_INPUT_PM8941_PWRKEY=y
  # CONFIG_SERIO_SERPORT is not set
  CONFIG_SERIO_AMBAKMI=y
  CONFIG_LEGACY_PTY_COUNT=16
@@@ -191,6 -188,7 +193,7 @@@ CONFIG_SPI_SPIDEV=
  CONFIG_SPMI=y
  CONFIG_PINCTRL_SINGLE=y
  CONFIG_PINCTRL_MSM8916=y
+ CONFIG_PINCTRL_MSM8996=y
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_DWAPB=y
@@@ -202,7 -200,6 +205,7 @@@ CONFIG_POWER_RESET_XGENE=
  CONFIG_POWER_RESET_SYSCON=y
  CONFIG_SENSORS_LM90=m
  CONFIG_SENSORS_INA2XX=m
 +CONFIG_SENSORS_ARM_SCPI=y
  CONFIG_THERMAL=y
  CONFIG_THERMAL_EMULATION=y
  CONFIG_EXYNOS_THERMAL=y
@@@ -291,6 -288,7 +294,7 @@@ CONFIG_COMMON_CLK_CS2000_CP=
  CONFIG_CLK_QORIQ=y
  CONFIG_COMMON_CLK_QCOM=y
  CONFIG_MSM_GCC_8916=y
+ CONFIG_MSM_MMCC_8996=y
  CONFIG_HWSPINLOCK_QCOM=y
  CONFIG_MAILBOX=y
  CONFIG_ARM_MHU=y
@@@ -349,5 -347,5 +353,5 @@@ CONFIG_CRYPTO_SHA2_ARM64_CE=
  CONFIG_CRYPTO_GHASH_ARM64_CE=y
  CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
  CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 -CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 +# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
  CONFIG_CRYPTO_CRC32_ARM64=y