From patchwork Thu Sep 21 01:04:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 816626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pRhnQoAi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xyJLB4Wnxz9s0Z for ; Thu, 21 Sep 2017 11:04:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752069AbdIUBEb (ORCPT ); Wed, 20 Sep 2017 21:04:31 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:37342 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751957AbdIUBE2 (ORCPT ); Wed, 20 Sep 2017 21:04:28 -0400 Received: by mail-qk0-f196.google.com with SMTP id r66so2747632qke.4; Wed, 20 Sep 2017 18:04:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9QDWuY64h73B1o4nahEPrmclzv1BNHHbDCOALsVd5gA=; b=pRhnQoAizL07j1AUGOKXWL7wyQLaru2kz0KW9K/lLykB3yNz0hnT2A3AK3NwZbdZzD 0XNhzY6Ujflw/zSB2IjpnwJopJnP7VndkMnyF5tHTqI0w857UZrF+Jr0nIQt/9yi+9ZK zWQvLcSvPkBo6B2mZZrBAWajfYK9PNWEohohlL2z+13VG1bKDI2VU/YCp8+TAP5b9UgT pjsFXuX2OOq8rELJV8L6RlSwRef+C4XVeAgY0mfJmRz4XWXOGzIpPyRCobMVV8hEpMwT 6EEo5y9adoi0r9aFuAyOXqDauOfAgsGGQOpCB4GCw+87QFj7XrM4btFJpFMnm7ncrNld 101w== 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; bh=9QDWuY64h73B1o4nahEPrmclzv1BNHHbDCOALsVd5gA=; b=eVvDDJU8r59LXdXaipAsKIiujE8dC+xQttEzQ9JgPhvxHVHrNbuog7+qy6OHhKGzDA IoEiPQwxZIBW6ZQbY4OiH6jLrNTFY+9hllOq92R58ttD15N8JSLqkdgSj/gChdRo4lSj s5cIa+CeTv6c6rD1QLLr50w7PEkXDX5fjmivYFJNtk1ltUhN7Jv1BpkTWaqJ0cO6Z0O8 9BtJWUKFjEMvNkWkOfDCHLWsbAhBfYSP8HCqVC8UBNjGHIMwGMr6X2PvAzud7e2v4czo u5scB4rgQYacPWJsPYZRbzw/3vEA3T0nK8L+SUMVvPrynzqcUC2q3QD7A1P82/98bPDo NCzg== X-Gm-Message-State: AHPjjUjTm3N+Dm8nBnrqIpdgHwAa9IM/7NvGoOUeOu7z8QgvYUJtN4U7 MUMtJb4OxMdPJAWFH43eM3AXJUK3 X-Google-Smtp-Source: AOwi7QAuUKAAcIxSSwr5Xn3EHoJ791aMvabu6DV9+q4zhstUXmb8AVwrMSB6z253rJT1DpRoiKsq3w== X-Received: by 10.55.66.22 with SMTP id p22mr850586qka.78.1505955867437; Wed, 20 Sep 2017 18:04:27 -0700 (PDT) Received: from stb-bld-03.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id t2sm184971qkd.16.2017.09.20.18.04.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 18:04:26 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: linus.walleij@linaro.org, swarren@nvidia.com, andy.shevchenko@gmail.com, alcooperx@gmail.com, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, bcm-kernel-feedback-list@broadcom.com, Florian Fainelli Subject: [PATCH 1/2] pinctrl: Allow a device to indicate when to force a state Date: Wed, 20 Sep 2017 18:04:20 -0700 Message-Id: <20170921010421.7467-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170921010421.7467-1-f.fainelli@gmail.com> References: <20170921010421.7467-1-f.fainelli@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org It may happen that a device needs to force applying a state, e.g: because it only defines one state of pin states (default) but loses power/register contents when entering low power modes. Add a pinctrl_dev::flags bitmask to help describe future quirks and define PINCTRL_FLG_FORCE_STATE as such a settable flag. Signed-off-by: Florian Fainelli --- drivers/pinctrl/core.c | 15 +++++++++++++++ drivers/pinctrl/core.h | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 56fbe4c3e800..c450a97de88f 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -1197,11 +1197,26 @@ int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *state) { struct pinctrl_setting *setting, *setting2; struct pinctrl_state *old_state = p->state; + bool force = false; int ret; if (p->state == state) return 0; + if (p->state) { + list_for_each_entry(setting, &p->state->settings, node) { + if (setting->pctldev->flags & PINCTRL_FLG_FORCE_STATE) + force = true; + } + } + + /* Some controllers may want to force this operation when they define + * only one set of functions and lose power state, e.g: pinctrl-single + * with its pinctrl-single,low-power-state-loss property. + */ + if (p->state == state && !force) + return 0; + if (p->state) { /* * For each pinmux setting in the old state, forget SW's record diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h index 7880c3adc450..5fbf4dd1fa76 100644 --- a/drivers/pinctrl/core.h +++ b/drivers/pinctrl/core.h @@ -39,6 +39,7 @@ struct pinctrl_gpio_range; * @hog_sleep: sleep state for pins hogged by this device * @mutex: mutex taken on each pin controller specific action * @device_root: debugfs root for this device + * @flags: feature/quirk flags */ struct pinctrl_dev { struct list_head node; @@ -63,8 +64,11 @@ struct pinctrl_dev { #ifdef CONFIG_DEBUG_FS struct dentry *device_root; #endif + unsigned long flags; }; +#define PINCTRL_FLG_FORCE_STATE (1 << 0) + /** * struct pinctrl - per-device pin control state holder * @node: global list node From patchwork Thu Sep 21 01:04:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 816627 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KefR379A"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xyJLV20YMz9s0Z for ; Thu, 21 Sep 2017 11:05:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751842AbdIUBEw (ORCPT ); Wed, 20 Sep 2017 21:04:52 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:36106 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752061AbdIUBEa (ORCPT ); Wed, 20 Sep 2017 21:04:30 -0400 Received: by mail-qk0-f195.google.com with SMTP id i14so2749774qke.3; Wed, 20 Sep 2017 18:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3SkuoBocuF6/O0ljKePbhr2keAYSIgicBYaWd3R+MQ8=; b=KefR379AO5Npmpkmirz3cxqdcli4HkKpuBk/s3KniidBDyhWchdXVswgt+gjlrV6b7 1F+5OtlHElk6pR8gb0zHJMjwj/0pxHj1fCA/1F2a63k3SVxU5/Bpc6TA+h2FKAr+37JD tQzuxq/qnUwzIfOsKScMs0XVsAl8sN7QizkAdP47U63HDTq08bPYPqzvzgLn5heQYHyr qnKNSOFDducjLqmpJJ7gfTH5JPas0ncSiQt5f4S8g1ilvwmz6LAIODsxOe2+vNnsT4xO gB2aDOPJ0Iu9gzpm1TPBDv+57O48FuCmzsrPL39rhEWw3JiC61jE0PzR/WphOhc8xISi sO2Q== 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; bh=3SkuoBocuF6/O0ljKePbhr2keAYSIgicBYaWd3R+MQ8=; b=kqmgCWrC6aifIBc8yVhahfa33Ow+u/Dq44//LplbtTm9jCHGkRKmxnOF27ex2hEpO8 DjqAozpqvmgx2oYmuGrFWPgPXArzoSQ3DulnwDclavqNIMxsbqLZxWXLhI2MrRDl3hZX rmL2CYUV2ZHGl8Tg9cToypwL1IApbbZy6pkRCSiF0LN0ajdrFfGwD+B1BW1hhAEUiK0g KFjf0krbkWv5FfkxGcqHQyOKcbZ+3tLnex7CE3mUIDbVz/eKMENlMqZKtMu3JUAyqui7 sFmyy6jii9GjrW6bNIPUIZCOJv+WDJt16pRijrXac4HzLF4Vyi3g5g7EZtLvFdkw4LA+ DOsQ== X-Gm-Message-State: AHPjjUiQ44s0U2L2nI1BPN0Nhb//oGlQo4Brg5gWJMPADfISJwEl+yq3 UhxukxxVKDVJT5ptd40fO7vth1Ls X-Google-Smtp-Source: AOwi7QAM/7kqbDAOfkw6J5W6lDSpKaDxBISmx2WvkA69kU9jFxDw+6zlzbt6EhbZnH2bjZ0NScZacA== X-Received: by 10.55.161.85 with SMTP id k82mr832750qke.158.1505955869778; Wed, 20 Sep 2017 18:04:29 -0700 (PDT) Received: from stb-bld-03.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id t2sm184971qkd.16.2017.09.20.18.04.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 18:04:28 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: linus.walleij@linaro.org, swarren@nvidia.com, andy.shevchenko@gmail.com, alcooperx@gmail.com, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, bcm-kernel-feedback-list@broadcom.com, Florian Fainelli Subject: [PATCH 2/2] pinctrl: single: Allow indicating loss of pin states during low-power Date: Wed, 20 Sep 2017 18:04:21 -0700 Message-Id: <20170921010421.7467-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170921010421.7467-1-f.fainelli@gmail.com> References: <20170921010421.7467-1-f.fainelli@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Some platforms (e.g: Broadcom STB: BMIPS_GENERIC/ARCH_BRCMSTB) will lose their register contents when entering their lower power state. In such a case, the pinctrl-single driver that is used will not be able to restore the power states without telling the core about it and having pinctrl_select_state() check for that. This patch adds a new optional boolean property that Device Tree can define in order to obtain exactly that and having the core pinctrl code take that into account. Signed-off-by: Florian Fainelli --- Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt | 4 ++++ drivers/pinctrl/pinctrl-single.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt index e705acd3612c..e71967f6a1a7 100644 --- a/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt +++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt @@ -82,6 +82,10 @@ Optional properties: /* pin base, nr pins & gpio function */ pinctrl-single,gpio-range = <&range 0 3 0 &range 3 9 1>; +- pinctrl-single,low-power-state-loss : indicates that the pins lose their + state during low power modes and therefore need to be restored upon + system resumption. + - interrupt-controller : standard interrupt controller binding if using interrupts for wake-up events for example. In this case pinctrl-single is set up as a chained interrupt controller and the wake-up interrupts diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index b8b3d932cd73..d69d20b8247a 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1749,6 +1749,9 @@ static int pcs_probe(struct platform_device *pdev) goto free; } + if (of_property_read_bool(np, "pinctrl-single,low-power-state-loss")) + pcs->pctl->flags |= PINCTRL_FLG_FORCE_STATE; + ret = pcs_add_gpio_func(np, pcs); if (ret < 0) goto free;