Skip to content

Commit 0873694

Browse files
committed
Merge tag 'soc-defconfig-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC defconfig updates from Arnd Bergmann: "The arm64 defconfig file gets the usual updates to enable addition device drivers as well as the sparx5 and realtek SoC platforms. For arm32, there are only a couple of cleanup patches for imx, renesas and rockchips" * tag 'soc-defconfig-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (23 commits) arm64: defconfig: Enable Rockchip I2S TDM and ES8316 drivers arm64: defconfig: update RK8XX MFD config ARM: multi_v7_defconfig: update MFD_RK808 name arm64: defconfig: Enable UBIFS arm64: defconfig: enable drivers for Verdin AM62 arm64: defconfig: Build SM6115 display and GPU clock controller drivers arm64: defconfig: Build display clock controller driver for QCM2290 arm64: defconfig: Build interconnect driver for QCM2290 arm64: defconfig: Build Global Clock Controller driver for QCM2290 arm64: defconfig: Build MSM power manager driver arm64: defconfig: Enable sc828x0xp lpasscc clock controller arm64: defconfig: Enable the TI SN65DSI83 driver arm64: defconfig: Enable Renesas MTU3a counter config arm64: defconfig: enable Mediatek PMIC key arm64: defconfig: enable MT6357 regulator ARM: imx_v6_v7_defconfig: Remove KERNEL_LZO config arm64: defconfig: Enable ipq6018 apss clock and PLL controller arm64: defconfig: Enable ARCH_SPARX5 and ARCH_REALTEK arm64: defconfig: enable FSA4480 driver as module ARM: shmobile: defconfig: Refresh for v6.4-rc1 ...
2 parents e4c8d01 + 2b24391 commit 0873694

4 files changed

Lines changed: 33 additions & 7 deletions

File tree

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
CONFIG_KERNEL_LZO=y
21
CONFIG_SYSVIPC=y
32
CONFIG_NO_HZ_IDLE=y
43
CONFIG_HIGH_RES_TIMERS=y
@@ -80,8 +79,6 @@ CONFIG_PCI_IMX6_HOST=y
8079
CONFIG_DEVTMPFS=y
8180
CONFIG_DEVTMPFS_MOUNT=y
8281
# CONFIG_STANDALONE is not set
83-
CONFIG_FW_LOADER_USER_HELPER=y
84-
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
8582
CONFIG_IMX_WEIM=y
8683
CONFIG_CONNECTOR=y
8784
CONFIG_MTD=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ CONFIG_MFD_CPCAP=y
596596
CONFIG_MFD_PM8XXX=y
597597
CONFIG_MFD_QCOM_RPM=y
598598
CONFIG_MFD_SPMI_PMIC=y
599-
CONFIG_MFD_RK808=y
599+
CONFIG_MFD_RK8XX_I2C=y
600600
CONFIG_MFD_RN5T618=y
601601
CONFIG_MFD_SEC_CORE=y
602602
CONFIG_MFD_STMPE=y

arch/arm/configs/shmobile_defconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ CONFIG_NET_DSA=y
3636
CONFIG_CAN=y
3737
CONFIG_PCI=y
3838
CONFIG_PCI_MSI=y
39-
CONFIG_PCI_RCAR_GEN2=y
4039
CONFIG_PCIE_RCAR_HOST=y
40+
CONFIG_PCI_RCAR_GEN2=y
4141
CONFIG_DEVTMPFS=y
4242
CONFIG_DEVTMPFS_MOUNT=y
4343
CONFIG_MTD=y
@@ -76,7 +76,6 @@ CONFIG_SERIAL_8250=y
7676
# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
7777
CONFIG_SERIAL_8250_CONSOLE=y
7878
# CONFIG_SERIAL_8250_PCI is not set
79-
# CONFIG_SERIAL_8250_PCI1XXXX is not set
8079
CONFIG_SERIAL_8250_DW=y
8180
CONFIG_SERIAL_8250_EM=y
8281
# CONFIG_SERIAL_8250_PERICOM is not set

arch/arm64/configs/defconfig

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ CONFIG_ARCH_BCMBCA=y
4141
CONFIG_ARCH_BRCMSTB=y
4242
CONFIG_ARCH_BERLIN=y
4343
CONFIG_ARCH_EXYNOS=y
44+
CONFIG_ARCH_SPARX5=y
4445
CONFIG_ARCH_K3=y
4546
CONFIG_ARCH_LG1K=y
4647
CONFIG_ARCH_HISI=y
@@ -55,6 +56,7 @@ CONFIG_ARCH_S32=y
5556
CONFIG_ARCH_MA35=y
5657
CONFIG_ARCH_NPCM=y
5758
CONFIG_ARCH_QCOM=y
59+
CONFIG_ARCH_REALTEK=y
5860
CONFIG_ARCH_RENESAS=y
5961
CONFIG_ARCH_ROCKCHIP=y
6062
CONFIG_ARCH_SEATTLE=y
@@ -269,6 +271,8 @@ CONFIG_MTD_NAND_BRCMNAND=m
269271
CONFIG_MTD_NAND_FSL_IFC=y
270272
CONFIG_MTD_NAND_QCOM=y
271273
CONFIG_MTD_SPI_NOR=y
274+
CONFIG_MTD_UBI=m
275+
CONFIG_UBIFS_FS=m
272276
CONFIG_BLK_DEV_LOOP=y
273277
CONFIG_BLK_DEV_NBD=m
274278
CONFIG_VIRTIO_BLK=y
@@ -415,6 +419,7 @@ CONFIG_KEYBOARD_GPIO=y
415419
CONFIG_KEYBOARD_SNVS_PWRKEY=m
416420
CONFIG_KEYBOARD_IMX_SC_KEY=m
417421
CONFIG_KEYBOARD_CROS_EC=y
422+
CONFIG_KEYBOARD_MTK_PMIC=m
418423
CONFIG_MOUSE_ELAN_I2C=m
419424
CONFIG_INPUT_TOUCHSCREEN=y
420425
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
@@ -692,9 +697,11 @@ CONFIG_MFD_MAX77620=y
692697
CONFIG_MFD_MT6360=y
693698
CONFIG_MFD_MT6397=y
694699
CONFIG_MFD_SPMI_PMIC=y
695-
CONFIG_MFD_RK808=y
700+
CONFIG_MFD_RK8XX_I2C=y
701+
CONFIG_MFD_RK8XX_SPI=y
696702
CONFIG_MFD_SEC_CORE=y
697703
CONFIG_MFD_SL28CPLD=y
704+
CONFIG_RZ_MTU3=y
698705
CONFIG_MFD_TPS65219=y
699706
CONFIG_MFD_TI_AM335X_TSCADC=m
700707
CONFIG_MFD_ROHM_BD718XX=y
@@ -712,6 +719,7 @@ CONFIG_REGULATOR_MAX77620=y
712719
CONFIG_REGULATOR_MAX8973=y
713720
CONFIG_REGULATOR_MP8859=y
714721
CONFIG_REGULATOR_MT6315=m
722+
CONFIG_REGULATOR_MT6357=y
715723
CONFIG_REGULATOR_MT6358=y
716724
CONFIG_REGULATOR_MT6359=y
717725
CONFIG_REGULATOR_MT6360=y
@@ -747,6 +755,10 @@ CONFIG_SDR_PLATFORM_DRIVERS=y
747755
CONFIG_V4L_MEM2MEM_DRIVERS=y
748756
CONFIG_VIDEO_MEDIATEK_JPEG=m
749757
CONFIG_VIDEO_MEDIATEK_VCODEC=m
758+
CONFIG_VIDEO_IMX7_CSI=m
759+
CONFIG_VIDEO_IMX_MIPI_CSIS=m
760+
CONFIG_VIDEO_IMX8_ISI=m
761+
CONFIG_VIDEO_IMX8_ISI_M2M=y
750762
CONFIG_VIDEO_QCOM_CAMSS=m
751763
CONFIG_VIDEO_QCOM_VENUS=m
752764
CONFIG_VIDEO_RCAR_ISP=m
@@ -814,7 +826,9 @@ CONFIG_DRM_PARADE_PS8640=m
814826
CONFIG_DRM_SII902X=m
815827
CONFIG_DRM_SIMPLE_BRIDGE=m
816828
CONFIG_DRM_THINE_THC63LVD1024=m
829+
CONFIG_DRM_TOSHIBA_TC358768=m
817830
CONFIG_DRM_TI_TFP410=m
831+
CONFIG_DRM_TI_SN65DSI83=m
818832
CONFIG_DRM_TI_SN65DSI86=m
819833
CONFIG_DRM_ANALOGIX_ANX7625=m
820834
CONFIG_DRM_I2C_ADV7511=m
@@ -874,6 +888,7 @@ CONFIG_SND_SOC_SM8250=m
874888
CONFIG_SND_SOC_SC7180=m
875889
CONFIG_SND_SOC_SC7280=m
876890
CONFIG_SND_SOC_ROCKCHIP=m
891+
CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
877892
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
878893
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
879894
CONFIG_SND_SOC_RK3399_GRU_SOUND=m
@@ -904,6 +919,7 @@ CONFIG_SND_SOC_AK4613=m
904919
CONFIG_SND_SOC_DA7213=m
905920
CONFIG_SND_SOC_ES7134=m
906921
CONFIG_SND_SOC_ES7241=m
922+
CONFIG_SND_SOC_ES8316=m
907923
CONFIG_SND_SOC_GTM601=m
908924
CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
909925
CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
@@ -996,6 +1012,7 @@ CONFIG_TYPEC_FUSB302=m
9961012
CONFIG_TYPEC_TPS6598X=m
9971013
CONFIG_TYPEC_HD3SS3220=m
9981014
CONFIG_TYPEC_UCSI=m
1015+
CONFIG_TYPEC_MUX_FSA4480=m
9991016
CONFIG_UCSI_CCG=m
10001017
CONFIG_TYPEC_MUX_GPIO_SBU=m
10011018
CONFIG_MMC=y
@@ -1007,6 +1024,7 @@ CONFIG_MMC_SDHCI_PLTFM=y
10071024
CONFIG_MMC_SDHCI_OF_ARASAN=y
10081025
CONFIG_MMC_SDHCI_OF_ESDHC=y
10091026
CONFIG_MMC_SDHCI_OF_DWCMSHC=y
1027+
CONFIG_MMC_SDHCI_OF_SPARX5=y
10101028
CONFIG_MMC_SDHCI_CADENCE=y
10111029
CONFIG_MMC_SDHCI_ESDHC_IMX=y
10121030
CONFIG_MMC_SDHCI_TEGRA=y
@@ -1157,6 +1175,7 @@ CONFIG_QCOM_CLK_APCS_MSM8916=y
11571175
CONFIG_QCOM_CLK_APCC_MSM8996=y
11581176
CONFIG_QCOM_CLK_SMD_RPM=y
11591177
CONFIG_QCOM_CLK_RPMH=y
1178+
CONFIG_IPQ_APSS_6018=y
11601179
CONFIG_IPQ_GCC_5332=y
11611180
CONFIG_IPQ_GCC_6018=y
11621181
CONFIG_IPQ_GCC_8074=y
@@ -1167,19 +1186,24 @@ CONFIG_MSM_MMCC_8994=m
11671186
CONFIG_MSM_MMCC_8996=m
11681187
CONFIG_MSM_MMCC_8998=m
11691188
CONFIG_MSM_GCC_8998=y
1189+
CONFIG_QCM_GCC_2290=y
1190+
CONFIG_QCM_DISPCC_2290=m
11701191
CONFIG_QCS_GCC_404=y
11711192
CONFIG_SA_GCC_8775P=y
11721193
CONFIG_SC_DISPCC_8280XP=m
1194+
CONFIG_SA_GPUCC_8775P=m
11731195
CONFIG_SC_GCC_7180=y
11741196
CONFIG_SC_GCC_7280=y
11751197
CONFIG_SC_GCC_8180X=y
11761198
CONFIG_SC_GCC_8280XP=y
1199+
CONFIG_SC_LPASSCC_8280XP=m
11771200
CONFIG_SDM_CAMCC_845=m
11781201
CONFIG_SDM_GPUCC_845=y
11791202
CONFIG_SDM_VIDEOCC_845=y
11801203
CONFIG_SDM_DISPCC_845=y
11811204
CONFIG_SDM_LPASSCC_845=m
11821205
CONFIG_SM_CAMCC_8250=m
1206+
CONFIG_SM_DISPCC_6115=m
11831207
CONFIG_SM_DISPCC_8250=y
11841208
CONFIG_SM_DISPCC_8450=m
11851209
CONFIG_SM_DISPCC_8550=m
@@ -1188,6 +1212,7 @@ CONFIG_SM_GCC_8350=y
11881212
CONFIG_SM_GCC_8450=y
11891213
CONFIG_SM_GCC_8550=y
11901214
CONFIG_SM_TCSRCC_8550=y
1215+
CONFIG_SM_GPUCC_6115=m
11911216
CONFIG_SM_GPUCC_8150=y
11921217
CONFIG_SM_GPUCC_8250=y
11931218
CONFIG_SM_VIDEOCC_8250=y
@@ -1323,9 +1348,11 @@ CONFIG_PWM_SAMSUNG=y
13231348
CONFIG_PWM_SL28CPLD=m
13241349
CONFIG_PWM_SUN4I=m
13251350
CONFIG_PWM_TEGRA=m
1351+
CONFIG_PWM_TIEHRPWM=m
13261352
CONFIG_PWM_VISCONTI=m
13271353
CONFIG_SL28CPLD_INTC=y
13281354
CONFIG_QCOM_PDC=y
1355+
CONFIG_QCOM_MPM=y
13291356
CONFIG_RESET_IMX7=y
13301357
CONFIG_RESET_QCOM_AOSS=y
13311358
CONFIG_RESET_QCOM_PDC=m
@@ -1416,6 +1443,7 @@ CONFIG_INTERCONNECT_QCOM=y
14161443
CONFIG_INTERCONNECT_QCOM_MSM8916=m
14171444
CONFIG_INTERCONNECT_QCOM_MSM8996=m
14181445
CONFIG_INTERCONNECT_QCOM_OSM_L3=m
1446+
CONFIG_INTERCONNECT_QCOM_QCM2290=m
14191447
CONFIG_INTERCONNECT_QCOM_QCS404=m
14201448
CONFIG_INTERCONNECT_QCOM_SA8775P=y
14211449
CONFIG_INTERCONNECT_QCOM_SC7180=y
@@ -1428,6 +1456,8 @@ CONFIG_INTERCONNECT_QCOM_SM8250=m
14281456
CONFIG_INTERCONNECT_QCOM_SM8350=m
14291457
CONFIG_INTERCONNECT_QCOM_SM8450=y
14301458
CONFIG_INTERCONNECT_QCOM_SM8550=y
1459+
CONFIG_COUNTER=m
1460+
CONFIG_RZ_MTU3_CNT=m
14311461
CONFIG_HTE=y
14321462
CONFIG_HTE_TEGRA194=y
14331463
CONFIG_HTE_TEGRA194_TEST=m

0 commit comments

Comments
 (0)