RE: [PATCH v2 1/3] usb: renesas_usbhs: Add support for RZ/A1

2018-01-05 Thread Chris Brandt 
Hi Geert,

On Friday, January 05, 2018, Geert Uytterhoeven wrote:
> > +   {
> > +   .compatible = "renesas,usbhs-r7s72100",
> > +   .data = (void *)USBHS_TYPE_RZA1,
> > +   },
> 
> I think it suffices to drop the part above...
> 
> > {
> > .compatible = "renesas,rcar-gen2-usbhs",
> > .data = (void *)USBHS_TYPE_RCAR_GEN2,
> > @@ -488,6 +493,10 @@ static const struct of_device_id usbhs_of_match[] =
> {
> > .compatible = "renesas,rcar-gen3-usbhs",
> > .data = (void *)USBHS_TYPE_RCAR_GEN3,
> > },
> > +   {
> > +   .compatible = "renesas,rza1-usbhs",
> > +   .data = (void *)USBHS_TYPE_RZA1,
> > +   },
> 
> ... and just let the driver match against the generic compatible value.
> But then you have to add "renesas,rza1-usbhs" to the DTS, too.

OK. I can do that.

I keep forgetting all the new/old DT rules.
I thought there was something about you always need a generic name and
also a device specific name.

I'm happy with just "renesas,rza1-usbhs".


> > --- /dev/null
> > +++ b/drivers/usb/renesas_usbhs/rza.c
> > @@ -0,0 +1,52 @@
> > +// SPDX-License-Identifier: GPL-1.0+
> 
> Not GPL-2.0?

Oops. Copy/paste error.


I'll submit a V3 of the series.


Thanks!

Chris

Re: [PATCH v2 1/3] usb: renesas_usbhs: Add support for RZ/A1

2018-01-05 Thread Geert Uytterhoeven 
Hi Chris,

On Fri, Jan 5, 2018 at 7:46 PM, Chris Brandt  wrote:
> This patch adds the capability to support RZ/A1 SoCs.
>
> Signed-off-by: Chris Brandt 

Thanks for your patch!

> index c5289b3ecf8d..2abefd3d6050 100644
> --- a/drivers/usb/renesas_usbhs/common.c
> +++ b/drivers/usb/renesas_usbhs/common.c

> @@ -480,6 +481,10 @@ static const struct of_device_id usbhs_of_match[] = {
> .compatible = "renesas,usbhs-r8a77995",
> .data = (void *)USBHS_TYPE_RCAR_GEN3_WITH_PLL,
> },
> +   {
> +   .compatible = "renesas,usbhs-r7s72100",
> +   .data = (void *)USBHS_TYPE_RZA1,
> +   },

I think it suffices to drop the part above...

> {
> .compatible = "renesas,rcar-gen2-usbhs",
> .data = (void *)USBHS_TYPE_RCAR_GEN2,
> @@ -488,6 +493,10 @@ static const struct of_device_id usbhs_of_match[] = {
> .compatible = "renesas,rcar-gen3-usbhs",
> .data = (void *)USBHS_TYPE_RCAR_GEN3,
> },
> +   {
> +   .compatible = "renesas,rza1-usbhs",
> +   .data = (void *)USBHS_TYPE_RZA1,
> +   },

... and just let the driver match against the generic compatible value.
But then you have to add "renesas,rza1-usbhs" to the DTS, too.

> --- /dev/null
> +++ b/drivers/usb/renesas_usbhs/rza.c
> @@ -0,0 +1,52 @@
> +// SPDX-License-Identifier: GPL-1.0+

Not GPL-2.0?

> +++ b/drivers/usb/renesas_usbhs/rza.h
> @@ -0,0 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0

like here?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 1/3] usb: renesas_usbhs: Add support for RZ/A1

2018-01-05 Thread Chris Brandt 
This patch adds the capability to support RZ/A1 SoCs.

Signed-off-by: Chris Brandt 
---
 drivers/usb/renesas_usbhs/Makefile |  2 +-
 drivers/usb/renesas_usbhs/common.c | 17 +
 drivers/usb/renesas_usbhs/common.h |  6 +
 drivers/usb/renesas_usbhs/rza.c| 52 ++
 drivers/usb/renesas_usbhs/rza.h|  4 +++
 include/linux/usb/renesas_usbhs.h  |  1 +
 6 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 drivers/usb/renesas_usbhs/rza.c
 create mode 100644 drivers/usb/renesas_usbhs/rza.h

diff --git a/drivers/usb/renesas_usbhs/Makefile 
b/drivers/usb/renesas_usbhs/Makefile
index fac147a3ad23..5c5b51bb48ef 100644
--- a/drivers/usb/renesas_usbhs/Makefile
+++ b/drivers/usb/renesas_usbhs/Makefile
@@ -5,7 +5,7 @@
 
 obj-$(CONFIG_USB_RENESAS_USBHS)+= renesas_usbhs.o
 
-renesas_usbhs-y:= common.o mod.o pipe.o fifo.o rcar2.o 
rcar3.o
+renesas_usbhs-y:= common.o mod.o pipe.o fifo.o rcar2.o 
rcar3.o rza.o
 
 ifneq ($(CONFIG_USB_RENESAS_USBHS_HCD),)
renesas_usbhs-y += mod_host.o
diff --git a/drivers/usb/renesas_usbhs/common.c 
b/drivers/usb/renesas_usbhs/common.c
index c5289b3ecf8d..2abefd3d6050 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -17,6 +17,7 @@
 #include "common.h"
 #include "rcar2.h"
 #include "rcar3.h"
+#include "rza.h"
 
 /*
  * image of renesas_usbhs
@@ -480,6 +481,10 @@ static const struct of_device_id usbhs_of_match[] = {
.compatible = "renesas,usbhs-r8a77995",
.data = (void *)USBHS_TYPE_RCAR_GEN3_WITH_PLL,
},
+   {
+   .compatible = "renesas,usbhs-r7s72100",
+   .data = (void *)USBHS_TYPE_RZA1,
+   },
{
.compatible = "renesas,rcar-gen2-usbhs",
.data = (void *)USBHS_TYPE_RCAR_GEN2,
@@ -488,6 +493,10 @@ static const struct of_device_id usbhs_of_match[] = {
.compatible = "renesas,rcar-gen3-usbhs",
.data = (void *)USBHS_TYPE_RCAR_GEN3,
},
+   {
+   .compatible = "renesas,rza1-usbhs",
+   .data = (void *)USBHS_TYPE_RZA1,
+   },
{ },
 };
 MODULE_DEVICE_TABLE(of, usbhs_of_match);
@@ -520,6 +529,11 @@ static struct renesas_usbhs_platform_info 
*usbhs_parse_dt(struct device *dev)
dparam->pipe_size = ARRAY_SIZE(usbhsc_new_pipe);
}
 
+   if (dparam->type == USBHS_TYPE_RZA1) {
+   dparam->pipe_configs = usbhsc_new_pipe;
+   dparam->pipe_size = ARRAY_SIZE(usbhsc_new_pipe);
+   }
+
return info;
 }
 
@@ -591,6 +605,9 @@ static int usbhs_probe(struct platform_device *pdev)
dev_err(>dev, "no notifier registered\n");
}
break;
+   case USBHS_TYPE_RZA1:
+   priv->pfunc = usbhs_rza1_ops;
+   break;
default:
if (!info->platform_callback.get_id) {
dev_err(>dev, "no platform callbacks");
diff --git a/drivers/usb/renesas_usbhs/common.h 
b/drivers/usb/renesas_usbhs/common.h
index c9747f064601..f619afeae2b8 100644
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -98,6 +98,7 @@ struct usbhs_priv;
 #define D2FIFOCTR  0x00F2  /* for R-Car Gen2 */
 #define D3FIFOSEL  0x00F4  /* for R-Car Gen2 */
 #define D3FIFOCTR  0x00F6  /* for R-Car Gen2 */
+#define SUSPMODE   0x0102  /* for RZ/A */
 
 /* SYSCFG */
 #define SCKE   (1 << 10)   /* USB Module Clock Enable */
@@ -106,6 +107,8 @@ struct usbhs_priv;
 #define DRPD   (1 << 5)/* D+ Line/D- Line Resistance Control */
 #define DPRPU  (1 << 4)/* D+ Line Resistance Control */
 #define USBE   (1 << 0)/* USB Module Operation Enable */
+#define UCKSEL (1 << 2)/* Clock Select for RZ/A1 */
+#define UPLLE  (1 << 1)/* USB PLL Enable for RZ/A1 */
 
 /* DVSTCTR */
 #define EXTLP  (1 << 10)   /* Controls the EXTLP pin output state */
@@ -233,6 +236,9 @@ struct usbhs_priv;
 #define USBSPD_SPEED_FULL  0x2
 #define USBSPD_SPEED_HIGH  0x3
 
+/* SUSPMODE */
+#define SUSPM  (1 << 14)   /* SuspendM Control */
+
 /*
  * struct
  */
diff --git a/drivers/usb/renesas_usbhs/rza.c b/drivers/usb/renesas_usbhs/rza.c
new file mode 100644
index ..b76e836d2c3d
--- /dev/null
+++ b/drivers/usb/renesas_usbhs/rza.c
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: GPL-1.0+
+/*
+ * Renesas USB driver RZ/A initialization and power control
+ *
+ * Copyright (C) 2018 Chris Brandt
+ * Copyright (C) 2018 Renesas Electronics Corporation
+ */
+
+#include 
+#include 
+#include 
+#include "common.h"
+#include "rza.h"
+
+static int usbhs_rza1_hardware_init(struct platform_device *pdev)
+{
+   struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
+   struct device_node *usb_x1_clk,