Commit d4894a60 authored by Thor Thayer's avatar Thor Thayer Committed by Greg Kroah-Hartman

EDAC, altera: Fix peripheral warnings for Cyclone5

[ Upstream commit 25b223dd ]

The peripherals' RAS functionality only exist on the Arria10 SoCFPGA.
The Cyclone5 initialization generates EDAC warnings when the peripherals
aren't found in the device tree. Fix by checking for Arria10 in the init
Signed-off-by: default avatarThor Thayer <>
Cc: linux-edac <>
Link: default avatarBorislav Petkov <>
Signed-off-by: default avatarSasha Levin <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 1f7b46d2
......@@ -1020,13 +1020,23 @@ out:
return ret;
static int socfpga_is_a10(void)
return of_machine_is_compatible("altr,socfpga-arria10");
static int validate_parent_available(struct device_node *np);
static const struct of_device_id altr_edac_a10_device_of_match[];
static int __init __maybe_unused altr_init_a10_ecc_device_type(char *compat)
int irq;
struct device_node *child, *np = of_find_compatible_node(NULL, NULL,
struct device_node *child, *np;
if (!socfpga_is_a10())
return -ENODEV;
np = of_find_compatible_node(NULL, NULL,
if (!np) {
edac_printk(KERN_ERR, EDAC_DEVICE, "ECC Manager not found\n");
return -ENODEV;
......@@ -1542,8 +1552,12 @@ static const struct edac_device_prv_data a10_sdmmceccb_data = {
static int __init socfpga_init_sdmmc_ecc(void)
int rc = -ENODEV;
struct device_node *child = of_find_compatible_node(NULL, NULL,
struct device_node *child;
if (!socfpga_is_a10())
return -ENODEV;
child = of_find_compatible_node(NULL, NULL, "altr,socfpga-sdmmc-ecc");
if (!child) {
edac_printk(KERN_WARNING, EDAC_DEVICE, "SDMMC node not found\n");
return -ENODEV;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment