From patchwork Thu Jul 1 06:54:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 469259 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0714C11F64 for ; Thu, 1 Jul 2021 06:54:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A83F261460 for ; Thu, 1 Jul 2021 06:54:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234529AbhGAG5P (ORCPT ); Thu, 1 Jul 2021 02:57:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234250AbhGAG5P (ORCPT ); Thu, 1 Jul 2021 02:57:15 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85829C0617A8 for ; Wed, 30 Jun 2021 23:54:45 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id a2so5224186pgi.6 for ; Wed, 30 Jun 2021 23:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BaGoqmFP1tt0EpZeEpkj9x84y98y9BYCdG4DKqTdqyc=; b=jytw1fUdgseF6tkwK4vPEO6tMMLx7zUiWZECq+PuslI4xmtAklxm6BQi0CekZ+tkIT aqXLdrI5VN/Nc5msg6XIAk1fVxzUfAR+cKBijD9YUtszoyZNJz5//dHazXD96UAh9TOT CjyS7QVqbISwamkqJs9oz5XJJYFycLwO1/P+s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BaGoqmFP1tt0EpZeEpkj9x84y98y9BYCdG4DKqTdqyc=; b=a54zk9CDTVNWirRNmZpDlNgGa7xz18LgaAgnmPqkcut4R9S7hD+QFIvqxMckaBL1RL 7LOz7o5XTieWFGPfC1JpD16pB/89lYw23XiMvq9ciXts/7FUfCvDOeraCkm1g86Y09gw SX1efCGsza0S3G/L9a9nReBcrtsZEPiw7UZaECh91u4jiz6WVE4cbh/xImTaOGTeRX34 iU50MAXLfWefZ8If2JA+kaQsLlhu0FztLTvqEz1ORCMBOGSWA5l5sIHFraxVHNRRN+fw VcO6fNuoiSFo2gJCNG0fkVEFp8ggmws1I7gOlOuArt8zdM6UWKTwVjNQes7Wi1y372Cs xkWw== X-Gm-Message-State: AOAM533OKKafy/E8DHBmimqhLRaNUeH6FJSnUCPMU9gLtVSdmtP6m2Vq LbM87eSAwFAci6I2C2KBPLNJAw== X-Google-Smtp-Source: ABdhPJzxV7zCV9lAR3c0Jc9juDg8NFET/Z+3XOOmtNN2U0pMXdlVQZ61Yd8/oRnIU39J8a/TT842Sg== X-Received: by 2002:a05:6a00:2145:b029:30b:127:e0a3 with SMTP id o5-20020a056a002145b029030b0127e0a3mr25141688pfk.34.1625122484840; Wed, 30 Jun 2021 23:54:44 -0700 (PDT) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:a18a:185:21d0:d5d6]) by smtp.gmail.com with ESMTPSA id l7sm24770126pgb.19.2021.06.30.23.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jun 2021 23:54:44 -0700 (PDT) From: Hsin-Yi Wang To: Sean Wang , Linus Walleij , zhiyong.tao@mediatek.com Cc: Matthias Brugger , linux-mediatek@lists.infradead.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] pinctrl: mediatek: Fix fallback behavior for bias_set_combo Date: Thu, 1 Jul 2021 14:54:39 +0800 Message-Id: <20210701065439.2527790-1-hsinyi@chromium.org> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Some pin doesn't support PUPD register, if it fails and fallbacks with bias_set_combo case, it will call mtk_pinconf_bias_set_pupd_r1_r0() to modify the PUPD pin again. Since the general bias set are either PU/PD or PULLSEL/PULLEN, try bias_set or bias_set_rev1 for this fallback case. Fixes: 81bd1579b43e ("pinctrl: mediatek: Fix fallback call path") Signed-off-by: Hsin-Yi Wang --- drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c index 5b3b048725cc8..0cdff487836fa 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c @@ -926,9 +926,12 @@ int mtk_pinconf_adv_pull_set(struct mtk_pinctrl *hw, if (err) return err; } else if (hw->soc->bias_set_combo) { - err = hw->soc->bias_set_combo(hw, desc, pullup, arg); - if (err) - return err; + err = mtk_pinconf_bias_set_rev1(hw, desc, pullup); + if (err) { + err = mtk_pinconf_bias_set(hw, desc, pullup); + if (err) + return err; + } } else { return -ENOTSUPP; }