Skip to content

Commit

Permalink
usb: host: ehci-st: Inform the reset framework that our reset line ma…
Browse files Browse the repository at this point in the history
…y be shared

On the STiH410 B2120 development board the ST EHCI IP shares its reset
line with the OHCI IP.  New functionality in the reset subsystems forces
consumers to be explicit when requesting shared/exclusive reset lines.

Acked-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Lee Jones committed Jun 30, 2016
1 parent f5ee3f2 commit 1959930
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/usb/host/ehci-st.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,15 +206,17 @@ static int st_ehci_platform_probe(struct platform_device *dev)
priv->clk48 = NULL;
}

priv->pwr = devm_reset_control_get_optional(&dev->dev, "power");
priv->pwr =
devm_reset_control_get_optional_shared(&dev->dev, "power");
if (IS_ERR(priv->pwr)) {
err = PTR_ERR(priv->pwr);
if (err == -EPROBE_DEFER)
goto err_put_clks;
priv->pwr = NULL;
}

priv->rst = devm_reset_control_get_optional(&dev->dev, "softreset");
priv->rst =
devm_reset_control_get_optional_shared(&dev->dev, "softreset");
if (IS_ERR(priv->rst)) {
err = PTR_ERR(priv->rst);
if (err == -EPROBE_DEFER)
Expand Down

0 comments on commit 1959930

Please sign in to comment.