Commit 75a15a78 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Borislav Petkov

EDAC, octeon: Fix broken build due to model helper renames

Commit

  debe6a62 ("MIPS: OCTEON: Update octeon-model.h code for new SoCs.")

renamed some SoC model helper functions, but forgot to update the EDAC
drivers resulting in build failures. Fix that.

Cc: stable@vger.kernel.org # v4.0+
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@nokia.com>
Acked-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: linux-mips@linux-mips.org
Link: http://lkml.kernel.org/r/1435747132-10954-1-git-send-email-aaro.koskinen@nokia.comSigned-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 043b4318
...@@ -151,7 +151,7 @@ static int octeon_l2c_probe(struct platform_device *pdev) ...@@ -151,7 +151,7 @@ static int octeon_l2c_probe(struct platform_device *pdev)
l2c->ctl_name = "octeon_l2c_err"; l2c->ctl_name = "octeon_l2c_err";
if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) { if (OCTEON_IS_OCTEON1PLUS()) {
union cvmx_l2t_err l2t_err; union cvmx_l2t_err l2t_err;
union cvmx_l2d_err l2d_err; union cvmx_l2d_err l2d_err;
......
...@@ -234,7 +234,7 @@ static int octeon_lmc_edac_probe(struct platform_device *pdev) ...@@ -234,7 +234,7 @@ static int octeon_lmc_edac_probe(struct platform_device *pdev)
layers[0].size = 1; layers[0].size = 1;
layers[0].is_virt_csrow = false; layers[0].is_virt_csrow = false;
if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) { if (OCTEON_IS_OCTEON1PLUS()) {
union cvmx_lmcx_mem_cfg0 cfg0; union cvmx_lmcx_mem_cfg0 cfg0;
cfg0.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(0)); cfg0.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(0));
......
...@@ -73,7 +73,7 @@ static int co_cache_error_event(struct notifier_block *this, ...@@ -73,7 +73,7 @@ static int co_cache_error_event(struct notifier_block *this,
edac_device_handle_ce(p->ed, cpu, 0, "dcache"); edac_device_handle_ce(p->ed, cpu, 0, "dcache");
/* Clear the error indication */ /* Clear the error indication */
if (OCTEON_IS_MODEL(OCTEON_FAM_2)) if (OCTEON_IS_OCTEON2())
write_octeon_c0_dcacheerr(1); write_octeon_c0_dcacheerr(1);
else else
write_octeon_c0_dcacheerr(0); write_octeon_c0_dcacheerr(0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment