EDAC, altera: Handle Arria10 SDRAM child node

Separate the device match arrays for each platform to prevent CycloneV
matches when calling of_platform_populate() on the Arria10 ECC manager
node.

If the SDRAM is a child node of ECC manager, call probe function via
of_platform_populate().

Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1464193783-5071-4-git-send-email-tthayer@opensource.altera.com
Signed-off-by: Borislav Petkov <bp@suse.de>

diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
index c254f90b2e70d2d3eebee4a3cc194cae4960aec7..6f5d586fa0a08c23288ebf02cad22a07bc889c2d 100644 (file)
--- a/drivers/edac/altera_edac.c
+++ b/drivers/edac/altera_edac.c
@@ -688,11 +688,9 @@ static void altr_create_edacdev_dbgfs(struct edac_device_ctl_info *edac_dci,
 static const struct of_device_id altr_edac_device_of_match[] = {
 #ifdef CONFIG_EDAC_ALTERA_L2C
        { .compatible = "altr,socfpga-l2-ecc", .data = &l2ecc_data },
-       { .compatible = "altr,socfpga-a10-l2-ecc", .data = &a10_l2ecc_data },
 #endif
 #ifdef CONFIG_EDAC_ALTERA_OCRAM
        { .compatible = "altr,socfpga-ocram-ecc", .data = &ocramecc_data },
-       { .compatible = "altr,socfpga-a10-ocram-ecc", .data = &a10_ocramecc_data },
 #endif
        {},
 };
@@ -1058,6 +1056,17 @@ const struct edac_device_prv_data a10_l2ecc_data = {
 #endif /* CONFIG_EDAC_ALTERA_L2C */
 
 /********************* Arria10 EDAC Device Functions *************************/
+static const struct of_device_id altr_edac_a10_device_of_match[] = {
+#ifdef CONFIG_EDAC_ALTERA_L2C
+       { .compatible = "altr,socfpga-a10-l2-ecc", .data = &a10_l2ecc_data },
+#endif
+#ifdef CONFIG_EDAC_ALTERA_OCRAM
+       { .compatible = "altr,socfpga-a10-ocram-ecc",
+         .data = &a10_ocramecc_data },
+#endif
+       {},
+};
+MODULE_DEVICE_TABLE(of, altr_edac_a10_device_of_match);
 
 /*
  * The Arria10 EDAC Device Functions differ from the Cyclone5/Arria5
@@ -1128,7 +1137,7 @@ static int altr_edac_a10_device_add(struct altr_arria10_edac *edac,
        const struct edac_device_prv_data *prv;
        /* Get matching node and check for valid result */
        const struct of_device_id *pdev_id =
-               of_match_node(altr_edac_device_of_match, np);
+               of_match_node(altr_edac_a10_device_of_match, np);
        if (IS_ERR_OR_NULL(pdev_id))
                return -ENODEV;
 
@@ -1329,6 +1338,11 @@ static int altr_edac_a10_probe(struct platform_device *pdev)
                else if (of_device_is_compatible(child,
                                                 "altr,socfpga-a10-ocram-ecc"))
                        altr_edac_a10_device_add(edac, child);
+               else if (of_device_is_compatible(child,
+                                                "altr,sdram-edac-a10"))
+                       of_platform_populate(pdev->dev.of_node,
+                                            altr_sdram_ctrl_of_match,
+                                            NULL, &pdev->dev);
        }
 
        return 0;