From: Jeff Garzik <jeff@garzik.org>
To: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Cc: netdev@vger.kernel.org, Russell King <rmk@arm.linux.org.uk>,
Lennert Buytenhek <buytenh@wantstofly.org>
Subject: Re: [PATCH] cs89x0: add support for i.MX31ADS ARM board
Date: Sat, 13 Sep 2008 20:29:55 -0400 [thread overview]
Message-ID: <48CC5B03.2020003@garzik.org> (raw)
In-Reply-To: <489DD049.6020106@xenomai.org>
Gilles Chanteperdrix wrote:
> Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> ---
> diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
> index ea6144a..875a43d 100644
> --- a/drivers/net/cs89x0.c
> +++ b/drivers/net/cs89x0.c
> @@ -194,6 +194,12 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
> #define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */
> static unsigned int netcard_portlist[] __used __initdata = {CIRRUS_DEFAULT_BASE, 0};
> static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};
> +#elif defined(CONFIG_MACH_MX31ADS)
> +#include <mach/board-mx31ads.h>
> +static unsigned int netcard_portlist[] __used __initdata = {
> + PBC_BASE_ADDRESS + PBC_CS8900A_IOBASE + 0x300, 0
> +};
> +static unsigned cs8900_irq_map[] = {EXPIO_INT_ENET_INT, 0, 0, 0};
> #else
> static unsigned int netcard_portlist[] __used __initdata =
> { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
> @@ -802,7 +808,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
> } else {
> i = lp->isa_config & INT_NO_MASK;
> if (lp->chip_type == CS8900) {
> -#if defined(CONFIG_MACH_IXDP2351) || defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX010X)
> +#if defined(CONFIG_MACH_IXDP2351) || defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX010X) || defined(CONFIG_MACH_MX31ADS)
> i = cs8900_irq_map[0];
> #else
> /* Translate the IRQ using the IRQ mapping table. */
> @@ -1029,6 +1035,7 @@ skip_this_frame:
>
> void __init reset_chip(struct net_device *dev)
> {
> +#if !defined(CONFIG_MACH_MX31ADS)
> #if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)
> struct net_local *lp = netdev_priv(dev);
> int ioaddr = dev->base_addr;
> @@ -1057,6 +1064,7 @@ void __init reset_chip(struct net_device *dev)
> reset_start_time = jiffies;
> while( (readreg(dev, PP_SelfST) & INIT_DONE) == 0 && jiffies - reset_start_time < 2)
> ;
> +#endif /* !CONFIG_MACH_MX31ADS */
> }
>
>
> @@ -1304,7 +1312,7 @@ net_open(struct net_device *dev)
> else
> #endif
> {
> -#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X)
> +#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X) && !defined(CONFIG_MACH_MX31ADS)
> if (((1 << dev->irq) & lp->irq_map) == 0) {
> printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n",
I don't know enough about the arch to be able to ACK or NAK... pass
this through the appropriate arch maintainer tree please?
next prev parent reply other threads:[~2008-09-14 0:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-09 17:13 [PATCH] cs89x0: add support for i.MX31ADS ARM board Gilles Chanteperdrix
2008-09-14 0:29 ` Jeff Garzik [this message]
2008-09-14 12:03 ` Lennert Buytenhek
2008-09-14 14:13 ` Gilles Chanteperdrix
2008-09-16 12:44 ` Lennert Buytenhek
2008-09-16 12:47 ` Gilles Chanteperdrix
2008-09-16 12:52 ` Lennert Buytenhek
2008-09-16 12:54 ` Gilles Chanteperdrix
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=48CC5B03.2020003@garzik.org \
--to=jeff@garzik.org \
--cc=buytenh@wantstofly.org \
--cc=gilles.chanteperdrix@xenomai.org \
--cc=netdev@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
/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).