Since SOC_FOO should be deprecated from patch [1], and cleanup for other
SoCs is already in the mailing list [2,3,4], so we deprecate the use of
SOC_CANAAN and use ARCH_CANAAN for SoCs vendored by Canaan instead from now
on.
However, the K210 SoC is so special for NoMMU and built for loader.bin, if
we share the ARCH_CANAAN symbol directly for K210 and other new SoCs which
has MMU and no need for loader, it will confuse some users who may try to
boot MMU Kernel on K210, but it will fail. Thus, this patch set renamed the
original use of SOC_CANAAN to SOC_CANAAN_K210 for K210 SoC, as Damien
suggested from the list [5]. Then, it made some adaptations for soc, clk,
pinctrl, and reset drivers.
Note: This patch set is used to prepare for Canaan K230 Support, which is
on the mailing list [6]. The next revision for the K230 support patch will
be based on this patch set.
[1] https://lore.kernel.org/linux-riscv/[email protected]/
[2] https://lore.kernel.org/linux-riscv/20240305-praying-clad-c4fbcaa7ed0a@spud/
[3] https://lore.kernel.org/linux-riscv/20240305-fled-undrilled-41dc0c46bb29@spud/
[4] https://lore.kernel.org/linux-riscv/20240305-stress-earflap-d7ddb8655a4d@spud/
[5] https://lore.kernel.org/linux-riscv/[email protected]/
[6] https://lore.kernel.org/linux-riscv/[email protected]/
Yangyu Chen (5):
riscv: Kconfig.socs: Split ARCH_CANAAN and SOC_CANAAN_K210
soc: canaan: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 for K210
clk: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210
pinctrl: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210
reset: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210
arch/riscv/Kconfig.socs | 10 ++++++++--
arch/riscv/Makefile | 2 +-
arch/riscv/configs/nommu_k210_defconfig | 3 ++-
arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 ++-
drivers/clk/Kconfig | 4 ++--
drivers/pinctrl/Kconfig | 4 ++--
drivers/reset/Kconfig | 4 ++--
drivers/soc/Makefile | 2 +-
drivers/soc/canaan/Kconfig | 4 ++--
9 files changed, 22 insertions(+), 14 deletions(-)
--
2.43.0
From: Conor Dooley <[email protected]>
On Fri, 29 Mar 2024 01:03:22 +0800, Yangyu Chen wrote:
> Since SOC_FOO should be deprecated from patch [1], and cleanup for other
> SoCs is already in the mailing list [2,3,4], so we deprecate the use of
> SOC_CANAAN and use ARCH_CANAAN for SoCs vendored by Canaan instead from now
> on.
>
> However, the K210 SoC is so special for NoMMU and built for loader.bin, if
> we share the ARCH_CANAAN symbol directly for K210 and other new SoCs which
> has MMU and no need for loader, it will confuse some users who may try to
> boot MMU Kernel on K210, but it will fail. Thus, this patch set renamed the
> original use of SOC_CANAAN to SOC_CANAAN_K210 for K210 SoC, as Damien
> suggested from the list [5]. Then, it made some adaptations for soc, clk,
> pinctrl, and reset drivers.
>
> [...]
Applied to riscv-dt-for-next, thanks!
[1/5] riscv: Kconfig.socs: Split ARCH_CANAAN and SOC_CANAAN_K210
https://git.kernel.org/conor/c/ef10bdf9c3e6
[2/5] soc: canaan: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 for K210
https://git.kernel.org/conor/c/915fb0e31c5b
[3/5] clk: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210
https://git.kernel.org/conor/c/8e5b7234ded5
[4/5] pinctrl: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210
https://git.kernel.org/conor/c/c1556a9b426e
[5/5] reset: k210: Deprecate SOC_CANAAN and use SOC_CANAAN_K210
https://git.kernel.org/conor/c/68f41105ea07
I added another commit at the end, deleting SOC_CANAAN given all the users
are gone and it is not user-visible:
https://git.kernel.org/conor/c/0eea987088a22d73d81e968de7347cdc7e594f72
Thanks,
Conor.