Enable DA830 OHCI USB Controller with DM_USB
Subsystems (2)
v2 cover Enable DA830 OHCI USB Controller with DM_USB
This patch enables the DA830 USB Host controller with DM_USB.
Adam Ford (2):
usb: ohci: ohci-da8xx: Enable da850-ohci driver with DM support
ARM: da850evm: Enable da850-ohci USB host controller
configs/da850evm_defconfig | 7 +- drivers/usb/host/Kconfig | 5 ++ drivers/usb/host/ohci-da8xx.c | 138 +++++++++++++++++++++++++++++++++- include/configs/da850evm.h | 8 ++ 4 files changed, 156 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 usb: ohci: ohci-da8xx: Enable da850-ohci driver with DM support
This patch reuses some former code for the hawkboard, combines it with some some similar DM_USB compatible code for the OHCI driver, and enables the use of the da850's OHCI controller with DM_USB compatibility.
---
V2: Replace timeout with get_timer and read/modify/write registers with
clrsetbits_le32 instead of doing it manually.
drivers/usb/host/Kconfig +5 -0
@@ -239,6 +239,11 @@ config USB_OHCI_GENERIC ---help--- Enables support for generic OHCI controller. +config USB_OHCI_DA8XX + bool "Support for da850 OHCI USB controller" + help + Enable support for the da850 USB controller. + endif # USB_OHCI_HCD config USB_UHCI_HCD
drivers/usb/host/ohci-da8xx.c +137 -1
149 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 1/2 usb: ohci: ohci-da8xx: Enable da850-ohci driver with DM support
On 4/30/19 12:21 PM, Adam Ford wrote:
[..]
drivers/usb/host/ohci-da8xx.c int usb_cpu_init_fail(void) · line 96
Quoted 11 lines
drivers/usb/host/ohci-da8xx.c +11
-0+#if CONFIG_IS_ENABLED (DM_USB ) +static int ohci_da8xx_probe (struct udevice *dev) +{ +struct ohci_regs *regs = (struct ohci_regs *)devfdt_get_addr (dev); +struct da8xx_ohci *priv =dev_get_priv (dev); +int i, err, ret, clock_nb; + + err =0 ; + priv->clock_count =0 ; + clock_nb =dev_count_phandle_with_args (dev,"clocks" ,"#clock-cells" ); +if (clock_nb >0 ) {
What happens if clock_nb == -ENOENT ?
I think what you want here is
if (clock_nb < 0) {
...
return clock_nb;
}if (clock_nb > 0) {
...
}Quoted 64 lines
drivers/usb/host/ohci-da8xx.c +64
-0+ priv->clocks =devm_kcalloc (dev, clock_nb,sizeof (struct clk ), +GFP_KERNEL ); +if (!priv->clocks) +return -ENOMEM ; + +for (i =0 ; i < clock_nb; i++) { + err =clk_get_by_index (dev, i, &priv->clocks[i]); +if (err <0 ) +break ; + + err =clk_enable (&priv->clocks[i]); +if (err) { +dev_err (dev,"failed to enable clock %d\n" , i); +clk_free (&priv->clocks[i]); + goto clk_err; + } + priv->clock_count++; + } + }else if (clock_nb != -ENOENT ) { +dev_err (dev,"failed to get clock phandle(%d)\n" , clock_nb); +return clock_nb; + } + + err =usb_cpu_init (); + +if (err) + goto clk_err; + + err =ohci_register (dev, regs); +if (err) + goto phy_err; + +return 0 ; + +phy_err: + ret =usb_cpu_stop (); +if (ret) +dev_err (dev,"failed to shutdown usb phy\n" ); + +clk_err: + ret =clk_release_all (priv->clocks, priv->clock_count); +if (ret) +dev_err (dev,"failed to disable all clocks\n" ); + +return err; +} + +static int ohci_da8xx_remove (struct udevice *dev) +{ +struct da8xx_ohci *priv =dev_get_priv (dev); +int ret; + + ret =ohci_deregister (dev); +if (ret) +return ret; + + ret =usb_cpu_stop (); +if (ret) +return ret; + +return clk_release_all (priv->clocks, priv->clock_count); +} + +static const struct udevice_id da8xx_ohci_ids[] = {
drivers/usb/host/ohci-da8xx.c int usb_cpu_init_fail(void) · line 170
Quoted 10 lines
drivers/usb/host/ohci-da8xx.c +10
-0+ { .compatible = "ti,da830-ohci" }, + { } +}; + +U_BOOT_DRIVER (ohci_generic) = { + .name ="ohci-da8xx" , + .id =UCLASS_USB , + .of_match = da8xx_ohci_ids, + .probe = ohci_da8xx_probe, + .remove = ohci_da8xx_remove,
Add DM_FLAG_OS_PREPARE for this to work IIRC.
Quoted 6 lines
drivers/usb/host/ohci-da8xx.c +5
-0+ .ops = &ohci_usb_ops, + .priv_auto_alloc_size = sizeof(struct da8xx_ohci), + .flags = DM_FLAG_ALLOC_PRIV_DMA, +}; +#endif
Signature · 2 lines
Best regards, Marek Vasut
PATCH v2 1/2 usb: ohci: ohci-da8xx: Enable da850-ohci driver with DM support
In reply to Adam FordQuoted 6 lines · Adam Ford
This patch reuses some former code for the hawkboard, combines it with some some similar
DM_USBcompatible code for the OHCI driver, and enables the use of the da850's OHCI controller withDM_USBcompatibility.Signed-off-by Adam Ford <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190506/a4151a7e/attachment.sig>
PATCH v2 2/2 ARM: da850evm: Enable da850-ohci USB host controller
In reply to Adam FordThe DA850 EVM has one USB 1.1 OHCI Host controller. With the host controller now support DM_USB, this patch enables the respective functions for the da850evm.
---
V2: No changes
configs/da850evm_defconfig +6 -1
@@ -8,8 +8,8 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SPL=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
@@ -67,5 +67,10 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_DAVINCI_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_DA8XX=y # CONFIG_FAT_WRITE is not set CONFIG_USE_TINY_PRINTF=y
include/configs/da850evm.h +8 -0
@@ -267,6 +267,14 @@#define CONFIG_ENV_SIZE (16 << 10)#endif +/* USB Configs */ +#define CONFIG_SYS_USB_OHCI_CPU_INIT +#define CONFIG_USB_OHCI_NEW +#define CONFIG_USB_STORAGE +#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x01E25000 +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15 +#define CONFIG_SYS_USB_OHCI_SLOT_NAME "da850evm" +#ifndef CONFIG_DIRECT_NOR_BOOT /* defines for SPL */ #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \
Signature · 1 line
2.17.1
PATCH 2/2 ARM: da850evm: Enable da850-ohci USB host controller
Quoted 5 lines · Adam Ford
The DA850 EVM has one USB 1.1 OHCI Host controller. With the host controller now support
DM_USB, this patch enables the respective functions for the da850evm.Signed-off-by Adam Ford <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190506/6e02cb23/attachment.sig>