Dale Farnsworth wrote: > On Mon, Oct 29, 2007 at 05:27:29PM -0400, Luis R. Rodriguez wrote: >> This commit made an incorrect assumption: >> -- >> Author: Lennert Buytenhek <[EMAIL PROTECTED]> >> Date: Fri Oct 19 04:10:10 2007 +0200 >> >> mv643xx_eth: Move ethernet register definitions into private header >> >> Move the mv643xx's ethernet-related register definitions from >> include/linux/mv643xx.h into drivers/net/mv643xx_eth.h, since >> they aren't of any use outside the ethernet driver. >> >> Signed-off-by: Lennert Buytenhek <[EMAIL PROTECTED]> >> Acked-by: Tzachi Perelstein <[EMAIL PROTECTED]> >> Signed-off-by: Dale Farnsworth <[EMAIL PROTECTED]> >> -- >> >> arch/powerpc/platforms/chrp/pegasos_eth.c made use of a 3 defines there. >> >> [EMAIL PROTECTED]:~/devel/wireless-2.6$ git-describe >> >> v2.6.24-rc1-138-g0119130 >> >> This patch fixes this by internalizing 3 defines onto pegasos which are >> simply no longer available elsewhere. Without this your compile will fail > > That compile failure was fixed in commit > 30e69bf4cce16d4c2dcfd629a60fcd8e1aba9fee by Al Viro. > > However, as I examine that commit, I see that it defines offsets from > the eth block in the chip, rather than the full chip registeri block > as the Pegasos 2 code expects. So, I think it fixes the compile > failure, but leaves the Pegasos 2 broken. > > Luis, do you have Pegasos 2 hardware? Can you (or anyone) verify that > the following patch is needed for the Pegasos 2? > > Thanks, > -Dale > > --------------------------------- > > mv643xx_eth: Fix MV643XX_ETH offsets used by Pegasos 2 > > In the mv643xx_eth driver, we now use offsets from the ethernet > register block within the chip, but the pegasos 2 platform still > needs offsets from the full chip's register base address. > > Signed-off-by: Dale Farnsworth <[EMAIL PROTECTED]> > --- > include/linux/mv643xx_eth.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h > index 8df230a..30e11aa 100644 > --- a/include/linux/mv643xx_eth.h > +++ b/include/linux/mv643xx_eth.h > @@ -8,9 +8,9 @@ > #define MV643XX_ETH_NAME "mv643xx_eth" > #define MV643XX_ETH_SHARED_REGS 0x2000 > #define MV643XX_ETH_SHARED_REGS_SIZE 0x2000 > -#define MV643XX_ETH_BAR_4 0x220 > -#define MV643XX_ETH_SIZE_REG_4 0x224 > -#define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x0290 > +#define MV643XX_ETH_BAR_4 0x2220 > +#define MV643XX_ETH_SIZE_REG_4 0x2224 > +#define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290
applied _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev