Skip to content

Commit 6d1346f

Browse files
torvaldstorvalds
committed
Merge tag 'soc-defconfig-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC defconfig updates from Arnd Bergmann: "Most of the changes enable additional device driver modules and arm64 platforms. In addition, the usb onboard-device support and ext4 security labels are turned on" * tag 'soc-defconfig-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (23 commits) arm64: defconfig: enable Airoha platform arm64: defconfig: enable Khadas TS050 panel as module arm64: defconfig: select INTERCONNECT_QCOM_SM6115 as built-in arm64: defconfig: Enable Tegra Security Engine arm64: defconfig: enable REGULATOR_QCOM_USB_VBUS ARM: imx_v6_v7_defconfig: Update ONBOARD_USB_HUB to ONBOAD_USB_DEV arm64: defconfig: enable ext4 security labels arm64: defconfig: qcom: enable X1E80100 sound card ARM: configs: sunxi: Enable DRM_DW_HDMI arm64: defconfig: build snd_bcm2835 as module arm64: defconfig: enable Rockchip Samsung USBDP PHY ARM: shmobile: defconfig: Refresh for v6.9-rc1 arm64: defconfig: build ath12k as a module arm64: defconfig: Enable sc7280 display and gpu clock controllers ARM: imx_v6_v7_defconfig: Select CONFIG_USB_ONBOARD_HUB arm64: defconfig: Enable DRM_IMX8MP_DW_HDMI_BRIDGE as module arm64: defconfig: support Mali CSF-based GPUs arm64: defconfig: enable Rockchip RK3308 internal audio codec driver arm64: defconfig: Enable R9A09G057 SoC arm64: defconfig: Enable Renesas DA9062 PMIC ...
2 parents 0c22129 + 78b08cf commit 6d1346f

File tree

4 files changed

+27
-1
lines changed

4 files changed

+27
-1
lines changed

‎arch/arm/configs/imx_v6_v7_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
336336
CONFIG_USB_SERIAL_OPTION=m
337337
CONFIG_USB_TEST=m
338338
CONFIG_USB_EHSET_TEST_FIXTURE=m
339+
CONFIG_USB_ONBOARD_DEV=y
339340
CONFIG_NOP_USB_XCEIV=y
340341
CONFIG_USB_MXS_PHY=y
341342
CONFIG_USB_GADGET=y

‎arch/arm/configs/shmobile_defconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ CONFIG_DRM_FBDEV_EMULATION=y
139139
CONFIG_DRM_RCAR_DU=y
140140
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
141141
CONFIG_DRM_SHMOBILE=y
142-
CONFIG_DRM_PANEL_SIMPLE=y
143142
CONFIG_DRM_PANEL_EDP=y
143+
CONFIG_DRM_PANEL_SIMPLE=y
144144
CONFIG_DRM_DISPLAY_CONNECTOR=y
145145
CONFIG_DRM_LVDS_CODEC=y
146146
CONFIG_DRM_SII902X=y
@@ -235,3 +235,4 @@ CONFIG_CMA_SIZE_MBYTES=64
235235
CONFIG_PRINTK_TIME=y
236236
CONFIG_DEBUG_KERNEL=y
237237
CONFIG_DEBUG_FS=y
238+
CONFIG_ARM_DEBUG_WX=y

‎arch/arm/configs/sunxi_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ CONFIG_DRM_PANEL_LVDS=y
110110
CONFIG_DRM_PANEL_SIMPLE=y
111111
CONFIG_DRM_PANEL_EDP=y
112112
CONFIG_DRM_SIMPLE_BRIDGE=y
113+
CONFIG_DRM_DW_HDMI=y
113114
CONFIG_DRM_LIMA=y
114115
CONFIG_FB_SIMPLE=y
115116
CONFIG_BACKLIGHT_CLASS_DEVICE=y

‎arch/arm64/configs/defconfig‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ CONFIG_KEXEC=y
3434
CONFIG_KEXEC_FILE=y
3535
CONFIG_CRASH_DUMP=y
3636
CONFIG_ARCH_ACTIONS=y
37+
CONFIG_ARCH_AIROHA=y
3738
CONFIG_ARCH_SUNXI=y
3839
CONFIG_ARCH_ALPINE=y
3940
CONFIG_ARCH_APPLE=y
@@ -411,6 +412,7 @@ CONFIG_WCN36XX=m
411412
CONFIG_ATH11K=m
412413
CONFIG_ATH11K_AHB=m
413414
CONFIG_ATH11K_PCI=m
415+
CONFIG_ATH12K=m
414416
CONFIG_BRCMFMAC=m
415417
CONFIG_MWIFIEX=m
416418
CONFIG_MWIFIEX_SDIO=m
@@ -445,6 +447,7 @@ CONFIG_INPUT_TPS65219_PWRBUTTON=m
445447
CONFIG_INPUT_PWM_BEEPER=m
446448
CONFIG_INPUT_PWM_VIBRA=m
447449
CONFIG_INPUT_RK805_PWRKEY=m
450+
CONFIG_INPUT_DA9063_ONKEY=m
448451
CONFIG_INPUT_HISI_POWERKEY=y
449452
# CONFIG_SERIO_SERPORT is not set
450453
CONFIG_SERIO_AMBAKMI=y
@@ -562,6 +565,7 @@ CONFIG_SPI_TEGRA114=m
562565
CONFIG_SPI_SPIDEV=m
563566
CONFIG_SPMI=y
564567
CONFIG_SPMI_MTK_PMIF=m
568+
CONFIG_PINCTRL_DA9062=m
565569
CONFIG_PINCTRL_MAX77620=y
566570
CONFIG_PINCTRL_RK805=m
567571
CONFIG_PINCTRL_SINGLE=y
@@ -727,6 +731,7 @@ CONFIG_MFD_ALTERA_SYSMGR=y
727731
CONFIG_MFD_BD9571MWV=y
728732
CONFIG_MFD_AXP20X_I2C=y
729733
CONFIG_MFD_AXP20X_RSB=y
734+
CONFIG_MFD_DA9062=m
730735
CONFIG_MFD_EXYNOS_LPASS=m
731736
CONFIG_MFD_HI6421_PMIC=y
732737
CONFIG_MFD_HI655X_PMIC=y
@@ -772,6 +777,7 @@ CONFIG_REGULATOR_PWM=y
772777
CONFIG_REGULATOR_QCOM_RPMH=y
773778
CONFIG_REGULATOR_QCOM_SMD_RPM=y
774779
CONFIG_REGULATOR_QCOM_SPMI=y
780+
CONFIG_REGULATOR_QCOM_USB_VBUS=m
775781
CONFIG_REGULATOR_RAA215300=y
776782
CONFIG_REGULATOR_RK808=y
777783
CONFIG_REGULATOR_S2MPS11=y
@@ -854,6 +860,7 @@ CONFIG_DRM_RCAR_DU=m
854860
CONFIG_DRM_RCAR_DW_HDMI=m
855861
CONFIG_DRM_RCAR_MIPI_DSI=m
856862
CONFIG_DRM_RZG2L_MIPI_DSI=m
863+
CONFIG_DRM_RZG2L_DU=m
857864
CONFIG_DRM_SUN4I=m
858865
CONFIG_DRM_SUN6I_DSI=m
859866
CONFIG_DRM_SUN8I_DW_HDMI=m
@@ -865,7 +872,9 @@ CONFIG_DRM_PANEL_LVDS=m
865872
CONFIG_DRM_PANEL_SIMPLE=m
866873
CONFIG_DRM_PANEL_EDP=m
867874
CONFIG_DRM_PANEL_ILITEK_ILI9882T=m
875+
CONFIG_DRM_PANEL_KHADAS_TS050=m
868876
CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
877+
CONFIG_DRM_PANEL_NOVATEK_NT36672E=m
869878
CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
870879
CONFIG_DRM_PANEL_SITRONIX_ST7703=m
871880
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
@@ -890,6 +899,7 @@ CONFIG_DRM_ANALOGIX_ANX7625=m
890899
CONFIG_DRM_I2C_ADV7511=m
891900
CONFIG_DRM_I2C_ADV7511_AUDIO=y
892901
CONFIG_DRM_CDNS_MHDP8546=m
902+
CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE=m
893903
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
894904
CONFIG_DRM_DW_HDMI_CEC=m
895905
CONFIG_DRM_IMX_DCSS=m
@@ -907,6 +917,7 @@ CONFIG_DRM_MESON=m
907917
CONFIG_DRM_PL111=m
908918
CONFIG_DRM_LIMA=m
909919
CONFIG_DRM_PANFROST=m
920+
CONFIG_DRM_PANTHOR=m
910921
CONFIG_DRM_TIDSS=m
911922
CONFIG_DRM_POWERVR=m
912923
CONFIG_FB=y
@@ -949,6 +960,7 @@ CONFIG_SND_SOC_SM8250=m
949960
CONFIG_SND_SOC_SC8280XP=m
950961
CONFIG_SND_SOC_SC7180=m
951962
CONFIG_SND_SOC_SC7280=m
963+
CONFIG_SND_SOC_X1E80100=m
952964
CONFIG_SND_SOC_ROCKCHIP=m
953965
CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
954966
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
@@ -991,6 +1003,7 @@ CONFIG_SND_SOC_GTM601=m
9911003
CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
9921004
CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
9931005
CONFIG_SND_SOC_PCM3168A_I2C=m
1006+
CONFIG_SND_SOC_RK3308=m
9941007
CONFIG_SND_SOC_RK817=m
9951008
CONFIG_SND_SOC_RT5640=m
9961009
CONFIG_SND_SOC_RT5659=m
@@ -1169,6 +1182,7 @@ CONFIG_RTC_DRV_RV8803=m
11691182
CONFIG_RTC_DRV_S5M=y
11701183
CONFIG_RTC_DRV_DS3232=y
11711184
CONFIG_RTC_DRV_PCF2127=m
1185+
CONFIG_RTC_DRV_DA9063=m
11721186
CONFIG_RTC_DRV_EFI=y
11731187
CONFIG_RTC_DRV_CROS_EC=y
11741188
CONFIG_RTC_DRV_FSL_FTM_ALARM=m
@@ -1217,6 +1231,7 @@ CONFIG_STAGING=y
12171231
CONFIG_STAGING_MEDIA=y
12181232
CONFIG_VIDEO_MAX96712=m
12191233
CONFIG_VIDEO_MESON_VDEC=m
1234+
CONFIG_SND_BCM2835=m
12201235
CONFIG_CHROME_PLATFORMS=y
12211236
CONFIG_CROS_EC=y
12221237
CONFIG_CROS_EC_I2C=y
@@ -1286,13 +1301,15 @@ CONFIG_QCM_DISPCC_2290=m
12861301
CONFIG_QCS_GCC_404=y
12871302
CONFIG_QDU_GCC_1000=y
12881303
CONFIG_SC_CAMCC_8280XP=m
1304+
CONFIG_SC_DISPCC_7280=m
12891305
CONFIG_SC_DISPCC_8280XP=m
12901306
CONFIG_SA_GCC_8775P=y
12911307
CONFIG_SA_GPUCC_8775P=m
12921308
CONFIG_SC_GCC_7180=y
12931309
CONFIG_SC_GCC_7280=y
12941310
CONFIG_SC_GCC_8180X=y
12951311
CONFIG_SC_GCC_8280XP=y
1312+
CONFIG_SC_GPUCC_7280=m
12961313
CONFIG_SC_GPUCC_8280XP=m
12971314
CONFIG_SC_LPASSCC_8280XP=m
12981315
CONFIG_SDM_CAMCC_845=m
@@ -1408,6 +1425,7 @@ CONFIG_ARCH_R9A07G044=y
14081425
CONFIG_ARCH_R9A07G054=y
14091426
CONFIG_ARCH_R9A08G045=y
14101427
CONFIG_ARCH_R9A09G011=y
1428+
CONFIG_ARCH_R9A09G057=y
14111429
CONFIG_ROCKCHIP_IODOMAIN=y
14121430
CONFIG_ARCH_TEGRA_132_SOC=y
14131431
CONFIG_ARCH_TEGRA_210_SOC=y
@@ -1473,6 +1491,7 @@ CONFIG_PWM_VISCONTI=m
14731491
CONFIG_SL28CPLD_INTC=y
14741492
CONFIG_QCOM_PDC=y
14751493
CONFIG_QCOM_MPM=y
1494+
CONFIG_RESET_GPIO=m
14761495
CONFIG_RESET_IMX7=y
14771496
CONFIG_RESET_QCOM_AOSS=y
14781497
CONFIG_RESET_QCOM_PDC=m
@@ -1517,6 +1536,7 @@ CONFIG_PHY_ROCKCHIP_PCIE=m
15171536
CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m
15181537
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
15191538
CONFIG_PHY_ROCKCHIP_TYPEC=y
1539+
CONFIG_PHY_ROCKCHIP_USBDP=m
15201540
CONFIG_PHY_SAMSUNG_UFS=y
15211541
CONFIG_PHY_UNIPHIER_USB2=y
15221542
CONFIG_PHY_UNIPHIER_USB3=y
@@ -1585,6 +1605,7 @@ CONFIG_INTERCONNECT_QCOM_SC8180X=y
15851605
CONFIG_INTERCONNECT_QCOM_SC8280XP=y
15861606
CONFIG_INTERCONNECT_QCOM_SDM845=y
15871607
CONFIG_INTERCONNECT_QCOM_SDX75=y
1608+
CONFIG_INTERCONNECT_QCOM_SM6115=y
15881609
CONFIG_INTERCONNECT_QCOM_SM8150=m
15891610
CONFIG_INTERCONNECT_QCOM_SM8250=y
15901611
CONFIG_INTERCONNECT_QCOM_SM8350=m
@@ -1599,6 +1620,7 @@ CONFIG_HTE_TEGRA194=y
15991620
CONFIG_HTE_TEGRA194_TEST=m
16001621
CONFIG_EXT4_FS=y
16011622
CONFIG_EXT4_FS_POSIX_ACL=y
1623+
CONFIG_EXT4_FS_SECURITY=y
16021624
CONFIG_BTRFS_FS=m
16031625
CONFIG_BTRFS_FS_POSIX_ACL=y
16041626
CONFIG_FANOTIFY=y
@@ -1647,6 +1669,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM=m
16471669
CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
16481670
CONFIG_CRYPTO_DEV_QCE=m
16491671
CONFIG_CRYPTO_DEV_QCOM_RNG=m
1672+
CONFIG_CRYPTO_DEV_TEGRA=m
16501673
CONFIG_CRYPTO_DEV_CCREE=m
16511674
CONFIG_CRYPTO_DEV_HISI_SEC2=m
16521675
CONFIG_CRYPTO_DEV_HISI_ZIP=m

0 commit comments

Comments
 (0)