Skip to content

Commit d2dff8d

Browse files
committed
Merge tag 'qcom-arm64-defconfig-for-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/defconfig
Qualcomm ARM64 defconfig updates for v6.6 This marks the MSM8996 global clock controller as buildin, to avoid boot issues. The SC8280XP GPU clock controller is enabled, to enable GPU support. A series of drivers needed to boot the IPQ5018 platform is enabled, and the ethernet PHY to enable Ethernet on SA8775P is enabled. * tag 'qcom-arm64-defconfig-for-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: defconfig: Enable IPQ5018 SoC base configs arm64: defconfig: enable the SerDes PHY for Qualcomm DWMAC arm64: defconfig: enable Qualcomm MSM8996 Global Clock Controller as built-in arm64: defconfig: Enable Qualcomm SC8280XP GPUCC Link: https://lore.kernel.org/r/20230818023651.2484774-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents da6212d + 7f0c873 commit d2dff8d

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ CONFIG_PINCTRL_IMX8ULP=y
574574
CONFIG_PINCTRL_IMX93=y
575575
CONFIG_PINCTRL_MSM=y
576576
CONFIG_PINCTRL_IPQ8074=y
577+
CONFIG_PINCTRL_IPQ5018=y
577578
CONFIG_PINCTRL_IPQ5332=y
578579
CONFIG_PINCTRL_IPQ6018=y
579580
CONFIG_PINCTRL_IPQ9574=y
@@ -1206,11 +1207,14 @@ CONFIG_QCOM_CLK_SMD_RPM=y
12061207
CONFIG_QCOM_CLK_RPMH=y
12071208
CONFIG_IPQ_APSS_6018=y
12081209
CONFIG_IPQ_GCC_5332=y
1210+
CONFIG_IPQ_APSS_5018=y
1211+
CONFIG_IPQ_GCC_5018=y
12091212
CONFIG_IPQ_GCC_6018=y
12101213
CONFIG_IPQ_GCC_8074=y
12111214
CONFIG_IPQ_GCC_9574=y
12121215
CONFIG_MSM_GCC_8916=y
12131216
CONFIG_MSM_GCC_8994=y
1217+
CONFIG_MSM_GCC_8996=y
12141218
CONFIG_MSM_MMCC_8994=m
12151219
CONFIG_MSM_MMCC_8996=m
12161220
CONFIG_MSM_MMCC_8998=m
@@ -1225,6 +1229,7 @@ CONFIG_SC_GCC_7180=y
12251229
CONFIG_SC_GCC_7280=y
12261230
CONFIG_SC_GCC_8180X=y
12271231
CONFIG_SC_GCC_8280XP=y
1232+
CONFIG_SC_GPUCC_8280XP=m
12281233
CONFIG_SC_LPASSCC_8280XP=m
12291234
CONFIG_SDM_CAMCC_845=m
12301235
CONFIG_SDM_GPUCC_845=y
@@ -1417,6 +1422,7 @@ CONFIG_PHY_QCOM_USB_HS=m
14171422
CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m
14181423
CONFIG_PHY_QCOM_USB_HS_28NM=m
14191424
CONFIG_PHY_QCOM_USB_SS=m
1425+
CONFIG_PHY_QCOM_SGMII_ETH=m
14201426
CONFIG_PHY_R8A779F0_ETHERNET_SERDES=y
14211427
CONFIG_PHY_RCAR_GEN3_PCIE=y
14221428
CONFIG_PHY_RCAR_GEN3_USB2=y

0 commit comments

Comments
 (0)