Hi Marek On 03/17/2017 05:41 PM, Marek Vasut wrote: > On 03/17/2017 05:25 PM, patrice.chot...@st.com wrote: >> From: Patrice Chotard <patrice.chot...@st.com> >> >> Add support for on-chip ohci controller available >> on STMicrolectronics SoCs. >> Ohci support will be then available on both type A >> USB 2.0 connectors. >> >> Signed-off-by: Patrice Chotard <patrice.chot...@st.com> >> --- >> drivers/usb/host/Kconfig | 9 +++++ >> drivers/usb/host/Makefile | 1 + >> drivers/usb/host/ohci-sti.c | 90 >> +++++++++++++++++++++++++++++++++++++++++ >> include/configs/stih410-b2260.h | 3 ++ >> 4 files changed, 103 insertions(+) >> create mode 100644 drivers/usb/host/ohci-sti.c >> >> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig >> index d66f49e..33ded5d 100644 >> --- a/drivers/usb/host/Kconfig >> +++ b/drivers/usb/host/Kconfig >> @@ -168,6 +168,15 @@ config USB_OHCI_GENERIC >> ---help--- >> Enables support for generic OHCI controller. >> >> +config USB_OHCI_STI >> + bool "Support for STMicroelectronics OHCI USB controller" >> + depends on ARCH_STI >> + depends on OF_CONTROL >> + depends on DM_USB >> + select USB_HOST >> + ---help--- >> + Enables support for the on-chip OHCI controller on STMicroelectronics >> SoCs. >> + >> endif # USB_OHCI_HCD >> >> config USB_UHCI_HCD >> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile >> index 303aa32..b78e632 100644 >> --- a/drivers/usb/host/Makefile >> +++ b/drivers/usb/host/Makefile >> @@ -22,6 +22,7 @@ obj-$(CONFIG_USB_OHCI_EP93XX) += ohci-ep93xx.o >> obj-$(CONFIG_USB_OHCI_SUNXI) += ohci-sunxi.o >> obj-$(CONFIG_USB_OHCI_LPC32XX) += ohci-lpc32xx.o >> obj-$(CONFIG_USB_OHCI_GENERIC) += ohci-generic.o >> +obj-$(CONFIG_USB_OHCI_STI) += ohci-sti.o >> >> # echi >> obj-$(CONFIG_USB_EHCI) += ehci-hcd.o >> diff --git a/drivers/usb/host/ohci-sti.c b/drivers/usb/host/ohci-sti.c >> new file mode 100644 >> index 0000000..62b63cd >> --- /dev/null >> +++ b/drivers/usb/host/ohci-sti.c >> @@ -0,0 +1,90 @@ >> +/* >> + * Copyright (c) 2017 >> + * Patrice Chotard <patrice.chot...@st.com> >> + * >> + * SPDX-License-Identifier: GPL-2.0+ >> + */ >> + >> +#include <common.h> >> +#include <asm/io.h> >> +#include <dm.h> >> +#include <errno.h> >> +#include "ohci.h" >> +#include <reset-uclass.h> >> +#include <usb.h> >> + >> +DECLARE_GLOBAL_DATA_PTR; >> + >> +#if !defined(CONFIG_USB_OHCI_NEW) >> +# error "Generic OHCI driver requires CONFIG_USB_OHCI_NEW" >> +#endif >> + >> +struct sti_ohci_priv { >> + ohci_t ohci; >> + struct reset_ctl power_ctl; >> + struct reset_ctl softreset_ctl; >> +}; >> + >> +static int ohci_usb_probe(struct udevice *dev) >> +{ >> + struct sti_ohci_priv *priv = dev_get_priv(dev); >> + struct ohci_regs *regs; >> + struct udevice *dev_phy; >> + int ret, phy_node; >> + >> + regs = (struct ohci_regs *)dev_get_addr(dev); >> + if (regs == (void *)FDT_ADDR_T_NONE) >> + return -EINVAL; >> + >> + ret = reset_get_by_name(dev, "power", &priv->power_ctl); >> + if (ret) { >> + error("can't get power reset for %s (%d)", dev->name, ret); >> + return ret; >> + } >> + >> + ret = reset_get_by_name(dev, "softreset", &priv->softreset_ctl); >> + if (ret) { >> + error("can't get soft reset for %s (%d)", dev->name, ret); >> + return ret; >> + } >> + >> + ret = reset_deassert(&priv->power_ctl); >> + if (ret < 0) { >> + error("OHCI power reset deassert failed: %d", ret); >> + return ret; >> + } >> + >> + ret = reset_deassert(&priv->softreset_ctl); >> + if (ret < 0) { >> + error("OHCI soft reset deassert failed: %d", ret); >> + return ret; >> + } >> + >> + /* get phy node */ >> + phy_node = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset, "phys"); >> + if (phy_node <= 0) { >> + error("Not found usb phy device\n"); >> + return -ENODEV; >> + } >> + >> + /* probe associated phy node */ >> + ret = uclass_get_device_by_of_offset(UCLASS_MISC, phy_node, &dev_phy); >> + >> + return ohci_register(dev, regs); >> +} >> + >> +static const struct udevice_id sti_usb_ids[] = { >> + { .compatible = "st,st-ohci-300x" }, >> + { } >> +}; >> + >> +U_BOOT_DRIVER(ohci_sti) = { >> + .name = "ohci_sti", >> + .id = UCLASS_USB, >> + .of_match = sti_usb_ids, >> + .probe = ohci_usb_probe, >> + .remove = ohci_deregister, >> + .ops = &ohci_usb_ops, >> + .priv_auto_alloc_size = sizeof(struct sti_ohci_priv), >> + .flags = DM_FLAG_ALLOC_PRIV_DMA, >> +}; >> diff --git a/include/configs/stih410-b2260.h >> b/include/configs/stih410-b2260.h >> index 28e2f7f..4a5da82 100644 >> --- a/include/configs/stih410-b2260.h >> +++ b/include/configs/stih410-b2260.h >> @@ -57,4 +57,7 @@ >> >> #define CONFIG_SKIP_LOWLEVEL_INIT >> >> +#define CONFIG_USB_OHCI_NEW >> +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 > > Is this max_root_ports still needed ? :(
Yes it's still needed > > btw this board-thing should likely be split into separate patch Ok i will extract board config from this patch > >> #endif /* __CONFIG_H */ >> > > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot