diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-09-23 17:59:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-09-23 17:59:27 +0200 |
| commit | 15116bf667241ddf12c4eb143c7cf81e235ce24c (patch) | |
| tree | 1c1c94b5ab44a489c66d40bd5312ad5daffc7236 /arch/arm/configs | |
| parent | d1d48fd18abcec95383b54bbb4530367f2168f4f (diff) | |
| parent | 10fa117bfc0a9ba5f38a36fa59ccd4e1e36a2b7f (diff) | |
| download | linux-15116bf667241ddf12c4eb143c7cf81e235ce24c.tar.bz2 | |
Merge tag 'qcom-defconfig-for-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/defconfig
Qualcomm ARM defconfig updates for 6.1
This enables command-db, ocmem, rpmh and rpmhpd drivers in the
multi_v7_defconfig, used on SDX55, SDX65 and MSM8974. For qcom_defconfig
rmtfs-mem, rpmpd, socinfo and qcom-stats are enables as they are used
across MSM8974, MSM8226, MSM8916 and APQ8084.
Lastly the MAINTAINERS entry is updated to include the qcom_defconfig.
* tag 'qcom-defconfig-for-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
ARM: qcom: include defconfig in MAINTAINERS
ARM: multi_v7_defconfig: enable more Qualcomm drivers
ARM: qcom_defconfig: enable more Qualcomm drivers
Link: https://lore.kernel.org/r/20220921153734.1314952-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/configs/qcom_defconfig | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 599f0b45ffd4..23003a43ffe9 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -1063,9 +1063,13 @@ CONFIG_ASPEED_LPC_CTRL=m CONFIG_ASPEED_LPC_SNOOP=m CONFIG_ASPEED_P2A_CTRL=m CONFIG_RASPBERRYPI_POWER=y +CONFIG_QCOM_COMMAND_DB=m CONFIG_QCOM_CPR=y CONFIG_QCOM_GSBI=y +CONFIG_QCOM_OCMEM=m CONFIG_QCOM_RMTFS_MEM=m +CONFIG_QCOM_RPMH=y +CONFIG_QCOM_RPMHPD=y CONFIG_QCOM_RPMPD=y CONFIG_QCOM_SMEM=y CONFIG_QCOM_SMD_RPM=y diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index 3b84bb1c328d..0afa62b92de7 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -254,10 +254,14 @@ CONFIG_QCOM_OCMEM=y CONFIG_QCOM_PM=y CONFIG_QCOM_RPMH=y CONFIG_QCOM_RPMHPD=y +CONFIG_QCOM_RMTFS_MEM=y +CONFIG_QCOM_RPMPD=y CONFIG_QCOM_SMEM=y CONFIG_QCOM_SMD_RPM=y CONFIG_QCOM_SMP2P=y CONFIG_QCOM_SMSM=y +CONFIG_QCOM_SOCINFO=y +CONFIG_QCOM_STATS=y CONFIG_QCOM_WCNSS_CTRL=y CONFIG_EXTCON_QCOM_SPMI_MISC=y CONFIG_IIO=y |