From patchwork Mon Jun 5 15:45:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 103375 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2802866vqr; Mon, 5 Jun 2023 09:21:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6FHvsCvusQ3+YTIJLhFR5xOhMtsWnAveEM1r+lyPHQiWoOI0ZwDhEFgksh596lk7APrqJJ X-Received: by 2002:a05:6a20:258b:b0:10b:e88f:5983 with SMTP id k11-20020a056a20258b00b0010be88f5983mr8784383pzd.43.1685982109723; Mon, 05 Jun 2023 09:21:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685982109; cv=none; d=google.com; s=arc-20160816; b=ewvt3vek1tdem1UEvIZSQIlJcv+NWMrqoUOVnSlDAu+J5Po0Bou/B4PBrssBMkq4is TECaGGAzaJ92QDIC3M3i40lE3QXIhkL6tmj9y911h3o7elLnM5X6ydk9GluGzz9QQocI 6hKkjEobEP/1N/hC3SNdfNgu5wcPVCkvmR2NPMrWqoKni4q8ipmRy6rFwLYy42yvn1AO HOqT3+2C7M8jDj1FHoxv36xJiWfsQRIuOiMcT9HSvCU34/4ZfbW6CgZRuY5RpQ9LvXIO eDYLyTPc+iY1CiieooEkuNygl2eYsqlNXJTg37gzPtG6FyxRyKuAWaF6Yu78lpXRlGuf n3wA== 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=Z36qiW8AaxIKKY+045ECgPDHbNjAJNOISf1XGxrIw+Q=; b=LVzXzHU3Go93SkdRVeabgtAyZirv1rHvqsfYvW0lzQdz9tN710DFyD/w11N8onUclG HfVOLzgh+FElXweDa5G7hdioNZfhs07+y4ZtyfpTTCPbc8XAkKQB5HxX//X2DBrI47+d 05Kk6UZDfbN+OhKG7YMMxlCY/alyX7w9Q/60xxCaHZ58AM+qeN9eoRFJVk+1y9ImXCpU S+WnPYBlG4cJw5UhSI/ekJp1e1LNV62oA69eTCHN+c2jnPRfC2KtgpjOVuCWGaguQ+yx uAp3Q9uRFtL/1F/QvyM4tiHKK+a1jNZVeT5QVPPcfLUzGxbbnnA1WJTqZeuJDdPv7jef qb6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DZV0xBlG; 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 a36-20020a630b64000000b0054294ef7818si5253009pgl.862.2023.06.05.09.21.32; Mon, 05 Jun 2023 09:21:49 -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=DZV0xBlG; 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 S235188AbjFEPqg (ORCPT + 99 others); Mon, 5 Jun 2023 11:46:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235083AbjFEPqP (ORCPT ); Mon, 5 Jun 2023 11:46:15 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CA33E54; Mon, 5 Jun 2023 08:45:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685979950; x=1717515950; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/IVTcr+jzG8u5BML8CWpJRp9glsm0WdjT1NvRtOaRGc=; b=DZV0xBlGtR15f4s32AUbRpkStMNTgwFgtMFE1Y1e/WGmOaray+ANHXhR X2yEYhNmTCviPKDp1PLPSRiJ4aN6kIbGdrdZubX8eY23s83pVoWBZQ68y 5cyOKBa68Akfps1Ut5pAD7n29RKHdbckCpsBcZVifYZ8/SloKC8nxaymY HyV8/B/vYdktuIihEovRxhFwGzysWkwOUlFo9/+NRCtYU2RE71cg0HuCw 70093amNE0DwXODY69vs9iTgdmVNvP72iwiSNvML5xcVKMZbYt6/iH3X9 vJkTKH6Gz4Zw42kAjNFHQcVLcIVlESYdB91PNgOMxwAz6kSSVYjL/YmhP w==; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="384707604" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="384707604" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 08:45:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="738405451" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="738405451" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 05 Jun 2023 08:45:03 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 443B3204; Mon, 5 Jun 2023 18:45:10 +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: merrifield: Fix open-drain pin mode configuration Date: Mon, 5 Jun 2023 18:45:08 +0300 Message-Id: <20230605154509.11616-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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?1767880376896383439?= X-GMAIL-MSGID: =?utf-8?q?1767880376896383439?= 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-merrifield.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c index 365c391c97a3..f1d0b7576703 100644 --- a/drivers/pinctrl/intel/pinctrl-merrifield.c +++ b/drivers/pinctrl/intel/pinctrl-merrifield.c @@ -710,6 +710,11 @@ static int mrfld_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; @@ -791,10 +796,14 @@ static int mrfld_config_set_pin(struct mrfld_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: @@ -826,6 +835,7 @@ static int mrfld_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 = mrfld_config_set_pin(mp, pin, configs[i]);