Skip to content

Commit 2425d7e

Browse files
committed
Merge tag 'qcom-arm64-defconfig-for-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/defconfig
Qualcomm ARM64 defconfig updates for v6.4 This enables a range of TLMM pinctrl drivers, needed to boot related platforms. Multimedia clock drivers for MSM8994 and MSM8998 are enabled and the MSM8996 is flagged as a module instead of builtin. The PMIC_GLINK drivers are enabled, providing USB Type-C and battery support on various platforms, and eUSB2 drivers found on SM8550 are enabled. Base drivers for IPQ5332 and IPQ9574 are enabled. * tag 'qcom-arm64-defconfig-for-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: defconfig: Enable IPQ9574 SoC base configs arm64: defconfig: remove duplicate TYPEC_UCSI & QCOM_PMIC_GLINK arm64: defconfig: add PMIC GLINK modules arm64: defconfig: enable Qualcomm pin controller drivers arm64: defconfig: Enable qcom msm899{4,8} clk drivers arm64: defconfig: Switch msm8996 clk drivers to module arm64: defconfig: Enable QCOM eUSB2 SNPS PHY and repeater arm64: defconfig: Enable IPQ5332 SoC base configs Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 24c1597 + 34d1a90 commit 2425d7e

File tree

1 file changed

+21
-1
lines changed

1 file changed

+21
-1
lines changed

arch/arm64/configs/defconfig

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ CONFIG_VIRTIO_BLK=y
273273
CONFIG_BLK_DEV_NVME=m
274274
CONFIG_QCOM_COINCELL=m
275275
CONFIG_QCOM_FASTRPC=m
276+
CONFIG_BATTERY_QCOM_BATTMGR=m
277+
CONFIG_UCSI_PMIC_GLINK=m
276278
CONFIG_SRAM=y
277279
CONFIG_PCI_ENDPOINT_TEST=m
278280
CONFIG_EEPROM_AT24=m
@@ -547,7 +549,9 @@ CONFIG_PINCTRL_IMX8ULP=y
547549
CONFIG_PINCTRL_IMX93=y
548550
CONFIG_PINCTRL_MSM=y
549551
CONFIG_PINCTRL_IPQ8074=y
552+
CONFIG_PINCTRL_IPQ5332=y
550553
CONFIG_PINCTRL_IPQ6018=y
554+
CONFIG_PINCTRL_IPQ9574=y
551555
CONFIG_PINCTRL_MSM8916=y
552556
CONFIG_PINCTRL_MSM8953=y
553557
CONFIG_PINCTRL_MSM8976=y
@@ -558,19 +562,29 @@ CONFIG_PINCTRL_QCM2290=y
558562
CONFIG_PINCTRL_QCS404=y
559563
CONFIG_PINCTRL_QDF2XXX=y
560564
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
565+
CONFIG_PINCTRL_QDU1000=y
561566
CONFIG_PINCTRL_SA8775P=y
562567
CONFIG_PINCTRL_SC7180=y
563568
CONFIG_PINCTRL_SC7280=y
569+
CONFIG_PINCTRL_SC7280_LPASS_LPI=m
564570
CONFIG_PINCTRL_SC8180X=y
565571
CONFIG_PINCTRL_SC8280XP=y
572+
CONFIG_PINCTRL_SDM660=y
573+
CONFIG_PINCTRL_SDM670=y
566574
CONFIG_PINCTRL_SDM845=y
567575
CONFIG_PINCTRL_SM6115=y
576+
CONFIG_PINCTRL_SM6125=y
577+
CONFIG_PINCTRL_SM6350=y
578+
CONFIG_PINCTRL_SM6375=y
568579
CONFIG_PINCTRL_SM8150=y
569580
CONFIG_PINCTRL_SM8250=y
570581
CONFIG_PINCTRL_SM8250_LPASS_LPI=m
571582
CONFIG_PINCTRL_SM8350=y
572583
CONFIG_PINCTRL_SM8450=y
584+
CONFIG_PINCTRL_SM8450_LPASS_LPI=m
585+
CONFIG_PINCTRL_SC8280XP_LPASS_LPI=m
573586
CONFIG_PINCTRL_SM8550=y
587+
CONFIG_PINCTRL_SM8550_LPASS_LPI=m
574588
CONFIG_PINCTRL_LPASS_LPI=m
575589
CONFIG_GPIO_ALTERA=m
576590
CONFIG_GPIO_DAVINCI=y
@@ -1127,11 +1141,15 @@ CONFIG_QCOM_CLK_APCS_MSM8916=y
11271141
CONFIG_QCOM_CLK_APCC_MSM8996=y
11281142
CONFIG_QCOM_CLK_SMD_RPM=y
11291143
CONFIG_QCOM_CLK_RPMH=y
1144+
CONFIG_IPQ_GCC_5332=y
11301145
CONFIG_IPQ_GCC_6018=y
11311146
CONFIG_IPQ_GCC_8074=y
1147+
CONFIG_IPQ_GCC_9574=y
11321148
CONFIG_MSM_GCC_8916=y
11331149
CONFIG_MSM_GCC_8994=y
1134-
CONFIG_MSM_MMCC_8996=y
1150+
CONFIG_MSM_MMCC_8994=m
1151+
CONFIG_MSM_MMCC_8996=m
1152+
CONFIG_MSM_MMCC_8998=m
11351153
CONFIG_MSM_GCC_8998=y
11361154
CONFIG_QCS_GCC_404=y
11371155
CONFIG_SA_GCC_8775P=y
@@ -1308,9 +1326,11 @@ CONFIG_PHY_HISI_INNO_USB2=y
13081326
CONFIG_PHY_MVEBU_CP110_COMPHY=y
13091327
CONFIG_PHY_MTK_TPHY=y
13101328
CONFIG_PHY_QCOM_EDP=m
1329+
CONFIG_PHY_QCOM_EUSB2_REPEATER=m
13111330
CONFIG_PHY_QCOM_PCIE2=m
13121331
CONFIG_PHY_QCOM_QMP=m
13131332
CONFIG_PHY_QCOM_QUSB2=m
1333+
CONFIG_PHY_QCOM_SNPS_EUSB2=m
13141334
CONFIG_PHY_QCOM_USB_HS=m
13151335
CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m
13161336
CONFIG_PHY_QCOM_USB_HS_28NM=m

0 commit comments

Comments
 (0)