Skip to contentSkip to conversation

Patch "usb: renesas_usbhs: add wait after initialization for R-Car Gen3" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Nov 7, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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

usb: renesas_usbhs: add wait after initialization for R-Car Gen3

to the 4.8-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-add-wait-after-initialization-for-r-car-gen3.patch
and it can be found in the queue-4.8 subdirectory.

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

Quoted 1 line

From b76032396d7958f006bccf5fb2535beb5526837c Mon Sep 17 00:00:00 2001

From: Yoshihiro Shimoda <[email protected]>
Date: Thu, 20 Oct 2016 13:19:19 +0900
Subject: usb: renesas_usbhs: add wait after initialization for R-Car Gen3

From: Yoshihiro Shimoda <[email protected]>

commit b76032396d7958f006bccf5fb2535beb5526837c upstream.

Since the controller on R-Car Gen3 doesn't have any status registers to detect initialization (LPSTS.SUSPM = 1) and the initialization needs up to 45 usec, this patch adds wait after the initialization. Otherwise, writing other registers (e.g. INTENB0) will fail.

Fixes de18757e272d ("usb: renesas_usbhs: add R-Car Gen3 power control")
---
 drivers/usb/renesas_usbhs/rcar3.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/renesas_usbhs/rcar3.c +6 -2
@@ -9,6 +9,7 @@
  *
  */
 
+#include <linux/delay.h>
 #include <linux/io.h>
 #include "common.h"
 #include "rcar3.h"
@@ -35,10 +36,13 @@ static int usbhs_rcar3_power_ctrl(struct
 
 	usbhs_write32(priv, UGCTRL2, UGCTRL2_RESERVED_3 | UGCTRL2_USB0SEL_OTG);
 
-	if (enable)
+	if (enable) {
 		usbhs_bset(priv, LPSTS, LPSTS_SUSPM, LPSTS_SUSPM);
-	else
+		/* The controller on R-Car Gen3 needs to wait up to 45 usec */
+		udelay(45);
+	} else {
 		usbhs_bset(priv, LPSTS, LPSTS_SUSPM, 0);
+	}
 
 	return 0;
 }

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

queue-4.8/usb-renesas_usbhs-add-wait-after-initialization-for-r-car-gen3.patch