diff mbox series

[RESEND,2/5] phy: sun4i-usb: add support for the USB PHY on suniv SoC

Message ID 20200309204326.27403-3-thirtythreeforty@gmail.com (mailing list archive)
State Superseded
Headers show
Series Support the Allwinner F1C100s USB stack | expand

Commit Message

George Hilliard March 9, 2020, 8:43 p.m. UTC 
The suniv SoC has one USB OTG port connected to a MUSB controller.

Add support for its USB PHY.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: George Hilliard <thirtythreeforty@gmail.com>
---
 drivers/phy/allwinner/phy-sun4i-usb.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Chen-Yu Tsai March 12, 2020, 6:51 a.m. UTC | #1 
On Tue, Mar 10, 2020 at 4:43 AM George Hilliard
<thirtythreeforty@gmail.com> wrote:
>
> The suniv SoC has one USB OTG port connected to a MUSB controller.
>
> Add support for its USB PHY.
>
> Signed-off-by: Icenowy Zheng <icenowy@aosc.io>

Not sure why Icenowy's SoB is here. If she was the original author, you
are supposed to keep her name as the author.

> Signed-off-by: George Hilliard <thirtythreeforty@gmail.com>
> ---
>  drivers/phy/allwinner/phy-sun4i-usb.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
> index 856927382248..5fb0c42fe8fd 100644
> --- a/drivers/phy/allwinner/phy-sun4i-usb.c
> +++ b/drivers/phy/allwinner/phy-sun4i-usb.c
> @@ -98,6 +98,7 @@
>  #define POLL_TIME                      msecs_to_jiffies(250)
>
>  enum sun4i_usb_phy_type {
> +       suniv_f1c100s_phy,
>         sun4i_a10_phy,
>         sun6i_a31_phy,
>         sun8i_a33_phy,
> @@ -859,6 +860,14 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
>         return 0;
>  }
>
> +static const struct sun4i_usb_phy_cfg suniv_f1c100s_cfg = {
> +       .num_phys = 1,
> +       .type = suniv_f1c100s_phy,
> +       .disc_thresh = 3,
> +       .phyctl_offset = REG_PHYCTL_A10,
> +       .dedicated_clocks = true,
> +};
> +
>  static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = {
>         .num_phys = 3,
>         .type = sun4i_a10_phy,
> @@ -973,6 +982,8 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = {
>  };
>
>  static const struct of_device_id sun4i_usb_phy_of_match[] = {
> +       { .compatible = "allwinner,suniv-f1c100s-usb-phy",
> +         .data = &suniv_f1c100s_cfg },
>         { .compatible = "allwinner,sun4i-a10-usb-phy", .data = &sun4i_a10_cfg },

Please use the same style (and ignore checkpatch.pl on this one).

ChenYu

>         { .compatible = "allwinner,sun5i-a13-usb-phy", .data = &sun5i_a13_cfg },
>         { .compatible = "allwinner,sun6i-a31-usb-phy", .data = &sun6i_a31_cfg },
> --
> 2.25.0
>
Chen-Yu Tsai March 12, 2020, 6:54 a.m. UTC | #2 
On Thu, Mar 12, 2020 at 2:51 PM Chen-Yu Tsai <wens@csie.org> wrote:
>
> On Tue, Mar 10, 2020 at 4:43 AM George Hilliard
> <thirtythreeforty@gmail.com> wrote:
> >
> > The suniv SoC has one USB OTG port connected to a MUSB controller.
> >
> > Add support for its USB PHY.
> >
> > Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
>
> Not sure why Icenowy's SoB is here. If she was the original author, you
> are supposed to keep her name as the author.
>
> > Signed-off-by: George Hilliard <thirtythreeforty@gmail.com>
> > ---
> >  drivers/phy/allwinner/phy-sun4i-usb.c | 11 +++++++++++
> >  1 file changed, 11 insertions(+)
> >
> > diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
> > index 856927382248..5fb0c42fe8fd 100644
> > --- a/drivers/phy/allwinner/phy-sun4i-usb.c
> > +++ b/drivers/phy/allwinner/phy-sun4i-usb.c
> > @@ -98,6 +98,7 @@
> >  #define POLL_TIME                      msecs_to_jiffies(250)
> >
> >  enum sun4i_usb_phy_type {
> > +       suniv_f1c100s_phy,
> >         sun4i_a10_phy,
> >         sun6i_a31_phy,
> >         sun8i_a33_phy,
> > @@ -859,6 +860,14 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
> >         return 0;
> >  }
> >
> > +static const struct sun4i_usb_phy_cfg suniv_f1c100s_cfg = {
> > +       .num_phys = 1,
> > +       .type = suniv_f1c100s_phy,
> > +       .disc_thresh = 3,
> > +       .phyctl_offset = REG_PHYCTL_A10,
> > +       .dedicated_clocks = true,
> > +};
> > +
> >  static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = {
> >         .num_phys = 3,
> >         .type = sun4i_a10_phy,
> > @@ -973,6 +982,8 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = {
> >  };
> >
> >  static const struct of_device_id sun4i_usb_phy_of_match[] = {
> > +       { .compatible = "allwinner,suniv-f1c100s-usb-phy",
> > +         .data = &suniv_f1c100s_cfg },
> >         { .compatible = "allwinner,sun4i-a10-usb-phy", .data = &sun4i_a10_cfg },
>
> Please use the same style (and ignore checkpatch.pl on this one).
>
> ChenYu
>
> >         { .compatible = "allwinner,sun5i-a13-usb-phy", .data = &sun5i_a13_cfg },
> >         { .compatible = "allwinner,sun6i-a31-usb-phy", .data = &sun6i_a31_cfg },


Also, please stick to the same ordering in the driver and the bindings.

FWIW, `sort` places "suniv" after all sun([4-9]|50)i variants.

ChenYu

> > --
> > 2.25.0
> >
George Hilliard March 12, 2020, 12:06 p.m. UTC | #3 
Thanks for the review.

On Thu, Mar 12, 2020 at 1:51 AM Chen-Yu Tsai <wens@csie.org> wrote:
>
> On Tue, Mar 10, 2020 at 4:43 AM George Hilliard
> <thirtythreeforty@gmail.com> wrote:
> >
> > The suniv SoC has one USB OTG port connected to a MUSB controller.
> >
> > Add support for its USB PHY.
> >
> > Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
>
> Not sure why Icenowy's SoB is here. If she was the original author, you
> are supposed to keep her name as the author.

So, I was unclear on the convention here.  This patch is based on her
patch, but I've modified it and rebased those modifications back into
a single change.  I'm happy to change the author field - does it need
a "Co-authored-by: myself" here?

> >
> >  static const struct of_device_id sun4i_usb_phy_of_match[] = {
> > +       { .compatible = "allwinner,suniv-f1c100s-usb-phy",
> > +         .data = &suniv_f1c100s_cfg },
> >         { .compatible = "allwinner,sun4i-a10-usb-phy", .data = &sun4i_a10_cfg },
>
> Please use the same style (and ignore checkpatch.pl on this one).

Very happy to change this, it was bugging me!

George
Chen-Yu Tsai March 13, 2020, 4:07 a.m. UTC | #4 
On Thu, Mar 12, 2020 at 8:06 PM George Hilliard
<thirtythreeforty@gmail.com> wrote:
>
> Thanks for the review.
>
> On Thu, Mar 12, 2020 at 1:51 AM Chen-Yu Tsai <wens@csie.org> wrote:
> >
> > On Tue, Mar 10, 2020 at 4:43 AM George Hilliard
> > <thirtythreeforty@gmail.com> wrote:
> > >
> > > The suniv SoC has one USB OTG port connected to a MUSB controller.
> > >
> > > Add support for its USB PHY.
> > >
> > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
> >
> > Not sure why Icenowy's SoB is here. If she was the original author, you
> > are supposed to keep her name as the author.
>
> So, I was unclear on the convention here.  This patch is based on her
> patch, but I've modified it and rebased those modifications back into
> a single change.  I'm happy to change the author field - does it need
> a "Co-authored-by: myself" here?

I suppose that really depends on how much you changed it. If it were just
stylistic changes I'd keep the original author. Also you should list any
changes you made to the patch by inserting

    [<who>: changed foo and bar]

before your SoB.

As for the Co-authored-by, I haven't really seen it used so I don't really
know.

ChenYu

> > >
> > >  static const struct of_device_id sun4i_usb_phy_of_match[] = {
> > > +       { .compatible = "allwinner,suniv-f1c100s-usb-phy",
> > > +         .data = &suniv_f1c100s_cfg },
> > >         { .compatible = "allwinner,sun4i-a10-usb-phy", .data = &sun4i_a10_cfg },
> >
> > Please use the same style (and ignore checkpatch.pl on this one).
>
> Very happy to change this, it was bugging me!
>
> George
George Hilliard March 13, 2020, 2:03 p.m. UTC | #5 
On Thu, Mar 12, 2020, 11:08 PM Chen-Yu Tsai <wens@csie.org> wrote:
>
> On Thu, Mar 12, 2020 at 8:06 PM George Hilliard
> <thirtythreeforty@gmail.com> wrote:
> >
> > Thanks for the review.
> >
> > On Thu, Mar 12, 2020 at 1:51 AM Chen-Yu Tsai <wens@csie.org> wrote:
> > >
> > > On Tue, Mar 10, 2020 at 4:43 AM George Hilliard
> > > <thirtythreeforty@gmail.com> wrote:
> > > >
> > > > The suniv SoC has one USB OTG port connected to a MUSB controller.
> > > >
> > > > Add support for its USB PHY.
> > > >
> > > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
> > >
> > > Not sure why Icenowy's SoB is here. If she was the original author, you
> > > are supposed to keep her name as the author.
> >
> > So, I was unclear on the convention here.  This patch is based on her
> > patch, but I've modified it and rebased those modifications back into
> > a single change.  I'm happy to change the author field - does it need
> > a "Co-authored-by: myself" here?
>
> I suppose that really depends on how much you changed it. If it were just
> stylistic changes I'd keep the original author. Also you should list any
> changes you made to the patch by inserting
>
>     [<who>: changed foo and bar]
>
> before your SoB.

Ok, this makes sense. Thanks. I'll send another series. The few that
are stylistic, I believe I retained Icenowy as the author. Where I
modified them, I put myself (so people email me, not her, with
problems).  I'll modify the commit messages like you describe and
double check the authorship.

> As for the Co-authored-by, I haven't really seen it used so I don't really
> know.

Off topic, but I wish Git supported multiple authors natively.

George
diff mbox series

Patch

diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index 856927382248..5fb0c42fe8fd 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -98,6 +98,7 @@ 
 #define POLL_TIME			msecs_to_jiffies(250)
 
 enum sun4i_usb_phy_type {
+	suniv_f1c100s_phy,
 	sun4i_a10_phy,
 	sun6i_a31_phy,
 	sun8i_a33_phy,
@@ -859,6 +860,14 @@  static int sun4i_usb_phy_probe(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct sun4i_usb_phy_cfg suniv_f1c100s_cfg = {
+	.num_phys = 1,
+	.type = suniv_f1c100s_phy,
+	.disc_thresh = 3,
+	.phyctl_offset = REG_PHYCTL_A10,
+	.dedicated_clocks = true,
+};
+
 static const struct sun4i_usb_phy_cfg sun4i_a10_cfg = {
 	.num_phys = 3,
 	.type = sun4i_a10_phy,
@@ -973,6 +982,8 @@  static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = {
 };
 
 static const struct of_device_id sun4i_usb_phy_of_match[] = {
+	{ .compatible = "allwinner,suniv-f1c100s-usb-phy",
+	  .data = &suniv_f1c100s_cfg },
 	{ .compatible = "allwinner,sun4i-a10-usb-phy", .data = &sun4i_a10_cfg },
 	{ .compatible = "allwinner,sun5i-a13-usb-phy", .data = &sun5i_a13_cfg },
 	{ .compatible = "allwinner,sun6i-a31-usb-phy", .data = &sun6i_a31_cfg },