(no subject)
Subsystems (5)
PATCH 1/4 usb: ohci: Re-enable commented out delay
There is a delay function that was commented out. This patch re-enables it, because it will be needed for da850 ohci support.
drivers/usb/host/ohci-hcd.c +0 -2
@@ -1545,10 +1545,8 @@ static int submit_common_msg(ohci_t *ohci, struct usb_device *dev,return -1 ; } -#if 0 mdelay (10 );/* ohci_dump_status(ohci); */ -#endif timeout =USB_TIMEOUT_MS (pipe);
Signature · 1 line
2.17.1
PATCH 2/4 ARM: davinci: Remove unused functions from header
In reply to Adam FordThere are a few functions defined in the header file, but they are not referenced by any Davinci code. In order to make a general function in the future with static function declarations, this patch will remove the references all together.
arch/arm/mach-davinci/include/mach/da8xx-usb.h +0 -3
@@ -86,7 +86,4 @@ struct da8xx_usb_regs {#define DA8XX_USB_VBUS_GPIO (1 << 15) -int usb_phy_on (void ); -void usb_phy_off (void ); -#endif /* __DA8XX_MUSB_H__ */
Signature · 1 line
2.17.1
PATCH 3/4 usb: ohci: ohci-da8xx: Enable da850-ohci driver with DM support
In reply to Adam FordThis 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.
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 +146 -1
158 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 4/4 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.
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 3/4 usb: ohci: ohci-da8xx: Enable da850-ohci driver with DM support
In reply to Adam FordQuoted 58 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]>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_HCDdrivers/usb/host/ohci-da8xx.c +24
-1@@ -4,9 +4,63 @@*/ #include <common.h> - +#include <asm/io.h> +#include <clk.h> +#include <dm.h> +#include <dm/ofnode.h> +#include <generic-phy.h> +#include <reset.h> +#include "ohci.h" #include <asm/arch/da8xx-usb.h> +struct da8xx_ohci { +ohci_t ohci; +struct clk *clocks;/* clock list */ +struct phy phy; +int clock_count;/* number of clock in clock list */ +}; + +static int usb_phy_on (void ) +{ +u32 timeout; +u32 cfgchip2; + + cfgchip2 =readl (&davinci_syscfg_regs->cfgchip2); + + cfgchip2 &= ~(CFGCHIP2_RESET |CFGCHIP2_PHYPWRDN |CFGCHIP2_OTGPWRDN | +CFGCHIP2_OTGMODE |CFGCHIP2_REFFREQ | +CFGCHIP2_USB1PHYCLKMUX );
drivers/usb/host/ohci-da8xx.c line 42
Quoted 10 lines
drivers/usb/host/ohci-da8xx.c +10
-0+ cfgchip2 |=CFGCHIP2_SESENDEN |CFGCHIP2_VBDTCTEN |CFGCHIP2_PHY_PLLON | +CFGCHIP2_REFFREQ_24MHZ |CFGCHIP2_USB2PHYCLKMUX | +CFGCHIP2_USB1SUSPENDM ; + +writel (cfgchip2, &davinci_syscfg_regs->cfgchip2); + +/* wait until the usb phy pll locks */ + timeout =0x7FFFFFF ; + +while (timeout--) {
Use get_timer() for the timeout.
Quoted 9 lines
drivers/usb/host/ohci-da8xx.c +9
-0+if (readl (&davinci_syscfg_regs->cfgchip2) &CFGCHIP2_PHYCLKGD ) +return 1 ; + } + +/* USB phy was not turned on */ +return 0 ; +} + +static void usb_phy_off (void )
drivers/usb/host/ohci-da8xx.c line 61
Quoted 10 lines
drivers/usb/host/ohci-da8xx.c +10
-0+{ +u32 cfgchip2; + +/* +* Power down the on-chip PHY. +*/ + cfgchip2 =readl (&davinci_syscfg_regs->cfgchip2); + cfgchip2 &= ~(CFGCHIP2_PHY_PLLON |CFGCHIP2_USB1SUSPENDM ); + cfgchip2 |=CFGCHIP2_PHYPWRDN |CFGCHIP2_OTGPWRDN |CFGCHIP2_RESET ; +writel (cfgchip2, &davinci_syscfg_regs->cfgchip2);
clrsetbits
Quoted 15 lines
drivers/usb/host/ohci-da8xx.c +8
-0+} +int usb_cpu_init (void ) {/* enable psc for usb2.0 */ @@ -37,3 +91,94 @@ int usb_cpu_init_fail(void) {return usb_cpu_stop (); } + +#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);
drivers/usb/host/ohci-da8xx.c int usb_cpu_init_fail(void) · line 109
Quoted 10 lines
drivers/usb/host/ohci-da8xx.c +10
-0+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 ) { + priv->clocks =devm_kcalloc (dev, clock_nb,sizeof (struct clk ), +GFP_KERNEL ); +if (!priv->clocks) +return -ENOMEM ;
clk_enable_bulk()
Quoted 75 lines
drivers/usb/host/ohci-da8xx.c +74
-0+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[] = { + { .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, + .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
Marek Vasut
AppliedPATCH 1/4 usb: ohci: Re-enable commented out delay
In reply to Adam FordQuoted 11 lines · Adam Ford
There is a delay function that was commented out. This patch re-enables it, because it will be needed for da850 ohci support.
Signed-off-by Adam Ford <[email protected]>drivers/usb/host/ohci-hcd.c +0
-0
drivers/usb/host/ohci-hcd.c static int submit_common_msg(ohci_t *ohci, struct usb_device *dev, · line 1552
Quoted 10 lines
drivers/usb/host/ohci-hcd.c +0
-2@@ -1545,10 +1545,8 @@ static int submit_common_msg(ohci_t *ohci, struct usb_device *dev,return -1 ; } -#if 0 mdelay (10 );/* ohci_dump_status(ohci); */ -#endif timeout =USB_TIMEOUT_MS (pipe);
Applied, since this was probably broken since 2006.
Signature · 2 lines
Best regards, Marek Vasut
Marek Vasut
AppliedPATCH 2/4 ARM: davinci: Remove unused functions from header
In reply to Adam FordQuoted 13 lines · Adam Ford
There are a few functions defined in the header file, but they are not referenced by any Davinci code. In order to make a general function in the future with static function declarations, this patch will remove the references all together.
Signed-off-by Adam Ford <[email protected]>arch/arm/mach-davinci/include/mach/da8xx-usb.h +0
-0
arch/arm/mach-davinci/include/mach/da8xx-usb.h struct da8xx_usb_regs { · line 89
Quoted 7 lines
arch/arm/mach-davinci/include/mach/da8xx-usb.h +0
-3@@ -86,7 +86,4 @@ struct da8xx_usb_regs {#define DA8XX_USB_VBUS_GPIO (1 << 15) -int usb_phy_on (void ); -void usb_phy_off (void ); -#endif /* __DA8XX_MUSB_H__ */
Applied, thanks
Signature · 2 lines
Best regards, Marek Vasut
PATCH 3/4 usb: ohci: ohci-da8xx: Enable da850-ohci driver with DM support
In reply to Marek VasutQuoted 86 lines · Marek Vasut
Quoted 58 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]>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_HCDdrivers/usb/host/ohci-da8xx.c +24
-1@@ -4,9 +4,63 @@*/ #include <common.h> - +#include <asm/io.h> +#include <clk.h> +#include <dm.h> +#include <dm/ofnode.h> +#include <generic-phy.h> +#include <reset.h> +#include "ohci.h" #include <asm/arch/da8xx-usb.h> +struct da8xx_ohci { +ohci_t ohci; +struct clk *clocks;/* clock list */ +struct phy phy; +int clock_count;/* number of clock in clock list */ +}; + +static int usb_phy_on (void ) +{ +u32 timeout; +u32 cfgchip2; + + cfgchip2 =readl (&davinci_syscfg_regs->cfgchip2); + + cfgchip2 &= ~(CFGCHIP2_RESET |CFGCHIP2_PHYPWRDN |CFGCHIP2_OTGPWRDN | +CFGCHIP2_OTGMODE |CFGCHIP2_REFFREQ | +CFGCHIP2_USB1PHYCLKMUX );drivers/usb/host/ohci-da8xx.c line 42
Quoted 10 lines
drivers/usb/host/ohci-da8xx.c +10
-0+ cfgchip2 |=CFGCHIP2_SESENDEN |CFGCHIP2_VBDTCTEN |CFGCHIP2_PHY_PLLON | +CFGCHIP2_REFFREQ_24MHZ |CFGCHIP2_USB2PHYCLKMUX | +CFGCHIP2_USB1SUSPENDM ; + +writel (cfgchip2, &davinci_syscfg_regs->cfgchip2); + +/* wait until the usb phy pll locks */ + timeout =0x7FFFFFF ; + +while (timeout--) {Use
get_timer()for the timeout.Quoted 13 lines
drivers/usb/host/ohci-da8xx.c +13
-0+if (readl (&davinci_syscfg_regs->cfgchip2) &CFGCHIP2_PHYCLKGD ) +return 1 ; + } + +/* USB phy was not turned on */ +return 0 ; +} + +static void usb_phy_off (void ) +{ +u32 cfgchip2; + +/*
Quoted 8 lines
drivers/usb/host/ohci-da8xx.c line 61
Quoted 6 lines
drivers/usb/host/ohci-da8xx.c +6
-0+* Power down the on-chip PHY. +*/ + cfgchip2 =readl (&davinci_syscfg_regs->cfgchip2); + cfgchip2 &= ~(CFGCHIP2_PHY_PLLON |CFGCHIP2_USB1SUSPENDM ); + cfgchip2 |=CFGCHIP2_PHYPWRDN |CFGCHIP2_OTGPWRDN |CFGCHIP2_RESET ; +writel (cfgchip2, &davinci_syscfg_regs->cfgchip2);clrsetbits
Marek - I will be submitting a V2 with your suggestions. It seems like some of the segments are going to be applied, do you want just do a V2 on the this one, or re-submit the whole series?
Quoted 109 lines
Quoted 16 lines
drivers/usb/host/ohci-da8xx.c +8
-0+} +int usb_cpu_init (void ) {/* enable psc for usb2.0 */ @@ -37,3 +91,94 @@ int usb_cpu_init_fail(void) {return usb_cpu_stop (); } + +#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);drivers/usb/host/ohci-da8xx.c int usb_cpu_init_fail(void) · line 109
Quoted 10 lines
drivers/usb/host/ohci-da8xx.c +10
-0+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 ) { + priv->clocks =devm_kcalloc (dev, clock_nb,sizeof (struct clk ), +GFP_KERNEL ); +if (!priv->clocks) +return -ENOMEM ;
clk_enable_bulk()Quoted 65 lines
drivers/usb/host/ohci-da8xx.c +64
-0+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[] = { + { .compatible ="ti,da830-ohci" }, + { } +}; + +U_BOOT_DRIVER (ohci_generic) = {drivers/usb/host/ohci-da8xx.c int usb_cpu_init_fail(void) · line 184
Quoted 10 lines
drivers/usb/host/ohci-da8xx.c +10
-0+ .name = "ohci-da8xx", + .id = UCLASS_USB, + .of_match = da8xx_ohci_ids, + .probe = ohci_da8xx_probe, + .remove = ohci_da8xx_remove, + .ops = &ohci_usb_ops, + .priv_auto_alloc_size = sizeof(struct da8xx_ohci), + .flags = DM_FLAG_ALLOC_PRIV_DMA, +}; +#endif --
Best regards,
Marek Vasut
PATCH 3/4 usb: ohci: ohci-da8xx: Enable da850-ohci driver with DM support
Quoted 96 lines · Adam Ford
Quoted 86 lines · Marek Vasut
Quoted 58 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]>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_HCDdrivers/usb/host/ohci-da8xx.c +24
-1@@ -4,9 +4,63 @@*/ #include <common.h> - +#include <asm/io.h> +#include <clk.h> +#include <dm.h> +#include <dm/ofnode.h> +#include <generic-phy.h> +#include <reset.h> +#include "ohci.h" #include <asm/arch/da8xx-usb.h> +struct da8xx_ohci { +ohci_t ohci; +struct clk *clocks;/* clock list */ +struct phy phy; +int clock_count;/* number of clock in clock list */ +}; + +static int usb_phy_on (void ) +{ +u32 timeout; +u32 cfgchip2; + + cfgchip2 =readl (&davinci_syscfg_regs->cfgchip2); + + cfgchip2 &= ~(CFGCHIP2_RESET |CFGCHIP2_PHYPWRDN |CFGCHIP2_OTGPWRDN | +CFGCHIP2_OTGMODE |CFGCHIP2_REFFREQ | +CFGCHIP2_USB1PHYCLKMUX );drivers/usb/host/ohci-da8xx.c line 42
Quoted 10 lines
drivers/usb/host/ohci-da8xx.c +10
-0+ cfgchip2 |=CFGCHIP2_SESENDEN |CFGCHIP2_VBDTCTEN |CFGCHIP2_PHY_PLLON | +CFGCHIP2_REFFREQ_24MHZ |CFGCHIP2_USB2PHYCLKMUX | +CFGCHIP2_USB1SUSPENDM ; + +writel (cfgchip2, &davinci_syscfg_regs->cfgchip2); + +/* wait until the usb phy pll locks */ + timeout =0x7FFFFFF ; + +while (timeout--) {Use
get_timer()for the timeout.Quoted 13 lines
drivers/usb/host/ohci-da8xx.c +13
-0+if (readl (&davinci_syscfg_regs->cfgchip2) &CFGCHIP2_PHYCLKGD ) +return 1 ; + } + +/* USB phy was not turned on */ +return 0 ; +} + +static void usb_phy_off (void ) +{ +u32 cfgchip2; + +/* Quoted 8 lines
drivers/usb/host/ohci-da8xx.c line 61
Quoted 6 lines
drivers/usb/host/ohci-da8xx.c +6
-0+* Power down the on-chip PHY. +*/ + cfgchip2 =readl (&davinci_syscfg_regs->cfgchip2); + cfgchip2 &= ~(CFGCHIP2_PHY_PLLON |CFGCHIP2_USB1SUSPENDM ); + cfgchip2 |=CFGCHIP2_PHYPWRDN |CFGCHIP2_OTGPWRDN |CFGCHIP2_RESET ; +writel (cfgchip2, &davinci_syscfg_regs->cfgchip2);clrsetbits
Quoted 3 lines
Marek - I will be submitting a V2 with your suggestions. It seems like some of the segments are going to be applied, do you want just do a V2 on the this one, or re-submit the whole series?
Just 3/4 and 4/4 is enough. Rebase on u-boot-usb/master and make sure not to drop $subject from the cover letter (this series has it empty, which made me almost miss it)
Signature · 2 lines
Best regards, Marek Vasut