From patchwork Fri Sep 8 05:51:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linhua Xu X-Patchwork-Id: 720988 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41B2DEE57CB for ; Fri, 8 Sep 2023 05:52:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236415AbjIHFw3 (ORCPT ); Fri, 8 Sep 2023 01:52:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230208AbjIHFw3 (ORCPT ); Fri, 8 Sep 2023 01:52:29 -0400 Received: from SHSQR01.spreadtrum.com (unknown [222.66.158.135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2412219BA for ; Thu, 7 Sep 2023 22:52:25 -0700 (PDT) Received: from dlp.unisoc.com ([10.29.3.86]) by SHSQR01.spreadtrum.com with ESMTP id 3885q2LC010059; Fri, 8 Sep 2023 13:52:02 +0800 (+08) (envelope-from linhua.xu@unisoc.com) Received: from SHDLP.spreadtrum.com (shmbx04.spreadtrum.com [10.0.1.214]) by dlp.unisoc.com (SkyGuard) with ESMTPS id 4RhlY025qcz2RbT5V; Fri, 8 Sep 2023 13:49:08 +0800 (CST) Received: from xm9614pcu.spreadtrum.com (10.13.2.29) by shmbx04.spreadtrum.com (10.0.1.214) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Fri, 8 Sep 2023 13:52:01 +0800 From: Linhua Xu To: Linus Walleij CC: Orson Zhai , Baolin Wang , Chunyan Zhang , , , Andy Shevchenko , lh xu , Linhua Xu , Zhirong Qiu , Xiongpeng Wu Subject: [PATCH V2 3/6] pinctrl: sprd: Modify pull-up parameters Date: Fri, 8 Sep 2023 13:51:43 +0800 Message-ID: <20230908055146.18347-4-Linhua.xu@unisoc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230908055146.18347-1-Linhua.xu@unisoc.com> References: <20230908055146.18347-1-Linhua.xu@unisoc.com> MIME-Version: 1.0 X-Originating-IP: [10.13.2.29] X-ClientProxiedBy: SHCAS01.spreadtrum.com (10.0.1.201) To shmbx04.spreadtrum.com (10.0.1.214) X-MAIL: SHSQR01.spreadtrum.com 3885q2LC010059 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Linhua Xu For UNISOC pin controller, there are three different configurations of pull-up drive current. Modify the 20K pull-up resistor configuration and add the 1.8K pull-up resistor configuration. Signed-off-by: Linhua Xu --- drivers/pinctrl/sprd/pinctrl-sprd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.c b/drivers/pinctrl/sprd/pinctrl-sprd.c index 5b9126b2cde2..6c75e6b8d2ca 100644 --- a/drivers/pinctrl/sprd/pinctrl-sprd.c +++ b/drivers/pinctrl/sprd/pinctrl-sprd.c @@ -69,7 +69,8 @@ #define SLEEP_PULL_UP_MASK GENMASK(1, 0) #define SLEEP_PULL_UP_SHIFT 2 -#define PULL_UP_4_7K (BIT(12) | BIT(7)) +#define PULL_UP_1_8K (BIT(12) | BIT(7)) +#define PULL_UP_4_7K BIT(12) #define PULL_UP_20K BIT(7) #define PULL_UP_MASK (GENMASK(1, 0) | BIT(6)) #define PULL_UP_SHIFT 6 @@ -499,7 +500,7 @@ static int sprd_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin_id, break; case PIN_CONFIG_BIAS_DISABLE: if ((reg & (SLEEP_PULL_DOWN | SLEEP_PULL_UP)) || - (reg & (PULL_DOWN | PULL_UP_4_7K | PULL_UP_20K))) + (reg & (PULL_DOWN | PULL_UP_1_8K))) return -EINVAL; arg = 1; @@ -701,6 +702,8 @@ static int sprd_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin_id, val |= PULL_UP_20K; else if (arg == 4700) val |= PULL_UP_4_7K; + else if (arg == 1800) + val |= PULL_UP_1_8K; mask = PULL_UP_MASK; shift = PULL_UP_SHIFT; @@ -712,8 +715,7 @@ static int sprd_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin_id, mask = SLEEP_PULL_DOWN | SLEEP_PULL_UP; } else { val = shift = 0; - mask = PULL_DOWN | PULL_UP_20K | - PULL_UP_4_7K; + mask = PULL_DOWN | PULL_UP_1_8K; } break; case PIN_CONFIG_SLEEP_HARDWARE_STATE: