Skip to content

Commit 70881a7

Browse files
committed
Merge tag 'qcom-arm64-defconfig-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/defconfig
Qualcomm ARM64 defconfig updates for v6.9 Enable the Qualcomm PBS driver to resolve the dependency from the Light Pulse Generator (LED-driver) on modern Qualcomm platforms. Enable the X1E multimedia clock controllers, to provide clocks for the various multimedia blocks. Enable Global clock controller and interconnect drivers for the QDU1000/QRU1000 platforms. Enable the audio drivers and the Goodi Berlin touchscreen driver, used on SM8650 QRD. Enable the MAX20411 regulator driver drive the GPU rail on SA8295P. Lastly mark the Qualcomm interconnect providers that feeds UART instances as builtin, to ensure the console exists when userspace is launched. * tag 'qcom-arm64-defconfig-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: defconfig: Enable QCOM PBS arm64: deconfig: enable Goodix Berlin SPI touchscreen driver as module arm64: defconfig: Enable X1E80100 multimedia clock controllers configs arm64: defconfig: Enable GCC and interconnect for QDU1000/QRU1000 arm64: defconfig: enable WCD939x USBSS driver as module arm64: defconfig: enable audio drivers for SM8650 QRD board arm64: defconfig: Enable Qualcomm interconnect providers arm64: defconfig: Enable MAX20411 regulator driver Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 82abf00 + 9c5c14c commit 70881a7

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

arch/arm64/configs/defconfig

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ CONFIG_MOUSE_ELAN_I2C=m
432432
CONFIG_INPUT_TOUCHSCREEN=y
433433
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
434434
CONFIG_TOUCHSCREEN_GOODIX=m
435+
CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI=m
435436
CONFIG_TOUCHSCREEN_ELAN=m
436437
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
437438
CONFIG_INPUT_MISC=y
@@ -620,6 +621,7 @@ CONFIG_PINCTRL_SM8350_LPASS_LPI=m
620621
CONFIG_PINCTRL_SM8450_LPASS_LPI=m
621622
CONFIG_PINCTRL_SC8280XP_LPASS_LPI=m
622623
CONFIG_PINCTRL_SM8550_LPASS_LPI=m
624+
CONFIG_PINCTRL_SM8650_LPASS_LPI=m
623625
CONFIG_GPIO_ALTERA=m
624626
CONFIG_GPIO_DAVINCI=y
625627
CONFIG_GPIO_DWAPB=y
@@ -752,6 +754,7 @@ CONFIG_REGULATOR_HI6421V530=y
752754
CONFIG_REGULATOR_HI655X=y
753755
CONFIG_REGULATOR_MAX77620=y
754756
CONFIG_REGULATOR_MAX8973=y
757+
CONFIG_REGULATOR_MAX20411=m
755758
CONFIG_REGULATOR_MP8859=y
756759
CONFIG_REGULATOR_MT6315=m
757760
CONFIG_REGULATOR_MT6357=y
@@ -992,6 +995,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
992995
CONFIG_SND_SOC_TLV320AIC3X_I2C=m
993996
CONFIG_SND_SOC_WCD9335=m
994997
CONFIG_SND_SOC_WCD934X=m
998+
CONFIG_SND_SOC_WCD939X=m
999+
CONFIG_SND_SOC_WCD939X_SDW=m
9951000
CONFIG_SND_SOC_WM8524=m
9961001
CONFIG_SND_SOC_WM8904=m
9971002
CONFIG_SND_SOC_WM8960=m
@@ -1079,6 +1084,7 @@ CONFIG_TYPEC_HD3SS3220=m
10791084
CONFIG_TYPEC_MUX_FSA4480=m
10801085
CONFIG_TYPEC_MUX_GPIO_SBU=m
10811086
CONFIG_TYPEC_MUX_NB7VPQ904M=m
1087+
CONFIG_TYPEC_MUX_WCD939X_USBSS=m
10821088
CONFIG_TYPEC_DP_ALTMODE=m
10831089
CONFIG_MMC=y
10841090
CONFIG_MMC_BLOCK_MINORS=32
@@ -1242,7 +1248,11 @@ CONFIG_COMMON_CLK_MT8192_SCP_ADSP=y
12421248
CONFIG_COMMON_CLK_MT8192_VDECSYS=y
12431249
CONFIG_COMMON_CLK_MT8192_VENCSYS=y
12441250
CONFIG_COMMON_CLK_QCOM=y
1251+
CONFIG_CLK_X1E80100_CAMCC=m
1252+
CONFIG_CLK_X1E80100_DISPCC=m
12451253
CONFIG_CLK_X1E80100_GCC=y
1254+
CONFIG_CLK_X1E80100_GPUCC=m
1255+
CONFIG_CLK_X1E80100_TCSRCC=y
12461256
CONFIG_QCOM_A53PLL=y
12471257
CONFIG_QCOM_CLK_APCS_MSM8916=y
12481258
CONFIG_QCOM_CLK_APCC_MSM8996=y
@@ -1265,6 +1275,7 @@ CONFIG_MSM_MMCC_8998=m
12651275
CONFIG_QCM_GCC_2290=y
12661276
CONFIG_QCM_DISPCC_2290=m
12671277
CONFIG_QCS_GCC_404=y
1278+
CONFIG_QDU_GCC_1000=y
12681279
CONFIG_SC_CAMCC_8280XP=m
12691280
CONFIG_SC_DISPCC_8280XP=m
12701281
CONFIG_SA_GCC_8775P=y
@@ -1366,6 +1377,7 @@ CONFIG_QCOM_STATS=m
13661377
CONFIG_QCOM_WCNSS_CTRL=m
13671378
CONFIG_QCOM_APR=m
13681379
CONFIG_QCOM_ICC_BWMON=m
1380+
CONFIG_QCOM_PBS=m
13691381
CONFIG_ARCH_R8A77995=y
13701382
CONFIG_ARCH_R8A77990=y
13711383
CONFIG_ARCH_R8A77951=y
@@ -1551,8 +1563,9 @@ CONFIG_INTERCONNECT_QCOM=y
15511563
CONFIG_INTERCONNECT_QCOM_MSM8916=m
15521564
CONFIG_INTERCONNECT_QCOM_MSM8996=m
15531565
CONFIG_INTERCONNECT_QCOM_OSM_L3=m
1554-
CONFIG_INTERCONNECT_QCOM_QCM2290=m
1566+
CONFIG_INTERCONNECT_QCOM_QCM2290=y
15551567
CONFIG_INTERCONNECT_QCOM_QCS404=m
1568+
CONFIG_INTERCONNECT_QCOM_QDU1000=y
15561569
CONFIG_INTERCONNECT_QCOM_SA8775P=y
15571570
CONFIG_INTERCONNECT_QCOM_SC7180=y
15581571
CONFIG_INTERCONNECT_QCOM_SC7280=y
@@ -1561,7 +1574,7 @@ CONFIG_INTERCONNECT_QCOM_SC8280XP=y
15611574
CONFIG_INTERCONNECT_QCOM_SDM845=y
15621575
CONFIG_INTERCONNECT_QCOM_SDX75=y
15631576
CONFIG_INTERCONNECT_QCOM_SM8150=m
1564-
CONFIG_INTERCONNECT_QCOM_SM8250=m
1577+
CONFIG_INTERCONNECT_QCOM_SM8250=y
15651578
CONFIG_INTERCONNECT_QCOM_SM8350=m
15661579
CONFIG_INTERCONNECT_QCOM_SM8450=y
15671580
CONFIG_INTERCONNECT_QCOM_SM8550=y

0 commit comments

Comments
 (0)