github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-11 08:03:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

modify for dm9000

Browse Source
This commit is contained in:
刘益星 2010-05-17 02:35:58 +00:00 committed by 黄涛
parent d822bb6817
commit a3cf55fe4e
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-rk2818/devices.c
View File

@ -198,17 +198,17 @@ struct platform_device rk2818_device_fb = {
/* DM9000 */
static struct resource dm9k_resource[] = {
[0] = {
.start = RK2818_NANDC_PHYS + 0x800 + 1*0x100, //nand_cs1
.end = RK2818_NANDC_PHYS + 0x800 + 1*0x100 + 3,
.start = RK2818_NANDC_PHYS + 0x800 + (1*0x100 + 0x8), //nand_cs1+nand_cmd
.end = RK2818_NANDC_PHYS + 0x800 + (1*0x100 + 0x8) + 3,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = RK2818_NANDC_PHYS + (0x800+1*0x100)+ 0x4,
.end = RK2818_NANDC_PHYS + (0x800+1*0x100)+ 0x4 + 3,
.start = RK2818_NANDC_PHYS + 0x800 + (1*0x100 + 0x4), //nand_cs1+nand_data
.end = RK2818_NANDC_PHYS + 0x800 + (1*0x100 + 0x4) + 3,
.flags = IORESOURCE_MEM,
},
[2] = {
.start = RK2818_PIN_PE2,//use pe2 as interrupt
.start = RK2818_PIN_PE2, //use pe2 as interrupt
.end = RK2818_PIN_PE2,
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
}

2
arch/arm/mach-rk2818/include/mach/rk2818_iomap.h
View File

@ -91,7 +91,7 @@
#define RK2818_NANDC_BASE 0xFF0AE000
#define RK2818_NANDC_PHYS 0x100AE000
#define RK2818_NANDC_SIZE SZ_8K
#define RK2818_NANDC_SIZE SZ_16K
#define RK2818_SDRAMC_BASE 0xFF0B0000
#define RK2818_SDRAMC_PHYS 0x100B0000

6
drivers/net/dm9000.c
View File

@ -911,8 +911,12 @@ dm9000_rx(struct net_device *dev)
/* Status check: this byte must be 0 or 1 */
if (rxbyte & DM9000_PKT_ERR) {
dev_warn(db->dev, "status check fail: %d\n", rxbyte);
#if 0
iow(db, DM9000_RCR, 0x00); /* Stop Device */
iow(db, DM9000_ISR, IMR_PAR); /* Stop INT request */
iow(db, DM9000_IMR, IMR_PAR); /* Stop INT request */
#else
dm9000_reset(db);
#endif
return;
}