* [PATCH 1/1] phy: phy-cadence-salvo: add phy .init API
@ 2020-05-07 5:21 Peter Chen
[not found] ` <20200513025709.GB29070@a0393678ub>
0 siblings, 1 reply; 4+ messages in thread
From: Peter Chen @ 2020-05-07 5:21 UTC (permalink / raw)
To: kishon, vkoul; +Cc: linux-usb, jun.li, linux-imx, Peter Chen
.init is used for PHY's initialization, and .power_on/power_off are only
used for clock on and off.
Signed-off-by: Peter Chen <peter.chen@nxp.com>
---
drivers/phy/cadence/phy-cadence-salvo.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/phy/cadence/phy-cadence-salvo.c b/drivers/phy/cadence/phy-cadence-salvo.c
index fa666527356d..c2b6ddfe02e0 100644
--- a/drivers/phy/cadence/phy-cadence-salvo.c
+++ b/drivers/phy/cadence/phy-cadence-salvo.c
@@ -206,7 +206,7 @@ static struct cdns_reg_pairs cdns_nxp_sequence_pair[] = {
};
-static int cdns_salvo_phy_power_on(struct phy *phy)
+static int cdns_salvo_phy_init(struct phy *phy)
{
struct cdns_salvo_phy *salvo_phy = phy_get_drvdata(phy);
struct cdns_salvo_data *data = salvo_phy->data;
@@ -231,9 +231,18 @@ static int cdns_salvo_phy_power_on(struct phy *phy)
udelay(10);
+ clk_disable_unprepare(salvo_phy->clk);
+
return ret;
}
+static int cdns_salvo_phy_power_on(struct phy *phy)
+{
+ struct cdns_salvo_phy *salvo_phy = phy_get_drvdata(phy);
+
+ return clk_prepare_enable(salvo_phy->clk);
+}
+
static int cdns_salvo_phy_power_off(struct phy *phy)
{
struct cdns_salvo_phy *salvo_phy = phy_get_drvdata(phy);
@@ -244,6 +253,7 @@ static int cdns_salvo_phy_power_off(struct phy *phy)
}
static struct phy_ops cdns_salvo_phy_ops = {
+ .init = cdns_salvo_phy_init,
.power_on = cdns_salvo_phy_power_on,
.power_off = cdns_salvo_phy_power_off,
.owner = THIS_MODULE,
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] phy: phy-cadence-salvo: add phy .init API
[not found] ` <20200513025709.GB29070@a0393678ub>
@ 2020-05-13 10:51 ` Peter Chen
2020-05-13 11:00 ` Vinod Koul
2020-05-13 11:03 ` Kishon Vijay Abraham I
0 siblings, 2 replies; 4+ messages in thread
From: Peter Chen @ 2020-05-13 10:51 UTC (permalink / raw)
To: Kishon Vijay Abraham I; +Cc: vkoul, linux-usb, Jun Li, dl-linux-imx
On 20-05-13 08:27:09, Kishon Vijay Abraham I wrote:
> Hi Peter,
>
> On Thu, May 07, 2020 at 01:21:20PM +0800, Peter Chen wrote:
> > .init is used for PHY's initialization, and .power_on/power_off are only
> > used for clock on and off.
> >
> > Signed-off-by: Peter Chen <peter.chen@nxp.com>
>
> This patch doesn't apply cleanly. Can you kindly check phy -next is
> proper since I expected this to merge cleanly?
>
Hi Kishon,
I don't see my first salvo PHY at your phy -next tree
https://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git/log/?h=next
But I do see it is on linux-next tree:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=50d35aa8c15f7210fe76de64b1940100b588bcae
What happened?
Peter
> Thanks
> Kishon
> > ---
> > drivers/phy/cadence/phy-cadence-salvo.c | 12 +++++++++++-
> > 1 file changed, 11 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/phy/cadence/phy-cadence-salvo.c b/drivers/phy/cadence/phy-cadence-salvo.c
> > index fa666527356d..c2b6ddfe02e0 100644
> > --- a/drivers/phy/cadence/phy-cadence-salvo.c
> > +++ b/drivers/phy/cadence/phy-cadence-salvo.c
> > @@ -206,7 +206,7 @@ static struct cdns_reg_pairs cdns_nxp_sequence_pair[] = {
> > };
> >
> >
> > -static int cdns_salvo_phy_power_on(struct phy *phy)
> > +static int cdns_salvo_phy_init(struct phy *phy)
> > {
> > struct cdns_salvo_phy *salvo_phy = phy_get_drvdata(phy);
> > struct cdns_salvo_data *data = salvo_phy->data;
> > @@ -231,9 +231,18 @@ static int cdns_salvo_phy_power_on(struct phy *phy)
> >
> > udelay(10);
> >
> > + clk_disable_unprepare(salvo_phy->clk);
> > +
> > return ret;
> > }
> >
> > +static int cdns_salvo_phy_power_on(struct phy *phy)
> > +{
> > + struct cdns_salvo_phy *salvo_phy = phy_get_drvdata(phy);
> > +
> > + return clk_prepare_enable(salvo_phy->clk);
> > +}
> > +
> > static int cdns_salvo_phy_power_off(struct phy *phy)
> > {
> > struct cdns_salvo_phy *salvo_phy = phy_get_drvdata(phy);
> > @@ -244,6 +253,7 @@ static int cdns_salvo_phy_power_off(struct phy *phy)
> > }
> >
> > static struct phy_ops cdns_salvo_phy_ops = {
> > + .init = cdns_salvo_phy_init,
> > .power_on = cdns_salvo_phy_power_on,
> > .power_off = cdns_salvo_phy_power_off,
> > .owner = THIS_MODULE,
> > --
> > 2.17.1
> >
--
Thanks,
Peter Chen
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] phy: phy-cadence-salvo: add phy .init API
2020-05-13 10:51 ` Peter Chen
@ 2020-05-13 11:00 ` Vinod Koul
2020-05-13 11:03 ` Kishon Vijay Abraham I
1 sibling, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2020-05-13 11:00 UTC (permalink / raw)
To: Peter Chen; +Cc: Kishon Vijay Abraham I, linux-usb, Jun Li, dl-linux-imx
On 13-05-20, 10:51, Peter Chen wrote:
> On 20-05-13 08:27:09, Kishon Vijay Abraham I wrote:
> > Hi Peter,
> >
> > On Thu, May 07, 2020 at 01:21:20PM +0800, Peter Chen wrote:
> > > .init is used for PHY's initialization, and .power_on/power_off are only
> > > used for clock on and off.
> > >
> > > Signed-off-by: Peter Chen <peter.chen@nxp.com>
> >
> > This patch doesn't apply cleanly. Can you kindly check phy -next is
> > proper since I expected this to merge cleanly?
> >
>
> Hi Kishon,
>
> I don't see my first salvo PHY at your phy -next tree
>
> https://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git/log/?h=next
>
> But I do see it is on linux-next tree:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=50d35aa8c15f7210fe76de64b1940100b588bcae
>
> What happened?
Phy tree has moved to git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
--
~Vinod
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] phy: phy-cadence-salvo: add phy .init API
2020-05-13 10:51 ` Peter Chen
2020-05-13 11:00 ` Vinod Koul
@ 2020-05-13 11:03 ` Kishon Vijay Abraham I
1 sibling, 0 replies; 4+ messages in thread
From: Kishon Vijay Abraham I @ 2020-05-13 11:03 UTC (permalink / raw)
To: Peter Chen; +Cc: vkoul, linux-usb, Jun Li, dl-linux-imx
Hi Peter,
On 5/13/2020 4:21 PM, Peter Chen wrote:
> On 20-05-13 08:27:09, Kishon Vijay Abraham I wrote:
>> Hi Peter,
>>
>> On Thu, May 07, 2020 at 01:21:20PM +0800, Peter Chen wrote:
>>> .init is used for PHY's initialization, and .power_on/power_off are only
>>> used for clock on and off.
>>>
>>> Signed-off-by: Peter Chen <peter.chen@nxp.com>
>>
>> This patch doesn't apply cleanly. Can you kindly check phy -next is
>> proper since I expected this to merge cleanly?
>>
>
> Hi Kishon,
>
> I don't see my first salvo PHY at your phy -next tree
>
> https://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git/log/?h=next
PHY tree is moved here
git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
Thanks
Kishon
>
> But I do see it is on linux-next tree:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=50d35aa8c15f7210fe76de64b1940100b588bcae
>
> What happened?
>
> Peter
>> Thanks
>> Kishon
>>> ---
>>> drivers/phy/cadence/phy-cadence-salvo.c | 12 +++++++++++-
>>> 1 file changed, 11 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/phy/cadence/phy-cadence-salvo.c b/drivers/phy/cadence/phy-cadence-salvo.c
>>> index fa666527356d..c2b6ddfe02e0 100644
>>> --- a/drivers/phy/cadence/phy-cadence-salvo.c
>>> +++ b/drivers/phy/cadence/phy-cadence-salvo.c
>>> @@ -206,7 +206,7 @@ static struct cdns_reg_pairs cdns_nxp_sequence_pair[] = {
>>> };
>>>
>>>
>>> -static int cdns_salvo_phy_power_on(struct phy *phy)
>>> +static int cdns_salvo_phy_init(struct phy *phy)
>>> {
>>> struct cdns_salvo_phy *salvo_phy = phy_get_drvdata(phy);
>>> struct cdns_salvo_data *data = salvo_phy->data;
>>> @@ -231,9 +231,18 @@ static int cdns_salvo_phy_power_on(struct phy *phy)
>>>
>>> udelay(10);
>>>
>>> + clk_disable_unprepare(salvo_phy->clk);
>>> +
>>> return ret;
>>> }
>>>
>>> +static int cdns_salvo_phy_power_on(struct phy *phy)
>>> +{
>>> + struct cdns_salvo_phy *salvo_phy = phy_get_drvdata(phy);
>>> +
>>> + return clk_prepare_enable(salvo_phy->clk);
>>> +}
>>> +
>>> static int cdns_salvo_phy_power_off(struct phy *phy)
>>> {
>>> struct cdns_salvo_phy *salvo_phy = phy_get_drvdata(phy);
>>> @@ -244,6 +253,7 @@ static int cdns_salvo_phy_power_off(struct phy *phy)
>>> }
>>>
>>> static struct phy_ops cdns_salvo_phy_ops = {
>>> + .init = cdns_salvo_phy_init,
>>> .power_on = cdns_salvo_phy_power_on,
>>> .power_off = cdns_salvo_phy_power_off,
>>> .owner = THIS_MODULE,
>>> --
>>> 2.17.1
>>>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-13 11:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-07 5:21 [PATCH 1/1] phy: phy-cadence-salvo: add phy .init API Peter Chen
[not found] ` <20200513025709.GB29070@a0393678ub>
2020-05-13 10:51 ` Peter Chen
2020-05-13 11:00 ` Vinod Koul
2020-05-13 11:03 ` Kishon Vijay Abraham I
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).