Skip to content

Commit

Permalink
[POWERPC] Make EMAC use generic DCR access methods
Browse files Browse the repository at this point in the history
This patch makes the EMAC driver use the new DCR access methods. It
doesn't yet uses dcr_map() and thus still only work with real DCRs.
This will be fixed in a later patch

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Paul Mackerras committed Dec 4, 2006
1 parent 4c75a6f commit 1be3770
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/net/ibm_emac/ibm_emac_mal.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <linux/netdevice.h>

#include <asm/io.h>
#include <asm/dcr.h>

/*
* These MAL "versions" probably aren't the real versions IBM uses for these
Expand Down Expand Up @@ -191,6 +192,7 @@ struct mal_commac {

struct ibm_ocp_mal {
int dcrbase;
dcr_host_t dcrhost;

struct list_head poll_list;
struct net_device poll_dev;
Expand All @@ -207,12 +209,12 @@ struct ibm_ocp_mal {

static inline u32 get_mal_dcrn(struct ibm_ocp_mal *mal, int reg)
{
return mfdcr(mal->dcrbase + reg);
return dcr_read(mal->dcrhost, mal->dcrbase + reg);
}

static inline void set_mal_dcrn(struct ibm_ocp_mal *mal, int reg, u32 val)
{
mtdcr(mal->dcrbase + reg, val);
dcr_write(mal->dcrhost, mal->dcrbase + reg, val);
}

/* Register MAL devices */
Expand Down

0 comments on commit 1be3770

Please sign in to comment.