summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-09-21 16:22:18 -0700
committerTom Rini <trini@ti.com>2012-09-21 16:22:18 -0700
commit9fe2cfb43aab2225a8c970a69341534b2488da8c (patch)
tree9dbb2228a729857375131191631c305732e4e4cc /drivers
parent495dbd72dd1172de866ba323263a5b62cf454972 (diff)
parentcf5787f2a4f1af71e72f4faaee32685c8f82a3dd (diff)
downloadu-boot-imx-9fe2cfb43aab2225a8c970a69341534b2488da8c.zip
u-boot-imx-9fe2cfb43aab2225a8c970a69341534b2488da8c.tar.gz
u-boot-imx-9fe2cfb43aab2225a8c970a69341534b2488da8c.tar.bz2
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/pci.c6
-rw-r--r--drivers/pci/pci_auto.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 2a6d0a7..d864f13 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -118,11 +118,11 @@ PCI_WRITE_VIA_DWORD_OP(word, u16, 0x02, 0x0000ffff)
void *pci_map_bar(pci_dev_t pdev, int bar, int flags)
{
pci_addr_t pci_bus_addr;
- pci_addr_t bar_response;
+ u32 bar_response;
/* read BAR address */
pci_read_config_dword(pdev, bar, &bar_response);
- pci_bus_addr = bar_response & ~0xf;
+ pci_bus_addr = (pci_addr_t)(bar_response & ~0xf);
/*
* Pass "0" as the length argument to pci_bus_to_virt. The arg
@@ -389,7 +389,7 @@ int pci_hose_config_device(struct pci_controller *hose,
pci_addr_t mem,
unsigned long command)
{
- pci_addr_t bar_response;
+ u32 bar_response;
unsigned int old_command;
pci_addr_t bar_value;
pci_size_t bar_size;
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index ae61e24..cd78030 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -89,7 +89,7 @@ void pciauto_setup_device(struct pci_controller *hose,
struct pci_region *prefetch,
struct pci_region *io)
{
- pci_addr_t bar_response;
+ u32 bar_response;
pci_size_t bar_size;
u16 cmdstat = 0;
int bar, bar_nr = 0;