From: Frank Wang <frank.wang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> To: heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org, marex-ynQEQJNshbs@public.gmane.org, bmeng.cn-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, philipp.tomsich-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org, klaus.goger-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org, jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org, sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org Cc: jianing.ren-TNX95d0MmH7DzftRWevZcw@public.gmane.org, Frank Wang <frank.wang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>, marek.belisko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, wmc-TNX95d0MmH7DzftRWevZcw@public.gmane.org, u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org, william.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org, chenjh-TNX95d0MmH7DzftRWevZcw@public.gmane.org Subject: [PATCH v4 12/16] usb: dwc3: add make compatible for rockchip platform Date: Mon, 11 May 2020 15:57:21 +0800 [thread overview] Message-ID: <20200511075725.26665-3-frank.wang@rock-chips.com> (raw) In-Reply-To: <20200511075725.26665-1-frank.wang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> RK3399 Type-C PHY is required that must hold whole USB3.0 OTG controller in resetting to hold pipe power state in P2 before initializing the PHY. This commit fixed it and added device compatible for rockchip platform. Signed-off-by: Frank Wang <frank.wang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> Signed-off-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> --- drivers/usb/dwc3/dwc3-generic.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index eabd53a36d..359460eb13 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -24,6 +24,12 @@ #include <clk.h> #include <usb/xhci.h> +struct dwc3_glue_data { + struct clk_bulk clks; + struct reset_ctl_bulk resets; + fdt_addr_t regs; +}; + struct dwc3_generic_plat { fdt_addr_t base; u32 maximum_speed; @@ -47,6 +53,7 @@ static int dwc3_generic_probe(struct udevice *dev, int rc; struct dwc3_generic_plat *plat = dev_get_platdata(dev); struct dwc3 *dwc3 = &priv->dwc3; + struct dwc3_glue_data *glue = dev_get_platdata(dev->parent); dwc3->dev = dev; dwc3->maximum_speed = plat->maximum_speed; @@ -55,10 +62,22 @@ static int dwc3_generic_probe(struct udevice *dev, dwc3_of_parse(dwc3); #endif + /* + * It must hold whole USB3.0 OTG controller in resetting to hold pipe + * power state in P2 before initializing TypeC PHY on RK3399 platform. + */ + if (device_is_compatible(dev->parent, "rockchip,rk3399-dwc3")) { + reset_assert_bulk(&glue->resets); + udelay(1); + } + rc = dwc3_setup_phy(dev, &priv->phys); if (rc) return rc; + if (device_is_compatible(dev->parent, "rockchip,rk3399-dwc3")) + reset_deassert_bulk(&glue->resets); + priv->base = map_physmem(plat->base, DWC3_OTG_REGS_END, MAP_NOCACHE); dwc3->regs = priv->base + DWC3_GLOBALS_REGS_START; @@ -186,12 +205,6 @@ U_BOOT_DRIVER(dwc3_generic_host) = { }; #endif -struct dwc3_glue_data { - struct clk_bulk clks; - struct reset_ctl_bulk resets; - fdt_addr_t regs; -}; - struct dwc3_glue_ops { void (*select_dr_mode)(struct udevice *dev, int index, enum usb_dr_mode mode); @@ -394,6 +407,12 @@ static int dwc3_glue_probe(struct udevice *dev) if (ret) return ret; + if (glue->resets.count < 1) { + ret = dwc3_glue_reset_init(child, glue); + if (ret) + return ret; + } + while (child) { enum usb_dr_mode dr_mode; @@ -424,6 +443,8 @@ static const struct udevice_id dwc3_glue_ids[] = { { .compatible = "ti,dwc3", .data = (ulong)&ti_ops }, { .compatible = "ti,am437x-dwc3", .data = (ulong)&ti_ops }, { .compatible = "ti,am654-dwc3" }, + { .compatible = "rockchip,rk3328-dwc3" }, + { .compatible = "rockchip,rk3399-dwc3" }, { } }; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Frank Wang <frank.wang@rock-chips.com> To: u-boot@lists.denx.de Subject: [PATCH v4 12/16] usb: dwc3: add make compatible for rockchip platform Date: Mon, 11 May 2020 15:57:21 +0800 [thread overview] Message-ID: <20200511075725.26665-3-frank.wang@rock-chips.com> (raw) In-Reply-To: <20200511075725.26665-1-frank.wang@rock-chips.com> RK3399 Type-C PHY is required that must hold whole USB3.0 OTG controller in resetting to hold pipe power state in P2 before initializing the PHY. This commit fixed it and added device compatible for rockchip platform. Signed-off-by: Frank Wang <frank.wang@rock-chips.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- drivers/usb/dwc3/dwc3-generic.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index eabd53a36d..359460eb13 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -24,6 +24,12 @@ #include <clk.h> #include <usb/xhci.h> +struct dwc3_glue_data { + struct clk_bulk clks; + struct reset_ctl_bulk resets; + fdt_addr_t regs; +}; + struct dwc3_generic_plat { fdt_addr_t base; u32 maximum_speed; @@ -47,6 +53,7 @@ static int dwc3_generic_probe(struct udevice *dev, int rc; struct dwc3_generic_plat *plat = dev_get_platdata(dev); struct dwc3 *dwc3 = &priv->dwc3; + struct dwc3_glue_data *glue = dev_get_platdata(dev->parent); dwc3->dev = dev; dwc3->maximum_speed = plat->maximum_speed; @@ -55,10 +62,22 @@ static int dwc3_generic_probe(struct udevice *dev, dwc3_of_parse(dwc3); #endif + /* + * It must hold whole USB3.0 OTG controller in resetting to hold pipe + * power state in P2 before initializing TypeC PHY on RK3399 platform. + */ + if (device_is_compatible(dev->parent, "rockchip,rk3399-dwc3")) { + reset_assert_bulk(&glue->resets); + udelay(1); + } + rc = dwc3_setup_phy(dev, &priv->phys); if (rc) return rc; + if (device_is_compatible(dev->parent, "rockchip,rk3399-dwc3")) + reset_deassert_bulk(&glue->resets); + priv->base = map_physmem(plat->base, DWC3_OTG_REGS_END, MAP_NOCACHE); dwc3->regs = priv->base + DWC3_GLOBALS_REGS_START; @@ -186,12 +205,6 @@ U_BOOT_DRIVER(dwc3_generic_host) = { }; #endif -struct dwc3_glue_data { - struct clk_bulk clks; - struct reset_ctl_bulk resets; - fdt_addr_t regs; -}; - struct dwc3_glue_ops { void (*select_dr_mode)(struct udevice *dev, int index, enum usb_dr_mode mode); @@ -394,6 +407,12 @@ static int dwc3_glue_probe(struct udevice *dev) if (ret) return ret; + if (glue->resets.count < 1) { + ret = dwc3_glue_reset_init(child, glue); + if (ret) + return ret; + } + while (child) { enum usb_dr_mode dr_mode; @@ -424,6 +443,8 @@ static const struct udevice_id dwc3_glue_ids[] = { { .compatible = "ti,dwc3", .data = (ulong)&ti_ops }, { .compatible = "ti,am437x-dwc3", .data = (ulong)&ti_ops }, { .compatible = "ti,am654-dwc3" }, + { .compatible = "rockchip,rk3328-dwc3" }, + { .compatible = "rockchip,rk3399-dwc3" }, { } }; -- 2.17.1
next prev parent reply other threads:[~2020-05-11 7:57 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-11 7:53 [PATCH v4 00/16] Add Rockchip RK3399 USB3.0 Host support Frank Wang 2020-05-11 7:53 ` Frank Wang 2020-05-11 7:53 ` [PATCH v4 01/16] clk: rk3399: Enable/Disable the USB2PHY clk Frank Wang 2020-05-11 7:53 ` Frank Wang [not found] ` <20200511075330.26462-1-frank.wang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> 2020-05-11 7:53 ` [PATCH v4 02/16] clk: rk3399: Set empty for TCPHY assigned-clocks Frank Wang 2020-05-11 7:53 ` Frank Wang 2020-05-11 7:53 ` [PATCH v4 03/16] clk: rk3399: Enable/Disable TCPHY clocks Frank Wang 2020-05-11 7:53 ` Frank Wang 2020-05-11 7:53 ` [PATCH v4 04/16] phy: rockchip: Add Rockchip USB2PHY driver Frank Wang 2020-05-11 7:53 ` Frank Wang 2020-05-11 7:55 ` [PATCH v4 05/16] arm64: dts: rk3399: Move u2phy into root port Frank Wang 2020-05-11 7:55 ` Frank Wang [not found] ` <20200511075520.26557-1-frank.wang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> 2020-05-11 7:55 ` [PATCH v4 06/16] phy: rockchip: Add Rockchip USB TypeC PHY driver Frank Wang 2020-05-11 7:55 ` Frank Wang 2020-05-11 7:55 ` [PATCH v4 07/16] usb: dwc3: add dis_enblslpm_quirk Frank Wang 2020-05-11 7:55 ` Frank Wang 2020-05-11 8:49 ` Jagan Teki 2020-05-11 8:49 ` Jagan Teki 2020-05-11 7:55 ` [PATCH v4 08/16] usb: dwc3: add dis_u2_freeclk_exists_quirk Frank Wang 2020-05-11 7:55 ` Frank Wang 2020-05-11 8:50 ` Jagan Teki 2020-05-11 8:50 ` Jagan Teki 2020-05-11 7:55 ` [PATCH v4 09/16] usb: dwc3: Add disable u2mac linestate check quirk Frank Wang 2020-05-11 7:55 ` Frank Wang 2020-05-11 7:57 ` [PATCH v4 10/16] usb: dwc3: Enable AutoRetry feature in the controller Frank Wang 2020-05-11 7:57 ` Frank Wang [not found] ` <20200511075725.26665-1-frank.wang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> 2020-05-11 7:57 ` [PATCH v4 11/16] usb: dwc3: amend UTMI/UTMIW phy interface setup Frank Wang 2020-05-11 7:57 ` Frank Wang 2020-05-11 7:57 ` Frank Wang [this message] 2020-05-11 7:57 ` [PATCH v4 12/16] usb: dwc3: add make compatible for rockchip platform Frank Wang 2020-05-11 9:48 ` Marek Vasut 2020-05-11 9:48 ` Marek Vasut 2020-05-12 1:08 ` Frank Wang 2020-05-12 1:08 ` Frank Wang 2020-05-12 7:26 ` Marek Vasut 2020-05-12 7:26 ` Marek Vasut 2020-05-13 0:47 ` Frank Wang 2020-05-13 0:47 ` Frank Wang 2020-05-13 11:41 ` Marek Vasut 2020-05-13 11:41 ` Marek Vasut 2020-05-11 7:57 ` [PATCH v4 13/16] driver: usb: drop legacy rockchip xhci driver Frank Wang 2020-05-11 7:57 ` Frank Wang 2020-05-11 7:57 ` [PATCH v4 14/16] ARM: dts: rk3399-evb: usb3.0 host support Frank Wang 2020-05-11 7:57 ` Frank Wang 2020-05-11 7:58 ` [PATCH v4 15/16] configs: evb-rk3399: update support usb3.0 host Frank Wang 2020-05-11 7:58 ` Frank Wang [not found] ` <20200511075830.26754-1-frank.wang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> 2020-05-11 7:58 ` [PATCH v4 16/16] roc-rk3399-pc: Enable USB3.0 Host Frank Wang 2020-05-11 7:58 ` Frank Wang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200511075725.26665-3-frank.wang@rock-chips.com \ --to=frank.wang-tnx95d0mmh7dzftrwevzcw@public.gmane.org \ --cc=bmeng.cn-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=chenjh-TNX95d0MmH7DzftRWevZcw@public.gmane.org \ --cc=heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org \ --cc=jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org \ --cc=jianing.ren-TNX95d0MmH7DzftRWevZcw@public.gmane.org \ --cc=kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org \ --cc=klaus.goger-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org \ --cc=linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org \ --cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=marek.belisko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=marex-ynQEQJNshbs@public.gmane.org \ --cc=philipp.tomsich-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org \ --cc=sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \ --cc=u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org \ --cc=william.wu-TNX95d0MmH7DzftRWevZcw@public.gmane.org \ --cc=wmc-TNX95d0MmH7DzftRWevZcw@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.