diff for duplicates of <20100519182727.GG5818@atomide.com> diff --git a/a/1.txt b/N1/1.txt index d4fc9dd..99a2f70 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,14 +2,14 @@ > 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 +> > 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(-) +> > ?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 @@ -17,39 +17,39 @@ > > +++ 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 +> > ?#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) +> > ?#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, -> > + }, +> > + ? ? ? { +> > + ? ? ? ? ? ? ? .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, +> > ?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 = { +> > ?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 ? ? ? ? ? ?= { > > > > -- > @@ -66,7 +66,7 @@ that contains some clues. > Original: > -> http://www.mail-archive.com/linux-omap@vger.kernel.org/msg26350.html +> http://www.mail-archive.com/linux-omap at vger.kernel.org/msg26350.html > > How would you like to handle getting the missing chuncks? @@ -77,7 +77,3 @@ 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 diff --git a/a/content_digest b/N1/content_digest index 90d153a..78f19c6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,26 +1,24 @@ "ref\020100505192957.21568.19569.stgit@baageli.muru.com\0" "ref\020100505193315.21568.55530.stgit@baageli.muru.com\0" "ref\0AANLkTinxHaxG89pUhD7nmMjQSF-p-FB1FWj_w-de9y1r@mail.gmail.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 14/18] omap: Overo: Add support for second ethernet port\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 14/18] omap: Overo: Add support for second ethernet port\0" "Date\0Wed, 19 May 2010 11:27:27 -0700\0" - "To\0Steve Sakoman <sakoman@gmail.com>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - " linux-omap@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Steve Sakoman <sakoman@gmail.com> [100518 06:36]:\n" "> On Wed, May 5, 2010 at 12:33 PM, Tony Lindgren <tony@atomide.com> wrote:\n" "> > From: Steve Sakoman <steve@sakoman.com>\n" "> >\n" - "> > Some Overo add-on boards include a second ethernet port. \302\240This patch\n" + "> > Some Overo add-on boards include a second ethernet port. ?This patch\n" "> > adds support for that second port.\n" "> >\n" "> > Signed-off-by: Steve Sakoman <steve@sakoman.com>\n" "> > Signed-off-by: Tony Lindgren <tony@atomide.com>\n" "> > ---\n" - "> > \302\240arch/arm/mach-omap2/board-overo.c | \302\240 14 +++++++++++++-\n" - "> > \302\2401 files changed, 13 insertions(+), 1 deletions(-)\n" + "> > ?arch/arm/mach-omap2/board-overo.c | ? 14 +++++++++++++-\n" + "> > ?1 files changed, 13 insertions(+), 1 deletions(-)\n" "> >\n" "> > diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c\n" "> > index 8848c7c..79ac414 100644\n" @@ -28,39 +26,39 @@ "> > +++ b/arch/arm/mach-omap2/board-overo.c\n" "> > @@ -63,6 +63,8 @@\n" "> >\n" - "> > \302\240#define OVERO_SMSC911X_CS \302\240 \302\240 \302\2405\n" - "> > \302\240#define OVERO_SMSC911X_GPIO \302\240 \302\240176\n" - "> > +#define OVERO_SMSC911X2_CS \302\240 \302\240 4\n" - "> > +#define OVERO_SMSC911X2_GPIO \302\240 65\n" + "> > ?#define OVERO_SMSC911X_CS ? ? ?5\n" + "> > ?#define OVERO_SMSC911X_GPIO ? ?176\n" + "> > +#define OVERO_SMSC911X2_CS ? ? 4\n" + "> > +#define OVERO_SMSC911X2_GPIO ? 65\n" "> >\n" - "> > \302\240#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \\\n" - "> > \302\240 \302\240 \302\240 \302\240defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)\n" + "> > ?#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \\\n" + "> > ? ? ? ?defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)\n" "> > @@ -137,6 +139,16 @@ static struct resource overo_smsc911x_resources[] = {\n" - "> > \302\240 \302\240 \302\240 \302\240},\n" - "> > \302\240};\n" + "> > ? ? ? ?},\n" + "> > ?};\n" "> >\n" "> > +static struct resource overo_smsc911x2_resources[] = {\n" - "> > + \302\240 \302\240 \302\240 {\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 .name \302\240 = \"smsc911x2-memory\",\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 .flags \302\240= IORESOURCE_MEM,\n" - "> > + \302\240 \302\240 \302\240 },\n" - "> > + \302\240 \302\240 \302\240 {\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 .flags \302\240= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,\n" - "> > + \302\240 \302\240 \302\240 },\n" + "> > + ? ? ? {\n" + "> > + ? ? ? ? ? ? ? .name ? = \"smsc911x2-memory\",\n" + "> > + ? ? ? ? ? ? ? .flags ?= IORESOURCE_MEM,\n" + "> > + ? ? ? },\n" + "> > + ? ? ? {\n" + "> > + ? ? ? ? ? ? ? .flags ?= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,\n" + "> > + ? ? ? },\n" "> > +};\n" "> > +\n" - "> > \302\240static struct smsc911x_platform_config overo_smsc911x_config = {\n" - "> > \302\240 \302\240 \302\240 \302\240.irq_polarity \302\240 = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,\n" - "> > \302\240 \302\240 \302\240 \302\240.irq_type \302\240 \302\240 \302\240 = SMSC911X_IRQ_TYPE_OPEN_DRAIN,\n" + "> > ?static struct smsc911x_platform_config overo_smsc911x_config = {\n" + "> > ? ? ? ?.irq_polarity ? = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,\n" + "> > ? ? ? ?.irq_type ? ? ? = SMSC911X_IRQ_TYPE_OPEN_DRAIN,\n" "> > @@ -146,7 +158,7 @@ static struct smsc911x_platform_config overo_smsc911x_config = {\n" "> >\n" - "> > \302\240static struct platform_device overo_smsc911x_device = {\n" - "> > \302\240 \302\240 \302\240 \302\240.name \302\240 \302\240 \302\240 \302\240 \302\240 = \"smsc911x\",\n" - "> > - \302\240 \302\240 \302\240 .id \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 = -1,\n" - "> > + \302\240 \302\240 \302\240 .id \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 = 0,\n" - "> > \302\240 \302\240 \302\240 \302\240.num_resources \302\240= ARRAY_SIZE(overo_smsc911x_resources),\n" - "> > \302\240 \302\240 \302\240 \302\240.resource \302\240 \302\240 \302\240 = overo_smsc911x_resources,\n" - "> > \302\240 \302\240 \302\240 \302\240.dev \302\240 \302\240 \302\240 \302\240 \302\240 \302\240= {\n" + "> > ?static struct platform_device overo_smsc911x_device = {\n" + "> > ? ? ? ?.name ? ? ? ? ? = \"smsc911x\",\n" + "> > - ? ? ? .id ? ? ? ? ? ? = -1,\n" + "> > + ? ? ? .id ? ? ? ? ? ? = 0,\n" + "> > ? ? ? ?.num_resources ?= ARRAY_SIZE(overo_smsc911x_resources),\n" + "> > ? ? ? ?.resource ? ? ? = overo_smsc911x_resources,\n" + "> > ? ? ? ?.dev ? ? ? ? ? ?= {\n" "> >\n" "> > --\n" "> \n" @@ -77,7 +75,7 @@ " \n" "> Original:\n" "> \n" - "> http://www.mail-archive.com/linux-omap@vger.kernel.org/msg26350.html\n" + "> http://www.mail-archive.com/linux-omap at vger.kernel.org/msg26350.html\n" "> \n" "> How would you like to handle getting the missing chuncks?\n" "\n" @@ -87,10 +85,6 @@ "\n" "Regards,\n" "\n" - "Tony\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Tony -c371679eeb5d9c833ff187c0e9145d380affa4f857bcd7609af3444204ca1b37 +f2aa4a47848b969e29437a4b7aeec83770ba796a00e186502a3008e08754d5a8
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.