Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf9c85e7 authored by Peter Chen's avatar Peter Chen
Browse files

usb: chipidea: introduce ci_platform_configure 



It is used to configure controller parameters according to
platform data, like speed, stream mode, etc, both host and
device's initialization need it, most of code are the
same for both roles, with this new interface, it can reduce
the duplicated code and be easy to maintain in future.

Signed-off-by: default avatarPeter Chen <peter.chen@freescale.com>
parent 9d2effea

drivers/usb/chipidea/ci.h

+2 −0
Original line number Diff line number Diff line
@@ -427,4 +427,6 @@ u8 hw_port_test_get(struct ci_hdrc *ci); 
int hw_wait_reg(struct ci_hdrc *ci, enum ci_hw_regs reg, u32 mask,

				u32 value, unsigned int timeout_ms);



void ci_platform_configure(struct ci_hdrc *ci);



#endif	/* __DRIVERS_USB_CHIPIDEA_CI_H */

drivers/usb/chipidea/core.c

+24 −10
Original line number Diff line number Diff line
@@ -405,6 +405,28 @@ static int ci_usb_phy_init(struct ci_hdrc *ci) 
	return ret;

}





/**

 * ci_platform_configure: do controller configure

 * @ci: the controller

 *

 */

void ci_platform_configure(struct ci_hdrc *ci)

{

	if (ci->platdata->flags & CI_HDRC_DISABLE_STREAMING)

		hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);



	if (ci->platdata->flags & CI_HDRC_FORCE_FULLSPEED) {

		if (ci->hw_bank.lpm)

			hw_write(ci, OP_DEVLC, DEVLC_PFSC, DEVLC_PFSC);

		else

			hw_write(ci, OP_PORTSC, PORTSC_PFSC, PORTSC_PFSC);

	}



	if (ci->platdata->flags & CI_HDRC_SET_NON_ZERO_TTHA)

		hw_write(ci, OP_TTCTRL, TTCTRL_TTHA_MASK, TTCTRL_TTHA);

}



/**

 * hw_controller_reset: do controller reset

 * @ci: the controller
@@ -449,16 +471,6 @@ int hw_device_reset(struct ci_hdrc *ci) 
		ci->platdata->notify_event(ci,

			CI_HDRC_CONTROLLER_RESET_EVENT);



	if (ci->platdata->flags & CI_HDRC_DISABLE_STREAMING)

		hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);



	if (ci->platdata->flags & CI_HDRC_FORCE_FULLSPEED) {

		if (ci->hw_bank.lpm)

			hw_write(ci, OP_DEVLC, DEVLC_PFSC, DEVLC_PFSC);

		else

			hw_write(ci, OP_PORTSC, PORTSC_PFSC, PORTSC_PFSC);

	}



	/* USBMODE should be configured step by step */

	hw_write(ci, OP_USBMODE, USBMODE_CM, USBMODE_CM_IDLE);

	hw_write(ci, OP_USBMODE, USBMODE_CM, USBMODE_CM_DC);
@@ -471,6 +483,8 @@ int hw_device_reset(struct ci_hdrc *ci) 
		return -ENODEV;

	}



	ci_platform_configure(ci);



	return 0;

}

drivers/usb/chipidea/host.c

+1 −8
Original line number Diff line number Diff line
@@ -153,14 +153,7 @@ static int host_start(struct ci_hdrc *ci) 
		}

	}



	if (ci->platdata->flags & CI_HDRC_DISABLE_STREAMING)

		hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);



	if (ci->platdata->flags & CI_HDRC_FORCE_FULLSPEED)

		hw_write(ci, OP_PORTSC, PORTSC_PFSC, PORTSC_PFSC);



	if (ci->platdata->flags & CI_HDRC_SET_NON_ZERO_TTHA)

		hw_write(ci, OP_TTCTRL, TTCTRL_TTHA_MASK, TTCTRL_TTHA);

	ci_platform_configure(ci);



	return ret;