Skip to content

Commit f79749a

Browse files
torvaldstorvalds
committed
Merge tag 'soc-defconfig-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC defconfig updates from Arnd Bergmann: "The usual defconfig updates enable configuration options for drivers that got added. A few SoC specific options are enabled in Kconfig files instead, in place of the defconfig files" * tag 'soc-defconfig-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: arm64: defconfig: enable ACPM protocol and Exynos mailbox arm64: defconfig: Enable configs for MediaTek Genio EVK boards arm64: defconfig: mediatek: enable PHY drivers arm64: defconfig: Enable Rockchip SAI and ES8328 arm64: defconfig: Add Toradex Embedded Controller config arm64: defconfig: Enable TPIC2810 GPIO expander riscv: defconfig: spacemit: enable clock controller driver for SpacemiT K1 arm64: defconfig: Enable TMP102 as module arm64: defconfig: Enable hwspinlock and eQEP for K3 arm64: defconfig: Add CDNS_DSI and CDNS_PHY config riscv: defconfig: spacemit: enable gpio support for K1 SoC arm64: defconfig: Enable IPQ5424 RDP466 base configs riscv: Enable PM_GENERIC_DOMAINS for T-Head SoCs
2 parents 500af1d + ae00649 commit f79749a

3 files changed

Lines changed: 30 additions & 0 deletions

File tree

‎arch/arm64/configs/defconfig‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ CONFIG_IMX_SCU=y
265265
CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
266266
CONFIG_QCOM_QSEECOM=y
267267
CONFIG_QCOM_QSEECOM_UEFISECAPP=y
268+
CONFIG_EXYNOS_ACPM_PROTOCOL=m
268269
CONFIG_GNSS=m
269270
CONFIG_GNSS_MTK_SERIAL=m
270271
CONFIG_MTD=y
@@ -605,6 +606,7 @@ CONFIG_PINCTRL_IMX93=y
605606
CONFIG_PINCTRL_MSM=y
606607
CONFIG_PINCTRL_IPQ5018=y
607608
CONFIG_PINCTRL_IPQ5332=y
609+
CONFIG_PINCTRL_IPQ5424=y
608610
CONFIG_PINCTRL_IPQ8074=y
609611
CONFIG_PINCTRL_IPQ6018=y
610612
CONFIG_PINCTRL_IPQ9574=y
@@ -672,12 +674,14 @@ CONFIG_GPIO_PCA953X=y
672674
CONFIG_GPIO_PCA953X_IRQ=y
673675
CONFIG_GPIO_ADP5585=m
674676
CONFIG_GPIO_PCF857X=m
677+
CONFIG_GPIO_TPIC2810=m
675678
CONFIG_GPIO_BD9571MWV=m
676679
CONFIG_GPIO_MAX77620=y
677680
CONFIG_GPIO_SL28CPLD=m
678681
CONFIG_GPIO_AGGREGATOR=m
679682
CONFIG_POWER_RESET_MSM=y
680683
CONFIG_POWER_RESET_QCOM_PON=m
684+
CONFIG_POWER_RESET_TORADEX_EC=m
681685
CONFIG_POWER_RESET_XGENE=y
682686
CONFIG_POWER_RESET_SYSCON=y
683687
CONFIG_POWER_RESET_SYSCON_POWEROFF=y
@@ -702,6 +706,7 @@ CONFIG_SENSORS_RASPBERRYPI_HWMON=m
702706
CONFIG_SENSORS_SL28CPLD=m
703707
CONFIG_SENSORS_INA2XX=m
704708
CONFIG_SENSORS_INA3221=m
709+
CONFIG_SENSORS_TMP102=m
705710
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
706711
CONFIG_CPU_THERMAL=y
707712
CONFIG_DEVFREQ_THERMAL=y
@@ -841,6 +846,7 @@ CONFIG_VIDEO_MEDIATEK_JPEG=m
841846
CONFIG_VIDEO_MEDIATEK_VCODEC=m
842847
CONFIG_VIDEO_WAVE_VPU=m
843848
CONFIG_VIDEO_E5010_JPEG_ENC=m
849+
CONFIG_VIDEO_MEDIATEK_MDP3=m
844850
CONFIG_VIDEO_IMX7_CSI=m
845851
CONFIG_VIDEO_IMX_MIPI_CSIS=m
846852
CONFIG_VIDEO_IMX8_ISI=m
@@ -907,13 +913,15 @@ CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
907913
CONFIG_DRM_PANEL_LVDS=m
908914
CONFIG_DRM_PANEL_SIMPLE=m
909915
CONFIG_DRM_PANEL_EDP=m
916+
CONFIG_DRM_PANEL_HIMAX_HX8279=m
910917
CONFIG_DRM_PANEL_ILITEK_ILI9882T=m
911918
CONFIG_DRM_PANEL_KHADAS_TS050=m
912919
CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
913920
CONFIG_DRM_PANEL_NOVATEK_NT36672E=m
914921
CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
915922
CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m
916923
CONFIG_DRM_PANEL_SITRONIX_ST7703=m
924+
CONFIG_DRM_PANEL_STARTEK_KD070FHFID015=m
917925
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
918926
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
919927
CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -937,6 +945,7 @@ CONFIG_DRM_TI_SN65DSI86=m
937945
CONFIG_DRM_ANALOGIX_ANX7625=m
938946
CONFIG_DRM_I2C_ADV7511=m
939947
CONFIG_DRM_I2C_ADV7511_AUDIO=y
948+
CONFIG_DRM_CDNS_DSI=m
940949
CONFIG_DRM_CDNS_MHDP8546=m
941950
CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE=m
942951
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
@@ -1005,6 +1014,7 @@ CONFIG_SND_SOC_SC7280=m
10051014
CONFIG_SND_SOC_X1E80100=m
10061015
CONFIG_SND_SOC_ROCKCHIP=m
10071016
CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
1017+
CONFIG_SND_SOC_ROCKCHIP_SAI=m
10081018
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
10091019
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
10101020
CONFIG_SND_SOC_RK3399_GRU_SOUND=m
@@ -1044,6 +1054,8 @@ CONFIG_SND_SOC_DA7213=m
10441054
CONFIG_SND_SOC_ES7134=m
10451055
CONFIG_SND_SOC_ES7241=m
10461056
CONFIG_SND_SOC_ES8316=m
1057+
CONFIG_SND_SOC_ES8328=m
1058+
CONFIG_SND_SOC_ES8328_I2C=m
10471059
CONFIG_SND_SOC_GTM601=m
10481060
CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
10491061
CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
@@ -1143,6 +1155,8 @@ CONFIG_USB_MASS_STORAGE=m
11431155
CONFIG_TYPEC=m
11441156
CONFIG_TYPEC_TCPM=m
11451157
CONFIG_TYPEC_TCPCI=m
1158+
CONFIG_TYPEC_RT1711H=m
1159+
CONFIG_TYPEC_MT6360=m
11461160
CONFIG_TYPEC_TCPCI_MAXIM=m
11471161
CONFIG_TYPEC_FUSB302=m
11481162
CONFIG_TYPEC_QCOM_PMIC=m
@@ -1153,6 +1167,7 @@ CONFIG_TYPEC_TPS6598X=m
11531167
CONFIG_TYPEC_HD3SS3220=m
11541168
CONFIG_TYPEC_MUX_FSA4480=m
11551169
CONFIG_TYPEC_MUX_GPIO_SBU=m
1170+
CONFIG_TYPEC_MUX_IT5205=m
11561171
CONFIG_TYPEC_MUX_NB7VPQ904M=m
11571172
CONFIG_TYPEC_MUX_PS883X=m
11581173
CONFIG_TYPEC_MUX_WCD939X_USBSS=m
@@ -1262,6 +1277,7 @@ CONFIG_PL330_DMA=y
12621277
CONFIG_TEGRA186_GPC_DMA=y
12631278
CONFIG_TEGRA20_APB_DMA=y
12641279
CONFIG_TEGRA210_ADMA=m
1280+
CONFIG_MTK_UART_APDMA=m
12651281
CONFIG_QCOM_BAM_DMA=y
12661282
CONFIG_QCOM_GPI_DMA=m
12671283
CONFIG_QCOM_HIDMA_MGMT=y
@@ -1342,6 +1358,7 @@ CONFIG_IPQ_APSS_5018=y
13421358
CONFIG_IPQ_CMN_PLL=m
13431359
CONFIG_IPQ_GCC_5018=y
13441360
CONFIG_IPQ_GCC_5332=y
1361+
CONFIG_IPQ_GCC_5424=y
13451362
CONFIG_IPQ_GCC_6018=y
13461363
CONFIG_IPQ_GCC_8074=y
13471364
CONFIG_IPQ_GCC_9574=y
@@ -1413,10 +1430,12 @@ CONFIG_CLK_GFM_LPASS_SM8250=m
14131430
CONFIG_CLK_RCAR_USB2_CLOCK_SEL=y
14141431
CONFIG_CLK_RENESAS_VBATTB=m
14151432
CONFIG_HWSPINLOCK=y
1433+
CONFIG_HWSPINLOCK_OMAP=m
14161434
CONFIG_HWSPINLOCK_QCOM=y
14171435
CONFIG_TEGRA186_TIMER=y
14181436
CONFIG_RENESAS_OSTM=y
14191437
CONFIG_ARM_MHU=y
1438+
CONFIG_EXYNOS_MBOX=m
14201439
CONFIG_IMX_MBOX=y
14211440
CONFIG_OMAP2PLUS_MBOX=m
14221441
CONFIG_PLATFORM_MHU=y
@@ -1503,6 +1522,7 @@ CONFIG_EXYNOS_ADC=y
15031522
CONFIG_IMX8QXP_ADC=m
15041523
CONFIG_IMX93_ADC=m
15051524
CONFIG_MAX9611=m
1525+
CONFIG_MEDIATEK_MT6359_AUXADC=m
15061526
CONFIG_MEDIATEK_MT6577_AUXADC=m
15071527
CONFIG_QCOM_SPMI_VADC=m
15081528
CONFIG_QCOM_SPMI_ADC5=m
@@ -1556,6 +1576,7 @@ CONFIG_PHY_CAN_TRANSCEIVER=m
15561576
CONFIG_PHY_NXP_PTN3222=m
15571577
CONFIG_PHY_SUN4I_USB=y
15581578
CONFIG_PHY_CADENCE_TORRENT=m
1579+
CONFIG_PHY_CADENCE_DPHY=m
15591580
CONFIG_PHY_CADENCE_DPHY_RX=m
15601581
CONFIG_PHY_CADENCE_SIERRA=m
15611582
CONFIG_PHY_CADENCE_SALVO=m
@@ -1565,7 +1586,11 @@ CONFIG_PHY_HI6220_USB=y
15651586
CONFIG_PHY_HISTB_COMBPHY=y
15661587
CONFIG_PHY_HISI_INNO_USB2=y
15671588
CONFIG_PHY_MVEBU_CP110_COMPHY=y
1589+
CONFIG_PHY_MTK_PCIE=m
15681590
CONFIG_PHY_MTK_TPHY=y
1591+
CONFIG_PHY_MTK_HDMI=m
1592+
CONFIG_PHY_MTK_MIPI_DSI=m
1593+
CONFIG_PHY_MTK_DP=m
15691594
CONFIG_PHY_QCOM_EDP=m
15701595
CONFIG_PHY_QCOM_PCIE2=m
15711596
CONFIG_PHY_QCOM_QMP=m
@@ -1674,6 +1699,7 @@ CONFIG_INTERCONNECT_QCOM_SM8650=y
16741699
CONFIG_INTERCONNECT_QCOM_SM8750=y
16751700
CONFIG_INTERCONNECT_QCOM_X1E80100=y
16761701
CONFIG_COUNTER=m
1702+
CONFIG_TI_EQEP=m
16771703
CONFIG_RZ_MTU3_CNT=m
16781704
CONFIG_HTE=y
16791705
CONFIG_HTE_TEGRA194=y

‎arch/riscv/Kconfig.socs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ config ARCH_THEAD
5454
bool "T-HEAD RISC-V SoCs"
5555
depends on MMU && !XIP_KERNEL
5656
select ERRATA_THEAD
57+
select PM_GENERIC_DOMAINS if PM
5758
help
5859
This enables support for the RISC-V based T-HEAD SoCs.
5960

‎arch/riscv/configs/defconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ CONFIG_PINCTRL_SOPHGO_SG2002=y
169169
CONFIG_PINCTRL_TH1520=y
170170
CONFIG_GPIO_DWAPB=y
171171
CONFIG_GPIO_SIFIVE=y
172+
CONFIG_GPIO_SPACEMIT_K1=y
172173
CONFIG_POWER_RESET_GPIO_RESTART=y
173174
CONFIG_SENSORS_SFCTEMP=m
174175
CONFIG_CPU_THERMAL=y
@@ -250,6 +251,8 @@ CONFIG_CLK_SOPHGO_CV1800=y
250251
CONFIG_CLK_SOPHGO_SG2042_PLL=y
251252
CONFIG_CLK_SOPHGO_SG2042_CLKGEN=y
252253
CONFIG_CLK_SOPHGO_SG2042_RPGATE=y
254+
CONFIG_SPACEMIT_CCU=y
255+
CONFIG_SPACEMIT_K1_CCU=y
253256
CONFIG_SUN8I_DE2_CCU=m
254257
CONFIG_SUN50I_IOMMU=y
255258
CONFIG_RPMSG_CHAR=y

0 commit comments

Comments
 (0)