aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/renesas/sh_eth.h
diff options
context:
space:
mode:
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>2011-09-27 17:48:58 -0400
committerDavid S. Miller <davem@davemloft.net>2011-09-28 13:41:50 -0400
commitae70644df780c0e87f1705fda932e7cb1bdb2074 (patch)
tree389689f9a84c511d99719d274f9cf8577a21e2ea /drivers/net/ethernet/renesas/sh_eth.h
parentfd734c6f25aea4b2b44b045e489aec67b388577e (diff)
net: sh_eth: use ioremap()
This patch also changes writel/readl to iowrite32/ioread32. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/renesas/sh_eth.h')
-rw-r--r--drivers/net/ethernet/renesas/sh_eth.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index c3048a6ba676..78e586ecdeaa 100644
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -762,6 +762,7 @@ struct sh_eth_private {
762 struct platform_device *pdev; 762 struct platform_device *pdev;
763 struct sh_eth_cpu_data *cd; 763 struct sh_eth_cpu_data *cd;
764 const u16 *reg_offset; 764 const u16 *reg_offset;
765 void __iomem *addr;
765 void __iomem *tsu_addr; 766 void __iomem *tsu_addr;
766 dma_addr_t rx_desc_dma; 767 dma_addr_t rx_desc_dma;
767 dma_addr_t tx_desc_dma; 768 dma_addr_t tx_desc_dma;
@@ -811,7 +812,7 @@ static inline void sh_eth_write(struct net_device *ndev, unsigned long data,
811{ 812{
812 struct sh_eth_private *mdp = netdev_priv(ndev); 813 struct sh_eth_private *mdp = netdev_priv(ndev);
813 814
814 writel(data, ndev->base_addr + mdp->reg_offset[enum_index]); 815 iowrite32(data, mdp->addr + mdp->reg_offset[enum_index]);
815} 816}
816 817
817static inline unsigned long sh_eth_read(struct net_device *ndev, 818static inline unsigned long sh_eth_read(struct net_device *ndev,
@@ -819,19 +820,19 @@ static inline unsigned long sh_eth_read(struct net_device *ndev,
819{ 820{
820 struct sh_eth_private *mdp = netdev_priv(ndev); 821 struct sh_eth_private *mdp = netdev_priv(ndev);
821 822
822 return readl(ndev->base_addr + mdp->reg_offset[enum_index]); 823 return ioread32(mdp->addr + mdp->reg_offset[enum_index]);
823} 824}
824 825
825static inline void sh_eth_tsu_write(struct sh_eth_private *mdp, 826static inline void sh_eth_tsu_write(struct sh_eth_private *mdp,
826 unsigned long data, int enum_index) 827 unsigned long data, int enum_index)
827{ 828{
828 writel(data, mdp->tsu_addr + mdp->reg_offset[enum_index]); 829 iowrite32(data, mdp->tsu_addr + mdp->reg_offset[enum_index]);
829} 830}
830 831
831static inline unsigned long sh_eth_tsu_read(struct sh_eth_private *mdp, 832static inline unsigned long sh_eth_tsu_read(struct sh_eth_private *mdp,
832 int enum_index) 833 int enum_index)
833{ 834{
834 return readl(mdp->tsu_addr + mdp->reg_offset[enum_index]); 835 return ioread32(mdp->tsu_addr + mdp->reg_offset[enum_index]);
835} 836}
836 837
837#endif /* #ifndef __SH_ETH_H__ */ 838#endif /* #ifndef __SH_ETH_H__ */