evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edac, highbank: Improve and unify naming

Browse source 
Assinging correct names of the 'hb_mc_edac' and 'hb_l2_edac' edac
modules for module, controller and device. Reported values for
Highbank in dmesg are now:

 EDAC MC0: Giving out device to module hb_mc_edac controller
 calxeda,hb-ddr-ctrl: DEV fff00000.memory-controller (INTERRUPT)

 EDAC DEVICE0: Giving out device to module hb_l2_edac controller
 calxeda,hb-sregs-l2-ecc: DEV fff3c200.sregs (INTERRUPT)

Signed-off-by: Robert Richter <robert.richter@linaro.org>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Robert Richter <rric@kernel.org>
This commit is contained in:
Robert Richter 2013-10-10 17:36:19 +02:00 • committed by Robert Richter
parent 0ec8579e16
commit 41ec0e8da0
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/edac/highbank_l2_edac.c
View file

@ -50,8 +50,15 @@ static irqreturn_t highbank_l2_err_handler(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static const struct of_device_id hb_l2_err_of_match[] = {
{ .compatible = "calxeda,hb-sregs-l2-ecc", },
{},
};
MODULE_DEVICE_TABLE(of, hb_l2_err_of_match);
static int highbank_l2_err_probe(struct platform_device *pdev) static int highbank_l2_err_probe(struct platform_device *pdev)
{ {
const struct of_device_id *id;
struct edac_device_ctl_info *dci; struct edac_device_ctl_info *dci;
struct hb_l2_drvdata *drvdata; struct hb_l2_drvdata *drvdata;
struct resource *r; struct resource *r;
@ -90,7 +97,9 @@ static int highbank_l2_err_probe(struct platform_device *pdev)
goto err; goto err;
} }
dci->mod_name = dev_name(&pdev->dev); id = of_match_device(hb_l2_err_of_match, &pdev->dev);
dci->mod_name = pdev->dev.driver->name;
dci->ctl_name = id ? id->compatible : "unknown";
dci->dev_name = dev_name(&pdev->dev); dci->dev_name = dev_name(&pdev->dev);
if (edac_device_add_device(dci)) if (edac_device_add_device(dci))
@ -129,12 +138,6 @@ static int highbank_l2_err_remove(struct platform_device *pdev)
return 0; return 0;
} }
static const struct of_device_id hb_l2_err_of_match[] = {
{ .compatible = "calxeda,hb-sregs-l2-ecc", },
{},
};
MODULE_DEVICE_TABLE(of, hb_l2_err_of_match);
static struct platform_driver highbank_l2_edac_driver = { static struct platform_driver highbank_l2_edac_driver = {
.probe = highbank_l2_err_probe, .probe = highbank_l2_err_probe,
.remove = highbank_l2_err_remove, .remove = highbank_l2_err_remove,

5
drivers/edac/highbank_mc_edac.c
View file

@ -233,9 +233,10 @@ static int highbank_mc_probe(struct platform_device *pdev)
mci->mtype_cap = MEM_FLAG_DDR3; mci->mtype_cap = MEM_FLAG_DDR3;
mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
mci->edac_cap = EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED;
mci->mod_name = dev_name(&pdev->dev); mci->mod_name = pdev->dev.driver->name;
mci->mod_ver = "1"; mci->mod_ver = "1";
mci->ctl_name = dev_name(&pdev->dev); mci->ctl_name = id->compatible;
mci->dev_name = dev_name(&pdev->dev);
mci->scrub_mode = SCRUB_SW_SRC; mci->scrub_mode = SCRUB_SW_SRC;
/* Only a single 4GB DIMM is supported */ /* Only a single 4GB DIMM is supported */