Message ID | 1452104488-5502-10-git-send-email-mateusz.kulikowski@gmail.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
On Wednesday, January 06, 2016 at 07:21:21 PM, Mateusz Kulikowski wrote: > This driver is able to reconfigure OTG controller into HOST mode. > Board can add board-specific initialization as board_prepare_usb(). > It requires USB_ULPI_VIEWPORT enabled in board configuration. > > Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> [...] > +static int msm_init_after_reset(struct ehci_ctrl *dev) > +{ > + struct msm_ehci_priv *p = container_of(dev, struct msm_ehci_priv, ctrl); > + struct usb_ehci *ehci = p->ehci; > + > + /* select ULPI phy */ > + writel(0x80000000, &ehci->portsc); Don't we have macro for this bit ? > + setup_usb_phy(p); > + > + /* Enable sess_vld */ > + setbits_le32(&ehci->genconfig2, GEN2_SESS_VLD_CTRL_EN); > + > + /* Enable external vbus configuration in the LINK */ > + setbits_le32(&ehci->usbcmd, SESS_VLD_CTRL); > + > + /* USB_OTG_HS_AHB_BURST */ > + writel(0x0, &ehci->sbuscfg); > + > + /* USB_OTG_HS_AHB_MODE: HPROT_MODE */ > + /* Bus access related config. */ > + writel(0x08, &ehci->sbusmode); > + > + /* set mode to host controller */ > + writel(CM_HOST, &ehci->usbmode); > + > + return 0; > +} [...] > +static int ehci_usb_remove(struct udevice *dev) > +{ > + struct msm_ehci_priv *p = dev_get_priv(dev); > + struct usb_ehci *ehci = p->ehci; > + int ret; > + > + ret = ehci_deregister(dev); > + if (ret) > + return ret; > + > + /* Stop controller. */ > + clrbits_le32(&ehci->usbcmd, CMD_RUN); > + > + reset_usb_phy(p); > + > + ret = board_prepare_usb(USB_INIT_DEVICE); /* Board specific hook */ > + if (ret < 0) > + return ret; > + > + /* Reset controller */ > + setbits_le32(&ehci->usbcmd, CMD_RESET); > + > + /* Wait for reset */ > + if (wait_for_bit(__func__, &ehci->usbcmd, CMD_RESET, false, 30, Ad. this wait_for_bit() , you can define a macro "wait_for_bit()" in some header file which would call the final __wait_for_bit(). The trick is, such macro will expand in place and you wouldn't have to call it with __func__ argument. The macro would be able to pass that __func__ argument into the final __wait_for_bit() . But that's just an idea, it doesn't prevent this driver from mainlining of course. > + false)) { > + printf("Stuck on USB reset.\n"); > + return -ETIMEDOUT; > + } > + > + return 0; > +} Other than that portsc bit, add my Acked-by: Marek Vasut <marex@denx.de>
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On 06.01.2016 22:04, Marek Vasut wrote: > On Wednesday, January 06, 2016 at 07:21:21 PM, Mateusz Kulikowski wrote: >> This driver is able to reconfigure OTG controller into HOST mode. >> Board can add board-specific initialization as board_prepare_usb(). >> It requires USB_ULPI_VIEWPORT enabled in board configuration. >> >> Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> > > [...] > >> +static int msm_init_after_reset(struct ehci_ctrl *dev) >> +{ >> + struct msm_ehci_priv *p = container_of(dev, struct msm_ehci_priv, ctrl); >> + struct usb_ehci *ehci = p->ehci; >> + >> + /* select ULPI phy */ >> + writel(0x80000000, &ehci->portsc); > > Don't we have macro for this bit ? hmhm.. I need spoiler.. Did you meant EHCI_PS_* series of #defines from ehci.h? This bit is not there (header was probably based on EHCI 1.0 spec, where this bit was reserved). Of course I can add it there and use here :) Regards, Mateusz -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWlCEeAAoJELvtohmVtQzBkoMH/RSRhWcO2CMdNpsBi38oIXNC xt7n0Tpilaac/Ch2GaSnY5rsJN9iMGCEgFZbXy+Z05qqFPMBPKPcQ5Bq7cTt2hvM jLyLknxNAHIfJjGg1RxIpZakXflrt83DZG6mV0jHldFh5Q2+VZtNRCPbpOqBpAzI mPT1+9SJt9By6LcQfTHjo+45nVvMifw0giKjHNoXadM2a+RHgi+jyeYwa8Vi6XyL fmv4UfYISrA+fYYxvCANsTcXlyULxiTfzIYA2BzXslYjskEjvha0cqD8gsFpfAqP AntwSXnOKg7EYkr8IniAxsoITcQKfEi1g9liLLgxOENMpCQLvrUAN6l+6Ma2rI8= =inLQ -----END PGP SIGNATURE-----
On Monday, January 11, 2016 at 10:39:46 PM, Mateusz Kulikowski wrote: > On 06.01.2016 22:04, Marek Vasut wrote: > > On Wednesday, January 06, 2016 at 07:21:21 PM, Mateusz Kulikowski wrote: > >> This driver is able to reconfigure OTG controller into HOST mode. > >> Board can add board-specific initialization as board_prepare_usb(). > >> It requires USB_ULPI_VIEWPORT enabled in board configuration. > >> > >> Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> > > > > [...] > > > >> +static int msm_init_after_reset(struct ehci_ctrl *dev) > >> +{ > >> + struct msm_ehci_priv *p = container_of(dev, struct msm_ehci_priv, > >> ctrl); + struct usb_ehci *ehci = p->ehci; > >> + > >> + /* select ULPI phy */ > >> + writel(0x80000000, &ehci->portsc); > > > > Don't we have macro for this bit ? > > hmhm.. I need spoiler.. > > Did you meant EHCI_PS_* series of #defines from ehci.h? > > This bit is not there (header was probably based on EHCI 1.0 spec, where > this bit was reserved). Of course I can add it there and use here :) More like include/usb/ehci-fsl.h , there's a bit for it. Best regards, Marek Vasut
diff --git a/doc/device-tree-bindings/usb/ehci-msm.txt b/doc/device-tree-bindings/usb/ehci-msm.txt new file mode 100644 index 0000000..205bb07 --- /dev/null +++ b/doc/device-tree-bindings/usb/ehci-msm.txt @@ -0,0 +1,10 @@ +Chipidea EHCI controller (part of OTG controller) used on Qualcomm devices. + +Required properties: +- compatible: must be "qcom,ehci-host" +- reg: start address and size of the registers + +ehci@78d9000 { + compatible = "qcom,ehci-host"; + reg = <0x78d9000 0x400>; +}; diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 39f7185..ff5e843 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -74,6 +74,17 @@ config USB_EHCI_MX6 ---help--- Enables support for the on-chip EHCI controller on i.MX6 SoCs. +config USB_EHCI_MSM + bool "Support for Qualcomm on-chip EHCI USB controller" + depends on DM_USB + select USB_ULPI_VIEWPORT + default n + ---help--- + Enables support for the on-chip EHCI controller on Qualcomm + Snapdragon SoCs. + This driver supports combination of Chipidea USB controller + and Synapsys USB PHY in host mode only. + config USB_EHCI_UNIPHIER bool "Support for UniPhier on-chip EHCI USB controller" depends on ARCH_UNIPHIER && OF_CONTROL diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 6183b80..426b066 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_USB_EHCI_MX7) += ehci-mx6.o obj-$(CONFIG_USB_EHCI_OMAP) += ehci-omap.o obj-$(CONFIG_USB_EHCI_PPC4XX) += ehci-ppc4xx.o obj-$(CONFIG_USB_EHCI_MARVELL) += ehci-marvell.o +obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o obj-$(CONFIG_USB_EHCI_SPEAR) += ehci-spear.o obj-$(CONFIG_USB_EHCI_SUNXI) += ehci-sunxi.o diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c new file mode 100644 index 0000000..2efa880 --- /dev/null +++ b/drivers/usb/host/ehci-msm.c @@ -0,0 +1,179 @@ +/* + * Qualcomm EHCI driver + * + * (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski@gmail.com> + * + * Based on Linux driver + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <fdtdec.h> +#include <libfdt.h> +#include <usb.h> +#include <usb/ehci-ci.h> +#include <usb/ulpi.h> +#include <wait_bit.h> +#include <asm/gpio.h> +#include <asm/io.h> +#include <linux/compat.h> +#include "ehci.h" + +/* PHY viewport regs */ +#define ULPI_MISC_A_READ 0x96 +#define ULPI_MISC_A_SET 0x97 +#define ULPI_MISC_A_CLEAR 0x98 +#define ULPI_MISC_A_VBUSVLDEXTSEL (1 << 1) +#define ULPI_MISC_A_VBUSVLDEXT (1 << 0) + +#define GEN2_SESS_VLD_CTRL_EN (1 << 7) + +#define SESS_VLD_CTRL (1 << 25) + +struct msm_ehci_priv { + struct ehci_ctrl ctrl; /* Needed by EHCI */ + struct usb_ehci *ehci; /* Start of IP core*/ + struct ulpi_viewport ulpi_vp; /* ULPI Viewport */ +}; + +int __weak board_prepare_usb(enum usb_init_type type) +{ + return 0; +} + +static void setup_usb_phy(struct msm_ehci_priv *priv) +{ + /* Select and enable external configuration with USB PHY */ + ulpi_write(&priv->ulpi_vp, (u8 *)ULPI_MISC_A_SET, + ULPI_MISC_A_VBUSVLDEXTSEL | ULPI_MISC_A_VBUSVLDEXT); +} + +static void reset_usb_phy(struct msm_ehci_priv *priv) +{ + /* Disable VBUS mimicing in the controller. */ + ulpi_write(&priv->ulpi_vp, (u8 *)ULPI_MISC_A_CLEAR, + ULPI_MISC_A_VBUSVLDEXTSEL | ULPI_MISC_A_VBUSVLDEXT); +} + + +static int msm_init_after_reset(struct ehci_ctrl *dev) +{ + struct msm_ehci_priv *p = container_of(dev, struct msm_ehci_priv, ctrl); + struct usb_ehci *ehci = p->ehci; + + /* select ULPI phy */ + writel(0x80000000, &ehci->portsc); + setup_usb_phy(p); + + /* Enable sess_vld */ + setbits_le32(&ehci->genconfig2, GEN2_SESS_VLD_CTRL_EN); + + /* Enable external vbus configuration in the LINK */ + setbits_le32(&ehci->usbcmd, SESS_VLD_CTRL); + + /* USB_OTG_HS_AHB_BURST */ + writel(0x0, &ehci->sbuscfg); + + /* USB_OTG_HS_AHB_MODE: HPROT_MODE */ + /* Bus access related config. */ + writel(0x08, &ehci->sbusmode); + + /* set mode to host controller */ + writel(CM_HOST, &ehci->usbmode); + + return 0; +} + +static const struct ehci_ops msm_ehci_ops = { + .init_after_reset = msm_init_after_reset +}; + +static int ehci_usb_probe(struct udevice *dev) +{ + struct msm_ehci_priv *p = dev_get_priv(dev); + struct usb_ehci *ehci = p->ehci; + struct ehci_hccr *hccr; + struct ehci_hcor *hcor; + int ret; + + hccr = (struct ehci_hccr *)((phys_addr_t)&ehci->caplength); + hcor = (struct ehci_hcor *)((phys_addr_t)hccr + + HC_LENGTH(ehci_readl(&(hccr)->cr_capbase))); + + ret = board_prepare_usb(USB_INIT_HOST); + if (ret < 0) + return ret; + + + return ehci_register(dev, hccr, hcor, &msm_ehci_ops, 0, USB_INIT_HOST); +} + +static int ehci_usb_remove(struct udevice *dev) +{ + struct msm_ehci_priv *p = dev_get_priv(dev); + struct usb_ehci *ehci = p->ehci; + int ret; + + ret = ehci_deregister(dev); + if (ret) + return ret; + + /* Stop controller. */ + clrbits_le32(&ehci->usbcmd, CMD_RUN); + + reset_usb_phy(p); + + ret = board_prepare_usb(USB_INIT_DEVICE); /* Board specific hook */ + if (ret < 0) + return ret; + + /* Reset controller */ + setbits_le32(&ehci->usbcmd, CMD_RESET); + + /* Wait for reset */ + if (wait_for_bit(__func__, &ehci->usbcmd, CMD_RESET, false, 30, + false)) { + printf("Stuck on USB reset.\n"); + return -ETIMEDOUT; + } + + return 0; +} + +static int ehci_usb_ofdata_to_platdata(struct udevice *dev) +{ + struct msm_ehci_priv *priv = dev_get_priv(dev); + + priv->ulpi_vp.port_num = 0; + priv->ehci = (void *)dev_get_addr(dev); + + if (priv->ehci == (void *)FDT_ADDR_T_NONE) + return -EINVAL; + + /* Warning: this will not work if viewport address is > 64 bit due to + * ULPI design. + */ + priv->ulpi_vp.viewport_addr = (phys_addr_t)&priv->ehci->ulpi_viewpoint; + + return 0; +} + +static const struct udevice_id ehci_usb_ids[] = { + { .compatible = "qcom,ehci-host", }, + { } +}; + +U_BOOT_DRIVER(usb_ehci) = { + .name = "ehci_msm", + .id = UCLASS_USB, + .of_match = ehci_usb_ids, + .ofdata_to_platdata = ehci_usb_ofdata_to_platdata, + .probe = ehci_usb_probe, + .remove = ehci_usb_remove, + .ops = &ehci_usb_ops, + .priv_auto_alloc_size = sizeof(struct msm_ehci_priv), + .flags = DM_FLAG_ALLOC_PRIV_DMA, +};
This driver is able to reconfigure OTG controller into HOST mode. Board can add board-specific initialization as board_prepare_usb(). It requires USB_ULPI_VIEWPORT enabled in board configuration. Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> --- Changes in v1: - Reordered header files - Removed braces around constant - Added more verbose help to KConfig - Added ULPI dependency to Kconfig - Drop register #defines - use ehci-ci.h instead - Create fixed ulpi viewport for device - Use setbits/clearbits where possible - Use wait_for_bit to reset controller - Add dt binding documents doc/device-tree-bindings/usb/ehci-msm.txt | 10 ++ drivers/usb/host/Kconfig | 11 ++ drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-msm.c | 179 ++++++++++++++++++++++++++++++ 4 files changed, 201 insertions(+) create mode 100644 doc/device-tree-bindings/usb/ehci-msm.txt create mode 100644 drivers/usb/host/ehci-msm.c