[PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Ulrich Hecht]

Changes in v2:
- move phy handle to struct usbhs_priv
- add new default pipe type to driver
- remove pipe type from Lager board code

Ulrich Hecht (2):
  usb: renesas_usbhs: add R-Car Gen. 2 init and power control
  ARM: shmobile: lager: remove USBHS callbacks

 arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
 drivers/usb/renesas_usbhs/Makefile   |   2 +-
 drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
 drivers/usb/renesas_usbhs/common.h   |   2 +
 drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
 drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
 include/linux/usb/renesas_usbhs.h    |   6 ++
 7 files changed, 163 insertions(+), 119 deletions(-)
 create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
 create mode 100644 drivers/usb/renesas_usbhs/rcar2.h

-- 
1.8.4.5

[PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Ulrich Hecht]

Changes in v2:
- move phy handle to struct usbhs_priv
- add new default pipe type to driver
- remove pipe type from Lager board code

Ulrich Hecht (2):
  usb: renesas_usbhs: add R-Car Gen. 2 init and power control
  ARM: shmobile: lager: remove USBHS callbacks

 arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
 drivers/usb/renesas_usbhs/Makefile   |   2 +-
 drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
 drivers/usb/renesas_usbhs/common.h   |   2 +
 drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
 drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
 include/linux/usb/renesas_usbhs.h    |   6 ++
 7 files changed, 163 insertions(+), 119 deletions(-)
 create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
 create mode 100644 drivers/usb/renesas_usbhs/rcar2.h

-- 
1.8.4.5

[PATCH v2 1/2] usb: renesas_usbhs: add R-Car Gen. 2 init and power control

[Ulrich Hecht]

In preparation for DT conversion to reduce reliance on platform device
callbacks.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 drivers/usb/renesas_usbhs/Makefile |  2 +-
 drivers/usb/renesas_usbhs/common.c | 66 ++++++++++++++++++++++++++++++---
 drivers/usb/renesas_usbhs/common.h |  2 +
 drivers/usb/renesas_usbhs/rcar2.c  | 76 ++++++++++++++++++++++++++++++++++++++
 drivers/usb/renesas_usbhs/rcar2.h  |  4 ++
 include/linux/usb/renesas_usbhs.h  |  6 +++
 6 files changed, 150 insertions(+), 6 deletions(-)
 create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
 create mode 100644 drivers/usb/renesas_usbhs/rcar2.h

diff --git a/drivers/usb/renesas_usbhs/Makefile b/drivers/usb/renesas_usbhs/Makefile
index bc8aef4..9e47f47 100644
--- a/drivers/usb/renesas_usbhs/Makefile
+++ b/drivers/usb/renesas_usbhs/Makefile
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_USB_RENESAS_USBHS)	+= renesas_usbhs.o
 
-renesas_usbhs-y			:= common.o mod.o pipe.o fifo.o
+renesas_usbhs-y			:= common.o mod.o pipe.o fifo.o rcar2.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 17267b0..1b9bf8d 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -15,12 +15,14 @@
  *
  */
 #include <linux/err.h>
+#include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include "common.h"
+#include "rcar2.h"
 
 /*
  *		image of renesas_usbhs
@@ -284,6 +286,8 @@ static void usbhsc_set_buswait(struct usbhs_priv *priv)
 /*
  *		platform default param
  */
+
+/* commonly used on old SH-Mobile SoCs */
 static u32 usbhsc_default_pipe_type[] = {
 		USB_ENDPOINT_XFER_CONTROL,
 		USB_ENDPOINT_XFER_ISOC,
@@ -297,6 +301,26 @@ static u32 usbhsc_default_pipe_type[] = {
 		USB_ENDPOINT_XFER_INT,
 };
 
+/* commonly used on newer SH-Mobile and R-Car SoCs */
+static u32 usbhsc_new_pipe_type[] = {
+		USB_ENDPOINT_XFER_CONTROL,
+		USB_ENDPOINT_XFER_ISOC,
+		USB_ENDPOINT_XFER_ISOC,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_INT,
+		USB_ENDPOINT_XFER_INT,
+		USB_ENDPOINT_XFER_INT,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+};
+
 /*
  *		power control
  */
@@ -423,8 +447,7 @@ static int usbhs_probe(struct platform_device *pdev)
 	int ret;
 
 	/* check platform information */
-	if (!info ||
-	    !info->platform_callback.get_id) {
+	if (!info) {
 		dev_err(&pdev->dev, "no platform information\n");
 		return -EINVAL;
 	}
@@ -451,13 +474,32 @@ static int usbhs_probe(struct platform_device *pdev)
 	/*
 	 * care platform info
 	 */
-	memcpy(&priv->pfunc,
-	       &info->platform_callback,
-	       sizeof(struct renesas_usbhs_platform_callback));
+
 	memcpy(&priv->dparam,
 	       &info->driver_param,
 	       sizeof(struct renesas_usbhs_driver_param));
 
+	switch (priv->dparam.type) {
+	case USBHS_TYPE_R8A7790:
+	case USBHS_TYPE_R8A7791:
+		priv->pfunc = usbhs_rcar2_ops;
+		if (!priv->dparam.pipe_type) {
+			priv->dparam.pipe_type = usbhsc_new_pipe_type;
+			priv->dparam.pipe_size +				ARRAY_SIZE(usbhsc_new_pipe_type);
+		}
+		break;
+	default:
+		if (!info->platform_callback.get_id) {
+			dev_err(&pdev->dev, "no platform callbacks");
+			return -EINVAL;
+		}
+		memcpy(&priv->pfunc,
+		       &info->platform_callback,
+		       sizeof(struct renesas_usbhs_platform_callback));
+		break;
+	}
+
 	/* set driver callback functions for platform */
 	dfunc			= &info->driver_callback;
 	dfunc->notify_hotplug	= usbhsc_drvcllbck_notify_hotplug;
@@ -507,6 +549,20 @@ static int usbhs_probe(struct platform_device *pdev)
 	 */
 	usbhs_sys_clock_ctrl(priv, 0);
 
+	/* check GPIO determining if USB function should be enabled */
+	if (priv->dparam.enable_gpio) {
+		gpio_request_one(priv->dparam.enable_gpio, GPIOF_IN, NULL);
+		ret = !gpio_get_value(priv->dparam.enable_gpio);
+		gpio_free(priv->dparam.enable_gpio);
+		if (ret) {
+			dev_warn(&pdev->dev,
+				 "USB function not selected (GPIO %d)\n",
+				 priv->dparam.enable_gpio);
+			ret = -ENOTSUPP;
+			goto probe_end_mod_exit;
+		}
+	}
+
 	/*
 	 * platform call
 	 *
diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index c69dd2f..a7996da 100644
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -268,6 +268,8 @@ struct usbhs_priv {
 	 * fifo control
 	 */
 	struct usbhs_fifo_info fifo_info;
+
+	struct usb_phy *phy;
 };
 
 /*
diff --git a/drivers/usb/renesas_usbhs/rcar2.c b/drivers/usb/renesas_usbhs/rcar2.c
new file mode 100644
index 0000000..4e22a0b
--- /dev/null
+++ b/drivers/usb/renesas_usbhs/rcar2.c
@@ -0,0 +1,76 @@
+/*
+ * Renesas USB driver R-Car Gen. 2 initialization and power control
+ *
+ * Copyright (C) 2014 Ulrich Hecht
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_data/gpio-rcar.h>
+#include <linux/usb/phy.h>
+#include "common.h"
+
+static int usbhs_rcar2_hardware_init(struct platform_device *pdev)
+{
+	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
+	struct usb_phy *phy;
+
+	phy = usb_get_phy_dev(&pdev->dev, 0);
+	if (IS_ERR(phy))
+		return PTR_ERR(phy);
+
+	priv->phy = phy;
+	return 0;
+}
+
+static int usbhs_rcar2_hardware_exit(struct platform_device *pdev)
+{
+	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
+
+	if (!priv->phy)
+		return 0;
+
+	usb_put_phy(priv->phy);
+	priv->phy = NULL;
+
+	return 0;
+}
+
+static int usbhs_rcar2_power_ctrl(struct platform_device *pdev,
+				void __iomem *base, int enable)
+{
+	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
+
+	if (!priv->phy)
+		return -ENODEV;
+
+	if (enable) {
+		int retval = usb_phy_init(priv->phy);
+
+		if (!retval)
+			retval = usb_phy_set_suspend(priv->phy, 0);
+		return retval;
+	}
+
+	usb_phy_set_suspend(priv->phy, 1);
+	usb_phy_shutdown(priv->phy);
+	return 0;
+}
+
+static int usbhs_rcar2_get_id(struct platform_device *pdev)
+{
+	return USBHS_GADGET;
+}
+
+const struct renesas_usbhs_platform_callback usbhs_rcar2_ops = {
+	.hardware_init = usbhs_rcar2_hardware_init,
+	.hardware_exit = usbhs_rcar2_hardware_exit,
+	.power_ctrl = usbhs_rcar2_power_ctrl,
+	.get_id = usbhs_rcar2_get_id,
+};
diff --git a/drivers/usb/renesas_usbhs/rcar2.h b/drivers/usb/renesas_usbhs/rcar2.h
new file mode 100644
index 0000000..f07f10d
--- /dev/null
+++ b/drivers/usb/renesas_usbhs/rcar2.h
@@ -0,0 +1,4 @@
+#include "common.h"
+
+extern const struct renesas_usbhs_platform_callback
+	usbhs_rcar2_ops;
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index e452ba6..d5952bb 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -153,6 +153,9 @@ struct renesas_usbhs_driver_param {
 	 */
 	int pio_dma_border; /* default is 64byte */
 
+	u32 type;
+	u32 enable_gpio;
+
 	/*
 	 * option:
 	 */
@@ -160,6 +163,9 @@ struct renesas_usbhs_driver_param {
 	u32 has_sudmac:1; /* for SUDMAC */
 };
 
+#define USBHS_TYPE_R8A7790 1
+#define USBHS_TYPE_R8A7791 2
+
 /*
  * option:
  *
-- 
1.8.4.5

[PATCH v2 1/2] usb: renesas_usbhs: add R-Car Gen. 2 init and power control

[Ulrich Hecht]

In preparation for DT conversion to reduce reliance on platform device
callbacks.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 drivers/usb/renesas_usbhs/Makefile |  2 +-
 drivers/usb/renesas_usbhs/common.c | 66 ++++++++++++++++++++++++++++++---
 drivers/usb/renesas_usbhs/common.h |  2 +
 drivers/usb/renesas_usbhs/rcar2.c  | 76 ++++++++++++++++++++++++++++++++++++++
 drivers/usb/renesas_usbhs/rcar2.h  |  4 ++
 include/linux/usb/renesas_usbhs.h  |  6 +++
 6 files changed, 150 insertions(+), 6 deletions(-)
 create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
 create mode 100644 drivers/usb/renesas_usbhs/rcar2.h

diff --git a/drivers/usb/renesas_usbhs/Makefile b/drivers/usb/renesas_usbhs/Makefile
index bc8aef4..9e47f47 100644
--- a/drivers/usb/renesas_usbhs/Makefile
+++ b/drivers/usb/renesas_usbhs/Makefile
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_USB_RENESAS_USBHS)	+= renesas_usbhs.o
 
-renesas_usbhs-y			:= common.o mod.o pipe.o fifo.o
+renesas_usbhs-y			:= common.o mod.o pipe.o fifo.o rcar2.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 17267b0..1b9bf8d 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -15,12 +15,14 @@
  *
  */
 #include <linux/err.h>
+#include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include "common.h"
+#include "rcar2.h"
 
 /*
  *		image of renesas_usbhs
@@ -284,6 +286,8 @@ static void usbhsc_set_buswait(struct usbhs_priv *priv)
 /*
  *		platform default param
  */
+
+/* commonly used on old SH-Mobile SoCs */
 static u32 usbhsc_default_pipe_type[] = {
 		USB_ENDPOINT_XFER_CONTROL,
 		USB_ENDPOINT_XFER_ISOC,
@@ -297,6 +301,26 @@ static u32 usbhsc_default_pipe_type[] = {
 		USB_ENDPOINT_XFER_INT,
 };
 
+/* commonly used on newer SH-Mobile and R-Car SoCs */
+static u32 usbhsc_new_pipe_type[] = {
+		USB_ENDPOINT_XFER_CONTROL,
+		USB_ENDPOINT_XFER_ISOC,
+		USB_ENDPOINT_XFER_ISOC,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_INT,
+		USB_ENDPOINT_XFER_INT,
+		USB_ENDPOINT_XFER_INT,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+		USB_ENDPOINT_XFER_BULK,
+};
+
 /*
  *		power control
  */
@@ -423,8 +447,7 @@ static int usbhs_probe(struct platform_device *pdev)
 	int ret;
 
 	/* check platform information */
-	if (!info ||
-	    !info->platform_callback.get_id) {
+	if (!info) {
 		dev_err(&pdev->dev, "no platform information\n");
 		return -EINVAL;
 	}
@@ -451,13 +474,32 @@ static int usbhs_probe(struct platform_device *pdev)
 	/*
 	 * care platform info
 	 */
-	memcpy(&priv->pfunc,
-	       &info->platform_callback,
-	       sizeof(struct renesas_usbhs_platform_callback));
+
 	memcpy(&priv->dparam,
 	       &info->driver_param,
 	       sizeof(struct renesas_usbhs_driver_param));
 
+	switch (priv->dparam.type) {
+	case USBHS_TYPE_R8A7790:
+	case USBHS_TYPE_R8A7791:
+		priv->pfunc = usbhs_rcar2_ops;
+		if (!priv->dparam.pipe_type) {
+			priv->dparam.pipe_type = usbhsc_new_pipe_type;
+			priv->dparam.pipe_size =
+				ARRAY_SIZE(usbhsc_new_pipe_type);
+		}
+		break;
+	default:
+		if (!info->platform_callback.get_id) {
+			dev_err(&pdev->dev, "no platform callbacks");
+			return -EINVAL;
+		}
+		memcpy(&priv->pfunc,
+		       &info->platform_callback,
+		       sizeof(struct renesas_usbhs_platform_callback));
+		break;
+	}
+
 	/* set driver callback functions for platform */
 	dfunc			= &info->driver_callback;
 	dfunc->notify_hotplug	= usbhsc_drvcllbck_notify_hotplug;
@@ -507,6 +549,20 @@ static int usbhs_probe(struct platform_device *pdev)
 	 */
 	usbhs_sys_clock_ctrl(priv, 0);
 
+	/* check GPIO determining if USB function should be enabled */
+	if (priv->dparam.enable_gpio) {
+		gpio_request_one(priv->dparam.enable_gpio, GPIOF_IN, NULL);
+		ret = !gpio_get_value(priv->dparam.enable_gpio);
+		gpio_free(priv->dparam.enable_gpio);
+		if (ret) {
+			dev_warn(&pdev->dev,
+				 "USB function not selected (GPIO %d)\n",
+				 priv->dparam.enable_gpio);
+			ret = -ENOTSUPP;
+			goto probe_end_mod_exit;
+		}
+	}
+
 	/*
 	 * platform call
 	 *
diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index c69dd2f..a7996da 100644
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -268,6 +268,8 @@ struct usbhs_priv {
 	 * fifo control
 	 */
 	struct usbhs_fifo_info fifo_info;
+
+	struct usb_phy *phy;
 };
 
 /*
diff --git a/drivers/usb/renesas_usbhs/rcar2.c b/drivers/usb/renesas_usbhs/rcar2.c
new file mode 100644
index 0000000..4e22a0b
--- /dev/null
+++ b/drivers/usb/renesas_usbhs/rcar2.c
@@ -0,0 +1,76 @@
+/*
+ * Renesas USB driver R-Car Gen. 2 initialization and power control
+ *
+ * Copyright (C) 2014 Ulrich Hecht
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_data/gpio-rcar.h>
+#include <linux/usb/phy.h>
+#include "common.h"
+
+static int usbhs_rcar2_hardware_init(struct platform_device *pdev)
+{
+	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
+	struct usb_phy *phy;
+
+	phy = usb_get_phy_dev(&pdev->dev, 0);
+	if (IS_ERR(phy))
+		return PTR_ERR(phy);
+
+	priv->phy = phy;
+	return 0;
+}
+
+static int usbhs_rcar2_hardware_exit(struct platform_device *pdev)
+{
+	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
+
+	if (!priv->phy)
+		return 0;
+
+	usb_put_phy(priv->phy);
+	priv->phy = NULL;
+
+	return 0;
+}
+
+static int usbhs_rcar2_power_ctrl(struct platform_device *pdev,
+				void __iomem *base, int enable)
+{
+	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
+
+	if (!priv->phy)
+		return -ENODEV;
+
+	if (enable) {
+		int retval = usb_phy_init(priv->phy);
+
+		if (!retval)
+			retval = usb_phy_set_suspend(priv->phy, 0);
+		return retval;
+	}
+
+	usb_phy_set_suspend(priv->phy, 1);
+	usb_phy_shutdown(priv->phy);
+	return 0;
+}
+
+static int usbhs_rcar2_get_id(struct platform_device *pdev)
+{
+	return USBHS_GADGET;
+}
+
+const struct renesas_usbhs_platform_callback usbhs_rcar2_ops = {
+	.hardware_init = usbhs_rcar2_hardware_init,
+	.hardware_exit = usbhs_rcar2_hardware_exit,
+	.power_ctrl = usbhs_rcar2_power_ctrl,
+	.get_id = usbhs_rcar2_get_id,
+};
diff --git a/drivers/usb/renesas_usbhs/rcar2.h b/drivers/usb/renesas_usbhs/rcar2.h
new file mode 100644
index 0000000..f07f10d
--- /dev/null
+++ b/drivers/usb/renesas_usbhs/rcar2.h
@@ -0,0 +1,4 @@
+#include "common.h"
+
+extern const struct renesas_usbhs_platform_callback
+	usbhs_rcar2_ops;
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index e452ba6..d5952bb 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -153,6 +153,9 @@ struct renesas_usbhs_driver_param {
 	 */
 	int pio_dma_border; /* default is 64byte */
 
+	u32 type;
+	u32 enable_gpio;
+
 	/*
 	 * option:
 	 */
@@ -160,6 +163,9 @@ struct renesas_usbhs_driver_param {
 	u32 has_sudmac:1; /* for SUDMAC */
 };
 
+#define USBHS_TYPE_R8A7790 1
+#define USBHS_TYPE_R8A7791 2
+
 /*
  * option:
  *
-- 
1.8.4.5

[PATCH v2 2/2] ARM: shmobile: lager: remove USBHS callbacks

[Ulrich Hecht]

Let the driver handle initialization and power control.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
 1 file changed, 13 insertions(+), 113 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index b8b2b44..c2a14c7 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -420,117 +420,17 @@ static const struct resource usbhs_resources[] __initconst = {
 	DEFINE_RES_IRQ(gic_spi(107)),
 };
 
-struct usbhs_private {
-	struct renesas_usbhs_platform_info info;
-	struct usb_phy *phy;
-};
-
-#define usbhs_get_priv(pdev) \
-	container_of(renesas_usbhs_get_info(pdev), struct usbhs_private, info)
-
-static int usbhs_power_ctrl(struct platform_device *pdev,
-				void __iomem *base, int enable)
-{
-	struct usbhs_private *priv = usbhs_get_priv(pdev);
-
-	if (!priv->phy)
-		return -ENODEV;
-
-	if (enable) {
-		int retval = usb_phy_init(priv->phy);
-
-		if (!retval)
-			retval = usb_phy_set_suspend(priv->phy, 0);
-		return retval;
-	}
-
-	usb_phy_set_suspend(priv->phy, 1);
-	usb_phy_shutdown(priv->phy);
-	return 0;
-}
-
-static int usbhs_hardware_init(struct platform_device *pdev)
-{
-	struct usbhs_private *priv = usbhs_get_priv(pdev);
-	struct usb_phy *phy;
-	int ret;
-
-	/* USB0 Function - use PWEN as GPIO input to detect DIP Switch SW5
-	 * setting to avoid VBUS short circuit due to wrong cable.
-	 * PWEN should be pulled up high if USB Function is selected by SW5
-	 */
-	gpio_request_one(RCAR_GP_PIN(5, 18), GPIOF_IN, NULL); /* USB0_PWEN */
-	if (!gpio_get_value(RCAR_GP_PIN(5, 18))) {
-		pr_warn("Error: USB Function not selected - check SW5 + SW6\n");
-		ret = -ENOTSUPP;
-		goto error;
-	}
-
-	phy = usb_get_phy_dev(&pdev->dev, 0);
-	if (IS_ERR(phy)) {
-		ret = PTR_ERR(phy);
-		goto error;
-	}
-
-	priv->phy = phy;
-	return 0;
- error:
-	gpio_free(RCAR_GP_PIN(5, 18));
-	return ret;
-}
-
-static int usbhs_hardware_exit(struct platform_device *pdev)
-{
-	struct usbhs_private *priv = usbhs_get_priv(pdev);
-
-	if (!priv->phy)
-		return 0;
-
-	usb_put_phy(priv->phy);
-	priv->phy = NULL;
-
-	gpio_free(RCAR_GP_PIN(5, 18));
-	return 0;
-}
-
-static int usbhs_get_id(struct platform_device *pdev)
-{
-	return USBHS_GADGET;
-}
-
-static u32 lager_usbhs_pipe_type[] = {
-	USB_ENDPOINT_XFER_CONTROL,
-	USB_ENDPOINT_XFER_ISOC,
-	USB_ENDPOINT_XFER_ISOC,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_INT,
-	USB_ENDPOINT_XFER_INT,
-	USB_ENDPOINT_XFER_INT,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-};
-
-static struct usbhs_private usbhs_priv __initdata = {
-	.info = {
-		.platform_callback = {
-			.power_ctrl	= usbhs_power_ctrl,
-			.hardware_init	= usbhs_hardware_init,
-			.hardware_exit	= usbhs_hardware_exit,
-			.get_id		= usbhs_get_id,
-		},
-		.driver_param = {
-			.buswait_bwait	= 4,
-			.pipe_type = lager_usbhs_pipe_type,
-			.pipe_size = ARRAY_SIZE(lager_usbhs_pipe_type),
-		},
-	}
+static struct renesas_usbhs_platform_info usbhs_info __initdata = {
+	.driver_param = {
+		.buswait_bwait	= 4,
+		.type = USBHS_TYPE_R8A7790,
+		/* USB0 Function - use PWEN as GPIO input to detect DIP
+		 * Switch SW5 setting to avoid VBUS short circuit due to
+		 * wrong cable.  PWEN should be pulled up high if USB
+		 * Function is selected by SW5.
+		 */
+		.enable_gpio = RCAR_GP_PIN(5, 18),
+	},
 };
 
 static void __init lager_register_usbhs(void)
@@ -540,8 +440,8 @@ static void __init lager_register_usbhs(void)
 					  "renesas_usbhs", -1,
 					  usbhs_resources,
 					  ARRAY_SIZE(usbhs_resources),
-					  &usbhs_priv.info,
-					  sizeof(usbhs_priv.info));
+					  &usbhs_info,
+					  sizeof(usbhs_info));
 }
 
 /* USBHS PHY */
-- 
1.8.4.5

[PATCH v2 2/2] ARM: shmobile: lager: remove USBHS callbacks

[Ulrich Hecht]

Let the driver handle initialization and power control.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
 1 file changed, 13 insertions(+), 113 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index b8b2b44..c2a14c7 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -420,117 +420,17 @@ static const struct resource usbhs_resources[] __initconst = {
 	DEFINE_RES_IRQ(gic_spi(107)),
 };
 
-struct usbhs_private {
-	struct renesas_usbhs_platform_info info;
-	struct usb_phy *phy;
-};
-
-#define usbhs_get_priv(pdev) \
-	container_of(renesas_usbhs_get_info(pdev), struct usbhs_private, info)
-
-static int usbhs_power_ctrl(struct platform_device *pdev,
-				void __iomem *base, int enable)
-{
-	struct usbhs_private *priv = usbhs_get_priv(pdev);
-
-	if (!priv->phy)
-		return -ENODEV;
-
-	if (enable) {
-		int retval = usb_phy_init(priv->phy);
-
-		if (!retval)
-			retval = usb_phy_set_suspend(priv->phy, 0);
-		return retval;
-	}
-
-	usb_phy_set_suspend(priv->phy, 1);
-	usb_phy_shutdown(priv->phy);
-	return 0;
-}
-
-static int usbhs_hardware_init(struct platform_device *pdev)
-{
-	struct usbhs_private *priv = usbhs_get_priv(pdev);
-	struct usb_phy *phy;
-	int ret;
-
-	/* USB0 Function - use PWEN as GPIO input to detect DIP Switch SW5
-	 * setting to avoid VBUS short circuit due to wrong cable.
-	 * PWEN should be pulled up high if USB Function is selected by SW5
-	 */
-	gpio_request_one(RCAR_GP_PIN(5, 18), GPIOF_IN, NULL); /* USB0_PWEN */
-	if (!gpio_get_value(RCAR_GP_PIN(5, 18))) {
-		pr_warn("Error: USB Function not selected - check SW5 + SW6\n");
-		ret = -ENOTSUPP;
-		goto error;
-	}
-
-	phy = usb_get_phy_dev(&pdev->dev, 0);
-	if (IS_ERR(phy)) {
-		ret = PTR_ERR(phy);
-		goto error;
-	}
-
-	priv->phy = phy;
-	return 0;
- error:
-	gpio_free(RCAR_GP_PIN(5, 18));
-	return ret;
-}
-
-static int usbhs_hardware_exit(struct platform_device *pdev)
-{
-	struct usbhs_private *priv = usbhs_get_priv(pdev);
-
-	if (!priv->phy)
-		return 0;
-
-	usb_put_phy(priv->phy);
-	priv->phy = NULL;
-
-	gpio_free(RCAR_GP_PIN(5, 18));
-	return 0;
-}
-
-static int usbhs_get_id(struct platform_device *pdev)
-{
-	return USBHS_GADGET;
-}
-
-static u32 lager_usbhs_pipe_type[] = {
-	USB_ENDPOINT_XFER_CONTROL,
-	USB_ENDPOINT_XFER_ISOC,
-	USB_ENDPOINT_XFER_ISOC,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_INT,
-	USB_ENDPOINT_XFER_INT,
-	USB_ENDPOINT_XFER_INT,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-	USB_ENDPOINT_XFER_BULK,
-};
-
-static struct usbhs_private usbhs_priv __initdata = {
-	.info = {
-		.platform_callback = {
-			.power_ctrl	= usbhs_power_ctrl,
-			.hardware_init	= usbhs_hardware_init,
-			.hardware_exit	= usbhs_hardware_exit,
-			.get_id		= usbhs_get_id,
-		},
-		.driver_param = {
-			.buswait_bwait	= 4,
-			.pipe_type = lager_usbhs_pipe_type,
-			.pipe_size = ARRAY_SIZE(lager_usbhs_pipe_type),
-		},
-	}
+static struct renesas_usbhs_platform_info usbhs_info __initdata = {
+	.driver_param = {
+		.buswait_bwait	= 4,
+		.type = USBHS_TYPE_R8A7790,
+		/* USB0 Function - use PWEN as GPIO input to detect DIP
+		 * Switch SW5 setting to avoid VBUS short circuit due to
+		 * wrong cable.  PWEN should be pulled up high if USB
+		 * Function is selected by SW5.
+		 */
+		.enable_gpio = RCAR_GP_PIN(5, 18),
+	},
 };
 
 static void __init lager_register_usbhs(void)
@@ -540,8 +440,8 @@ static void __init lager_register_usbhs(void)
 					  "renesas_usbhs", -1,
 					  usbhs_resources,
 					  ARRAY_SIZE(usbhs_resources),
-					  &usbhs_priv.info,
-					  sizeof(usbhs_priv.info));
+					  &usbhs_info,
+					  sizeof(usbhs_info));
 }
 
 /* USBHS PHY */
-- 
1.8.4.5

Re: [PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Kuninori Morimoto]

Hi

> Changes in v2:
> - move phy handle to struct usbhs_priv
> - add new default pipe type to driver
> - remove pipe type from Lager board code
> 
> Ulrich Hecht (2):
>   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
>   ARM: shmobile: lager: remove USBHS callbacks
> 
>  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
>  drivers/usb/renesas_usbhs/Makefile   |   2 +-
>  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
>  drivers/usb/renesas_usbhs/common.h   |   2 +
>  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
>  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
>  include/linux/usb/renesas_usbhs.h    |   6 ++
>  7 files changed, 163 insertions(+), 119 deletions(-)
>  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
>  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h

For all patches

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

[PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Kuninori Morimoto]

Hi

> Changes in v2:
> - move phy handle to struct usbhs_priv
> - add new default pipe type to driver
> - remove pipe type from Lager board code
> 
> Ulrich Hecht (2):
>   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
>   ARM: shmobile: lager: remove USBHS callbacks
> 
>  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
>  drivers/usb/renesas_usbhs/Makefile   |   2 +-
>  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
>  drivers/usb/renesas_usbhs/common.h   |   2 +
>  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
>  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
>  include/linux/usb/renesas_usbhs.h    |   6 ++
>  7 files changed, 163 insertions(+), 119 deletions(-)
>  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
>  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h

For all patches

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Re: [PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Yoshihiro Shimoda]

Hi Ulrich,

(2014/07/10 16:53), Ulrich Hecht wrote:
> Changes in v2:
> - move phy handle to struct usbhs_priv
> - add new default pipe type to driver
> - remove pipe type from Lager board code
> 
> Ulrich Hecht (2):
>   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
>   ARM: shmobile: lager: remove USBHS callbacks
> 
>  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
>  drivers/usb/renesas_usbhs/Makefile   |   2 +-
>  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
>  drivers/usb/renesas_usbhs/common.h   |   2 +
>  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
>  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
>  include/linux/usb/renesas_usbhs.h    |   6 ++
>  7 files changed, 163 insertions(+), 119 deletions(-)
>  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
>  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> 

I tested these patches on Lager legacy, and these patches worked correctly.

Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Best regards,
Yoshihiro Shimoda

[PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Yoshihiro Shimoda]

Hi Ulrich,

(2014/07/10 16:53), Ulrich Hecht wrote:
> Changes in v2:
> - move phy handle to struct usbhs_priv
> - add new default pipe type to driver
> - remove pipe type from Lager board code
> 
> Ulrich Hecht (2):
>   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
>   ARM: shmobile: lager: remove USBHS callbacks
> 
>  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
>  drivers/usb/renesas_usbhs/Makefile   |   2 +-
>  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
>  drivers/usb/renesas_usbhs/common.h   |   2 +
>  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
>  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
>  include/linux/usb/renesas_usbhs.h    |   6 ++
>  7 files changed, 163 insertions(+), 119 deletions(-)
>  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
>  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> 

I tested these patches on Lager legacy, and these patches worked correctly.

Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Best regards,
Yoshihiro Shimoda

Re: [PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Simon Horman]

[Cc Felipe Balbi]

On Thu, Jul 10, 2014 at 01:20:34AM -0700, Kuninori Morimoto wrote:
> 
> Hi
> 
> > Changes in v2:
> > - move phy handle to struct usbhs_priv
> > - add new default pipe type to driver
> > - remove pipe type from Lager board code
> > 
> > Ulrich Hecht (2):
> >   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
> >   ARM: shmobile: lager: remove USBHS callbacks
> > 
> >  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
> >  drivers/usb/renesas_usbhs/Makefile   |   2 +-
> >  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
> >  drivers/usb/renesas_usbhs/common.h   |   2 +
> >  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
> >  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
> >  include/linux/usb/renesas_usbhs.h    |   6 ++
> >  7 files changed, 163 insertions(+), 119 deletions(-)
> >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
> >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> 
> For all patches
> 
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

[snip]

> I tested these patches on Lager legacy, and these patches worked correctly.
> 
> Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Hi,

it seems that the 2nd patch should go through my renesas tree
but it depends on the first patch which should be taken by 
Felipe Balbi (Cced).

Felipe, is there any chance that you could take this for v3.16?
I am quite happy to make a branch for you to pull for renesas_usbhs
if this would make your life easier.

[PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Simon Horman]

[Cc Felipe Balbi]

On Thu, Jul 10, 2014 at 01:20:34AM -0700, Kuninori Morimoto wrote:
> 
> Hi
> 
> > Changes in v2:
> > - move phy handle to struct usbhs_priv
> > - add new default pipe type to driver
> > - remove pipe type from Lager board code
> > 
> > Ulrich Hecht (2):
> >   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
> >   ARM: shmobile: lager: remove USBHS callbacks
> > 
> >  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
> >  drivers/usb/renesas_usbhs/Makefile   |   2 +-
> >  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
> >  drivers/usb/renesas_usbhs/common.h   |   2 +
> >  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
> >  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
> >  include/linux/usb/renesas_usbhs.h    |   6 ++
> >  7 files changed, 163 insertions(+), 119 deletions(-)
> >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
> >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> 
> For all patches
> 
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

[snip]

> I tested these patches on Lager legacy, and these patches worked correctly.
> 
> Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Hi,

it seems that the 2nd patch should go through my renesas tree
but it depends on the first patch which should be taken by 
Felipe Balbi (Cced).

Felipe, is there any chance that you could take this for v3.16?
I am quite happy to make a branch for you to pull for renesas_usbhs
if this would make your life easier.

Re: [PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Felipe Balbi]

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

On Fri, Jul 11, 2014 at 11:00:07AM +0200, Simon Horman wrote:
> [Cc Felipe Balbi]
> 
> On Thu, Jul 10, 2014 at 01:20:34AM -0700, Kuninori Morimoto wrote:
> > 
> > Hi
> > 
> > > Changes in v2:
> > > - move phy handle to struct usbhs_priv
> > > - add new default pipe type to driver
> > > - remove pipe type from Lager board code
> > > 
> > > Ulrich Hecht (2):
> > >   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
> > >   ARM: shmobile: lager: remove USBHS callbacks
> > > 
> > >  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
> > >  drivers/usb/renesas_usbhs/Makefile   |   2 +-
> > >  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
> > >  drivers/usb/renesas_usbhs/common.h   |   2 +
> > >  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
> > >  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
> > >  include/linux/usb/renesas_usbhs.h    |   6 ++
> > >  7 files changed, 163 insertions(+), 119 deletions(-)
> > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
> > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> > 
> > For all patches
> > 
> > Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> [snip]
> 
> > I tested these patches on Lager legacy, and these patches worked correctly.
> > 
> > Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> 
> Hi,
> 
> it seems that the 2nd patch should go through my renesas tree
> but it depends on the first patch which should be taken by 
> Felipe Balbi (Cced).
> 
> Felipe, is there any chance that you could take this for v3.16?
> I am quite happy to make a branch for you to pull for renesas_usbhs
> if this would make your life easier.

you need to take both patches or just patch 1 ?

-- 
balbi

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

[PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Felipe Balbi]

On Fri, Jul 11, 2014 at 11:00:07AM +0200, Simon Horman wrote:
> [Cc Felipe Balbi]
> 
> On Thu, Jul 10, 2014 at 01:20:34AM -0700, Kuninori Morimoto wrote:
> > 
> > Hi
> > 
> > > Changes in v2:
> > > - move phy handle to struct usbhs_priv
> > > - add new default pipe type to driver
> > > - remove pipe type from Lager board code
> > > 
> > > Ulrich Hecht (2):
> > >   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
> > >   ARM: shmobile: lager: remove USBHS callbacks
> > > 
> > >  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
> > >  drivers/usb/renesas_usbhs/Makefile   |   2 +-
> > >  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
> > >  drivers/usb/renesas_usbhs/common.h   |   2 +
> > >  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
> > >  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
> > >  include/linux/usb/renesas_usbhs.h    |   6 ++
> > >  7 files changed, 163 insertions(+), 119 deletions(-)
> > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
> > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> > 
> > For all patches
> > 
> > Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> [snip]
> 
> > I tested these patches on Lager legacy, and these patches worked correctly.
> > 
> > Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> 
> Hi,
> 
> it seems that the 2nd patch should go through my renesas tree
> but it depends on the first patch which should be taken by 
> Felipe Balbi (Cced).
> 
> Felipe, is there any chance that you could take this for v3.16?
> I am quite happy to make a branch for you to pull for renesas_usbhs
> if this would make your life easier.

you need to take both patches or just patch 1 ?

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140711/77a83077/attachment.sig>

Re: [PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Simon Horman]

On Fri, Jul 11, 2014 at 10:12:37AM -0500, Felipe Balbi wrote:
> On Fri, Jul 11, 2014 at 11:00:07AM +0200, Simon Horman wrote:
> > [Cc Felipe Balbi]
> > 
> > On Thu, Jul 10, 2014 at 01:20:34AM -0700, Kuninori Morimoto wrote:
> > > 
> > > Hi
> > > 
> > > > Changes in v2:
> > > > - move phy handle to struct usbhs_priv
> > > > - add new default pipe type to driver
> > > > - remove pipe type from Lager board code
> > > > 
> > > > Ulrich Hecht (2):
> > > >   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
> > > >   ARM: shmobile: lager: remove USBHS callbacks
> > > > 
> > > >  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
> > > >  drivers/usb/renesas_usbhs/Makefile   |   2 +-
> > > >  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
> > > >  drivers/usb/renesas_usbhs/common.h   |   2 +
> > > >  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
> > > >  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
> > > >  include/linux/usb/renesas_usbhs.h    |   6 ++
> > > >  7 files changed, 163 insertions(+), 119 deletions(-)
> > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
> > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> > > 
> > > For all patches
> > > 
> > > Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > 
> > [snip]
> > 
> > > I tested these patches on Lager legacy, and these patches worked correctly.
> > > 
> > > Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > 
> > Hi,
> > 
> > it seems that the 2nd patch should go through my renesas tree
> > but it depends on the first patch which should be taken by 
> > Felipe Balbi (Cced).
> > 
> > Felipe, is there any chance that you could take this for v3.16?
> > I am quite happy to make a branch for you to pull for renesas_usbhs
> > if this would make your life easier.
> 
> you need to take both patches or just patch 1 ?

Please just take patch 1.
Thanks

[PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Simon Horman]

On Fri, Jul 11, 2014 at 10:12:37AM -0500, Felipe Balbi wrote:
> On Fri, Jul 11, 2014 at 11:00:07AM +0200, Simon Horman wrote:
> > [Cc Felipe Balbi]
> > 
> > On Thu, Jul 10, 2014 at 01:20:34AM -0700, Kuninori Morimoto wrote:
> > > 
> > > Hi
> > > 
> > > > Changes in v2:
> > > > - move phy handle to struct usbhs_priv
> > > > - add new default pipe type to driver
> > > > - remove pipe type from Lager board code
> > > > 
> > > > Ulrich Hecht (2):
> > > >   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
> > > >   ARM: shmobile: lager: remove USBHS callbacks
> > > > 
> > > >  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
> > > >  drivers/usb/renesas_usbhs/Makefile   |   2 +-
> > > >  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
> > > >  drivers/usb/renesas_usbhs/common.h   |   2 +
> > > >  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
> > > >  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
> > > >  include/linux/usb/renesas_usbhs.h    |   6 ++
> > > >  7 files changed, 163 insertions(+), 119 deletions(-)
> > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
> > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> > > 
> > > For all patches
> > > 
> > > Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > 
> > [snip]
> > 
> > > I tested these patches on Lager legacy, and these patches worked correctly.
> > > 
> > > Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > 
> > Hi,
> > 
> > it seems that the 2nd patch should go through my renesas tree
> > but it depends on the first patch which should be taken by 
> > Felipe Balbi (Cced).
> > 
> > Felipe, is there any chance that you could take this for v3.16?
> > I am quite happy to make a branch for you to pull for renesas_usbhs
> > if this would make your life easier.
> 
> you need to take both patches or just patch 1 ?

Please just take patch 1.
Thanks

Re: [PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Felipe Balbi]

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

On Fri, Jul 11, 2014 at 05:41:52PM +0200, Simon Horman wrote:
> On Fri, Jul 11, 2014 at 10:12:37AM -0500, Felipe Balbi wrote:
> > On Fri, Jul 11, 2014 at 11:00:07AM +0200, Simon Horman wrote:
> > > [Cc Felipe Balbi]
> > > 
> > > On Thu, Jul 10, 2014 at 01:20:34AM -0700, Kuninori Morimoto wrote:
> > > > 
> > > > Hi
> > > > 
> > > > > Changes in v2:
> > > > > - move phy handle to struct usbhs_priv
> > > > > - add new default pipe type to driver
> > > > > - remove pipe type from Lager board code
> > > > > 
> > > > > Ulrich Hecht (2):
> > > > >   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
> > > > >   ARM: shmobile: lager: remove USBHS callbacks
> > > > > 
> > > > >  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
> > > > >  drivers/usb/renesas_usbhs/Makefile   |   2 +-
> > > > >  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
> > > > >  drivers/usb/renesas_usbhs/common.h   |   2 +
> > > > >  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
> > > > >  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
> > > > >  include/linux/usb/renesas_usbhs.h    |   6 ++
> > > > >  7 files changed, 163 insertions(+), 119 deletions(-)
> > > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
> > > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> > > > 
> > > > For all patches
> > > > 
> > > > Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > 
> > > [snip]
> > > 
> > > > I tested these patches on Lager legacy, and these patches worked correctly.
> > > > 
> > > > Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > 
> > > Hi,
> > > 
> > > it seems that the 2nd patch should go through my renesas tree
> > > but it depends on the first patch which should be taken by 
> > > Felipe Balbi (Cced).
> > > 
> > > Felipe, is there any chance that you could take this for v3.16?
> > > I am quite happy to make a branch for you to pull for renesas_usbhs
> > > if this would make your life easier.
> > 
> > you need to take both patches or just patch 1 ?
> 
> Please just take patch 1.

will do.

-- 
balbi

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

[PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Felipe Balbi]

On Fri, Jul 11, 2014 at 05:41:52PM +0200, Simon Horman wrote:
> On Fri, Jul 11, 2014 at 10:12:37AM -0500, Felipe Balbi wrote:
> > On Fri, Jul 11, 2014 at 11:00:07AM +0200, Simon Horman wrote:
> > > [Cc Felipe Balbi]
> > > 
> > > On Thu, Jul 10, 2014 at 01:20:34AM -0700, Kuninori Morimoto wrote:
> > > > 
> > > > Hi
> > > > 
> > > > > Changes in v2:
> > > > > - move phy handle to struct usbhs_priv
> > > > > - add new default pipe type to driver
> > > > > - remove pipe type from Lager board code
> > > > > 
> > > > > Ulrich Hecht (2):
> > > > >   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
> > > > >   ARM: shmobile: lager: remove USBHS callbacks
> > > > > 
> > > > >  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
> > > > >  drivers/usb/renesas_usbhs/Makefile   |   2 +-
> > > > >  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
> > > > >  drivers/usb/renesas_usbhs/common.h   |   2 +
> > > > >  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
> > > > >  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
> > > > >  include/linux/usb/renesas_usbhs.h    |   6 ++
> > > > >  7 files changed, 163 insertions(+), 119 deletions(-)
> > > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
> > > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> > > > 
> > > > For all patches
> > > > 
> > > > Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > 
> > > [snip]
> > > 
> > > > I tested these patches on Lager legacy, and these patches worked correctly.
> > > > 
> > > > Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > 
> > > Hi,
> > > 
> > > it seems that the 2nd patch should go through my renesas tree
> > > but it depends on the first patch which should be taken by 
> > > Felipe Balbi (Cced).
> > > 
> > > Felipe, is there any chance that you could take this for v3.16?
> > > I am quite happy to make a branch for you to pull for renesas_usbhs
> > > if this would make your life easier.
> > 
> > you need to take both patches or just patch 1 ?
> 
> Please just take patch 1.

will do.

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140711/d012ef40/attachment.sig>

Re: [PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Simon Horman]

On Fri, Jul 11, 2014 at 11:23:48AM -0500, Felipe Balbi wrote:
> On Fri, Jul 11, 2014 at 05:41:52PM +0200, Simon Horman wrote:
> > On Fri, Jul 11, 2014 at 10:12:37AM -0500, Felipe Balbi wrote:
> > > On Fri, Jul 11, 2014 at 11:00:07AM +0200, Simon Horman wrote:
> > > > [Cc Felipe Balbi]
> > > > 
> > > > On Thu, Jul 10, 2014 at 01:20:34AM -0700, Kuninori Morimoto wrote:
> > > > > 
> > > > > Hi
> > > > > 
> > > > > > Changes in v2:
> > > > > > - move phy handle to struct usbhs_priv
> > > > > > - add new default pipe type to driver
> > > > > > - remove pipe type from Lager board code
> > > > > > 
> > > > > > Ulrich Hecht (2):
> > > > > >   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
> > > > > >   ARM: shmobile: lager: remove USBHS callbacks
> > > > > > 
> > > > > >  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
> > > > > >  drivers/usb/renesas_usbhs/Makefile   |   2 +-
> > > > > >  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
> > > > > >  drivers/usb/renesas_usbhs/common.h   |   2 +
> > > > > >  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
> > > > > >  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
> > > > > >  include/linux/usb/renesas_usbhs.h    |   6 ++
> > > > > >  7 files changed, 163 insertions(+), 119 deletions(-)
> > > > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
> > > > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> > > > > 
> > > > > For all patches
> > > > > 
> > > > > Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > > 
> > > > [snip]
> > > > 
> > > > > I tested these patches on Lager legacy, and these patches worked correctly.
> > > > > 
> > > > > Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > > 
> > > > Hi,
> > > > 
> > > > it seems that the 2nd patch should go through my renesas tree
> > > > but it depends on the first patch which should be taken by 
> > > > Felipe Balbi (Cced).
> > > > 
> > > > Felipe, is there any chance that you could take this for v3.16?
> > > > I am quite happy to make a branch for you to pull for renesas_usbhs
> > > > if this would make your life easier.
> > > 
> > > you need to take both patches or just patch 1 ?
> > 
> > Please just take patch 1.
> 
> will do.

Thanks.

Ulrich, please repost patch #2 once patch #1 hits an rc release.

[PATCH v2 0/2] ARM: shmobile: lager: USBHS callback elimination

[Simon Horman]

On Fri, Jul 11, 2014 at 11:23:48AM -0500, Felipe Balbi wrote:
> On Fri, Jul 11, 2014 at 05:41:52PM +0200, Simon Horman wrote:
> > On Fri, Jul 11, 2014 at 10:12:37AM -0500, Felipe Balbi wrote:
> > > On Fri, Jul 11, 2014 at 11:00:07AM +0200, Simon Horman wrote:
> > > > [Cc Felipe Balbi]
> > > > 
> > > > On Thu, Jul 10, 2014 at 01:20:34AM -0700, Kuninori Morimoto wrote:
> > > > > 
> > > > > Hi
> > > > > 
> > > > > > Changes in v2:
> > > > > > - move phy handle to struct usbhs_priv
> > > > > > - add new default pipe type to driver
> > > > > > - remove pipe type from Lager board code
> > > > > > 
> > > > > > Ulrich Hecht (2):
> > > > > >   usb: renesas_usbhs: add R-Car Gen. 2 init and power control
> > > > > >   ARM: shmobile: lager: remove USBHS callbacks
> > > > > > 
> > > > > >  arch/arm/mach-shmobile/board-lager.c | 126 ++++-------------------------------
> > > > > >  drivers/usb/renesas_usbhs/Makefile   |   2 +-
> > > > > >  drivers/usb/renesas_usbhs/common.c   |  66 ++++++++++++++++--
> > > > > >  drivers/usb/renesas_usbhs/common.h   |   2 +
> > > > > >  drivers/usb/renesas_usbhs/rcar2.c    |  76 +++++++++++++++++++++
> > > > > >  drivers/usb/renesas_usbhs/rcar2.h    |   4 ++
> > > > > >  include/linux/usb/renesas_usbhs.h    |   6 ++
> > > > > >  7 files changed, 163 insertions(+), 119 deletions(-)
> > > > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.c
> > > > > >  create mode 100644 drivers/usb/renesas_usbhs/rcar2.h
> > > > > 
> > > > > For all patches
> > > > > 
> > > > > Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > > 
> > > > [snip]
> > > > 
> > > > > I tested these patches on Lager legacy, and these patches worked correctly.
> > > > > 
> > > > > Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > > 
> > > > Hi,
> > > > 
> > > > it seems that the 2nd patch should go through my renesas tree
> > > > but it depends on the first patch which should be taken by 
> > > > Felipe Balbi (Cced).
> > > > 
> > > > Felipe, is there any chance that you could take this for v3.16?
> > > > I am quite happy to make a branch for you to pull for renesas_usbhs
> > > > if this would make your life easier.
> > > 
> > > you need to take both patches or just patch 1 ?
> > 
> > Please just take patch 1.
> 
> will do.

Thanks.

Ulrich, please repost patch #2 once patch #1 hits an rc release.