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

Commit 19599304 authored by Lee Jones's avatar Lee Jones
Browse files

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: default avatarPeter Griffin <peter.griffin@linaro.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent f5ee3f2b

drivers/usb/host/ehci-st.c

+4 −2
Original line number Diff line number Diff line
@@ -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)