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

Commit d0e08b00 authored by Jiancheng Xue's avatar Jiancheng Xue Committed by Greg Kroah-Hartman
Browse files

usb: ehci-platform: add reset controller number in struct ehci_platform_priv 



Some ehci compatible controllers have more than one reset signal lines,
e.g., Synopsys DWC USB2.0 Host-AHB Controller has two resets hreset_i_n
and phy_rst_i_n. Two more resets are added in this patch in order for
this kind of controller to use this driver directly.

Signed-off-by: default avatarJiancheng Xue <xuejiancheng@hisilicon.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a695a90

drivers/usb/host/ehci-platform.c

+28 −17
Original line number Diff line number Diff line
@@ -39,11 +39,12 @@ 


#define DRIVER_DESC "EHCI generic platform driver"

#define EHCI_MAX_CLKS 3

#define EHCI_MAX_RSTS 3

#define hcd_to_ehci_priv(h) ((struct ehci_platform_priv *)hcd_to_ehci(h)->priv)



struct ehci_platform_priv {

	struct clk *clks[EHCI_MAX_CLKS];

	struct reset_control *rst;

	struct reset_control *rsts[EHCI_MAX_RSTS];

	struct phy **phys;

	int num_phys;

	bool reset_on_resume;
@@ -149,7 +150,7 @@ 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, phy_num, clk = 0;

	int err, irq, phy_num, clk = 0, rst;



	if (usb_disabled())

		return -ENODEV;
@@ -234,16 +235,22 @@ static int ehci_platform_probe(struct platform_device *dev) 
		}

	}



	priv->rst = devm_reset_control_get_optional(&dev->dev, NULL);

	if (IS_ERR(priv->rst)) {

		err = PTR_ERR(priv->rst);

	for (rst = 0; rst < EHCI_MAX_RSTS; rst++) {

		priv->rsts[rst] = of_reset_control_get_by_index(

					dev->dev.of_node, rst);

		if (IS_ERR(priv->rsts[rst])) {

			err = PTR_ERR(priv->rsts[rst]);

			if (err == -EPROBE_DEFER)

			goto err_put_clks;

		priv->rst = NULL;

	} else {

		err = reset_control_deassert(priv->rst);

		if (err)

			goto err_put_clks;

				goto err_reset;

			priv->rsts[rst] = NULL;

			break;

		}



		err = reset_control_deassert(priv->rsts[rst]);

		if (err) {

			reset_control_put(priv->rsts[rst]);

			goto err_reset;

		}

	}



	if (pdata->big_endian_desc)
@@ -300,8 +307,10 @@ static int ehci_platform_probe(struct platform_device *dev) 
	if (pdata->power_off)

		pdata->power_off(dev);

err_reset:

	if (priv->rst)

		reset_control_assert(priv->rst);

	while (--rst >= 0) {

		reset_control_assert(priv->rsts[rst]);

		reset_control_put(priv->rsts[rst]);

	}

err_put_clks:

	while (--clk >= 0)

		clk_put(priv->clks[clk]);
@@ -319,15 +328,17 @@ static int ehci_platform_remove(struct platform_device *dev) 
	struct usb_hcd *hcd = platform_get_drvdata(dev);

	struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);

	struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);

	int clk;

	int clk, rst;



	usb_remove_hcd(hcd);



	if (pdata->power_off)

		pdata->power_off(dev);



	if (priv->rst)

		reset_control_assert(priv->rst);

	for (rst = 0; rst < EHCI_MAX_RSTS && priv->rsts[rst]; rst++) {

		reset_control_assert(priv->rsts[rst]);

		reset_control_put(priv->rsts[rst]);

	}



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

		clk_put(priv->clks[clk]);