Commit d1d48fd1 authored by Arnd Bergmann's avatar Arnd Bergmann

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

Merge tag 'qcom-arm64-defconfig-for-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/defconfig

Qualcomm ARM64 defconfig updates for 6.1

This enables core providers needed to boot SC8180X, sound drivers for
SC7180 and SC7280, the Qualcomm EDP PHY, last-level cache controller
driver, on-chip memory driver and the SPM driver.

* tag 'qcom-arm64-defconfig-for-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: defconfig: Enabled SC8180x configs
  arm64: defconfig: enable newer Qualcomm SoC sound drivers
  arm64: defconfig: enable more Qualcomm drivers

Link: https://lore.kernel.org/r/20220921150314.1312358-1-andersson@kernel.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 075ed7b9 25c7d385
...@@ -538,6 +538,7 @@ CONFIG_PINCTRL_QDF2XXX=y ...@@ -538,6 +538,7 @@ CONFIG_PINCTRL_QDF2XXX=y
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
CONFIG_PINCTRL_SC7180=y CONFIG_PINCTRL_SC7180=y
CONFIG_PINCTRL_SC7280=y CONFIG_PINCTRL_SC7280=y
CONFIG_PINCTRL_SC8180X=y
CONFIG_PINCTRL_SC8280XP=y CONFIG_PINCTRL_SC8280XP=y
CONFIG_PINCTRL_SDM845=y CONFIG_PINCTRL_SDM845=y
CONFIG_PINCTRL_SM8150=y CONFIG_PINCTRL_SM8150=y
...@@ -799,6 +800,8 @@ CONFIG_SND_SOC_APQ8016_SBC=m ...@@ -799,6 +800,8 @@ CONFIG_SND_SOC_APQ8016_SBC=m
CONFIG_SND_SOC_MSM8996=m CONFIG_SND_SOC_MSM8996=m
CONFIG_SND_SOC_SDM845=m CONFIG_SND_SOC_SDM845=m
CONFIG_SND_SOC_SM8250=m CONFIG_SND_SOC_SM8250=m
CONFIG_SND_SOC_SC7180=m
CONFIG_SND_SOC_SC7280=m
CONFIG_SND_SOC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m CONFIG_SND_SOC_ROCKCHIP_RT5645=m
...@@ -1064,6 +1067,7 @@ CONFIG_MSM_GCC_8998=y ...@@ -1064,6 +1067,7 @@ CONFIG_MSM_GCC_8998=y
CONFIG_QCS_GCC_404=y CONFIG_QCS_GCC_404=y
CONFIG_SC_GCC_7180=y CONFIG_SC_GCC_7180=y
CONFIG_SC_GCC_7280=y CONFIG_SC_GCC_7280=y
CONFIG_SC_GCC_8180X=y
CONFIG_SC_GCC_8280XP=y CONFIG_SC_GCC_8280XP=y
CONFIG_SDM_CAMCC_845=m CONFIG_SDM_CAMCC_845=m
CONFIG_SDM_GPUCC_845=y CONFIG_SDM_GPUCC_845=y
...@@ -1094,6 +1098,7 @@ CONFIG_ARM_SMMU_V3=y ...@@ -1094,6 +1098,7 @@ CONFIG_ARM_SMMU_V3=y
CONFIG_MTK_IOMMU=y CONFIG_MTK_IOMMU=y
CONFIG_QCOM_IOMMU=y CONFIG_QCOM_IOMMU=y
CONFIG_REMOTEPROC=y CONFIG_REMOTEPROC=y
CONFIG_QCOM_Q6V5_ADSP=m
CONFIG_QCOM_Q6V5_MSS=m CONFIG_QCOM_Q6V5_MSS=m
CONFIG_QCOM_Q6V5_PAS=m CONFIG_QCOM_Q6V5_PAS=m
CONFIG_QCOM_SYSMON=m CONFIG_QCOM_SYSMON=m
...@@ -1116,6 +1121,8 @@ CONFIG_QCOM_AOSS_QMP=y ...@@ -1116,6 +1121,8 @@ CONFIG_QCOM_AOSS_QMP=y
CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_COMMAND_DB=y
CONFIG_QCOM_CPR=y CONFIG_QCOM_CPR=y
CONFIG_QCOM_GENI_SE=y CONFIG_QCOM_GENI_SE=y
CONFIG_QCOM_LLCC=m
CONFIG_QCOM_OCMEM=m
CONFIG_QCOM_RMTFS_MEM=m CONFIG_QCOM_RMTFS_MEM=m
CONFIG_QCOM_RPMH=y CONFIG_QCOM_RPMH=y
CONFIG_QCOM_RPMHPD=y CONFIG_QCOM_RPMHPD=y
...@@ -1125,6 +1132,7 @@ CONFIG_QCOM_SMD_RPM=y ...@@ -1125,6 +1132,7 @@ CONFIG_QCOM_SMD_RPM=y
CONFIG_QCOM_SMP2P=y CONFIG_QCOM_SMP2P=y
CONFIG_QCOM_SMSM=y CONFIG_QCOM_SMSM=y
CONFIG_QCOM_SOCINFO=m CONFIG_QCOM_SOCINFO=m
CONFIG_QCOM_SPM=m
CONFIG_QCOM_STATS=m CONFIG_QCOM_STATS=m
CONFIG_QCOM_WCNSS_CTRL=m CONFIG_QCOM_WCNSS_CTRL=m
CONFIG_QCOM_APR=m CONFIG_QCOM_APR=m
...@@ -1214,6 +1222,7 @@ CONFIG_PHY_HISTB_COMBPHY=y ...@@ -1214,6 +1222,7 @@ CONFIG_PHY_HISTB_COMBPHY=y
CONFIG_PHY_HISI_INNO_USB2=y CONFIG_PHY_HISI_INNO_USB2=y
CONFIG_PHY_MVEBU_CP110_COMPHY=y CONFIG_PHY_MVEBU_CP110_COMPHY=y
CONFIG_PHY_MTK_TPHY=y CONFIG_PHY_MTK_TPHY=y
CONFIG_PHY_QCOM_EDP=m
CONFIG_PHY_QCOM_PCIE2=m CONFIG_PHY_QCOM_PCIE2=m
CONFIG_PHY_QCOM_QMP=m CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QUSB2=m CONFIG_PHY_QCOM_QUSB2=m
...@@ -1282,6 +1291,7 @@ CONFIG_INTERCONNECT_QCOM_OSM_L3=m ...@@ -1282,6 +1291,7 @@ CONFIG_INTERCONNECT_QCOM_OSM_L3=m
CONFIG_INTERCONNECT_QCOM_QCS404=m CONFIG_INTERCONNECT_QCOM_QCS404=m
CONFIG_INTERCONNECT_QCOM_SC7180=m CONFIG_INTERCONNECT_QCOM_SC7180=m
CONFIG_INTERCONNECT_QCOM_SC7280=y CONFIG_INTERCONNECT_QCOM_SC7280=y
CONFIG_INTERCONNECT_QCOM_SC8180X=y
CONFIG_INTERCONNECT_QCOM_SC8280XP=y CONFIG_INTERCONNECT_QCOM_SC8280XP=y
CONFIG_INTERCONNECT_QCOM_SDM845=y CONFIG_INTERCONNECT_QCOM_SDM845=y
CONFIG_INTERCONNECT_QCOM_SM8150=m CONFIG_INTERCONNECT_QCOM_SM8150=m
......
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