mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 1/6 v2] dm9000: allow to specify that no srom is present
Date: Thu, 19 Aug 2010 08:40:29 +0200	[thread overview]
Message-ID: <1282200029-22420-1-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1282186110-32738-1-git-send-email-plagnioj@jcrosoft.com>

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
v2:

	keep set_ethaddr

Best Regards,
J.
 arch/arm/boards/scb9328/scb9328.c |    1 +
 drivers/net/dm9000.c              |    3 ++-
 include/dm9000.h                  |    1 +
 3 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/arm/boards/scb9328/scb9328.c b/arch/arm/boards/scb9328/scb9328.c
index e781393..3c04996 100644
--- a/arch/arm/boards/scb9328/scb9328.c
+++ b/arch/arm/boards/scb9328/scb9328.c
@@ -55,6 +55,7 @@ static struct dm9000_platform_data dm9000_data = {
 	.iobase   = 0x16000000,
 	.iodata   = 0x16000004,
 	.buswidth = DM9000_WIDTH_16,
+	.srom     = 1;
 };
 
 static struct device_d dm9000_dev = {
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 2062c66..ab06735 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -498,8 +498,9 @@ static int dm9000_probe(struct device_d *dev)
 	edev->send = dm9000_eth_send;
 	edev->recv = dm9000_eth_rx;
 	edev->halt = dm9000_eth_halt;
-	edev->get_ethaddr = dm9000_get_ethaddr;
 	edev->set_ethaddr = dm9000_set_ethaddr;
+	if (pdata->srom)
+		edev->get_ethaddr = dm9000_get_ethaddr;
 
 	/* RESET device */
 	dm9000_reset(priv);
diff --git a/include/dm9000.h b/include/dm9000.h
index 3cc5235..b4a04b1 100644
--- a/include/dm9000.h
+++ b/include/dm9000.h
@@ -10,6 +10,7 @@ struct dm9000_platform_data {
 	unsigned long iobase;
 	unsigned long iodata;
 	int buswidth;
+	int srom;
 };
 
 #endif /* __DM9000_H__ */
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2010-08-19  6:45 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-19  2:48 [PATCH 0/6] AT91 fies and new soc & board Jean-Christophe PLAGNIOL-VILLARD
2010-08-19  2:48 ` [PATCH 1/6] dm9000: allow to specify that no srom is present Jean-Christophe PLAGNIOL-VILLARD
2010-08-19  6:32   ` Sascha Hauer
2010-08-19  6:40   ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2010-08-19  6:42     ` [PATCH 1/6 v2] " Jean-Christophe PLAGNIOL-VILLARD
2010-08-19  2:48 ` [PATCH 2/6] at91: Introduction of at91sam9261 SOC Jean-Christophe PLAGNIOL-VILLARD
2010-08-19  6:52   ` Sascha Hauer
2010-08-19 15:42     ` Jean-Christophe PLAGNIOL-VILLARD
2010-08-19  2:48 ` [PATCH 3/6] at91: add Ronetix pm9261 board support Jean-Christophe PLAGNIOL-VILLARD
2010-08-19  2:48 ` [PATCH 4/6] at91: rename clocksource.c -> at91sam926x_time.c Jean-Christophe PLAGNIOL-VILLARD
2010-08-19  2:48 ` [PATCH 5/6] macb: introduce HAS_MACB configuration Jean-Christophe PLAGNIOL-VILLARD
2010-08-19  2:48 ` [PATCH 6/6] at91: remove non used and obsolete at91rm9200 code Jean-Christophe PLAGNIOL-VILLARD

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=1282200029-22420-1-git-send-email-plagnioj@jcrosoft.com \
    --to=plagnioj@jcrosoft.com \
    --cc=barebox@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