Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-20 12:08:06 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-20 12:08:23 +0100
commit0cb5d714ed38ead4fca24acddc745605823a903c (patch)
tree4919b9210157c0c7d819faa16d15b000bdeffeca
parentd8e381103e036c4a809fc99ff3d15b26e90142a0 (diff)
phy: renesas: rcar-gen3-usb2: fix vbus_ctrl for role sysfs
(bsc#1051510).
-rw-r--r--patches.drivers/phy-renesas-rcar-gen3-usb2-fix-vbus_ctrl-for-role-sy.patch41
-rw-r--r--series.conf1
2 files changed, 42 insertions, 0 deletions
diff --git a/patches.drivers/phy-renesas-rcar-gen3-usb2-fix-vbus_ctrl-for-role-sy.patch b/patches.drivers/phy-renesas-rcar-gen3-usb2-fix-vbus_ctrl-for-role-sy.patch
new file mode 100644
index 0000000000..5937e87154
--- /dev/null
+++ b/patches.drivers/phy-renesas-rcar-gen3-usb2-fix-vbus_ctrl-for-role-sy.patch
@@ -0,0 +1,41 @@
+From 09938ea9d136243e8d1fed6d4d7a257764f28f6d Mon Sep 17 00:00:00 2001
+From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
+Date: Fri, 21 Sep 2018 20:53:18 +0900
+Subject: [PATCH] phy: renesas: rcar-gen3-usb2: fix vbus_ctrl for role sysfs
+Git-commit: 09938ea9d136243e8d1fed6d4d7a257764f28f6d
+Patch-mainline: v4.20-rc1
+References: bsc#1051510
+
+This patch fixes and issue that the vbus_ctrl is disabled by
+rcar_gen3_init_from_a_peri_to_a_host(), so a usb host cannot
+supply the vbus.
+
+Note that this condition will exit when the otg irq happens
+even if we don't apply this patch.
+
+Fixes: 9bb86777fb71 ("phy: rcar-gen3-usb2: add sysfs for usb role swap")
+Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
+Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
+Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/phy/renesas/phy-rcar-gen3-usb2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+index 3d57ea1e1437..a6db25c20e2c 100644
+--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
++++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+@@ -195,7 +195,7 @@ static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch)
+ val = readl(usb2_base + USB2_OBINTEN);
+ writel(val & ~USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
+
+- rcar_gen3_enable_vbus_ctrl(ch, 0);
++ rcar_gen3_enable_vbus_ctrl(ch, 1);
+ rcar_gen3_init_for_host(ch);
+
+ writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 2045b5449f..97d455b136 100644
--- a/series.conf
+++ b/series.conf
@@ -19259,6 +19259,7 @@
patches.drivers/RDMA-bnxt_re-Add-missing-spin-lock-initialization.patch
patches.drivers/RDMA-bnxt_re-Avoid-NULL-check-after-accessing-the-po.patch
patches.drivers/RDMA-core-Fix-unwinding-flow-in-case-of-error-to-reg.patch
+ patches.drivers/phy-renesas-rcar-gen3-usb2-fix-vbus_ctrl-for-role-sy.patch
patches.drivers/usb-gadget-udc-atmel-handle-at91sam9rl-PMC.patch
patches.drivers/usb-gadget-fsl_udc_core-check-allocation-return-valu.patch
patches.drivers/usb-gadget-fsl_udc_core-fixup-struct_udc_setup-docum.patch