Remove kirkwood-specifics from marvell EHCI driver

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>

diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h
index 0035ed50a25902985c6b9bdd96343d31df9bdc4f..47771d5d70777f183533a0087835f9b166e3bfce 100644 (file)
--- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h
+++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h
@@ -65,6 +65,18 @@
 #define MVGBE0_BASE    KW_EGIGA0_BASE
 #define MVGBE1_BASE    KW_EGIGA1_BASE
 
+/* Kirkwood USB Host controller */
+#define MVUSB0_BASE                    KW_USB20_BASE
+#define MVUSB0_CPU_ATTR_DRAM_CS0       KWCPU_ATTR_DRAM_CS0
+#define MVUSB0_CPU_ATTR_DRAM_CS1       KWCPU_ATTR_DRAM_CS1
+#define MVUSB0_CPU_ATTR_DRAM_CS2       KWCPU_ATTR_DRAM_CS2
+#define MVUSB0_CPU_ATTR_DRAM_CS3       KWCPU_ATTR_DRAM_CS3
+
+/* Kirkwood CPU memory windows */
+#define MVCPU_WIN_CTRL_DATA    KWCPU_WIN_CTRL_DATA
+#define MVCPU_WIN_ENABLE       KWCPU_WIN_ENABLE
+#define MVCPU_WIN_DISABLE      KWCPU_WIN_DISABLE
+
 #if defined (CONFIG_KW88F6281)
 #include <asm/arch/kw88f6281.h>
 #elif defined (CONFIG_KW88F6192)

diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 6300587db02b37a9b4e809d10d6b9a3eb0e30720..e342d78b5752aa842c8efb8eb312156c50b3adf9 100644 (file)
--- 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)));