From patchwork Fri Oct 13 06:15:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fenglin Wu X-Patchwork-Id: 825236 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" (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="jNXDmhYN"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="jNXDmhYN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yCyDG3YTqz9sNr for ; Fri, 13 Oct 2017 17:17:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753427AbdJMGRB (ORCPT ); Fri, 13 Oct 2017 02:17:01 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:43112 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753403AbdJMGRA (ORCPT ); Fri, 13 Oct 2017 02:17:00 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 955176070A; Fri, 13 Oct 2017 06:16:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1507875419; bh=o3rZCKMB2RsTVe7IEQ37g+pjkrMj2E5g673UhZiUoSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jNXDmhYN/nEu1VKaPpSD/wdFtzjYUoZxL9e1/HbcECH/9irK4MpCxW7I2jsECRAP0 9MIxyM5LcUaXdWpBg2MrP6xjY7x+ITKiL7y2Rtv3cL9Ofl4FSZwMUuLND0fx81PS2j lVBT0dlICfcvS9uNtB+B/P3qYEVid9wEoyjWsdyo= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from FENGLINW.ap.qualcomm.com (unknown [180.166.53.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: fenglinw@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6C96A6014C; Fri, 13 Oct 2017 06:16:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1507875419; bh=o3rZCKMB2RsTVe7IEQ37g+pjkrMj2E5g673UhZiUoSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jNXDmhYN/nEu1VKaPpSD/wdFtzjYUoZxL9e1/HbcECH/9irK4MpCxW7I2jsECRAP0 9MIxyM5LcUaXdWpBg2MrP6xjY7x+ITKiL7y2Rtv3cL9Ofl4FSZwMUuLND0fx81PS2j lVBT0dlICfcvS9uNtB+B/P3qYEVid9wEoyjWsdyo= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6C96A6014C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=fenglinw@codeaurora.org From: fenglinw@codeaurora.org To: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Andersson , Linus Walleij , linux-gpio@vger.kernel.org Cc: collinsd@codeaurora.org, aghayal@codeaurora.org, wruan@codeaurora.org, subbaram@codeaurora.org, kgunda@codeaurora.org, Fenglin Wu Subject: [PATCH V1 1/2] pinctrl: qcom: spmi-gpio: Read REG_EN_CTL to get initial enable state Date: Fri, 13 Oct 2017 14:15:03 +0800 Message-Id: <20171013061550.996-2-fenglinw@codeaurora.org> X-Mailer: git-send-email 2.13.0.windows.1 In-Reply-To: <20171013061550.996-1-fenglinw@codeaurora.org> References: <20171013061550.996-1-fenglinw@codeaurora.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Fenglin Wu Get initial value of is_enabled flag by reading REG_EN_CTL register so that it can reflect the correct hardware enable state before setting pin config. Signed-off-by: Fenglin Wu Acked-by: Bjorn Andersson --- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c index a0edaa8..0a1e173 100644 --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c @@ -106,6 +106,7 @@ /* PMIC_GPIO_REG_EN_CTL */ #define PMIC_GPIO_REG_MASTER_EN_SHIFT 7 +#define PMIC_GPIO_REG_MASTER_EN 0x80 #define PMIC_GPIO_PHYSICAL_OFFSET 1 @@ -914,8 +915,12 @@ static int pmic_gpio_populate(struct pmic_gpio_state *state, pad->atest = (val & PMIC_GPIO_LV_MV_ANA_MUX_SEL_MASK) + 1; } - /* Pin could be disabled with PIN_CONFIG_BIAS_HIGH_IMPEDANCE */ - pad->is_enabled = true; + val = pmic_gpio_read(state, pad, PMIC_GPIO_REG_EN_CTL); + if (val < 0) + return val; + + pad->is_enabled = val & PMIC_GPIO_REG_MASTER_EN; + return 0; } From patchwork Fri Oct 13 06:15:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fenglin Wu X-Patchwork-Id: 825237 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" (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="bvBvneiV"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="bvBvneiV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yCyFJ5svLz9sNx for ; Fri, 13 Oct 2017 17:17:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751551AbdJMGRn (ORCPT ); Fri, 13 Oct 2017 02:17:43 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:43482 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751373AbdJMGRm (ORCPT ); Fri, 13 Oct 2017 02:17:42 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id D31376070A; Fri, 13 Oct 2017 06:17:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1507875461; bh=3APww8O0zDWMkhssSle1Uxu03DA+EePU+sQl3itxemk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bvBvneiV/IBtEdLzot86StYdvLItTwZELsbuB20rI1JHU5BumJZdxAEdjon/xObI/ koWIAopQwwG6ffcAFZ36qIOwJ4+VWcczHyy37rocBV4/Uu8zdAxOLN1IgNjGCtG146 evsxodUzV1O1aBjiY78QyojLao7QENseOP+f3gTY= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from FENGLINW.ap.qualcomm.com (unknown [180.166.53.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: fenglinw@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id A78D36014C; Fri, 13 Oct 2017 06:17:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1507875461; bh=3APww8O0zDWMkhssSle1Uxu03DA+EePU+sQl3itxemk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bvBvneiV/IBtEdLzot86StYdvLItTwZELsbuB20rI1JHU5BumJZdxAEdjon/xObI/ koWIAopQwwG6ffcAFZ36qIOwJ4+VWcczHyy37rocBV4/Uu8zdAxOLN1IgNjGCtG146 evsxodUzV1O1aBjiY78QyojLao7QENseOP+f3gTY= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A78D36014C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=fenglinw@codeaurora.org From: fenglinw@codeaurora.org To: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Andersson , Linus Walleij , linux-gpio@vger.kernel.org Cc: collinsd@codeaurora.org, aghayal@codeaurora.org, wruan@codeaurora.org, subbaram@codeaurora.org, kgunda@codeaurora.org, Fenglin Wu Subject: [PATCH V1 2/2] pinctrl: qcom: spmi-gpio: Set is_enabled flag in set_mux() Date: Fri, 13 Oct 2017 14:15:04 +0800 Message-Id: <20171013061550.996-3-fenglinw@codeaurora.org> X-Mailer: git-send-email 2.13.0.windows.1 In-Reply-To: <20171013061550.996-1-fenglinw@codeaurora.org> References: <20171013061550.996-1-fenglinw@codeaurora.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Fenglin Wu The initial value of is_enabled flag is read out from hardware in pmic_gpio_populate(), and it will be set in pmic_gpio_config_set() if pinconf is defined. For any GPIOs disabled initially in hardware which only have pinmux defined, they won't be enabled in pmic_gpio_set_mux() calling. So set is_enabled flag in set_mux() to ensure the GPIO module could be enabled in above case. Signed-off-by: Fenglin Wu --- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c index 0a1e173..219c934 100644 --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c @@ -312,6 +312,7 @@ static int pmic_gpio_set_mux(struct pinctrl_dev *pctldev, unsigned function, } pad = pctldev->desc->pins[pin].drv_data; + pad->is_enabled = true; /* * Non-LV/MV subtypes only support 2 special functions, * offsetting the dtestx function values by 2