| Message ID | 1554907730-14792-5-git-send-email-biju.das@bp.renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | Add USB2.0 support | expand |
Hi Biju-san, > From: Biju Das, Sent: Wednesday, April 10, 2019 11:49 PM > > This patch adds support for r8a77470 (RZ/G1C). We can reuse this driver for > initializing timing/interrupt generation registers. > > Signed-off-by: Biju Das <biju.das@bp.renesas.com> > Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > --- Thank you for the patch! I tested this patch on r8a77965-salvator-xs and I didn't find any regressions. So, Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Best regards, Yoshihiro Shimoda > V4-->V5 > * Incorporated Kishan and Shimoda-san's review comment > https://patchwork.kernel.org/patch/10893387/ > V3-->V4 > * Incorporated Kishan and Shimoda-san's review comment > https://patchwork.kernel.org/patch/10883265/ > V2-->V3 > * Incorporated shimoda-san's review comment > Ref: https://patchwork.kernel.org/patch/10655855/ > --- > drivers/phy/renesas/Kconfig | 2 +- > drivers/phy/renesas/phy-rcar-gen3-usb2.c | 39 +++++++++++++++++++++++++++----- > 2 files changed, 34 insertions(+), 7 deletions(-) > > diff --git a/drivers/phy/renesas/Kconfig b/drivers/phy/renesas/Kconfig > index e340a92..111bdca 100644 > --- a/drivers/phy/renesas/Kconfig > +++ b/drivers/phy/renesas/Kconfig > @@ -19,7 +19,7 @@ config PHY_RCAR_GEN3_PCIE > config PHY_RCAR_GEN3_USB2 > tristate "Renesas R-Car generation 3 USB 2.0 PHY driver" > depends on ARCH_RENESAS > - depends on EXTCON > + depends on EXTCON || !EXTCON # if EXTCON=m, this cannot be built-in > depends on USB_SUPPORT > select GENERIC_PHY > select USB_COMMON > diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c > index 0a34782..e3a88b9 100644 > --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c > +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c > @@ -393,6 +393,12 @@ static const struct phy_ops rcar_gen3_phy_usb2_ops = { > .owner = THIS_MODULE, > }; > > +static const struct phy_ops rz_g1c_phy_usb2_ops = { > + .init = rcar_gen3_phy_usb2_init, > + .exit = rcar_gen3_phy_usb2_exit, > + .owner = THIS_MODULE, > +}; > + > static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch) > { > struct rcar_gen3_chan *ch = _ch; > @@ -411,11 +417,27 @@ static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch) > } > > static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = { > - { .compatible = "renesas,usb2-phy-r8a7795" }, > - { .compatible = "renesas,usb2-phy-r8a7796" }, > - { .compatible = "renesas,usb2-phy-r8a77965" }, > - { .compatible = "renesas,rcar-gen3-usb2-phy" }, > - { } > + { > + .compatible = "renesas,usb2-phy-r8a77470", > + .data = &rz_g1c_phy_usb2_ops, > + }, > + { > + .compatible = "renesas,usb2-phy-r8a7795", > + .data = &rcar_gen3_phy_usb2_ops, > + }, > + { > + .compatible = "renesas,usb2-phy-r8a7796", > + .data = &rcar_gen3_phy_usb2_ops, > + }, > + { > + .compatible = "renesas,usb2-phy-r8a77965", > + .data = &rcar_gen3_phy_usb2_ops, > + }, > + { > + .compatible = "renesas,rcar-gen3-usb2-phy", > + .data = &rcar_gen3_phy_usb2_ops, > + }, > + { /* sentinel */ }, > }; > MODULE_DEVICE_TABLE(of, rcar_gen3_phy_usb2_match_table); > > @@ -431,6 +453,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) > struct rcar_gen3_chan *channel; > struct phy_provider *provider; > struct resource *res; > + const struct phy_ops *phy_usb2_ops; > int irq, ret = 0; > > if (!dev->of_node) { > @@ -481,7 +504,11 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) > * And then, phy-core will manage runtime pm for this device. > */ > pm_runtime_enable(dev); > - channel->phy = devm_phy_create(dev, NULL, &rcar_gen3_phy_usb2_ops); > + phy_usb2_ops = of_device_get_match_data(dev); > + if (!phy_usb2_ops) > + return -EINVAL; > + > + channel->phy = devm_phy_create(dev, NULL, phy_usb2_ops); > if (IS_ERR(channel->phy)) { > dev_err(dev, "Failed to create USB2 PHY\n"); > ret = PTR_ERR(channel->phy); > -- > 2.7.4
diff --git a/drivers/phy/renesas/Kconfig b/drivers/phy/renesas/Kconfig index e340a92..111bdca 100644 --- a/drivers/phy/renesas/Kconfig +++ b/drivers/phy/renesas/Kconfig @@ -19,7 +19,7 @@ config PHY_RCAR_GEN3_PCIE config PHY_RCAR_GEN3_USB2 tristate "Renesas R-Car generation 3 USB 2.0 PHY driver" depends on ARCH_RENESAS - depends on EXTCON + depends on EXTCON || !EXTCON # if EXTCON=m, this cannot be built-in depends on USB_SUPPORT select GENERIC_PHY select USB_COMMON diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c index 0a34782..e3a88b9 100644 --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c @@ -393,6 +393,12 @@ static const struct phy_ops rcar_gen3_phy_usb2_ops = { .owner = THIS_MODULE, }; +static const struct phy_ops rz_g1c_phy_usb2_ops = { + .init = rcar_gen3_phy_usb2_init, + .exit = rcar_gen3_phy_usb2_exit, + .owner = THIS_MODULE, +}; + static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch) { struct rcar_gen3_chan *ch = _ch; @@ -411,11 +417,27 @@ static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch) } static const struct of_device_id rcar_gen3_phy_usb2_match_table[] = { - { .compatible = "renesas,usb2-phy-r8a7795" }, - { .compatible = "renesas,usb2-phy-r8a7796" }, - { .compatible = "renesas,usb2-phy-r8a77965" }, - { .compatible = "renesas,rcar-gen3-usb2-phy" }, - { } + { + .compatible = "renesas,usb2-phy-r8a77470", + .data = &rz_g1c_phy_usb2_ops, + }, + { + .compatible = "renesas,usb2-phy-r8a7795", + .data = &rcar_gen3_phy_usb2_ops, + }, + { + .compatible = "renesas,usb2-phy-r8a7796", + .data = &rcar_gen3_phy_usb2_ops, + }, + { + .compatible = "renesas,usb2-phy-r8a77965", + .data = &rcar_gen3_phy_usb2_ops, + }, + { + .compatible = "renesas,rcar-gen3-usb2-phy", + .data = &rcar_gen3_phy_usb2_ops, + }, + { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, rcar_gen3_phy_usb2_match_table); @@ -431,6 +453,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) struct rcar_gen3_chan *channel; struct phy_provider *provider; struct resource *res; + const struct phy_ops *phy_usb2_ops; int irq, ret = 0; if (!dev->of_node) { @@ -481,7 +504,11 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) * And then, phy-core will manage runtime pm for this device. */ pm_runtime_enable(dev); - channel->phy = devm_phy_create(dev, NULL, &rcar_gen3_phy_usb2_ops); + phy_usb2_ops = of_device_get_match_data(dev); + if (!phy_usb2_ops) + return -EINVAL; + + channel->phy = devm_phy_create(dev, NULL, phy_usb2_ops); if (IS_ERR(channel->phy)) { dev_err(dev, "Failed to create USB2 PHY\n"); ret = PTR_ERR(channel->phy);