diff options
| author | Lee Jones <lee.jones@linaro.org> | 2016-06-06 18:08:54 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-06-30 07:44:20 +0100 |
| commit | f5ee3f2b5ad6881a8194b9f684ce11640d1062f7 (patch) | |
| tree | 0f3dfdff00ca1022e7d0683b018d7c26f0868386 /drivers/usb | |
| parent | 0bcc0eab363aa80f79769324bf3f2ab7781840f2 (diff) | |
| download | linux-f5ee3f2b5ad6881a8194b9f684ce11640d1062f7.tar.bz2 | |
usb: host: ohci-st: Inform the reset framework that our reset line may 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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ohci-st.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-st.c b/drivers/usb/host/ohci-st.c index acf2eb2a5676..02816a1515a1 100644 --- a/drivers/usb/host/ohci-st.c +++ b/drivers/usb/host/ohci-st.c @@ -188,13 +188,15 @@ static int st_ohci_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); goto err_put_clks; } - 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); goto err_put_clks; |