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

Commit 4352878

Browse files
committed
Merge tag 'riscv-config-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into soc/defconfig
RISC-V config update for v6.11 StarFive: Enable most of the options needed for the jh7100 based boards to be properly testable with defconfig. Signed-off-by: Conor Dooley <conor.dooley@microchip.com> * tag 'riscv-config-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux: riscv: defconfig: Enable StarFive JH7110 drivers Link: https://lore.kernel.org/r/20240707-unused-outflank-aa127ccb2cfe@spud Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents fa38c95 + d8a7d89 commit 4352878

File tree

1 file changed

+26
-0
lines changed

1 file changed

+26
-0
lines changed

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)