From a6510993a5a5929f38d7672cd3fdde2959bdb21d Mon Sep 17 00:00:00 2001 From: Chee Hong Ang Date: Wed, 5 Aug 2020 20:11:25 +0800 Subject: sysreset: socfpga: soc64: Rename SYSRESET SoCFPGA driver for S10 to SoC64 Rename the driver from S10 to SoC64 because Intel Agilex platform also using the this SYSRESET SoCFPGA driver for S10. Signed-off-by: Chee Hong Ang Reviewed-by: Ley Foon Tan --- drivers/sysreset/Kconfig | 6 +++--- drivers/sysreset/Makefile | 2 +- drivers/sysreset/sysreset_socfpga_s10.c | 29 ----------------------------- drivers/sysreset/sysreset_socfpga_soc64.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 drivers/sysreset/sysreset_socfpga_s10.c create mode 100644 drivers/sysreset/sysreset_socfpga_soc64.c (limited to 'drivers/sysreset') diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig index 6ebc90e1d3..b812af9359 100644 --- a/drivers/sysreset/Kconfig +++ b/drivers/sysreset/Kconfig @@ -79,12 +79,12 @@ config SYSRESET_SOCFPGA This enables the system reset driver support for Intel SOCFPGA SoCs (Cyclone 5, Arria 5 and Arria 10). -config SYSRESET_SOCFPGA_S10 - bool "Enable support for Intel SOCFPGA Stratix 10" +config SYSRESET_SOCFPGA_SOC64 + bool "Enable support for Intel SOCFPGA SoC64 family (Stratix10/Agilex)" depends on ARCH_SOCFPGA && TARGET_SOCFPGA_STRATIX10 help This enables the system reset driver support for Intel SOCFPGA - Stratix SoCs. + SoC64 SoCs. config SYSRESET_TI_SCI bool "TI System Control Interface (TI SCI) system reset driver" diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile index df2293b848..920c69233f 100644 --- a/drivers/sysreset/Makefile +++ b/drivers/sysreset/Makefile @@ -13,7 +13,7 @@ obj-$(CONFIG_SYSRESET_MICROBLAZE) += sysreset_microblaze.o obj-$(CONFIG_SYSRESET_OCTEON) += sysreset_octeon.o obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o obj-$(CONFIG_SYSRESET_SOCFPGA) += sysreset_socfpga.o -obj-$(CONFIG_SYSRESET_SOCFPGA_S10) += sysreset_socfpga_s10.o +obj-$(CONFIG_SYSRESET_SOCFPGA_SOC64) += sysreset_socfpga_soc64.o obj-$(CONFIG_SYSRESET_TI_SCI) += sysreset-ti-sci.o obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o diff --git a/drivers/sysreset/sysreset_socfpga_s10.c b/drivers/sysreset/sysreset_socfpga_s10.c deleted file mode 100644 index 9837aadf64..0000000000 --- a/drivers/sysreset/sysreset_socfpga_s10.c +++ /dev/null @@ -1,29 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2019 Pepperl+Fuchs - * Simon Goldschmidt - */ - -#include -#include -#include -#include -#include - -static int socfpga_sysreset_request(struct udevice *dev, - enum sysreset_t type) -{ - puts("Mailbox: Issuing mailbox cmd REBOOT_HPS\n"); - mbox_reset_cold(); - return -EINPROGRESS; -} - -static struct sysreset_ops socfpga_sysreset = { - .request = socfpga_sysreset_request, -}; - -U_BOOT_DRIVER(sysreset_socfpga) = { - .id = UCLASS_SYSRESET, - .name = "socfpga_sysreset", - .ops = &socfpga_sysreset, -}; diff --git a/drivers/sysreset/sysreset_socfpga_soc64.c b/drivers/sysreset/sysreset_socfpga_soc64.c new file mode 100644 index 0000000000..9837aadf64 --- /dev/null +++ b/drivers/sysreset/sysreset_socfpga_soc64.c @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 Pepperl+Fuchs + * Simon Goldschmidt + */ + +#include +#include +#include +#include +#include + +static int socfpga_sysreset_request(struct udevice *dev, + enum sysreset_t type) +{ + puts("Mailbox: Issuing mailbox cmd REBOOT_HPS\n"); + mbox_reset_cold(); + return -EINPROGRESS; +} + +static struct sysreset_ops socfpga_sysreset = { + .request = socfpga_sysreset_request, +}; + +U_BOOT_DRIVER(sysreset_socfpga) = { + .id = UCLASS_SYSRESET, + .name = "socfpga_sysreset", + .ops = &socfpga_sysreset, +}; -- cgit v1.2.3