diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-30 13:43:19 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-30 13:43:19 +1000 |
| commit | 719dbb2df78fc9a40e28392b07cd715bfc5a665c (patch) | |
| tree | 0bbc3b84b74178d18164f5522ee3715623f94bbe /arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | |
| parent | fbef66f0adcddf4475e19f3d09df22fb34e633f6 (diff) | |
| parent | 9f595fd8b54809fed13fc30906ef1e90a3fcfbc9 (diff) | |
| download | linux-719dbb2df78fc9a40e28392b07cd715bfc5a665c.tar.gz linux-719dbb2df78fc9a40e28392b07cd715bfc5a665c.tar.xz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include more 8xx optimizations, device tree updates,
and MVME7100 support."
Diffstat (limited to 'arch/powerpc/sysdev/fsl_85xx_l2ctlr.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c index 861cebf9c292..c27058e5df26 100644 --- a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c +++ b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c @@ -90,12 +90,8 @@ static int mpc85xx_l2ctlr_of_probe(struct platform_device *dev) } l2cache_size = *prop; - if (get_cache_sram_params(&sram_params)) { - dev_err(&dev->dev, - "Entire L2 as cache, provide valid sram offset and size\n"); - return -EINVAL; - } - + if (get_cache_sram_params(&sram_params)) + return 0; /* fall back to L2 cache only */ rem = l2cache_size % sram_params.sram_size; ways = LOCK_WAYS_FULL * sram_params.sram_size / l2cache_size; |