Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ac4ed9d authored by Gilles Chanteperdrix's avatar Gilles Chanteperdrix Committed by Russell King
Browse files

[NET] 5268/1: cs89x0: add support for i.MX31ADS ARM board. 



Add support for i.MX31ADS board to the cs89x0 ethernet driver.

Rework Kconfig options for the cs89x0 driver to reduce the #ifdef
clutter.

Signed-off-by: default avatarGilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b0dbcf51

drivers/net/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -1386,7 +1386,8 @@ config FORCEDETH_NAPI 


config CS89x0

	tristate "CS89x0 support"

	depends on NET_PCI && (ISA || MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X)

	depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \

		|| ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS)

	---help---

	  Support for CS89x0 chipset based Ethernet cards. If you have a

	  network (Ethernet) card of this type, say Y and read the
@@ -1397,6 +1398,11 @@ config CS89x0 
	  To compile this driver as a module, choose M here. The module

	  will be called cs89x0.



config CS89x0_NONISA_IRQ

	def_bool y

	depends on CS89x0 != n

	depends on MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_MX31ADS



config TC35815

	tristate "TOSHIBA TC35815 Ethernet support"

	depends on NET_PCI && PCI && MIPS

drivers/net/cs89x0.c

+10 −2
Original line number Diff line number Diff line
@@ -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)

#ifdef CONFIG_CS89x0_NONISA_IRQ

		        i = cs8900_irq_map[0];

#else

			/* Translate the IRQ using the IRQ mapping table. */
@@ -1029,6 +1035,7 @@ dma_rx(struct net_device *dev) 


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)

#ifndef CONFIG_CS89x0_NONISA_IRQ

		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",

                               dev->name, dev->irq, lp->irq_map);