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

Qualcomm defconfig updates for v5.18

The Qualcomm Snapdragon 8916 devices come in both 32- or 64-bit form,
and even though the typical case so far has been to 64-bit, it's
possible to run the Dragonboard 410c in either mode.

Enable the relevant drivers in multi_v7_defconfig to enable this, and
other Snapdragon 8916 devices to run the 32-bit kernel.

* tag 'qcom-defconfig-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: multi_v7_defconfig: Enable drivers for DragonBoard 410c

Signed-off-by: Arnd Bergmann <[email protected]>

diff --combined arch/arm/configs/multi_v7_defconfig
index ea93535bc3a84c66e5bb616f89eea2cc284ea0bd,ae227d309dc1bb3d0a7d019962531290fde18614..1c2c3e9f0e05117d2f508c1a206e3409ca8f4326
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -24,9 -24,7 +24,9 @@@ CONFIG_ARCH_BCM_NSP=
  CONFIG_ARCH_BCM_5301X=y
  CONFIG_ARCH_BCM_281XX=y
  CONFIG_ARCH_BCM_21664=y
 +CONFIG_ARCH_BCM_23550=y
  CONFIG_ARCH_BCM2835=y
 +CONFIG_ARCH_BCM_53573=y
  CONFIG_ARCH_BCM_63XX=y
  CONFIG_ARCH_BRCMSTB=y
  CONFIG_ARCH_BERLIN=y
@@@ -77,6 -75,7 +77,7 @@@ CONFIG_SOC_AM43XX=
  CONFIG_SOC_DRA7XX=y
  CONFIG_ARCH_QCOM=y
  CONFIG_ARCH_MSM8X60=y
+ CONFIG_ARCH_MSM8916=y
  CONFIG_ARCH_MSM8960=y
  CONFIG_ARCH_MSM8974=y
  CONFIG_ARCH_ROCKCHIP=y
@@@ -111,11 -110,13 +112,13 @@@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=
  CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
  CONFIG_CPUFREQ_DT=y
  CONFIG_ARM_IMX6Q_CPUFREQ=y
+ CONFIG_ARM_QCOM_CPUFREQ_NVMEM=y
  CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
  CONFIG_ARM_SCMI_CPUFREQ=y
  CONFIG_QORIQ_CPUFREQ=y
  CONFIG_CPU_IDLE=y
  CONFIG_ARM_CPUIDLE=y
+ CONFIG_ARM_PSCI_CPUIDLE=y
  CONFIG_ARM_ZYNQ_CPUIDLE=y
  CONFIG_ARM_EXYNOS_CPUIDLE=y
  CONFIG_ARM_TEGRA_CPUIDLE=y
@@@ -159,6 -160,8 +162,8 @@@ CONFIG_IPV6_MIP6=
  CONFIG_IPV6_TUNNEL=m
  CONFIG_IPV6_MULTIPLE_TABLES=y
  CONFIG_NET_DSA=m
+ CONFIG_QRTR=m
+ CONFIG_QRTR_SMD=m
  CONFIG_CAN=y
  CONFIG_CAN_AT91=m
  CONFIG_CAN_FLEXCAN=m
@@@ -171,6 -174,7 +176,7 @@@ CONFIG_BT_HCIUART=
  CONFIG_BT_HCIUART_BCM=y
  CONFIG_BT_MRVL=m
  CONFIG_BT_MRVL_SDIO=m
+ CONFIG_BT_QCOMSMD=m
  CONFIG_CFG80211=m
  CONFIG_MAC80211=m
  CONFIG_RFKILL=y
@@@ -227,6 -231,7 +233,7 @@@ CONFIG_AD525X_DPOT_I2C=
  CONFIG_ICS932S401=y
  CONFIG_ATMEL_SSC=m
  CONFIG_QCOM_COINCELL=m
+ CONFIG_QCOM_FASTRPC=m
  CONFIG_APDS9802ALS=y
  CONFIG_ISL29003=y
  CONFIG_PCI_ENDPOINT_TEST=m
@@@ -284,13 -289,13 +291,14 @@@ CONFIG_MARVELL_PHY=
  CONFIG_AT803X_PHY=y
  CONFIG_ROCKCHIP_PHY=y
  CONFIG_DP83867_PHY=y
 +CONFIG_USB_BRCMSTB=m
  CONFIG_USB_PEGASUS=y
  CONFIG_USB_RTL8152=m
  CONFIG_USB_LAN78XX=m
  CONFIG_USB_USBNET=y
  CONFIG_USB_NET_SMSC75XX=y
  CONFIG_USB_NET_SMSC95XX=y
+ CONFIG_WCN36XX=m
  CONFIG_BRCMFMAC=m
  CONFIG_MWIFIEX=m
  CONFIG_MWIFIEX_SDIO=m
@@@ -319,6 -324,7 +327,7 @@@ CONFIG_TOUCHSCREEN_ST1232=
  CONFIG_TOUCHSCREEN_STMPE=y
  CONFIG_TOUCHSCREEN_SUN4I=y
  CONFIG_INPUT_MISC=y
+ CONFIG_INPUT_PM8941_PWRKEY=y
  CONFIG_INPUT_MAX77693_HAPTIC=m
  CONFIG_INPUT_MAX8997_HAPTIC=m
  CONFIG_INPUT_CPCAP_PWRBUTTON=m
@@@ -385,7 -391,6 +394,7 @@@ CONFIG_TCG_TPM=
  CONFIG_TCG_TIS_I2C_INFINEON=m
  CONFIG_I2C_CHARDEV=y
  CONFIG_I2C_ARB_GPIO_CHALLENGE=m
 +CONFIG_I2C_MUX_GPIO=y
  CONFIG_I2C_MUX_PCA954x=y
  CONFIG_I2C_MUX_PINCTRL=y
  CONFIG_I2C_DEMUX_PINCTRL=y
@@@ -401,6 -406,8 +410,8 @@@ CONFIG_I2C_IMX=
  CONFIG_I2C_MESON=y
  CONFIG_I2C_MV64XXX=y
  CONFIG_I2C_OWL=y
+ CONFIG_I2C_QCOM_CCI=m
+ CONFIG_I2C_QUP=y
  CONFIG_I2C_RIIC=y
  CONFIG_I2C_RK3X=y
  CONFIG_I2C_S3C2410=y
@@@ -429,6 -436,7 +440,7 @@@ CONFIG_SPI_ORION=
  CONFIG_SPI_PL022=y
  CONFIG_SPI_ROCKCHIP=m
  CONFIG_SPI_RSPI=y
+ CONFIG_SPI_QUP=m
  CONFIG_SPI_S3C64XX=m
  CONFIG_SPI_SH_MSIOF=m
  CONFIG_SPI_SH_HSPI=y
@@@ -479,6 -487,8 +491,8 @@@ CONFIG_GPIO_TWL4030=
  CONFIG_POWER_RESET_AS3722=y
  CONFIG_POWER_RESET_GPIO=y
  CONFIG_POWER_RESET_GPIO_RESTART=y
+ CONFIG_POWER_RESET_MSM=y
+ CONFIG_POWER_RESET_QCOM_PON=y
  CONFIG_POWER_RESET_ST=y
  CONFIG_POWER_RESET_KEYSTONE=y
  CONFIG_POWER_RESET_RMOBILE=y
@@@ -519,6 -529,7 +533,7 @@@ CONFIG_ST_THERMAL_MEMMAP=
  CONFIG_TEGRA_SOCTHERM=m
  CONFIG_TEGRA30_TSENSOR=m
  CONFIG_GENERIC_ADC_THERMAL=m
+ CONFIG_QCOM_TSENS=y
  CONFIG_UNIPHIER_THERMAL=y
  CONFIG_DA9063_WATCHDOG=m
  CONFIG_XILINX_WATCHDOG=y
@@@ -534,11 -545,13 +549,13 @@@ CONFIG_SUNXI_WATCHDOG=
  CONFIG_IMX2_WDT=y
  CONFIG_ST_LPC_WATCHDOG=y
  CONFIG_TEGRA_WATCHDOG=m
+ CONFIG_QCOM_WDT=m
  CONFIG_MESON_WATCHDOG=y
  CONFIG_DIGICOLOR_WATCHDOG=y
  CONFIG_RENESAS_WDT=m
  CONFIG_RENESAS_RZAWDT=m
  CONFIG_STPMIC1_WATCHDOG=y
+ CONFIG_PM8916_WATCHDOG=m
  CONFIG_BCM47XX_WDT=y
  CONFIG_BCM2835_WDT=y
  CONFIG_BCM_KONA_WDT=y
@@@ -605,7 -618,8 +622,8 @@@ CONFIG_REGULATOR_PALMAS=
  CONFIG_REGULATOR_PBIAS=y
  CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_QCOM_RPM=y
- CONFIG_REGULATOR_QCOM_SMD_RPM=m
+ CONFIG_REGULATOR_QCOM_SMD_RPM=y
+ CONFIG_REGULATOR_QCOM_SPMI=y
  CONFIG_REGULATOR_RK808=y
  CONFIG_REGULATOR_RN5T618=y
  CONFIG_REGULATOR_S2MPA01=m
@@@ -684,23 -698,20 +702,24 @@@ CONFIG_DRM_FSL_DCU=
  CONFIG_DRM_TEGRA=y
  CONFIG_DRM_STM=m
  CONFIG_DRM_STM_DSI=m
 +CONFIG_DRM_PANEL_LVDS=m
  CONFIG_DRM_PANEL_SIMPLE=y
  CONFIG_DRM_PANEL_EDP=y
  CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
 +CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
  CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
  CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
  CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
  CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
 +CONFIG_DRM_LVDS_CODEC=m
+ CONFIG_DRM_DISPLAY_CONNECTOR=m
  CONFIG_DRM_NXP_PTN3460=m
  CONFIG_DRM_PARADE_PS8622=m
  CONFIG_DRM_SII902X=m
  CONFIG_DRM_SII9234=m
  CONFIG_DRM_SIMPLE_BRIDGE=m
  CONFIG_DRM_TOSHIBA_TC358764=m
 +CONFIG_DRM_TOSHIBA_TC358768=m
  CONFIG_DRM_I2C_ADV7511=m
  CONFIG_DRM_I2C_ADV7511_AUDIO=y
  CONFIG_DRM_STI=m
@@@ -744,6 -755,8 +763,8 @@@ CONFIG_SND_SOC_FSL_SAI=
  CONFIG_SND_PXA_SOC_SSP=m
  CONFIG_SND_MMP_SOC_SSPA=m
  CONFIG_SND_PXA910_SOC=m
+ CONFIG_SND_SOC_QCOM=m
+ CONFIG_SND_SOC_APQ8016_SBC=m
  CONFIG_SND_SOC_ROCKCHIP=m
  CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
  CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
@@@ -765,7 -778,6 +786,7 @@@ CONFIG_SND_SOC_STM32_DFSDM=
  CONFIG_SND_SUN4I_CODEC=m
  CONFIG_SND_SOC_TEGRA=m
  CONFIG_SND_SOC_TEGRA20_I2S=m
 +CONFIG_SND_SOC_TEGRA20_SPDIF=m
  CONFIG_SND_SOC_TEGRA30_I2S=m
  CONFIG_SND_SOC_TEGRA_RT5640=m
  CONFIG_SND_SOC_TEGRA_WM8753=m
@@@ -777,6 -789,8 +798,8 @@@ CONFIG_SND_SOC_TEGRA_MAX98090=
  CONFIG_SND_SOC_AK4642=m
  CONFIG_SND_SOC_CPCAP=m
  CONFIG_SND_SOC_CS42L51_I2C=m
+ CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+ CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
  CONFIG_SND_SOC_SGTL5000=m
  CONFIG_SND_SOC_STI_SAS=m
  CONFIG_SND_SOC_WM8978=m
@@@ -939,6 -953,7 +962,7 @@@ CONFIG_RTC_DRV_AT91SAM9=
  CONFIG_RTC_DRV_VT8500=y
  CONFIG_RTC_DRV_SUNXI=y
  CONFIG_RTC_DRV_MV=y
+ CONFIG_RTC_DRV_PM8XXX=m
  CONFIG_RTC_DRV_TEGRA=y
  CONFIG_RTC_DRV_ST_LPC=y
  CONFIG_RTC_DRV_STM32=y
@@@ -961,7 -976,6 +985,7 @@@ CONFIG_ST_FDMA=
  CONFIG_STM32_DMA=y
  CONFIG_STM32_DMAMUX=y
  CONFIG_STM32_MDMA=y
 +CONFIG_TEGRA20_APB_DMA=y
  CONFIG_UNIPHIER_MDMAC=y
  CONFIG_XILINX_DMA=y
  CONFIG_QCOM_BAM_DMA=y
@@@ -987,26 -1001,47 +1011,47 @@@ CONFIG_COMMON_CLK_SCMI=
  CONFIG_COMMON_CLK_S2MPS11=m
  CONFIG_CLK_RASPBERRYPI=y
  CONFIG_COMMON_CLK_QCOM=y
+ CONFIG_QCOM_A53PLL=y
+ CONFIG_QCOM_CLK_APCS_MSM8916=y
  CONFIG_QCOM_CLK_RPM=y
+ CONFIG_QCOM_CLK_SMD_RPM=y
  CONFIG_APQ_MMCC_8084=y
  CONFIG_MSM_GCC_8660=y
+ CONFIG_MSM_GCC_8916=y
  CONFIG_MSM_MMCC_8960=y
  CONFIG_MSM_MMCC_8974=y
+ CONFIG_HWSPINLOCK=y
+ CONFIG_HWSPINLOCK_QCOM=y
  CONFIG_MICROCHIP_PIT64B=y
  CONFIG_BCM2835_MBOX=y
+ CONFIG_QCOM_APCS_IPC=y
+ CONFIG_QCOM_IPCC=y
  CONFIG_ROCKCHIP_IOMMU=y
  CONFIG_TEGRA_IOMMU_GART=y
  CONFIG_TEGRA_IOMMU_SMMU=y
  CONFIG_EXYNOS_IOMMU=y
+ CONFIG_QCOM_IOMMU=y
  CONFIG_REMOTEPROC=y
+ CONFIG_QCOM_Q6V5_MSS=m
+ CONFIG_QCOM_SYSMON=m
+ CONFIG_QCOM_WCNSS_PIL=m
  CONFIG_ST_REMOTEPROC=m
+ CONFIG_RPMSG_QCOM_SMD=y
  CONFIG_RPMSG_VIRTIO=m
  CONFIG_ASPEED_LPC_CTRL=m
  CONFIG_ASPEED_LPC_SNOOP=m
  CONFIG_ASPEED_P2A_CTRL=m
  CONFIG_RASPBERRYPI_POWER=y
+ CONFIG_QCOM_CPR=y
  CONFIG_QCOM_GSBI=y
- CONFIG_QCOM_SMD_RPM=m
+ CONFIG_QCOM_RMTFS_MEM=m
+ CONFIG_QCOM_RPMPD=y
+ CONFIG_QCOM_SMEM=y
+ CONFIG_QCOM_SMD_RPM=y
+ CONFIG_QCOM_SMP2P=y
+ CONFIG_QCOM_SMSM=y
+ CONFIG_QCOM_SOCINFO=m
+ CONFIG_QCOM_STATS=m
  CONFIG_QCOM_WCNSS_CTRL=m
  CONFIG_ARCH_EMEV2=y
  CONFIG_ARCH_R8A7794=y
@@@ -1039,6 -1074,7 +1084,7 @@@ CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=
  CONFIG_EXTCON_MAX14577=m
  CONFIG_EXTCON_MAX77693=m
  CONFIG_EXTCON_MAX8997=m
+ CONFIG_EXTCON_USB_GPIO=y
  CONFIG_TI_AEMIF=y
  CONFIG_STM32_FMC2_EBI=y
  CONFIG_EXYNOS5422_DMC=m
@@@ -1051,6 -1087,7 +1097,7 @@@ CONFIG_BERLIN2_ADC=
  CONFIG_CPCAP_ADC=m
  CONFIG_EXYNOS_ADC=m
  CONFIG_MESON_SARADC=m
+ CONFIG_QCOM_SPMI_VADC=m
  CONFIG_ROCKCHIP_SARADC=m
  CONFIG_STM32_ADC_CORE=m
  CONFIG_STM32_ADC=m
@@@ -1093,10 -1130,10 +1140,11 @@@ CONFIG_PHY_SUN9I_USB=
  CONFIG_PHY_HIX5HD2_SATA=y
  CONFIG_PHY_BERLIN_SATA=y
  CONFIG_PHY_BERLIN_USB=y
 +CONFIG_PHY_BRCM_USB=m
  CONFIG_PHY_MMP3_USB=m
  CONFIG_PHY_CPCAP_USB=m
  CONFIG_PHY_QCOM_APQ8064_SATA=m
+ CONFIG_PHY_QCOM_USB_HS=y
  CONFIG_PHY_RCAR_GEN2=m
  CONFIG_PHY_ROCKCHIP_DP=m
  CONFIG_PHY_ROCKCHIP_USB=y
@@@ -1114,6 -1151,7 +1162,7 @@@ CONFIG_TI_PIPE3=
  CONFIG_TWL4030_USB=m
  CONFIG_RAS=y
  CONFIG_NVMEM_IMX_OCOTP=y
+ CONFIG_QCOM_QFPROM=y
  CONFIG_ROCKCHIP_EFUSE=m
  CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_NVMEM_VF610_OCOTP=y
@@@ -1126,6 -1164,8 +1175,8 @@@ CONFIG_FSI_MASTER_ASPEED=
  CONFIG_FSI_SCOM=m
  CONFIG_FSI_SBEFIFO=m
  CONFIG_FSI_OCC=m
+ CONFIG_INTERCONNECT_QCOM=y
+ CONFIG_INTERCONNECT_QCOM_MSM8916=y
  CONFIG_COUNTER=m
  CONFIG_STM32_TIMER_CNT=m
  CONFIG_STM32_LPTIMER_CNT=m
@@@ -1165,6 -1205,8 +1216,8 @@@ CONFIG_CRYPTO_DEV_ATMEL_AES=
  CONFIG_CRYPTO_DEV_ATMEL_TDES=m
  CONFIG_CRYPTO_DEV_ATMEL_SHA=m
  CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+ CONFIG_CRYPTO_DEV_QCE=m
+ CONFIG_CRYPTO_DEV_QCOM_RNG=m
  CONFIG_CRYPTO_DEV_ROCKCHIP=m
  CONFIG_CRYPTO_DEV_STM32_CRC=m
  CONFIG_CRYPTO_DEV_STM32_HASH=m