projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
drivers
/
ata
/
ahci.c
diff --git
a/drivers/ata/ahci.c
b/drivers/ata/ahci.c
index 188d8431975056b5c2e5680ad6557b2d91b4357f..e3135bb75fddb303cd3e826f02926df0c25e2cfe 100644
(file)
--- a/
drivers/ata/ahci.c
+++ b/
drivers/ata/ahci.c
@@
-55,17
+55,6
@@
__weak void __iomem *ahci_port_base(void __iomem *base, u32 port)
return base + 0x100 + (port * 0x80);
}
return base + 0x100 + (port * 0x80);
}
-
-static void ahci_setup_port(struct ahci_ioports *port, void __iomem *base,
- unsigned int port_idx)
-{
- base = ahci_port_base(base, port_idx);
-
- port->cmd_addr = base;
- port->scr_addr = base + PORT_SCR;
-}
-
-
#define msleep(a) udelay(a * 1000)
static void ahci_dcache_flush_range(unsigned long begin, unsigned long len)
#define msleep(a) udelay(a * 1000)
static void ahci_dcache_flush_range(unsigned long begin, unsigned long len)
@@
-240,7
+229,6
@@
static int ahci_host_init(struct ahci_uc_priv *uc_priv)
continue;
uc_priv->port[i].port_mmio = ahci_port_base(mmio, i);
port_mmio = (u8 *)uc_priv->port[i].port_mmio;
continue;
uc_priv->port[i].port_mmio = ahci_port_base(mmio, i);
port_mmio = (u8 *)uc_priv->port[i].port_mmio;
- ahci_setup_port(&uc_priv->port[i], mmio, i);
/* make sure port is not active */
tmp = readl(port_mmio + PORT_CMD);
/* make sure port is not active */
tmp = readl(port_mmio + PORT_CMD);