Re: [PATCH v2 4/7] usb: mtk-xhci: support ip-sleep wakeup for MT8183

2019-08-29 Thread Mathias Nyman

On 28.8.2019 10.34, Chunfeng Yun wrote:

Support USB wakeup by ip-sleep mode for MT8183, it's similar to
MT8173

Signed-off-by: Chunfeng Yun 


Acked-by: Mathias Nyman 


[PATCH v2 4/7] usb: mtk-xhci: support ip-sleep wakeup for MT8183

2019-08-28 Thread Chunfeng Yun
Support USB wakeup by ip-sleep mode for MT8183, it's similar to
MT8173

Signed-off-by: Chunfeng Yun 
---
v2: no changes
---
 drivers/usb/host/xhci-mtk.c | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index 026fe18972d3..4b59f2978954 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -57,6 +57,12 @@
 #define CTRL_U2_FORCE_PLL_STB  BIT(28)
 
 /* usb remote wakeup registers in syscon */
+/* mt8183 etc */
+#define PERI_WK_CTRL0  0x20
+#define WC0_IS_C(x)(((x) & 0xf) << 28)  /* cycle debounce */
+#define WC0_IS_EN  BIT(12)
+#define WC0_IS_P   BIT(6)  /* polarity for ip sleep */
+
 /* mt8173 etc */
 #define PERI_WK_CTRL1  0x4
 #define WC1_IS_C(x)(((x) & 0xf) << 26)  /* cycle debounce */
@@ -69,7 +75,8 @@
 #define SSC_SPM_INT_EN BIT(1)
 
 enum ssusb_uwk_vers {
-   SSUSB_UWK_V1 = 1,
+   SSUSB_UWK_V0 = 0,
+   SSUSB_UWK_V1,
SSUSB_UWK_V2,
 };
 
@@ -282,6 +289,11 @@ static void usb_wakeup_ip_sleep_set(struct xhci_hcd_mtk 
*mtk, bool enable)
u32 reg, msk, val;
 
switch (mtk->uwk_vers) {
+   case SSUSB_UWK_V0:
+   reg = mtk->uwk_reg_base + PERI_WK_CTRL0;
+   msk = WC0_IS_EN | WC0_IS_C(0xf) | WC0_IS_P;
+   val = enable ? (WC0_IS_EN | WC0_IS_C(0x8)) : 0;
+   break;
case SSUSB_UWK_V1:
reg = mtk->uwk_reg_base + PERI_WK_CTRL1;
msk = WC1_IS_EN | WC1_IS_C(0xf) | WC1_IS_P;
-- 
2.23.0