Just fix compile error of drivers/net/smc91x.c for m32r.
It seems the previous patch (m32r-trivial-fix-of-smc91xh.patch) is too old.
So I will send a new patch.
Please drop the previous patch
( $ patch -R1 -p1 <m32r-trivial-fix-of-smc91xh.patch )
and apply the new one.
* drivers/net/smc91x.h:
- Add set_irq_type() macro to ignore it for m32r.
- Fix RPC_LSA_DEFAULT and RPC_LSB_DEFAULT for an M3T-M32700UT board.
Thanks.
Signed-off-by: Hirokazu Takata <[email protected]>
---
drivers/net/smc91x.h | 5 +++++
1 files changed, 5 insertions(+)
diff -u15 -rNp a/drivers/net/smc91x.h b/drivers/net/smc91x.h
--- a/drivers/net/smc91x.h 2004-10-12 18:26:28.000000000 +0900
+++ b/drivers/net/smc91x.h 2004-10-12 18:38:36.000000000 +0900
@@ -204,30 +204,35 @@ static inline void SMC_outsw (unsigned l
#define RPC_LSB_DEFAULT RPC_LED_100_10
#elif defined(CONFIG_M32R)
#define SMC_CAN_USE_8BIT 0
#define SMC_CAN_USE_16BIT 1
#define SMC_CAN_USE_32BIT 0
#define SMC_inb(a, r) inb((a) + (r) - 0xa0000000)
#define SMC_inw(a, r) inw((a) + (r) - 0xa0000000)
#define SMC_outb(v, a, r) outb(v, (a) + (r) - 0xa0000000)
#define SMC_outw(v, a, r) outw(v, (a) + (r) - 0xa0000000)
#define SMC_insw(a, r, p, l) insw((a) + (r) - 0xa0000000, p, l)
#define SMC_outsw(a, r, p, l) outsw((a) + (r) - 0xa0000000, p, l)
+#define set_irq_type(irq, type) do {} while(0)
+
+#define RPC_LSA_DEFAULT RPC_LED_TX_RX
+#define RPC_LSB_DEFAULT RPC_LED_100_10
+
#else
#define SMC_CAN_USE_8BIT 1
#define SMC_CAN_USE_16BIT 1
#define SMC_CAN_USE_32BIT 1
#define SMC_NOWAIT 1
#define SMC_inb(a, r) readb((a) + (r))
#define SMC_inw(a, r) readw((a) + (r))
#define SMC_inl(a, r) readl((a) + (r))
#define SMC_outb(v, a, r) writeb(v, (a) + (r))
#define SMC_outw(v, a, r) writew(v, (a) + (r))
#define SMC_outl(v, a, r) writel(v, (a) + (r))
#define SMC_insl(a, r, p, l) readsl((a) + (r), p, l)
#define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l)
--
Hirokazu Takata <[email protected]>
Linux/M32R Project: http://www.linux-m32r.org/
Hirokazu Takata wrote:
> Just fix compile error of drivers/net/smc91x.c for m32r.
>
> It seems the previous patch (m32r-trivial-fix-of-smc91xh.patch) is too old.
> So I will send a new patch.
>
> Please drop the previous patch
> ( $ patch -R1 -p1 <m32r-trivial-fix-of-smc91xh.patch )
> and apply the new one.
>
> * drivers/net/smc91x.h:
> - Add set_irq_type() macro to ignore it for m32r.
> - Fix RPC_LSA_DEFAULT and RPC_LSB_DEFAULT for an M3T-M32700UT board.
>
> Thanks.
>
> Signed-off-by: Hirokazu Takata <[email protected]>
Seems OK to me, I'll put it into my netdev queue.
For net driver patches, please always CC
* [email protected], and
* [email protected]
Jeff
Hello,
Sorry, I've changed my mind, according to the thread of
"[PATCH] net: fix smc91x build for sh/ppc" (Oct 12, 2004).
I prefer that set_irq_type() is snipped by CONFIG_ARM, too.
Please throw away this patch and retrieve the previous
m32r-trivial-fix-of-smc91xh.patch again,
if the above patch "[PATCH] net: fix smc91x build for sh/ppc" is applied.
Thank you.
From: Jeff Garzik <[email protected]>
Subject: Re: [PATCH 2.6.9-rc4-mm1] [m32r] Fix smc91x driver for m32r
Date: Tue, 12 Oct 2004 11:51:21 -0400
> Hirokazu Takata wrote:
> > Just fix compile error of drivers/net/smc91x.c for m32r.
> >
> > It seems the previous patch (m32r-trivial-fix-of-smc91xh.patch) is too old.
> > So I will send a new patch.
> >
> > Please drop the previous patch
> > ( $ patch -R1 -p1 <m32r-trivial-fix-of-smc91xh.patch )
> > and apply the new one.
> >
> > * drivers/net/smc91x.h:
> > - Add set_irq_type() macro to ignore it for m32r.
> > - Fix RPC_LSA_DEFAULT and RPC_LSB_DEFAULT for an M3T-M32700UT board.
> >
> > Thanks.
> >
> > Signed-off-by: Hirokazu Takata <[email protected]>
>
> Seems OK to me, I'll put it into my netdev queue.
>
> For net driver patches, please always CC
> * [email protected], and
> * [email protected]
>
> Jeff
-- Takata
Hirokazu Takata wrote:
> Please throw away this patch and retrieve the previous
> m32r-trivial-fix-of-smc91xh.patch again,
> if the above patch "[PATCH] net: fix smc91x build for sh/ppc" is applied.
Would you be kind enough to send me this patch?
Jeff
From: Jeff Garzik <[email protected]>
Subject: Re: [PATCH 2.6.9-rc4-mm1] [m32r] Fix smc91x driver for m32r
Date: Tue, 12 Oct 2004 22:08:11 -0400
> Hirokazu Takata wrote:
> > Please throw away this patch and retrieve the previous
> > m32r-trivial-fix-of-smc91xh.patch again,
> > if the above patch "[PATCH] net: fix smc91x build for sh/ppc" is applied.
>
>
> Would you be kind enough to send me this patch?
>
> Jeff
OK. I will send you again, Jeff.
This patch has been already applied to 2.6.9-rc4-mm1 kernel and
you can also find it as
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.9-rc4/2.6.9-rc4-mm1/broken-out/m32r-trivial-fix-of-smc91xh.patch
Thanks.
To: Andrew Morton <[email protected]>
Cc: [email protected], [email protected]
Subject: [PATCH 2.6.9-rc2-mm2] [m32r] Trivial fix of smc91x.h
----
Hello,
Here is a patch to fix smc91x.h for m32r.
Please apply.
Thanks.
* drivers/net/smc91x.h:
Fix LED control.
Signed-off-by: Hayato Fujiwara <[email protected]>
Signed-off-by: Hirokazu Takata <[email protected]>
---
smc91x.h | 3 +++
1 files changed, 3 insertions(+)
diff -ruNp a/drivers/net/smc91x.h b/drivers/net/smc91x.h
--- a/drivers/net/smc91x.h 2004-09-23 10:11:08.000000000 +0900
+++ b/drivers/net/smc91x.h 2004-09-23 13:16:42.000000000 +0900
@@ -216,6 +216,9 @@ static inline void SMC_outsw (unsigned l
#define SMC_insw(a, r, p, l) insw((a) + (r) - 0xa0000000, p, l)
#define SMC_outsw(a, r, p, l) outsw((a) + (r) - 0xa0000000, p, l)
+#define RPC_LSA_DEFAULT RPC_LED_TX_RX
+#define RPC_LSB_DEFAULT RPC_LED_100_10
+
#elif defined(CONFIG_MACH_LPD7A400) || defined(CONFIG_MACH_LPD7A404)
#include <asm/arch/constants.h> /* IOBARRIER_VIRT */
--
Hirokazu Takata <[email protected]>
Linux/M32R Project: http://www.linux-m32r.org/
Hirokazu Takata <[email protected]> wrote:
>
> This patch has been already applied to 2.6.9-rc4-mm1 kernel and
> you can also find it as
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.9-rc4/2.6.9-rc4-mm1/broken-out/m32r-trivial-fix-of-smc91xh.patch
Well actually:
smc91x-revert-11923358-m32r-modify-drivers-net-smc91xc.patch
smc91x-assorted-minor-cleanups.patch
smc91x-set-the-mac-addr-from-the-smc_enable-function.patch
smc91x-fold-smc_setmulticast-into-smc_set_multicast_list.patch
smc91x-simplify-register-bank-usage.patch
smc91x-move-tx-processing-out-of-irq-context-entirely.patch
smc91x-use-a-work-queue-to-reconfigure-the-phy-from.patch
smc91x-fix-possible-leak-of-the-skb-waiting-for-mem.patch
smc91x-display-pertinent-register-values-from-the.patch
smc91x-straighten-smp-locking.patch
smc91x-cosmetics.patch
m32r-trivial-fix-of-smc91xh.patch
smc91x-fix-smp-lock-usage.patch
smc91x-more-smp-locking-fixes.patch
smc91x-fix-compilation-with-dma-on-pxa2xx.patch
smc91x-receives-two-bytes-too-many.patch
smc91x-release-on-chip-rx-packet-memory-asap.patch
I'll unload all those onto Jeff...
On Tue, Oct 12, 2004 at 10:32:27PM -0700, Andrew Morton wrote:
> smc91x-assorted-minor-cleanups.patch
This patch removes a comment I added to satisfy Jeff's review which
explains how the link state is initialised - it probably isn't a good
idea to remove this.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
On Thu, 14 Oct 2004, Russell King wrote:
> On Tue, Oct 12, 2004 at 10:32:27PM -0700, Andrew Morton wrote:
> > smc91x-assorted-minor-cleanups.patch
>
> This patch removes a comment I added to satisfy Jeff's review which
> explains how the link state is initialised - it probably isn't a good
> idea to remove this.
It was just moved elsewhere.
Nicolas
> smc91x-revert-11923358-m32r-modify-drivers-net-smc91xc.patch
> smc91x-assorted-minor-cleanups.patch
> smc91x-set-the-mac-addr-from-the-smc_enable-function.patch
> smc91x-fold-smc_setmulticast-into-smc_set_multicast_list.patch
> smc91x-simplify-register-bank-usage.patch
> smc91x-move-tx-processing-out-of-irq-context-entirely.patch
> smc91x-use-a-work-queue-to-reconfigure-the-phy-from.patch
> smc91x-fix-possible-leak-of-the-skb-waiting-for-mem.patch
> smc91x-display-pertinent-register-values-from-the.patch
> smc91x-straighten-smp-locking.patch
> smc91x-cosmetics.patch
> m32r-trivial-fix-of-smc91xh.patch
> smc91x-fix-smp-lock-usage.patch
> smc91x-more-smp-locking-fixes.patch
> smc91x-fix-compilation-with-dma-on-pxa2xx.patch
> smc91x-receives-two-bytes-too-many.patch
> smc91x-release-on-chip-rx-packet-memory-asap.patch
>
> I'll unload all those onto Jeff...
I'll wait for these patches, and drop other smc91x patches...
Jeff