diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-15 18:56:24 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-15 18:56:24 -0400 |
commit | 9c94e0a64490b90d48995a8230499167c0bdca68 (patch) | |
tree | ac81e19a3fd7733923bb272757fa8243134d1cb9 /drivers/net/ti/cpsw_mdio.c | |
parent | 6674dc77c2f735ec9bc02434626125698d2755ff (diff) | |
parent | 0dc97fc3d8cd8c4154f63c9ea74f5e73ee48fa6c (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/ti/cpsw_mdio.c')
-rw-r--r-- | drivers/net/ti/cpsw_mdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ti/cpsw_mdio.c b/drivers/net/ti/cpsw_mdio.c index 70f547e6d7..6e8f652011 100644 --- a/drivers/net/ti/cpsw_mdio.c +++ b/drivers/net/ti/cpsw_mdio.c @@ -125,7 +125,7 @@ u32 cpsw_mdio_get_alive(struct mii_dev *bus) return val & GENMASK(15, 0); } -struct mii_dev *cpsw_mdio_init(const char *name, u32 mdio_base, +struct mii_dev *cpsw_mdio_init(const char *name, phys_addr_t mdio_base, u32 bus_freq, int fck_freq) { struct cpsw_mdio *cpsw_mdio; @@ -144,7 +144,7 @@ struct mii_dev *cpsw_mdio_init(const char *name, u32 mdio_base, return NULL; } - cpsw_mdio->regs = (struct cpsw_mdio_regs *)mdio_base; + cpsw_mdio->regs = (struct cpsw_mdio_regs *)(uintptr_t)mdio_base; if (!bus_freq || !fck_freq) cpsw_mdio->div = CPSW_MDIO_DIV_DEF; |