Skip to content

Commit 71867d1

Browse files
committed
Merge tag 'qcom-arm64-defconfig-for-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/defconfig
Qualcomm Arm64 defconfig updates for v6.14 Enable core drivers for SM8750, QCS8300, SA8775P, and QCS615. Enable the IPQ CMD PLL driver. Drop the 8650 display clock option, now that the driver has been consolidated with 8550. * tag 'qcom-arm64-defconfig-for-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: defconfig: Enable Qualcomm IPQ CMN PLL clock controller arm64: defconfig: Enable basic Qualcomm SM8750 SoC drivers arm64: defconfig: remove obsolete CONFIG_SM_DISPCC_8650 arm64: defconfig: enable clock controller, interconnect and pinctrl for QCS8300 arm64: defconfig: Enable sa8775p clock controllers arm64: defconfig: enable clock controller, interconnect and pinctrl for QCS615 Link: https://lore.kernel.org/r/20250111173306.392204-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 8dc9697 + 1fe6c70 commit 71867d1

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

arch/arm64/configs/defconfig

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,8 @@ CONFIG_PINCTRL_MSM8996=y
612612
CONFIG_PINCTRL_MSM8998=y
613613
CONFIG_PINCTRL_QCM2290=y
614614
CONFIG_PINCTRL_QCS404=y
615+
CONFIG_PINCTRL_QCS615=y
616+
CONFIG_PINCTRL_QCS8300=y
615617
CONFIG_PINCTRL_QDF2XXX=y
616618
CONFIG_PINCTRL_QDU1000=y
617619
CONFIG_PINCTRL_SA8775P=y
@@ -634,6 +636,7 @@ CONFIG_PINCTRL_SM8350=y
634636
CONFIG_PINCTRL_SM8450=y
635637
CONFIG_PINCTRL_SM8550=y
636638
CONFIG_PINCTRL_SM8650=y
639+
CONFIG_PINCTRL_SM8750=y
637640
CONFIG_PINCTRL_X1E80100=y
638641
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
639642
CONFIG_PINCTRL_LPASS_LPI=m
@@ -1322,6 +1325,7 @@ CONFIG_QCOM_CLK_SMD_RPM=y
13221325
CONFIG_QCOM_CLK_RPMH=y
13231326
CONFIG_IPQ_APSS_6018=y
13241327
CONFIG_IPQ_APSS_5018=y
1328+
CONFIG_IPQ_CMN_PLL=m
13251329
CONFIG_IPQ_GCC_5018=y
13261330
CONFIG_IPQ_GCC_5332=y
13271331
CONFIG_IPQ_GCC_6018=y
@@ -1337,11 +1341,15 @@ CONFIG_MSM_MMCC_8998=m
13371341
CONFIG_QCM_GCC_2290=y
13381342
CONFIG_QCM_DISPCC_2290=m
13391343
CONFIG_QCS_GCC_404=y
1344+
CONFIG_QCS_GCC_615=y
1345+
CONFIG_QCS_GCC_8300=y
13401346
CONFIG_SC_CAMCC_7280=m
1347+
CONFIG_SA_CAMCC_8775P=m
13411348
CONFIG_QDU_GCC_1000=y
13421349
CONFIG_SC_CAMCC_8280XP=m
13431350
CONFIG_SC_DISPCC_7280=m
13441351
CONFIG_SC_DISPCC_8280XP=m
1352+
CONFIG_SA_DISPCC_8775P=m
13451353
CONFIG_SA_GCC_8775P=y
13461354
CONFIG_SA_GPUCC_8775P=m
13471355
CONFIG_SC_GCC_7180=y
@@ -1364,13 +1372,14 @@ CONFIG_SM_DISPCC_6115=m
13641372
CONFIG_SM_DISPCC_8250=y
13651373
CONFIG_SM_DISPCC_8450=m
13661374
CONFIG_SM_DISPCC_8550=m
1367-
CONFIG_SM_DISPCC_8650=m
1375+
CONFIG_SM_DISPCC_8750=m
13681376
CONFIG_SM_GCC_4450=y
13691377
CONFIG_SM_GCC_6115=y
13701378
CONFIG_SM_GCC_8350=y
13711379
CONFIG_SM_GCC_8450=y
13721380
CONFIG_SM_GCC_8550=y
13731381
CONFIG_SM_GCC_8650=y
1382+
CONFIG_SM_GCC_8750=y
13741383
CONFIG_SM_GPUCC_6115=m
13751384
CONFIG_SM_GPUCC_8150=y
13761385
CONFIG_SM_GPUCC_8250=y
@@ -1380,6 +1389,8 @@ CONFIG_SM_GPUCC_8550=m
13801389
CONFIG_SM_GPUCC_8650=m
13811390
CONFIG_SM_TCSRCC_8550=y
13821391
CONFIG_SM_TCSRCC_8650=y
1392+
CONFIG_SM_TCSRCC_8750=m
1393+
CONFIG_SA_VIDEOCC_8775P=m
13831394
CONFIG_SM_VIDEOCC_8250=y
13841395
CONFIG_QCOM_HFPLL=y
13851396
CONFIG_CLK_GFM_LPASS_SM8250=m
@@ -1646,6 +1657,8 @@ CONFIG_INTERCONNECT_QCOM_MSM8996=y
16461657
CONFIG_INTERCONNECT_QCOM_OSM_L3=m
16471658
CONFIG_INTERCONNECT_QCOM_QCM2290=y
16481659
CONFIG_INTERCONNECT_QCOM_QCS404=m
1660+
CONFIG_INTERCONNECT_QCOM_QCS615=y
1661+
CONFIG_INTERCONNECT_QCOM_QCS8300=y
16491662
CONFIG_INTERCONNECT_QCOM_QDU1000=y
16501663
CONFIG_INTERCONNECT_QCOM_SA8775P=y
16511664
CONFIG_INTERCONNECT_QCOM_SC7180=y
@@ -1661,6 +1674,7 @@ CONFIG_INTERCONNECT_QCOM_SM8350=y
16611674
CONFIG_INTERCONNECT_QCOM_SM8450=y
16621675
CONFIG_INTERCONNECT_QCOM_SM8550=y
16631676
CONFIG_INTERCONNECT_QCOM_SM8650=y
1677+
CONFIG_INTERCONNECT_QCOM_SM8750=y
16641678
CONFIG_INTERCONNECT_QCOM_X1E80100=y
16651679
CONFIG_COUNTER=m
16661680
CONFIG_RZ_MTU3_CNT=m

0 commit comments

Comments
 (0)