* [v3,1/4] usb: chipidea: add flag for imx hsic implementation
@ 2018-11-27 13:40 Frieder Schrempf
0 siblings, 0 replies; 2+ messages in thread
From: Frieder Schrempf @ 2018-11-27 13:40 UTC (permalink / raw)
To: PETER CHEN, linux-usb
Cc: dl-linux-imx, robh+dt, devicetree, frieder.schrempf, festevam
On 27.11.18 10:30, PETER CHEN wrote:
> NXP (Freecale) imx HSIC design has some special requirements, add
> some flags at host code to handle them.
>
> Signed-off-by: Peter Chen <peter.chen@nxp.com>
Tested on i.MX6S with Microchip LAN9730 USB HSIC Ethernet Controller.
Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> ---
> drivers/usb/chipidea/host.c | 17 +++++++++++++++++
> include/linux/usb/chipidea.h | 3 +++
> 2 files changed, 20 insertions(+)
>
> diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
> index d858a82c4f44..028a3574266a 100644
> --- a/drivers/usb/chipidea/host.c
> +++ b/drivers/usb/chipidea/host.c
> @@ -170,6 +170,11 @@ static int host_start(struct ci_hdrc *ci)
> otg->host = &hcd->self;
> hcd->self.otg_port = 1;
> }
> +
> + if (ci->platdata->notify_event &&
> + (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC))
> + ci->platdata->notify_event
> + (ci, CI_HDRC_IMX_HSIC_ACTIVE_EVENT);
> }
>
> return ret;
> @@ -218,6 +223,8 @@ void ci_hdrc_host_destroy(struct ci_hdrc *ci)
> static int ci_ehci_bus_suspend(struct usb_hcd *hcd)
> {
> struct ehci_hcd *ehci = hcd_to_ehci(hcd);
> + struct device *dev = hcd->self.controller;
> + struct ci_hdrc *ci = dev_get_drvdata(dev);
> int port;
> u32 tmp;
>
> @@ -249,6 +256,16 @@ static int ci_ehci_bus_suspend(struct usb_hcd *hcd)
> * It needs a short delay between set RS bit and PHCD.
> */
> usleep_range(150, 200);
> + /*
> + * Need to clear WKCN and WKOC for imx HSIC,
> + * otherwise, there will be wakeup event.
> + */
> + if (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC) {
> + tmp = ehci_readl(ehci, reg);
> + tmp &= ~(PORT_WKDISC_E | PORT_WKCONN_E);
> + ehci_writel(ehci, tmp, reg);
> + }
> +
> break;
> }
> }
> diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
> index 63758c399e4e..911e05af671e 100644
> --- a/include/linux/usb/chipidea.h
> +++ b/include/linux/usb/chipidea.h
> @@ -60,9 +60,12 @@ struct ci_hdrc_platform_data {
> #define CI_HDRC_OVERRIDE_RX_BURST BIT(11)
> #define CI_HDRC_OVERRIDE_PHY_CONTROL BIT(12) /* Glue layer manages phy */
> #define CI_HDRC_REQUIRES_ALIGNED_DMA BIT(13)
> +#define CI_HDRC_IMX_IS_HSIC BIT(14)
> enum usb_dr_mode dr_mode;
> #define CI_HDRC_CONTROLLER_RESET_EVENT 0
> #define CI_HDRC_CONTROLLER_STOPPED_EVENT 1
> +#define CI_HDRC_IMX_HSIC_ACTIVE_EVENT 2
> +#define CI_HDRC_IMX_HSIC_SUSPEND_EVENT 3
> int (*notify_event) (struct ci_hdrc *ci, unsigned event);
> struct regulator *reg_vbus;
> struct usb_otg_caps ci_otg_caps;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
* [v3,1/4] usb: chipidea: add flag for imx hsic implementation
@ 2018-11-27 9:30 Peter Chen
0 siblings, 0 replies; 2+ messages in thread
From: Peter Chen @ 2018-11-27 9:30 UTC (permalink / raw)
To: linux-usb
Cc: dl-linux-imx, robh+dt, devicetree, frieder.schrempf, festevam,
PETER CHEN
NXP (Freecale) imx HSIC design has some special requirements, add
some flags at host code to handle them.
Signed-off-by: Peter Chen <peter.chen@nxp.com>
---
drivers/usb/chipidea/host.c | 17 +++++++++++++++++
include/linux/usb/chipidea.h | 3 +++
2 files changed, 20 insertions(+)
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index d858a82c4f44..028a3574266a 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -170,6 +170,11 @@ static int host_start(struct ci_hdrc *ci)
otg->host = &hcd->self;
hcd->self.otg_port = 1;
}
+
+ if (ci->platdata->notify_event &&
+ (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC))
+ ci->platdata->notify_event
+ (ci, CI_HDRC_IMX_HSIC_ACTIVE_EVENT);
}
return ret;
@@ -218,6 +223,8 @@ void ci_hdrc_host_destroy(struct ci_hdrc *ci)
static int ci_ehci_bus_suspend(struct usb_hcd *hcd)
{
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+ struct device *dev = hcd->self.controller;
+ struct ci_hdrc *ci = dev_get_drvdata(dev);
int port;
u32 tmp;
@@ -249,6 +256,16 @@ static int ci_ehci_bus_suspend(struct usb_hcd *hcd)
* It needs a short delay between set RS bit and PHCD.
*/
usleep_range(150, 200);
+ /*
+ * Need to clear WKCN and WKOC for imx HSIC,
+ * otherwise, there will be wakeup event.
+ */
+ if (ci->platdata->flags & CI_HDRC_IMX_IS_HSIC) {
+ tmp = ehci_readl(ehci, reg);
+ tmp &= ~(PORT_WKDISC_E | PORT_WKCONN_E);
+ ehci_writel(ehci, tmp, reg);
+ }
+
break;
}
}
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index 63758c399e4e..911e05af671e 100644
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -60,9 +60,12 @@ struct ci_hdrc_platform_data {
#define CI_HDRC_OVERRIDE_RX_BURST BIT(11)
#define CI_HDRC_OVERRIDE_PHY_CONTROL BIT(12) /* Glue layer manages phy */
#define CI_HDRC_REQUIRES_ALIGNED_DMA BIT(13)
+#define CI_HDRC_IMX_IS_HSIC BIT(14)
enum usb_dr_mode dr_mode;
#define CI_HDRC_CONTROLLER_RESET_EVENT 0
#define CI_HDRC_CONTROLLER_STOPPED_EVENT 1
+#define CI_HDRC_IMX_HSIC_ACTIVE_EVENT 2
+#define CI_HDRC_IMX_HSIC_SUSPEND_EVENT 3
int (*notify_event) (struct ci_hdrc *ci, unsigned event);
struct regulator *reg_vbus;
struct usb_otg_caps ci_otg_caps;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-27 13:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-27 13:40 [v3,1/4] usb: chipidea: add flag for imx hsic implementation Frieder Schrempf
-- strict thread matches above, loose matches on Subject: below --
2018-11-27 9:30 Peter Chen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).