Patch "usb: renesas_usbhs: Fix UGCTRL2 value for R-Car Gen3" has been added to the 4.12-stable tree

This is a note to let you know that I've just added the patch titled

usb: renesas_usbhs: Fix UGCTRL2 value for R-Car Gen3

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
usb-renesas_usbhs-fix-ugctrl2-value-for-r-car-gen3.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Yoshihiro Shimoda <[email protected]>
Date: Wed, 2 Aug 2017 13:21:45 +0900
Subject: usb: renesas_usbhs: Fix UGCTRL2 value for R-Car Gen3

From: Yoshihiro Shimoda <[email protected]>

commit 2acecd58969897795cf015c9057ebd349a3fda8a upstream.

The latest HW manual (Rev.0.55) shows us this UGCTRL2.VBUSSEL bit. If the bit sets to 1, the VBUS drive is controlled by phy related registers (called "UCOM Registers" on the manual). Since R-Car Gen3 environment will control VBUS by phy-rcar-gen3-usb2 driver, the UGCTRL2.VBUSSEL bit should be set to 1. So, this patch fixes the register's value. Otherwise, even if the ID pin indicates to peripheral, the R-Car will output USBn_PWEN to 1 when a host driver is running.

---
 drivers/usb/renesas_usbhs/rcar3.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

@@ -20,9 +20,13 @@
 /* Low Power Status register (LPSTS) */
 #define LPSTS_SUSPM	0x4000
 
-/* USB General control register 2 (UGCTRL2), bit[31:6] should be 0 */
+/*
+ * USB General control register 2 (UGCTRL2)
+ * Remarks: bit[31:11] and bit[9:6] should be 0
+ */
 #define UGCTRL2_RESERVED_3	0x00000001	/* bit[3:0] should be B'0001 */
 #define UGCTRL2_USB0SEL_OTG	0x00000030
+#define UGCTRL2_VBUSSEL		0x00000400
 
 static void usbhs_write32(struct usbhs_priv *priv, u32 reg, u32 data)
 {

@@ -34,7 +38,8 @@ static int usbhs_rcar3_power_ctrl(struct
 {
 	struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
 
-	usbhs_write32(priv, UGCTRL2, UGCTRL2_RESERVED_3 | UGCTRL2_USB0SEL_OTG);
+	usbhs_write32(priv, UGCTRL2, UGCTRL2_RESERVED_3 | UGCTRL2_USB0SEL_OTG |
+		      UGCTRL2_VBUSSEL);
 
 	if (enable) {
 		usbhs_bset(priv, LPSTS, LPSTS_SUSPM, LPSTS_SUSPM);

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/usb-renesas_usbhs-fix-ugctrl2-value-for-r-car-gen3.patch queue-4.12/usb-gadget-udc-renesas_usb3-fix-usb_gadget_giveback_request-calling.patch