Skip to content

Commit 701340d

Browse files
committed
Merge tag 'qcom-arm64-defconfig-for-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/defconfig
Qualcomm Arm64 defconfig updates for v6.15 Explicitly enable the DRM_DISPLAY_CONNECTOR module, as this is used by a variety of boards. Enable retimer and redriver drivers used in the USB configuration of a variety of Qualcomm X Elite-based devices. Enable the NSS clock controller driver for IPQ9574, the new Iris video encoder/decoder driver and it's clock controller, as well as the QCM2290 GPU clocck ontroller. * tag 'qcom-arm64-defconfig-for-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: defconfig: Enable USB retimer and redriver arm64: defconfig: Build NSS Clock Controller driver for IPQ9574 arm64: defconfig: enable Qualcomm IRIS & VIDEOCC_8550 as module arm64: defconfig: enable DRM_DISPLAY_CONNECTOR as a module arm64: defconfig: Enable Qualcomm QCM2290 GPU clock controller Link: https://lore.kernel.org/r/20250319144354.2281720-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 1156ebe + dd20903 commit 701340d

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

arch/arm64/configs/defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,7 @@ CONFIG_VIDEO_IMX8_ISI=m
847847
CONFIG_VIDEO_IMX8_ISI_M2M=y
848848
CONFIG_VIDEO_IMX8_JPEG=m
849849
CONFIG_VIDEO_QCOM_CAMSS=m
850+
CONFIG_VIDEO_QCOM_IRIS=m
850851
CONFIG_VIDEO_QCOM_VENUS=m
851852
CONFIG_VIDEO_RCAR_ISP=m
852853
CONFIG_VIDEO_RCAR_CSI2=m
@@ -915,6 +916,7 @@ CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m
915916
CONFIG_DRM_PANEL_SITRONIX_ST7703=m
916917
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
917918
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
919+
CONFIG_DRM_DISPLAY_CONNECTOR=m
918920
CONFIG_DRM_FSL_LDB=m
919921
CONFIG_DRM_ITE_IT6263=m
920922
CONFIG_DRM_LONTIUM_LT8912B=m
@@ -1151,6 +1153,7 @@ CONFIG_TYPEC_HD3SS3220=m
11511153
CONFIG_TYPEC_MUX_FSA4480=m
11521154
CONFIG_TYPEC_MUX_GPIO_SBU=m
11531155
CONFIG_TYPEC_MUX_NB7VPQ904M=m
1156+
CONFIG_TYPEC_MUX_PS883X=m
11541157
CONFIG_TYPEC_MUX_WCD939X_USBSS=m
11551158
CONFIG_TYPEC_DP_ALTMODE=m
11561159
CONFIG_MMC=y
@@ -1327,6 +1330,7 @@ CONFIG_CLK_X1E80100_DISPCC=m
13271330
CONFIG_CLK_X1E80100_GCC=y
13281331
CONFIG_CLK_X1E80100_GPUCC=m
13291332
CONFIG_CLK_X1E80100_TCSRCC=y
1333+
CONFIG_CLK_QCM2290_GPUCC=m
13301334
CONFIG_QCOM_A53PLL=y
13311335
CONFIG_QCOM_CLK_APCS_MSM8916=y
13321336
CONFIG_QCOM_CLK_APCC_MSM8996=y
@@ -1340,6 +1344,7 @@ CONFIG_IPQ_GCC_5332=y
13401344
CONFIG_IPQ_GCC_6018=y
13411345
CONFIG_IPQ_GCC_8074=y
13421346
CONFIG_IPQ_GCC_9574=y
1347+
CONFIG_IPQ_NSSCC_9574=m
13431348
CONFIG_MSM_GCC_8916=y
13441349
CONFIG_MSM_MMCC_8994=m
13451350
CONFIG_MSM_GCC_8994=y
@@ -1401,6 +1406,7 @@ CONFIG_SM_TCSRCC_8650=y
14011406
CONFIG_SM_TCSRCC_8750=m
14021407
CONFIG_SA_VIDEOCC_8775P=m
14031408
CONFIG_SM_VIDEOCC_8250=y
1409+
CONFIG_SM_VIDEOCC_8550=m
14041410
CONFIG_QCOM_HFPLL=y
14051411
CONFIG_CLK_GFM_LPASS_SM8250=m
14061412
CONFIG_CLK_RCAR_USB2_CLOCK_SEL=y
@@ -1568,6 +1574,7 @@ CONFIG_RESET_RZG2L_USBPHY_CTRL=y
15681574
CONFIG_RESET_TI_SCI=y
15691575
CONFIG_PHY_XGENE=y
15701576
CONFIG_PHY_CAN_TRANSCEIVER=m
1577+
CONFIG_PHY_NXP_PTN3222=m
15711578
CONFIG_PHY_SUN4I_USB=y
15721579
CONFIG_PHY_CADENCE_TORRENT=m
15731580
CONFIG_PHY_CADENCE_DPHY_RX=m

0 commit comments

Comments
 (0)