Skip to content

Commit 72a790a

Browse files
committed
Merge tag 'qcom-arm64-defconfig-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/defconfig
Qualcomm ARM64 defconfig updates for v5.8 This enables SM8250 GCC clock driver, SC7180 GCC clock driver and SC7180 TLMM pinctrl driver, the IPA and RMNET drivers, CCI, camera subsystem and camera clock drivers and removes the now depricated GLINK_SSR entry. * tag 'qcom-arm64-defconfig-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: defconfig: enable Qualcomm IPA and RMNet modules arm64: defconfig: Enable Qualcomm SC7180 pinctrl and gcc arm64: defconfig: Remove QCOM_GLINK_SSR arm64: defconfig: Enable SM8250 GCC driver arm64: defconfig: Enable Qualcomm CAMCC, CAMSS and CCI drivers Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 88b1542 + 5ef3c35 commit 72a790a

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

arch/arm64/configs/defconfig

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,13 +306,15 @@ CONFIG_MLX4_EN=m
306306
CONFIG_MLX5_CORE=m
307307
CONFIG_MLX5_CORE_EN=y
308308
CONFIG_QCOM_EMAC=m
309+
CONFIG_RMNET=m
309310
CONFIG_RAVB=y
310311
CONFIG_SMC91X=y
311312
CONFIG_SMSC911X=y
312313
CONFIG_SNI_AVE=y
313314
CONFIG_SNI_NETSEC=y
314315
CONFIG_STMMAC_ETH=m
315316
CONFIG_TI_K3_AM65_CPSW_NUSS=y
317+
CONFIG_QCOM_IPA=m
316318
CONFIG_MDIO_BUS_MUX_MMIOREG=y
317319
CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
318320
CONFIG_AQUANTIA_PHY=y
@@ -411,6 +413,7 @@ CONFIG_I2C_MESON=y
411413
CONFIG_I2C_MV64XXX=y
412414
CONFIG_I2C_OWL=y
413415
CONFIG_I2C_PXA=y
416+
CONFIG_I2C_QCOM_CCI=m
414417
CONFIG_I2C_QCOM_GENI=m
415418
CONFIG_I2C_QUP=y
416419
CONFIG_I2C_RK3X=y
@@ -460,6 +463,7 @@ CONFIG_PINCTRL_MSM8998=y
460463
CONFIG_PINCTRL_QCS404=y
461464
CONFIG_PINCTRL_QDF2XXX=y
462465
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
466+
CONFIG_PINCTRL_SC7180=y
463467
CONFIG_PINCTRL_SDM845=y
464468
CONFIG_PINCTRL_SM8150=y
465469
CONFIG_GPIO_ALTERA=m
@@ -585,6 +589,7 @@ CONFIG_VIDEO_RENESAS_FCP=m
585589
CONFIG_VIDEO_RENESAS_VSP1=m
586590
CONFIG_SDR_PLATFORM_DRIVERS=y
587591
CONFIG_VIDEO_RCAR_DRIF=m
592+
CONFIG_VIDEO_QCOM_CAMSS=m
588593
CONFIG_DRM=m
589594
CONFIG_DRM_I2C_NXP_TDA998X=m
590595
CONFIG_DRM_MALI_DISPLAY=m
@@ -805,10 +810,13 @@ CONFIG_MSM_GCC_8994=y
805810
CONFIG_MSM_MMCC_8996=y
806811
CONFIG_MSM_GCC_8998=y
807812
CONFIG_QCS_GCC_404=y
813+
CONFIG_SC_GCC_7180=y
814+
CONFIG_SDM_CAMCC_845=m
808815
CONFIG_SDM_GCC_845=y
809816
CONFIG_SDM_GPUCC_845=y
810817
CONFIG_SDM_DISPCC_845=y
811818
CONFIG_SM_GCC_8150=y
819+
CONFIG_SM_GCC_8250=y
812820
CONFIG_QCOM_HFPLL=y
813821
CONFIG_HWSPINLOCK=y
814822
CONFIG_HWSPINLOCK_QCOM=y
@@ -838,7 +846,6 @@ CONFIG_FSL_MC_DPIO=y
838846
CONFIG_IMX_SCU_SOC=y
839847
CONFIG_QCOM_AOSS_QMP=y
840848
CONFIG_QCOM_GENI_SE=y
841-
CONFIG_QCOM_GLINK_SSR=m
842849
CONFIG_QCOM_RMTFS_MEM=m
843850
CONFIG_QCOM_RPMH=y
844851
CONFIG_QCOM_RPMHPD=y

0 commit comments

Comments
 (0)