[U-Boot] [PATCH 1/3] mvebu: usb: xhci: a38x support
From: Jon Nettleton jon@solid-run.com
This makes the initial changes need to support the a38x series of SOCs. It adds the device-tree identifier as well as changing the board_support function to take the IO address designated by device-tree.
Signed-off-by: Jon Nettleton jon@solid-run.com [baruch: use fdt_addr_t; update 37xx and 8K implementations] Signed-off-by: Baruch Siach baruch@tkos.co.il --- board/Marvell/mvebu_armada-37xx/board.c | 2 +- board/Marvell/mvebu_armada-8k/board.c | 2 +- drivers/usb/host/xhci-mvebu.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index 8dc1f46d9739..ac3e3a392fc2 100644 --- a/board/Marvell/mvebu_armada-37xx/board.c +++ b/board/Marvell/mvebu_armada-37xx/board.c @@ -123,7 +123,7 @@ int board_ahci_enable(void) }
/* Board specific xHCI enable code */ -int board_xhci_enable(void) +int board_xhci_enable(fdt_addr_t base) { struct udevice *dev; int ret; diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c index 7d1b5d9f6239..f4eabfb14f1d 100644 --- a/board/Marvell/mvebu_armada-8k/board.c +++ b/board/Marvell/mvebu_armada-8k/board.c @@ -95,7 +95,7 @@ int board_xhci_config(void) return 0; }
-int board_xhci_enable(void) +int board_xhci_enable(fdt_addr_t base) { struct udevice *dev; int ret; diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index b9201a5a6a3f..dbdfce38da20 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -35,7 +35,7 @@ struct mvebu_xhci { * Dummy implementation that can be overwritten by a board * specific function */ -__weak int board_xhci_enable(void) +__weak int board_xhci_enable(fdt_addr_t base) { return 0; } @@ -62,7 +62,7 @@ static int xhci_usb_probe(struct udevice *dev) }
/* Enable USB xHCI (VBUS, reset etc) in board specific code */ - board_xhci_enable(); + board_xhci_enable(devfdt_get_addr_index(dev, 1));
return xhci_register(dev, ctx->hcd, hcor); } @@ -85,6 +85,7 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
static const struct udevice_id xhci_usb_ids[] = { { .compatible = "marvell,armada3700-xhci" }, + { .compatible = "marvell,armada-380-xhci" }, { .compatible = "marvell,armada-8k-xhci" }, { } };
From: Jon Nettleton jon@solid-run.com
This fixes the USB 3.0 support for the a38x SOC.
Signed-off-by: Jon Nettleton jon@solid-run.com [baruch: use fdt_addr_t] Signed-off-by: Baruch Siach baruch@tkos.co.il --- arch/arm/mach-mvebu/cpu.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 74a63dd6560b..7c64a68388b5 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -554,6 +554,47 @@ void scsi_init(void) } #endif
+#ifdef CONFIG_USB_XHCI_MVEBU +#define USB3_MAX_WINDOWS 4 +#define USB3_WIN_CTRL(w) (0x0 + ((w) * 8)) +#define USB3_WIN_BASE(w) (0x4 + ((w) * 8)) + +static void xhci_mvebu_mbus_config(void __iomem *base, + const struct mbus_dram_target_info *dram) +{ + int i; + + for (i = 0; i < USB3_MAX_WINDOWS; i++) { + writel(0, base + USB3_WIN_CTRL(i)); + writel(0, base + USB3_WIN_BASE(i)); + } + + for (i = 0; i < dram->num_cs; i++) { + const struct mbus_dram_window *cs = dram->cs + i; + + /* Write size, attributes and target id to control register */ + writel(((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) | + (dram->mbus_dram_target_id << 4) | 1, + base + USB3_WIN_CTRL(i)); + + /* Write base address to base register */ + writel((cs->base & 0xffff0000), base + USB3_WIN_BASE(i)); + } +} + +int board_xhci_enable(fdt_addr_t base) +{ + const struct mbus_dram_target_info *dram; + + printf("MVEBU XHCI INIT controller @ 0x%lx\n", base); + + dram = mvebu_mbus_dram_info(); + xhci_mvebu_mbus_config((void __iomem *)base, dram); + + return 0; +} +#endif + void enable_caches(void) { /* Avoid problem with e.g. neta ethernet driver */
On 06.11.2017 09:33, Baruch Siach wrote:
From: Jon Nettleton jon@solid-run.com
This fixes the USB 3.0 support for the a38x SOC.
Signed-off-by: Jon Nettleton jon@solid-run.com [baruch: use fdt_addr_t] Signed-off-by: Baruch Siach baruch@tkos.co.il
Applied to u-boot-marvell/master.
Thanks, Stefan
From: Jon Nettleton jon@solid-run.com
Enable the driver by default for the clearfog boards since the external port is configured for XHCI.
Signed-off-by: Jon Nettleton jon@solid-run.com [baruch: split from the SoC setup patch] Signed-off-by: Baruch Siach baruch@tkos.co.il --- configs/clearfog_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index fa9f04a9d8a2..3de204346d88 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -43,5 +43,6 @@ CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_MVEBU=y CONFIG_USB_STORAGE=y
On 06.11.2017 09:33, Baruch Siach wrote:
From: Jon Nettleton jon@solid-run.com
Enable the driver by default for the clearfog boards since the external port is configured for XHCI.
Signed-off-by: Jon Nettleton jon@solid-run.com [baruch: split from the SoC setup patch] Signed-off-by: Baruch Siach baruch@tkos.co.il
Applied to u-boot-marvell/master.
Thanks, Stefan
On 06.11.2017 09:33, Baruch Siach wrote:
From: Jon Nettleton jon@solid-run.com
This makes the initial changes need to support the a38x series of SOCs. It adds the device-tree identifier as well as changing the board_support function to take the IO address designated by device-tree.
Signed-off-by: Jon Nettleton jon@solid-run.com [baruch: use fdt_addr_t; update 37xx and 8K implementations] Signed-off-by: Baruch Siach baruch@tkos.co.il
Applied to u-boot-marvell/master.
Thanks, Stefan
participants (2)
-
Baruch Siach -
Stefan Roese