EDAC/aspeed: Add support for AST2400 and AST2600

Add AST2400 and AST2600 EDAC driver support.

Signed-off-by: Troy Lee <troy_lee@aspeedtech.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Stefan Schaeckeler <sschaeck@cisco.com>
Link: https://lkml.kernel.org/r/20201207090013.14145-3-troy_lee@aspeedtech.com

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 7a47680d6f0786058201d2f02904b1211807c84b..c410331e8ee8723d021355b97d710bff49e8b870 100644 (file)
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -515,10 +515,10 @@ config EDAC_QCOM
          health, you should probably say 'Y' here.
 
 config EDAC_ASPEED
-       tristate "Aspeed AST 2500 SoC"
-       depends on MACH_ASPEED_G5
+       tristate "Aspeed AST BMC SoC"
+       depends on ARCH_ASPEED
        help
-         Support for error detection and correction on the Aspeed AST 2500 SoC.
+         Support for error detection and correction on the Aspeed AST BMC SoC.
 
          First, ECC must be configured in the bootloader. Then, this driver
          will expose error counters via the EDAC kernel framework.

diff --git a/drivers/edac/aspeed_edac.c b/drivers/edac/aspeed_edac.c
index fde809efc5205192ccf9052ca1d12a94902279af..a46da56d6d544ff3f9e20ec10513daee32d489e7 100644 (file)
--- a/drivers/edac/aspeed_edac.c
+++ b/drivers/edac/aspeed_edac.c
@@ -239,7 +239,7 @@ static int init_csrows(struct mem_ctl_info *mci)
        int rc;
 
        /* retrieve info about physical memory from device tree */
-       np = of_find_node_by_path("/memory");
+       np = of_find_node_by_name(NULL, "memory");
        if (!np) {
                dev_err(mci->pdev, "dt: missing /memory node\n");
                return -ENODEV;
@@ -375,10 +375,13 @@ static int aspeed_remove(struct platform_device *pdev)
 
 
 static const struct of_device_id aspeed_of_match[] = {
+       { .compatible = "aspeed,ast2400-sdram-edac" },
        { .compatible = "aspeed,ast2500-sdram-edac" },
+       { .compatible = "aspeed,ast2600-sdram-edac" },
        {},
 };
 
+MODULE_DEVICE_TABLE(of, aspeed_of_match);
 
 static struct platform_driver aspeed_driver = {
        .driver         = {
@@ -392,5 +395,5 @@ module_platform_driver(aspeed_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Stefan Schaeckeler <sschaeck@cisco.com>");
-MODULE_DESCRIPTION("Aspeed AST2500 EDAC driver");
+MODULE_DESCRIPTION("Aspeed BMC SoC EDAC driver");
 MODULE_VERSION("1.0");