random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-18 06:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

usb: ehci-marvell: Drop wrl accessor function

Browse Source 
This patch removes the wrl accessor function from the Marvell EHCI
driver by replacing it with the writel function.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Marek Vasut <marex@denx.de>
This commit is contained in:
Stefan Roese 2015-07-22 10:01:30 +02:00 committed by Marek Vasut
parent a588d99ac1
commit 82b9143bf8
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/usb/host/ehci-marvell.c
View File

@ -21,9 +21,6 @@
DECLARE_GLOBAL_DATA_PTR; 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_CTRL(i) (0x320 + ((i) << 4))
#define USB_WINDOW_BASE(i) (0x324 + ((i) << 4)) #define USB_WINDOW_BASE(i) (0x324 + ((i) << 4))
#define USB_TARGET_DRAM 0x0 #define USB_TARGET_DRAM 0x0
@ -48,20 +45,20 @@ static void usb_brg_adrdec_setup(void)
dram = mvebu_mbus_dram_info(); dram = mvebu_mbus_dram_info();
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
wrl(USB_WINDOW_CTRL(i), 0); writel(0, MVUSB0_BASE + USB_WINDOW_CTRL(i));
wrl(USB_WINDOW_BASE(i), 0); writel(0, MVUSB0_BASE + USB_WINDOW_BASE(i));
} }
for (i = 0; i < dram->num_cs; i++) { for (i = 0; i < dram->num_cs; i++) {
const struct mbus_dram_window *cs = dram->cs + i; const struct mbus_dram_window *cs = dram->cs + i;
/* Write size, attributes and target id to control register */ /* Write size, attributes and target id to control register */
wrl(USB_WINDOW_CTRL(i), writel(((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) |
((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) | (dram->mbus_dram_target_id << 4) | 1,
(dram->mbus_dram_target_id << 4) | 1); MVUSB0_BASE + USB_WINDOW_CTRL(i));
/* Write base address to base register */ /* Write base address to base register */
wrl(USB_WINDOW_BASE(i), cs->base); writel(cs->base, MVUSB0_BASE + USB_WINDOW_BASE(i));
} }
} }
#else #else
@ -95,13 +92,14 @@ static void usb_brg_adrdec_setup(void)
size = gd->bd->bi_dram[i].size; size = gd->bd->bi_dram[i].size;
base = gd->bd->bi_dram[i].start; base = gd->bd->bi_dram[i].start;
if ((size) && (attrib)) if ((size) && (attrib))
wrl(USB_WINDOW_CTRL(i), writel(MVCPU_WIN_CTRL_DATA(size, USB_TARGET_DRAM,
MVCPU_WIN_CTRL_DATA(size, USB_TARGET_DRAM, attrib, MVCPU_WIN_ENABLE),
attrib, MVCPU_WIN_ENABLE)); MVUSB0_BASE + USB_WINDOW_CTRL(i));
else else
wrl(USB_WINDOW_CTRL(i), MVCPU_WIN_DISABLE); writel(MVCPU_WIN_DISABLE,
MVUSB0_BASE + USB_WINDOW_CTRL(i));
wrl(USB_WINDOW_BASE(i), base); writel(base, MVUSB0_BASE + USB_WINDOW_BASE(i));
} }
} }
#endif #endif