diff options
| author | J. German Rivera <Jose.G.Rivera@freescale.com> | 2013-09-17 20:28:09 (GMT) |
|---|---|---|
| committer | J. German Rivera <German.Rivera@freescale.com> | 2013-09-17 20:28:09 (GMT) |
| commit | ab352aede03f580896c181e993fc37676beca44e (patch) | |
| tree | 370bd1ad21731bf1907707bc57aa8b211ca5e99c /drivers/net/ethernet | |
| parent | 6f0a7f2ad8b03a05dd3a4ee5374153a3a4befcf9 (diff) | |
| parent | 4b2b581bf100ab45e2c116fd08a9b94840ce3ebf (diff) | |
| download | linux-fsl-qoriq-ab352aede03f580896c181e993fc37676beca44e.tar.xz | |
Merge branch 'b4860rev2' into sdk-v1.4.x
Diffstat (limited to 'drivers/net/ethernet')
| -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 7a56ec0..a2519dd 100644 --- a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c +++ b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c @@ -518,16 +518,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; @@ -561,6 +551,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; + } } } |