From patchwork Mon Jun 5 15:45:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 103373 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2797109vqr; Mon, 5 Jun 2023 09:13:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ufeljwz6ekQlcAdXQmYToaPo0Y8Ay+f2wHGyEidoo6rd8wdSw3t5F3+9QXskX9x5ICUhn X-Received: by 2002:a05:6a20:7d8d:b0:100:b715:8ab2 with SMTP id v13-20020a056a207d8d00b00100b7158ab2mr3121884pzj.46.1685981590309; Mon, 05 Jun 2023 09:13:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685981590; cv=none; d=google.com; s=arc-20160816; b=WutHNNcCB+PT/Kz3+oVDy0ps8VLMXLsogEmCL6apBJLOLIbSST301B6WOiCyVQ/QXw bBCPp2wVgkxk9aYd2axZDeeESNmjNbhaBfDUTrF9RN5VJ9N9clSMuGZlMOeR6etlMwlz SwLOq7gbBmNCIvTVi9G14MqLXInDsTI5NtuPaejWKbsEAIxKRDgCxVr5x28vlylrz6HB HCY9/XZ19dLoOUfXvwJKAp0gCwO+6HRaIIQ8xpHAixuDf05f4IyzE5BWVcBqcsKH92rx sXLMfPukjvqPf54Yh57gDLNJ3VVeoYt83knmF7GXOAuinlE/PE5lMI5ZvcLZA3Is/Twe mzAQ== 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=8Pu2KwkkwEBoNWaslqkLgW3YFjyPbB9yep7aWv6Anf0=; b=GdpHdkc7AARxRaO/Yswtv+30tWJc+kdGmLfwKoJcZnM0srQiITMU3rX9DhUsLykU2A WBqMZG7FGpOlUunPlfeFUPCIDmG72cYUa/Y4GoplVFBcjYmVb2z2WUG0+jOpe5RoOi4o DOr10z1LwBNLrWeBqvhpf6p42+Wx3BYStHOE/+n7tOBpE5VRK6o3gTzB5wlpyxBTADOY LCTP6KKp6+FSMix5uVMQ+rEc+oc+Osr0aSu/Q3EulC+u+fYvyFEbaD49JBJr2xjzVHkQ yxcXG8wnYK2aZ33HC25rqO+jNq8/UZlR1EKnwwknrb8xds4gSbxaTWAZEDb3u4zk17WG NTGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KbR3wF88; 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 p29-20020a637f5d000000b0052c27a0125bsi5811057pgn.738.2023.06.05.09.12.57; Mon, 05 Jun 2023 09:13:10 -0700 (PDT) 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=KbR3wF88; 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 S235081AbjFEPrt (ORCPT + 99 others); Mon, 5 Jun 2023 11:47:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235059AbjFEPrT (ORCPT ); Mon, 5 Jun 2023 11:47:19 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05D1210DB; Mon, 5 Jun 2023 08:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685980017; x=1717516017; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=eC2G+d8txu/yxblVWStVJW47JlaxpIrg61haGv7/ORU=; b=KbR3wF88hoZVkrsAvqvm7K1Aq+fWEPppKeNsrmf4IqNyJAowLzdIYg5K PDmHVs8lgAwpqQHxRqaWmnmjqqCOFrw+k4vxdgewDwHvzoSA3BlA7nbFs 3LllPbNCdpHb5mQcb8QT6IMG1deOQ84auPflB+UEchdhtWKxps1S22rg0 MWJnNWZZilDBh6KGzflJ66+y7cc30Y5umsnoI19C9TpALqUcOHekoZ+pG drPITOpGg8sz9O5eJa4nGsAm279Fh7rhRxr0rXU6VTLXXQtLSF8MmoBgX KqYmsGfimz9zYu+rGOTvXYnj0358Rb4NWYZIdukCZUZvBL2rOFlLx6w0k Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="359713186" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="359713186" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 08:45:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="773777196" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="773777196" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 05 Jun 2023 08:45:18 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id CBDF1204; Mon, 5 Jun 2023 18:45:24 +0300 (EEST) 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/2] pinctrl: moorefield: Fix open-drain pin mode configuration Date: Mon, 5 Jun 2023 18:45:22 +0300 Message-Id: <20230605154523.11799-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b 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,T_SCC_BODY_TEXT_LINE 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?1767879831902881136?= X-GMAIL-MSGID: =?utf-8?q?1767879831902881136?= Currently the pin may not be configured as open-drain in some cases because the argument may be 0 for the boolean types of the pin configurations. Fix this by ignoring the argument. With that, allow to actually restore pin to the push-pull mode. Signed-off-by: Andy Shevchenko Acked-by: Mika Westerberg --- drivers/pinctrl/intel/pinctrl-moorefield.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-moorefield.c b/drivers/pinctrl/intel/pinctrl-moorefield.c index 3c9a8484b442..7656a5e20919 100644 --- a/drivers/pinctrl/intel/pinctrl-moorefield.c +++ b/drivers/pinctrl/intel/pinctrl-moorefield.c @@ -661,6 +661,11 @@ static int mofld_config_get(struct pinctrl_dev *pctldev, unsigned int pin, break; + case PIN_CONFIG_DRIVE_PUSH_PULL: + if (value & BUFCFG_OD_EN) + return -EINVAL; + break; + case PIN_CONFIG_DRIVE_OPEN_DRAIN: if (!(value & BUFCFG_OD_EN)) return -EINVAL; @@ -734,10 +739,14 @@ static int mofld_config_set_pin(struct mofld_pinctrl *mp, unsigned int pin, break; + case PIN_CONFIG_DRIVE_PUSH_PULL: + mask |= BUFCFG_OD_EN; + bits &= ~BUFCFG_OD_EN; + break; + case PIN_CONFIG_DRIVE_OPEN_DRAIN: mask |= BUFCFG_OD_EN; - if (arg) - bits |= BUFCFG_OD_EN; + bits |= BUFCFG_OD_EN; break; case PIN_CONFIG_SLEW_RATE: @@ -769,6 +778,7 @@ static int mofld_config_set(struct pinctrl_dev *pctldev, unsigned int pin, case PIN_CONFIG_BIAS_DISABLE: case PIN_CONFIG_BIAS_PULL_UP: case PIN_CONFIG_BIAS_PULL_DOWN: + case PIN_CONFIG_DRIVE_PUSH_PULL: case PIN_CONFIG_DRIVE_OPEN_DRAIN: case PIN_CONFIG_SLEW_RATE: ret = mofld_config_set_pin(mp, pin, configs[i]);