9e29827ad9
- `risc-v`: rework RichNeese's boards, reduce families, move tweaks to boards - `risc-v`/`starfive`: `CONFIG_MOTORCOMM_PHY=m` for the onboard Ethernet - `risc-v`/`starfive`: use mainline kernel 6.1.y, with StarFive's rebased patches against `v6.1.5` - from https://github.com/starfive-tech/linux/commits/visionfive - contention point: `1022-soc-sifive-ccache-Add-StarFive-JH71x0-support.patch` which I merged half-assed, need review/fixes? - `risc-v`/`starfive`: update kernel config, sans changes - `risc-v`/`starfive`: switch from `grub` to `extlinux` - `risc-v`/`starfive`: new `starfive` family with their (vendor) kernel Co-authored-by: Richard Neese <r.neese@gmail.com>
107 lines
3.9 KiB
Diff
107 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Emil Renner Berthing <kernel@esmil.dk>
|
|
Date: Sat, 20 Nov 2021 18:30:33 +0100
|
|
Subject: 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.
|
|
|
|
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|
---
|
|
MAINTAINERS | 2 +-
|
|
drivers/reset/Kconfig | 8 +-------
|
|
drivers/reset/Makefile | 2 +-
|
|
drivers/reset/starfive/Kconfig | 8 ++++++++
|
|
drivers/reset/starfive/Makefile | 2 ++
|
|
drivers/reset/{ => starfive}/reset-starfive-jh7100.c | 0
|
|
6 files changed, 13 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/MAINTAINERS b/MAINTAINERS
|
|
index ee4ef9a73e7d..7a472ac625e1 100644
|
|
--- a/MAINTAINERS
|
|
+++ b/MAINTAINERS
|
|
@@ -19652,7 +19652,7 @@ STARFIVE JH7100 RESET CONTROLLER DRIVER
|
|
M: Emil Renner Berthing <kernel@esmil.dk>
|
|
S: Maintained
|
|
F: Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml
|
|
-F: drivers/reset/reset-starfive-jh7100.c
|
|
+F: drivers/reset/starfive/reset-starfive-jh7100.c
|
|
F: include/dt-bindings/reset/starfive-jh7100.h
|
|
|
|
STATIC BRANCH/CALL
|
|
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
|
|
index de176c2fbad9..1e8e1c4954cd 100644
|
|
--- a/drivers/reset/Kconfig
|
|
+++ b/drivers/reset/Kconfig
|
|
@@ -232,13 +232,6 @@ config RESET_SOCFPGA
|
|
This enables the reset driver for the SoCFPGA ARMv7 platforms. This
|
|
driver gets initialized early during platform init calls.
|
|
|
|
-config RESET_STARFIVE_JH7100
|
|
- bool "StarFive JH7100 Reset Driver"
|
|
- depends on SOC_STARFIVE || COMPILE_TEST
|
|
- default SOC_STARFIVE
|
|
- help
|
|
- This enables the reset controller driver for the StarFive JH7100 SoC.
|
|
-
|
|
config RESET_SUNPLUS
|
|
bool "Sunplus SoCs Reset Driver" if COMPILE_TEST
|
|
default ARCH_SUNPLUS
|
|
@@ -320,6 +313,7 @@ config RESET_ZYNQ
|
|
help
|
|
This enables the reset controller driver for Xilinx Zynq SoCs.
|
|
|
|
+source "drivers/reset/starfive/Kconfig"
|
|
source "drivers/reset/sti/Kconfig"
|
|
source "drivers/reset/hisilicon/Kconfig"
|
|
source "drivers/reset/tegra/Kconfig"
|
|
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
|
|
index 3e7e5fd633a8..7fec5af6c964 100644
|
|
--- a/drivers/reset/Makefile
|
|
+++ b/drivers/reset/Makefile
|
|
@@ -1,6 +1,7 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
obj-y += core.o
|
|
obj-y += hisilicon/
|
|
+obj-y += starfive/
|
|
obj-$(CONFIG_ARCH_STI) += sti/
|
|
obj-$(CONFIG_ARCH_TEGRA) += tegra/
|
|
obj-$(CONFIG_RESET_A10SR) += reset-a10sr.o
|
|
@@ -30,7 +31,6 @@ obj-$(CONFIG_RESET_RZG2L_USBPHY_CTRL) += reset-rzg2l-usbphy-ctrl.o
|
|
obj-$(CONFIG_RESET_SCMI) += reset-scmi.o
|
|
obj-$(CONFIG_RESET_SIMPLE) += reset-simple.o
|
|
obj-$(CONFIG_RESET_SOCFPGA) += reset-socfpga.o
|
|
-obj-$(CONFIG_RESET_STARFIVE_JH7100) += reset-starfive-jh7100.o
|
|
obj-$(CONFIG_RESET_SUNPLUS) += reset-sunplus.o
|
|
obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
|
|
obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o
|
|
diff --git a/drivers/reset/starfive/Kconfig b/drivers/reset/starfive/Kconfig
|
|
new file mode 100644
|
|
index 000000000000..cddebdba7177
|
|
--- /dev/null
|
|
+++ b/drivers/reset/starfive/Kconfig
|
|
@@ -0,0 +1,8 @@
|
|
+# SPDX-License-Identifier: GPL-2.0-only
|
|
+
|
|
+config RESET_STARFIVE_JH7100
|
|
+ bool "StarFive JH7100 Reset Driver"
|
|
+ depends on SOC_STARFIVE || COMPILE_TEST
|
|
+ default SOC_STARFIVE
|
|
+ help
|
|
+ This enables the reset controller driver for the StarFive JH7100 SoC.
|
|
diff --git a/drivers/reset/starfive/Makefile b/drivers/reset/starfive/Makefile
|
|
new file mode 100644
|
|
index 000000000000..670d049423f5
|
|
--- /dev/null
|
|
+++ b/drivers/reset/starfive/Makefile
|
|
@@ -0,0 +1,2 @@
|
|
+# SPDX-License-Identifier: GPL-2.0
|
|
+obj-$(CONFIG_RESET_STARFIVE_JH7100) += reset-starfive-jh7100.o
|
|
diff --git a/drivers/reset/reset-starfive-jh7100.c b/drivers/reset/starfive/reset-starfive-jh7100.c
|
|
similarity index 100%
|
|
rename from drivers/reset/reset-starfive-jh7100.c
|
|
rename to drivers/reset/starfive/reset-starfive-jh7100.c
|
|
--
|
|
Armbian
|
|
|