summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/altera_tse.c30
-rw-r--r--drivers/net/ar231x.c15
-rw-r--r--drivers/net/arc_emac.c8
-rw-r--r--drivers/net/cpsw.c8
-rw-r--r--drivers/net/cs8900.c6
-rw-r--r--drivers/net/davinci_emac.c24
-rw-r--r--drivers/net/designware.c8
-rw-r--r--drivers/net/dm9k.c15
-rw-r--r--drivers/net/ethoc.c8
-rw-r--r--drivers/net/fec_imx.c6
-rw-r--r--drivers/net/fec_mpc5200.c8
-rw-r--r--drivers/net/ks8851_mll.c16
-rw-r--r--drivers/net/macb.c8
-rw-r--r--drivers/net/smc91111.c8
-rw-r--r--drivers/net/smc911x.c6
-rw-r--r--drivers/net/xgmac.c6
16 files changed, 121 insertions, 59 deletions
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index a1863655fa..1e67c7a8e7 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -492,6 +492,7 @@ static int tse_init_dev(struct eth_device *edev)
static int tse_probe(struct device_d *dev)
{
+ struct resource *iores;
struct altera_tse_priv *priv;
struct mii_bus *miibus;
struct eth_device *edev;
@@ -516,9 +517,10 @@ static int tse_probe(struct device_d *dev)
edev->parent = dev;
#ifdef CONFIG_TSE_USE_DEDICATED_DESC_MEM
- tx_desc = dev_request_mem_region(dev, 3);
- if (IS_ERR(tx_desc))
- return PTR_ERR(tx_desc);
+ iores = dev_request_mem_resource(dev, 3);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ tx_desc = IOMEM(iores->start);
rx_desc = tx_desc + 2;
#else
tx_desc = dma_alloc_coherent(sizeof(*tx_desc) * (3 + PKTBUFSRX), (dma_addr_t *)&dma_handle);
@@ -534,15 +536,19 @@ static int tse_probe(struct device_d *dev)
memset(rx_desc, 0, (sizeof *rx_desc) * (PKTBUFSRX + 1));
memset(tx_desc, 0, (sizeof *tx_desc) * 2);
- priv->tse_regs = dev_request_mem_region(dev, 0);
- if (IS_ERR(priv->tse_regs))
- return PTR_ERR(priv->tse_regs);
- priv->sgdma_rx_regs = dev_request_mem_region(dev, 1);
- if (IS_ERR(priv->sgdma_rx_regs))
- return PTR_ERR(priv->sgdma_rx_regs);
- priv->sgdma_tx_regs = dev_request_mem_region(dev, 2);
- if (IS_ERR(priv->sgdma_tx_regs))
- return PTR_ERR(priv->sgdma_tx_regs);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->tse_regs = IOMEM(iores->start);
+ iores = dev_request_mem_resource(dev, 1);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->sgdma_rx_regs = IOMEM(iores->start);
+
+ iores = dev_request_mem_resource(dev, 2);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->sgdma_tx_regs = IOMEM(iores->start);
priv->rx_desc = rx_desc;
priv->tx_desc = tx_desc;
diff --git a/drivers/net/ar231x.c b/drivers/net/ar231x.c
index 7447c4484d..1ef9ce8154 100644
--- a/drivers/net/ar231x.c
+++ b/drivers/net/ar231x.c
@@ -363,6 +363,7 @@ static int ar231x_mdiibus_reset(struct mii_bus *bus)
static int ar231x_eth_probe(struct device_d *dev)
{
+ struct resource *iores;
struct ar231x_eth_priv *priv;
struct eth_device *edev;
struct mii_bus *miibus;
@@ -384,20 +385,22 @@ static int ar231x_eth_probe(struct device_d *dev)
priv->mac = pdata->mac;
priv->reset_bit = pdata->reset_bit;
- priv->eth_regs = dev_request_mem_region(dev, 0);
- if (IS_ERR(priv->eth_regs)) {
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores)) {
dev_err(dev, "No eth_regs!!\n");
- return PTR_ERR(priv->eth_regs);
+ return PTR_ERR(iores);
}
+ priv->eth_regs = IOMEM(iores->start);
/* we have 0x100000 for eth, part of it are dma regs.
* So they are already requested */
priv->dma_regs = (void *)(priv->eth_regs + 0x1000);
- priv->phy_regs = dev_request_mem_region(dev, 1);
- if (IS_ERR(priv->phy_regs)) {
+ iores = dev_request_mem_resource(dev, 1);
+ if (IS_ERR(iores)) {
dev_err(dev, "No phy_regs!!\n");
- return PTR_ERR(priv->phy_regs);
+ return PTR_ERR(iores);
}
+ priv->phy_regs = IOMEM(iores->start);
priv->cfg = pdata;
edev->init = ar231x_eth_init;
diff --git a/drivers/net/arc_emac.c b/drivers/net/arc_emac.c
index 3dc54cd22b..2155349e21 100644
--- a/drivers/net/arc_emac.c
+++ b/drivers/net/arc_emac.c
@@ -391,6 +391,7 @@ static int arc_emac_mdio_write(struct mii_bus *bus, int phy_addr, int reg_num,
static int arc_emac_probe(struct device_d *dev)
{
+ struct resource *iores;
struct eth_device *edev;
struct arc_emac_priv *priv;
unsigned long clock_frequency;
@@ -406,9 +407,10 @@ static int arc_emac_probe(struct device_d *dev)
miibus = xzalloc(sizeof(struct mii_bus));
priv = edev->priv;
- priv->regs = dev_request_mem_region(dev, 0);
- if (IS_ERR(priv->regs))
- return PTR_ERR(priv->regs);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->regs = IOMEM(iores->start);
priv->bus = miibus;
priv->clk = clk_get(dev, "hclk");
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
index 4d6b7b2e78..d11ca33f70 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@ -1126,6 +1126,7 @@ static int cpsw_probe_dt(struct cpsw_priv *priv)
int cpsw_probe(struct device_d *dev)
{
+ struct resource *iores;
struct cpsw_platform_data *data = (struct cpsw_platform_data *)dev->platform_data;
struct cpsw_priv *priv;
void __iomem *regs;
@@ -1136,9 +1137,10 @@ int cpsw_probe(struct device_d *dev)
dev_dbg(dev, "* %s\n", __func__);
- regs = dev_request_mem_region(dev, 0);
- if (IS_ERR(regs))
- return PTR_ERR(regs);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ regs = IOMEM(iores->start);
priv = xzalloc(sizeof(*priv));
priv->dev = dev;
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index a4a5dcaf7f..1be49e86fe 100644
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -435,13 +435,17 @@ static int cs8900_check_id(struct cs8900_priv *priv)
static int cs8900_probe(struct device_d *dev)
{
+ struct resource *iores;
struct eth_device *edev;
struct cs8900_priv *priv;
debug("cs8900_init()\n");
priv = (struct cs8900_priv *)xmalloc(sizeof(*priv));
- priv->regs = dev_request_mem_region(dev, 0);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->regs = IOMEM(iores->start);
if (cs8900_check_id(priv)) {
free(priv);
return -1;
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 9f8f0e1fa7..3dc4b16b67 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -516,6 +516,7 @@ out:
static int davinci_emac_probe(struct device_d *dev)
{
+ struct resource *iores;
struct davinci_emac_platform_data *pdata;
struct davinci_emac_priv *priv;
uint64_t start;
@@ -534,10 +535,25 @@ static int davinci_emac_probe(struct device_d *dev)
priv->dev = dev;
- priv->adap_emac = dev_request_mem_region(dev, 0);
- priv->adap_ewrap = dev_request_mem_region(dev, 1);
- priv->adap_mdio = dev_request_mem_region(dev, 2);
- priv->emac_desc_base = dev_request_mem_region(dev, 3);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->adap_emac = IOMEM(iores->start);
+
+ iores = dev_request_mem_resource(dev, 1);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->adap_ewrap = IOMEM(iores->start);
+
+ iores = dev_request_mem_resource(dev, 2);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->adap_mdio = IOMEM(iores->start);
+
+ iores = dev_request_mem_resource(dev, 3);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->emac_desc_base = IOMEM(iores->start);
/* EMAC descriptors */
priv->emac_rx_desc = priv->emac_desc_base + EMAC_RX_DESC_BASE;
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 966f64f7b6..3b21244478 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -445,6 +445,7 @@ static int dwc_probe_dt(struct device_d *dev, struct dw_eth_dev *priv)
static int dwc_ether_probe(struct device_d *dev)
{
+ struct resource *iores;
struct dw_eth_dev *priv;
struct eth_device *edev;
struct mii_bus *miibus;
@@ -471,9 +472,10 @@ static int dwc_ether_probe(struct device_d *dev)
return ret;
}
- base = dev_request_mem_region(dev, 0);
- if (IS_ERR(base))
- return PTR_ERR(base);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ base = IOMEM(iores->start);
priv->mac_regs_p = base;
dwc_version(dev, readl(&priv->mac_regs_p->version));
diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c
index d813c8c275..ad402e3efc 100644
--- a/drivers/net/dm9k.c
+++ b/drivers/net/dm9k.c
@@ -785,6 +785,7 @@ static int dm9000_parse_pdata(struct device_d *dev, struct dm9k *priv)
static int dm9k_probe(struct device_d *dev)
{
+ struct resource *iores;
unsigned io_mode;
struct eth_device *edev;
struct dm9k *priv;
@@ -808,17 +809,19 @@ static int dm9k_probe(struct device_d *dev)
if (ret)
goto err;
- priv->iodata = dev_request_mem_region(dev, 1);
- if (IS_ERR(priv->iodata)) {
- ret = PTR_ERR(priv->iodata);
+ iores = dev_request_mem_resource(dev, 1);
+ if (IS_ERR(iores)) {
+ ret = PTR_ERR(iores);
goto err;
}
+ priv->iodata = IOMEM(iores->start);
- priv->iobase = dev_request_mem_region(dev, 0);
- if (IS_ERR(priv->iobase)) {
- ret = PTR_ERR(priv->iobase);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores)) {
+ ret = PTR_ERR(iores);
goto err;
}
+ priv->iobase = IOMEM(iores->start);
edev->init = dm9k_init_dev;
edev->open = dm9k_eth_open;
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 6bae7d68a6..1cb9fc2859 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -534,6 +534,7 @@ static int ethoc_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)
static int ethoc_probe(struct device_d *dev)
{
+ struct resource *iores;
struct eth_device *edev;
struct ethoc *priv;
@@ -542,9 +543,10 @@ static int ethoc_probe(struct device_d *dev)
edev->priv = (struct ethoc *)(edev + 1);
priv = edev->priv;
- priv->iobase = dev_request_mem_region(dev, 0);
- if (IS_ERR(priv->iobase))
- return PTR_ERR(priv->iobase);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->iobase = IOMEM(iores->start);
priv->miibus.read = ethoc_mdio_read;
priv->miibus.write = ethoc_mdio_write;
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 5418034129..de31ec48bd 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -647,6 +647,7 @@ static int fec_probe_dt(struct device_d *dev, struct fec_priv *fec)
#endif
static int fec_probe(struct device_d *dev)
{
+ struct resource *iores;
struct fec_platform_data *pdata = (struct fec_platform_data *)dev->platform_data;
struct eth_device *edev;
struct fec_priv *fec;
@@ -681,7 +682,10 @@ static int fec_probe(struct device_d *dev)
clk_enable(fec->clk);
- fec->regs = dev_request_mem_region(dev, 0);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ fec->regs = IOMEM(iores->start);
phy_reset = of_get_named_gpio(dev->device_node, "phy-reset-gpios", 0);
if (gpio_is_valid(phy_reset)) {
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index 30be8f77dc..bb57c34502 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -638,6 +638,7 @@ static int mpc5xxx_fec_recv(struct eth_device *dev)
int mpc5xxx_fec_probe(struct device_d *dev)
{
+ struct resource *iores;
struct fec_platform_data *pdata = dev->platform_data;
struct eth_device *edev;
mpc5xxx_fec_priv *fec;
@@ -655,9 +656,10 @@ int mpc5xxx_fec_probe(struct device_d *dev)
edev->set_ethaddr = mpc5xxx_fec_set_ethaddr;
edev->parent = dev;
- fec->eth = dev_request_mem_region(dev, 0);
- if (IS_ERR(fec->eth))
- return PTR_ERR(fec->eth);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ fec->eth = IOMEM(iores->start);
fec->tbdBase = (FEC_TBD *)FEC_BD_BASE;
fec->rbdBase = (FEC_RBD *)(FEC_BD_BASE + FEC_TBD_NUM * sizeof(FEC_TBD));
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 854a666bfc..39e1654ca6 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -809,6 +809,7 @@ static void ks8851_eth_halt(struct eth_device *edev)
static int ks8851_probe(struct device_d *dev)
{
+ struct resource *iores;
struct eth_device *edev;
struct ks_net *ks;
u16 id;
@@ -823,13 +824,16 @@ static int ks8851_probe(struct device_d *dev)
return -ENODEV;
}
- ks->hw_addr = dev_request_mem_region(dev, 0);
- if (IS_ERR(ks->hw_addr))
- return PTR_ERR(ks->hw_addr);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ ks->hw_addr = IOMEM(iores->start);
+
+ iores = dev_request_mem_resource(dev, 1);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ ks->hw_addr_cmd = IOMEM(iores->start);
- ks->hw_addr_cmd = dev_request_mem_region(dev, 1);
- if (IS_ERR(ks->hw_addr_cmd))
- return PTR_ERR(ks->hw_addr_cmd);
ks->bus_width = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
edev->init = ks8851_init_dev;
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 6d4973fa2f..5f2e5e5131 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -612,6 +612,7 @@ static void macb_init_rx_buffer_size(struct macb_device *bp, size_t size)
static int macb_probe(struct device_d *dev)
{
+ struct resource *iores;
struct eth_device *edev;
struct macb_device *macb;
u32 ncfgr;
@@ -649,9 +650,10 @@ static int macb_probe(struct device_d *dev)
macb->phy_flags = pdata->phy_flags;
- macb->regs = dev_request_mem_region(dev, 0);
- if (IS_ERR(macb->regs))
- return PTR_ERR(macb->regs);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ macb->regs = IOMEM(iores->start);
/*
* Do some basic initialization so that we at least can talk
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 1199b372b6..b7055910eb 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -1444,6 +1444,7 @@ static int smc91c111_init_dev(struct eth_device *edev)
static int smc91c111_probe(struct device_d *dev)
{
+ struct resource *iores;
struct eth_device *edev;
struct smc91c111_priv *priv;
@@ -1481,9 +1482,10 @@ static int smc91c111_probe(struct device_d *dev)
priv->miibus.write = smc91c111_phy_write;
priv->miibus.priv = priv;
priv->miibus.parent = dev;
- priv->base = dev_request_mem_region(dev, 0);
- if (IS_ERR(priv->base))
- return PTR_ERR(priv->base);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->base = IOMEM(iores->start);
smc91c111_reset(edev);
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 60cf36ea4a..9b1a38ae21 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -494,6 +494,7 @@ static int smc911x_init_dev(struct eth_device *edev)
static int smc911x_probe(struct device_d *dev)
{
+ struct resource *iores;
struct eth_device *edev;
struct smc911x_priv *priv;
uint32_t val;
@@ -506,7 +507,10 @@ static int smc911x_probe(struct device_d *dev)
is_32bit = 1;
else
is_32bit = is_32bit == IORESOURCE_MEM_32BIT;
- priv->base = dev_request_mem_region(dev, 0);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ priv->base = IOMEM(iores->start);
if (pdata) {
priv->shift = pdata->shift;
diff --git a/drivers/net/xgmac.c b/drivers/net/xgmac.c
index 7cc4d4888f..47ab6e72eb 100644
--- a/drivers/net/xgmac.c
+++ b/drivers/net/xgmac.c
@@ -689,11 +689,15 @@ static int xgmac_set_ethaddr(struct eth_device *dev, const unsigned char *addr)
static int hb_xgmac_probe(struct device_d *dev)
{
+ struct resource *iores;
struct eth_device *edev;
struct xgmac_priv *priv;
void __iomem *base;
- base = dev_request_mem_region(dev, 0);
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ base = IOMEM(iores->start);
/* check hardware version */
if (readl(base + XGMAC_VERSION) != 0x1012)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 01:55:58 +0000