leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DM9000: Add platform data to specify external phy

Browse Source 
Patch from: Laurent Pinchart <laurentp@cse-semaphore.com>

This patch adds a flag to the DM9000 platform data which, when set,
configures the device to use an external PHY.

Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
Signed-off-by: Ben Dooks <ben-linuy@fluff.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Ben Dooks 2008-02-05 00:02:01 +00:00 committed by Jeff Garzik
parent 931165739a
commit 33ba509191
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/dm9000.c
View File

@ -137,6 +137,7 @@ typedef struct board_info {
u16 dbug_cnt; u16 dbug_cnt;
u8 io_mode; /* 0:word, 2:byte */ u8 io_mode; /* 0:word, 2:byte */
u8 phy_addr; u8 phy_addr;
unsigned int flags;
void (*inblk)(void __iomem *port, void *data, int length); void (*inblk)(void __iomem *port, void *data, int length);
void (*outblk)(void __iomem *port, void *data, int length); void (*outblk)(void __iomem *port, void *data, int length);
@ -525,6 +526,8 @@ dm9000_probe(struct platform_device *pdev)
if (pdata->dumpblk != NULL) if (pdata->dumpblk != NULL)
db->dumpblk = pdata->dumpblk; db->dumpblk = pdata->dumpblk;
db->flags = pdata->flags;
} }
dm9000_reset(db); dm9000_reset(db);
@ -665,6 +668,9 @@ dm9000_init_dm9000(struct net_device *dev)
iow(db, DM9000_GPCR, GPCR_GEP_CNTL); /* Let GPIO0 output */ iow(db, DM9000_GPCR, GPCR_GEP_CNTL); /* Let GPIO0 output */
iow(db, DM9000_GPR, 0); /* Enable PHY */ iow(db, DM9000_GPR, 0); /* Enable PHY */
if (db->flags & DM9000_PLATF_EXT_PHY)
iow(db, DM9000_NCR, NCR_EXT_PHY);
/* Program operating register */ /* Program operating register */
iow(db, DM9000_TCR, 0); /* TX Polling clear */ iow(db, DM9000_TCR, 0); /* TX Polling clear */
iow(db, DM9000_BPTR, 0x3f); /* Less 3Kb, 200us */ iow(db, DM9000_BPTR, 0x3f); /* Less 3Kb, 200us */

1
include/linux/dm9000.h
View File

@ -19,6 +19,7 @@
#define DM9000_PLATF_8BITONLY (0x0001) #define DM9000_PLATF_8BITONLY (0x0001)
#define DM9000_PLATF_16BITONLY (0x0002) #define DM9000_PLATF_16BITONLY (0x0002)
#define DM9000_PLATF_32BITONLY (0x0004) #define DM9000_PLATF_32BITONLY (0x0004)
#define DM9000_PLATF_EXT_PHY (0x0008)
/* platfrom data for platfrom device structure's platfrom_data field */ /* platfrom data for platfrom device structure's platfrom_data field */