Skip to content

Commit 7108814

Browse files
committed
Merge tag 'soc-defconfig-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC defconfig updates from Arnd Bergmann: "As usual, a number of new drivers get added to the defconfig to support additional hardware. The stm32 defconfig also turns off a few options to optimize for size" * tag 'soc-defconfig-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (27 commits) dt-bindings: soc: samsung: exynos-pmu: Add exynos990-pmu compatible arm64: defconfig: enable Maxim TCPCI driver ARM: configs: stm32: Remove useless flags in STM32 defconfig ARM: configs: stm32: Remove CRYPTO in STM32 defconfig ARM: configs: stm32: Clean STM32 defconfig ARM: configs: stm32: Remove FLASH_MEM_BASE and FLASH_SIZE in STM32 defconfig arm64: defconfig: Enable pinctrl-based I2C mux arm64: defconfig: Enable Rockchip extensions for Synopsys DW HDMI QP arm64: defconfig: Enable RFKILL GPIO arm64: defconfig: Enable TI K3 M4 remoteproc driver arm64: defconfig: Enable Qualcomm IPQ CMN PLL clock controller arm64: defconfig: Enable basic Qualcomm SM8750 SoC drivers arm64: defconfig: remove obsolete CONFIG_SM_DISPCC_8650 arm64: defconfig: enable clock controller, interconnect and pinctrl for QCS8300 arm64: defconfig: Enable sa8775p clock controllers arm64: defconfig: Enable MediaTek DWMAC arm64: defconfig: Enable sound for MT8188 arm64: defconfig: Enable MediaTek STAR Ethernet MAC riscv: defconfig: enable pinctrl and dwmac support for TH1520 arm64: defconfig: Enable Amazon Elastic Network Adaptor ...
2 parents f2ad904 + 309f644 commit 7108814

File tree

8 files changed

+43
-7
lines changed

8 files changed

+43
-7
lines changed

Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ properties:
5555
- samsung,exynos7885-pmu
5656
- samsung,exynos8895-pmu
5757
- samsung,exynos9810-pmu
58+
- samsung,exynos990-pmu
5859
- samsung,exynosautov9-pmu
5960
- samsung,exynosautov920-pmu
6061
- tesla,fsd-pmu

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ CONFIG_RN5T618_POWER=m
230230
CONFIG_SENSORS_MC13783_ADC=y
231231
CONFIG_SENSORS_GPIO_FAN=y
232232
CONFIG_SENSORS_IIO_HWMON=y
233+
CONFIG_SENSORS_JC42=m
233234
CONFIG_SENSORS_LM75=m
234235
CONFIG_SENSORS_PWM_FAN=y
235236
CONFIG_SENSORS_SY7636A=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CONFIG_ARCH_AT91=y
2020
CONFIG_SOC_SAMA5D2=y
2121
CONFIG_SOC_SAMA5D3=y
2222
CONFIG_SOC_SAMA5D4=y
23+
CONFIG_SOC_SAMA7D65=y
2324
CONFIG_SOC_SAMA7G5=y
2425
CONFIG_SOC_LAN966=y
2526
CONFIG_ARCH_BCM=y

arch/arm/configs/sama7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ CONFIG_EXPERT=y
1212
# CONFIG_IO_URING is not set
1313
CONFIG_KALLSYMS_ALL=y
1414
CONFIG_ARCH_AT91=y
15+
CONFIG_SOC_SAMA7D65=y
1516
CONFIG_SOC_SAMA7G5=y
1617
CONFIG_ATMEL_CLOCKSOURCE_TCB=y
1718
# CONFIG_CACHE_L2X0 is not set

arch/arm/configs/shmobile_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ CONFIG_DW_DMAC=y
192192
CONFIG_RZN1_DMAMUX=y
193193
CONFIG_RCAR_DMAC=y
194194
CONFIG_RENESAS_USB_DMAC=y
195+
CONFIG_RZ_DMAC=y
195196
# CONFIG_IOMMU_SUPPORT is not set
196197
CONFIG_ARCH_EMEV2=y
197198
CONFIG_ARCH_R8A7794=y

arch/arm/configs/stm32_defconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,25 @@ CONFIG_BLK_DEV_INITRD=y
66
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
77
CONFIG_EXPERT=y
88
# CONFIG_UID16 is not set
9+
# CONFIG_POSIX_TIMERS is not set
910
CONFIG_BASE_SMALL=y
1011
# CONFIG_FUTEX is not set
1112
# CONFIG_EPOLL is not set
1213
# CONFIG_SIGNALFD is not set
1314
# CONFIG_EVENTFD is not set
1415
# CONFIG_AIO is not set
15-
# CONFIG_BLK_DEV_BSG is not set
16+
# CONFIG_IO_URING is not set
17+
# CONFIG_ADVISE_SYSCALLS is not set
1618
# CONFIG_MMU is not set
1719
CONFIG_ARCH_STM32=y
1820
CONFIG_CPU_V7M_NUM_IRQ=240
1921
CONFIG_SET_MEM_PARAM=y
2022
CONFIG_DRAM_BASE=0x90000000
21-
CONFIG_FLASH_MEM_BASE=0x08000000
22-
CONFIG_FLASH_SIZE=0x00200000
2323
# CONFIG_ATAGS is not set
2424
CONFIG_XIP_KERNEL=y
2525
CONFIG_XIP_PHYS_ADDR=0x08008000
26+
# CONFIG_SUSPEND is not set
27+
# CONFIG_GCC_PLUGINS is not set
2628
CONFIG_BINFMT_FLAT=y
2729
# CONFIG_COREDUMP is not set
2830
# CONFIG_VM_EVENT_COUNTERS is not set
@@ -63,6 +65,7 @@ CONFIG_DMADEVICES=y
6365
CONFIG_STM32_DMA=y
6466
CONFIG_STM32_DMAMUX=y
6567
CONFIG_STM32_MDMA=y
68+
# CONFIG_COMMON_CLK_STM32MP is not set
6669
CONFIG_IIO=y
6770
CONFIG_STM32_ADC_CORE=y
6871
CONFIG_STM32_ADC=y
@@ -74,10 +77,7 @@ CONFIG_NLS=y
7477
CONFIG_CRC_ITU_T=y
7578
CONFIG_CRC7=y
7679
CONFIG_PRINTK_TIME=y
77-
# CONFIG_ENABLE_MUST_CHECK is not set
7880
# CONFIG_DEBUG_BUGVERBOSE is not set
7981
CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
8082
CONFIG_MAGIC_SYSRQ=y
8183
# CONFIG_SLUB_DEBUG is not set
82-
# CONFIG_SCHED_DEBUG is not set
83-
CONFIG_CRYPTO=y

arch/arm64/configs/defconfig

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ CONFIG_CFG80211=m
201201
CONFIG_MAC80211=m
202202
CONFIG_MAC80211_LEDS=y
203203
CONFIG_RFKILL=m
204+
CONFIG_RFKILL_GPIO=m
204205
CONFIG_NET_9P=y
205206
CONFIG_NET_9P_VIRTIO=y
206207
CONFIG_NFC=m
@@ -331,6 +332,7 @@ CONFIG_VIRTIO_NET=y
331332
CONFIG_MHI_NET=m
332333
CONFIG_NET_DSA_BCM_SF2=m
333334
CONFIG_NET_DSA_MSCC_FELIX=m
335+
CONFIG_ENA_ETHERNET=m
334336
CONFIG_AMD_XGBE=y
335337
CONFIG_NET_XGENE=y
336338
CONFIG_ATL1C=m
@@ -359,6 +361,8 @@ CONFIG_IGBVF=y
359361
CONFIG_MVNETA=y
360362
CONFIG_MVPP2=y
361363
CONFIG_SKY2=y
364+
CONFIG_NET_VENDOR_MEDIATEK=y
365+
CONFIG_NET_MEDIATEK_STAR_EMAC=m
362366
CONFIG_MLX4_EN=m
363367
CONFIG_MLX5_CORE=m
364368
CONFIG_MLX5_CORE_EN=y
@@ -374,6 +378,7 @@ CONFIG_SMSC911X=y
374378
CONFIG_SNI_AVE=y
375379
CONFIG_SNI_NETSEC=y
376380
CONFIG_STMMAC_ETH=m
381+
CONFIG_DWMAC_MEDIATEK=m
377382
CONFIG_DWMAC_TEGRA=m
378383
CONFIG_TI_K3_AM65_CPSW_NUSS=y
379384
CONFIG_TI_ICSSG_PRUETH=m
@@ -517,6 +522,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=y
517522
CONFIG_I2C_CHARDEV=y
518523
CONFIG_I2C_MUX=y
519524
CONFIG_I2C_MUX_PCA954x=y
525+
CONFIG_I2C_MUX_PINCTRL=m
520526
CONFIG_I2C_BCM2835=m
521527
CONFIG_I2C_CADENCE=m
522528
CONFIG_I2C_DESIGNWARE_CORE=y
@@ -608,6 +614,8 @@ CONFIG_PINCTRL_MSM8996=y
608614
CONFIG_PINCTRL_MSM8998=y
609615
CONFIG_PINCTRL_QCM2290=y
610616
CONFIG_PINCTRL_QCS404=y
617+
CONFIG_PINCTRL_QCS615=y
618+
CONFIG_PINCTRL_QCS8300=y
611619
CONFIG_PINCTRL_QDF2XXX=y
612620
CONFIG_PINCTRL_QDU1000=y
613621
CONFIG_PINCTRL_SA8775P=y
@@ -630,6 +638,7 @@ CONFIG_PINCTRL_SM8350=y
630638
CONFIG_PINCTRL_SM8450=y
631639
CONFIG_PINCTRL_SM8550=y
632640
CONFIG_PINCTRL_SM8650=y
641+
CONFIG_PINCTRL_SM8750=y
633642
CONFIG_PINCTRL_X1E80100=y
634643
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
635644
CONFIG_PINCTRL_LPASS_LPI=m
@@ -738,6 +747,7 @@ CONFIG_MESON_WATCHDOG=m
738747
CONFIG_ARM_SMC_WATCHDOG=y
739748
CONFIG_RENESAS_WDT=y
740749
CONFIG_RENESAS_RZG2LWDT=y
750+
CONFIG_RENESAS_RZV2HWDT=y
741751
CONFIG_UNIPHIER_WATCHDOG=y
742752
CONFIG_PM8916_WATCHDOG=m
743753
CONFIG_BCM2835_WDT=y
@@ -873,6 +883,7 @@ CONFIG_ROCKCHIP_VOP2=y
873883
CONFIG_ROCKCHIP_ANALOGIX_DP=y
874884
CONFIG_ROCKCHIP_CDN_DP=y
875885
CONFIG_ROCKCHIP_DW_HDMI=y
886+
CONFIG_ROCKCHIP_DW_HDMI_QP=y
876887
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
877888
CONFIG_ROCKCHIP_INNO_HDMI=y
878889
CONFIG_ROCKCHIP_LVDS=y
@@ -901,6 +912,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7703=m
901912
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
902913
CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m
903914
CONFIG_DRM_FSL_LDB=m
915+
CONFIG_DRM_ITE_IT6263=m
904916
CONFIG_DRM_LONTIUM_LT8912B=m
905917
CONFIG_DRM_LONTIUM_LT9611=m
906918
CONFIG_DRM_LONTIUM_LT9611UXC=m
@@ -966,6 +978,8 @@ CONFIG_SND_SOC_IMX_AUDMIX=m
966978
CONFIG_SND_SOC_MT8183=m
967979
CONFIG_SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A=m
968980
CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
981+
CONFIG_SND_SOC_MT8188=m
982+
CONFIG_SND_SOC_MT8188_MT6359=m
969983
CONFIG_SND_SOC_MT8192=m
970984
CONFIG_SND_SOC_MT8192_MT6359_RT1015_RT5682=m
971985
CONFIG_SND_SOC_MT8195=m
@@ -994,6 +1008,7 @@ CONFIG_SND_SOC_RZ=m
9941008
CONFIG_SND_SOC_SOF_TOPLEVEL=y
9951009
CONFIG_SND_SOC_SOF_OF=y
9961010
CONFIG_SND_SOC_SOF_MTK_TOPLEVEL=y
1011+
CONFIG_SND_SOC_SOF_MT8186=m
9971012
CONFIG_SND_SOC_SOF_MT8195=m
9981013
CONFIG_SND_SUN8I_CODEC=m
9991014
CONFIG_SND_SUN8I_CODEC_ANALOG=m
@@ -1121,6 +1136,7 @@ CONFIG_USB_MASS_STORAGE=m
11211136
CONFIG_TYPEC=m
11221137
CONFIG_TYPEC_TCPM=m
11231138
CONFIG_TYPEC_TCPCI=m
1139+
CONFIG_TYPEC_TCPCI_MAXIM=m
11241140
CONFIG_TYPEC_FUSB302=m
11251141
CONFIG_TYPEC_QCOM_PMIC=m
11261142
CONFIG_TYPEC_UCSI=m
@@ -1311,6 +1327,7 @@ CONFIG_QCOM_CLK_SMD_RPM=y
13111327
CONFIG_QCOM_CLK_RPMH=y
13121328
CONFIG_IPQ_APSS_6018=y
13131329
CONFIG_IPQ_APSS_5018=y
1330+
CONFIG_IPQ_CMN_PLL=m
13141331
CONFIG_IPQ_GCC_5018=y
13151332
CONFIG_IPQ_GCC_5332=y
13161333
CONFIG_IPQ_GCC_6018=y
@@ -1326,11 +1343,15 @@ CONFIG_MSM_MMCC_8998=m
13261343
CONFIG_QCM_GCC_2290=y
13271344
CONFIG_QCM_DISPCC_2290=m
13281345
CONFIG_QCS_GCC_404=y
1346+
CONFIG_QCS_GCC_615=y
1347+
CONFIG_QCS_GCC_8300=y
13291348
CONFIG_SC_CAMCC_7280=m
1349+
CONFIG_SA_CAMCC_8775P=m
13301350
CONFIG_QDU_GCC_1000=y
13311351
CONFIG_SC_CAMCC_8280XP=m
13321352
CONFIG_SC_DISPCC_7280=m
13331353
CONFIG_SC_DISPCC_8280XP=m
1354+
CONFIG_SA_DISPCC_8775P=m
13341355
CONFIG_SA_GCC_8775P=y
13351356
CONFIG_SA_GPUCC_8775P=m
13361357
CONFIG_SC_GCC_7180=y
@@ -1353,13 +1374,14 @@ CONFIG_SM_DISPCC_6115=m
13531374
CONFIG_SM_DISPCC_8250=y
13541375
CONFIG_SM_DISPCC_8450=m
13551376
CONFIG_SM_DISPCC_8550=m
1356-
CONFIG_SM_DISPCC_8650=m
1377+
CONFIG_SM_DISPCC_8750=m
13571378
CONFIG_SM_GCC_4450=y
13581379
CONFIG_SM_GCC_6115=y
13591380
CONFIG_SM_GCC_8350=y
13601381
CONFIG_SM_GCC_8450=y
13611382
CONFIG_SM_GCC_8550=y
13621383
CONFIG_SM_GCC_8650=y
1384+
CONFIG_SM_GCC_8750=y
13631385
CONFIG_SM_GPUCC_6115=m
13641386
CONFIG_SM_GPUCC_8150=y
13651387
CONFIG_SM_GPUCC_8250=y
@@ -1369,6 +1391,8 @@ CONFIG_SM_GPUCC_8550=m
13691391
CONFIG_SM_GPUCC_8650=m
13701392
CONFIG_SM_TCSRCC_8550=y
13711393
CONFIG_SM_TCSRCC_8650=y
1394+
CONFIG_SM_TCSRCC_8750=m
1395+
CONFIG_SA_VIDEOCC_8775P=m
13721396
CONFIG_SM_VIDEOCC_8250=y
13731397
CONFIG_QCOM_HFPLL=y
13741398
CONFIG_CLK_GFM_LPASS_SM8250=m
@@ -1401,6 +1425,7 @@ CONFIG_QCOM_Q6V5_PAS=m
14011425
CONFIG_QCOM_SYSMON=m
14021426
CONFIG_QCOM_WCNSS_PIL=m
14031427
CONFIG_TI_K3_DSP_REMOTEPROC=m
1428+
CONFIG_TI_K3_M4_REMOTEPROC=m
14041429
CONFIG_TI_K3_R5_REMOTEPROC=m
14051430
CONFIG_RPMSG_CHAR=m
14061431
CONFIG_RPMSG_CTRL=m
@@ -1457,6 +1482,7 @@ CONFIG_ARCH_R9A07G044=y
14571482
CONFIG_ARCH_R9A07G054=y
14581483
CONFIG_ARCH_R9A08G045=y
14591484
CONFIG_ARCH_R9A09G011=y
1485+
CONFIG_ARCH_R9A09G047=y
14601486
CONFIG_ARCH_R9A09G057=y
14611487
CONFIG_ROCKCHIP_IODOMAIN=y
14621488
CONFIG_ARCH_TEGRA_132_SOC=y
@@ -1633,6 +1659,8 @@ CONFIG_INTERCONNECT_QCOM_MSM8996=y
16331659
CONFIG_INTERCONNECT_QCOM_OSM_L3=m
16341660
CONFIG_INTERCONNECT_QCOM_QCM2290=y
16351661
CONFIG_INTERCONNECT_QCOM_QCS404=m
1662+
CONFIG_INTERCONNECT_QCOM_QCS615=y
1663+
CONFIG_INTERCONNECT_QCOM_QCS8300=y
16361664
CONFIG_INTERCONNECT_QCOM_QDU1000=y
16371665
CONFIG_INTERCONNECT_QCOM_SA8775P=y
16381666
CONFIG_INTERCONNECT_QCOM_SC7180=y
@@ -1648,6 +1676,7 @@ CONFIG_INTERCONNECT_QCOM_SM8350=y
16481676
CONFIG_INTERCONNECT_QCOM_SM8450=y
16491677
CONFIG_INTERCONNECT_QCOM_SM8550=y
16501678
CONFIG_INTERCONNECT_QCOM_SM8650=y
1679+
CONFIG_INTERCONNECT_QCOM_SM8750=y
16511680
CONFIG_INTERCONNECT_QCOM_X1E80100=y
16521681
CONFIG_COUNTER=m
16531682
CONFIG_RZ_MTU3_CNT=m

arch/riscv/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ CONFIG_PINCTRL_SOPHGO_CV1800B=y
168168
CONFIG_PINCTRL_SOPHGO_CV1812H=y
169169
CONFIG_PINCTRL_SOPHGO_SG2000=y
170170
CONFIG_PINCTRL_SOPHGO_SG2002=y
171+
CONFIG_PINCTRL_TH1520=y
171172
CONFIG_GPIO_DWAPB=y
172173
CONFIG_GPIO_SIFIVE=y
173174
CONFIG_POWER_RESET_GPIO_RESTART=y
@@ -243,6 +244,7 @@ CONFIG_RTC_DRV_SUN6I=y
243244
CONFIG_DMADEVICES=y
244245
CONFIG_DMA_SUN6I=m
245246
CONFIG_DW_AXI_DMAC=y
247+
CONFIG_DWMAC_THEAD=m
246248
CONFIG_VIRTIO_PCI=y
247249
CONFIG_VIRTIO_BALLOON=y
248250
CONFIG_VIRTIO_INPUT=y

0 commit comments

Comments
 (0)