lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: gadget: renesas_usbhs: remove usbhs_sys_hispeed_ctrl()

Browse Source 
usbhs_sys_hispeed_ctrl() can collect into usbhs_sys_host/function_ctrl().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Kuninori Morimoto
2011-10-23 19:55:47 -07:00
committed by Felipe Balbi
parent dd39c358df
commit 2288e10993
4 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/renesas_usbhs/common.c
View File

@@ -100,11 +100,6 @@ void usbhs_sys_clock_ctrl(struct usbhs_priv *priv, int enable)
usbhs_bset(priv, SYSCFG, SCKE, enable ? SCKE : 0); usbhs_bset(priv, SYSCFG, SCKE, enable ? SCKE : 0);
} }
void usbhs_sys_hispeed_ctrl(struct usbhs_priv *priv, int enable)
{
usbhs_bset(priv, SYSCFG, HSE, enable ? HSE : 0);
}
void usbhs_sys_usb_ctrl(struct usbhs_priv *priv, int enable) void usbhs_sys_usb_ctrl(struct usbhs_priv *priv, int enable)
{ {
usbhs_bset(priv, SYSCFG, USBE, enable ? USBE : 0); usbhs_bset(priv, SYSCFG, USBE, enable ? USBE : 0);
@@ -112,8 +107,8 @@ void usbhs_sys_usb_ctrl(struct usbhs_priv *priv, int enable)
void usbhs_sys_host_ctrl(struct usbhs_priv *priv, int enable) void usbhs_sys_host_ctrl(struct usbhs_priv *priv, int enable)
{ {
u16 mask = DCFM | DRPD | DPRPU; u16 mask = DCFM | DRPD | DPRPU | HSE;
u16 val = DCFM | DRPD; u16 val = DCFM | DRPD | HSE;
int has_otg = usbhs_get_dparam(priv, has_otg); int has_otg = usbhs_get_dparam(priv, has_otg);
if (has_otg) if (has_otg)
@@ -130,8 +125,8 @@ void usbhs_sys_host_ctrl(struct usbhs_priv *priv, int enable)
void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable) void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable)
{ {
u16 mask = DCFM | DRPD | DPRPU; u16 mask = DCFM | DRPD | DPRPU | HSE;
u16 val = DPRPU; u16 val = DPRPU | HSE;
/* /*
* if enable * if enable

1
drivers/usb/renesas_usbhs/common.h
View File

@@ -284,7 +284,6 @@ int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev);
* sysconfig * sysconfig
*/ */
void usbhs_sys_clock_ctrl(struct usbhs_priv *priv, int enable); void usbhs_sys_clock_ctrl(struct usbhs_priv *priv, int enable);
void usbhs_sys_hispeed_ctrl(struct usbhs_priv *priv, int enable);
void usbhs_sys_usb_ctrl(struct usbhs_priv *priv, int enable); void usbhs_sys_usb_ctrl(struct usbhs_priv *priv, int enable);
void usbhs_sys_host_ctrl(struct usbhs_priv *priv, int enable); void usbhs_sys_host_ctrl(struct usbhs_priv *priv, int enable);
void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable); void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable);

2
drivers/usb/renesas_usbhs/mod_gadget.c
View File

@@ -681,7 +681,6 @@ static int usbhsg_try_start(struct usbhs_priv *priv, u32 status)
* - function * - function
* - usb module * - usb module
*/ */
usbhs_sys_hispeed_ctrl(priv, 1);
usbhs_sys_function_ctrl(priv, 1); usbhs_sys_function_ctrl(priv, 1);
usbhs_sys_usb_ctrl(priv, 1); usbhs_sys_usb_ctrl(priv, 1);
@@ -731,7 +730,6 @@ static int usbhsg_try_stop(struct usbhs_priv *priv, u32 status)
gpriv->gadget.speed = USB_SPEED_UNKNOWN; gpriv->gadget.speed = USB_SPEED_UNKNOWN;
/* disable sys */ /* disable sys */
usbhs_sys_hispeed_ctrl(priv, 0);
usbhs_sys_function_ctrl(priv, 0); usbhs_sys_function_ctrl(priv, 0);
usbhs_sys_usb_ctrl(priv, 0); usbhs_sys_usb_ctrl(priv, 0);

2
drivers/usb/renesas_usbhs/mod_host.c
View File

@@ -1205,7 +1205,6 @@ static int usbhsh_start(struct usbhs_priv *priv)
* - host * - host
* - usb module * - usb module
*/ */
usbhs_sys_hispeed_ctrl(priv, 1);
usbhs_sys_host_ctrl(priv, 1); usbhs_sys_host_ctrl(priv, 1);
usbhs_sys_usb_ctrl(priv, 1); usbhs_sys_usb_ctrl(priv, 1);
@@ -1242,7 +1241,6 @@ static int usbhsh_stop(struct usbhs_priv *priv)
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
/* disable sys */ /* disable sys */
usbhs_sys_hispeed_ctrl(priv, 0);
usbhs_sys_host_ctrl(priv, 0); usbhs_sys_host_ctrl(priv, 0);
usbhs_sys_usb_ctrl(priv, 0); usbhs_sys_usb_ctrl(priv, 0);