diff options
| author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2017-12-01 08:10:32 +0900 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2018-01-15 12:05:25 -0600 |
| commit | fbfb511548b686057e02f32ddf6e08a9e13206b8 (patch) | |
| tree | e1fae15ffae8cddb09c360fc4a934527742ef366 /drivers/net/sh_eth.h | |
| parent | 9b5f9ecf6e7e2af0d395e10323b14d77fc0c9a9b (diff) | |
| download | u-boot-fbfb511548b686057e02f32ddf6e08a9e13206b8.zip u-boot-fbfb511548b686057e02f32ddf6e08a9e13206b8.tar.gz u-boot-fbfb511548b686057e02f32ddf6e08a9e13206b8.tar.bz2 | |
net: sh-eth: Change read/write() param to struct sh_eth_info
This changes Change structure used in sh_eth_read and sh_eth_write function
from struct sh_eth_dev to struct sh_eth_info. This is necessary to convert
to Driver Model.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'drivers/net/sh_eth.h')
| -rw-r--r-- | drivers/net/sh_eth.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index a8339eb..a0dcfca 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h @@ -92,6 +92,7 @@ struct sh_eth_info { u8 phy_addr; struct eth_device *dev; struct phy_device *phydev; + void __iomem *iobase; }; struct sh_eth_dev { @@ -601,7 +602,7 @@ enum FIFO_SIZE_BIT { FIFO_SIZE_T = 0x00000700, FIFO_SIZE_R = 0x00000007, }; -static inline unsigned long sh_eth_reg_addr(struct sh_eth_dev *eth, +static inline unsigned long sh_eth_reg_addr(struct sh_eth_info *port, int enum_index) { #if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ) @@ -611,17 +612,17 @@ static inline unsigned long sh_eth_reg_addr(struct sh_eth_dev *eth, #else #error #endif - return BASE_IO_ADDR + reg_offset[enum_index] + 0x800 * eth->port; + return (unsigned long)port->iobase + reg_offset[enum_index]; } -static inline void sh_eth_write(struct sh_eth_dev *eth, unsigned long data, +static inline void sh_eth_write(struct sh_eth_info *port, unsigned long data, int enum_index) { - outl(data, sh_eth_reg_addr(eth, enum_index)); + outl(data, sh_eth_reg_addr(port, enum_index)); } -static inline unsigned long sh_eth_read(struct sh_eth_dev *eth, +static inline unsigned long sh_eth_read(struct sh_eth_info *port, int enum_index) { - return inl(sh_eth_reg_addr(eth, enum_index)); + return inl(sh_eth_reg_addr(port, enum_index)); } |