diff options
| author | Takeshi Kihara <takeshi.kihara.df@renesas.com> | 2014-11-04 10:05:43 +0900 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-11-05 13:22:09 -0600 |
| commit | 04a5def3df1cea758662615e075f64677690c75f (patch) | |
| tree | 17807399c602c95dd51344bda14656dcc09401dc /drivers/usb/renesas_usbhs/common.c | |
| parent | 11432050f070810ba139d0226344eef120c3a559 (diff) | |
| download | op-kernel-dev-04a5def3df1cea758662615e075f64677690c75f.zip op-kernel-dev-04a5def3df1cea758662615e075f64677690c75f.tar.gz | |
usb: renesas_usbhs: gadget: fix the behavior of pullup
This patch fixes an issue that this driver always enable the D+ pullup
after it detected the VBUS connection even though this usb controller
can control the D+ pullup timing by software. So, this driver should
enable the D+ pullup after a gadget driver called usb_gadget_connect().
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/renesas_usbhs/common.c')
| -rw-r--r-- | drivers/usb/renesas_usbhs/common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c index 169307b..3714787 100644 --- a/drivers/usb/renesas_usbhs/common.c +++ b/drivers/usb/renesas_usbhs/common.c @@ -126,13 +126,15 @@ void usbhs_sys_host_ctrl(struct usbhs_priv *priv, int enable) void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable) { u16 mask = DCFM | DRPD | DPRPU | HSE | USBE; - u16 val = DPRPU | HSE | USBE; + u16 val = HSE | USBE; /* * if enable * * - select Function mode - * - D+ Line Pull-up + * - D+ Line Pull-up is disabled + * When D+ Line Pull-up is enabled, + * calling usbhs_sys_function_pullup(,1) */ usbhs_bset(priv, SYSCFG, mask, enable ? val : 0); } |
