diff options
| author | J. German Rivera <Jose.G.Rivera@freescale.com> | 2013-09-18 19:14:10 (GMT) |
|---|---|---|
| committer | J. German Rivera <German.Rivera@freescale.com> | 2013-09-18 19:14:10 (GMT) |
| commit | 60c3617331c9a50e9b63f9e9cdcdc7e93899d0ff (patch) | |
| tree | 9b711300b5807b5fdfc3793d65d8d46775aed499 /drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c | |
| parent | 356c21aec7dcc9046d27c43323cf031e794c4a75 (diff) | |
| parent | ca76b6d2649931245f4ca4bf7106943f978a9d42 (diff) | |
| download | linux-fsl-qoriq-60c3617331c9a50e9b63f9e9cdcdc7e93899d0ff.tar.xz | |
Merge branch 'sdk-v1.4.x' into sdk-kernel-3.8
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c index 10de0ad..333b20a 100644 --- a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c +++ b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c @@ -523,16 +523,6 @@ static t_LnxWrpFmDev * ReadFmDevTreeNode (struct platform_device *of_dev) return NULL; } - { - uint32_t svr; - - svr = mfspr(SPRN_SVR); - - if ((svr & ~SVR_VER_IGNORE_MASK) == SVR_B4860_REV2_VALUE) { - res.end = 0x80000; - res.start = 0; - } - } p_LnxWrpFmDev->fmBaseAddr = 0; p_LnxWrpFmDev->fmPhysBaseAddr = res.start; @@ -566,6 +556,13 @@ static t_LnxWrpFmDev * ReadFmDevTreeNode (struct platform_device *of_dev) p_LnxWrpFmDev->fmMuramBaseAddr = 0; p_LnxWrpFmDev->fmMuramPhysBaseAddr = res.start; p_LnxWrpFmDev->fmMuramMemSize = res.end + 1 - res.start; + { + uint32_t svr; + svr = mfspr(SPRN_SVR); + + if ((svr & ~SVR_VER_IGNORE_MASK) == SVR_B4860_REV2_VALUE) + p_LnxWrpFmDev->fmMuramMemSize = 0x80000; + } } } |