linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/13] omap: Overo: Fix support for second ethernet port
Date: Thu, 08 Jul 2010 16:54:38 +0300	[thread overview]
Message-ID: <20100708135438.26276.12585.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100708135342.26276.80936.stgit@baageli.muru.com>

From: Steve Sakoman <sakoman@gmail.com>

The original patch got truncated when applied from patchwork.kernel.org
as discussed at:

http://www.mail-archive.com/linux-omap at vger.kernel.org/msg28953.html

This patch supplies the missing chunks.

Signed-off-by: Steve Sakoman <sakoman@gmail.com>
[tony at atomide.com: added more info to the patch description]
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/board-overo.c |   42 +++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 79ac414..4ceeb56 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -166,9 +166,26 @@ static struct platform_device overo_smsc911x_device = {
 	},
 };
 
+static struct platform_device overo_smsc911x2_device = {
+	.name		= "smsc911x",
+	.id		= 1,
+	.num_resources	= ARRAY_SIZE(overo_smsc911x2_resources),
+	.resource	= overo_smsc911x2_resources,
+	.dev		= {
+		.platform_data = &overo_smsc911x_config,
+	},
+};
+
+static struct platform_device *smsc911x_devices[] = {
+	&overo_smsc911x_device,
+	&overo_smsc911x2_device,
+};
+
 static inline void __init overo_init_smsc911x(void)
 {
-	unsigned long cs_mem_base;
+	unsigned long cs_mem_base, cs_mem_base2;
+
+	/* set up first smsc911x chip */
 
 	if (gpmc_cs_request(OVERO_SMSC911X_CS, SZ_16M, &cs_mem_base) < 0) {
 		printk(KERN_ERR "Failed request for GPMC mem for smsc911x\n");
@@ -189,7 +206,28 @@ static inline void __init overo_init_smsc911x(void)
 	overo_smsc911x_resources[1].start = OMAP_GPIO_IRQ(OVERO_SMSC911X_GPIO);
 	overo_smsc911x_resources[1].end	  = 0;
 
-	platform_device_register(&overo_smsc911x_device);
+	/* set up second smsc911x chip */
+
+	if (gpmc_cs_request(OVERO_SMSC911X2_CS, SZ_16M, &cs_mem_base2) < 0) {
+		printk(KERN_ERR "Failed request for GPMC mem for smsc911x2\n");
+		return;
+	}
+
+	overo_smsc911x2_resources[0].start = cs_mem_base2 + 0x0;
+	overo_smsc911x2_resources[0].end   = cs_mem_base2 + 0xff;
+
+	if ((gpio_request(OVERO_SMSC911X2_GPIO, "SMSC911X2 IRQ") == 0) &&
+	    (gpio_direction_input(OVERO_SMSC911X2_GPIO) == 0)) {
+		gpio_export(OVERO_SMSC911X2_GPIO, 0);
+	} else {
+		printk(KERN_ERR "could not obtain gpio for SMSC911X2 IRQ\n");
+		return;
+	}
+
+	overo_smsc911x2_resources[1].start = OMAP_GPIO_IRQ(OVERO_SMSC911X2_GPIO);
+	overo_smsc911x2_resources[1].end   = 0;
+
+	platform_add_devices(smsc911x_devices, ARRAY_SIZE(smsc911x_devices));
 }
 
 #else

  parent reply	other threads:[~2010-07-08 13:54 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-08 13:54 [PATCH 00/13] omap updates for 2.6.36 merge window Tony Lindgren
2010-07-08 13:54 ` [PATCH 01/13] omap: Add back UART MDR1 check into uncompress.h Tony Lindgren
2010-07-08 13:54 ` [PATCH 02/13] omap1: omap7xx clocks, mux, serial fixes Tony Lindgren
2010-07-08 13:54 ` [PATCH 03/13] omap2: Fix GPIO numbers and smc91x for 2430sdp Tony Lindgren
2010-07-08 13:54 ` Tony Lindgren [this message]
2010-07-08 13:54 ` [PATCH 05/13] omap2/3: id: fix sparse warning Tony Lindgren
2010-07-08 13:54 ` [PATCH 06/13] omap3: Unify omap2_set_globals_3[43,6x]x functions Tony Lindgren
2010-07-08 13:54 ` [PATCH 07/13] omap3: introduce omap3_map_io Tony Lindgren
2010-07-08 13:54 ` [PATCH 08/13] omap: mux: fix multipath gpio handling Tony Lindgren
2010-07-08 13:54 ` [PATCH 09/13] omap: dma: Support for prefetch in destination synchronizedtransfer Tony Lindgren
2010-07-08 13:55 ` [PATCH 10/13] OMAP3: AM3505/3517 do not have IO wakeup capability Tony Lindgren
2010-07-08 13:55 ` [PATCH 11/13] omap: Add new interface omap_get_die_id Tony Lindgren
2010-07-08 13:55 ` [PATCH 12/13] omap: Use omap_get_die_id() to get the DIE ids Tony Lindgren
2010-07-08 13:55 ` [PATCH 13/13] omap: Devkit8000: Use DIE id to initialize dm9000 MAC address 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=20100708135438.26276.12585.stgit@baageli.muru.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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).