summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-01-15 22:08:39 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-02-12 10:11:27 +0100
commit74d3442111bb5b899a4a6cfc825636f6a02055c0 (patch)
tree604eede525380b567b593de27ba2d7750ec71492 /drivers
parenta14bd41738de0b88c1b0f212a5571b6591d7f7bc (diff)
downloadu-boot-imx-74d3442111bb5b899a4a6cfc825636f6a02055c0.zip
u-boot-imx-74d3442111bb5b899a4a6cfc825636f6a02055c0.tar.gz
u-boot-imx-74d3442111bb5b899a4a6cfc825636f6a02055c0.tar.bz2
Remove kirkwood-specifics from marvell EHCI driver
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/host/ehci-marvell.c31
1 files changed, 17 insertions, 14 deletions
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 6300587..e342d78 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -30,8 +30,10 @@
#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
-#define rdl(off) readl(KW_USB20_BASE + (off))
-#define wrl(off, val) writel((val), KW_USB20_BASE + (off))
+DECLARE_GLOBAL_DATA_PTR;
+
+#define rdl(off) readl(MVUSB0_BASE + (off))
+#define wrl(off, val) writel((val), MVUSB0_BASE + (off))
#define USB_WINDOW_CTRL(i) (0x320 + ((i) << 4))
#define USB_WINDOW_BASE(i) (0x324 + ((i) << 4))
@@ -43,23 +45,23 @@
static void usb_brg_adrdec_setup(void)
{
int i;
- u32 size, attrib;
+ u32 size, base, attrib;
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
/* Enable DRAM bank */
switch (i) {
case 0:
- attrib = KWCPU_ATTR_DRAM_CS0;
+ attrib = MVUSB0_CPU_ATTR_DRAM_CS0;
break;
case 1:
- attrib = KWCPU_ATTR_DRAM_CS1;
+ attrib = MVUSB0_CPU_ATTR_DRAM_CS1;
break;
case 2:
- attrib = KWCPU_ATTR_DRAM_CS2;
+ attrib = MVUSB0_CPU_ATTR_DRAM_CS2;
break;
case 3:
- attrib = KWCPU_ATTR_DRAM_CS3;
+ attrib = MVUSB0_CPU_ATTR_DRAM_CS3;
break;
default:
/* invalide bank, disable access */
@@ -67,15 +69,16 @@ static void usb_brg_adrdec_setup(void)
break;
}
- size = kw_sdram_bs(i);
+ size = gd->bd->bi_dram[i].size;
+ base = gd->bd->bi_dram[i].start;
if ((size) && (attrib))
wrl(USB_WINDOW_CTRL(i),
- KWCPU_WIN_CTRL_DATA(size, USB_TARGET_DRAM,
- attrib, KWCPU_WIN_ENABLE));
+ MVCPU_WIN_CTRL_DATA(size, USB_TARGET_DRAM,
+ attrib, MVCPU_WIN_ENABLE));
else
- wrl(USB_WINDOW_CTRL(i), KWCPU_WIN_DISABLE);
+ wrl(USB_WINDOW_CTRL(i), MVCPU_WIN_DISABLE);
- wrl(USB_WINDOW_BASE(i), kw_sdram_bar(i));
+ wrl(USB_WINDOW_BASE(i), base);
}
}
@@ -87,11 +90,11 @@ int ehci_hcd_init(void)
{
usb_brg_adrdec_setup();
- hccr = (struct ehci_hccr *)(KW_USB20_BASE + 0x100);
+ hccr = (struct ehci_hccr *)(MVUSB0_BASE + 0x100);
hcor = (struct ehci_hcor *)((uint32_t) hccr
+ HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
- debug("Kirkwood-ehci: init hccr %x and hcor %x hc_length %d\n",
+ debug("ehci-marvell: init hccr %x and hcor %x hc_length %d\n",
(uint32_t)hccr, (uint32_t)hcor,
(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase)));