linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Steve Sakoman <sakoman@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Subject: Re: [PATCH 14/18] omap: Overo: Add support for second ethernet port
Date: Wed, 19 May 2010 11:27:27 -0700	[thread overview]
Message-ID: <20100519182727.GG5818@atomide.com> (raw)
In-Reply-To: <AANLkTinxHaxG89pUhD7nmMjQSF-p-FB1FWj_w-de9y1r@mail.gmail.com>

* Steve Sakoman <sakoman@gmail.com> [100518 06:36]:
> On Wed, May 5, 2010 at 12:33 PM, Tony Lindgren <tony@atomide.com> wrote:
> > From: Steve Sakoman <steve@sakoman.com>
> >
> > Some Overo add-on boards include a second ethernet port.  This patch
> > adds support for that second port.
> >
> > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > ---
> >  arch/arm/mach-omap2/board-overo.c |   14 +++++++++++++-
> >  1 files changed, 13 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
> > index 8848c7c..79ac414 100644
> > --- a/arch/arm/mach-omap2/board-overo.c
> > +++ b/arch/arm/mach-omap2/board-overo.c
> > @@ -63,6 +63,8 @@
> >
> >  #define OVERO_SMSC911X_CS      5
> >  #define OVERO_SMSC911X_GPIO    176
> > +#define OVERO_SMSC911X2_CS     4
> > +#define OVERO_SMSC911X2_GPIO   65
> >
> >  #if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
> >        defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
> > @@ -137,6 +139,16 @@ static struct resource overo_smsc911x_resources[] = {
> >        },
> >  };
> >
> > +static struct resource overo_smsc911x2_resources[] = {
> > +       {
> > +               .name   = "smsc911x2-memory",
> > +               .flags  = IORESOURCE_MEM,
> > +       },
> > +       {
> > +               .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
> > +       },
> > +};
> > +
> >  static struct smsc911x_platform_config overo_smsc911x_config = {
> >        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
> >        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
> > @@ -146,7 +158,7 @@ static struct smsc911x_platform_config overo_smsc911x_config = {
> >
> >  static struct platform_device overo_smsc911x_device = {
> >        .name           = "smsc911x",
> > -       .id             = -1,
> > +       .id             = 0,
> >        .num_resources  = ARRAY_SIZE(overo_smsc911x_resources),
> >        .resource       = overo_smsc911x_resources,
> >        .dev            = {
> >
> > --
> 
> I just noticed that somehow a good portion of my original patch got
> dropped in this version!

It seems to be a patchwork issue, note how some of that got into the commit
message:

https://patchwork.kernel.org/patch/91277/

Might be worth investigating further, there's the mbox link there, maybe
that contains some clues.
 
> Original:
> 
> http://www.mail-archive.com/linux-omap@vger.kernel.org/msg26350.html
> 
> How would you like to handle getting the missing chuncks?

Can you please post your fix as a reply to this thread? I've already
merged the original patch into omap-for-linus, this is too late to
start messing with that.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  reply	other threads:[~2010-05-19 18:27 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-05 19:32 [PATCH 00/18] omap platform data and board updates for 2.6.35 merge window Tony Lindgren
2010-05-05 19:32 ` [PATCH 01/18] OMAP2/3: Add V4L2 DSS driver support in device.c Tony Lindgren
2010-05-05 19:32 ` [PATCH 02/18] omap1: amsdelta: defconfig updates Tony Lindgren
2010-05-05 19:32 ` [PATCH 03/18] omap2: Add I2C bus 1 initialisation for 2430sdp Tony Lindgren
2010-05-05 19:32 ` [PATCH 04/18] omap2: Add OHCI USB platform init for 2430 SDP Tony Lindgren
2010-05-05 19:32 ` [PATCH 05/18] omap2: select ARCH_OMAP_OTG for OMAP2430 SDP Tony Lindgren
2010-05-05 19:32 ` [PATCH 06/18] omap: Devkit8000: Add mux initialization Tony Lindgren
2010-05-05 19:32 ` [PATCH 07/18] omap: Devkit8000: Update default configuration Tony Lindgren
2010-05-05 19:32 ` [PATCH 08/18] can:ti_hecc: board specific hookup on AM3517EVM Tony Lindgren
2010-05-05 19:33 ` [PATCH 09/18] can:ti_hecc: Enable CAN support on AM3517 Tony Lindgren
2010-05-05 19:33 ` [PATCH 10/18] AM35xx EMAC : define submodule offsets Tony Lindgren
2010-05-05 19:33 ` [PATCH 11/18] AM35xx : Platform specific hookup for EMAC module Tony Lindgren
2010-05-05 19:33 ` [PATCH 12/18] OMAP3 : clock data: Update name string for EMAC clocks Tony Lindgren
2010-05-05 19:45   ` Russell King - ARM Linux
2010-05-05 20:02     ` Tony Lindgren
2010-05-10 20:17       ` Tony Lindgren
2010-05-05 19:33 ` [PATCH 13/18] AM3517 defconfig update : enable EMAC support Tony Lindgren
2010-05-05 19:33 ` [PATCH 14/18] omap: Overo: Add support for second ethernet port Tony Lindgren
2010-05-18 13:41   ` Steve Sakoman
2010-05-19 18:27     ` Tony Lindgren [this message]
2010-05-21 20:15       ` [PATCH 14/18 FIX] " Steve Sakoman
2010-05-31 12:31         ` [APPLIED] [PATCH 14/18 FIX] omap: Overo: Add support for second ethernet Tony Lindgren
2010-05-05 19:33 ` [PATCH 15/18] omap: rx51: Change the TWL4030 VMMC2 voltage constraints andsupply name Tony Lindgren
2010-05-05 19:33 ` [PATCH 16/18] omap: rx51: Add i2c2 board_info with tlv320aic3x Tony Lindgren
2010-05-05 19:33 ` [PATCH 17/18] omap: rx51: Add supplies for the tlv320aic3x codec driver Tony Lindgren
2010-05-06  6:57   ` Eduardo Valentin
2010-05-06  7:00     ` Eduardo Valentin
2010-05-18 10:00       ` Jarkko Nikula
2010-05-05 19:33 ` [PATCH 18/18] AM35x: fix UI card EHCI port and LCD dependency Tony Lindgren
2010-05-05 20:21 ` [PATCH 00/18] omap platform data and board updates for 2.6.35 merge window Koen Kooi
2010-05-05 21:09   ` Tony Lindgren
2010-05-06  7:27     ` Koen Kooi
2010-05-06  7:42     ` Tomi Valkeinen
2010-05-06 15:44       ` Tony Lindgren
2010-05-10  7:57         ` Tomi Valkeinen
2010-05-10 22:25           ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100519182727.GG5818@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=sakoman@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).