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

Commit 7e7a0e67 authored by Arun Ramamurthy's avatar Arun Ramamurthy Committed by Greg Kroah-Hartman
Browse files

usb: ehci-platform: add support for multiple phys per controller 



Added support for cases where one controller is connected
to multiple phys.

Signed-off-by: default avatarArun Ramamurthy <arunrama@broadcom.com>
Reviewed-by: default avatarRay Jui <rjui@broadcom.com>
Reviewed-by: default avatarScott Branden <sbranden@broadcom.com>
Tested-by: default avatarScott Branden <sbranden@broadcom.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85cd690d

drivers/usb/host/ehci-platform.c

+60 −22
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ 
struct ehci_platform_priv {

	struct clk *clks[EHCI_MAX_CLKS];

	struct reset_control *rst;

	struct phy *phy;

	struct phy **phys;

	int num_phys;

};



static const char hcd_name[] = "ehci-platform";
@@ -78,7 +79,7 @@ static int ehci_platform_power_on(struct platform_device *dev) 
{

	struct usb_hcd *hcd = platform_get_drvdata(dev);

	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);

	int clk, ret;

	int clk, ret, phy_num;



	for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++) {

		ret = clk_prepare_enable(priv->clks[clk]);
@@ -86,20 +87,28 @@ static int ehci_platform_power_on(struct platform_device *dev) 
			goto err_disable_clks;

	}



	if (priv->phy) {

		ret = phy_init(priv->phy);

		if (ret)

			goto err_disable_clks;



		ret = phy_power_on(priv->phy);

	for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {

		if (priv->phys[phy_num]) {

			ret = phy_init(priv->phys[phy_num]);

			if (ret)

				goto err_exit_phy;

			ret = phy_power_on(priv->phys[phy_num]);

			if (ret) {

				phy_exit(priv->phys[phy_num]);

				goto err_exit_phy;

			}

		}

	}



	return 0;



err_exit_phy:

	phy_exit(priv->phy);

	while (--phy_num >= 0) {

		if (priv->phys[phy_num]) {

			phy_power_off(priv->phys[phy_num]);

			phy_exit(priv->phys[phy_num]);

		}

	}

err_disable_clks:

	while (--clk >= 0)

		clk_disable_unprepare(priv->clks[clk]);
@@ -111,11 +120,13 @@ static void ehci_platform_power_off(struct platform_device *dev) 
{

	struct usb_hcd *hcd = platform_get_drvdata(dev);

	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);

	int clk;

	int clk, phy_num;



	if (priv->phy) {

		phy_power_off(priv->phy);

		phy_exit(priv->phy);

	for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {

		if (priv->phys[phy_num]) {

			phy_power_off(priv->phys[phy_num]);

			phy_exit(priv->phys[phy_num]);

		}

	}



	for (clk = EHCI_MAX_CLKS - 1; clk >= 0; clk--)
@@ -143,7 +154,8 @@ static int ehci_platform_probe(struct platform_device *dev) 
	struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);

	struct ehci_platform_priv *priv;

	struct ehci_hcd *ehci;

	int err, irq, clk = 0;

	const char *phy_name;

	int err, irq, phy_num, clk = 0;



	if (usb_disabled())

		return -ENODEV;
@@ -190,12 +202,38 @@ static int ehci_platform_probe(struct platform_device *dev) 
					  "needs-reset-on-resume"))

			pdata->reset_on_resume = 1;



		priv->phy = devm_phy_get(&dev->dev, "usb");

		if (IS_ERR(priv->phy)) {

			err = PTR_ERR(priv->phy);

			if (err == -EPROBE_DEFER)

		priv->num_phys = of_count_phandle_with_args(dev->dev.of_node,

				"phys", "#phy-cells");

		priv->num_phys = priv->num_phys > 0 ? priv->num_phys : 1;



		priv->phys = devm_kcalloc(&dev->dev, priv->num_phys,

				sizeof(struct phy *), GFP_KERNEL);

		if (!priv->phys)

			return -ENOMEM;



		for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {

				err = of_property_read_string_index(

						dev->dev.of_node,

						"phy-names", phy_num,

						&phy_name);



				if (err < 0) {

					if (priv->num_phys > 1) {

						dev_err(&dev->dev, "phy-names not provided");

						goto err_put_hcd;

			priv->phy = NULL;

					} else

						phy_name = "usb";

				}



				priv->phys[phy_num] = devm_phy_get(&dev->dev,

						phy_name);

				if (IS_ERR(priv->phys[phy_num])) {

					err = PTR_ERR(priv->phys[phy_num]);

					if ((priv->num_phys > 1) ||

					    (err == -EPROBE_DEFER))

						goto err_put_hcd;

					priv->phys[phy_num] = NULL;

				}

		}



		for (clk = 0; clk < EHCI_MAX_CLKS; clk++) {