From patchwork Mon Aug 27 10:10:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Wang X-Patchwork-Id: 10576867 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF0CF1390 for ; Mon, 27 Aug 2018 10:18:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A227329474 for ; Mon, 27 Aug 2018 10:17:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9531E29480; Mon, 27 Aug 2018 10:17:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SUSPICIOUS_RECIPS, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7728129474 for ; Mon, 27 Aug 2018 10:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6qHbTaq9sEPG3dshMBcdYuCd1gicnf/Lh0/AyJ+HHUM=; b=bJ18LenRV0PZeZ itWWaFaJWzZ5f4ivEub0bSWFL1HEoNSTHBP6FTYPSxeKueipiaCPlFT9uAoOy1UrVoedkdanU6938 nou+fHS5SchFNQDq9B5nWImktlYib5rrLbuv2cqkDhqRT1IIiXT3DYrUP0xNE5PuoAxVifF9+PAn+ 4imr6KRFRsa9rG9O1uq/j5NVJX6OrERAOn7kQD0biR3zxl4JYQlw07da9YbfTkqGrq7ybeXdeJZZJ FnJqzGg47SoDlIu0vdcjl1i6vnzH1G9MrkWdtstVtP4ptS4C3p/AbKata+TAOjbHodoKBjLFwWGtw rPjD+Iwy/MeIIsHC7M9w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuEad-0005df-PV; Mon, 27 Aug 2018 10:17:43 +0000 Received: from [210.61.82.183] (helo=mailgw01.mediatek.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuETm-0001FW-Ss; Mon, 27 Aug 2018 10:10:48 +0000 X-UUID: 19c44db246bb4eb491df5a328f179e1c-20180827 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1434082920; Mon, 27 Aug 2018 18:10:21 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs08n1.mediatek.inc (172.21.101.55) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Mon, 27 Aug 2018 18:10:19 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1210.3 via Frontend Transport; Mon, 27 Aug 2018 18:10:19 +0800 From: To: , Subject: [PATCH 13/16] pinctrl: mediatek: use pin descriptor all in pinctrl-mtk-common-v2.c Date: Mon, 27 Aug 2018 18:10:12 +0800 Message-ID: <4552ab3ac4360c097d5e1f37aa87f7f700d013ce.1535363951.git.sean.wang@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_031039_354684_BEA53CBE X-CRM114-Status: GOOD ( 14.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-gpio@vger.kernel.org, Sean Wang , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sean Wang all use pin descriptor instead in pinctrl-mtk-common-v2.c for the consistency and extensibility. Signed-off-by: Sean Wang --- drivers/pinctrl/mediatek/pinctrl-moore.c | 66 +++++++++++++------- drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 76 +++++++++++++----------- drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 6 +- 3 files changed, 88 insertions(+), 60 deletions(-) diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c index 219cfce..2f3e3b5 100644 --- a/drivers/pinctrl/mediatek/pinctrl-moore.c +++ b/drivers/pinctrl/mediatek/pinctrl-moore.c @@ -54,9 +54,13 @@ static int mtk_pinmux_set_mux(struct pinctrl_dev *pctldev, func->name, grp->name); for (i = 0; i < grp->num_pins; i++) { + const struct mtk_pin_desc *desc; int *pin_modes = grp->data; + int pin = grp->pins[i]; - mtk_hw_set_value(hw, grp->pins[i], PINCTRL_PIN_REG_MODE, + desc = (const struct mtk_pin_desc *)&hw->soc->pins[pin]; + + mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_MODE, pin_modes[i]); } @@ -68,8 +72,12 @@ static int mtk_pinmux_gpio_request_enable(struct pinctrl_dev *pctldev, unsigned int pin) { struct mtk_pinctrl *hw = pinctrl_dev_get_drvdata(pctldev); + const struct mtk_pin_desc *desc; + + desc = (const struct mtk_pin_desc *)&hw->soc->pins[pin]; - return mtk_hw_set_value(hw, pin, PINCTRL_PIN_REG_MODE, hw->soc->gpio_m); + return mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_MODE, + hw->soc->gpio_m); } static int mtk_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev, @@ -77,9 +85,12 @@ static int mtk_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev, unsigned int pin, bool input) { struct mtk_pinctrl *hw = pinctrl_dev_get_drvdata(pctldev); + const struct mtk_pin_desc *desc; + + desc = (const struct mtk_pin_desc *)&hw->soc->pins[pin]; /* hardware would take 0 as input direction */ - return mtk_hw_set_value(hw, pin, PINCTRL_PIN_REG_DIR, !input); + return mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DIR, !input); } static int mtk_pinconf_get(struct pinctrl_dev *pctldev, @@ -121,7 +132,7 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev, } break; case PIN_CONFIG_SLEW_RATE: - err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_SR, &val); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_SR, &val); if (err) return err; @@ -131,7 +142,7 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev, break; case PIN_CONFIG_INPUT_ENABLE: case PIN_CONFIG_OUTPUT_ENABLE: - err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_DIR, &val); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DIR, &val); if (err) return err; @@ -142,11 +153,11 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev, break; case PIN_CONFIG_INPUT_SCHMITT_ENABLE: - err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_DIR, &val); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DIR, &val); if (err) return err; - err = mtk_hw_get_value(hw, pin, PINCTRL_PIN_REG_SMT, &val2); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_SMT, &val2); if (err) return err; @@ -168,7 +179,7 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev, reg = (param == MTK_PIN_CONFIG_TDSEL) ? PINCTRL_PIN_REG_TDSEL : PINCTRL_PIN_REG_RDSEL; - err = mtk_hw_get_value(hw, pin, reg, &val); + err = mtk_hw_get_value(hw, desc, reg, &val); if (err) return err; @@ -240,12 +251,12 @@ static int mtk_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, } break; case PIN_CONFIG_OUTPUT_ENABLE: - err = mtk_hw_set_value(hw, pin, PINCTRL_PIN_REG_SMT, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_SMT, MTK_DISABLE); if (err) goto err; - err = mtk_hw_set_value(hw, pin, PINCTRL_PIN_REG_DIR, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DIR, MTK_OUTPUT); if (err) goto err; @@ -253,29 +264,29 @@ static int mtk_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, case PIN_CONFIG_INPUT_ENABLE: if (hw->soc->ies_present) { - mtk_hw_set_value(hw, pin, PINCTRL_PIN_REG_IES, + mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_IES, MTK_ENABLE); } - err = mtk_hw_set_value(hw, pin, PINCTRL_PIN_REG_DIR, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DIR, MTK_INPUT); if (err) goto err; break; case PIN_CONFIG_SLEW_RATE: - err = mtk_hw_set_value(hw, pin, PINCTRL_PIN_REG_SR, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_SR, arg); if (err) goto err; break; case PIN_CONFIG_OUTPUT: - err = mtk_hw_set_value(hw, pin, PINCTRL_PIN_REG_DIR, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DIR, MTK_OUTPUT); if (err) goto err; - err = mtk_hw_set_value(hw, pin, PINCTRL_PIN_REG_DO, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DO, arg); if (err) goto err; @@ -285,12 +296,12 @@ static int mtk_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, * arg = 0: Output mode & SMT disable */ arg = arg ? 2 : 1; - err = mtk_hw_set_value(hw, pin, PINCTRL_PIN_REG_DIR, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DIR, arg & 1); if (err) goto err; - err = mtk_hw_set_value(hw, pin, PINCTRL_PIN_REG_SMT, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_SMT, !!(arg & 2)); if (err) goto err; @@ -309,7 +320,7 @@ static int mtk_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, reg = (param == MTK_PIN_CONFIG_TDSEL) ? PINCTRL_PIN_REG_TDSEL : PINCTRL_PIN_REG_RDSEL; - err = mtk_hw_set_value(hw, pin, reg, arg); + err = mtk_hw_set_value(hw, desc, reg, arg); if (err) goto err; break; @@ -419,9 +430,12 @@ static struct pinctrl_desc mtk_desc = { static int mtk_gpio_get(struct gpio_chip *chip, unsigned int gpio) { struct mtk_pinctrl *hw = gpiochip_get_data(chip); + const struct mtk_pin_desc *desc; int value, err; - err = mtk_hw_get_value(hw, gpio, PINCTRL_PIN_REG_DI, &value); + desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio]; + + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DI, &value); if (err) return err; @@ -431,8 +445,11 @@ static int mtk_gpio_get(struct gpio_chip *chip, unsigned int gpio) static void mtk_gpio_set(struct gpio_chip *chip, unsigned int gpio, int value) { struct mtk_pinctrl *hw = gpiochip_get_data(chip); + const struct mtk_pin_desc *desc; - mtk_hw_set_value(hw, gpio, PINCTRL_PIN_REG_DO, !!value); + desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio]; + + mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DO, !!value); } static int mtk_gpio_direction_input(struct gpio_chip *chip, unsigned int gpio) @@ -620,6 +637,7 @@ static int mtk_xt_get_gpio_state(void *data, unsigned long eint_n) static int mtk_xt_set_gpio_as_eint(void *data, unsigned long eint_n) { struct mtk_pinctrl *hw = (struct mtk_pinctrl *)data; + const struct mtk_pin_desc *desc; struct gpio_chip *gpio_chip; unsigned int gpio_n; int err; @@ -628,16 +646,18 @@ static int mtk_xt_set_gpio_as_eint(void *data, unsigned long eint_n) if (err) return err; - err = mtk_hw_set_value(hw, gpio_n, PINCTRL_PIN_REG_MODE, + desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio_n]; + + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_MODE, hw->soc->eint_m); if (err) return err; - err = mtk_hw_set_value(hw, gpio_n, PINCTRL_PIN_REG_DIR, MTK_INPUT); + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DIR, MTK_INPUT); if (err) return err; - err = mtk_hw_set_value(hw, gpio_n, PINCTRL_PIN_REG_SMT, MTK_ENABLE); + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_SMT, MTK_ENABLE); if (err) return err; diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c index 1cfacd4..0df1b15 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c @@ -59,7 +59,8 @@ void mtk_rmw(struct mtk_pinctrl *pctl, u32 reg, u32 mask, u32 set) mtk_w32(pctl, reg, val); } -static int mtk_hw_pin_field_lookup(struct mtk_pinctrl *hw, int pin, +static int mtk_hw_pin_field_lookup(struct mtk_pinctrl *hw, + const struct mtk_pin_desc *desc, const struct mtk_pin_reg_calc *rc, struct mtk_pin_field *pfd) { @@ -70,13 +71,14 @@ static int mtk_hw_pin_field_lookup(struct mtk_pinctrl *hw, int pin, e = c + rc->nranges; while (c < e) { - if (pin >= c->s_pin && pin <= c->e_pin) + if (desc->number >= c->s_pin && desc->number <= c->e_pin) break; c++; } if (c >= e) { - dev_err(hw->dev, "Out of range for pin = %d\n", pin); + dev_err(hw->dev, "Out of range for pin = %d (%s)\n", + desc->number, desc->name); return -EINVAL; } @@ -84,7 +86,8 @@ static int mtk_hw_pin_field_lookup(struct mtk_pinctrl *hw, int pin, * if c->fixed is held, that determines the all the pins in the * range use the same field with the s_pin. */ - bits = c->fixed ? c->s_bit : c->s_bit + (pin - c->s_pin) * (c->x_bits); + bits = c->fixed ? c->s_bit : c->s_bit + + (desc->number - c->s_pin) * (c->x_bits); /* Fill pfd from bits. For example 32-bit register applied is assumed * when c->sz_reg is equal to 32. @@ -102,7 +105,8 @@ static int mtk_hw_pin_field_lookup(struct mtk_pinctrl *hw, int pin, return 0; } -static int mtk_hw_pin_field_get(struct mtk_pinctrl *hw, int pin, +static int mtk_hw_pin_field_get(struct mtk_pinctrl *hw, + const struct mtk_pin_desc *desc, int field, struct mtk_pin_field *pfd) { const struct mtk_pin_reg_calc *rc; @@ -119,7 +123,7 @@ static int mtk_hw_pin_field_get(struct mtk_pinctrl *hw, int pin, return -EINVAL; } - return mtk_hw_pin_field_lookup(hw, pin, rc, pfd); + return mtk_hw_pin_field_lookup(hw, desc, rc, pfd); } static void mtk_hw_bits_part(struct mtk_pin_field *pf, int *h, int *l) @@ -155,12 +159,13 @@ static void mtk_hw_read_cross_field(struct mtk_pinctrl *hw, *value = (h << nbits_l) | l; } -int mtk_hw_set_value(struct mtk_pinctrl *hw, int pin, int field, int value) +int mtk_hw_set_value(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc, + int field, int value) { struct mtk_pin_field pf; int err; - err = mtk_hw_pin_field_get(hw, pin, field, &pf); + err = mtk_hw_pin_field_get(hw, desc, field, &pf); if (err) return err; @@ -173,12 +178,13 @@ int mtk_hw_set_value(struct mtk_pinctrl *hw, int pin, int field, int value) return 0; } -int mtk_hw_get_value(struct mtk_pinctrl *hw, int pin, int field, int *value) +int mtk_hw_get_value(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc, + int field, int *value) { struct mtk_pin_field pf; int err; - err = mtk_hw_pin_field_get(hw, pin, field, &pf); + err = mtk_hw_pin_field_get(hw, desc, field, &pf); if (err) return err; @@ -196,12 +202,12 @@ int mtk_pinconf_bias_disable_set(struct mtk_pinctrl *hw, { int err; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_PU, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_PU, MTK_DISABLE); if (err) return err; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_PD, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_PD, MTK_DISABLE); if (err) return err; @@ -215,11 +221,11 @@ int mtk_pinconf_bias_disable_get(struct mtk_pinctrl *hw, int v, v2; int err; - err = mtk_hw_get_value(hw, desc->number, PINCTRL_PIN_REG_PU, &v); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_PU, &v); if (err) return err; - err = mtk_hw_get_value(hw, desc->number, PINCTRL_PIN_REG_PD, &v2); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_PD, &v2); if (err) return err; @@ -238,11 +244,11 @@ int mtk_pinconf_bias_set(struct mtk_pinctrl *hw, arg = pullup ? 1 : 2; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_PU, arg & 1); + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_PU, arg & 1); if (err) return err; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_PD, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_PD, !!(arg & 2)); if (err) return err; @@ -257,7 +263,7 @@ int mtk_pinconf_bias_get(struct mtk_pinctrl *hw, reg = pullup ? PINCTRL_PIN_REG_PU : PINCTRL_PIN_REG_PD; - err = mtk_hw_get_value(hw, desc->number, reg, &v); + err = mtk_hw_get_value(hw, desc, reg, &v); if (err) return err; @@ -275,7 +281,7 @@ int mtk_pinconf_bias_disable_set_rev1(struct mtk_pinctrl *hw, { int err; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_PULLEN, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_PULLEN, MTK_DISABLE); if (err) return err; @@ -288,7 +294,7 @@ int mtk_pinconf_bias_disable_get_rev1(struct mtk_pinctrl *hw, { int v, err; - err = mtk_hw_get_value(hw, desc->number, PINCTRL_PIN_REG_PULLEN, &v); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_PULLEN, &v); if (err) return err; @@ -307,12 +313,12 @@ int mtk_pinconf_bias_set_rev1(struct mtk_pinctrl *hw, arg = pullup ? MTK_PULLUP : MTK_PULLDOWN; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_PULLEN, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_PULLEN, MTK_ENABLE); if (err) return err; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_PULLSEL, arg); + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_PULLSEL, arg); if (err) return err; @@ -325,7 +331,7 @@ int mtk_pinconf_bias_get_rev1(struct mtk_pinctrl *hw, { int err, arg, v; - err = mtk_hw_get_value(hw, desc->number, PINCTRL_PIN_REG_PULLEN, &v); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_PULLEN, &v); if (err) return err; @@ -334,7 +340,7 @@ int mtk_pinconf_bias_get_rev1(struct mtk_pinctrl *hw, arg = pullup ? MTK_PULLUP : MTK_PULLDOWN; - err = mtk_hw_get_value(hw, desc->number, PINCTRL_PIN_REG_PULLSEL, &v); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_PULLSEL, &v); if (err) return err; @@ -361,12 +367,12 @@ int mtk_pinconf_drive_set(struct mtk_pinctrl *hw, */ if ((arg >= tb->min && arg <= tb->max) && !(arg % tb->step)) { arg = (arg / tb->step - 1) * tb->scal; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_E4, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_E4, arg & 0x1); if (err) return err; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_E8, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_E8, (arg & 0x2) >> 1); if (err) return err; @@ -383,11 +389,11 @@ int mtk_pinconf_drive_get(struct mtk_pinctrl *hw, tb = &mtk_drive[desc->drv_n]; - err = mtk_hw_get_value(hw, desc->number, PINCTRL_PIN_REG_E4, &val1); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_E4, &val1); if (err) return err; - err = mtk_hw_get_value(hw, desc->number, PINCTRL_PIN_REG_E8, &val2); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_E8, &val2); if (err) return err; @@ -411,7 +417,7 @@ int mtk_pinconf_drive_set_rev1(struct mtk_pinctrl *hw, if ((arg >= tb->min && arg <= tb->max) && !(arg % tb->step)) { arg = (arg / tb->step - 1) * tb->scal; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_DRV, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_DRV, arg); if (err) return err; @@ -428,7 +434,7 @@ int mtk_pinconf_drive_get_rev1(struct mtk_pinctrl *hw, tb = &mtk_drive[desc->drv_n]; - err = mtk_hw_get_value(hw, desc->number, PINCTRL_PIN_REG_DRV, &val1); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_DRV, &val1); if (err) return err; @@ -448,18 +454,18 @@ int mtk_pinconf_adv_pull_set(struct mtk_pinctrl *hw, * 10K on & 50K (75K) off, when (R0, R1) = (1, 0); * 10K on & 50K (75K) on, when (R0, R1) = (1, 1) */ - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_R0, arg & 1); + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_R0, arg & 1); if (err) return 0; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_R1, + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_R1, !!(arg & 2)); if (err) return 0; arg = pullup ? 0 : 1; - err = mtk_hw_set_value(hw, desc->number, PINCTRL_PIN_REG_PUPD, arg); + err = mtk_hw_set_value(hw, desc, PINCTRL_PIN_REG_PUPD, arg); return err; } @@ -471,7 +477,7 @@ int mtk_pinconf_adv_pull_get(struct mtk_pinctrl *hw, u32 t, t2; int err; - err = mtk_hw_get_value(hw, desc->number, PINCTRL_PIN_REG_PUPD, &t); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_PUPD, &t); if (err) return err; @@ -479,11 +485,11 @@ int mtk_pinconf_adv_pull_get(struct mtk_pinctrl *hw, if (pullup ^ !t) return -EINVAL; - err = mtk_hw_get_value(hw, desc->number, PINCTRL_PIN_REG_R0, &t); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_R0, &t); if (err) return err; - err = mtk_hw_get_value(hw, desc->number, PINCTRL_PIN_REG_R1, &t2); + err = mtk_hw_get_value(hw, desc, PINCTRL_PIN_REG_R1, &t2); if (err) return err; diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h index c97a0af..a9cb7c4 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h @@ -193,8 +193,10 @@ struct mtk_pinctrl { void mtk_rmw(struct mtk_pinctrl *pctl, u32 reg, u32 mask, u32 set); -int mtk_hw_set_value(struct mtk_pinctrl *hw, int pin, int field, int value); -int mtk_hw_get_value(struct mtk_pinctrl *hw, int pin, int field, int *value); +int mtk_hw_set_value(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc, + int field, int value); +int mtk_hw_get_value(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc, + int field, int *value); int mtk_pinconf_bias_disable_set(struct mtk_pinctrl *hw, const struct mtk_pin_desc *desc);