From patchwork Mon Apr 29 03:25:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10921123 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 478D8912 for ; Mon, 29 Apr 2019 03:26:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34B4528658 for ; Mon, 29 Apr 2019 03:26:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2940628735; Mon, 29 Apr 2019 03:26:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 57F7928658 for ; Mon, 29 Apr 2019 03:26:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sXweAlHWK+NEuVGLMRosqJlHq/YY9KSnrsowWdxoLUo=; b=lILMGMGV5VEXJK FqGaVrwLzwCeFzuwhk0sghH4O/BxIfIa4LU0adgDpQ6bviN1igbKmB3ERqBZ3B+6k4cjpvFLQVGqx Y9ztTTmbe+kM9J1b6LhucHrPN+IGboXGDw53qNtRbfG7emOsiAvMiYc22jQWtYjZ9tln0LPs58cqX C6+f3kRgIps85vTswMhWsKYHG6q72KvOh3bgEpKoCXvuTBzDZBl0fNEr5X8ge+A9BVRISciq9Vs/f ZV3LJ3txR5qFg4DdFYrC44KGwyIdlUpo7cGqgvDHK1wGIxyqOhDXb+HyVjoa4SdLntvlc13RANQ3s eerm2YAGiYRC5mP6f/YA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKwvp-0004wO-Nj; Mon, 29 Apr 2019 03:26:17 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKwvh-0004mf-Pj for linux-mediatek@lists.infradead.org; Mon, 29 Apr 2019 03:26:12 +0000 Received: by mail-pg1-x542.google.com with SMTP id z16so4455618pgv.11 for ; Sun, 28 Apr 2019 20:26:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1t5XlT2MKDWHi6woYas868Il32PJ2FqSyI3/eucTk+M=; b=Y/5zs/kxPAO6IznP7l9z6tSm542jICmYfTeptX9Pgu6+SP/6pjsy+VlsKri0qNx3bW 3CrDEh7MGVazLDHxtLnppmWeGBNx5qs9SjyrF8BGyDBmD5eGDy17qcfeFqswBBmiUIRW V78BmDvy9QIwm+aC9Xbe4TSHCO48cVQpBNwI4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1t5XlT2MKDWHi6woYas868Il32PJ2FqSyI3/eucTk+M=; b=en+pznqa1UxmTvyqiNfRFd8Du/Sl+MLfu3aopudHvG40r0mnBbhIuwei4gwvERVv+m aVT1CAKtAN9YqCp9rKLueQVh4U5dsScJ8Ij7SxkTR7pbS8CDVAN9S/WILlr7mHZ7Dw7C QWulyEzobNz4hwmKwLUVrfJYLT0BTYReWpJbXvHZZfwTUYR0eLxq5h0+Z+gBI2qm//Kc qRoO0ZGJw45gPU47Wtt8F0VaU8pT1dAoJRQlhiLwAzLwj6UbY1H85/t+OL2IwR4qsNvA dDLPCKiMm2nbpLDaesMSzy0dsgnMGFddEoUX/03832AR0I/yNl8PE8xryjgvBu3tS9dM bhtQ== X-Gm-Message-State: APjAAAXBwf8kvMEmZQyHBfJTlwFnhaY8Zpstj9N3PyoTMv3Dm31h7Tls C44he1wWJMFCJEieHX156p1yeLlR2Jg= X-Google-Smtp-Source: APXvYqwcxJtRHeC+jJ4mkhX0VVM0VpONliBoEORgL2cg9CA+k0cwGAgIX09ALZvOAb8IaI6sFJjyLw== X-Received: by 2002:a63:161d:: with SMTP id w29mr33985281pgl.395.1556508369048; Sun, 28 Apr 2019 20:26:09 -0700 (PDT) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:d8b7:33af:adcb:b648]) by smtp.gmail.com with ESMTPSA id a10sm41364938pfc.21.2019.04.28.20.26.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 20:26:08 -0700 (PDT) From: Nicolas Boichat To: linux-mediatek@lists.infradead.org Subject: [PATCH 1/2] pinctrl: mediatek: Add mtk_eint_pm_ops to common-v2 Date: Mon, 29 Apr 2019 11:25:50 +0800 Message-Id: <20190429032551.65975-2-drinkcat@chromium.org> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog In-Reply-To: <20190429032551.65975-1-drinkcat@chromium.org> References: <20190429032551.65975-1-drinkcat@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_202609_831320_8CCAD0FB X-CRM114-Status: GOOD ( 10.69 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chuanjia Liu , Linus Walleij , Sean Wang , linux-kernel@vger.kernel.org, evgreen@chromium.org, swboyd@chromium.org, linux-gpio@vger.kernel.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP pinctrl variants that include pinctrl-mtk-common-v2.h (and not pinctrl-mtk-common.h) also need to use mtk_eint_pm_ops to setup wake mask properly, so copy over the pm_ops to v2. It is not easy to merge the 2 copies (or move mtk_eint_suspend/resume to mtk-eint.c), as we need to dereference pctrl->eint, and struct mtk_pinctrl *pctl has a different structure definition for v1 and v2. Signed-off-by: Nicolas Boichat Reviewed-by: Chuanjia Liu --- .../pinctrl/mediatek/pinctrl-mtk-common-v2.c | 19 +++++++++++++++++++ .../pinctrl/mediatek/pinctrl-mtk-common-v2.h | 1 + 2 files changed, 20 insertions(+) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c index 20e1c890e73b30c..7e19b5a4748eafe 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c @@ -723,3 +723,22 @@ int mtk_pinconf_adv_drive_get(struct mtk_pinctrl *hw, return 0; } + +static int mtk_eint_suspend(struct device *device) +{ + struct mtk_pinctrl *pctl = dev_get_drvdata(device); + + return mtk_eint_do_suspend(pctl->eint); +} + +static int mtk_eint_resume(struct device *device) +{ + struct mtk_pinctrl *pctl = dev_get_drvdata(device); + + return mtk_eint_do_resume(pctl->eint); +} + +const struct dev_pm_ops mtk_eint_pm_ops = { + .suspend_noirq = mtk_eint_suspend, + .resume_noirq = mtk_eint_resume, +}; diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h index 1b7da42aa1d53e4..e2048db5bb16671 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h @@ -299,4 +299,5 @@ int mtk_pinconf_adv_drive_set(struct mtk_pinctrl *hw, int mtk_pinconf_adv_drive_get(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc, u32 *val); +extern const struct dev_pm_ops mtk_eint_pm_ops; #endif /* __PINCTRL_MTK_COMMON_V2_H */ From patchwork Mon Apr 29 03:25:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10921127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1A5C414D5 for ; Mon, 29 Apr 2019 03:26:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08D2828658 for ; Mon, 29 Apr 2019 03:26:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F132D28735; Mon, 29 Apr 2019 03:26:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A0FF628658 for ; Mon, 29 Apr 2019 03:26:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Udlk8Zjgz2Y5ygylD/HwXIvTGSP1fSEUROSVGN6NbEo=; b=V9wRtWOC2GFHQ8 Cf6g/zU78oNKcTlWduH0FZmYXfY7USXVvVQXLRn3n0v9ihfc7Y+hZtrS5/EQdRX6VFxEn14UOaE5i hk/MC/+3CHaxPgHx/RiYHwqFBimftKk5CGbm3hjZQnHjKnGhDJKW16/Dcr7fRVOBVj2X6oWqTHTNQ Ywkc2I7vKPtXfGPHivPXj/dcLd6OkVZnIKlYmMU1NGfXn38HKxp40LGzkjTpTlYQS79hmvj/Mtqf9 J0MYSJoOy7KZKhYX5MNcvgI9uIIivBktHQCx3Ni9Qe9qXuASrE4VHj8k0nLVvoIMFj0j+pQKZkN3V I6A1AXBIfmREWXBqxImA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKww6-0005F7-Aw; Mon, 29 Apr 2019 03:26:34 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKwvk-0004ny-5T for linux-mediatek@lists.infradead.org; Mon, 29 Apr 2019 03:26:15 +0000 Received: by mail-pl1-x644.google.com with SMTP id w24so4404541plp.2 for ; Sun, 28 Apr 2019 20:26:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cjmbiwT3xx0O7Zw3eEqLKXpxbtx6F0HnsFgBh+Wws60=; b=CNgWhxrReeKSMttB9V3/AQpjze5DuX7cltNGhy/sDaNNUG7o+k1WqxOSMkKwKlDvW2 /9n0hGXDpt/Or05jBZQIIJVwxeyltEgOjCn83ff0quxl9zoHmE2m3a1M1H44l1FkUIzz fYB61oYgVr8AOx3UNCWaSDCzPBsI7r0sSZzRE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cjmbiwT3xx0O7Zw3eEqLKXpxbtx6F0HnsFgBh+Wws60=; b=ba347j/yzD+nmfm1QtW448PqPLfQJjh858NffNj3OlhF/cxW9ulVM4REDBDAiyAuNK kVhnzkulg6H0q38T0AHxLUiYq2da3WAkefjMBJQnALxNZmUrVORGlt126ml6PGwULTT+ IcNyJU0jbV1FICpbhBtA4/DSRsiQccp+kUs0l0z7Ay3L/uceioXyDvkLKt07K1b4sC+i /8k/bpU4dUXiKN/icXnV8lUpTkLB1cjDaSzMdmyTI3xLKUcQXx/g93idsIkOLUipGbjq N6hO/hJThIy8Ojj8fkf6x1vFIiFDYmvm1rS0W4DuBvXAVAxaOWY7yLG7Bwr60ZE4Y8DP RTWg== X-Gm-Message-State: APjAAAU2H0OnJ3RM/3eLRmUhAv38hXP6wsIUt7oWsoDf5ma+5mhIIRTk 5fN4tleot2PIbH73medp6UiuE2XVeiw= X-Google-Smtp-Source: APXvYqy06pNWRUPq6DrNgZnE5+p+TnTL2fBYI+0TfPcqSXM5TfqsdN3IWuQyyVKhaxJhoe+spIIhgA== X-Received: by 2002:a17:902:a7:: with SMTP id a36mr59457611pla.111.1556508371342; Sun, 28 Apr 2019 20:26:11 -0700 (PDT) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:d8b7:33af:adcb:b648]) by smtp.gmail.com with ESMTPSA id a10sm41364938pfc.21.2019.04.28.20.26.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 20:26:10 -0700 (PDT) From: Nicolas Boichat To: linux-mediatek@lists.infradead.org Subject: [PATCH 2/2] pinctrl: mediatek: mt8183: Add mtk_eint_pm_ops Date: Mon, 29 Apr 2019 11:25:51 +0800 Message-Id: <20190429032551.65975-3-drinkcat@chromium.org> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog In-Reply-To: <20190429032551.65975-1-drinkcat@chromium.org> References: <20190429032551.65975-1-drinkcat@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_202612_405869_61112263 X-CRM114-Status: UNSURE ( 9.86 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chuanjia Liu , Linus Walleij , Sean Wang , linux-kernel@vger.kernel.org, evgreen@chromium.org, swboyd@chromium.org, linux-gpio@vger.kernel.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Setting this up will configure wake from suspend properly, and wake only for the interrupts that are setup in wake_mask, not all interrupts. Signed-off-by: Nicolas Boichat Reviewed-by: Chuanjia Liu --- drivers/pinctrl/mediatek/pinctrl-mt8183.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8183.c b/drivers/pinctrl/mediatek/pinctrl-mt8183.c index 2c7409ed16fae9c..ce93e55b79a435a 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt8183.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt8183.c @@ -583,6 +583,7 @@ static struct platform_driver mt8183_pinctrl_driver = { .driver = { .name = "mt8183-pinctrl", .of_match_table = mt8183_pinctrl_of_match, + .pm = &mtk_eint_pm_ops, }, .probe = mt8183_pinctrl_probe, };