| Message ID | 1315524373-18336-1-git-send-email-philip@opensdr.com |
|---|---|
| State | Accepted |
| Headers | show |
2011/9/9 Philip Balister <philip@balister.org>: > The existing timing does not quite meet the minimum requirements > in the LAN9221 datasheet. The timing in this patch solves problems > noticed on some parts. The patch also combines the CS configuration > for the overo and igep0020 boards per request. > > Signed-off-by: Philip Balister <philip@opensdr.com> > --- > Changes for v2: Added igep0020 board per Enric Balletbò i Serra. Compile > tested only. > > arch/arm/include/asm/arch-omap3/omap_gpmc.h | 9 +++++++++ > board/isee/igep0020/igep0020.c | 1 + > board/isee/igep0020/igep0020.h | 9 --------- > board/overo/overo.c | 1 + > board/overo/overo.h | 9 --------- > 5 files changed, 11 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/include/asm/arch-omap3/omap_gpmc.h b/arch/arm/include/asm/arch-omap3/omap_gpmc.h > index bd22bce..800e4ee 100644 > --- a/arch/arm/include/asm/arch-omap3/omap_gpmc.h > +++ b/arch/arm/include/asm/arch-omap3/omap_gpmc.h > @@ -80,4 +80,13 @@ > } > #endif > > +/* GPMC CS configuration for an SMSC LAN9221 ethernet controller */ > +#define NET_LAN9221_GPMC_CONFIG1 0x00001000 > +#define NET_LAN9221_GPMC_CONFIG2 0x00060700 > +#define NET_LAN9221_GPMC_CONFIG3 0x00020201 > +#define NET_LAN9221_GPMC_CONFIG4 0x06000700 > +#define NET_LAN9221_GPMC_CONFIG5 0x0006090A > +#define NET_LAN9221_GPMC_CONFIG6 0x87030000 > +#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c > + > #endif /* __ASM_ARCH_OMAP_GPMC_H */ > diff --git a/board/isee/igep0020/igep0020.c b/board/isee/igep0020/igep0020.c > index 36cc924..a5210c9 100644 > --- a/board/isee/igep0020/igep0020.c > +++ b/board/isee/igep0020/igep0020.c > @@ -29,6 +29,7 @@ > #include <asm/arch/mmc_host_def.h> > #include <asm/arch/mux.h> > #include <asm/arch/sys_proto.h> > +#include <asm/arch/omap_gpmc.h> > #include <asm/mach-types.h> > #include "igep0020.h" > > diff --git a/board/isee/igep0020/igep0020.h b/board/isee/igep0020/igep0020.h > index c08d758..3d6e15f 100644 > --- a/board/isee/igep0020/igep0020.h > +++ b/board/isee/igep0020/igep0020.h > @@ -29,15 +29,6 @@ const omap3_sysinfo sysinfo = { > "ONENAND", > }; > > -/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */ > -#define NET_LAN9221_GPMC_CONFIG1 0x00001000 > -#define NET_LAN9221_GPMC_CONFIG2 0x00080701 > -#define NET_LAN9221_GPMC_CONFIG3 0x00020201 > -#define NET_LAN9221_GPMC_CONFIG4 0x08030703 > -#define NET_LAN9221_GPMC_CONFIG5 0x00060908 > -#define NET_LAN9221_GPMC_CONFIG6 0x87030000 > -#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c > - > static void setup_net_chip(void); > > /* > diff --git a/board/overo/overo.c b/board/overo/overo.c > index 4eafdb1..bcd7d62 100644 > --- a/board/overo/overo.c > +++ b/board/overo/overo.c > @@ -37,6 +37,7 @@ > #include <asm/arch/mem.h> > #include <asm/arch/sys_proto.h> > #include <asm/arch/gpio.h> > +#include <asm/arch/omap_gpmc.h> > #include <asm/mach-types.h> > #include "overo.h" > > diff --git a/board/overo/overo.h b/board/overo/overo.h > index 68e1243..57f2457 100644 > --- a/board/overo/overo.h > +++ b/board/overo/overo.h > @@ -33,15 +33,6 @@ const omap3_sysinfo sysinfo = { > #endif > }; > > -/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */ > -#define NET_LAN9221_GPMC_CONFIG1 0x00001000 > -#define NET_LAN9221_GPMC_CONFIG2 0x00080701 > -#define NET_LAN9221_GPMC_CONFIG3 0x00020201 > -#define NET_LAN9221_GPMC_CONFIG4 0x08030703 > -#define NET_LAN9221_GPMC_CONFIG5 0x00060908 > -#define NET_LAN9221_GPMC_CONFIG6 0x87030000 > -#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c > - > /* > * IEN - Input Enable > * IDIS - Input Disable > -- > 1.7.4.4 > > Tested on igep0020 machine (aka IGEP v2). Thanks Philip Acked-by: Enric Balletbo i Serra <eballetbo@gmail.com> Tested-by: Enric Balletbo i Serra <eballetbo@gmail.com>
I see I should have copied a maintainer on this patch. Which tree will this sort of path go upstream via? It seems like my choices are ARM of OMAP3. I've got a number of other patches that should go upstream that are Overo centric. In general, what route should they take upstream? Philip On 09/09/2011 03:16 AM, Enric Balletbò i Serra wrote: > 2011/9/9 Philip Balister<philip@balister.org>: >> The existing timing does not quite meet the minimum requirements >> in the LAN9221 datasheet. The timing in this patch solves problems >> noticed on some parts. The patch also combines the CS configuration >> for the overo and igep0020 boards per request. >> >> Signed-off-by: Philip Balister<philip@opensdr.com> >> --- >> Changes for v2: Added igep0020 board per Enric Balletbò i Serra. Compile >> tested only. >> >> arch/arm/include/asm/arch-omap3/omap_gpmc.h | 9 +++++++++ >> board/isee/igep0020/igep0020.c | 1 + >> board/isee/igep0020/igep0020.h | 9 --------- >> board/overo/overo.c | 1 + >> board/overo/overo.h | 9 --------- >> 5 files changed, 11 insertions(+), 18 deletions(-) >> >> diff --git a/arch/arm/include/asm/arch-omap3/omap_gpmc.h b/arch/arm/include/asm/arch-omap3/omap_gpmc.h >> index bd22bce..800e4ee 100644 >> --- a/arch/arm/include/asm/arch-omap3/omap_gpmc.h >> +++ b/arch/arm/include/asm/arch-omap3/omap_gpmc.h >> @@ -80,4 +80,13 @@ >> } >> #endif >> >> +/* GPMC CS configuration for an SMSC LAN9221 ethernet controller */ >> +#define NET_LAN9221_GPMC_CONFIG1 0x00001000 >> +#define NET_LAN9221_GPMC_CONFIG2 0x00060700 >> +#define NET_LAN9221_GPMC_CONFIG3 0x00020201 >> +#define NET_LAN9221_GPMC_CONFIG4 0x06000700 >> +#define NET_LAN9221_GPMC_CONFIG5 0x0006090A >> +#define NET_LAN9221_GPMC_CONFIG6 0x87030000 >> +#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c >> + >> #endif /* __ASM_ARCH_OMAP_GPMC_H */ >> diff --git a/board/isee/igep0020/igep0020.c b/board/isee/igep0020/igep0020.c >> index 36cc924..a5210c9 100644 >> --- a/board/isee/igep0020/igep0020.c >> +++ b/board/isee/igep0020/igep0020.c >> @@ -29,6 +29,7 @@ >> #include<asm/arch/mmc_host_def.h> >> #include<asm/arch/mux.h> >> #include<asm/arch/sys_proto.h> >> +#include<asm/arch/omap_gpmc.h> >> #include<asm/mach-types.h> >> #include "igep0020.h" >> >> diff --git a/board/isee/igep0020/igep0020.h b/board/isee/igep0020/igep0020.h >> index c08d758..3d6e15f 100644 >> --- a/board/isee/igep0020/igep0020.h >> +++ b/board/isee/igep0020/igep0020.h >> @@ -29,15 +29,6 @@ const omap3_sysinfo sysinfo = { >> "ONENAND", >> }; >> >> -/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */ >> -#define NET_LAN9221_GPMC_CONFIG1 0x00001000 >> -#define NET_LAN9221_GPMC_CONFIG2 0x00080701 >> -#define NET_LAN9221_GPMC_CONFIG3 0x00020201 >> -#define NET_LAN9221_GPMC_CONFIG4 0x08030703 >> -#define NET_LAN9221_GPMC_CONFIG5 0x00060908 >> -#define NET_LAN9221_GPMC_CONFIG6 0x87030000 >> -#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c >> - >> static void setup_net_chip(void); >> >> /* >> diff --git a/board/overo/overo.c b/board/overo/overo.c >> index 4eafdb1..bcd7d62 100644 >> --- a/board/overo/overo.c >> +++ b/board/overo/overo.c >> @@ -37,6 +37,7 @@ >> #include<asm/arch/mem.h> >> #include<asm/arch/sys_proto.h> >> #include<asm/arch/gpio.h> >> +#include<asm/arch/omap_gpmc.h> >> #include<asm/mach-types.h> >> #include "overo.h" >> >> diff --git a/board/overo/overo.h b/board/overo/overo.h >> index 68e1243..57f2457 100644 >> --- a/board/overo/overo.h >> +++ b/board/overo/overo.h >> @@ -33,15 +33,6 @@ const omap3_sysinfo sysinfo = { >> #endif >> }; >> >> -/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */ >> -#define NET_LAN9221_GPMC_CONFIG1 0x00001000 >> -#define NET_LAN9221_GPMC_CONFIG2 0x00080701 >> -#define NET_LAN9221_GPMC_CONFIG3 0x00020201 >> -#define NET_LAN9221_GPMC_CONFIG4 0x08030703 >> -#define NET_LAN9221_GPMC_CONFIG5 0x00060908 >> -#define NET_LAN9221_GPMC_CONFIG6 0x87030000 >> -#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c >> - >> /* >> * IEN - Input Enable >> * IDIS - Input Disable >> -- >> 1.7.4.4 >> >> > > Tested on igep0020 machine (aka IGEP v2). Thanks Philip > > Acked-by: Enric Balletbo i Serra<eballetbo@gmail.com> > Tested-by: Enric Balletbo i Serra<eballetbo@gmail.com> > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
On 09/11/2011 12:38 PM, Philip Balister wrote: > I see I should have copied a maintainer on this patch. Which tree will > this sort of path go upstream via? It seems like my choices are ARM of > OMAP3. > > I've got a number of other patches that should go upstream that are > Overo centric. In general, what route should they take upstream? Ping? Any tips for getting patched committed would be helpful, I'm sure I'm doing something wrong. Philip > > Philip > > On 09/09/2011 03:16 AM, Enric Balletbò i Serra wrote: >> 2011/9/9 Philip Balister<philip@balister.org>: >>> The existing timing does not quite meet the minimum requirements >>> in the LAN9221 datasheet. The timing in this patch solves problems >>> noticed on some parts. The patch also combines the CS configuration >>> for the overo and igep0020 boards per request. >>> >>> Signed-off-by: Philip Balister<philip@opensdr.com> >>> --- >>> Changes for v2: Added igep0020 board per Enric Balletbò i Serra. Compile >>> tested only. >>> >>> arch/arm/include/asm/arch-omap3/omap_gpmc.h | 9 +++++++++ >>> board/isee/igep0020/igep0020.c | 1 + >>> board/isee/igep0020/igep0020.h | 9 --------- >>> board/overo/overo.c | 1 + >>> board/overo/overo.h | 9 --------- >>> 5 files changed, 11 insertions(+), 18 deletions(-) >>> >>> diff --git a/arch/arm/include/asm/arch-omap3/omap_gpmc.h b/arch/arm/include/asm/arch-omap3/omap_gpmc.h >>> index bd22bce..800e4ee 100644 >>> --- a/arch/arm/include/asm/arch-omap3/omap_gpmc.h >>> +++ b/arch/arm/include/asm/arch-omap3/omap_gpmc.h >>> @@ -80,4 +80,13 @@ >>> } >>> #endif >>> >>> +/* GPMC CS configuration for an SMSC LAN9221 ethernet controller */ >>> +#define NET_LAN9221_GPMC_CONFIG1 0x00001000 >>> +#define NET_LAN9221_GPMC_CONFIG2 0x00060700 >>> +#define NET_LAN9221_GPMC_CONFIG3 0x00020201 >>> +#define NET_LAN9221_GPMC_CONFIG4 0x06000700 >>> +#define NET_LAN9221_GPMC_CONFIG5 0x0006090A >>> +#define NET_LAN9221_GPMC_CONFIG6 0x87030000 >>> +#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c >>> + >>> #endif /* __ASM_ARCH_OMAP_GPMC_H */ >>> diff --git a/board/isee/igep0020/igep0020.c b/board/isee/igep0020/igep0020.c >>> index 36cc924..a5210c9 100644 >>> --- a/board/isee/igep0020/igep0020.c >>> +++ b/board/isee/igep0020/igep0020.c >>> @@ -29,6 +29,7 @@ >>> #include<asm/arch/mmc_host_def.h> >>> #include<asm/arch/mux.h> >>> #include<asm/arch/sys_proto.h> >>> +#include<asm/arch/omap_gpmc.h> >>> #include<asm/mach-types.h> >>> #include "igep0020.h" >>> >>> diff --git a/board/isee/igep0020/igep0020.h b/board/isee/igep0020/igep0020.h >>> index c08d758..3d6e15f 100644 >>> --- a/board/isee/igep0020/igep0020.h >>> +++ b/board/isee/igep0020/igep0020.h >>> @@ -29,15 +29,6 @@ const omap3_sysinfo sysinfo = { >>> "ONENAND", >>> }; >>> >>> -/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */ >>> -#define NET_LAN9221_GPMC_CONFIG1 0x00001000 >>> -#define NET_LAN9221_GPMC_CONFIG2 0x00080701 >>> -#define NET_LAN9221_GPMC_CONFIG3 0x00020201 >>> -#define NET_LAN9221_GPMC_CONFIG4 0x08030703 >>> -#define NET_LAN9221_GPMC_CONFIG5 0x00060908 >>> -#define NET_LAN9221_GPMC_CONFIG6 0x87030000 >>> -#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c >>> - >>> static void setup_net_chip(void); >>> >>> /* >>> diff --git a/board/overo/overo.c b/board/overo/overo.c >>> index 4eafdb1..bcd7d62 100644 >>> --- a/board/overo/overo.c >>> +++ b/board/overo/overo.c >>> @@ -37,6 +37,7 @@ >>> #include<asm/arch/mem.h> >>> #include<asm/arch/sys_proto.h> >>> #include<asm/arch/gpio.h> >>> +#include<asm/arch/omap_gpmc.h> >>> #include<asm/mach-types.h> >>> #include "overo.h" >>> >>> diff --git a/board/overo/overo.h b/board/overo/overo.h >>> index 68e1243..57f2457 100644 >>> --- a/board/overo/overo.h >>> +++ b/board/overo/overo.h >>> @@ -33,15 +33,6 @@ const omap3_sysinfo sysinfo = { >>> #endif >>> }; >>> >>> -/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */ >>> -#define NET_LAN9221_GPMC_CONFIG1 0x00001000 >>> -#define NET_LAN9221_GPMC_CONFIG2 0x00080701 >>> -#define NET_LAN9221_GPMC_CONFIG3 0x00020201 >>> -#define NET_LAN9221_GPMC_CONFIG4 0x08030703 >>> -#define NET_LAN9221_GPMC_CONFIG5 0x00060908 >>> -#define NET_LAN9221_GPMC_CONFIG6 0x87030000 >>> -#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c >>> - >>> /* >>> * IEN - Input Enable >>> * IDIS - Input Disable >>> -- >>> 1.7.4.4 >>> >>> >> >> Tested on igep0020 machine (aka IGEP v2). Thanks Philip >> >> Acked-by: Enric Balletbo i Serra<eballetbo@gmail.com> >> Tested-by: Enric Balletbo i Serra<eballetbo@gmail.com> >> _______________________________________________ >> U-Boot mailing list >> U-Boot@lists.denx.de >> http://lists.denx.de/mailman/listinfo/u-boot > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
On Tue, Sep 13, 2011 at 9:54 AM, Philip Balister <philip@balister.org> wrote: > On 09/11/2011 12:38 PM, Philip Balister wrote: >> I see I should have copied a maintainer on this patch. Which tree will >> this sort of path go upstream via? It seems like my choices are ARM of >> OMAP3. >> >> I've got a number of other patches that should go upstream that are >> Overo centric. In general, what route should they take upstream? > > Ping? Any tips for getting patched committed would be helpful, I'm sure > I'm doing something wrong. Sandeep, is this a patch you can pull into either u-boot-ti/master or u-boot-ti/next? I believe it is just a bug fix and might be suitable to pull into the existing -rcX. > > Philip > >> >> Philip >> >> On 09/09/2011 03:16 AM, Enric Balletbò i Serra wrote: >>> 2011/9/9 Philip Balister<philip@balister.org>: >>>> The existing timing does not quite meet the minimum requirements >>>> in the LAN9221 datasheet. The timing in this patch solves problems >>>> noticed on some parts. The patch also combines the CS configuration >>>> for the overo and igep0020 boards per request. >>>> >>>> Signed-off-by: Philip Balister<philip@opensdr.com> >>>> --- >>>> Changes for v2: Added igep0020 board per Enric Balletbò i Serra. Compile >>>> tested only. >>>> >>>> arch/arm/include/asm/arch-omap3/omap_gpmc.h | 9 +++++++++ >>>> board/isee/igep0020/igep0020.c | 1 + >>>> board/isee/igep0020/igep0020.h | 9 --------- >>>> board/overo/overo.c | 1 + >>>> board/overo/overo.h | 9 --------- >>>> 5 files changed, 11 insertions(+), 18 deletions(-) >>>> >>>> diff --git a/arch/arm/include/asm/arch-omap3/omap_gpmc.h b/arch/arm/include/asm/arch-omap3/omap_gpmc.h >>>> index bd22bce..800e4ee 100644 >>>> --- a/arch/arm/include/asm/arch-omap3/omap_gpmc.h >>>> +++ b/arch/arm/include/asm/arch-omap3/omap_gpmc.h >>>> @@ -80,4 +80,13 @@ >>>> } >>>> #endif >>>> >>>> +/* GPMC CS configuration for an SMSC LAN9221 ethernet controller */ >>>> +#define NET_LAN9221_GPMC_CONFIG1 0x00001000 >>>> +#define NET_LAN9221_GPMC_CONFIG2 0x00060700 >>>> +#define NET_LAN9221_GPMC_CONFIG3 0x00020201 >>>> +#define NET_LAN9221_GPMC_CONFIG4 0x06000700 >>>> +#define NET_LAN9221_GPMC_CONFIG5 0x0006090A >>>> +#define NET_LAN9221_GPMC_CONFIG6 0x87030000 >>>> +#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c >>>> + >>>> #endif /* __ASM_ARCH_OMAP_GPMC_H */ >>>> diff --git a/board/isee/igep0020/igep0020.c b/board/isee/igep0020/igep0020.c >>>> index 36cc924..a5210c9 100644 >>>> --- a/board/isee/igep0020/igep0020.c >>>> +++ b/board/isee/igep0020/igep0020.c >>>> @@ -29,6 +29,7 @@ >>>> #include<asm/arch/mmc_host_def.h> >>>> #include<asm/arch/mux.h> >>>> #include<asm/arch/sys_proto.h> >>>> +#include<asm/arch/omap_gpmc.h> >>>> #include<asm/mach-types.h> >>>> #include "igep0020.h" >>>> >>>> diff --git a/board/isee/igep0020/igep0020.h b/board/isee/igep0020/igep0020.h >>>> index c08d758..3d6e15f 100644 >>>> --- a/board/isee/igep0020/igep0020.h >>>> +++ b/board/isee/igep0020/igep0020.h >>>> @@ -29,15 +29,6 @@ const omap3_sysinfo sysinfo = { >>>> "ONENAND", >>>> }; >>>> >>>> -/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */ >>>> -#define NET_LAN9221_GPMC_CONFIG1 0x00001000 >>>> -#define NET_LAN9221_GPMC_CONFIG2 0x00080701 >>>> -#define NET_LAN9221_GPMC_CONFIG3 0x00020201 >>>> -#define NET_LAN9221_GPMC_CONFIG4 0x08030703 >>>> -#define NET_LAN9221_GPMC_CONFIG5 0x00060908 >>>> -#define NET_LAN9221_GPMC_CONFIG6 0x87030000 >>>> -#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c >>>> - >>>> static void setup_net_chip(void); >>>> >>>> /* >>>> diff --git a/board/overo/overo.c b/board/overo/overo.c >>>> index 4eafdb1..bcd7d62 100644 >>>> --- a/board/overo/overo.c >>>> +++ b/board/overo/overo.c >>>> @@ -37,6 +37,7 @@ >>>> #include<asm/arch/mem.h> >>>> #include<asm/arch/sys_proto.h> >>>> #include<asm/arch/gpio.h> >>>> +#include<asm/arch/omap_gpmc.h> >>>> #include<asm/mach-types.h> >>>> #include "overo.h" >>>> >>>> diff --git a/board/overo/overo.h b/board/overo/overo.h >>>> index 68e1243..57f2457 100644 >>>> --- a/board/overo/overo.h >>>> +++ b/board/overo/overo.h >>>> @@ -33,15 +33,6 @@ const omap3_sysinfo sysinfo = { >>>> #endif >>>> }; >>>> >>>> -/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */ >>>> -#define NET_LAN9221_GPMC_CONFIG1 0x00001000 >>>> -#define NET_LAN9221_GPMC_CONFIG2 0x00080701 >>>> -#define NET_LAN9221_GPMC_CONFIG3 0x00020201 >>>> -#define NET_LAN9221_GPMC_CONFIG4 0x08030703 >>>> -#define NET_LAN9221_GPMC_CONFIG5 0x00060908 >>>> -#define NET_LAN9221_GPMC_CONFIG6 0x87030000 >>>> -#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c >>>> - >>>> /* >>>> * IEN - Input Enable >>>> * IDIS - Input Disable >>>> -- >>>> 1.7.4.4 >>>> >>>> >>> >>> Tested on igep0020 machine (aka IGEP v2). Thanks Philip >>> >>> Acked-by: Enric Balletbo i Serra<eballetbo@gmail.com> >>> Tested-by: Enric Balletbo i Serra<eballetbo@gmail.com> >>> _______________________________________________ >>> U-Boot mailing list >>> U-Boot@lists.denx.de >>> http://lists.denx.de/mailman/listinfo/u-boot >> >> _______________________________________________ >> U-Boot mailing list >> U-Boot@lists.denx.de >> http://lists.denx.de/mailman/listinfo/u-boot > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot >
> On 09/11/2011 12:38 PM, Philip Balister wrote: > > I see I should have copied a maintainer on this patch. Which tree will > > this sort of path go upstream via? It seems like my choices are ARM of > > OMAP3. > > > > I've got a number of other patches that should go upstream that are > > Overo centric. In general, what route should they take upstream? You can send them as soon as you are ready. > > Ping? Any tips for getting patched committed would be helpful, I'm sure > I'm doing something wrong. I'll apply it to u-boot-ti/next I'll setup a next branch soon. --Sandeep
> > On Tue, Sep 13, 2011 at 9:54 AM, Philip Balister <philip@balister.org> > wrote: > > On 09/11/2011 12:38 PM, Philip Balister wrote: > >> I see I should have copied a maintainer on this patch. Which tree will > >> this sort of path go upstream via? It seems like my choices are ARM of > >> OMAP3. > >> > >> I've got a number of other patches that should go upstream that are > >> Overo centric. In general, what route should they take upstream? > > > > Ping? Any tips for getting patched committed would be helpful, I'm sure > > I'm doing something wrong. > > Sandeep, is this a patch you can pull into either u-boot-ti/master or > u-boot-ti/next? I believe it is just a bug fix and might be suitable > to pull into the existing -rcX. > u-boot-ti/next
diff --git a/arch/arm/include/asm/arch-omap3/omap_gpmc.h b/arch/arm/include/asm/arch-omap3/omap_gpmc.h index bd22bce..800e4ee 100644 --- a/arch/arm/include/asm/arch-omap3/omap_gpmc.h +++ b/arch/arm/include/asm/arch-omap3/omap_gpmc.h @@ -80,4 +80,13 @@ } #endif +/* GPMC CS configuration for an SMSC LAN9221 ethernet controller */ +#define NET_LAN9221_GPMC_CONFIG1 0x00001000 +#define NET_LAN9221_GPMC_CONFIG2 0x00060700 +#define NET_LAN9221_GPMC_CONFIG3 0x00020201 +#define NET_LAN9221_GPMC_CONFIG4 0x06000700 +#define NET_LAN9221_GPMC_CONFIG5 0x0006090A +#define NET_LAN9221_GPMC_CONFIG6 0x87030000 +#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c + #endif /* __ASM_ARCH_OMAP_GPMC_H */ diff --git a/board/isee/igep0020/igep0020.c b/board/isee/igep0020/igep0020.c index 36cc924..a5210c9 100644 --- a/board/isee/igep0020/igep0020.c +++ b/board/isee/igep0020/igep0020.c @@ -29,6 +29,7 @@ #include <asm/arch/mmc_host_def.h> #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> +#include <asm/arch/omap_gpmc.h> #include <asm/mach-types.h> #include "igep0020.h" diff --git a/board/isee/igep0020/igep0020.h b/board/isee/igep0020/igep0020.h index c08d758..3d6e15f 100644 --- a/board/isee/igep0020/igep0020.h +++ b/board/isee/igep0020/igep0020.h @@ -29,15 +29,6 @@ const omap3_sysinfo sysinfo = { "ONENAND", }; -/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */ -#define NET_LAN9221_GPMC_CONFIG1 0x00001000 -#define NET_LAN9221_GPMC_CONFIG2 0x00080701 -#define NET_LAN9221_GPMC_CONFIG3 0x00020201 -#define NET_LAN9221_GPMC_CONFIG4 0x08030703 -#define NET_LAN9221_GPMC_CONFIG5 0x00060908 -#define NET_LAN9221_GPMC_CONFIG6 0x87030000 -#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c - static void setup_net_chip(void); /* diff --git a/board/overo/overo.c b/board/overo/overo.c index 4eafdb1..bcd7d62 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -37,6 +37,7 @@ #include <asm/arch/mem.h> #include <asm/arch/sys_proto.h> #include <asm/arch/gpio.h> +#include <asm/arch/omap_gpmc.h> #include <asm/mach-types.h> #include "overo.h" diff --git a/board/overo/overo.h b/board/overo/overo.h index 68e1243..57f2457 100644 --- a/board/overo/overo.h +++ b/board/overo/overo.h @@ -33,15 +33,6 @@ const omap3_sysinfo sysinfo = { #endif }; -/* GPMC CS 5 connected to an SMSC LAN9221 ethernet controller */ -#define NET_LAN9221_GPMC_CONFIG1 0x00001000 -#define NET_LAN9221_GPMC_CONFIG2 0x00080701 -#define NET_LAN9221_GPMC_CONFIG3 0x00020201 -#define NET_LAN9221_GPMC_CONFIG4 0x08030703 -#define NET_LAN9221_GPMC_CONFIG5 0x00060908 -#define NET_LAN9221_GPMC_CONFIG6 0x87030000 -#define NET_LAN9221_GPMC_CONFIG7 0x00000f6c - /* * IEN - Input Enable * IDIS - Input Disable
The existing timing does not quite meet the minimum requirements in the LAN9221 datasheet. The timing in this patch solves problems noticed on some parts. The patch also combines the CS configuration for the overo and igep0020 boards per request. Signed-off-by: Philip Balister <philip@opensdr.com> --- Changes for v2: Added igep0020 board per Enric Balletbò i Serra. Compile tested only. arch/arm/include/asm/arch-omap3/omap_gpmc.h | 9 +++++++++ board/isee/igep0020/igep0020.c | 1 + board/isee/igep0020/igep0020.h | 9 --------- board/overo/overo.c | 1 + board/overo/overo.h | 9 --------- 5 files changed, 11 insertions(+), 18 deletions(-)