Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp4027345pxf; Tue, 23 Mar 2021 00:08:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFws6iWqwQnNpupLaNELGkl8wp0ERczvxD4g+JSOkocqUCwbGXZw5CN4/A+ffrv2whLVdl X-Received: by 2002:a17:906:c08f:: with SMTP id f15mr3562873ejz.318.1616483322287; Tue, 23 Mar 2021 00:08:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616483322; cv=none; d=google.com; s=arc-20160816; b=aLMJPmvWMqxRIkBtxjgG1m5BVcQN09xeii0lgmrdQBhgG37yz/QD7xT9yEOsl7/ZCj pb6jGRqaE1KhS7OEtzGuHMwc3ezje26rNtfNyqWq0CC6iBsal0LSNaCeRPX37qJxvDH2 kNYwqi3vX9iU5fuiTBglw4mneS8U8iiKF41RKpeFzM8J26UIUq1rn4hcIv7nqxMMxu4I ERdAU2mTrLhJU7ilz1k/tXSKu5bfJotMUFSBqmGVDwW3u/eiM9XoeQ7/sQT6aEDwJxn5 mSbTmFdsgTDZtjM3bek+lj6l9sCqiJMW2TW27Am4R1PgJhRNueF9VyHdk3EzDaGoOjvZ 475A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=sFqMQZEC/5OFiKKXvwKmywWFYJVT6dzAY7qUeF9IcLk=; b=kzK3wZixjEq6CGvRAExeE4R4b2bY1vgIB+t06mecv9sisglaiVR6fTnfDyQri896D5 BCWnDY1H7l8iftqZqds2Mh9wLRjfRS15E/qiPcOJQr8b7uPldvnXzBsPvPs9H55IHEaQ DqUCrrI+WHaq89TTdkjPWuZ6+fHvO3PQl1hO8DdnOPNlResOAWC2l9Z1nw5or+nSZEhO Wl4BuxKvEaUSA4E9gLiURtAaR5ghTSQdO4qYFai1NK96jzx74JdLSrmUAzUen880wapT ji2YNGkOBK9g5UL2x9rPz6BmlUrkVkmLV/9Ahy9/Gzo0J97GiNxDnUhDv5/jG9LW3tOA mo3g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cq5si12535266edb.98.2021.03.23.00.08.20; Tue, 23 Mar 2021 00:08:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230285AbhCWHEH (ORCPT + 99 others); Tue, 23 Mar 2021 03:04:07 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:52778 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S230080AbhCWHDl (ORCPT ); Tue, 23 Mar 2021 03:03:41 -0400 X-UUID: becfb29289564dd198c664aebd3e5ac3-20210323 X-UUID: becfb29289564dd198c664aebd3e5ac3-20210323 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.14 Build 0819 with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1348556983; Tue, 23 Mar 2021 15:03:36 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs06n1.mediatek.inc (172.21.101.129) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 23 Mar 2021 15:03:13 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 23 Mar 2021 15:03:13 +0800 From: Chunfeng Yun To: Greg Kroah-Hartman , Rob Herring , Mathias Nyman CC: Chunfeng Yun , Matthias Brugger , , , , , , Sergei Shtylyov , Eddie Hung , Nicolas Boichat Subject: [PATCH v2 06/13] usb: xhci-mtk: support ip-sleep wakeup for MT8183 Date: Tue, 23 Mar 2021 15:02:48 +0800 Message-ID: <1616482975-17841-6-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1616482975-17841-1-git-send-email-chunfeng.yun@mediatek.com> References: <1616482975-17841-1-git-send-email-chunfeng.yun@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support ip-sleep wakeup for MT8183, it's similar to MT8173, and it's also a specific one, but not following IPM rule. Due to the index 2 already used by many DTS, it's better to keep it unchanged for backward compatibility, treat specific ones without following IPM rule as revision 1.x, meanwhile reserve 3~10 for later revision that follows the IPM rule. Signed-off-by: Chunfeng Yun --- v2: 1. fix typo suggested by Sergei 2. fix build warning - Woverflow 3. modify revision format --- drivers/usb/host/xhci-mtk.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c index 09f2ddbfe8b9..ef2c74281ab4 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -57,12 +57,19 @@ #define CTRL_U2_FORCE_PLL_STB BIT(28) /* usb remote wakeup registers in syscon */ + /* mt8173 etc */ #define PERI_WK_CTRL1 0x4 #define WC1_IS_C(x) (((x) & 0xf) << 26) /* cycle debounce */ #define WC1_IS_EN BIT(25) #define WC1_IS_P BIT(6) /* polarity for ip sleep */ +/* mt8183 */ +#define PERI_WK_CTRL0 0x0 +#define WC0_IS_C(x) ((u32)(((x) & 0xf) << 28)) /* cycle debounce */ +#define WC0_IS_P BIT(12) /* polarity */ +#define WC0_IS_EN BIT(6) + /* mt2712 etc */ #define PERI_SSUSB_SPM_CTRL 0x0 #define SSC_IP_SLEEP_EN BIT(4) @@ -71,6 +78,7 @@ enum ssusb_uwk_vers { SSUSB_UWK_V1 = 1, SSUSB_UWK_V2, + SSUSB_UWK_V1_1 = 101, /* specific revision 1.01 */ }; static int xhci_mtk_host_enable(struct xhci_hcd_mtk *mtk) @@ -300,6 +308,11 @@ static void usb_wakeup_ip_sleep_set(struct xhci_hcd_mtk *mtk, bool enable) msk = WC1_IS_EN | WC1_IS_C(0xf) | WC1_IS_P; val = enable ? (WC1_IS_EN | WC1_IS_C(0x8)) : 0; break; + case SSUSB_UWK_V1_1: + 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_V2: reg = mtk->uwk_reg_base + PERI_SSUSB_SPM_CTRL; msk = SSC_IP_SLEEP_EN | SSC_SPM_INT_EN; -- 2.18.0