usb: chipidea: imx: enable vbus and id wakeup only for OTG events
PATCH 2/2 usb: chipidea: imx: enable vbus and id wakeup only for OTG events
If ID or VBUS is from external block, don't enable its wakeup because it isn't used at all.
Signed-off-by Li Jun <[email protected]>
--- drivers/usb/chipidea/ci_hdrc_imx.c | 6 ++++++ drivers/usb/chipidea/ci_hdrc_imx.h | 2 ++ drivers/usb/chipidea/usbmisc_imx.c | 17 ++++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-)
drivers/usb/chipidea/ci_hdrc_imx.c +6 -0
@@ -419,6 +419,12 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) goto err_clk; } +if (pdata.ext_id) + data->usbmisc_data->ext_id =1 ; + +if (pdata.ext_vbus) + data->usbmisc_data->ext_vbus =1 ; + ret =imx_usbmisc_init_post (data->usbmisc_data);if (ret) {dev_err (dev,"usbmisc post failed, ret=%d\n" , ret);
drivers/usb/chipidea/ci_hdrc_imx.h +2 -0
@@ -21,6 +21,8 @@ struct imx_usbmisc_data { unsigned int evdo:1; /* set external vbus divider option */ unsigned int ulpi:1; /* connected to an ULPI phy */ unsigned int hsic:1; /* HSIC controlller */ + unsigned int ext_id:1; /* ID from exteranl event */ + unsigned int ext_vbus:1; /* Vbus from exteranl event */ };int imx_usbmisc_init (struct imx_usbmisc_data *data);
drivers/usb/chipidea/usbmisc_imx.c +16 -1
@@ -329,6 +329,20 @@ static int usbmisc_imx53_init(struct imx_usbmisc_data *data)return 0 ; } +static u32 usbmisc_update_wakeup_setting (struct imx_usbmisc_data *data) +{ +u32 wakeup_setting = (MX6_BM_WAKEUP_ENABLE | +MX6_BM_VBUS_WAKEUP |MX6_BM_ID_WAKEUP ); + +if (data->ext_id) + wakeup_setting &= ~MX6_BM_ID_WAKEUP ; + +if (data->ext_vbus) + wakeup_setting &= ~MX6_BM_VBUS_WAKEUP ; + +return wakeup_setting; +} +static int usbmisc_imx6q_set_wakeup (struct imx_usbmisc_data *data,bool enabled) {
@@ -345,7 +359,7 @@ static int usbmisc_imx6q_set_wakeupspin_lock_irqsave (&usbmisc->lock, flags); val =readl (usbmisc->base + data->index *4 );if (enabled) { - val |= wakeup_setting; + val |=usbmisc_update_wakeup_setting (data); }else {if (val &MX6_BM_WAKEUP_INTR )pr_debug ("wakeup int at ci_hdrc.%d\n" , data->index);
@@ -549,6 +563,7 @@ static int usbmisc_imx7d_set_wakeupspin_lock_irqsave (&usbmisc->lock, flags); val =readl (usbmisc->base);if (enabled) { + wakeup_setting =usbmisc_update_wakeup_setting (data);writel (val | wakeup_setting, usbmisc->base); }else {if (val &MX6_BM_WAKEUP_INTR )