From patchwork Wed Feb 8 08:18:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 13132553 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34B14C05027 for ; Wed, 8 Feb 2023 08:19:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230196AbjBHIT5 (ORCPT ); Wed, 8 Feb 2023 03:19:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230150AbjBHIT4 (ORCPT ); Wed, 8 Feb 2023 03:19:56 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98EF4F760 for ; Wed, 8 Feb 2023 00:19:54 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id hn2-20020a05600ca38200b003dc5cb96d46so814769wmb.4 for ; Wed, 08 Feb 2023 00:19:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0l1LQIgPjZSYHp6ZlYWpsxbiEcCjDEndwPKdoxGHr50=; b=KcFcxyTfkRuWf/DmKpWOjhrVHMIKVfJzEKMvB9JXDx+7IGP7mqqRJaWpGSwue++j6w Wnqx/yGRjSFwwrGsQ5d5E6xxJslmW2IaNKwDR/L2HXdvnQjFiuaxzo07jZcOrK19rq+J /dUAAp58FsoZeRyEJMGlgss3RlK0w7JiIyiXwiXTOirn2gR70sRiobITRLQNVqLJdxVr AEqRTVM26mU7xLCks+g9sDtLQMwMRtvn0d4XW0enzGD9mPj8u7DjnO+FWQpAh73nOrfj L/DTCMeyI6Ki+iQ3IMHCz25Um8GN3/NS6zsne9DZmyZzA6+VFLegXpJ1XeLMj8BdHoSU yPFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0l1LQIgPjZSYHp6ZlYWpsxbiEcCjDEndwPKdoxGHr50=; b=eQhXyeqG5grG+4dX1tI+ruVbdwK+NdVIZRYsWcBOlItxpBDeTagR4j/TY5a7meG/RN W8CEZo/YvJY7a+kjhvVuL+NPKAKgEuPdkBK9qVnwK3rMN/Znxn7dBvcU/pIVH57at2q2 A33Nu9ebNRHPxicQIuhJpKbOhlu58n/sRrynOQ2oQPdfMWU9OzccRLMyd/0NrnLDgcLy uvcQeF4zlwBb4c0dRKeV4owXlEaLR/WwGusts2X82PsdNhJwENyWsU1uZArMMTD/TxnH SJNlSO1fGEM/xM6TfguAVcA8AkyQMyk7UpuhVt7KkoVcMSFh/jL3jk6HRSMV/JWzg39N 8lGg== X-Gm-Message-State: AO0yUKWTOzr9HPvkpx40hDsW+n1JaG8dS1WQoKc04aanmphZkbHGkXSU X63LIJ+VtGgEhzTdY6CvHcV8lA== X-Google-Smtp-Source: AK7set+9FyNwI+o7IDokP38uw7oFjz4TgpYpE07R3Wj1J4s0h8bXD/vtlJmiTSqKeDaDhxrI1MYcGg== X-Received: by 2002:a05:600c:2eca:b0:3e0:ffd4:bfab with SMTP id q10-20020a05600c2eca00b003e0ffd4bfabmr1913924wmn.13.1675844393194; Wed, 08 Feb 2023 00:19:53 -0800 (PST) Received: from hackbox.lan ([94.52.112.99]) by smtp.gmail.com with ESMTPSA id a3-20020a05600c224300b003db01178b62sm1142452wmm.40.2023.02.08.00.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 00:19:52 -0800 (PST) From: Abel Vesa To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Linus Walleij Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Linux Kernel Mailing List , Neil Armstrong Subject: [PATCH v3 1/2] pinctrl: qcom: Add support for i2c specific pull feature Date: Wed, 8 Feb 2023 10:18:35 +0200 Message-Id: <20230208081836.984673-1-abel.vesa@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add support for the new i2c_pull property introduced for SM8550 setting a I2C specific pull mode on I2C able pins. Add the bit to the SM8550 specific driver while at it. Co-developed-by: Neil Armstrong Signed-off-by: Neil Armstrong Signed-off-by: Abel Vesa --- The v2 of this specific patch is here: https://lore.kernel.org/all/20221123152001.694546-4-abel.vesa@linaro.org/ Changes since v2: * This time, this patch is sent separate w.r.t. SM8550 pinctrl driver * The qcom,i2c-pull is dropped, bias-pull-up with value is used instead * Default value for i2c pull up is 2.2kOhms and since SM8550 is the first one to use it, we hard code it for now * changed the authorship as the implementation looks entirely different now drivers/pinctrl/qcom/pinctrl-msm.c | 7 +++++++ drivers/pinctrl/qcom/pinctrl-msm.h | 1 + drivers/pinctrl/qcom/pinctrl-sm8550.c | 1 + 3 files changed, 9 insertions(+) diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 5142c363480a..510c964dd0f5 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -310,6 +310,8 @@ static int msm_config_reg(struct msm_pinctrl *pctrl, case PIN_CONFIG_BIAS_PULL_UP: *bit = g->pull_bit; *mask = 3; + if (g->i2c_pull_bit) + *mask |= BIT(g->i2c_pull_bit) >> *bit; break; case PIN_CONFIG_DRIVE_OPEN_DRAIN: *bit = g->od_bit; @@ -336,6 +338,7 @@ static int msm_config_reg(struct msm_pinctrl *pctrl, #define MSM_KEEPER 2 #define MSM_PULL_UP_NO_KEEPER 2 #define MSM_PULL_UP 3 +#define MSM_I2C_STRONG_PULL_UP 2200 static unsigned msm_regval_to_drive(u32 val) { @@ -387,6 +390,8 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev, case PIN_CONFIG_BIAS_PULL_UP: if (pctrl->soc->pull_no_keeper) arg = arg == MSM_PULL_UP_NO_KEEPER; + else if (arg & BIT(g->i2c_pull_bit)) + arg = MSM_I2C_STRONG_PULL_UP; else arg = arg == MSM_PULL_UP; if (!arg) @@ -467,6 +472,8 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev, case PIN_CONFIG_BIAS_PULL_UP: if (pctrl->soc->pull_no_keeper) arg = MSM_PULL_UP_NO_KEEPER; + else if (g->i2c_pull_bit && arg > 1) + arg = BIT(g->i2c_pull_bit) | MSM_PULL_UP; else arg = MSM_PULL_UP; break; diff --git a/drivers/pinctrl/qcom/pinctrl-msm.h b/drivers/pinctrl/qcom/pinctrl-msm.h index 05a1209bf9ae..985eceda2517 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.h +++ b/drivers/pinctrl/qcom/pinctrl-msm.h @@ -80,6 +80,7 @@ struct msm_pingroup { unsigned pull_bit:5; unsigned drv_bit:5; + unsigned i2c_pull_bit:5; unsigned od_bit:5; unsigned egpio_enable:5; diff --git a/drivers/pinctrl/qcom/pinctrl-sm8550.c b/drivers/pinctrl/qcom/pinctrl-sm8550.c index 0b7db7d4054a..c9d038098f2c 100644 --- a/drivers/pinctrl/qcom/pinctrl-sm8550.c +++ b/drivers/pinctrl/qcom/pinctrl-sm8550.c @@ -47,6 +47,7 @@ .mux_bit = 2, \ .pull_bit = 0, \ .drv_bit = 6, \ + .i2c_pull_bit = 13, \ .egpio_enable = 12, \ .egpio_present = 11, \ .oe_bit = 9, \