Commit 2288e109 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Felipe Balbi
Browse files

usb: gadget: renesas_usbhs: remove usbhs_sys_hispeed_ctrl() 



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

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent dd39c358

drivers/usb/renesas_usbhs/common.c

+4 −9
Original line number Diff line number Diff line
@@ -100,11 +100,6 @@ void usbhs_sys_clock_ctrl(struct usbhs_priv *priv, int enable) 
	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)

{

	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)

{

	u16 mask = DCFM | DRPD | DPRPU;

	u16 val  = DCFM | DRPD;

	u16 mask = DCFM | DRPD | DPRPU | HSE;

	u16 val  = DCFM | DRPD | HSE;

	int has_otg = usbhs_get_dparam(priv, 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)

{

	u16 mask = DCFM | DRPD | DPRPU;

	u16 val  = DPRPU;

	u16 mask = DCFM | DRPD | DPRPU | HSE;

	u16 val  = DPRPU | HSE;



	/*

	 * if enable

drivers/usb/renesas_usbhs/common.h

+0 −1
Original line number Diff line number Diff line
@@ -284,7 +284,6 @@ int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev); 
 * sysconfig

 */

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_host_ctrl(struct usbhs_priv *priv, int enable);

void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable);

drivers/usb/renesas_usbhs/mod_gadget.c

+0 −2
Original line number Diff line number Diff line
@@ -681,7 +681,6 @@ static int usbhsg_try_start(struct usbhs_priv *priv, u32 status) 
	 * - function

	 * - usb module

	 */

	usbhs_sys_hispeed_ctrl(priv, 1);

	usbhs_sys_function_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;



	/* disable sys */

	usbhs_sys_hispeed_ctrl(priv, 0);

	usbhs_sys_function_ctrl(priv, 0);

	usbhs_sys_usb_ctrl(priv, 0);

drivers/usb/renesas_usbhs/mod_host.c

+0 −2
Original line number Diff line number Diff line
@@ -1205,7 +1205,6 @@ static int usbhsh_start(struct usbhs_priv *priv) 
	 * - host

	 * - usb module

	 */

	usbhs_sys_hispeed_ctrl(priv, 1);

	usbhs_sys_host_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);



	/* disable sys */

	usbhs_sys_hispeed_ctrl(priv, 0);

	usbhs_sys_host_ctrl(priv, 0);

	usbhs_sys_usb_ctrl(priv, 0);