Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp3999121ybn; Fri, 27 Sep 2019 14:45:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqwAi5ZAtUZV77wbbXwaVOzwAIHfByUaQPEPf8VAvwY64QmOPFtubAcoORa45SdfX+NZg7iG X-Received: by 2002:a17:906:134b:: with SMTP id x11mr9599774ejb.272.1569620735510; Fri, 27 Sep 2019 14:45:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569620735; cv=none; d=google.com; s=arc-20160816; b=nJ0UZkDFYTQhD7BqLPkII0QU42GSTMo+hbE5t8rGgw5NLY0Hwk0EXiJbWaLi0P3/Nk 0sILNPjg1K7pl7PzcBau/sfyENkCj3wViYW+1mZXYWRAH+HTJz2Wv/53CL7QsNC2sojF KjBp2Jy5+nv2rU+08hddjHRPGDkbigc6kfojFfRBwZGeDsBQ68v8F+SMqMUquwa7NqV0 XBpAQtBBT6dlWmrqxb/1rs4X58h/6C42WZJNpRUR/Fqpd8M9tVnTmHsJ0ahTGehICcyy vCzkLLgr+FgVKHZGZeUn9VKK3+k2RGyn8/nkC0KlIu86PKfcl1tKL5FjBtwje9MT6vJ6 1g2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=1KA4otiiEWzEFGiXkAG1Z2/i/Qh8pKK1Mxq3+UuY1C4=; b=z/gmeGvAapHhaD+KsE1JrpGlOvHWlA/UBDSejtNSRaU3ZcOtl1Ogg1pHWQ6Vxoabze MU9zIJArP8Xsl8rOfjqQPJA3h0MPiJVm5A+59GdKRZKFBT4uUxp7kerYv3t9jlrFczzI b+GTNBF6SS4vFPRUgRmWPjEV2Hlrso9YKhpKAwCUGi4DxZxjrG8/PuPOHVH/fFDYl93w XZ1u4NZX8PWtPz83HIZKUNlPUSZcOwaWnqDsJFBrojmk0OnAaTIp+7GzB/Ua76bFdt8u QVG2nDF2GB4QIZ0L2grFeUfpKI5vAf/pJZxnpadx/d3VQrTx319BSn5mZ+WDWetUp6fM XqfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qGvjVY69; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f12si3657579ejj.108.2019.09.27.14.45.10; Fri, 27 Sep 2019 14:45:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qGvjVY69; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728335AbfI0VoU (ORCPT + 99 others); Fri, 27 Sep 2019 17:44:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:59206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728304AbfI0VoU (ORCPT ); Fri, 27 Sep 2019 17:44:20 -0400 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 261A121906; Fri, 27 Sep 2019 21:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569620658; bh=Aw7iu127rxS5WT+GCEE362QtZANlRjXx9kTLfkZW5SQ=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=qGvjVY69nA4zPeErPoQIw6ETjSjenGXNPZzoqeFfY39Q5qR2LVr3RSb+OtbECbasG w2qReh/2skDMAbPJYwU8YaZwFW17kmGH7Yvh04FeWsmT4lvPYswEUbptHIYXlrQ+kb d6YnVIXPJXk38viEUnCfLgELYfEpXo/ZObpQ5PQI= Received: by mail-wm1-f48.google.com with SMTP id 7so7430675wme.1; Fri, 27 Sep 2019 14:44:18 -0700 (PDT) X-Gm-Message-State: APjAAAWgi1T6cnb/y6z+Hk6fvZ4jFJOF++nT5dym1xmP3M7z6FDyUySL aTJZJy+asUtZ//oH1Nwy8t+f+xjhuhc4+9nG09c= X-Received: by 2002:a7b:cb8b:: with SMTP id m11mr8921857wmi.145.1569620656522; Fri, 27 Sep 2019 14:44:16 -0700 (PDT) MIME-Version: 1.0 References: <1569560532-1886-1-git-send-email-light.hsieh@mediatek.com> <1569560532-1886-4-git-send-email-light.hsieh@mediatek.com> In-Reply-To: <1569560532-1886-4-git-send-email-light.hsieh@mediatek.com> From: Sean Wang Date: Fri, 27 Sep 2019 14:44:04 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v6 4/5] pinctrl: mediatek: Backward compatible to previous Mediatek's bias-pull usage To: Light Hsieh Cc: Linus Walleij , "moderated list:ARM/Mediatek SoC support" , "open list:GPIO SUBSYSTEM" , lkml , kuohong.wang@mediatek.com Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Thu, Sep 26, 2019 at 10:02 PM Light Hsieh wrote: > > Refine mtk_pinconf_set()/mtk_pinconf_get() for backward compatibility to > previous Mediatek's bias-pull usage. MediaTek > In PINCTRL_MTK that use pinctrl-mtk-common.c, bias-pull setting for pins > with 2 pull resistors can be specified as value for bias-pull-up and > bias-pull-down. For example: > bias-pull-up = ; > bias-pull-up = ; > bias-pull-up = ; > bias-pull-up = ; > bias-pull-down = ; > bias-pull-down = ; > bias-pull-down = ; > bias-pull-down = ; > > On the other hand, PINCTRL_MTK_PARIS use customized properties > "mediatek,pull-up-adv" and "mediatek,pull-down-adv" to specify bias-pull > setting for pins with 2 pull resistors. > This introduce in-compatibility in device tree and increatse porting s/increatse/inscrease/ > effort to Mediatek's customer that had already used PINCTRL_MTK version. s/Mediatek/MediaTek/ > Besides, if customers are not awared of this change and still write devicetree s/awared/aware/ > for PINCTRL_MTK version, they may encounter runtime failure with pinctrl and > spent time to debug. > > This patch add backward compatible to previous Mediatek's bias-pull usage s/add/adds > so that Mediatek's customer need not use a new devicetree property name. s/Mediatek/MediaTek/ > The rationale is that: changing driver implemenation had better leave s/implemenation/implementation/ > interface unchanged. > There are many tags missing here too. > --- > drivers/pinctrl/mediatek/pinctrl-mt6765.c | 6 +- > drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 285 +++++++++++++++++++++++ > drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 11 + > drivers/pinctrl/mediatek/pinctrl-paris.c | 49 ++-- > 4 files changed, 327 insertions(+), 24 deletions(-) > > diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6765.c b/drivers/pinctrl/mediatek/pinctrl-mt6765.c > index bada37f..ae85fdc 100644 > --- a/drivers/pinctrl/mediatek/pinctrl-mt6765.c > +++ b/drivers/pinctrl/mediatek/pinctrl-mt6765.c > @@ -1072,10 +1072,8 @@ > .gpio_m = 0, > .base_names = mt6765_pinctrl_register_base_names, > .nbase_names = ARRAY_SIZE(mt6765_pinctrl_register_base_names), > - .bias_disable_set = mtk_pinconf_bias_disable_set, > - .bias_disable_get = mtk_pinconf_bias_disable_get, > - .bias_set = mtk_pinconf_bias_set, > - .bias_get = mtk_pinconf_bias_get, > + .bias_set_combo = mtk_pinconf_bias_set_combo, > + .bias_get_combo = mtk_pinconf_bias_get_combo, > .drive_set = mtk_pinconf_drive_set_direct_val, > .drive_get = mtk_pinconf_drive_get_direct_val, > .adv_pull_get = mtk_pinconf_adv_pull_get, > diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c > index acfddf9..6d9972f 100644 > --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c > +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c > @@ -13,6 +13,8 @@ > #include > #include > > +#include > + List the header declarations in alphabetic order. > #include "mtk-eint.h" > #include "pinctrl-mtk-common-v2.h" > > @@ -206,6 +208,20 @@ int mtk_hw_set_value(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc, > return 0; > } > > +void mtk_hw_set_value_no_lookup(struct mtk_pinctrl *hw, > + const struct mtk_pin_desc *desc, > + int value, struct mtk_pin_field *pf) > +{ > + if (value < 0 || value > pf->mask) > + return; > + > + if (!pf->next) > + mtk_rmw(hw, pf->index, pf->offset, pf->mask << pf->bitpos, > + (value & pf->mask) << pf->bitpos); > + else > + mtk_hw_write_cross_field(hw, pf, value); > +} > + > int mtk_hw_get_value(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc, > int field, int *value) > { > @@ -225,6 +241,17 @@ int mtk_hw_get_value(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc, > return 0; > } > > +void mtk_hw_get_value_no_lookup(struct mtk_pinctrl *hw, > + const struct mtk_pin_desc *desc, > + int *value, struct mtk_pin_field *pf) > +{ > + if (!pf->next) > + *value = (mtk_r32(hw, pf->index, pf->offset) > + >> pf->bitpos) & pf->mask; > + else > + mtk_hw_read_cross_field(hw, pf, value); > +} > + We are able to improve mtk_hw_[set,get]_value with a cache for the recently visited pin_desc to speed up the subsequent access to the same register for all clients, rather than creating a specific one with no_lookup just for a few clients. Generally, all clients should be able to just apply the mtk_hw_[set,get]_value to compose what they actually need. And the changes related to the improvement on mtk_hw_[set,get]_value with a cache is needed to put to a separate patch prior to the current one. > static int mtk_xt_find_eint_num(struct mtk_pinctrl *hw, unsigned long eint_n) > { > const struct mtk_pin_desc *desc; > @@ -517,6 +544,264 @@ int mtk_pinconf_bias_get_rev1(struct mtk_pinctrl *hw, > return 0; > } > > +/* Combo for the following pull register type: > + * 1. PU + PD > + * 2. PULLSEL + PULLEN > + * 3. PUPD + R0 + R1 > + */ > +int mtk_pinconf_bias_set_pu_pd(struct mtk_pinctrl *hw, static int > + const struct mtk_pin_desc *desc, > + u32 pullup, u32 arg) > +{ > + struct mtk_pin_field pf; > + int err = -EINVAL; > + int pu, pd; err doesn't need an initialization value, just keeping err in the same line with pu, pd is fine > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_PU, &pf); > + if (err) > + goto out; > + > + if (arg == MTK_DISABLE) { > + pu = 0; > + pd = 0; > + } else if ((arg == MTK_ENABLE) && pullup) { > + pu = 1; > + pd = 0; > + } else if ((arg == MTK_ENABLE) && !pullup) { > + pu = 0; > + pd = 1; > + } else { > + goto out; > + } > + > + mtk_hw_set_value_no_lookup(hw, desc, pu, &pf); > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_PD, &pf); > + if (err) > + goto out; > + > + mtk_hw_set_value_no_lookup(hw, desc, pd, &pf); > + > +out: > + return err; > +} > + > +int mtk_pinconf_bias_set_pullsel_pullen(struct mtk_pinctrl *hw, static int > + const struct mtk_pin_desc *desc, > + u32 pullup, u32 arg) > +{ > + struct mtk_pin_field pf; > + int err = -EINVAL, enable; err doesn't need an initialization value > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_PULLEN, &pf); > + if (err) > + goto out; > + > + if (arg == MTK_DISABLE) > + enable = 0; > + else if (arg == MTK_ENABLE) > + enable = 1; > + else > + goto out; > + > + mtk_hw_set_value_no_lookup(hw, desc, enable, &pf); > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_PULLSEL, &pf); > + if (err) > + goto out; > + mtk_hw_set_value_no_lookup(hw, desc, pullup, &pf); > + > +out: > + return err; > +} > + > +int mtk_pinconf_bias_set_pupd_r1_r0(struct mtk_pinctrl *hw, static int > + const struct mtk_pin_desc *desc, > + u32 pullup, u32 arg) > +{ > + struct mtk_pin_field pf; > + int err = -EINVAL; > + int r0, r1; err doesn't need an initialization value, just keeping err in the same line with r0 and r1 is fine > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_PUPD, &pf); > + if (err) > + goto out; > + > + if ((arg == MTK_DISABLE) || (arg == MTK_PUPD_SET_R1R0_00)) { > + pullup = 0; > + r0 = 0; > + r1 = 0; > + } else if (arg == MTK_PUPD_SET_R1R0_01) { > + r0 = 1; > + r1 = 0; > + } else if (arg == MTK_PUPD_SET_R1R0_10) { > + r0 = 0; > + r1 = 1; > + } else if (arg == MTK_PUPD_SET_R1R0_11) { > + r0 = 1; > + r1 = 1; > + } else > + goto out; > + > + /* MTK HW PUPD bit: 1 for pull-down, 0 for pull-up */ > + mtk_hw_set_value_no_lookup(hw, desc, !pullup, &pf); > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_R0, &pf); > + if (err) > + goto out; > + mtk_hw_set_value_no_lookup(hw, desc, r0, &pf); > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_R1, &pf); > + if (err) > + goto out; > + mtk_hw_set_value_no_lookup(hw, desc, r1, &pf); > + > +out: > + return err; > +} > + > +int mtk_pinconf_bias_get_pu_pd(struct mtk_pinctrl *hw, > + const struct mtk_pin_desc *desc, > + u32 *pullup, u32 *enable) static int > +{ > + struct mtk_pin_field pf; > + int err = -EINVAL; > + int pu, pd; err doesn't need an initialization value, just keeping err in the same line with pu, pd is fine > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_PU, &pf); > + if (err) > + goto out; > + > + mtk_hw_get_value_no_lookup(hw, desc, &pu, &pf); > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_PD, &pf); > + if (err) > + goto out; > + > + mtk_hw_get_value_no_lookup(hw, desc, &pd, &pf); > + > + if (pu == 0 && pd == 0) { > + *pullup = 0; > + *enable = MTK_DISABLE; > + } else if (pu == 1 && pd == 0) { > + *pullup = 1; > + *enable = MTK_ENABLE; > + } else if (pu == 0 && pd == 1) { > + *pullup = 0; > + *enable = MTK_ENABLE; > + } else { > + err = -EINVAL; > + goto out; > + } > + > +out: > + return err; > +} > + > +int mtk_pinconf_bias_get_pullsel_pullen(struct mtk_pinctrl *hw, > + const struct mtk_pin_desc *desc, > + u32 *pullup, u32 *enable) static int > +{ > + struct mtk_pin_field pf; > + int err = -EINVAL; > + err doesn't need an initialization value > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_PULLSEL, &pf); > + if (err) > + goto out; > + > + mtk_hw_get_value_no_lookup(hw, desc, pullup, &pf); > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_PULLEN, &pf); > + if (err) > + goto out; > + > + mtk_hw_get_value_no_lookup(hw, desc, enable, &pf); > + > +out: > + return err; > +} > + > +int mtk_pinconf_bias_get_pupd_r1_r0(struct mtk_pinctrl *hw, > + const struct mtk_pin_desc *desc, > + u32 *pullup, u32 *enable) static int > +{ > + struct mtk_pin_field pf; > + int err = -EINVAL; > + int r0, r1; > + err doesn't need an initialization value, just keeping err in the same line with r0, r1 is fine > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_PUPD, &pf); > + if (err) > + goto out; > + > + /* MTK HW PUPD bit: 1 for pull-down, 0 for pull-up */ > + mtk_hw_get_value_no_lookup(hw, desc, pullup, &pf); > + *pullup = !(*pullup); > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_R0, &pf); > + if (err) > + goto out; > + mtk_hw_get_value_no_lookup(hw, desc, &r0, &pf); > + > + err = mtk_hw_pin_field_lookup(hw, desc, PINCTRL_PIN_REG_R1, &pf); > + if (err) > + goto out; > + mtk_hw_get_value_no_lookup(hw, desc, &r1, &pf); > + > + if ((r1 == 0) && (r0 == 0)) > + *enable = MTK_PUPD_SET_R1R0_00; > + else if ((r1 == 0) && (r0 == 1)) > + *enable = MTK_PUPD_SET_R1R0_01; > + else if ((r1 == 1) && (r0 == 0)) > + *enable = MTK_PUPD_SET_R1R0_10; > + else if ((r1 == 1) && (r0 == 1)) > + *enable = MTK_PUPD_SET_R1R0_11; > + else > + goto out; > + > +out: > + return err; > +} > + > +int mtk_pinconf_bias_set_combo(struct mtk_pinctrl *hw, > + const struct mtk_pin_desc *desc, > + u32 pullup, u32 arg) > +{ > + int err; > + > + err = mtk_pinconf_bias_set_pu_pd(hw, desc, pullup, arg); > + if (!err) > + goto out; > + > + err = mtk_pinconf_bias_set_pullsel_pullen(hw, desc, pullup, arg); > + if (!err) > + goto out; > + > + err = mtk_pinconf_bias_set_pupd_r1_r0(hw, desc, pullup, arg); > + > +out: > + return err; > +} > + > +int mtk_pinconf_bias_get_combo(struct mtk_pinctrl *hw, > + const struct mtk_pin_desc *desc, > + u32 *pullup, u32 *enable) > +{ > + int err; > + > + err = mtk_pinconf_bias_get_pu_pd(hw, desc, pullup, enable); > + if (!err) > + goto out; > + > + err = mtk_pinconf_bias_get_pullsel_pullen(hw, desc, pullup, enable); > + if (!err) > + goto out; > + > + err = mtk_pinconf_bias_get_pupd_r1_r0(hw, desc, pullup, enable); > + > +out: > + return err; > +} > + > /* Revision 0 */ > int mtk_pinconf_drive_set(struct mtk_pinctrl *hw, > const struct mtk_pin_desc *desc, u32 arg) > diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h > index b3bada0..a13dcae 100644 > --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h > +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h > @@ -216,6 +216,11 @@ struct mtk_pin_soc { > int (*bias_get)(struct mtk_pinctrl *hw, > const struct mtk_pin_desc *desc, bool pullup, int *res); > > + int (*bias_set_combo)(struct mtk_pinctrl *hw, > + const struct mtk_pin_desc *desc, u32 pullup, u32 arg); > + int (*bias_get_combo)(struct mtk_pinctrl *hw, > + const struct mtk_pin_desc *desc, u32 *pullup, u32 *arg); > + > int (*drive_set)(struct mtk_pinctrl *hw, > const struct mtk_pin_desc *desc, u32 arg); > int (*drive_get)(struct mtk_pinctrl *hw, > @@ -277,6 +282,12 @@ int mtk_pinconf_bias_set_rev1(struct mtk_pinctrl *hw, > int mtk_pinconf_bias_get_rev1(struct mtk_pinctrl *hw, > const struct mtk_pin_desc *desc, bool pullup, > int *res); > +int mtk_pinconf_bias_set_combo(struct mtk_pinctrl *hw, > + const struct mtk_pin_desc *desc, > + u32 pullup, u32 enable); > +int mtk_pinconf_bias_get_combo(struct mtk_pinctrl *hw, > + const struct mtk_pin_desc *desc, > + u32 *pullup, u32 *enable); > > int mtk_pinconf_drive_set(struct mtk_pinctrl *hw, > const struct mtk_pin_desc *desc, u32 arg); > diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c > index 54f069b..2a47c45 100644 > --- a/drivers/pinctrl/mediatek/pinctrl-paris.c > +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c > @@ -79,6 +79,7 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev, > struct mtk_pinctrl *hw = pinctrl_dev_get_drvdata(pctldev); > u32 param = pinconf_to_config_param(*config); > int err, reg, ret = 1; > + int pullup; Keep pullup the same line with other value with the type > const struct mtk_pin_desc *desc; > > if (pin >= hw->soc->npins) { > @@ -89,22 +90,31 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev, > > switch (param) { > case PIN_CONFIG_BIAS_DISABLE: > - if (hw->soc->bias_disable_get) > - err = hw->soc->bias_disable_get(hw, desc, &ret); > - else > - err = -ENOTSUPP; > - break; > case PIN_CONFIG_BIAS_PULL_UP: > - if (hw->soc->bias_get) > - err = hw->soc->bias_get(hw, desc, 1, &ret); > - else > - err = -ENOTSUPP; > - break; > case PIN_CONFIG_BIAS_PULL_DOWN: > - if (hw->soc->bias_get) > - err = hw->soc->bias_get(hw, desc, 0, &ret); > - else > + if (hw->soc->bias_get_combo) { > + err = hw->soc->bias_get_combo(hw, desc, &pullup, &ret); > + if (err) > + goto out; > + if (param == PIN_CONFIG_BIAS_DISABLE) { > + if (ret == MTK_PUPD_SET_R1R0_00) > + ret = MTK_DISABLE; > + } else if (param == PIN_CONFIG_BIAS_PULL_UP) { > + /* When desire to get pull-up value, > + * return error if current setting is pull-down > + */ Keep the line close to 80 char alignment as much as possible. > + if (!pullup) > + err = -EINVAL; > + } else if (param == PIN_CONFIG_BIAS_PULL_DOWN) { > + /* When desire to get pull-down value, > + * return error if current setting is pull-up > + */ Keep the line close to 80 char alignment as much as possible. > + if (pullup) > + err = -EINVAL; > + } > + } else { We don't remove the old usage (->bias_get and bias_disable_get) and instead keep two ways exist for a while until all driver such as MT8183 driver using the core is being switched into new old you proposed here. > err = -ENOTSUPP; > + } > break; > case PIN_CONFIG_SLEW_RATE: > err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_SR, &ret); > @@ -196,20 +206,20 @@ static int mtk_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, > > switch ((u32)param) { > case PIN_CONFIG_BIAS_DISABLE: > - if (hw->soc->bias_disable_set) > - err = hw->soc->bias_disable_set(hw, desc); > + if (hw->soc->bias_set_combo) > + err = hw->soc->bias_set_combo(hw, desc, 0, MTK_DISABLE); > else > err = -ENOTSUPP; > break; > case PIN_CONFIG_BIAS_PULL_UP: > - if (hw->soc->bias_set) > - err = hw->soc->bias_set(hw, desc, 1); > + if (hw->soc->bias_set_combo) > + err = hw->soc->bias_set_combo(hw, desc, 1, arg); > else > err = -ENOTSUPP; > break; > case PIN_CONFIG_BIAS_PULL_DOWN: > - if (hw->soc->bias_set) > - err = hw->soc->bias_set(hw, desc, 0); > + if (hw->soc->bias_set_combo) > + err = hw->soc->bias_set_combo(hw, desc, 0, arg); Ditto as the above > else > err = -ENOTSUPP; > break; > @@ -899,7 +909,6 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev, > return 0; > } > > - Remove the needless change > static int mtk_paris_pinctrl_suspend(struct device *device) > { > struct mtk_pinctrl *pctl = dev_get_drvdata(device); > -- > 1.8.1.1.dirty >