| Message ID | 20160606170854.12407-2-lee.jones@linaro.org |
|---|---|
| State | Accepted |
| Commit | 19599304625b74c95bff318c735928eec668b1ca |
| Headers | show |
On Mon, 06 Jun 2016, Lee Jones wrote: > 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. > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- > drivers/usb/host/ehci-st.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Acked-by: Peter Griffin <peter.griffin@linaro.org>
On Tue, 28 Jun 2016, Lee Jones wrote: > On Mon, 06 Jun 2016, Alan Stern wrote: > > > On Mon, 6 Jun 2016, Lee Jones wrote: > > > > > 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. > > > > > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > > > For this andd the 10/10 patch: > > > > Acked-by: Alan Stern <stern@rowland.harvard.edu> > > Thanks Alan. > > I'm going to take this (actually half of this patch -- the other half > which is due for -next I will resubmit with your Ack) along with the > other patches due for the -rcs though my MFD -next branch. Sorry, ignore that. I'm going to take the whole thing. Just realised that both APIs are the *_shared() variant in this patch. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
diff --git a/drivers/usb/host/ehci-st.c b/drivers/usb/host/ehci-st.c index a94ed67..6cfce6f 100644 --- a/drivers/usb/host/ehci-st.c +++ b/drivers/usb/host/ehci-st.c @@ -206,7 +206,7 @@ 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 +214,7 @@ 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)
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. Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/usb/host/ehci-st.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.8.3