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

Commit c14af973 authored by Franklin S Cooper Jr's avatar Franklin S Cooper Jr Committed by Felipe Balbi
Browse files

usb: dwc3: keystone: Add PM_RUNTIME Support to DWC3 Keystone USB driver 



For 66AK2Gx there is a requirement to use PM Runtime to properly manage
clocks and the power domains. Therefore, add PM runtime support. Remove
legacy clock api's calls since other users of this driver worked without
these clock apis calls.

Signed-off-by: default avatarFranklin S Cooper Jr <fcooper@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 0ae99ecb

drivers/usb/dwc3/dwc3-keystone.c

+10 −12
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ 
 * GNU General Public License for more details.

 * GNU General Public License for more details.

 */

 */





#include <linux/clk.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>
@@ -23,6 +22,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/pm_runtime.h>





/* USBSS register offsets */

/* USBSS register offsets */

#define USBSS_REVISION		0x0000

#define USBSS_REVISION		0x0000
@@ -41,7 +41,6 @@ 




struct dwc3_keystone {

struct dwc3_keystone {

	struct device			*dev;

	struct device			*dev;

	struct clk			*clk;

	void __iomem			*usbss;

	void __iomem			*usbss;

};

};
@@ -106,17 +105,13 @@ static int kdwc3_probe(struct platform_device *pdev) 
	if (IS_ERR(kdwc->usbss))

	if (IS_ERR(kdwc->usbss))

		return PTR_ERR(kdwc->usbss);

		return PTR_ERR(kdwc->usbss);





	kdwc->clk = devm_clk_get(kdwc->dev, "usb");

	pm_runtime_enable(kdwc->dev);

	if (IS_ERR(kdwc->clk)) {

		dev_err(kdwc->dev, "unable to get usb clock\n");

		return PTR_ERR(kdwc->clk);

	}





	error = clk_prepare_enable(kdwc->clk);

	error = pm_runtime_get_sync(kdwc->dev);

	if (error < 0) {

	if (error < 0) {

		dev_err(kdwc->dev, "unable to enable usb clock, error %d\n",

		dev_err(kdwc->dev, "pm_runtime_get_sync failed, error %d\n",

			error);

			error);

		return error;

		goto err_irq;

	}

	}





	irq = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);
@@ -147,7 +142,8 @@ static int kdwc3_probe(struct platform_device *pdev) 
err_core:

err_core:

	kdwc3_disable_irqs(kdwc);

	kdwc3_disable_irqs(kdwc);

err_irq:

err_irq:

	clk_disable_unprepare(kdwc->clk);

	pm_runtime_put_sync(kdwc->dev);

	pm_runtime_disable(kdwc->dev);





	return error;

	return error;

}

}
@@ -167,7 +163,9 @@ static int kdwc3_remove(struct platform_device *pdev) 




	kdwc3_disable_irqs(kdwc);

	kdwc3_disable_irqs(kdwc);

	device_for_each_child(&pdev->dev, NULL, kdwc3_remove_core);

	device_for_each_child(&pdev->dev, NULL, kdwc3_remove_core);

	clk_disable_unprepare(kdwc->clk);

	pm_runtime_put_sync(kdwc->dev);

	pm_runtime_disable(kdwc->dev);



	platform_set_drvdata(pdev, NULL);

	platform_set_drvdata(pdev, NULL);





	return 0;

	return 0;