* [PATCH v2 1/2] CS89x0: Finish transition to CS89x0_NONISA_IRQ [not found] <20110314133302.137497490@gmail.com> @ 2011-03-14 13:46 ` Domenico Andreoli 2011-03-14 13:47 ` Domenico Andreoli 1 sibling, 0 replies; 4+ messages in thread From: Domenico Andreoli @ 2011-03-14 13:46 UTC (permalink / raw) To: linux-arm-kernel From: Domenico Andreoli <cavokz@gmail.com> CS89x0_NONISA_IRQ is selected by all those non-ISA boards which use CS89x0. This patch only cleans the last bits left after its introduction. Signed-off-by: Domenico Andreoli <cavokz@gmail.com> Index: arm-2.6.git/drivers/net/cs89x0.c =================================================================== --- arm-2.6.git.orig/drivers/net/cs89x0.c 2011-03-14 11:29:35.000000000 +0000 +++ arm-2.6.git/drivers/net/cs89x0.c 2011-03-14 11:35:11.000000000 +0000 @@ -943,10 +943,10 @@ static void __init reset_chip(struct net_device *dev) { #if !defined(CONFIG_MACH_MX31ADS) -#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) +#if !defined(CS89x0_NONISA_IRQ) struct net_local *lp = netdev_priv(dev); int ioaddr = dev->base_addr; -#endif +#endif /* CS89x0_NONISA_IRQ */ int reset_start_time; writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET); @@ -954,7 +954,7 @@ /* wait 30 ms */ msleep(30); -#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) +#if !defined(CS89x0_NONISA_IRQ) if (lp->chip_type != CS8900) { /* Hardware problem requires PNP registers to be reconfigured after a reset */ writeword(ioaddr, ADD_PORT, PP_CS8920_ISAINT); @@ -965,7 +965,7 @@ outb((dev->mem_start >> 16) & 0xff, ioaddr + DATA_PORT); outb((dev->mem_start >> 8) & 0xff, ioaddr + DATA_PORT + 1); } -#endif /* IXDP2x01 */ +#endif /* CS89x0_NONISA_IRQ */ /* Wait until the chip is reset */ reset_start_time = jiffies; ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] CS89x0: Finish transition to CS89x0_NONISA_IRQ @ 2011-03-14 13:46 ` Domenico Andreoli 0 siblings, 0 replies; 4+ messages in thread From: Domenico Andreoli @ 2011-03-14 13:46 UTC (permalink / raw) To: David S. Miller, Andrew Morton Cc: linux-arm-kernel, netdev, Domenico Andreoli [-- Attachment #1: cs89x0-finish-config-nonisa-irq-conversion --] [-- Type: text/plain, Size: 1526 bytes --] From: Domenico Andreoli <cavokz@gmail.com> CS89x0_NONISA_IRQ is selected by all those non-ISA boards which use CS89x0. This patch only cleans the last bits left after its introduction. Signed-off-by: Domenico Andreoli <cavokz@gmail.com> Index: arm-2.6.git/drivers/net/cs89x0.c =================================================================== --- arm-2.6.git.orig/drivers/net/cs89x0.c 2011-03-14 11:29:35.000000000 +0000 +++ arm-2.6.git/drivers/net/cs89x0.c 2011-03-14 11:35:11.000000000 +0000 @@ -943,10 +943,10 @@ static void __init reset_chip(struct net_device *dev) { #if !defined(CONFIG_MACH_MX31ADS) -#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) +#if !defined(CS89x0_NONISA_IRQ) struct net_local *lp = netdev_priv(dev); int ioaddr = dev->base_addr; -#endif +#endif /* CS89x0_NONISA_IRQ */ int reset_start_time; writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET); @@ -954,7 +954,7 @@ /* wait 30 ms */ msleep(30); -#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) +#if !defined(CS89x0_NONISA_IRQ) if (lp->chip_type != CS8900) { /* Hardware problem requires PNP registers to be reconfigured after a reset */ writeword(ioaddr, ADD_PORT, PP_CS8920_ISAINT); @@ -965,7 +965,7 @@ outb((dev->mem_start >> 16) & 0xff, ioaddr + DATA_PORT); outb((dev->mem_start >> 8) & 0xff, ioaddr + DATA_PORT + 1); } -#endif /* IXDP2x01 */ +#endif /* CS89x0_NONISA_IRQ */ /* Wait until the chip is reset */ reset_start_time = jiffies; ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] CS89x0: Add networking support for QQ2440 [not found] <20110314133302.137497490@gmail.com> @ 2011-03-14 13:47 ` Domenico Andreoli 2011-03-14 13:47 ` Domenico Andreoli 1 sibling, 0 replies; 4+ messages in thread From: Domenico Andreoli @ 2011-03-14 13:47 UTC (permalink / raw) To: linux-arm-kernel From: Domenico Andreoli <cavokz@gmail.com> QQ2440 is only another non-ISA board using CS89x0. This patch adds the minimum bits required to make QQ2440 work with CS89x0. Signed-off-by: Domenico Andreoli <cavokz@gmail.com> --- I'm working on another series that brings CS89x0 to the third millenium, it properly uses the modern ISA and platform drivers model. That series is a little more invasive and will require more testing than this one. arch/arm/mach-s3c2440/include/mach/qq2440.h | 22 ++++++++++++ arch/arm/mach-s3c2440/mach-qq2440.c | 16 ++++++++ drivers/net/Kconfig | 4 +- drivers/net/cs89x0.c | 33 ++++++++++++------ 4 files changed, 61 insertions(+), 14 deletions(-) Index: arm-2.6.git/drivers/net/cs89x0.c =================================================================== --- arm-2.6.git.orig/drivers/net/cs89x0.c 2011-02-07 17:04:06.000000000 +0000 +++ arm-2.6.git/drivers/net/cs89x0.c 2011-02-07 17:07:36.000000000 +0000 @@ -95,6 +95,9 @@ Dmitry Pervushin : dpervushin at ru.mvista.com : PNX010X platform support + Domenico Andreoli : cavokz at gmail.com + : QQ2440 platform support + */ /* Always include 'config.h' first in case the user wants to turn on @@ -176,6 +179,10 @@ #elif defined(CONFIG_ARCH_IXDP2X01) static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; +#elif defined(CONFIG_MACH_QQ2440) +#include <mach/qq2440.h> +static unsigned int netcard_portlist[] __used __initdata = { QQ2440_CS8900_VIRT_BASE + 0x300, 0 }; +static unsigned int cs8900_irq_map[] = { QQ2440_CS8900_IRQ, 0, 0, 0 }; #elif defined(CONFIG_MACH_MX31ADS) #include <mach/board-mx31ads.h> static unsigned int netcard_portlist[] __used __initdata = { @@ -521,6 +528,10 @@ #endif lp->force = g_cs89x0_media__force; #endif + +#if defined(CONFIG_MACH_QQ2440) + lp->force |= FORCE_RJ45 | FORCE_FULL; +#endif } /* Grab the region so we can find another board if autoIRQ fails. */ Index: arm-2.6.git/drivers/net/Kconfig =================================================================== --- arm-2.6.git.orig/drivers/net/Kconfig 2011-02-07 17:04:06.000000000 +0000 +++ arm-2.6.git/drivers/net/Kconfig 2011-02-07 17:04:42.000000000 +0000 @@ -1498,7 +1498,7 @@ config CS89x0 tristate "CS89x0 support" depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \ - || ARCH_IXDP2X01 || MACH_MX31ADS) + || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440) ---help--- Support for CS89x0 chipset based Ethernet cards. If you have a network (Ethernet) card of this type, say Y and read the @@ -1512,7 +1512,7 @@ config CS89x0_NONISA_IRQ def_bool y depends on CS89x0 != n - depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS + depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440 config TC35815 tristate "TOSHIBA TC35815 Ethernet support" ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] CS89x0: Add networking support for QQ2440 @ 2011-03-14 13:47 ` Domenico Andreoli 0 siblings, 0 replies; 4+ messages in thread From: Domenico Andreoli @ 2011-03-14 13:47 UTC (permalink / raw) To: David S. Miller, Andrew Morton Cc: linux-arm-kernel, netdev, Domenico Andreoli [-- Attachment #1: cs89x0-add-qq2440-support --] [-- Type: text/plain, Size: 3018 bytes --] From: Domenico Andreoli <cavokz@gmail.com> QQ2440 is only another non-ISA board using CS89x0. This patch adds the minimum bits required to make QQ2440 work with CS89x0. Signed-off-by: Domenico Andreoli <cavokz@gmail.com> --- I'm working on another series that brings CS89x0 to the third millenium, it properly uses the modern ISA and platform drivers model. That series is a little more invasive and will require more testing than this one. arch/arm/mach-s3c2440/include/mach/qq2440.h | 22 ++++++++++++ arch/arm/mach-s3c2440/mach-qq2440.c | 16 ++++++++ drivers/net/Kconfig | 4 +- drivers/net/cs89x0.c | 33 ++++++++++++------ 4 files changed, 61 insertions(+), 14 deletions(-) Index: arm-2.6.git/drivers/net/cs89x0.c =================================================================== --- arm-2.6.git.orig/drivers/net/cs89x0.c 2011-02-07 17:04:06.000000000 +0000 +++ arm-2.6.git/drivers/net/cs89x0.c 2011-02-07 17:07:36.000000000 +0000 @@ -95,6 +95,9 @@ Dmitry Pervushin : dpervushin@ru.mvista.com : PNX010X platform support + Domenico Andreoli : cavokz@gmail.com + : QQ2440 platform support + */ /* Always include 'config.h' first in case the user wants to turn on @@ -176,6 +179,10 @@ #elif defined(CONFIG_ARCH_IXDP2X01) static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; +#elif defined(CONFIG_MACH_QQ2440) +#include <mach/qq2440.h> +static unsigned int netcard_portlist[] __used __initdata = { QQ2440_CS8900_VIRT_BASE + 0x300, 0 }; +static unsigned int cs8900_irq_map[] = { QQ2440_CS8900_IRQ, 0, 0, 0 }; #elif defined(CONFIG_MACH_MX31ADS) #include <mach/board-mx31ads.h> static unsigned int netcard_portlist[] __used __initdata = { @@ -521,6 +528,10 @@ #endif lp->force = g_cs89x0_media__force; #endif + +#if defined(CONFIG_MACH_QQ2440) + lp->force |= FORCE_RJ45 | FORCE_FULL; +#endif } /* Grab the region so we can find another board if autoIRQ fails. */ Index: arm-2.6.git/drivers/net/Kconfig =================================================================== --- arm-2.6.git.orig/drivers/net/Kconfig 2011-02-07 17:04:06.000000000 +0000 +++ arm-2.6.git/drivers/net/Kconfig 2011-02-07 17:04:42.000000000 +0000 @@ -1498,7 +1498,7 @@ config CS89x0 tristate "CS89x0 support" depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \ - || ARCH_IXDP2X01 || MACH_MX31ADS) + || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440) ---help--- Support for CS89x0 chipset based Ethernet cards. If you have a network (Ethernet) card of this type, say Y and read the @@ -1512,7 +1512,7 @@ config CS89x0_NONISA_IRQ def_bool y depends on CS89x0 != n - depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS + depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440 config TC35815 tristate "TOSHIBA TC35815 Ethernet support" ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-14 13:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20110314133302.137497490@gmail.com>
2011-03-14 13:46 ` [PATCH v2 1/2] CS89x0: Finish transition to CS89x0_NONISA_IRQ Domenico Andreoli
2011-03-14 13:46 ` Domenico Andreoli
2011-03-14 13:47 ` [PATCH v2 2/2] CS89x0: Add networking support for QQ2440 Domenico Andreoli
2011-03-14 13:47 ` Domenico Andreoli
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.