mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-18 16:08:53 +09:00
Merge branch 'phys_t' of git://www.denx.de/git/u-boot-microblaze
This commit is contained in:
commit
65afbbde6b
@ -20,7 +20,7 @@ extern void zynq_ddrc_init(void);
|
|||||||
extern unsigned int zynq_get_silicon_version(void);
|
extern unsigned int zynq_get_silicon_version(void);
|
||||||
|
|
||||||
/* Driver extern functions */
|
/* 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 int zynq_sdhci_of_init(const void *blob);
|
||||||
|
|
||||||
extern void ps7_init(void);
|
extern void ps7_init(void);
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#include <sdhci.h>
|
#include <sdhci.h>
|
||||||
#include <asm/arch/sys_proto.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;
|
struct sdhci_host *host = NULL;
|
||||||
|
|
||||||
@ -40,7 +40,7 @@ int zynq_sdhci_of_init(const void *blob)
|
|||||||
{
|
{
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
u32 ret = 0;
|
u32 ret = 0;
|
||||||
u32 reg;
|
phys_addr_t reg;
|
||||||
|
|
||||||
debug("ZYNQ SDHCI: Initialization\n");
|
debug("ZYNQ SDHCI: Initialization\n");
|
||||||
|
|
||||||
|
@ -231,7 +231,7 @@ static int ll_temac_init(struct eth_device *dev, bd_t *bis)
|
|||||||
struct ll_temac *ll_temac = dev->priv;
|
struct ll_temac *ll_temac = dev->priv;
|
||||||
int ret;
|
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);
|
dev->name, dev->index, dev->iobase);
|
||||||
|
|
||||||
if (!ll_temac_setup_ctrl(dev))
|
if (!ll_temac_setup_ctrl(dev))
|
||||||
|
@ -489,7 +489,8 @@ static int zynq_gem_miiphy_write(const char *devname, uchar addr,
|
|||||||
return phywrite(dev, addr, reg, val);
|
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 eth_device *dev;
|
||||||
struct zynq_gem_priv *priv;
|
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->phyaddr = phy_addr;
|
||||||
priv->emio = emio;
|
priv->emio = emio;
|
||||||
|
|
||||||
sprintf(dev->name, "Gem.%x", base_addr);
|
sprintf(dev->name, "Gem.%lx", base_addr);
|
||||||
|
|
||||||
dev->iobase = base_addr;
|
dev->iobase = base_addr;
|
||||||
|
|
||||||
|
@ -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,
|
int xilinx_ll_temac_eth_init(bd_t *bis, unsigned long base_addr, int flags,
|
||||||
unsigned long ctrl_addr);
|
unsigned long ctrl_addr);
|
||||||
int zynq_gem_of_init(const void *blob);
|
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
|
* 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.
|
* exported by a public hader file, we need a global definition at this point.
|
||||||
|
Loading…
Reference in New Issue
Block a user