leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'phys_t' of git://www.denx.de/git/u-boot-microblaze

Browse Source
This commit is contained in:
Tom Rini 2015-01-22 09:51:18 -05:00
commit 65afbbde6b
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/arch-zynq/sys_proto.h
View File

@ -20,7 +20,7 @@ extern void zynq_ddrc_init(void);
extern unsigned int zynq_get_silicon_version(void);
/* Driver extern functions */
extern int zynq_sdhci_init(u32 regbase);
extern int zynq_sdhci_init(phys_addr_t regbase);
extern int zynq_sdhci_of_init(const void *blob);
extern void ps7_init(void);

4
drivers/mmc/zynq_sdhci.c
View File

@ -13,7 +13,7 @@
#include <sdhci.h>
#include <asm/arch/sys_proto.h>
int zynq_sdhci_init(u32 regbase)
int zynq_sdhci_init(phys_addr_t regbase)
{
struct sdhci_host *host = NULL;
@ -40,7 +40,7 @@ int zynq_sdhci_of_init(const void *blob)
{
int offset = 0;
u32 ret = 0;
u32 reg;
phys_addr_t reg;
debug("ZYNQ SDHCI: Initialization\n");

2
drivers/net/xilinx_ll_temac.c
View File

@ -231,7 +231,7 @@ static int ll_temac_init(struct eth_device *dev, bd_t *bis)
struct ll_temac *ll_temac = dev->priv;
int ret;
printf("%s: Xilinx XPS LocalLink Tri-Mode Ether MAC #%d at 0x%08X.\n",
printf("%s: Xilinx XPS LocalLink Tri-Mode Ether MAC #%d at 0x%08lx.\n",
dev->name, dev->index, dev->iobase);
if (!ll_temac_setup_ctrl(dev))

5
drivers/net/zynq_gem.c
View File

@ -489,7 +489,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;
@ -521,7 +522,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;

3
include/netdev.h
View File

@ -93,7 +93,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.