Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-12 22:18:26 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-12 22:21:23 +0100
commitf0491a98f75fd1c923e496f2362668e3036e6e5d (patch)
tree8fc2c924a2e834a8af83a140665c9999eba38362
parentf505ea937e90936893a6a3d3904555818b7eed01 (diff)
arm64: dts: allwinner: a64: Fix USB OTG regulator (bnc#1012628).
-rw-r--r--patches.kernel.org/4.20.8-321-arm64-dts-allwinner-a64-Fix-USB-OTG-regulator.patch42
-rw-r--r--series.conf1
2 files changed, 43 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.8-321-arm64-dts-allwinner-a64-Fix-USB-OTG-regulator.patch b/patches.kernel.org/4.20.8-321-arm64-dts-allwinner-a64-Fix-USB-OTG-regulator.patch
new file mode 100644
index 0000000000..4364019e3d
--- /dev/null
+++ b/patches.kernel.org/4.20.8-321-arm64-dts-allwinner-a64-Fix-USB-OTG-regulator.patch
@@ -0,0 +1,42 @@
+From: Jernej Skrabec <jernej.skrabec@siol.net>
+Date: Wed, 9 Jan 2019 19:16:04 +0100
+Subject: [PATCH] arm64: dts: allwinner: a64: Fix USB OTG regulator
+References: bnc#1012628
+Patch-mainline: 4.20.8
+Git-commit: b1360dcfdaa1d55952e5ec8dd9d99f88965d7ac9
+
+commit b1360dcfdaa1d55952e5ec8dd9d99f88965d7ac9 upstream.
+
+Currently, AXP803 driver assumes that reg_drivevbus is input which is
+wrong. Unfortunate consequence of that is that none of the USB ports
+work on the board, even USB HOST port, because USB PHY driver probing
+fails due to missing regulator.
+
+Fix that by adding "x-powers,drive-vbus-en" property to AXP803 node.
+
+Fixes: 14ff5d8f9151 ("arm64: dts: allwinner: a64: Orange Pi Win: Enable USB OTG socket")
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
+Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
+index b0c64f75792c..8974b5a1d3b1 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
+@@ -188,6 +188,7 @@
+ reg = <0x3a3>;
+ interrupt-parent = <&r_intc>;
+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
++ x-powers,drive-vbus-en; /* set N_VBUSEN as output pin */
+ };
+ };
+
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index aed93d7a0d..3fb65501e3 100644
--- a/series.conf
+++ b/series.conf
@@ -1057,6 +1057,7 @@
patches.kernel.org/4.20.8-318-dmaengine-imx-dma-fix-wrong-callback-invoke.patch
patches.kernel.org/4.20.8-319-futex-Handle-early-deadlock-return-correctly.patch
patches.kernel.org/4.20.8-320-irqchip-gic-v3-its-Plug-allocation-race-for-de.patch
+ patches.kernel.org/4.20.8-321-arm64-dts-allwinner-a64-Fix-USB-OTG-regulator.patch
########################################################
# Build fixes that apply to the vanilla kernel too.