64b53247c4
Refresh patches. Remove upstreamed patch: generic/pending/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Update patches that no longer applies: generic/hack/901-debloat_sock_diag.patch Compile-tested on: x86/64. Runtime-tested on: x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
50 lines
2.0 KiB
Diff
50 lines
2.0 KiB
Diff
From bbbbdd36c7311a786d7392f2394b355b1f78cf8b Mon Sep 17 00:00:00 2001
|
|
From: Chunfeng Yun <chunfeng.yun@mediatek.com>
|
|
Date: Wed, 3 Jan 2018 16:53:21 +0800
|
|
Subject: [PATCH 192/224] dt-bindings: usb: mtk-xhci: update USB wakeup
|
|
properties
|
|
|
|
Add two arguments in "mediatek,syscon-wakeup" to support multi
|
|
wakeup glue layer between SSUSB and SPM, and use standard property
|
|
"wakeup-source" to replace the private "mediatek,wakeup-src"
|
|
|
|
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
|
|
Reviewed-by: Rob Herring <robh@kernel.org>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
.../devicetree/bindings/usb/mediatek,mtk-xhci.txt | 16 ++++++++++------
|
|
1 file changed, 10 insertions(+), 6 deletions(-)
|
|
|
|
--- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt
|
|
+++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt
|
|
@@ -35,10 +35,14 @@ Required properties:
|
|
- phys : a list of phandle + phy specifier pairs
|
|
|
|
Optional properties:
|
|
- - mediatek,wakeup-src : 1: ip sleep wakeup mode; 2: line state wakeup
|
|
- mode;
|
|
- - mediatek,syscon-wakeup : phandle to syscon used to access USB wakeup
|
|
- control register, it depends on "mediatek,wakeup-src".
|
|
+ - wakeup-source : enable USB remote wakeup;
|
|
+ - mediatek,syscon-wakeup : phandle to syscon used to access the register
|
|
+ of the USB wakeup glue layer between xHCI and SPM; it depends on
|
|
+ "wakeup-source", and has two arguments:
|
|
+ - the first one : register base address of the glue layer in syscon;
|
|
+ - the second one : hardware version of the glue layer
|
|
+ - 1 : used by mt8173 etc
|
|
+ - 2 : used by mt2712 etc
|
|
- mediatek,u3p-dis-msk : mask to disable u3ports, bit0 for u3port0,
|
|
bit1 for u3port1, ... etc;
|
|
- vbus-supply : reference to the VBUS regulator;
|
|
@@ -65,8 +69,8 @@ usb30: usb@11270000 {
|
|
vusb33-supply = <&mt6397_vusb_reg>;
|
|
vbus-supply = <&usb_p1_vbus>;
|
|
usb3-lpm-capable;
|
|
- mediatek,syscon-wakeup = <&pericfg>;
|
|
- mediatek,wakeup-src = <1>;
|
|
+ mediatek,syscon-wakeup = <&pericfg 0x400 1>;
|
|
+ wakeup-source;
|
|
imod-interval-ns = <10000>;
|
|
};
|
|
|