Skip to content

Commit 69bfec7

Browse files
esmilConchuOD
authored andcommitted
reset: Create subdirectory for StarFive drivers
This moves the StarFive JH7100 reset driver to a new subdirectory in preparation for adding more StarFive reset drivers. Reviewed-by: Philipp Zabel <[email protected]> Tested-by: Tommaso Merciai <[email protected]> Reviewed-by: Conor Dooley <[email protected]> Reviewed-by: Emil Renner Berthing <[email protected]> Signed-off-by: Emil Renner Berthing <[email protected]> Signed-off-by: Hal Feng <[email protected]> Signed-off-by: Conor Dooley <[email protected]>
1 parent c49a757 commit 69bfec7

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

drivers/reset/Kconfig

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,6 @@ config RESET_SOCFPGA
232232
This enables the reset driver for the SoCFPGA ARMv7 platforms. This
233233
driver gets initialized early during platform init calls.
234234

235-
config RESET_STARFIVE_JH7100
236-
bool "StarFive JH7100 Reset Driver"
237-
depends on ARCH_STARFIVE || COMPILE_TEST
238-
default ARCH_STARFIVE
239-
help
240-
This enables the reset controller driver for the StarFive JH7100 SoC.
241-
242235
config RESET_SUNPLUS
243236
bool "Sunplus SoCs Reset Driver" if COMPILE_TEST
244237
default ARCH_SUNPLUS
@@ -320,6 +313,7 @@ config RESET_ZYNQ
320313
help
321314
This enables the reset controller driver for Xilinx Zynq SoCs.
322315

316+
source "drivers/reset/starfive/Kconfig"
323317
source "drivers/reset/sti/Kconfig"
324318
source "drivers/reset/hisilicon/Kconfig"
325319
source "drivers/reset/tegra/Kconfig"

drivers/reset/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
obj-y += core.o
33
obj-y += hisilicon/
4+
obj-y += starfive/
45
obj-$(CONFIG_ARCH_STI) += sti/
56
obj-$(CONFIG_ARCH_TEGRA) += tegra/
67
obj-$(CONFIG_RESET_A10SR) += reset-a10sr.o
@@ -30,7 +31,6 @@ obj-$(CONFIG_RESET_RZG2L_USBPHY_CTRL) += reset-rzg2l-usbphy-ctrl.o
3031
obj-$(CONFIG_RESET_SCMI) += reset-scmi.o
3132
obj-$(CONFIG_RESET_SIMPLE) += reset-simple.o
3233
obj-$(CONFIG_RESET_SOCFPGA) += reset-socfpga.o
33-
obj-$(CONFIG_RESET_STARFIVE_JH7100) += reset-starfive-jh7100.o
3434
obj-$(CONFIG_RESET_SUNPLUS) += reset-sunplus.o
3535
obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
3636
obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o

drivers/reset/starfive/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
config RESET_STARFIVE_JH7100
4+
bool "StarFive JH7100 Reset Driver"
5+
depends on ARCH_STARFIVE || COMPILE_TEST
6+
default ARCH_STARFIVE
7+
help
8+
This enables the reset controller driver for the StarFive JH7100 SoC.

drivers/reset/starfive/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
obj-$(CONFIG_RESET_STARFIVE_JH7100) += reset-starfive-jh7100.o

0 commit comments

Comments
 (0)