aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/fs_enet/mii-fec.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/fs_enet/mii-fec.c')
-rw-r--r--drivers/net/fs_enet/mii-fec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index f91c38d0b57b..a89cf15090b8 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -70,7 +70,7 @@ static int match_has_phy (struct device *dev, void* data)
70static int fs_mii_fec_init(struct fec_info* fec, struct fs_mii_fec_platform_info *fmpi) 70static int fs_mii_fec_init(struct fec_info* fec, struct fs_mii_fec_platform_info *fmpi)
71{ 71{
72 struct resource *r; 72 struct resource *r;
73 fec_t *fecp; 73 fec_t __iomem *fecp;
74 char* name = "fsl-cpm-fec"; 74 char* name = "fsl-cpm-fec";
75 75
76 /* we need fec in order to be useful */ 76 /* we need fec in order to be useful */
@@ -85,7 +85,7 @@ static int fs_mii_fec_init(struct fec_info* fec, struct fs_mii_fec_platform_info
85 85
86 r = platform_get_resource_byname(fec_pdev, IORESOURCE_MEM, "regs"); 86 r = platform_get_resource_byname(fec_pdev, IORESOURCE_MEM, "regs");
87 87
88 fec->fecp = fecp = (fec_t*)ioremap(r->start,sizeof(fec_t)); 88 fec->fecp = fecp = ioremap(r->start,sizeof(fec_t));
89 fec->mii_speed = fmpi->mii_speed; 89 fec->mii_speed = fmpi->mii_speed;
90 90
91 setbits32(&fecp->fec_r_cntrl, FEC_RCNTRL_MII_MODE); /* MII enable */ 91 setbits32(&fecp->fec_r_cntrl, FEC_RCNTRL_MII_MODE); /* MII enable */
@@ -100,7 +100,7 @@ static int fs_mii_fec_init(struct fec_info* fec, struct fs_mii_fec_platform_info
100static int fs_enet_fec_mii_read(struct mii_bus *bus , int phy_id, int location) 100static int fs_enet_fec_mii_read(struct mii_bus *bus , int phy_id, int location)
101{ 101{
102 struct fec_info* fec = bus->priv; 102 struct fec_info* fec = bus->priv;
103 fec_t *fecp = fec->fecp; 103 fec_t __iomem *fecp = fec->fecp;
104 int i, ret = -1; 104 int i, ret = -1;
105 105
106 if ((in_be32(&fecp->fec_r_cntrl) & FEC_RCNTRL_MII_MODE) == 0) 106 if ((in_be32(&fecp->fec_r_cntrl) & FEC_RCNTRL_MII_MODE) == 0)
@@ -124,7 +124,7 @@ static int fs_enet_fec_mii_read(struct mii_bus *bus , int phy_id, int location)
124static int fs_enet_fec_mii_write(struct mii_bus *bus, int phy_id, int location, u16 val) 124static int fs_enet_fec_mii_write(struct mii_bus *bus, int phy_id, int location, u16 val)
125{ 125{
126 struct fec_info* fec = bus->priv; 126 struct fec_info* fec = bus->priv;
127 fec_t *fecp = fec->fecp; 127 fec_t __iomem *fecp = fec->fecp;
128 int i; 128 int i;
129 129
130 /* this must never happen */ 130 /* this must never happen */