Skip to content

Commit 948b256

Browse files
committed
Merge tag 'qcom-arm64-defconfig-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/defconfig
Qualcomm Arm64 Defconfig updates for v6.10 Ext4 security labels are enabled, as the expectation of setcap being functional is widespread. SC7280 display and GPU clock controllers are enabled, to make available related functionality. The driver for the Novatek display panel found in QCM6490 IDP is enabled. The X1E80100 sound card and reset-gpio drivers are enabled to provide the necessary drivers for this. The regulator driver providing VBUS power on a few different platforms is enabled. ath12k is present on several recent platforms, so this is enabled as well. * tag 'qcom-arm64-defconfig-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: defconfig: enable REGULATOR_QCOM_USB_VBUS arm64: defconfig: enable ext4 security labels arm64: defconfig: qcom: enable X1E80100 sound card arm64: defconfig: build ath12k as a module arm64: defconfig: Enable sc7280 display and gpu clock controllers arm64: defconfig: enable reset-gpio driver as module arm64: defconfig: enable Novatek NT36672E DSI Panel driver Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents ee00d5c + fefda68 commit 948b256

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ CONFIG_WCN36XX=m
411411
CONFIG_ATH11K=m
412412
CONFIG_ATH11K_AHB=m
413413
CONFIG_ATH11K_PCI=m
414+
CONFIG_ATH12K=m
414415
CONFIG_BRCMFMAC=m
415416
CONFIG_MWIFIEX=m
416417
CONFIG_MWIFIEX_SDIO=m
@@ -772,6 +773,7 @@ CONFIG_REGULATOR_PWM=y
772773
CONFIG_REGULATOR_QCOM_RPMH=y
773774
CONFIG_REGULATOR_QCOM_SMD_RPM=y
774775
CONFIG_REGULATOR_QCOM_SPMI=y
776+
CONFIG_REGULATOR_QCOM_USB_VBUS=m
775777
CONFIG_REGULATOR_RAA215300=y
776778
CONFIG_REGULATOR_RK808=y
777779
CONFIG_REGULATOR_S2MPS11=y
@@ -866,6 +868,7 @@ CONFIG_DRM_PANEL_SIMPLE=m
866868
CONFIG_DRM_PANEL_EDP=m
867869
CONFIG_DRM_PANEL_ILITEK_ILI9882T=m
868870
CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
871+
CONFIG_DRM_PANEL_NOVATEK_NT36672E=m
869872
CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
870873
CONFIG_DRM_PANEL_SITRONIX_ST7703=m
871874
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
@@ -950,6 +953,7 @@ CONFIG_SND_SOC_SM8250=m
950953
CONFIG_SND_SOC_SC8280XP=m
951954
CONFIG_SND_SOC_SC7180=m
952955
CONFIG_SND_SOC_SC7280=m
956+
CONFIG_SND_SOC_X1E80100=m
953957
CONFIG_SND_SOC_ROCKCHIP=m
954958
CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
955959
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
@@ -1288,13 +1292,15 @@ CONFIG_QCM_DISPCC_2290=m
12881292
CONFIG_QCS_GCC_404=y
12891293
CONFIG_QDU_GCC_1000=y
12901294
CONFIG_SC_CAMCC_8280XP=m
1295+
CONFIG_SC_DISPCC_7280=m
12911296
CONFIG_SC_DISPCC_8280XP=m
12921297
CONFIG_SA_GCC_8775P=y
12931298
CONFIG_SA_GPUCC_8775P=m
12941299
CONFIG_SC_GCC_7180=y
12951300
CONFIG_SC_GCC_7280=y
12961301
CONFIG_SC_GCC_8180X=y
12971302
CONFIG_SC_GCC_8280XP=y
1303+
CONFIG_SC_GPUCC_7280=m
12981304
CONFIG_SC_GPUCC_8280XP=m
12991305
CONFIG_SC_LPASSCC_8280XP=m
13001306
CONFIG_SDM_CAMCC_845=m
@@ -1475,6 +1481,7 @@ CONFIG_PWM_VISCONTI=m
14751481
CONFIG_SL28CPLD_INTC=y
14761482
CONFIG_QCOM_PDC=y
14771483
CONFIG_QCOM_MPM=y
1484+
CONFIG_RESET_GPIO=m
14781485
CONFIG_RESET_IMX7=y
14791486
CONFIG_RESET_QCOM_AOSS=y
14801487
CONFIG_RESET_QCOM_PDC=m
@@ -1602,6 +1609,7 @@ CONFIG_HTE_TEGRA194=y
16021609
CONFIG_HTE_TEGRA194_TEST=m
16031610
CONFIG_EXT4_FS=y
16041611
CONFIG_EXT4_FS_POSIX_ACL=y
1612+
CONFIG_EXT4_FS_SECURITY=y
16051613
CONFIG_BTRFS_FS=m
16061614
CONFIG_BTRFS_FS_POSIX_ACL=y
16071615
CONFIG_FANOTIFY=y

0 commit comments

Comments
 (0)