Commit 15116bf6 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'qcom-defconfig-for-6.1' of...

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.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d1d48fd1 10fa117b
...@@ -2588,6 +2588,7 @@ F: Documentation/devicetree/bindings/*/qcom* ...@@ -2588,6 +2588,7 @@ F: Documentation/devicetree/bindings/*/qcom*
F: Documentation/devicetree/bindings/soc/qcom/ F: Documentation/devicetree/bindings/soc/qcom/
F: arch/arm/boot/dts/qcom-*.dts F: arch/arm/boot/dts/qcom-*.dts
F: arch/arm/boot/dts/qcom-*.dtsi F: arch/arm/boot/dts/qcom-*.dtsi
F: arch/arm/configs/qcom_defconfig
F: arch/arm/mach-qcom/ F: arch/arm/mach-qcom/
F: arch/arm64/boot/dts/qcom/ F: arch/arm64/boot/dts/qcom/
F: drivers/*/*/qcom* F: drivers/*/*/qcom*
......
...@@ -1063,9 +1063,13 @@ CONFIG_ASPEED_LPC_CTRL=m ...@@ -1063,9 +1063,13 @@ CONFIG_ASPEED_LPC_CTRL=m
CONFIG_ASPEED_LPC_SNOOP=m CONFIG_ASPEED_LPC_SNOOP=m
CONFIG_ASPEED_P2A_CTRL=m CONFIG_ASPEED_P2A_CTRL=m
CONFIG_RASPBERRYPI_POWER=y CONFIG_RASPBERRYPI_POWER=y
CONFIG_QCOM_COMMAND_DB=m
CONFIG_QCOM_CPR=y CONFIG_QCOM_CPR=y
CONFIG_QCOM_GSBI=y CONFIG_QCOM_GSBI=y
CONFIG_QCOM_OCMEM=m
CONFIG_QCOM_RMTFS_MEM=m CONFIG_QCOM_RMTFS_MEM=m
CONFIG_QCOM_RPMH=y
CONFIG_QCOM_RPMHPD=y
CONFIG_QCOM_RPMPD=y CONFIG_QCOM_RPMPD=y
CONFIG_QCOM_SMEM=y CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SMD_RPM=y CONFIG_QCOM_SMD_RPM=y
......
...@@ -254,10 +254,14 @@ CONFIG_QCOM_OCMEM=y ...@@ -254,10 +254,14 @@ CONFIG_QCOM_OCMEM=y
CONFIG_QCOM_PM=y CONFIG_QCOM_PM=y
CONFIG_QCOM_RPMH=y CONFIG_QCOM_RPMH=y
CONFIG_QCOM_RPMHPD=y CONFIG_QCOM_RPMHPD=y
CONFIG_QCOM_RMTFS_MEM=y
CONFIG_QCOM_RPMPD=y
CONFIG_QCOM_SMEM=y CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SMD_RPM=y CONFIG_QCOM_SMD_RPM=y
CONFIG_QCOM_SMP2P=y CONFIG_QCOM_SMP2P=y
CONFIG_QCOM_SMSM=y CONFIG_QCOM_SMSM=y
CONFIG_QCOM_SOCINFO=y
CONFIG_QCOM_STATS=y
CONFIG_QCOM_WCNSS_CTRL=y CONFIG_QCOM_WCNSS_CTRL=y
CONFIG_EXTCON_QCOM_SPMI_MISC=y CONFIG_EXTCON_QCOM_SPMI_MISC=y
CONFIG_IIO=y CONFIG_IIO=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment