Skip to content

Commit d8dc175

Browse files
committed
Merge remote-tracking branch tech/all/config into qcom-next
2 parents 5c75654 + b2866ec commit d8dc175

4 files changed

Lines changed: 459 additions & 17 deletions

File tree

arch/arm64/configs/defconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,7 @@ CONFIG_PINCTRL_DA9062=m
602602
CONFIG_PINCTRL_MAX77620=y
603603
CONFIG_PINCTRL_RK805=m
604604
CONFIG_PINCTRL_SINGLE=y
605+
CONFIG_PINCTRL_SX150X=m
605606
CONFIG_PINCTRL_OWL=y
606607
CONFIG_PINCTRL_S700=y
607608
CONFIG_PINCTRL_S900=y
@@ -616,12 +617,14 @@ CONFIG_PINCTRL_IMX8ULP=y
616617
CONFIG_PINCTRL_IMX91=y
617618
CONFIG_PINCTRL_IMX93=y
618619
CONFIG_PINCTRL_MSM=y
620+
CONFIG_PINCTRL_GLYMUR=y
619621
CONFIG_PINCTRL_IPQ5018=y
620622
CONFIG_PINCTRL_IPQ5332=y
621623
CONFIG_PINCTRL_IPQ5424=y
622624
CONFIG_PINCTRL_IPQ8074=y
623625
CONFIG_PINCTRL_IPQ6018=y
624626
CONFIG_PINCTRL_IPQ9574=y
627+
CONFIG_PINCTRL_KAANAPALI=y
625628
CONFIG_PINCTRL_MSM8916=y
626629
CONFIG_PINCTRL_MSM8953=y
627630
CONFIG_PINCTRL_MSM8976=y
@@ -937,7 +940,9 @@ CONFIG_DRM_PANEL_HIMAX_HX8279=m
937940
CONFIG_DRM_PANEL_ILITEK_ILI9882T=m
938941
CONFIG_DRM_PANEL_KHADAS_TS050=m
939942
CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
943+
CONFIG_DRM_PANEL_NOVATEK_NT36672A=m
940944
CONFIG_DRM_PANEL_NOVATEK_NT36672E=m
945+
CONFIG_DRM_PANEL_NOVATEK_NT37801=m
941946
CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
942947
CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m
943948
CONFIG_DRM_PANEL_SITRONIX_ST7703=m
@@ -947,6 +952,7 @@ CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
947952
CONFIG_DRM_DISPLAY_CONNECTOR=m
948953
CONFIG_DRM_FSL_LDB=m
949954
CONFIG_DRM_ITE_IT6263=m
955+
CONFIG_DRM_LONTIUM_LT8713SX=m
950956
CONFIG_DRM_LONTIUM_LT8912B=m
951957
CONFIG_DRM_LONTIUM_LT9611=m
952958
CONFIG_DRM_LONTIUM_LT9611UXC=m
@@ -1071,6 +1077,7 @@ CONFIG_SND_SOC_J721E_EVM=m
10711077
CONFIG_SND_SOC_AK4613=m
10721078
CONFIG_SND_SOC_AK4619=m
10731079
CONFIG_SND_SOC_DA7213=m
1080+
CONFIG_SND_SOC_DMIC=m
10741081
CONFIG_SND_SOC_ES7134=m
10751082
CONFIG_SND_SOC_ES7241=m
10761083
CONFIG_SND_SOC_ES8316=m
@@ -1363,6 +1370,10 @@ CONFIG_COMMON_CLK_MT8192_SCP_ADSP=y
13631370
CONFIG_COMMON_CLK_MT8192_VDECSYS=y
13641371
CONFIG_COMMON_CLK_MT8192_VENCSYS=y
13651372
CONFIG_COMMON_CLK_QCOM=y
1373+
CONFIG_CLK_GLYMUR_DISPCC=y
1374+
CONFIG_CLK_GLYMUR_GCC=y
1375+
CONFIG_CLK_GLYMUR_TCSRCC=y
1376+
CONFIG_CLK_KAANAPALI_GCC=y
13661377
CONFIG_CLK_X1E80100_CAMCC=m
13671378
CONFIG_CLK_X1E80100_DISPCC=m
13681379
CONFIG_CLK_X1E80100_GCC=y
@@ -1641,6 +1652,7 @@ CONFIG_PHY_QCOM_QMP=m
16411652
CONFIG_PHY_QCOM_QUSB2=m
16421653
CONFIG_PHY_QCOM_EUSB2_REPEATER=m
16431654
CONFIG_PHY_QCOM_M31_USB=m
1655+
CONFIG_PHY_QCOM_M31_EUSB=m
16441656
CONFIG_PHY_QCOM_USB_HS=m
16451657
CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m
16461658
CONFIG_PHY_QCOM_USB_HS_28NM=m
@@ -1706,6 +1718,7 @@ CONFIG_OF_FPGA_REGION=m
17061718
CONFIG_OF_OVERLAY=y
17071719
CONFIG_TEE=y
17081720
CONFIG_OPTEE=y
1721+
CONFIG_QCOMTEE=y
17091722
CONFIG_MUX_GPIO=m
17101723
CONFIG_MUX_MMIO=y
17111724
CONFIG_SLIMBUS=m
@@ -1718,6 +1731,8 @@ CONFIG_INTERCONNECT_IMX8MN=m
17181731
CONFIG_INTERCONNECT_IMX8MQ=m
17191732
CONFIG_INTERCONNECT_IMX8MP=y
17201733
CONFIG_INTERCONNECT_QCOM=y
1734+
CONFIG_INTERCONNECT_QCOM_GLYMUR=y
1735+
CONFIG_INTERCONNECT_QCOM_KAANAPALI=y
17211736
CONFIG_INTERCONNECT_QCOM_MSM8916=m
17221737
CONFIG_INTERCONNECT_QCOM_MSM8996=y
17231738
CONFIG_INTERCONNECT_QCOM_OSM_L3=m

0 commit comments

Comments
 (0)