net: Use phys_addr_t instead of int

Ultrascale has IPs on 0xFXXX XXXX addresses that's why
unsigned types has to be used.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 101489c994760bf8bdaba0f7546fd941ca846a94..480888cf6591b6e1ad298fc5d69262252e66a11c 100644 (file)
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -487,7 +487,8 @@ static int zynq_gem_miiphy_write(const char *devname, uchar addr,
        return phywrite(dev, addr, reg, val);
 }
 
-int zynq_gem_initialize(bd_t *bis, int base_addr, int phy_addr, u32 emio)
+int zynq_gem_initialize(bd_t *bis, phys_addr_t base_addr,
+                       int phy_addr, u32 emio)
 {
        struct eth_device *dev;
        struct zynq_gem_priv *priv;
@@ -519,7 +520,7 @@ int zynq_gem_initialize(bd_t *bis, int base_addr, int phy_addr, u32 emio)
        priv->phyaddr = phy_addr;
        priv->emio = emio;
 
-       sprintf(dev->name, "Gem.%x", base_addr);
+       sprintf(dev->name, "Gem.%lx", base_addr);
 
        dev->iobase = base_addr;
 

diff --git a/include/net.h b/include/net.h
index 0802fad8761364d97f04a799e91d01ca4cd2eb06..016002daad214f34e9e26671d9793dcb14d023ff 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -81,7 +81,7 @@ enum eth_state_t {
 struct eth_device {
        char name[16];
        unsigned char enetaddr[6];
-       int iobase;
+       phys_addr_t iobase;
        int state;
 
        int  (*init) (struct eth_device *, bd_t *);

diff --git a/include/netdev.h b/include/netdev.h
index 32b5073ef025bb3e8d5e8b2bac0c3558236d0a25..9ed44c057d4a6656f1e8b197bb4d133aad7d1c44 100644 (file)
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -92,7 +92,8 @@ int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr,
 int xilinx_ll_temac_eth_init(bd_t *bis, unsigned long base_addr, int flags,
                                                unsigned long ctrl_addr);
 int zynq_gem_of_init(const void *blob);
-int zynq_gem_initialize(bd_t *bis, int base_addr, int phy_addr, u32 emio);
+int zynq_gem_initialize(bd_t *bis, phys_addr_t base_addr,
+                       int phy_addr, u32 emio);
 /*
  * As long as the Xilinx xps_ll_temac ethernet driver has not its own interface
  * exported by a public hader file, we need a global definition at this point.