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 <chee.hong.ang@intel.com>
Reviewed-by: Ley Foon Tan <ley.foon.tan@intel.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index abbc89a889008a15e7da14f95c736535ec98311d..9e7c2931cd0797e1b2e79d6e59d05a66d4ae9929 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -994,7 +994,7 @@ config ARCH_SOCFPGA
        select SYS_THUMB_BUILD if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
        select SYSRESET
        select SYSRESET_SOCFPGA if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
-       select SYSRESET_SOCFPGA_S10 if TARGET_SOCFPGA_STRATIX10
+       select SYSRESET_SOCFPGA_SOC64 if TARGET_SOCFPGA_STRATIX10
        imply CMD_DM
        imply CMD_MTDPARTS
        imply CRC32_VERIFY

diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig
index 6ebc90e1d33ba05a48bfa34e34bd31f660fdb26a..b812af9359810803334bbda7a3e9b1b4edb1ad66 100644 (file)
--- 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 df2293b8489d17c8d6e68ef777f180e212dce8f9..920c69233f7f82cfaa5ed1c12f361023788fc038 100644 (file)
--- 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_soc64.c
similarity index 100%
rename from drivers/sysreset/sysreset_socfpga_s10.c
rename to drivers/sysreset/sysreset_socfpga_soc64.c