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

Commit ee9e5f4c authored by Jon Hunter's avatar Jon Hunter Committed by Greg Kroah-Hartman
Browse files

usb: xhci: tegra: Add runtime PM support 



Add runtime PM support to the Tegra XHCI driver and move the function
calls to enable/disable the clocks, regulators and PHY into the runtime
PM callbacks.

Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f468b55c

drivers/usb/host/xhci-tegra.c

+62 −26
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/phy/tegra/xusb.h>

#include <linux/phy/tegra/xusb.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/pm.h>

#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>

#include <linux/reset.h>

#include <linux/reset.h>

#include <linux/slab.h>

#include <linux/slab.h>
@@ -761,6 +762,49 @@ static void tegra_xusb_phy_disable(struct tegra_xusb *tegra) 
	}

	}

}

}





static int tegra_xusb_runtime_suspend(struct device *dev)

{

	struct tegra_xusb *tegra = dev_get_drvdata(dev);



	tegra_xusb_phy_disable(tegra);

	regulator_bulk_disable(tegra->soc->num_supplies, tegra->supplies);

	tegra_xusb_clk_disable(tegra);



	return 0;

}



static int tegra_xusb_runtime_resume(struct device *dev)

{

	struct tegra_xusb *tegra = dev_get_drvdata(dev);

	int err;



	err = tegra_xusb_clk_enable(tegra);

	if (err) {

		dev_err(dev, "failed to enable clocks: %d\n", err);

		return err;

	}



	err = regulator_bulk_enable(tegra->soc->num_supplies, tegra->supplies);

	if (err) {

		dev_err(dev, "failed to enable regulators: %d\n", err);

		goto disable_clk;

	}



	err = tegra_xusb_phy_enable(tegra);

	if (err < 0) {

		dev_err(dev, "failed to enable PHYs: %d\n", err);

		goto disable_regulator;

	}



	return 0;



disable_regulator:

	regulator_bulk_disable(tegra->soc->num_supplies, tegra->supplies);

disable_clk:

	tegra_xusb_clk_disable(tegra);

	return err;

}



static int tegra_xusb_load_firmware(struct tegra_xusb *tegra)

static int tegra_xusb_load_firmware(struct tegra_xusb *tegra)

{

{

	unsigned int code_tag_blocks, code_size_blocks, code_blocks;

	unsigned int code_tag_blocks, code_size_blocks, code_blocks;
@@ -1067,22 +1111,15 @@ static int tegra_xusb_probe(struct platform_device *pdev) 
	 */

	 */

	platform_set_drvdata(pdev, tegra);

	platform_set_drvdata(pdev, tegra);





	err = tegra_xusb_clk_enable(tegra);

	pm_runtime_enable(&pdev->dev);

	if (err) {

	if (!pm_runtime_enabled(&pdev->dev))

		dev_err(&pdev->dev, "failed to enable clocks: %d\n", err);

		err = pm_runtime_get_sync(&pdev->dev);

		goto put_usb2;

	else

	}

		err = tegra_xusb_runtime_resume(&pdev->dev);



	err = regulator_bulk_enable(tegra->soc->num_supplies, tegra->supplies);

	if (err) {

		dev_err(&pdev->dev, "failed to enable regulators: %d\n", err);

		goto disable_clk;

	}





	err = tegra_xusb_phy_enable(tegra);

	if (err < 0) {

	if (err < 0) {

		dev_err(&pdev->dev, "failed to enable PHYs: %d\n", err);

		dev_err(&pdev->dev, "failed to enable device: %d\n", err);

		goto disable_regulator;

		goto disable_rpm;

	}

	}





	tegra_xusb_ipfs_config(tegra, regs);

	tegra_xusb_ipfs_config(tegra, regs);
@@ -1090,7 +1127,7 @@ static int tegra_xusb_probe(struct platform_device *pdev) 
	err = tegra_xusb_load_firmware(tegra);

	err = tegra_xusb_load_firmware(tegra);

	if (err < 0) {

	if (err < 0) {

		dev_err(&pdev->dev, "failed to load firmware: %d\n", err);

		dev_err(&pdev->dev, "failed to load firmware: %d\n", err);

		goto disable_phy;

		goto put_rpm;

	}

	}





	tegra->hcd->regs = tegra->regs;

	tegra->hcd->regs = tegra->regs;
@@ -1100,7 +1137,7 @@ static int tegra_xusb_probe(struct platform_device *pdev) 
	err = usb_add_hcd(tegra->hcd, tegra->xhci_irq, IRQF_SHARED);

	err = usb_add_hcd(tegra->hcd, tegra->xhci_irq, IRQF_SHARED);

	if (err < 0) {

	if (err < 0) {

		dev_err(&pdev->dev, "failed to add USB HCD: %d\n", err);

		dev_err(&pdev->dev, "failed to add USB HCD: %d\n", err);

		goto disable_phy;

		goto put_rpm;

	}

	}





	device_wakeup_enable(tegra->hcd->self.controller);

	device_wakeup_enable(tegra->hcd->self.controller);
@@ -1155,13 +1192,11 @@ static int tegra_xusb_probe(struct platform_device *pdev) 
	usb_put_hcd(xhci->shared_hcd);

	usb_put_hcd(xhci->shared_hcd);

remove_usb2:

remove_usb2:

	usb_remove_hcd(tegra->hcd);

	usb_remove_hcd(tegra->hcd);

disable_phy:

put_rpm:

	tegra_xusb_phy_disable(tegra);

	if (!pm_runtime_status_suspended(&pdev->dev))

disable_regulator:

		tegra_xusb_runtime_suspend(&pdev->dev);

	regulator_bulk_disable(tegra->soc->num_supplies, tegra->supplies);

disable_rpm:

disable_clk:

	pm_runtime_disable(&pdev->dev);

	tegra_xusb_clk_disable(tegra);

put_usb2:

	usb_put_hcd(tegra->hcd);

	usb_put_hcd(tegra->hcd);

put_padctl:

put_padctl:

	tegra_xusb_padctl_put(tegra->padctl);

	tegra_xusb_padctl_put(tegra->padctl);
@@ -1181,9 +1216,8 @@ static int tegra_xusb_remove(struct platform_device *pdev) 
	dma_free_coherent(&pdev->dev, tegra->fw.size, tegra->fw.virt,

	dma_free_coherent(&pdev->dev, tegra->fw.size, tegra->fw.virt,

			  tegra->fw.phys);

			  tegra->fw.phys);





	tegra_xusb_phy_disable(tegra);

	pm_runtime_put_sync(&pdev->dev);

	regulator_bulk_disable(tegra->soc->num_supplies, tegra->supplies);

	pm_runtime_disable(&pdev->dev);

	tegra_xusb_clk_disable(tegra);





	tegra_xusb_padctl_put(tegra->padctl);

	tegra_xusb_padctl_put(tegra->padctl);
@@ -1211,6 +1245,8 @@ static int tegra_xusb_resume(struct device *dev) 
#endif

#endif





static const struct dev_pm_ops tegra_xusb_pm_ops = {

static const struct dev_pm_ops tegra_xusb_pm_ops = {

	SET_RUNTIME_PM_OPS(tegra_xusb_runtime_suspend,

			   tegra_xusb_runtime_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(tegra_xusb_suspend, tegra_xusb_resume)

	SET_SYSTEM_SLEEP_PM_OPS(tegra_xusb_suspend, tegra_xusb_resume)

};

};