From patchwork Sun Dec 24 13:37:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 10131999 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6A9806037D for ; Sun, 24 Dec 2017 13:38:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4683B28BB3 for ; Sun, 24 Dec 2017 13:38:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 297F128D48; Sun, 24 Dec 2017 13:38:13 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7513828BB3 for ; Sun, 24 Dec 2017 13:38:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752034AbdLXNiK (ORCPT ); Sun, 24 Dec 2017 08:38:10 -0500 Received: from mail-pl0-f67.google.com ([209.85.160.67]:41541 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751680AbdLXNiJ (ORCPT ); Sun, 24 Dec 2017 08:38:09 -0500 Received: by mail-pl0-f67.google.com with SMTP id g2so15526509pli.8; Sun, 24 Dec 2017 05:38:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=O1Sgj4kaDnS531q4XPJpgyEbaVdymGsCPGEIuil/grk=; b=VaGCHIoBasSbs1o/nkioFpzdGfcvThCjDpRBfUZ79QDbEHZVKF3qPx0sQI9wyHQw/F fKmmAlfe6N8sWhKxZf+2vmR9U3xKnIGU2ayBtzDHbfxGx3QdaD6sFHVSDJ3DNOOTMEME PbhQqSOAHHVo8PZ2nEIBh/wyux/MncWPgT9Wl3h7eXD7D17FcBGJvfl0COuZMHjoUcAm N0VZ4eaenAzzL+MFJhJgSpywL/2SSjzVDLz2JHZZZJBh31Oy1pY89zLh/dCb7fIs6fYd djt/yz1SnRzJhyHGSbAl8qbNAXmtB05dl52DdDApHVpeBLKpW96zAk+dTLiJSk2tdNch kFeA== 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; bh=O1Sgj4kaDnS531q4XPJpgyEbaVdymGsCPGEIuil/grk=; b=pb0LlLVHYWWM4uFUHnKUsRzdMPqoKiV43eOrp292v0YZCe7KfP+7x/6iclv+kQDR4q vNAYpBw+IoonfdbDTXxX2dVC316LEtM6t15ebwumO+oQs8mKkxndXATWzuZkhZwI7Fp2 U8ztXLx3PJT5/UkS8ibIB9L2yKyxa8z25XyuTMelSA9zAgXujdFR9EXS7Lhph5uatVqg anyj397DfQpbsr6Hs15muvsjKQfX8BspguownlTc5tBtlUypUz9VKImsXmycp9O0nJKk jqHXXoveYc9+glaEhPrtLqjVfEzC/fBRzuXzfUreqd+A00xWbzvID/9eS9YQxYozAUnN dH/A== X-Gm-Message-State: AKGB3mK2QdbjNXcgwJYal/Fa9xFTtQn3uDLvTxY46lPkaVQz8fqh/SgS KqJxa4IJT/6vnvgTDU/icIbXJw== X-Google-Smtp-Source: ACJfBovuYlpE3opN9ZIe7ykuflAE4q+JFrMldyd9EGHYW65bG2cFUwuvdsWpZ2kpJcL8/08ZSuy66Q== X-Received: by 10.84.129.36 with SMTP id 33mr19805955plb.394.1514122688620; Sun, 24 Dec 2017 05:38:08 -0800 (PST) Received: from macc.flets-east.jp (p8035-ipngn10101marunouchi.tokyo.ocn.ne.jp. [114.164.103.35]) by smtp.gmail.com with ESMTPSA id h81sm57215792pfh.119.2017.12.24.05.38.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Dec 2017 05:38:07 -0800 (PST) From: Yoshihiro Kaneko To: linux-gpio@vger.kernel.org Cc: Linus Walleij , Simon Horman , Magnus Damm , Geert Uytterhoeven , linux-renesas-soc@vger.kernel.org Subject: [PATCH/RFT v2] gpio: gpio-rcar: Support S2RAM Date: Sun, 24 Dec 2017 22:37:23 +0900 Message-Id: <1514122643-28838-1-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hien Dang This patch adds an implementation that saves and restores the state of GPIO configuration on suspend and resume. Signed-off-by: Hien Dang Signed-off-by: Takeshi Kihara [Modify structure of the bank info to simplify a saving registers] Signed-off-by: Yoshihiro Kaneko --- This patch is based on the for-next branch of linux-gpio tree. v2 [Yoshihiro Kaneko] * Modify structure of the bank info as suggested by Geert Uytterhoeven drivers/gpio/gpio-rcar.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index e76de57..7c7360b 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -31,6 +31,16 @@ #include #include +struct gpio_rcar_bank_info { + u32 iointsel; + u32 inoutsel; + u32 outdt; + u32 active_high_rising_edge; + u32 level_trigger; + u32 both; + u32 intmsk; +}; + struct gpio_rcar_priv { void __iomem *base; spinlock_t lock; @@ -41,6 +51,7 @@ struct gpio_rcar_priv { unsigned int irq_parent; bool has_both_edge_trigger; bool needs_clk; + struct gpio_rcar_bank_info bank_info; }; #define IOINTSEL 0x00 /* General IO/Interrupt Switching Register */ @@ -415,6 +426,63 @@ static int gpio_rcar_parse_dt(struct gpio_rcar_priv *p, unsigned int *npins) return 0; } +#ifdef CONFIG_PM_SLEEP +static int gpio_rcar_suspend(struct device *dev) +{ + struct gpio_rcar_priv *p = dev_get_drvdata(dev); + + p->bank_info.iointsel = gpio_rcar_read(p, IOINTSEL); + p->bank_info.inoutsel = gpio_rcar_read(p, INOUTSEL); + p->bank_info.outdt = gpio_rcar_read(p, OUTDT); + p->bank_info.intmsk = gpio_rcar_read(p, INTMSK); + p->bank_info.active_high_rising_edge = gpio_rcar_read(p, POSNEG); + p->bank_info.level_trigger = gpio_rcar_read(p, EDGLEVEL); + p->bank_info.both = gpio_rcar_read(p, BOTHEDGE); + + return 0; +} + +static int gpio_rcar_resume(struct device *dev) +{ + struct gpio_rcar_priv *p = dev_get_drvdata(dev); + int offset; + u32 mask; + + for (offset = 0; offset < p->gpio_chip.ngpio; offset++) { + mask = BIT(offset); + /* I/O pin */ + if (!(p->bank_info.iointsel & mask)) { + if (p->bank_info.inoutsel & mask) + gpio_rcar_direction_output( + &p->gpio_chip, offset, + !!(p->bank_info.outdt & mask)); + else + gpio_rcar_direction_input(&p->gpio_chip, + offset); + /* Interrupt pin */ + } else { + gpio_rcar_config_interrupt_input_mode( + p, + offset, + !(p->bank_info.active_high_rising_edge & mask), + !!(p->bank_info.level_trigger & mask), + !!(p->bank_info.both & mask)); + + if (p->bank_info.intmsk & mask) + gpio_rcar_write(p, MSKCLR, mask); + } + } + + return 0; +} + +static SIMPLE_DEV_PM_OPS(gpio_rcar_pm_ops, + gpio_rcar_suspend, gpio_rcar_resume); +#define DEV_PM_OPS (&gpio_rcar_pm_ops) +#else +#define DEV_PM_OPS NULL +#endif /* CONFIG_PM_SLEEP*/ + static int gpio_rcar_probe(struct platform_device *pdev) { struct gpio_rcar_priv *p; @@ -536,6 +604,7 @@ static int gpio_rcar_remove(struct platform_device *pdev) .remove = gpio_rcar_remove, .driver = { .name = "gpio_rcar", + .pm = DEV_PM_OPS, .of_match_table = of_match_ptr(gpio_rcar_of_table), } };