[RFC PATCH 2/3] usb: phy: msm: Make phy_reset clk and reset line optional.

[RFC PATCH 2/3] usb: phy: msm: Make phy_reset clk and reset line optional.

[Srinivas Kandagatla]

This patch makes the phy reset clk and reset line optional as this clk
is not available on boards like IFC6410 with APQ8064.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/usb/phy/phy-msm-usb.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index ced34f3..3bb559d 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -279,11 +279,11 @@ static int msm_otg_link_clk_reset(struct msm_otg *motg, bool assert)
 
 static int msm_otg_phy_clk_reset(struct msm_otg *motg)
 {
-	int ret;
+	int ret = 0;
 
-	if (motg->pdata->phy_clk_reset)
+	if (motg->pdata->phy_clk_reset && motg->phy_reset_clk)
 		ret = motg->pdata->phy_clk_reset(motg->phy_reset_clk);
-	else
+	else if (motg->phy_rst)
 		ret = reset_control_reset(motg->phy_rst);
 
 	if (ret)
@@ -1464,7 +1464,7 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg)
 
 	motg->phy_rst = devm_reset_control_get(&pdev->dev, "phy");
 	if (IS_ERR(motg->phy_rst))
-		return PTR_ERR(motg->phy_rst);
+		motg->phy_rst = NULL;
 
 	pdata->mode = of_usb_get_dr_mode(node);
 	if (pdata->mode == USB_DR_MODE_UNKNOWN)
@@ -1556,7 +1556,7 @@ static int msm_otg_probe(struct platform_device *pdev)
 					   np ? "phy" : "usb_phy_clk");
 	if (IS_ERR(motg->phy_reset_clk)) {
 		dev_err(&pdev->dev, "failed to get usb_phy_clk\n");
-		return PTR_ERR(motg->phy_reset_clk);
+		motg->phy_reset_clk = NULL;
 	}
 
 	motg->clk = devm_clk_get(&pdev->dev, np ? "core" : "usb_hs_clk");
-- 
1.9.1

Re: [RFC PATCH 2/3 ] usb: phy: msm: Make phy_reset clk and reset line optional.

[pramod gurav]

Hi Srini,

On Thu, Jul 17, 2014 at 6:19 PM,  <pramod.gurav.etc@gmail.com> wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
>
> This patch makes the phy reset clk and reset line optional as this clk
> is not available on boards like IFC6410 with APQ8064.
>
.
[snip]
.
>
>         pdata->mode = of_usb_get_dr_mode(node);
>         if (pdata->mode == USB_DR_MODE_UNKNOWN)
> @@ -1556,7 +1556,7 @@ static int msm_otg_probe(struct platform_device *pdev)
>                                            np ? "phy" : "usb_phy_clk");
>         if (IS_ERR(motg->phy_reset_clk)) {
>                 dev_err(&pdev->dev, "failed to get usb_phy_clk\n");

I keep getting this error on IFC6410. Cant we suppress it?

> -               return PTR_ERR(motg->phy_reset_clk);
> +               motg->phy_reset_clk = NULL;

for non-ifc boards(having this clk), if they have this clock should
not code return on failure to get the usb_phy_clk?

>         }
>
>         motg->clk = devm_clk_get(&pdev->dev, np ? "core" : "usb_hs_clk");
> --
> 1.7.9.5
>



-- 
Thanks and Regards
Pramod

Re: [RFC PATCH 2/3 ] usb: phy: msm: Make phy_reset clk and reset line optional.

[Srinivas Kandagatla]

On 17/07/14 13:54, pramod gurav wrote:
> Hi Srini,
>
> On Thu, Jul 17, 2014 at 6:19 PM,  <pramod.gurav.etc@gmail.com> wrote:
>> From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
>>
>> This patch makes the phy reset clk and reset line optional as this clk
>> is not available on boards like IFC6410 with APQ8064.
>>
> .
> [snip]
> .
>>
>>          pdata->mode = of_usb_get_dr_mode(node);
>>          if (pdata->mode == USB_DR_MODE_UNKNOWN)
>> @@ -1556,7 +1556,7 @@ static int msm_otg_probe(struct platform_device *pdev)
>>                                             np ? "phy" : "usb_phy_clk");
>>          if (IS_ERR(motg->phy_reset_clk)) {
>>                  dev_err(&pdev->dev, "failed to get usb_phy_clk\n");
>
> I keep getting this error on IFC6410. Cant we suppress it?
IMO, We should ignore this message for IFC 6410 board as they do not 
have phy reset clk.


>
>> -               return PTR_ERR(motg->phy_reset_clk);
>> +               motg->phy_reset_clk = NULL;
>
> for non-ifc boards(having this clk), if they have this clock should
> not code return on failure to get the usb_phy_clk?
I agree, Its a catch 22 situation here.
Unless we introduce more SOC level awareness into this driver. Which 
would be a bit overdo for printing this message.

The error message should be considered more seriously for non IFC board.

Thanks,
srini
>
>>          }
>>
>>          motg->clk = devm_clk_get(&pdev->dev, np ? "core" : "usb_hs_clk");
>> --
>> 1.7.9.5
>>
>
>
>

Re: [RFC PATCH 2/3 ] usb: phy: msm: Make phy_reset clk and reset line optional.

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1072 bytes --]

Hi,

On Thu, Jul 17, 2014 at 02:14:15PM +0100, Srinivas Kandagatla wrote:
> On 17/07/14 13:54, pramod gurav wrote:
> >Hi Srini,
> >
> >On Thu, Jul 17, 2014 at 6:19 PM,  <pramod.gurav.etc@gmail.com> wrote:
> >>From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> >>
> >>This patch makes the phy reset clk and reset line optional as this clk
> >>is not available on boards like IFC6410 with APQ8064.
> >>
> >.
> >[snip]
> >.
> >>
> >>         pdata->mode = of_usb_get_dr_mode(node);
> >>         if (pdata->mode == USB_DR_MODE_UNKNOWN)
> >>@@ -1556,7 +1556,7 @@ static int msm_otg_probe(struct platform_device *pdev)
> >>                                            np ? "phy" : "usb_phy_clk");
> >>         if (IS_ERR(motg->phy_reset_clk)) {
> >>                 dev_err(&pdev->dev, "failed to get usb_phy_clk\n");
> >
> >I keep getting this error on IFC6410. Cant we suppress it?
> IMO, We should ignore this message for IFC 6410 board as they do not have
> phy reset clk.

looks like that should become a dev_dbg() then ?

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [RFC PATCH 2/3 ] usb: phy: msm: Make phy_reset clk and reset line optional.

[Srinivas Kandagatla]

On 17/07/14 15:39, Felipe Balbi wrote:
> Hi,
>
> On Thu, Jul 17, 2014 at 02:14:15PM +0100, Srinivas Kandagatla wrote:
>> On 17/07/14 13:54, pramod gurav wrote:
>>> Hi Srini,
>>>
>>> On Thu, Jul 17, 2014 at 6:19 PM,  <pramod.gurav.etc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>>>> From: Srinivas Kandagatla <srinivas.kandagatla-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>>>>
>>>> This patch makes the phy reset clk and reset line optional as this clk
>>>> is not available on boards like IFC6410 with APQ8064.
>>>>
>>> .
>>> [snip]
>>> .
>>>>
>>>>          pdata->mode = of_usb_get_dr_mode(node);
>>>>          if (pdata->mode == USB_DR_MODE_UNKNOWN)
>>>> @@ -1556,7 +1556,7 @@ static int msm_otg_probe(struct platform_device *pdev)
>>>>                                             np ? "phy" : "usb_phy_clk");
>>>>          if (IS_ERR(motg->phy_reset_clk)) {
>>>>                  dev_err(&pdev->dev, "failed to get usb_phy_clk\n");
>>>
>>> I keep getting this error on IFC6410. Cant we suppress it?
>> IMO, We should ignore this message for IFC 6410 board as they do not have
>> phy reset clk.
>
> looks like that should become a dev_dbg() then ?
>
Sure, I agree.

I will resend the patch with dev_dbg.

--srini
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html