?? Wed, 21 Jun 2006 09:20:36 +0200 Gerhard Jaeger <g.jaeger at sysgo.com> ????????:
> Hi, > > On Tuesday 20 June 2006 16:58, Vitaly Bordug wrote: > > > > This patch should update the fs_enet infrastructure to utilize > > Phy Abstraction Layer subsystem. Inside there are generic driver > > rehaul, board-specific portion to respect driver changes (for > > 8272ads and 866ads). > > > > Signed-off-by: Vitaly Bordug <vbordug at ru.mvista.com> > > --- > > > > arch/ppc/platforms/mpc8272ads_setup.c | 154 ++++++---- > > arch/ppc/platforms/mpc866ads_setup.c | 192 ++++++------ > > arch/ppc/platforms/mpc885ads_setup.c | 179 ++++-------- > > arch/ppc/syslib/mpc8xx_devices.c | 8 + > > arch/ppc/syslib/mpc8xx_sys.c | 6 > > arch/ppc/syslib/pq2_devices.c | 5 > > arch/ppc/syslib/pq2_sys.c | 3 > > drivers/net/fs_enet/Makefile | 6 > > drivers/net/fs_enet/fec.h | 42 +++ > > drivers/net/fs_enet/fs_enet-main.c | 207 ++++++++----- > > drivers/net/fs_enet/fs_enet-mii.c | 507 > > --------------------------------- > > drivers/net/fs_enet/fs_enet.h | 40 ++- > > drivers/net/fs_enet/mac-fcc.c | 10 - > > drivers/net/fs_enet/mac-fec.c | 132 +-------- > > drivers/net/fs_enet/mac-scc.c | 4 > > drivers/net/fs_enet/mii-bitbang.c | 384 > > +++++++++++++++---------- drivers/net/fs_enet/mii-fec.c | > > 243 ++++++++++++++++ drivers/net/fs_enet/mii-fixed.c | 92 > > ------ include/asm-ppc/mpc8260.h | 1 > > include/asm-ppc/mpc8xx.h | 1 > > include/linux/fs_enet_pd.h | 50 +-- 21 files changed, > > 983 insertions(+), 1283 deletions(-) > > [SNIPSNAP] > > diff --git a/drivers/net/fs_enet/mii-bitbang.c > > b/drivers/net/fs_enet/mii-bitbang.c index 24a5e2e..145bf4c 100644 > > --- a/drivers/net/fs_enet/mii-bitbang.c > > +++ b/drivers/net/fs_enet/mii-bitbang.c > > @@ -34,6 +34,7 @@ > > #include <linux/mii.h> > > #include <linux/ethtool.h> > > #include <linux/bitops.h> > > +#include <linux/platform_device.h> > > > > #include <asm/pgtable.h> > > #include <asm/irq.h> > > @@ -41,6 +42,7 @@ > > > > #include "fs_enet.h" > > > > + > > #ifdef CONFIG_8xx > > static int bitbang_prep_bit(u8 **dirp, u8 **datp, u8 *mskp, int > > port, int bit) { > > @@ -106,64 +108,25 @@ static int bitbang_prep_bit(u8 **dirp, u > > } > > #endif > > > > -#ifdef CONFIG_8260 > > -static int bitbang_prep_bit(u8 **dirp, u8 **datp, u8 *mskp, int > > port, int bit) +static int bitbang_prep_bit(u8 **datp, u8 *mskp, > > + struct fs_mii_bit *mii_bit) > > is it possible, that in case of CONFIG_8xx you'll have two times this > bitbang_prep_bit() function? > Hmm, yes, thanks for pointing that out. The problem is in other thing though - the bitbang stuff got unified so there should be no board-specific ifdefs like those. This issue must have missed the cleanup, I'll fix and redo the patches. -- Sincerely, Vitaly