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

Qualcomm ARM64 Based defconfig Updates for v4.19

* Enable Qualcomm NAND driver

* tag 'qcom-arm64-defconfig-for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: defconfig: Enable CONFIG_MTD_NAND_QCOM for IPQ8074

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

diff --combined arch/arm64/configs/defconfig
index b8db636f43906603072b2ba969f1c74252c60985,9a0fce5155d90f0d2fb3f60e8e7b62b74b5328e8..19ab9d9c00224c7e2f1c22371a9f69f6db83849f
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -47,7 -47,6 +47,7 @@@ CONFIG_ARCH_MVEBU=
  CONFIG_ARCH_QCOM=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_ARCH_SEATTLE=y
 +CONFIG_ARCH_SYNQUACER=y
  CONFIG_ARCH_RENESAS=y
  CONFIG_ARCH_R8A7795=y
  CONFIG_ARCH_R8A7796=y
@@@ -59,6 -58,7 +59,6 @@@ CONFIG_ARCH_R8A77995=
  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
@@@ -67,23 -67,25 +67,23 @@@ CONFIG_ARCH_XGENE=
  CONFIG_ARCH_ZX=y
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_PCI=y
 -CONFIG_HOTPLUG_PCI_PCIE=y
  CONFIG_PCI_IOV=y
  CONFIG_HOTPLUG_PCI=y
  CONFIG_HOTPLUG_PCI_ACPI=y
 -CONFIG_PCI_LAYERSCAPE=y
 -CONFIG_PCI_HISI=y
 -CONFIG_PCIE_QCOM=y
 -CONFIG_PCIE_KIRIN=y
 -CONFIG_PCIE_ARMADA_8K=y
 -CONFIG_PCIE_HISI_STB=y
  CONFIG_PCI_AARDVARK=y
  CONFIG_PCI_TEGRA=y
  CONFIG_PCIE_RCAR=y
 -CONFIG_PCIE_ROCKCHIP=y
 -CONFIG_PCIE_ROCKCHIP_HOST=m
  CONFIG_PCI_HOST_GENERIC=y
  CONFIG_PCI_XGENE=y
  CONFIG_PCI_HOST_THUNDER_PEM=y
  CONFIG_PCI_HOST_THUNDER_ECAM=y
 +CONFIG_PCIE_ROCKCHIP_HOST=m
 +CONFIG_PCI_LAYERSCAPE=y
 +CONFIG_PCI_HISI=y
 +CONFIG_PCIE_QCOM=y
 +CONFIG_PCIE_ARMADA_8K=y
 +CONFIG_PCIE_KIRIN=y
 +CONFIG_PCIE_HISI_STB=y
  CONFIG_ARM64_VA_BITS_48=y
  CONFIG_SCHED_MC=y
  CONFIG_NUMA=y
@@@ -102,6 -104,8 +102,6 @@@ 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
@@@ -109,11 -113,11 +109,11 @@@ CONFIG_CPU_FREQ_GOV_ONDEMAND=
  CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
  CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
  CONFIG_CPUFREQ_DT=y
 +CONFIG_ACPI_CPPC_CPUFREQ=m
  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
  CONFIG_UNIX=y
@@@ -179,6 -183,7 +179,7 @@@ CONFIG_MTD_M25P80=
  CONFIG_MTD_NAND=y
  CONFIG_MTD_NAND_DENALI_DT=y
  CONFIG_MTD_NAND_MARVELL=y
+ CONFIG_MTD_NAND_QCOM=y
  CONFIG_MTD_SPI_NOR=y
  CONFIG_BLK_DEV_LOOP=y
  CONFIG_BLK_DEV_NBD=m
@@@ -232,6 -237,11 +233,6 @@@ CONFIG_SMSC911X=
  CONFIG_SNI_AVE=y
  CONFIG_SNI_NETSEC=y
  CONFIG_STMMAC_ETH=m
 -CONFIG_DWMAC_IPQ806X=m
 -CONFIG_DWMAC_MESON=m
 -CONFIG_DWMAC_ROCKCHIP=m
 -CONFIG_DWMAC_SUNXI=m
 -CONFIG_DWMAC_SUN8I=m
  CONFIG_MDIO_BUS_MUX_MMIOREG=y
  CONFIG_AT803X_PHY=m
  CONFIG_MARVELL_PHY=m
@@@ -260,8 -270,8 +261,8 @@@ CONFIG_WL18XX=
  CONFIG_WLCORE_SDIO=m
  CONFIG_INPUT_EVDEV=y
  CONFIG_KEYBOARD_ADC=m
 -CONFIG_KEYBOARD_CROS_EC=y
  CONFIG_KEYBOARD_GPIO=y
 +CONFIG_KEYBOARD_CROS_EC=y
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ATMEL_MXT=m
  CONFIG_INPUT_MISC=y
@@@ -287,13 -297,17 +288,13 @@@ CONFIG_SERIAL_SAMSUNG=
  CONFIG_SERIAL_SAMSUNG_CONSOLE=y
  CONFIG_SERIAL_TEGRA=y
  CONFIG_SERIAL_SH_SCI=y
 -CONFIG_SERIAL_SH_SCI_NR_UARTS=11
 -CONFIG_SERIAL_SH_SCI_CONSOLE=y
  CONFIG_SERIAL_MSM=y
  CONFIG_SERIAL_MSM_CONSOLE=y
  CONFIG_SERIAL_XILINX_PS_UART=y
  CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
  CONFIG_SERIAL_MVEBU_UART=y
  CONFIG_SERIAL_DEV_BUS=y
 -CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
  CONFIG_VIRTIO_CONSOLE=y
 -CONFIG_I2C_HID=m
  CONFIG_I2C_CHARDEV=y
  CONFIG_I2C_MUX=y
  CONFIG_I2C_MUX_PCA954x=y
@@@ -312,26 -326,26 +313,26 @@@ CONFIG_I2C_RCAR=
  CONFIG_I2C_CROS_EC_TUNNEL=y
  CONFIG_SPI=y
  CONFIG_SPI_ARMADA_3700=y
 -CONFIG_SPI_MESON_SPICC=m
 -CONFIG_SPI_MESON_SPIFC=m
  CONFIG_SPI_BCM2835=m
  CONFIG_SPI_BCM2835AUX=m
 +CONFIG_SPI_MESON_SPICC=m
 +CONFIG_SPI_MESON_SPIFC=m
  CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
 -CONFIG_SPI_QUP=y
  CONFIG_SPI_ROCKCHIP=y
 +CONFIG_SPI_QUP=y
  CONFIG_SPI_S3C64XX=y
  CONFIG_SPI_SPIDEV=m
  CONFIG_SPMI=y
 -CONFIG_PINCTRL_IPQ8074=y
  CONFIG_PINCTRL_SINGLE=y
  CONFIG_PINCTRL_MAX77620=y
 +CONFIG_PINCTRL_IPQ8074=y
  CONFIG_PINCTRL_MSM8916=y
  CONFIG_PINCTRL_MSM8994=y
  CONFIG_PINCTRL_MSM8996=y
 -CONFIG_PINCTRL_MT7622=y
  CONFIG_PINCTRL_QDF2XXX=y
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 +CONFIG_PINCTRL_MT7622=y
  CONFIG_GPIO_DWAPB=y
  CONFIG_GPIO_MB86S7X=y
  CONFIG_GPIO_PL061=y
@@@ -352,27 -366,24 +353,27 @@@ CONFIG_BATTERY_BQ27XXX=
  CONFIG_SENSORS_ARM_SCPI=y
  CONFIG_SENSORS_LM90=m
  CONFIG_SENSORS_INA2XX=m
 +CONFIG_SENSORS_RASPBERRYPI_HWMON=m
  CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
  CONFIG_CPU_THERMAL=y
  CONFIG_THERMAL_EMULATION=y
 +CONFIG_ROCKCHIP_THERMAL=m
 +CONFIG_RCAR_GEN3_THERMAL=y
  CONFIG_ARMADA_THERMAL=y
  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_QCOM_TSENS=y
  CONFIG_UNIPHIER_THERMAL=y
  CONFIG_WATCHDOG=y
 +CONFIG_ARM_SP805_WATCHDOG=y
  CONFIG_S3C2410_WATCHDOG=y
  CONFIG_MESON_GXBB_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=m
  CONFIG_RENESAS_WDT=y
  CONFIG_UNIPHIER_WATCHDOG=y
  CONFIG_BCM2835_WDT=y
 +CONFIG_MFD_BD9571MWV=y
  CONFIG_MFD_AXP20X_RSB=y
  CONFIG_MFD_CROS_EC=y
  CONFIG_MFD_CROS_EC_I2C=y
@@@ -385,10 -396,9 +386,10 @@@ CONFIG_MFD_MAX77620=
  CONFIG_MFD_SPMI_PMIC=y
  CONFIG_MFD_RK808=y
  CONFIG_MFD_SEC_CORE=y
 +CONFIG_REGULATOR_FIXED_VOLTAGE=y
  CONFIG_REGULATOR_AXP20X=y
 +CONFIG_REGULATOR_BD9571MWV=y
  CONFIG_REGULATOR_FAN53555=y
 -CONFIG_REGULATOR_FIXED_VOLTAGE=y
  CONFIG_REGULATOR_GPIO=y
  CONFIG_REGULATOR_HI6421V530=y
  CONFIG_REGULATOR_HI655X=y
@@@ -398,15 -408,16 +399,15 @@@ CONFIG_REGULATOR_QCOM_SMD_RPM=
  CONFIG_REGULATOR_QCOM_SPMI=y
  CONFIG_REGULATOR_RK808=y
  CONFIG_REGULATOR_S2MPS11=y
 +CONFIG_RC_CORE=m
 +CONFIG_RC_DECODERS=y
 +CONFIG_RC_DEVICES=y
 +CONFIG_IR_MESON=m
  CONFIG_MEDIA_SUPPORT=m
  CONFIG_MEDIA_CAMERA_SUPPORT=y
  CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
  CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
  CONFIG_MEDIA_CONTROLLER=y
 -CONFIG_MEDIA_RC_SUPPORT=y
 -CONFIG_RC_CORE=m
 -CONFIG_RC_DEVICES=y
 -CONFIG_RC_DECODERS=y
 -CONFIG_IR_MESON=m
  CONFIG_VIDEO_V4L2_SUBDEV_API=y
  # CONFIG_DVB_NET is not set
  CONFIG_V4L_MEM2MEM_DRIVERS=y
@@@ -431,7 -442,8 +432,7 @@@ CONFIG_ROCKCHIP_DW_HDMI=
  CONFIG_ROCKCHIP_DW_MIPI_DSI=y
  CONFIG_ROCKCHIP_INNO_HDMI=y
  CONFIG_DRM_RCAR_DU=m
 -CONFIG_DRM_RCAR_LVDS=y
 -CONFIG_DRM_RCAR_VSP=y
 +CONFIG_DRM_RCAR_LVDS=m
  CONFIG_DRM_TEGRA=m
  CONFIG_DRM_PANEL_SIMPLE=m
  CONFIG_DRM_I2C_ADV7511=m
@@@ -444,6 -456,7 +445,6 @@@ CONFIG_FB_ARMCLCD=
  CONFIG_BACKLIGHT_GENERIC=m
  CONFIG_BACKLIGHT_PWM=m
  CONFIG_BACKLIGHT_LP855X=m
 -CONFIG_FRAMEBUFFER_CONSOLE=y
  CONFIG_LOGO=y
  # CONFIG_LOGO_LINUX_MONO is not set
  # CONFIG_LOGO_LINUX_VGA16 is not set
@@@ -456,7 -469,6 +457,7 @@@ CONFIG_SND_SOC_RCAR=
  CONFIG_SND_SOC_AK4613=m
  CONFIG_SND_SIMPLE_CARD=m
  CONFIG_SND_AUDIO_GRAPH_CARD=m
 +CONFIG_I2C_HID=m
  CONFIG_USB=y
  CONFIG_USB_OTG=y
  CONFIG_USB_XHCI_HCD=y
@@@ -490,12 -502,12 +491,12 @@@ CONFIG_MMC_BLOCK_MINORS=3
  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
  CONFIG_MMC_SDHCI_CADENCE=y
  CONFIG_MMC_SDHCI_TEGRA=y
 +CONFIG_MMC_SDHCI_F_SDH30=y
  CONFIG_MMC_MESON_GX=y
  CONFIG_MMC_SDHCI_MSM=y
  CONFIG_MMC_SPI=y
@@@ -513,11 -525,11 +514,11 @@@ CONFIG_LEDS_CLASS=
  CONFIG_LEDS_GPIO=y
  CONFIG_LEDS_PWM=y
  CONFIG_LEDS_SYSCON=y
 +CONFIG_LEDS_TRIGGER_DISK=y
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
  CONFIG_LEDS_TRIGGER_CPU=y
  CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
  CONFIG_LEDS_TRIGGER_PANIC=y
 -CONFIG_LEDS_TRIGGER_DISK=y
  CONFIG_EDAC=y
  CONFIG_EDAC_GHES=y
  CONFIG_RTC_CLASS=y
@@@ -526,13 -538,13 +527,13 @@@ CONFIG_RTC_DRV_RK808=
  CONFIG_RTC_DRV_S5M=y
  CONFIG_RTC_DRV_DS3232=y
  CONFIG_RTC_DRV_EFI=y
 +CONFIG_RTC_DRV_CROS_EC=y
  CONFIG_RTC_DRV_S3C=y
  CONFIG_RTC_DRV_PL031=y
  CONFIG_RTC_DRV_SUN6I=y
  CONFIG_RTC_DRV_ARMADA38X=y
  CONFIG_RTC_DRV_TEGRA=y
  CONFIG_RTC_DRV_XGENE=y
 -CONFIG_RTC_DRV_CROS_EC=y
  CONFIG_DMADEVICES=y
  CONFIG_DMA_BCM2835=m
  CONFIG_K3_DMA=y
@@@ -568,6 -580,7 +569,6 @@@ CONFIG_HWSPINLOCK_QCOM=
  CONFIG_ARM_MHU=y
  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
@@@ -590,6 -603,7 +591,6 @@@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=
  CONFIG_EXTCON_USB_GPIO=y
  CONFIG_EXTCON_USBC_CROS_EC=y
  CONFIG_MEMORY=y
 -CONFIG_TEGRA_MC=y
  CONFIG_IIO=y
  CONFIG_EXYNOS_ADC=y
  CONFIG_ROCKCHIP_SARADC=m
@@@ -605,28 -619,27 +606,28 @@@ CONFIG_PWM_RCAR=
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_PWM_SAMSUNG=y
  CONFIG_PWM_TEGRA=m
 +CONFIG_PHY_XGENE=y
 +CONFIG_PHY_SUN4I_USB=y
 +CONFIG_PHY_HI6220_USB=y
  CONFIG_PHY_HISTB_COMBPHY=y
  CONFIG_PHY_HISI_INNO_USB2=y
 -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
  CONFIG_PHY_MVEBU_CP110_COMPHY=y
  CONFIG_PHY_QCOM_QMP=m
 -CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 +CONFIG_PHY_QCOM_USB_HS=y
 +CONFIG_PHY_RCAR_GEN3_USB2=y
 +CONFIG_PHY_RCAR_GEN3_USB3=m
  CONFIG_PHY_ROCKCHIP_EMMC=y
 +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
  CONFIG_PHY_ROCKCHIP_PCIE=m
  CONFIG_PHY_ROCKCHIP_TYPEC=y
 -CONFIG_PHY_XGENE=y
  CONFIG_PHY_TEGRA_XUSB=y
 +CONFIG_HISI_PMU=y
  CONFIG_QCOM_L2_PMU=y
  CONFIG_QCOM_L3_PMU=y
 -CONFIG_MESON_EFUSE=m
  CONFIG_QCOM_QFPROM=y
  CONFIG_ROCKCHIP_EFUSE=y
  CONFIG_UNIPHIER_EFUSE=y
 +CONFIG_MESON_EFUSE=m
  CONFIG_TEE=y
  CONFIG_OPTEE=y
  CONFIG_ARM_SCPI_PROTOCOL=y
@@@ -635,6 -648,7 +636,6 @@@ CONFIG_EFI_CAPSULE_LOADER=
  CONFIG_ACPI=y
  CONFIG_ACPI_APEI=y
  CONFIG_ACPI_APEI_GHES=y
 -CONFIG_ACPI_APEI_PCIEAER=y
  CONFIG_ACPI_APEI_MEMORY_FAILURE=y
  CONFIG_ACPI_APEI_EINJ=y
  CONFIG_EXT2_FS=y
@@@ -669,6 -683,7 +670,6 @@@ CONFIG_DEBUG_INFO=
  CONFIG_DEBUG_FS=y
  CONFIG_MAGIC_SYSRQ=y
  CONFIG_DEBUG_KERNEL=y
 -CONFIG_LOCKUP_DETECTOR=y
  # CONFIG_SCHED_DEBUG is not set
  # CONFIG_DEBUG_PREEMPT is not set
  # CONFIG_FTRACE is not set
@@@ -677,15 -692,20 +678,15 @@@ CONFIG_SECURITY=
  CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_ANSI_CPRNG=y
  CONFIG_ARM64_CRYPTO=y
 -CONFIG_CRYPTO_SHA256_ARM64=m
 -CONFIG_CRYPTO_SHA512_ARM64=m
  CONFIG_CRYPTO_SHA1_ARM64_CE=y
  CONFIG_CRYPTO_SHA2_ARM64_CE=y
 +CONFIG_CRYPTO_SHA512_ARM64_CE=m
 +CONFIG_CRYPTO_SHA3_ARM64=m
 +CONFIG_CRYPTO_SM3_ARM64_CE=m
  CONFIG_CRYPTO_GHASH_ARM64_CE=y
  CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
  CONFIG_CRYPTO_CRC32_ARM64_CE=m
 -CONFIG_CRYPTO_AES_ARM64=m
 -CONFIG_CRYPTO_AES_ARM64_CE=m
  CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
  CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 -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