From patchwork Mon Dec 19 12:32:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 34518 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2358534wrn; Mon, 19 Dec 2022 04:33:20 -0800 (PST) X-Google-Smtp-Source: AA0mqf7LF7gf/+OIWwr6l5c3O7jl4q9EmuoRvojTiEMe+bAwAa9AhGiX2I21LPPXToZdAlo/UwOw X-Received: by 2002:aa7:96d4:0:b0:576:8e8d:6675 with SMTP id h20-20020aa796d4000000b005768e8d6675mr47380909pfq.19.1671453200563; Mon, 19 Dec 2022 04:33:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671453200; cv=none; d=google.com; s=arc-20160816; b=xnVnJjoi/vl0VNfTN7IywvIHyGfKZ0ptpBdT6dGwKJ7sDRSrdzK8Fw7NcDYJ3yp0gH UQf9/AzKONtUz/i/J9lKgrZH3Bg2g3+akenMRvUdkG0I3YXfGC3Zy29RcXlmZAScmK1q l/6kdD6YStOiKyQ7JnctLI1cahwtsvshQJmMlAbzxLgFmSyTEYmKEzLBX62FIrdVdPEJ 6ICTRpeoBuaujohw7iuRSZOphjnewqS7VSObG83286x4RfO4JmP9GUQfBO2SyB1AEaDM X9VaSS12WMxDpbwm/iNK5EjHSPJJFmPQoOX6iYMTgFgUx3aGktgAMQUf1DQ3DNXdCG6d gh7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=QCcJteLTGOtCNBPtxm6/mxHmODlUOIpzDTbfc8iuKzw=; b=AcylSHtsnhlQmzPogRrp/ntTOOO34SaL1vu97IaUvhMSh6VquTqPQrUftaKrd8qtVp V6AlikHNqfdwQxgqAucXoCeGHjjCwmSNrWziyoMJlhMbE79zraPP3UPXGvC7yKOIEGGp bjW1hu25sKCRjd1e6mcTiGF8foO4awPW35TP56EZDXfcDvWmCdLJgzJ226JEYXKLNKhW zJldVrTqE5CbeHIytSD3TTN3BgVA5rd0AZdr7NwxtSo94XFJBVuDVt/vg40Mnf6/WNow 1O58irzXrNXZABKC8/43z/YdKTM1sgsf1MyzaRwrfVOBVJeeLC1evq5+BNhO7g0J0AJM UYXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=O8s7VviL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y22-20020a056a00181600b005728c05ef9esi11626197pfa.14.2022.12.19.04.33.07; Mon, 19 Dec 2022 04:33:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=O8s7VviL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231862AbiLSMdC (ORCPT + 99 others); Mon, 19 Dec 2022 07:33:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232063AbiLSMch (ORCPT ); Mon, 19 Dec 2022 07:32:37 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC3E1EE1D; Mon, 19 Dec 2022 04:31:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671453106; x=1702989106; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=eN8P+N64P95zR91Fwvb5XL2UO1+uvpxDLZPoDQkp4Ig=; b=O8s7VviL+cw9tp9FrDRMaajNKt8ltgGY2Rijq1XO99LsyZG/SikFjUe0 Cw580K0qzxISf/Tj87jAaD4uY1G5EK9067KinJKnIddsoexM3cpvttD7T 8FUkLOCX5zs8YTch2zpvo7T1Vx+8azxxcMT+nDZslqjI6EHrchtKH+m6I 2MkpBg4dk+ThHRZbXM95cjL3zWgDaQfsCjjXOQN1sG/o499R5Uk7VKzF4 Hhzu5R7YtJQ5qXGe+xyqzQBi1pO7mfHEoyuOv0+iwCxEyQpPBD9Q0e9yT lU30fTYD4hWAArQUEy1x+5tBlm4aecgM3BCzzJE5lpMSTi99oM5BVKwZV w==; X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="299670630" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="299670630" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 04:31:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="896027912" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="896027912" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 19 Dec 2022 04:31:43 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id CB011F7; Mon, 19 Dec 2022 14:32:13 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Andy Shevchenko , Linus Walleij Subject: [PATCH v1 1/4] pinctrl: intel: Add default case to intel_config_set_pull() Date: Mon, 19 Dec 2022 14:32:05 +0200 Message-Id: <20221219123208.5505-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752645711509175671?= X-GMAIL-MSGID: =?utf-8?q?1752645711509175671?= For the sake of symmetry with intel_config_get_pull(), add a default case to the outer switch. Signed-off-by: Andy Shevchenko Acked-by: Mika Westerberg --- drivers/pinctrl/intel/pinctrl-intel.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index 8181a65fb815..4b1d5a21aa68 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -758,6 +758,10 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, } break; + + default: + ret = -EINVAL; + break; } if (!ret) From patchwork Mon Dec 19 12:32:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 34520 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2358600wrn; Mon, 19 Dec 2022 04:33:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf4RmPJTCCWe8lm4O+26bImQfIGqNsFkxX4ExVv8qwi9YZWM5lKEZU5ut22pL505VTvIWL13 X-Received: by 2002:a05:6a20:4414:b0:af:7b32:4deb with SMTP id ce20-20020a056a20441400b000af7b324debmr33985419pzb.4.1671453208830; Mon, 19 Dec 2022 04:33:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671453208; cv=none; d=google.com; s=arc-20160816; b=fPeyT7eeluUgpODXzhoKqjfDikW2BKVtIg1seeqtnSaNT4GGghH9HJgTkZ0uczFbUR GqEv0P8/bM2RaKgiv2q3pADTx0hkXXa1xZshD6UsBM44BMBasTrpSHe46pM60UpBz7dS EYG60veuu8WXDyyGUEmkuOQSXuyv3ZtmlAhu9myNzPsbsZ2aQ7BbtDLDx56h5E5zjJt5 Dx36bMzxvZUtjv/6TJIeneiEX1QtDYzEp9GYKErwlTuhlte9ch2xAQramL7wqoNZNFDh 9mr49HFuGmM/RfoH9UbpXutf6kHsk1Wnf0PmnMwtiX6sI5IT4HsTfPpY2gBcJwJKDB9/ e3TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YaAGvqoVS6B5eSc4micqKPYOU3FLZqnZKuVo/snKpL8=; b=TpS8L5E+oTXK5kar0KJnbdvNayqznwI2GGaT3EXzqzg27b5lrZ2dZXl22yztv1I6d7 EpVPeko90oG5mvU3I7k8XsAoSHewCXvD0urmr8ax4d21cjylYqYY99LbbKgIYEa+WqMF uM3esrZMeRKaaQZ+w5T4p+zDG1shVTBg2VYUscISdcKusx4wFGxM7ejBeetdxzCOGULG AumhXxEovkpClNoiXvxsAFAmSZA89duF1SR5nC6gq1irgkF63c2l3wuZ0vPBjLIsBiNn KOLVZ9dYPdIvZylHqHB7W7WbMpUUBsSnzUe2dUAH5ePhXdnwJIS7EBPpIQOrnZb+MZ6t BVZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cMqCwPqg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t134-20020a635f8c000000b0043a0121bb28si10779604pgb.811.2022.12.19.04.33.16; Mon, 19 Dec 2022 04:33:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cMqCwPqg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231869AbiLSMdF (ORCPT + 99 others); Mon, 19 Dec 2022 07:33:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232067AbiLSMch (ORCPT ); Mon, 19 Dec 2022 07:32:37 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 644CBF018; Mon, 19 Dec 2022 04:31:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671453107; x=1702989107; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/otEhEs+STYSNvH47lyUPmGAgLM3giYO0stFpJM8ox0=; b=cMqCwPqgTvNoSomzr81QRacZ6r8f566ojSRWY+KzJ+kap7qv5Am92liD QoLtfg/f5uWYBFx5d0lVG7iJoxYar5LspMZBvYDuRGgtk9EuD0A710WwL Lw8WyM+QLVCA0YINl37AERNrEwvgGuywGUD3lnyyEszbznDe9RItWnMSx CPjtMv6jVyPMLus5rV9N4Fv+T2WYLv5t9V7NEa+Pt3yJ9s14IVI+1QfCq egropQcs0RcbKYwDqHpj5rODvThHgkEkBjcG7dwDn2vGQDxffJMLDfw4t gN+6ZalCw/C8dqSCAY/ppJgy/juqRNAy95/T5RzleGqhJJsTvlan6QNye g==; X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="320509090" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="320509090" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 04:31:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="774913750" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="774913750" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 19 Dec 2022 04:31:44 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id D9917B7; Mon, 19 Dec 2022 14:32:13 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Andy Shevchenko , Linus Walleij Subject: [PATCH v1 2/4] pinctrl: intel: Deduplicate some code in intel_config_set_pull() Date: Mon, 19 Dec 2022 14:32:06 +0200 Message-Id: <20221219123208.5505-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221219123208.5505-1-andriy.shevchenko@linux.intel.com> References: <20221219123208.5505-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752645719768792057?= X-GMAIL-MSGID: =?utf-8?q?1752645719768792057?= First part is to assign default argument for all cases, since bias disablement doesn't use it anyway. Second part is to clear all bits in the bias setting and depending on the argument and parameter set them as asked. While at it, add break statement to the default cases. Signed-off-by: Andy Shevchenko --- drivers/pinctrl/intel/pinctrl-intel.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index 4b1d5a21aa68..6926f64b68d4 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -691,21 +691,14 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, raw_spin_lock_irqsave(&pctrl->lock, flags); value = readl(padcfg1); + value &= ~(PADCFG1_TERM_MASK | PADCFG1_TERM_UP); - switch (param) { - case PIN_CONFIG_BIAS_DISABLE: - value &= ~(PADCFG1_TERM_MASK | PADCFG1_TERM_UP); - break; + /* Set default strength value in case none is given */ + if (arg == 1) + arg = 5000; + switch (param) { case PIN_CONFIG_BIAS_PULL_UP: - value &= ~PADCFG1_TERM_MASK; - - value |= PADCFG1_TERM_UP; - - /* Set default strength value in case none is given */ - if (arg == 1) - arg = 5000; - switch (arg) { case 20000: value |= PADCFG1_TERM_20K << PADCFG1_TERM_SHIFT; @@ -721,17 +714,13 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, break; default: ret = -EINVAL; + break; } + value |= PADCFG1_TERM_UP; break; case PIN_CONFIG_BIAS_PULL_DOWN: - value &= ~(PADCFG1_TERM_UP | PADCFG1_TERM_MASK); - - /* Set default strength value in case none is given */ - if (arg == 1) - arg = 5000; - switch (arg) { case 20000: value |= PADCFG1_TERM_20K << PADCFG1_TERM_SHIFT; @@ -755,6 +744,7 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, break; default: ret = -EINVAL; + break; } break; From patchwork Mon Dec 19 12:32:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 34519 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2358590wrn; Mon, 19 Dec 2022 04:33:27 -0800 (PST) X-Google-Smtp-Source: AA0mqf786lRtaZ9ki5Vs1kqpwy0kJwy3PAncovlytzijB0d5eMUK8ZxU/liBEKRZ9iCFCuDWbVGd X-Received: by 2002:aa7:c787:0:b0:46d:cead:4eab with SMTP id n7-20020aa7c787000000b0046dcead4eabmr34652724eds.6.1671453207612; Mon, 19 Dec 2022 04:33:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671453207; cv=none; d=google.com; s=arc-20160816; b=TJt9/X7zOkkpSnXJpWhks5ngAtfKzYafTdtOBDUH5wi/Gv0oLrbUpZP5OSkYMPzjQc Tn2Q1Rr7E6cg6X90i5sEKJzvLrsVSRwYQl3preDxhF2FnfKDZm4CapKi2nzcThwzYeRm dUVKA3/stIJEyxANnFMmCfZDyMLWwglVOQHBYXdDkFL/yVWIUHDYLbRKzNDaSntrbKIF NF8i19xzV/pHztvYfGXj/J7o6wP/mVjI5BcDEy8qajWan0gmEHAKlK7l2OcAnU9fBuET zA2KTvDOP96RkBY8NSsqbhVsVs3GgTPjxYxPbCXbrUDjOxRG9czX9cBLW5z8DlWzVs6a nsUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OBXxvRFqVjuXeP8TaH9Uw+TYaYkcIIJejiNzqPc6zS8=; b=eFD9RgtS37kMF2IX3SYdpzkJVzEdLK4QAvveHYp7yzl6RFRJeyxjj7BiVpQT04fsTR i7M/UaA8zdIcDtOaVM71RIO7fimp9D3XjRebB2q4bIceFO2l0WhNJoXR3j2AZBQnl/ru 1p+w717AO9ryCGTMtb8zp62avmnHAeA7rrwXRKjm9weLCx2ItB8b+ZKVwAsEEBeainTR Byjzu64whlThORJGSFUm0bnwlreYLMxjj3q7ALZd6KuPbFUQCScbAfhIAqJQIntKrooT +OMYtZNjJEo2lq7ADWcoKzY0trEDg5JagOHzfQuUn/oJ2zyn9vGVrbphVrKkwhWIUz1E N/Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UJtzmAGz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qk13-20020a1709077f8d00b007aecd8912ecsi9739841ejc.21.2022.12.19.04.33.03; Mon, 19 Dec 2022 04:33:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UJtzmAGz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232109AbiLSMc6 (ORCPT + 99 others); Mon, 19 Dec 2022 07:32:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232060AbiLSMch (ORCPT ); Mon, 19 Dec 2022 07:32:37 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAA6CEE19; Mon, 19 Dec 2022 04:31:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671453105; x=1702989105; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=f+Y573fbqCtXZip97WFp1idIb9kXQkOhGQmr7sMp5sg=; b=UJtzmAGzI/X6LIguwsGIdUcM7mAIeeM/i5FKmK+2Gn5ibsp9HK8ZU+WR gC0Hqvp5HQErkjaMsYJ4L/CDlfwmkzit22VQgb74rv1SRIJ52DoOB1RCP h61S58CemmSMfuFTPcLL8aIQVWe/XchtwlUqfFvRA74rdXIIjWG2w5U1Z Glrv4Fu/Q97PWDZXNyNOs9oZwIpnPLue/U7aIIRbJEWBbHcRvQEYg81Tg DQZqdxGwIlFRGQAwmCotPfUL4JxlBIybheivi4P9n2l7BB9uU/7kJ4rva YQW+e8eSNmLjcCC0WhhrSA+4Ia4M9RFlIp4DT+N14pDmeBR0J3ADlglRP Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="299670627" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="299670627" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 04:31:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="896027911" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="896027911" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 19 Dec 2022 04:31:43 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id E287411D; Mon, 19 Dec 2022 14:32:13 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Andy Shevchenko , Linus Walleij Subject: [PATCH v1 3/4] pinctrl: intel: Add definitions to all possible biases Date: Mon, 19 Dec 2022 14:32:07 +0200 Message-Id: <20221219123208.5505-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221219123208.5505-1-andriy.shevchenko@linux.intel.com> References: <20221219123208.5505-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752645718824292338?= X-GMAIL-MSGID: =?utf-8?q?1752645718824292338?= Add definitions to all possible biases, i.e. add ~800 Ohms, ~952 Ohms, ~4 kOhms. Signed-off-by: Andy Shevchenko --- drivers/pinctrl/intel/pinctrl-intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index 6926f64b68d4..8ecb7ca7fbac 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -81,8 +81,11 @@ #define PADCFG1_TERM_MASK GENMASK(12, 10) #define PADCFG1_TERM_20K BIT(2) #define PADCFG1_TERM_5K BIT(1) +#define PADCFG1_TERM_4K (BIT(2) | BIT(1)) #define PADCFG1_TERM_1K BIT(0) +#define PADCFG1_TERM_952 (BIT(2) | BIT(0)) #define PADCFG1_TERM_833 (BIT(1) | BIT(0)) +#define PADCFG1_TERM_800 (BIT(2) | BIT(1) | BIT(0)) #define PADCFG2 0x008 #define PADCFG2_DEBEN BIT(0) From patchwork Mon Dec 19 12:32:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 34521 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2358747wrn; Mon, 19 Dec 2022 04:33:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf4HX9+iL4uolOCn16Ccmsmf9oQv0NiXmUfqxB7AcM7zUKxYrks0JpLI8wP0xYb7r32oZVr9 X-Received: by 2002:a17:902:b287:b0:189:be6e:7077 with SMTP id u7-20020a170902b28700b00189be6e7077mr42464369plr.55.1671453226266; Mon, 19 Dec 2022 04:33:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671453226; cv=none; d=google.com; s=arc-20160816; b=hcumDhBY1L56A4GduMiMSFhAXqhMFdh03ZESQZ1xKUJ+NdqDU+BWFKcnQHpN6xjQgW h+UqJv/MGsXwc+eNRn91/YlDwBa6iGcXvp0E8QHF655jpJJeS1BIvNu8jNVT5nnOp2nO +8TPfZSNQuw/xmjw8TIU/yeDDswbScQGe+a3hy0iYzBwQbvNSp/mH0dXJB28xZEnwUnR 6yCcmGhh+VFq4PU8uOAPEFXs9wniq7w+wIwmX0yca0NlDJlGldyfTB6lR94tFfl/9vjR cwYnBJbbzyrfVJ6afg36yK2qHAT/bhhUCoXiw4UDLMqKZ1NPFBI3KkApv8O1UC2Ikn7B 1q9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=thmhPGd39srKwlpDaVNlOOqIE50548WyIG0VtMu8SXY=; b=l2RVDwZLXBgGVuxPcDuJofEZ6qaCWhYXIY0A1xJWzzA0qr8jThhAIpuDYT1PU0eKSM AKp5/J0bWswKl3gVzSdJXOsrMt2vlXSHoqwfn6Yefuvz3j6CQwpAT9+q2wprBrJ2BnjP //M9VgvG2nCaxNYTGEUCKOIFw/JjCX9suY2PzNgQDxhY144dWiioOzQeVAXD/P7z7X9F ZLENxHYdj/sJYwaJWH6Bu4Y52keIsaWWfn4fWZ/O6oA9KA0Kw0fNgN/AZz0lbD81K3rM Nb4okm4y5YwR714KPHkvqbDqEZDupRP1ra3nlzfwEb8IRZmK8KuiJyfB8NxI7plXvJzS /lNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=V+cL6F4B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b10-20020a6541ca000000b00473c36e3b85si10828134pgq.678.2022.12.19.04.33.32; Mon, 19 Dec 2022 04:33:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=V+cL6F4B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232154AbiLSMdK (ORCPT + 99 others); Mon, 19 Dec 2022 07:33:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232068AbiLSMch (ORCPT ); Mon, 19 Dec 2022 07:32:37 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21F13F02D; Mon, 19 Dec 2022 04:31:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671453108; x=1702989108; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=W5/mAD3rb44U/Snba0SWl2h8OeAaalRUzRmh9CqBDBc=; b=V+cL6F4BN9X/vXRo61SJYHkF4LjvI+RHMmROXTRJ0sN5/3G22DIS2FcJ BeKvrzmeZwiJ3LdJho7PTsjHHg2TvwWW8vpRvnh2mSn5j+pM9ZnJdwfL+ /dSNN7TBIywzFnlMZWkzi3Vf0gimFF7GK0hJNW4/aNQf7XgsVkF3065l+ xdBgHTNrdQ+vbmBWl8zihEkuxXlKln0Qhpje27lV8OyMMDCiAjRXs10Rb nRYtcTvsHevPpilTBLLKp1ORNkv5CIuGiAImM77QLcR1PC7PnRKI8LKHs VEaIVRR5hXgMgjkplV3Qec4DRNes39HzrSELHwKylDiEdhvIrlKL7yCj/ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="320509094" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="320509094" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 04:31:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="774913749" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="774913749" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 19 Dec 2022 04:31:44 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 017FF1C3; Mon, 19 Dec 2022 14:32:13 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Andy Shevchenko , Linus Walleij Subject: [PATCH v1 4/4] pinctrl: intel: Add ~4k bias support Date: Mon, 19 Dec 2022 14:32:08 +0200 Message-Id: <20221219123208.5505-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221219123208.5505-1-andriy.shevchenko@linux.intel.com> References: <20221219123208.5505-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752645737995266599?= X-GMAIL-MSGID: =?utf-8?q?1752645737995266599?= All versions that have 20k and 5k resistance, i.e. all that the driver supports, may support ~4k when the above mentioned are connected in parallel. Add such a support. Signed-off-by: Andy Shevchenko --- drivers/pinctrl/intel/pinctrl-intel.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index 8ecb7ca7fbac..5e21b0a96efe 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -577,6 +577,9 @@ static int intel_config_get_pull(struct intel_pinctrl *pctrl, unsigned int pin, case PADCFG1_TERM_1K: *arg = 1000; break; + case PADCFG1_TERM_4K: + *arg = 4000; + break; case PADCFG1_TERM_5K: *arg = 5000; break; @@ -602,6 +605,9 @@ static int intel_config_get_pull(struct intel_pinctrl *pctrl, unsigned int pin, return -EINVAL; *arg = 1000; break; + case PADCFG1_TERM_4K: + *arg = 4000; + break; case PADCFG1_TERM_5K: *arg = 5000; break; @@ -709,6 +715,9 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, case 5000: value |= PADCFG1_TERM_5K << PADCFG1_TERM_SHIFT; break; + case 4000: + value |= PADCFG1_TERM_4K << PADCFG1_TERM_SHIFT; + break; case 1000: value |= PADCFG1_TERM_1K << PADCFG1_TERM_SHIFT; break; @@ -731,6 +740,9 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, case 5000: value |= PADCFG1_TERM_5K << PADCFG1_TERM_SHIFT; break; + case 4000: + value |= PADCFG1_TERM_4K << PADCFG1_TERM_SHIFT; + break; case 1000: if (!(community->features & PINCTRL_FEATURE_1K_PD)) { ret = -EINVAL;