From patchwork Fri Aug 25 03:18:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linhua Xu X-Patchwork-Id: 717029 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 32972C3DA66 for ; Fri, 25 Aug 2023 03:36:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238344AbjHYDff (ORCPT ); Thu, 24 Aug 2023 23:35:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238077AbjHYDf2 (ORCPT ); Thu, 24 Aug 2023 23:35:28 -0400 Received: from SHSQR01.spreadtrum.com (unknown [222.66.158.135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D82CDE54 for ; Thu, 24 Aug 2023 20:35:25 -0700 (PDT) Received: from dlp.unisoc.com ([10.29.3.86]) by SHSQR01.spreadtrum.com with ESMTP id 37P3ZEjs056153; Fri, 25 Aug 2023 11:35:14 +0800 (+08) (envelope-from linhua.xu@unisoc.com) Received: from SHDLP.spreadtrum.com (shmbx04.spreadtrum.com [10.0.1.214]) by dlp.unisoc.com (SkyGuard) with ESMTPS id 4RX5B700T9z2QTWgH; Fri, 25 Aug 2023 11:32:47 +0800 (CST) Received: from xm9614pcu.spreadtrum.com (10.13.2.29) by shmbx04.spreadtrum.com (10.0.1.214) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Fri, 25 Aug 2023 11:35:12 +0800 From: Linhua Xu To: Linus Walleij CC: Orson Zhai , Baolin Wang , Chunyan Zhang , , , Andy Shevchenko , lh xu , Linhua Xu , Xiongpeng Wu Subject: [PATCH 1/6] pinctrl: sprd: Modify the probe function parameters Date: Fri, 25 Aug 2023 11:18:21 +0800 Message-ID: <20230825031826.31599-2-Linhua.xu@unisoc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230825031826.31599-1-Linhua.xu@unisoc.com> References: <20230825031826.31599-1-Linhua.xu@unisoc.com> MIME-Version: 1.0 X-Originating-IP: [10.13.2.29] X-ClientProxiedBy: SHCAS01.spreadtrum.com (10.0.1.201) To shmbx04.spreadtrum.com (10.0.1.214) X-MAIL: SHSQR01.spreadtrum.com 37P3ZEjs056153 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Linhua Xu For UNISOC pin controller, the offset values of the common register and misc register will be different. Thus put these in the probe function parameters. Signed-off-by: Linhua Xu --- drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c | 7 ++++- drivers/pinctrl/sprd/pinctrl-sprd.c | 31 ++++++++++++---------- drivers/pinctrl/sprd/pinctrl-sprd.h | 3 ++- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c b/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c index d14f382f2392..05158c71ad77 100644 --- a/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c +++ b/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c @@ -10,6 +10,9 @@ #include "pinctrl-sprd.h" +#define PINCTRL_REG_OFFSET 0x20 +#define PINCTRL_REG_MISC_OFFSET 0x4020 + enum sprd_sc9860_pins { /* pin global control register 0 */ SC9860_VIO28_0_IRTE = SPRD_PIN_INFO(0, GLOBAL_CTRL_PIN, 11, 1, 0), @@ -926,7 +929,9 @@ static struct sprd_pins_info sprd_sc9860_pins_info[] = { static int sprd_pinctrl_probe(struct platform_device *pdev) { return sprd_pinctrl_core_probe(pdev, sprd_sc9860_pins_info, - ARRAY_SIZE(sprd_sc9860_pins_info)); + ARRAY_SIZE(sprd_sc9860_pins_info), + PINCTRL_REG_OFFSET, + PINCTRL_REG_MISC_OFFSET); } static const struct of_device_id sprd_pinctrl_of_match[] = { diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.c b/drivers/pinctrl/sprd/pinctrl-sprd.c index ca9659f4e4b1..4ee030d723c4 100644 --- a/drivers/pinctrl/sprd/pinctrl-sprd.c +++ b/drivers/pinctrl/sprd/pinctrl-sprd.c @@ -30,8 +30,6 @@ #include "pinctrl-sprd.h" #define PINCTRL_BIT_MASK(width) (~(~0UL << (width))) -#define PINCTRL_REG_OFFSET 0x20 -#define PINCTRL_REG_MISC_OFFSET 0x4020 #define PINCTRL_REG_LEN 0x4 #define PIN_FUNC_MASK (BIT(4) | BIT(5)) @@ -154,6 +152,8 @@ struct sprd_pinctrl { struct pinctrl_dev *pctl; void __iomem *base; struct sprd_pinctrl_soc_info *info; + u32 common_pin_offset; + u32 misc_pin_offset; }; #define SPRD_PIN_CONFIG_CONTROL (PIN_CONFIG_END + 1) @@ -999,7 +999,7 @@ static int sprd_pinctrl_add_pins(struct sprd_pinctrl *sprd_pctl, struct sprd_pinctrl_soc_info *info = sprd_pctl->info; unsigned int ctrl_pin = 0, com_pin = 0; struct sprd_pin *pin; - int i; + unsigned int i; info->npins = pins_cnt; info->pins = devm_kcalloc(sprd_pctl->dev, @@ -1016,19 +1016,19 @@ static int sprd_pinctrl_add_pins(struct sprd_pinctrl *sprd_pctl, pin->number = sprd_soc_pin_info[i].num; reg = sprd_soc_pin_info[i].reg; if (pin->type == GLOBAL_CTRL_PIN) { - pin->reg = (unsigned long)sprd_pctl->base + - PINCTRL_REG_LEN * reg; + pin->reg = (unsigned long)(sprd_pctl->base + + (unsigned long)(PINCTRL_REG_LEN * reg)); pin->bit_offset = sprd_soc_pin_info[i].bit_offset; pin->bit_width = sprd_soc_pin_info[i].bit_width; ctrl_pin++; } else if (pin->type == COMMON_PIN) { pin->reg = (unsigned long)sprd_pctl->base + - PINCTRL_REG_OFFSET + PINCTRL_REG_LEN * + sprd_pctl->common_pin_offset + PINCTRL_REG_LEN * (i - ctrl_pin); com_pin++; } else if (pin->type == MISC_PIN) { pin->reg = (unsigned long)sprd_pctl->base + - PINCTRL_REG_MISC_OFFSET + PINCTRL_REG_LEN * + sprd_pctl->misc_pin_offset + PINCTRL_REG_LEN * (i - ctrl_pin - com_pin); } } @@ -1045,7 +1045,9 @@ static int sprd_pinctrl_add_pins(struct sprd_pinctrl *sprd_pctl, int sprd_pinctrl_core_probe(struct platform_device *pdev, struct sprd_pins_info *sprd_soc_pin_info, - int pins_cnt) + int pins_cnt, + u32 common_pin_offset, + u32 misc_pin_offset) { struct sprd_pinctrl *sprd_pctl; struct sprd_pinctrl_soc_info *pinctrl_info; @@ -1069,6 +1071,8 @@ int sprd_pinctrl_core_probe(struct platform_device *pdev, sprd_pctl->info = pinctrl_info; sprd_pctl->dev = &pdev->dev; + sprd_pctl->common_pin_offset = common_pin_offset; + sprd_pctl->misc_pin_offset = misc_pin_offset; platform_set_drvdata(pdev, sprd_pctl); ret = sprd_pinctrl_add_pins(sprd_pctl, sprd_soc_pin_info, pins_cnt); @@ -1077,12 +1081,6 @@ int sprd_pinctrl_core_probe(struct platform_device *pdev, return ret; } - ret = sprd_pinctrl_parse_dt(sprd_pctl); - if (ret) { - dev_err(&pdev->dev, "fail to parse dt properties\n"); - return ret; - } - pin_desc = devm_kcalloc(&pdev->dev, pinctrl_info->npins, sizeof(struct pinctrl_pin_desc), @@ -1100,6 +1098,11 @@ int sprd_pinctrl_core_probe(struct platform_device *pdev, sprd_pinctrl_desc.name = dev_name(&pdev->dev); sprd_pinctrl_desc.npins = pinctrl_info->npins; + ret = sprd_pinctrl_parse_dt(sprd_pctl); + if (ret) { + dev_err(&pdev->dev, "fail to parse dt properties\n"); + return ret; + } sprd_pctl->pctl = pinctrl_register(&sprd_pinctrl_desc, &pdev->dev, (void *)sprd_pctl); if (IS_ERR(sprd_pctl->pctl)) { diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.h b/drivers/pinctrl/sprd/pinctrl-sprd.h index 69544a3cd635..a696f81ce663 100644 --- a/drivers/pinctrl/sprd/pinctrl-sprd.h +++ b/drivers/pinctrl/sprd/pinctrl-sprd.h @@ -52,7 +52,8 @@ struct sprd_pins_info { int sprd_pinctrl_core_probe(struct platform_device *pdev, struct sprd_pins_info *sprd_soc_pin_info, - int pins_cnt); + int pins_cnt, u32 common_pin_offset, + u32 misc_pin_offset); int sprd_pinctrl_remove(struct platform_device *pdev); void sprd_pinctrl_shutdown(struct platform_device *pdev);