On Tue, Aug 14, 2007 at 01:29:35PM +0200, Laurent Pinchart wrote:
> This patch adds a flag to the DM9000 platform data which, when set,
> configures the device to use an external PHY.
This patch applies with fuzz:
$ patch -p1 < ~/dm9000-external-phy.patch
patching file drivers/net/dm9000.c
Hunk #1 succeeded at 136 (offset 12 lines).
Hunk #2 succeeded at 529 (offset 15 lines).
Hunk #3 succeeded at 673 (offset 15 lines).
patching file include/linux/dm9000.h
> Signed-off-by: Laurent Pinchart <[EMAIL PROTECTED]>
> ---
> drivers/net/dm9000.c | 6 ++++++
> include/linux/dm9000.h | 1 +
> 2 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
> index ee578d9..820f0d3 100644
> --- a/drivers/net/dm9000.c
> +++ b/drivers/net/dm9000.c
> @@ -124,6 +124,7 @@ typedef struct board_info {
> u16 dbug_cnt;
> u8 io_mode; /* 0:word, 2:byte */
> u8 phy_addr;
> + unsigned int flags;
>
> void (*inblk)(void __iomem *port, void *data, int length);
> void (*outblk)(void __iomem *port, void *data, int length);
> @@ -513,6 +514,8 @@ dm9000_probe(struct platform_device *pdev)
>
> if (pdata->dumpblk != NULL)
> db->dumpblk = pdata->dumpblk;
> +
> + db->flags = pdata->flags;
> }
>
> dm9000_reset(db);
> @@ -655,6 +658,9 @@ dm9000_init_dm9000(struct net_device *dev)
> iow(db, DM9000_GPCR, GPCR_GEP_CNTL); /* Let GPIO0 output */
> iow(db, DM9000_GPR, 0); /* Enable PHY */
>
> + if (db->flags & DM9000_PLATF_EXT_PHY)
> + iow(db, DM9000_NCR, NCR_EXT_PHY);
> +
> /* Program operating register */
> iow(db, DM9000_TCR, 0); /* TX Polling clear */
> iow(db, DM9000_BPTR, 0x3f); /* Less 3Kb, 200us */
> diff --git a/include/linux/dm9000.h b/include/linux/dm9000.h
> index 0008e2a..ea530fd 100644
> --- a/include/linux/dm9000.h
> +++ b/include/linux/dm9000.h
> @@ -19,6 +19,7 @@
> #define DM9000_PLATF_8BITONLY (0x0001)
> #define DM9000_PLATF_16BITONLY (0x0002)
> #define DM9000_PLATF_32BITONLY (0x0004)
> +#define DM9000_PLATF_EXT_PHY (0x0008)
>
> /* platfrom data for platfrom device structure's platfrom_data field */
--
Ben ([EMAIL PROTECTED], http://www.fluff.org/)
'a smiley only costs 4 bytes'
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
