浏览代码

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>
Lee Jones 9 年之前
父节点
当前提交
f5ee3f2b5a
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      drivers/usb/host/ohci-st.c

+ 4 - 2
drivers/usb/host/ohci-st.c

@@ -188,13 +188,15 @@ static int st_ohci_platform_probe(struct platform_device *dev)
 		priv->clk48 = NULL;
 		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)) {
 	if (IS_ERR(priv->pwr)) {
 		err = PTR_ERR(priv->pwr);
 		err = PTR_ERR(priv->pwr);
 		goto err_put_clks;
 		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)) {
 	if (IS_ERR(priv->rst)) {
 		err = PTR_ERR(priv->rst);
 		err = PTR_ERR(priv->rst);
 		goto err_put_clks;
 		goto err_put_clks;