summaryrefslogtreecommitdiff
path: root/drivers/usb/host/ehci-st.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2016-06-06 20:08:53 +0300
committerLee Jones <lee.jones@linaro.org>2016-06-30 09:44:21 +0300
commit19599304625b74c95bff318c735928eec668b1ca (patch)
tree7aab1582b7a52b4467d0342d6f963ca815e1faeb /drivers/usb/host/ehci-st.c
parentf5ee3f2b5ad6881a8194b9f684ce11640d1062f7 (diff)
downloadlinux-19599304625b74c95bff318c735928eec668b1ca.tar.xz
usb: host: ehci-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: Peter Griffin <peter.griffin@linaro.org> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/usb/host/ehci-st.c')
-rw-r--r--drivers/usb/host/ehci-st.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-st.c b/drivers/usb/host/ehci-st.c
index a94ed677d937..be4a2788fc58 100644
--- a/drivers/usb/host/ehci-st.c
+++ b/drivers/usb/host/ehci-st.c
@@ -206,7 +206,8 @@ 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)
@@ -214,7 +215,8 @@ static int st_ehci_platform_probe(struct platform_device *dev)
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)