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

Commit 32a51f2a authored by Roger Quadros's avatar Roger Quadros
Browse files

mfd: omap-usb-tll: introduce and use mode_needs_tll() 



This is a handy macro to check if the port requires the
USB TLL module or not. Use it to Enable the TLL module and manage
the clocks.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
parent 0bde3e9f

drivers/mfd/omap-usb-tll.c

+12 −8
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ 


#define is_ehci_tll_mode(x)	(x == OMAP_EHCI_PORT_MODE_TLL)



/* only PHY and UNUSED modes don't need TLL */

#define omap_usb_mode_needs_tll(x)	((x) != OMAP_USBHS_PORT_MODE_UNUSED &&\

					 (x) != OMAP_EHCI_PORT_MODE_PHY)



struct usbtll_omap {

	int					nch;	/* num. of channels */

	struct usbhs_omap_platform_data		*pdata;
@@ -211,6 +215,7 @@ static int usbtll_omap_probe(struct platform_device *pdev) 
	unsigned long				flags;

	int					ret = 0;

	int					i, ver;

	bool needs_tll;



	dev_dbg(dev, "starting TI HSUSB TLL Controller\n");
@@ -278,12 +283,11 @@ static int usbtll_omap_probe(struct platform_device *pdev) 


	spin_lock_irqsave(&tll->lock, flags);



	if (is_ehci_tll_mode(pdata->port_mode[0]) ||

	    is_ehci_tll_mode(pdata->port_mode[1]) ||

	    is_ehci_tll_mode(pdata->port_mode[2]) ||

	    is_ohci_port(pdata->port_mode[0]) ||

	    is_ohci_port(pdata->port_mode[1]) ||

	    is_ohci_port(pdata->port_mode[2])) {

	needs_tll = false;

	for (i = 0; i < tll->nch; i++)

		needs_tll |= omap_usb_mode_needs_tll(pdata->port_mode[i]);



	if (needs_tll) {



		/* Program Common TLL register */

		reg = usbtll_read(base, OMAP_TLL_SHARED_CONF);
@@ -372,7 +376,7 @@ static int usbtll_runtime_resume(struct device *dev) 
	spin_lock_irqsave(&tll->lock, flags);



	for (i = 0; i < tll->nch; i++) {

		if (is_ehci_tll_mode(pdata->port_mode[i])) {

		if (omap_usb_mode_needs_tll(pdata->port_mode[i])) {

			int r;



			if (IS_ERR(tll->ch_clk[i]))
@@ -408,7 +412,7 @@ static int usbtll_runtime_suspend(struct device *dev) 
	spin_lock_irqsave(&tll->lock, flags);



	for (i = 0; i < tll->nch; i++) {

		if (is_ehci_tll_mode(pdata->port_mode[i])) {

		if (omap_usb_mode_needs_tll(pdata->port_mode[i])) {

			if (!IS_ERR(tll->ch_clk[i]))

				clk_disable(tll->ch_clk[i]);

		}