[ar71xx] remove duplicated includes
[openwrt.git] / target / linux / s3c24xx / patches-2.6.24 / 1049-qt2410-cs8900.patch.patch
1 From a1ad9949db4fa268e152e9b2efb2fa5932596d63 Mon Sep 17 00:00:00 2001
2 From: mokopatches <mokopatches@openmoko.org>
3 Date: Sun, 13 Apr 2008 07:23:49 +0100
4 Subject: [PATCH] qt2410-cs8900.patch
5
6 ---
7 drivers/net/Kconfig | 4 ++--
8 drivers/net/cs89x0.c | 14 +++++++++++++-
9 2 files changed, 15 insertions(+), 3 deletions(-)
10
11 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
12 index 9af05a2..272e0ec 100644
13 --- a/drivers/net/Kconfig
14 +++ b/drivers/net/Kconfig
15 @@ -1209,7 +1209,7 @@ source "drivers/net/ibm_newemac/Kconfig"
16
17 config NET_PCI
18 bool "EISA, VLB, PCI and on board controllers"
19 - depends on ISA || EISA || PCI
20 + depends on ISA || EISA || PCI || MACH_QT2410
21 help
22 This is another class of network cards which attach directly to the
23 bus. If you have one of those, say Y and read the Ethernet-HOWTO,
24 @@ -1385,7 +1385,7 @@ config FORCEDETH_NAPI
25
26 config CS89x0
27 tristate "CS89x0 support"
28 - depends on NET_PCI && (ISA || MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X)
29 + depends on NET_PCI && (ISA || MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_QT2410)
30 ---help---
31 Support for CS89x0 chipset based Ethernet cards. If you have a
32 network (Ethernet) card of this type, say Y and read the
33 diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
34 index 5717509..c6235e1 100644
35 --- a/drivers/net/cs89x0.c
36 +++ b/drivers/net/cs89x0.c
37 @@ -194,6 +194,10 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
38 #define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */
39 static unsigned int netcard_portlist[] __initdata = {CIRRUS_DEFAULT_BASE, 0};
40 static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};
41 +#elif defined(CONFIG_MACH_QT2410)
42 +#include <asm/arch/irqs.h>
43 +static unsigned int netcard_portlist [] __initdata = { 0xe0000300, 0 };
44 +static unsigned int cs8900_irq_map[] = { IRQ_EINT9, 0, 0, 0 };
45 #else
46 static unsigned int netcard_portlist[] __initdata =
47 { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
48 @@ -829,6 +833,14 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
49
50 printk(" IRQ %d", dev->irq);
51
52 + dev->dev_addr[0] = 0x00;
53 + dev->dev_addr[1] = 0x00;
54 + dev->dev_addr[2] = 0xc0;
55 + dev->dev_addr[3] = 0xff;
56 + dev->dev_addr[4] = 0xee;
57 + dev->dev_addr[5] = 0x08;
58 + set_mac_address(dev, dev->dev_addr);
59 +
60 #if ALLOW_DMA
61 if (lp->use_dma) {
62 get_dma_channel(dev);
63 @@ -1304,7 +1316,7 @@ net_open(struct net_device *dev)
64 else
65 #endif
66 {
67 -#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X)
68 +#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X) && !defined(CONFIG_MACH_QT2410)
69 if (((1 << dev->irq) & lp->irq_map) == 0) {
70 printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n",
71 dev->name, dev->irq, lp->irq_map);
72 --
73 1.5.6.5
74
This page took 0.056511 seconds and 5 git commands to generate.