From patchwork Mon Dec 28 09:04:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 1420812 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Q0q/Ga+N; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4D4BVT14yQz9sVv for ; Mon, 28 Dec 2020 20:06:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726919AbgL1JFL (ORCPT ); Mon, 28 Dec 2020 04:05:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726861AbgL1JFL (ORCPT ); Mon, 28 Dec 2020 04:05:11 -0500 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5703C061795 for ; Mon, 28 Dec 2020 01:04:30 -0800 (PST) Received: by mail-pf1-x429.google.com with SMTP id c79so5982882pfc.2 for ; Mon, 28 Dec 2020 01:04:30 -0800 (PST) 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=X4pAM+KZPcorEeEY52d8nlRr19UO6jcGAcFxkVXndac=; b=Q0q/Ga+Nxl+3FRZgGiLxoEgOGgwiSNoS3EbH3cbyl+E0gQ7GJLAkpv/ZNUp2DuRnZh c7JaTDTi6Jcrtdo5bby8PAXpJsATseq5v3CWrgtaVJNHH8vi4G/xtXPWxXhyjRWONizp 6rFkdMqbF9G8k+I0VvApIg/HinLERWVH9zkTs= 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=X4pAM+KZPcorEeEY52d8nlRr19UO6jcGAcFxkVXndac=; b=ginWvNQqgBx9qzTamy/fiL7l1DXwvL78COGx9P27QMPfT+PWhNj3xMqhRLiKfwP0LL vSKHsAd6B/du8Y6m3c74sTqoEbnw42nZA1CPmRwYRzGQBhzXdVw05Ee8hakQG1n/AfKH 3q4G8bSw2t3rISs2PFfGRnZzA9NOTa9sh+uwcMw14JuXx10irud3+3fLiw71vl6IePKx MP7t/k+78QoY22UJgtSrjwiBrLSgpWP433a/upIYHG0uGRG4SI1y0va8ha1qb0lKbDxg D88NMAUeden/x0Lk94hVd1X11x5eLpA/nZPqjMI9cOzITiRnXtIf95aBRVE6GXj8Y4pm 4aHA== X-Gm-Message-State: AOAM533DTbCnbQP6bqIFcpkQj6CaJPKZP7wud35l18N65IwJGCV5ka3i B3SG2S6eJ7cPmzUKbzdShtav9w== X-Google-Smtp-Source: ABdhPJxt6FqRzO1S7YUjyHUwrV8TLbMVa6hCRDhCOqzEtTJ899Q8c45+FCd78FI7imT744QJSdl6hQ== X-Received: by 2002:a63:e049:: with SMTP id n9mr42750637pgj.339.1609146270214; Mon, 28 Dec 2020 01:04:30 -0800 (PST) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:1a60:24ff:fe89:3e93]) by smtp.gmail.com with ESMTPSA id h10sm31496329pfn.213.2020.12.28.01.04.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 01:04:29 -0800 (PST) From: Hsin-Yi Wang To: linux-arm-kernel@lists.infradead.org Cc: Sean Wang , Linus Walleij , Matthias Brugger , Light Hsieh , linux-mediatek@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Enric Balletbo i Serra Subject: [PATCH] pinctrl: mediatek: Fix fallback call path Date: Mon, 28 Dec 2020 17:04:25 +0800 Message-Id: <20201228090425.2130569-1-hsinyi@chromium.org> X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Some SoCs, eg. mt8183, are using a pinconfig operation bias_set_combo. The fallback path in mtk_pinconf_adv_pull_set() should also try this operation. Fixes: cafe19db7751 ("pinctrl: mediatek: Backward compatible to previous Mediatek's bias-pull usage") Signed-off-by: Hsin-Yi Wang Acked-by: Sean Wang --- drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c index 7aeb552d16ce9..72f17f26acd80 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c @@ -920,6 +920,10 @@ int mtk_pinconf_adv_pull_set(struct mtk_pinctrl *hw, err = hw->soc->bias_set(hw, desc, pullup); 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; } else { return -ENOTSUPP; }