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

Commit 917f68f8 authored by Jon Ringle's avatar Jon Ringle Committed by Russell King
Browse files

[ARM] 2919/1: CS8900A ethernet driver modifications for the Comdial MP1000 



Patch from Jon Ringle

This patch gives support for the CS8900A ethernet chip on the Comdial MP1000

Signed-off-by: Jon Ringle
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0b83f140

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1330,7 +1330,7 @@ config FORCEDETH 


config CS89x0

	tristate "CS89x0 support"

	depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105

	depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105 || MACH_MP1000

	---help---

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

	  network (Ethernet) card of this type, say Y and read the

drivers/net/cs89x0.c

+13 −1
Original line number Diff line number Diff line
@@ -182,6 +182,10 @@ 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[] __initdata = {CIRRUS_DEFAULT_BASE, 0};

static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};

#elif defined(CONFIG_MACH_MP1000)

#include <asm/arch/mp1000-seprom.h>

static unsigned int netcard_portlist[] __initdata = {MP1000_EIO_BASE+0x300, 0};

static unsigned int cs8900_irq_map[] = {IRQ_EINT3,0,0,0};

#else

static unsigned int netcard_portlist[] __initdata =

   { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
@@ -590,6 +594,10 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) 
			cnt -= j;

		}

	} else

#elif defined(CONFIG_MACH_MP1000)

	if (1) {

		memcpy(dev->dev_addr, get_eeprom_mac_address(), ETH_ALEN);

	} else

#endif



        if ((readreg(dev, PP_SelfST) & (EEPROM_OK | EEPROM_PRESENT)) ==
@@ -649,6 +657,10 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) 
	if (1) {

		printk(KERN_NOTICE "cs89x0: No EEPROM on HiCO.SH4\n");

	} else

#elif defined(CONFIG_MACH_MP1000)

	if (1) {

		lp->force |= FORCE_RJ45;

	} else

#endif

	if ((readreg(dev, PP_SelfST) & EEPROM_PRESENT) == 0)

		printk(KERN_WARNING "cs89x0: No EEPROM, relying on command line....\n");
@@ -1231,7 +1243,7 @@ net_open(struct net_device *dev) 
	else

#endif

	{

#if !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX0105)

#if !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX0105) && !defined(CONFIG_MACH_MP1000)

		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);

drivers/net/cs89x0.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include <linux/config.h>



#if defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX0105)

#if defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX0105) || defined (CONFIG_MACH_MP1000)

/* IXDP2401/IXDP2801 uses dword-aligned register addressing */

#define CS89x0_PORT(reg) ((reg) * 2)

#else