Skip to content

Commit 7c3ac7c

Browse files
committed
Merge tag 'qcom-arm64-defconfig-for-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/defconfig
Qualcomm Arm64 defconfig update for v6.20 Enable drivers needed to boot the Kaanapali and Milos platforms. Enable EC-drivers found on various Qualcomm-based laptops. * tag 'qcom-arm64-defconfig-for-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: defconfig: Enable EC drivers for Qualcomm-based laptops arm64: defconfig: Enable options for Qualcomm Milos SoC arm64: defconfig: enable clocks, interconnect and pinctrl for Qualcomm Kaanapali Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 3b03f89 + 9f26262 commit 7c3ac7c

1 file changed

Lines changed: 15 additions & 0 deletions

File tree

arch/arm64/configs/defconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,7 @@ CONFIG_PINCTRL_IPQ5424=y
651651
CONFIG_PINCTRL_IPQ8074=y
652652
CONFIG_PINCTRL_IPQ6018=y
653653
CONFIG_PINCTRL_IPQ9574=y
654+
CONFIG_PINCTRL_KAANAPALI=y
654655
CONFIG_PINCTRL_MSM8916=y
655656
CONFIG_PINCTRL_MSM8953=y
656657
CONFIG_PINCTRL_MSM8976=y
@@ -678,6 +679,7 @@ CONFIG_PINCTRL_SM6115=y
678679
CONFIG_PINCTRL_SM6125=y
679680
CONFIG_PINCTRL_SM6350=y
680681
CONFIG_PINCTRL_SM6375=y
682+
CONFIG_PINCTRL_MILOS=y
681683
CONFIG_PINCTRL_SM8150=y
682684
CONFIG_PINCTRL_SM8250=y
683685
CONFIG_PINCTRL_SM8350=y
@@ -1410,6 +1412,10 @@ CONFIG_CROS_EC_SPI=y
14101412
CONFIG_CROS_KBD_LED_BACKLIGHT=m
14111413
CONFIG_CROS_EC_CHARDEV=m
14121414
CONFIG_COMMON_CLK_APPLE_NCO=m
1415+
CONFIG_EC_ACER_ASPIRE1=m
1416+
CONFIG_EC_HUAWEI_GAOKUN=m
1417+
CONFIG_EC_LENOVO_YOGA_C630=m
1418+
CONFIG_EC_LENOVO_THINKPAD_T14S=m
14131419
CONFIG_COMMON_CLK_RK808=y
14141420
CONFIG_COMMON_CLK_SCMI=y
14151421
CONFIG_COMMON_CLK_SCPI=y
@@ -1445,6 +1451,8 @@ CONFIG_COMMON_CLK_MT8192_SCP_ADSP=y
14451451
CONFIG_COMMON_CLK_MT8192_VDECSYS=y
14461452
CONFIG_COMMON_CLK_MT8192_VENCSYS=y
14471453
CONFIG_COMMON_CLK_QCOM=y
1454+
CONFIG_CLK_KAANAPALI_GCC=y
1455+
CONFIG_CLK_KAANAPALI_TCSRCC=m
14481456
CONFIG_CLK_X1E80100_CAMCC=m
14491457
CONFIG_CLK_X1E80100_DISPCC=m
14501458
CONFIG_CLK_X1E80100_GCC=y
@@ -1510,25 +1518,29 @@ CONFIG_SDM_DISPCC_845=y
15101518
CONFIG_SDM_LPASSCC_845=m
15111519
CONFIG_SDX_GCC_75=y
15121520
CONFIG_SM_CAMCC_6350=m
1521+
CONFIG_SM_CAMCC_MILOS=m
15131522
CONFIG_SM_CAMCC_8250=m
15141523
CONFIG_SM_CAMCC_8550=m
15151524
CONFIG_SM_CAMCC_8650=m
15161525
CONFIG_SM_DISPCC_6115=m
15171526
CONFIG_SM_DISPCC_8250=y
15181527
CONFIG_SM_DISPCC_6350=m
1528+
CONFIG_SM_DISPCC_MILOS=m
15191529
CONFIG_SM_DISPCC_8450=m
15201530
CONFIG_SM_DISPCC_8550=m
15211531
CONFIG_SM_DISPCC_8750=m
15221532
CONFIG_SM_GCC_4450=y
15231533
CONFIG_SM_GCC_6115=y
15241534
CONFIG_SM_GCC_6350=y
1535+
CONFIG_SM_GCC_MILOS=y
15251536
CONFIG_SM_GCC_8350=y
15261537
CONFIG_SM_GCC_8450=y
15271538
CONFIG_SM_GCC_8550=y
15281539
CONFIG_SM_GCC_8650=y
15291540
CONFIG_SM_GCC_8750=y
15301541
CONFIG_SM_GPUCC_6115=m
15311542
CONFIG_SM_GPUCC_6350=m
1543+
CONFIG_SM_GPUCC_MILOS=m
15321544
CONFIG_SM_GPUCC_8150=y
15331545
CONFIG_SM_GPUCC_8250=y
15341546
CONFIG_SM_GPUCC_8350=m
@@ -1540,6 +1552,7 @@ CONFIG_SM_TCSRCC_8650=y
15401552
CONFIG_SM_TCSRCC_8750=m
15411553
CONFIG_SA_VIDEOCC_8775P=m
15421554
CONFIG_SM_VIDEOCC_6350=m
1555+
CONFIG_SM_VIDEOCC_MILOS=m
15431556
CONFIG_SM_VIDEOCC_8250=y
15441557
CONFIG_SM_VIDEOCC_8550=m
15451558
CONFIG_QCOM_HFPLL=y
@@ -1830,6 +1843,7 @@ CONFIG_INTERCONNECT_IMX8MN=m
18301843
CONFIG_INTERCONNECT_IMX8MQ=m
18311844
CONFIG_INTERCONNECT_IMX8MP=y
18321845
CONFIG_INTERCONNECT_QCOM=y
1846+
CONFIG_INTERCONNECT_QCOM_KAANAPALI=y
18331847
CONFIG_INTERCONNECT_QCOM_MSM8916=m
18341848
CONFIG_INTERCONNECT_QCOM_MSM8953=y
18351849
CONFIG_INTERCONNECT_QCOM_MSM8996=y
@@ -1848,6 +1862,7 @@ CONFIG_INTERCONNECT_QCOM_SDM845=y
18481862
CONFIG_INTERCONNECT_QCOM_SDX75=y
18491863
CONFIG_INTERCONNECT_QCOM_SM6115=y
18501864
CONFIG_INTERCONNECT_QCOM_SM6350=y
1865+
CONFIG_INTERCONNECT_QCOM_MILOS=y
18511866
CONFIG_INTERCONNECT_QCOM_SM8150=y
18521867
CONFIG_INTERCONNECT_QCOM_SM8250=y
18531868
CONFIG_INTERCONNECT_QCOM_SM8350=y

0 commit comments

Comments
 (0)