Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit a9a4cd9

Browse files
committed
Merge tag 'soc-defconfig-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC defconfig updates from Arnd Bergmann: "These are the usual updates to enable newly added drivers, mostly for arm64 and riscv this time" * tag 'soc-defconfig-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: arm64: defconfig: Enable the IWLWIFI driver ARM: multi_v7_defconfig: Add MCP23S08 pinctrl support arm64: defconfig: Enable NVIDIA CoreSight PMU driver arm64: defconfig: enable SHM Bridge support for the TZ memory allocator arm64: defconfig: Enable secure QFPROM driver ARM: imx_v6_v7_defconfig: enable DRM_SII902X and DRM_DISPLAY_CONNECTOR ARM: imx_v6_v7_defconfig: Enable drivers for TQMa7x/MBa7x riscv: defconfig: Enable StarFive JH7110 drivers arm64: defconfig: Enable TI LP873X PMIC arm64: defconfig: Enable USB2 PHY Driver arm64: defconfig: Enable MTD support for Hyperbus ARM: configs: at91: Enable LVDS serializer support arm64: defconfig: enable several Qualcomm interconnects arm64: defconfig: Enable Marvell 88Q2XXX PHY support arm64: defconfig: make CONFIG_INTERCONNECT_QCOM_SM8350 built-in arm64: defconfig: enable CONFIG_SM_GPUCC_8350 arm64: defconfig: Enable Renesas R-Car Gen4 PCIe controller
2 parents e395096 + 05a01ce commit a9a4cd9

File tree

5 files changed

+54
-3
lines changed

5 files changed

+54
-3
lines changed

arch/arm/configs/at91_dt_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ CONFIG_VIDEO_OV2640=m
143143
CONFIG_VIDEO_OV7740=m
144144
CONFIG_DRM=y
145145
CONFIG_DRM_ATMEL_HLCDC=y
146+
CONFIG_DRM_MICROCHIP_LVDS_SERIALIZER=y
146147
CONFIG_DRM_PANEL_SIMPLE=y
147148
CONFIG_DRM_PANEL_EDP=y
148149
CONFIG_FB_ATMEL=y

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ CONFIG_SMSC911X=y
133133
# CONFIG_NET_VENDOR_STMICRO is not set
134134
CONFIG_MICREL_PHY=y
135135
CONFIG_AT803X_PHY=y
136+
CONFIG_DP83867_PHY=y
136137
CONFIG_CAN_FLEXCAN=y
137138
CONFIG_USB_PEGASUS=m
138139
CONFIG_USB_RTL8150=m
@@ -180,6 +181,7 @@ CONFIG_TOUCHSCREEN_SX8654=y
180181
CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
181182
CONFIG_INPUT_MISC=y
182183
CONFIG_INPUT_MMA8450=y
184+
CONFIG_INPUT_GPIO_BEEPER=m
183185
CONFIG_SERIO_SERPORT=m
184186
# CONFIG_LEGACY_PTYS is not set
185187
CONFIG_SERIAL_IMX=y
@@ -211,6 +213,7 @@ CONFIG_GPIO_SIOX=m
211213
CONFIG_GPIO_VF610=y
212214
CONFIG_GPIO_MAX732X=y
213215
CONFIG_GPIO_PCA953X=y
216+
CONFIG_GPIO_PCA953X_IRQ=y
214217
CONFIG_GPIO_PCF857X=y
215218
CONFIG_GPIO_BD71815=y
216219
CONFIG_GPIO_STMPE=y
@@ -226,6 +229,7 @@ CONFIG_RN5T618_POWER=m
226229
CONFIG_SENSORS_MC13783_ADC=y
227230
CONFIG_SENSORS_GPIO_FAN=y
228231
CONFIG_SENSORS_IIO_HWMON=y
232+
CONFIG_SENSORS_LM75=m
229233
CONFIG_SENSORS_PWM_FAN=y
230234
CONFIG_SENSORS_SY7636A=y
231235
CONFIG_THERMAL_STATISTICS=y
@@ -282,6 +286,9 @@ CONFIG_DRM_PANEL_LVDS=y
282286
CONFIG_DRM_PANEL_SIMPLE=y
283287
CONFIG_DRM_PANEL_EDP=y
284288
CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
289+
CONFIG_DRM_DISPLAY_CONNECTOR=y
290+
CONFIG_DRM_LVDS_CODEC=m
291+
CONFIG_DRM_SII902X=y
285292
CONFIG_DRM_TI_TFP410=y
286293
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
287294
CONFIG_DRM_DW_HDMI_CEC=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ CONFIG_SPI_XILINX=y
469469
CONFIG_SPI_SPIDEV=y
470470
CONFIG_SPMI=y
471471
CONFIG_PINCTRL_AS3722=y
472+
CONFIG_PINCTRL_MCP23S08=m
472473
CONFIG_PINCTRL_MICROCHIP_SGPIO=y
473474
CONFIG_PINCTRL_OCELOT=y
474475
CONFIG_PINCTRL_PALMAS=y

arch/arm64/configs/defconfig

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ CONFIG_PCIE_HISI_STB=y
233233
CONFIG_PCIE_ARMADA_8K=y
234234
CONFIG_PCIE_TEGRA194_HOST=m
235235
CONFIG_PCIE_QCOM=y
236+
CONFIG_PCIE_RCAR_GEN4_HOST=m
237+
CONFIG_PCIE_RCAR_GEN4_EP=m
236238
CONFIG_PCIE_ROCKCHIP_DW_HOST=y
237239
CONFIG_PCIE_VISCONTI_HOST=y
238240
CONFIG_PCIE_LAYERSCAPE_GEN4=y
@@ -256,6 +258,7 @@ CONFIG_GOOGLE_CBMEM=m
256258
CONFIG_GOOGLE_COREBOOT_TABLE=m
257259
CONFIG_EFI_CAPSULE_LOADER=y
258260
CONFIG_IMX_SCU=y
261+
CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
259262
CONFIG_QCOM_QSEECOM=y
260263
CONFIG_QCOM_QSEECOM_UEFISECAPP=y
261264
CONFIG_GNSS=m
@@ -279,6 +282,8 @@ CONFIG_MTD_NAND_FSL_IFC=y
279282
CONFIG_MTD_NAND_QCOM=y
280283
CONFIG_MTD_SPI_NOR=y
281284
CONFIG_MTD_UBI=m
285+
CONFIG_MTD_HYPERBUS=m
286+
CONFIG_HBMC_AM654=m
282287
CONFIG_BLK_DEV_LOOP=y
283288
CONFIG_BLK_DEV_NBD=m
284289
CONFIG_VIRTIO_BLK=y
@@ -375,6 +380,7 @@ CONFIG_AQUANTIA_PHY=y
375380
CONFIG_BCM54140_PHY=m
376381
CONFIG_MARVELL_PHY=m
377382
CONFIG_MARVELL_10G_PHY=y
383+
CONFIG_MARVELL_88Q2XXX_PHY=y
378384
CONFIG_MICREL_PHY=y
379385
CONFIG_MICROSEMI_PHY=y
380386
CONFIG_AT803X_PHY=y
@@ -414,6 +420,9 @@ CONFIG_ATH11K_AHB=m
414420
CONFIG_ATH11K_PCI=m
415421
CONFIG_ATH12K=m
416422
CONFIG_BRCMFMAC=m
423+
CONFIG_IWLWIFI=m
424+
CONFIG_IWLDVM=m
425+
CONFIG_IWLMVM=m
417426
CONFIG_MWIFIEX=m
418427
CONFIG_MWIFIEX_SDIO=m
419428
CONFIG_MWIFIEX_PCIE=m
@@ -745,6 +754,7 @@ CONFIG_MFD_SEC_CORE=y
745754
CONFIG_MFD_SL28CPLD=y
746755
CONFIG_RZ_MTU3=y
747756
CONFIG_MFD_TI_AM335X_TSCADC=m
757+
CONFIG_MFD_TI_LP873X=m
748758
CONFIG_MFD_TPS65219=y
749759
CONFIG_MFD_TPS6594_I2C=m
750760
CONFIG_MFD_ROHM_BD718XX=y
@@ -760,6 +770,7 @@ CONFIG_REGULATOR_FAN53555=y
760770
CONFIG_REGULATOR_GPIO=y
761771
CONFIG_REGULATOR_HI6421V530=y
762772
CONFIG_REGULATOR_HI655X=y
773+
CONFIG_REGULATOR_LP873X=m
763774
CONFIG_REGULATOR_MAX77620=y
764775
CONFIG_REGULATOR_MAX8973=y
765776
CONFIG_REGULATOR_MAX20411=m
@@ -1063,6 +1074,7 @@ CONFIG_USB_MTU3=y
10631074
CONFIG_USB_MUSB_HDRC=y
10641075
CONFIG_USB_MUSB_SUNXI=y
10651076
CONFIG_USB_DWC3=y
1077+
CONFIG_OMAP_USB2=m
10661078
CONFIG_USB_DWC2=y
10671079
CONFIG_USB_CHIPIDEA=y
10681080
CONFIG_USB_CHIPIDEA_UDC=y
@@ -1216,6 +1228,7 @@ CONFIG_QCOM_BAM_DMA=y
12161228
CONFIG_QCOM_GPI_DMA=m
12171229
CONFIG_QCOM_HIDMA_MGMT=y
12181230
CONFIG_QCOM_HIDMA=y
1231+
CONFIG_DW_EDMA=m
12191232
CONFIG_RCAR_DMAC=y
12201233
CONFIG_RENESAS_USB_DMAC=m
12211234
CONFIG_RZ_DMAC=y
@@ -1334,6 +1347,7 @@ CONFIG_SM_GCC_8650=y
13341347
CONFIG_SM_GPUCC_6115=m
13351348
CONFIG_SM_GPUCC_8150=y
13361349
CONFIG_SM_GPUCC_8250=y
1350+
CONFIG_SM_GPUCC_8350=m
13371351
CONFIG_SM_GPUCC_8450=m
13381352
CONFIG_SM_GPUCC_8550=m
13391353
CONFIG_SM_GPUCC_8650=m
@@ -1556,6 +1570,7 @@ CONFIG_ARM_SPE_PMU=m
15561570
CONFIG_ARM_DMC620_PMU=m
15571571
CONFIG_HISI_PMU=y
15581572
CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
1573+
CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
15591574
CONFIG_MESON_DDR_PMU=m
15601575
CONFIG_NVMEM_LAYOUT_SL28_VPD=m
15611576
CONFIG_NVMEM_IMX_OCOTP=y
@@ -1565,6 +1580,7 @@ CONFIG_NVMEM_LAYERSCAPE_SFP=m
15651580
CONFIG_NVMEM_MESON_EFUSE=m
15661581
CONFIG_NVMEM_MTK_EFUSE=y
15671582
CONFIG_NVMEM_QCOM_QFPROM=y
1583+
CONFIG_NVMEM_QCOM_SEC_QFPROM=m
15681584
CONFIG_NVMEM_RMEM=m
15691585
CONFIG_NVMEM_ROCKCHIP_EFUSE=y
15701586
CONFIG_NVMEM_ROCKCHIP_OTP=y
@@ -1594,7 +1610,7 @@ CONFIG_INTERCONNECT_IMX8MQ=m
15941610
CONFIG_INTERCONNECT_IMX8MP=y
15951611
CONFIG_INTERCONNECT_QCOM=y
15961612
CONFIG_INTERCONNECT_QCOM_MSM8916=m
1597-
CONFIG_INTERCONNECT_QCOM_MSM8996=m
1613+
CONFIG_INTERCONNECT_QCOM_MSM8996=y
15981614
CONFIG_INTERCONNECT_QCOM_OSM_L3=m
15991615
CONFIG_INTERCONNECT_QCOM_QCM2290=y
16001616
CONFIG_INTERCONNECT_QCOM_QCS404=m
@@ -1607,9 +1623,9 @@ CONFIG_INTERCONNECT_QCOM_SC8280XP=y
16071623
CONFIG_INTERCONNECT_QCOM_SDM845=y
16081624
CONFIG_INTERCONNECT_QCOM_SDX75=y
16091625
CONFIG_INTERCONNECT_QCOM_SM6115=y
1610-
CONFIG_INTERCONNECT_QCOM_SM8150=m
1626+
CONFIG_INTERCONNECT_QCOM_SM8150=y
16111627
CONFIG_INTERCONNECT_QCOM_SM8250=y
1612-
CONFIG_INTERCONNECT_QCOM_SM8350=m
1628+
CONFIG_INTERCONNECT_QCOM_SM8350=y
16131629
CONFIG_INTERCONNECT_QCOM_SM8450=y
16141630
CONFIG_INTERCONNECT_QCOM_SM8550=y
16151631
CONFIG_INTERCONNECT_QCOM_SM8650=y

arch/riscv/configs/defconfig

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,10 @@ CONFIG_PCIEPORTBUS=y
110110
CONFIG_PCI_HOST_GENERIC=y
111111
CONFIG_PCIE_XILINX=y
112112
CONFIG_PCIE_FU740=y
113+
CONFIG_PCIE_STARFIVE_HOST=m
113114
CONFIG_DEVTMPFS=y
114115
CONFIG_DEVTMPFS_MOUNT=y
116+
CONFIG_SIFIVE_CCACHE=y
115117
CONFIG_MTD=y
116118
CONFIG_MTD_BLOCK=y
117119
CONFIG_MTD_CFI=y
@@ -143,6 +145,7 @@ CONFIG_RAVB=y
143145
CONFIG_STMMAC_ETH=m
144146
CONFIG_MICREL_PHY=y
145147
CONFIG_MICROSEMI_PHY=y
148+
CONFIG_MOTORCOMM_PHY=y
146149
CONFIG_CAN_RCAR_CANFD=m
147150
CONFIG_INPUT_MOUSEDEV=y
148151
CONFIG_KEYBOARD_SUN4I_LRADC=m
@@ -155,24 +158,35 @@ CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
155158
CONFIG_VIRTIO_CONSOLE=y
156159
CONFIG_HW_RANDOM=y
157160
CONFIG_HW_RANDOM_VIRTIO=y
161+
CONFIG_HW_RANDOM_JH7110=m
162+
CONFIG_I2C=y
158163
CONFIG_I2C_CHARDEV=m
164+
CONFIG_I2C_DESIGNWARE_PLATFORM=y
159165
CONFIG_I2C_MV64XXX=m
160166
CONFIG_I2C_RIIC=y
161167
CONFIG_SPI=y
168+
CONFIG_SPI_CADENCE_QUADSPI=m
169+
CONFIG_SPI_PL022=m
162170
CONFIG_SPI_RSPI=m
163171
CONFIG_SPI_SIFIVE=y
164172
CONFIG_SPI_SUN6I=y
165173
# CONFIG_PTP_1588_CLOCK is not set
166174
CONFIG_GPIO_SIFIVE=y
175+
CONFIG_POWER_RESET_GPIO_RESTART=y
176+
CONFIG_SENSORS_SFCTEMP=m
167177
CONFIG_CPU_THERMAL=y
168178
CONFIG_DEVFREQ_THERMAL=y
169179
CONFIG_RZG2L_THERMAL=y
170180
CONFIG_WATCHDOG=y
171181
CONFIG_SUNXI_WATCHDOG=y
172182
CONFIG_RENESAS_RZG2LWDT=y
183+
CONFIG_MFD_AXP20X_I2C=y
173184
CONFIG_REGULATOR=y
174185
CONFIG_REGULATOR_FIXED_VOLTAGE=y
186+
CONFIG_REGULATOR_AXP20X=y
175187
CONFIG_REGULATOR_GPIO=y
188+
CONFIG_MEDIA_SUPPORT=m
189+
CONFIG_VIDEO_CADENCE_CSI2RX=m
176190
CONFIG_DRM=m
177191
CONFIG_DRM_RADEON=m
178192
CONFIG_DRM_NOUVEAU=m
@@ -184,6 +198,10 @@ CONFIG_SOUND=y
184198
CONFIG_SND=y
185199
CONFIG_SND_SOC=y
186200
CONFIG_SND_SOC_RZ=m
201+
CONFIG_SND_DESIGNWARE_I2S=m
202+
CONFIG_SND_SOC_STARFIVE=m
203+
CONFIG_SND_SOC_JH7110_PWMDAC=m
204+
CONFIG_SND_SOC_JH7110_TDM=m
187205
CONFIG_SND_SOC_WM8978=m
188206
CONFIG_SND_SIMPLE_CARD=m
189207
CONFIG_USB=y
@@ -197,6 +215,11 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
197215
CONFIG_USB_RENESAS_USBHS=m
198216
CONFIG_USB_STORAGE=y
199217
CONFIG_USB_UAS=y
218+
CONFIG_USB_CDNS_SUPPORT=m
219+
CONFIG_USB_CDNS3=m
220+
CONFIG_USB_CDNS3_GADGET=y
221+
CONFIG_USB_CDNS3_HOST=y
222+
CONFIG_USB_CDNS3_STARFIVE=m
200223
CONFIG_USB_MUSB_HDRC=m
201224
CONFIG_USB_MUSB_SUNXI=m
202225
CONFIG_NOP_USB_XCEIV=m
@@ -246,6 +269,9 @@ CONFIG_RZG2L_ADC=m
246269
CONFIG_RESET_RZG2L_USBPHY_CTRL=y
247270
CONFIG_PHY_SUN4I_USB=m
248271
CONFIG_PHY_RCAR_GEN3_USB2=y
272+
CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=m
273+
CONFIG_PHY_STARFIVE_JH7110_PCIE=m
274+
CONFIG_PHY_STARFIVE_JH7110_USB=m
249275
CONFIG_LIBNVDIMM=y
250276
CONFIG_NVMEM_SUNXI_SID=y
251277
CONFIG_EXT4_FS=y

0 commit comments

Comments
 (0)