From nobody Thu Dec 18 11:10:04 2025 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 676C1C04FDF for ; Mon, 14 Aug 2023 06:04:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233488AbjHNGET (ORCPT ); Mon, 14 Aug 2023 02:04:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233197AbjHNGEG (ORCPT ); Mon, 14 Aug 2023 02:04:06 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4653129; Sun, 13 Aug 2023 23:04:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691993045; x=1723529045; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=zMDA+didh0MVfZqHCFkYIlUXtN0gsB/nuvcifkiqleI=; b=gPiLoIRTnhVEFIyyy26o4enRWplUVyJqrqJaUJfS31HOjISVIv4WsIdS 9+8DjRtWr8DSE3vdqJDXurFNfm2nW8xxwIrwU9t6GPuBc06h8WT11wYB7 Xm4SFCwLUHw0J/x6SVnXDkjvXa56skQ+VL1FddE8egwER/7ugL8k44qSG nJLkNMNbBJFj8rMhrtWNjAse8H7udac4aWsYvfWtzypRtpbxnA3/KqpQ1 NKy9K5URmJN+liuZ9b7asTqR7FAIxeO0sVOm2seG/ttsn28ZjR9mlzqQw BUI5gt6kW+5m1iOzKvEZgEtCIUg8qa0BrR83THpFKkuA6wx23GmS2mM1M w==; X-IronPort-AV: E=McAfee;i="6600,9927,10801"; a="371970750" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="371970750" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2023 23:04:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10801"; a="798702908" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="798702908" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga008.fm.intel.com with ESMTP; 13 Aug 2023 23:04:03 -0700 From: Raag Jadav To: linus.walleij@linaro.org, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, pandith.n@intel.com, Raag Jadav Subject: [PATCH v1 1/4] pinctrl: intel: export common pinctrl functions Date: Mon, 14 Aug 2023 11:33:08 +0530 Message-Id: <20230814060311.15945-2-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230814060311.15945-1-raag.jadav@intel.com> References: <20230814060311.15945-1-raag.jadav@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Export common pinctrl functions that are used across Intel specific platform drivers, so that they can be reused. Signed-off-by: Raag Jadav Acked-by: Mika Westerberg --- drivers/pinctrl/intel/pinctrl-intel.c | 30 ++++++++++++++------------- drivers/pinctrl/intel/pinctrl-intel.h | 12 +++++++++++ 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/= pinctrl-intel.c index 64c3e62b4348..4e019c2cb27a 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -107,8 +107,7 @@ struct intel_community_context { #define pin_to_padno(c, p) ((p) - (c)->pin_base) #define padgroup_offset(g, p) ((p) - (g)->base) =20 -static struct intel_community *intel_get_community(struct intel_pinctrl *p= ctrl, - unsigned int pin) +struct intel_community *intel_get_community(struct intel_pinctrl *pctrl, u= nsigned int pin) { struct intel_community *community; int i; @@ -123,6 +122,7 @@ static struct intel_community *intel_get_community(stru= ct intel_pinctrl *pctrl, dev_warn(pctrl->dev, "failed to find community for pin %u\n", pin); return NULL; } +EXPORT_SYMBOL_NS_GPL(intel_get_community, PINCTRL_INTEL); =20 static const struct intel_padgroup * intel_community_get_padgroup(const struct intel_community *community, @@ -276,23 +276,24 @@ static bool intel_pad_usable(struct intel_pinctrl *pc= trl, unsigned int pin) return intel_pad_owned_by_host(pctrl, pin) && intel_pad_is_unlocked(pctrl= , pin); } =20 -static int intel_get_groups_count(struct pinctrl_dev *pctldev) +int intel_get_groups_count(struct pinctrl_dev *pctldev) { struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); =20 return pctrl->soc->ngroups; } +EXPORT_SYMBOL_NS_GPL(intel_get_groups_count, PINCTRL_INTEL); =20 -static const char *intel_get_group_name(struct pinctrl_dev *pctldev, - unsigned int group) +const char *intel_get_group_name(struct pinctrl_dev *pctldev, unsigned int= group) { struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); =20 return pctrl->soc->groups[group].grp.name; } +EXPORT_SYMBOL_NS_GPL(intel_get_group_name, PINCTRL_INTEL); =20 -static int intel_get_group_pins(struct pinctrl_dev *pctldev, unsigned int = group, - const unsigned int **pins, unsigned int *npins) +int intel_get_group_pins(struct pinctrl_dev *pctldev, unsigned int group, + const unsigned int **pins, unsigned int *npins) { struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); =20 @@ -300,6 +301,7 @@ static int intel_get_group_pins(struct pinctrl_dev *pct= ldev, unsigned int group, *npins =3D pctrl->soc->groups[group].grp.npins; return 0; } +EXPORT_SYMBOL_NS_GPL(intel_get_group_pins, PINCTRL_INTEL); =20 static void intel_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_fil= e *s, unsigned int pin) @@ -359,25 +361,24 @@ static const struct pinctrl_ops intel_pinctrl_ops =3D= { .pin_dbg_show =3D intel_pin_dbg_show, }; =20 -static int intel_get_functions_count(struct pinctrl_dev *pctldev) +int intel_get_functions_count(struct pinctrl_dev *pctldev) { struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); =20 return pctrl->soc->nfunctions; } +EXPORT_SYMBOL_NS_GPL(intel_get_functions_count, PINCTRL_INTEL); =20 -static const char *intel_get_function_name(struct pinctrl_dev *pctldev, - unsigned int function) +const char *intel_get_function_name(struct pinctrl_dev *pctldev, unsigned = int function) { struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); =20 return pctrl->soc->functions[function].func.name; } +EXPORT_SYMBOL_NS_GPL(intel_get_function_name, PINCTRL_INTEL); =20 -static int intel_get_function_groups(struct pinctrl_dev *pctldev, - unsigned int function, - const char * const **groups, - unsigned int * const ngroups) +int intel_get_function_groups(struct pinctrl_dev *pctldev, unsigned int fu= nction, + const char * const **groups, unsigned int * const ngroups) { struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); =20 @@ -385,6 +386,7 @@ static int intel_get_function_groups(struct pinctrl_dev= *pctldev, *ngroups =3D pctrl->soc->functions[function].func.ngroups; return 0; } +EXPORT_SYMBOL_NS_GPL(intel_get_function_groups, PINCTRL_INTEL); =20 static int intel_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function, unsigned int group) diff --git a/drivers/pinctrl/intel/pinctrl-intel.h b/drivers/pinctrl/intel/= pinctrl-intel.h index 1faf2ada480a..cee512f97b56 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.h +++ b/drivers/pinctrl/intel/pinctrl-intel.h @@ -266,4 +266,16 @@ const struct dev_pm_ops _name =3D { \ intel_pinctrl_resume_noirq) \ } =20 +struct intel_community *intel_get_community(struct intel_pinctrl *pctrl, u= nsigned int pin); + +int intel_get_groups_count(struct pinctrl_dev *pctldev); +const char *intel_get_group_name(struct pinctrl_dev *pctldev, unsigned int= group); +int intel_get_group_pins(struct pinctrl_dev *pctldev, unsigned int group, + const unsigned int **pins, unsigned int *npins); + +int intel_get_functions_count(struct pinctrl_dev *pctldev); +const char *intel_get_function_name(struct pinctrl_dev *pctldev, unsigned = int function); +int intel_get_function_groups(struct pinctrl_dev *pctldev, unsigned int fu= nction, + const char * const **groups, unsigned int * const ngroups); + #endif /* PINCTRL_INTEL_H */ --=20 2.17.1 From nobody Thu Dec 18 11:10:04 2025 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 7A2C2C04FE2 for ; Mon, 14 Aug 2023 06:04:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233514AbjHNGEV (ORCPT ); Mon, 14 Aug 2023 02:04:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233294AbjHNGEK (ORCPT ); Mon, 14 Aug 2023 02:04:10 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E678E129; Sun, 13 Aug 2023 23:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691993049; x=1723529049; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=WcdGtChIm1EcfRxknsGqjMYwaa75wWP0SVoFIOs0nSI=; b=k4SiMj6lkVCqQoowyNLmbVjWTuN2TO2DmWY6CUETYfJDERqMsqKYnsJm aw6AXg1ng5W0f5ts6dIHWjWdW9eN1LNsZW8t7mzAck2qgumJ/wbgR1Jy8 OjAFpbSF6YbQXQvdIHx6r+nOlDxbAtzRztK30B83c2H8R4dpXYYESjKS6 YqiKxhBF4ctjSk9yL2VbmPqWrpapRYS9Xo25PMwqsVemovuYNBPT0BvEg eSYsKTD5zJkwdIDCK5B7kWjn+G+3Hqx2wRt/HQMGQadIKsVmHZkLtwbUU TMfi7Jb0xwUYZEpVhZiSN0yWIvDHlDC5p0uhuPXxRO+KHxI6rCqmDFd2F Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10801"; a="371970755" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="371970755" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2023 23:04:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10801"; a="798702943" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="798702943" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga008.fm.intel.com with ESMTP; 13 Aug 2023 23:04:05 -0700 From: Raag Jadav To: linus.walleij@linaro.org, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, pandith.n@intel.com, Raag Jadav Subject: [PATCH v1 2/4] pinctrl: baytrail: reuse common functions from pinctrl-intel Date: Mon, 14 Aug 2023 11:33:09 +0530 Message-Id: <20230814060311.15945-3-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230814060311.15945-1-raag.jadav@intel.com> References: <20230814060311.15945-1-raag.jadav@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Reuse common functions from pinctrl-intel driver. Signed-off-by: Raag Jadav Acked-by: Mika Westerberg --- drivers/pinctrl/intel/pinctrl-baytrail.c | 90 +++--------------------- 1 file changed, 11 insertions(+), 79 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/int= el/pinctrl-baytrail.c index 02ab5fd7cbd5..85f1aea2ca89 100644 --- a/drivers/pinctrl/intel/pinctrl-baytrail.c +++ b/drivers/pinctrl/intel/pinctrl-baytrail.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -551,25 +552,10 @@ static const struct intel_pinctrl_soc_data *byt_soc_d= ata[] =3D { =20 static DEFINE_RAW_SPINLOCK(byt_lock); =20 -static struct intel_community *byt_get_community(struct intel_pinctrl *vg, - unsigned int pin) -{ - struct intel_community *comm; - int i; - - for (i =3D 0; i < vg->ncommunities; i++) { - comm =3D vg->communities + i; - if (pin < comm->pin_base + comm->npins && pin >=3D comm->pin_base) - return comm; - } - - return NULL; -} - static void __iomem *byt_gpio_reg(struct intel_pinctrl *vg, unsigned int o= ffset, int reg) { - struct intel_community *comm =3D byt_get_community(vg, offset); + struct intel_community *comm =3D intel_get_community(vg, offset); u32 reg_offset; =20 if (!comm) @@ -591,68 +577,12 @@ static void __iomem *byt_gpio_reg(struct intel_pinctr= l *vg, unsigned int offset, return comm->pad_regs + reg_offset + reg; } =20 -static int byt_get_groups_count(struct pinctrl_dev *pctldev) -{ - struct intel_pinctrl *vg =3D pinctrl_dev_get_drvdata(pctldev); - - return vg->soc->ngroups; -} - -static const char *byt_get_group_name(struct pinctrl_dev *pctldev, - unsigned int selector) -{ - struct intel_pinctrl *vg =3D pinctrl_dev_get_drvdata(pctldev); - - return vg->soc->groups[selector].grp.name; -} - -static int byt_get_group_pins(struct pinctrl_dev *pctldev, - unsigned int selector, - const unsigned int **pins, - unsigned int *num_pins) -{ - struct intel_pinctrl *vg =3D pinctrl_dev_get_drvdata(pctldev); - - *pins =3D vg->soc->groups[selector].grp.pins; - *num_pins =3D vg->soc->groups[selector].grp.npins; - - return 0; -} - static const struct pinctrl_ops byt_pinctrl_ops =3D { - .get_groups_count =3D byt_get_groups_count, - .get_group_name =3D byt_get_group_name, - .get_group_pins =3D byt_get_group_pins, + .get_groups_count =3D intel_get_groups_count, + .get_group_name =3D intel_get_group_name, + .get_group_pins =3D intel_get_group_pins, }; =20 -static int byt_get_functions_count(struct pinctrl_dev *pctldev) -{ - struct intel_pinctrl *vg =3D pinctrl_dev_get_drvdata(pctldev); - - return vg->soc->nfunctions; -} - -static const char *byt_get_function_name(struct pinctrl_dev *pctldev, - unsigned int selector) -{ - struct intel_pinctrl *vg =3D pinctrl_dev_get_drvdata(pctldev); - - return vg->soc->functions[selector].func.name; -} - -static int byt_get_function_groups(struct pinctrl_dev *pctldev, - unsigned int selector, - const char * const **groups, - unsigned int *ngroups) -{ - struct intel_pinctrl *vg =3D pinctrl_dev_get_drvdata(pctldev); - - *groups =3D vg->soc->functions[selector].func.groups; - *ngroups =3D vg->soc->functions[selector].func.ngroups; - - return 0; -} - static void byt_set_group_simple_mux(struct intel_pinctrl *vg, const struct intel_pingroup group, unsigned int func) @@ -851,9 +781,9 @@ static int byt_gpio_set_direction(struct pinctrl_dev *p= ctl_dev, } =20 static const struct pinmux_ops byt_pinmux_ops =3D { - .get_functions_count =3D byt_get_functions_count, - .get_function_name =3D byt_get_function_name, - .get_function_groups =3D byt_get_function_groups, + .get_functions_count =3D intel_get_functions_count, + .get_function_name =3D intel_get_function_name, + .get_function_groups =3D intel_get_function_groups, .set_mux =3D byt_set_mux, .gpio_request_enable =3D byt_gpio_request_enable, .gpio_disable_free =3D byt_gpio_disable_free, @@ -1261,7 +1191,7 @@ static void byt_gpio_dbg_show(struct seq_file *s, str= uct gpio_chip *chip) val =3D readl(val_reg); raw_spin_unlock_irqrestore(&byt_lock, flags); =20 - comm =3D byt_get_community(vg, pin); + comm =3D intel_get_community(vg, pin); if (!comm) { seq_printf(s, "Pin %i: can't retrieve community\n", pin); continue; @@ -1848,3 +1778,5 @@ static int __init byt_gpio_init(void) return platform_driver_register(&byt_gpio_driver); } subsys_initcall(byt_gpio_init); + +MODULE_IMPORT_NS(PINCTRL_INTEL); --=20 2.17.1 From nobody Thu Dec 18 11:10:04 2025 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 8A768C04FE1 for ; Mon, 14 Aug 2023 06:04:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233526AbjHNGEX (ORCPT ); Mon, 14 Aug 2023 02:04:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233338AbjHNGEM (ORCPT ); Mon, 14 Aug 2023 02:04:12 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A49D129; Sun, 13 Aug 2023 23:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691993051; x=1723529051; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=dNS6n8ZSNCyYDSi15UaC1jDhjYzXiYjvjoZeqmbL/X8=; b=fBFmYCTxEIzhDRH8P2SyvNkiIGPTX2PzCr9xI1OVUk0PIi7O+fDq05u4 EB2BKWWT5IBz+pYQcaogoHqGiC8zB/LZVD6WVImYnCakpZPPr28TW9uCp hIHSR+Yyd0kqGp8g4XUgGEM0lvFLn4S7BO+z7YSzRTr+5Zp0sm/42EqY1 Yd3fMPQYlhLB7UAhWUkguFoKZ/gqoYDgAiPwjXjgVx78REH6zhuyxFM+T fgStJ4aMTgmdApdlkGR8FSB9FLqOXjjynHi0fdy+0/ih8NVXSa0haXTIz ufpMYWJYVo+sQgW7tkSJF1QpBJgAdwgQRRfBT15ned19q9le4bCdqHGpu A==; X-IronPort-AV: E=McAfee;i="6600,9927,10801"; a="371970761" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="371970761" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2023 23:04:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10801"; a="798702966" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="798702966" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga008.fm.intel.com with ESMTP; 13 Aug 2023 23:04:08 -0700 From: Raag Jadav To: linus.walleij@linaro.org, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, pandith.n@intel.com, Raag Jadav Subject: [PATCH v1 3/4] pinctrl: cherryview: reuse common functions from pinctrl-intel Date: Mon, 14 Aug 2023 11:33:10 +0530 Message-Id: <20230814060311.15945-4-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230814060311.15945-1-raag.jadav@intel.com> References: <20230814060311.15945-1-raag.jadav@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Reuse common functions from pinctrl-intel driver. Signed-off-by: Raag Jadav Acked-by: Mika Westerberg --- drivers/pinctrl/intel/pinctrl-cherryview.c | 69 +++------------------- 1 file changed, 9 insertions(+), 60 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/i= ntel/pinctrl-cherryview.c index eee0f9bc3d32..7bde3316addf 100644 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c @@ -617,31 +617,6 @@ static bool chv_pad_locked(struct intel_pinctrl *pctrl= , unsigned int offset) return chv_readl(pctrl, offset, CHV_PADCTRL1) & CHV_PADCTRL1_CFGLOCK; } =20 -static int chv_get_groups_count(struct pinctrl_dev *pctldev) -{ - struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); - - return pctrl->soc->ngroups; -} - -static const char *chv_get_group_name(struct pinctrl_dev *pctldev, - unsigned int group) -{ - struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); - - return pctrl->soc->groups[group].grp.name; -} - -static int chv_get_group_pins(struct pinctrl_dev *pctldev, unsigned int gr= oup, - const unsigned int **pins, unsigned int *npins) -{ - struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); - - *pins =3D pctrl->soc->groups[group].grp.pins; - *npins =3D pctrl->soc->groups[group].grp.npins; - return 0; -} - static void chv_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file = *s, unsigned int offset) { @@ -676,39 +651,12 @@ static void chv_pin_dbg_show(struct pinctrl_dev *pctl= dev, struct seq_file *s, } =20 static const struct pinctrl_ops chv_pinctrl_ops =3D { - .get_groups_count =3D chv_get_groups_count, - .get_group_name =3D chv_get_group_name, - .get_group_pins =3D chv_get_group_pins, + .get_groups_count =3D intel_get_groups_count, + .get_group_name =3D intel_get_group_name, + .get_group_pins =3D intel_get_group_pins, .pin_dbg_show =3D chv_pin_dbg_show, }; =20 -static int chv_get_functions_count(struct pinctrl_dev *pctldev) -{ - struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); - - return pctrl->soc->nfunctions; -} - -static const char *chv_get_function_name(struct pinctrl_dev *pctldev, - unsigned int function) -{ - struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); - - return pctrl->soc->functions[function].func.name; -} - -static int chv_get_function_groups(struct pinctrl_dev *pctldev, - unsigned int function, - const char * const **groups, - unsigned int * const ngroups) -{ - struct intel_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev); - - *groups =3D pctrl->soc->functions[function].func.groups; - *ngroups =3D pctrl->soc->functions[function].func.ngroups; - return 0; -} - static int chv_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function, unsigned int group) { @@ -884,9 +832,9 @@ static int chv_gpio_set_direction(struct pinctrl_dev *p= ctldev, } =20 static const struct pinmux_ops chv_pinmux_ops =3D { - .get_functions_count =3D chv_get_functions_count, - .get_function_name =3D chv_get_function_name, - .get_function_groups =3D chv_get_function_groups, + .get_functions_count =3D intel_get_functions_count, + .get_function_name =3D intel_get_function_name, + .get_function_groups =3D intel_get_function_groups, .set_mux =3D chv_pinmux_set_mux, .gpio_request_enable =3D chv_gpio_request_enable, .gpio_disable_free =3D chv_gpio_disable_free, @@ -1118,7 +1066,7 @@ static int chv_config_group_get(struct pinctrl_dev *p= ctldev, unsigned int npins; int ret; =20 - ret =3D chv_get_group_pins(pctldev, group, &pins, &npins); + ret =3D intel_get_group_pins(pctldev, group, &pins, &npins); if (ret) return ret; =20 @@ -1137,7 +1085,7 @@ static int chv_config_group_set(struct pinctrl_dev *p= ctldev, unsigned int npins; int i, ret; =20 - ret =3D chv_get_group_pins(pctldev, group, &pins, &npins); + ret =3D intel_get_group_pins(pctldev, group, &pins, &npins); if (ret) return ret; =20 @@ -1915,3 +1863,4 @@ module_exit(chv_pinctrl_exit); MODULE_AUTHOR("Mika Westerberg "); MODULE_DESCRIPTION("Intel Cherryview/Braswell pinctrl driver"); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(PINCTRL_INTEL); --=20 2.17.1 From nobody Thu Dec 18 11:10:04 2025 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 9AA2EC0729B for ; Mon, 14 Aug 2023 06:04:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233536AbjHNGEY (ORCPT ); Mon, 14 Aug 2023 02:04:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233343AbjHNGEO (ORCPT ); Mon, 14 Aug 2023 02:04:14 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF851129; Sun, 13 Aug 2023 23:04:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691993053; x=1723529053; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=BPpmaoshcMt6goKsPUPVpZaxcfTUVVBLgBqsePBBad0=; b=je8x6t67Y7ZBiwxk70ZgHjUC83FhQKqo7jfSGuOm6ThXy8+FxB99JkU4 GRfBtRKjR1t10o9pxHlrJ+/tVP9B5Wnie81Em0lgfHg7L2KFE/3arP+mF R25wnCa8ug19KAN+ZdnMF1jcTrzMeAgWOLMF66rCWnjn4pQFW7EZ2wHKS Fgo7e1C3aqKXEonMqnWdPKQ3AtHbAMKnXZk7qD5Q8Rh/ASof7Wq0RMKZR kiryM+19UzWvQTjjqzWmRMBL+qfhZIdbXEActQEqxlgHAG9ZNkYOMJdjE CaJaxyMbRxy2BPwKMPpzkWy7EwjNQz5JOEihTyrVoukC6kANsunjGKJ8I g==; X-IronPort-AV: E=McAfee;i="6600,9927,10801"; a="371970764" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="371970764" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2023 23:04:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10801"; a="798702983" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="798702983" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga008.fm.intel.com with ESMTP; 13 Aug 2023 23:04:11 -0700 From: Raag Jadav To: linus.walleij@linaro.org, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, pandith.n@intel.com, Raag Jadav Subject: [PATCH v1 4/4] pinctrl: lynxpoint: reuse common functions from pinctrl-intel Date: Mon, 14 Aug 2023 11:33:11 +0530 Message-Id: <20230814060311.15945-5-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230814060311.15945-1-raag.jadav@intel.com> References: <20230814060311.15945-1-raag.jadav@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Reuse common functions from pinctrl-intel driver. While at it, select pinctrl-intel for Intel Lynxpoint driver. Signed-off-by: Raag Jadav Acked-by: Mika Westerberg --- drivers/pinctrl/intel/Kconfig | 6 +- drivers/pinctrl/intel/pinctrl-lynxpoint.c | 86 +++-------------------- 2 files changed, 9 insertions(+), 83 deletions(-) diff --git a/drivers/pinctrl/intel/Kconfig b/drivers/pinctrl/intel/Kconfig index eaa45ebfd1c1..f42a83e29b8b 100644 --- a/drivers/pinctrl/intel/Kconfig +++ b/drivers/pinctrl/intel/Kconfig @@ -26,11 +26,7 @@ config PINCTRL_CHERRYVIEW config PINCTRL_LYNXPOINT tristate "Intel Lynxpoint pinctrl and GPIO driver" depends on ACPI - select PINMUX - select PINCONF - select GENERIC_PINCONF - select GPIOLIB - select GPIOLIB_IRQCHIP + select PINCTRL_INTEL help Lynxpoint is the PCH of Intel Haswell. This pinctrl driver provides an interface that allows configuring of PCH pins and diff --git a/drivers/pinctrl/intel/pinctrl-lynxpoint.c b/drivers/pinctrl/in= tel/pinctrl-lynxpoint.c index cdace55aaeac..780c9ab79d85 100644 --- a/drivers/pinctrl/intel/pinctrl-lynxpoint.c +++ b/drivers/pinctrl/intel/pinctrl-lynxpoint.c @@ -206,21 +206,6 @@ static const struct intel_pinctrl_soc_data lptlp_soc_d= ata =3D { * IOxAPIC redirection map applies only for gpio 8-10, 13-14, 45-55. */ =20 -static struct intel_community *lp_get_community(struct intel_pinctrl *lg, - unsigned int pin) -{ - struct intel_community *comm; - int i; - - for (i =3D 0; i < lg->ncommunities; i++) { - comm =3D &lg->communities[i]; - if (pin < comm->pin_base + comm->npins && pin >=3D comm->pin_base) - return comm; - } - - return NULL; -} - static void __iomem *lp_gpio_reg(struct gpio_chip *chip, unsigned int offs= et, int reg) { @@ -228,7 +213,7 @@ static void __iomem *lp_gpio_reg(struct gpio_chip *chip= , unsigned int offset, struct intel_community *comm; int reg_offset; =20 - comm =3D lp_get_community(lg, offset); + comm =3D intel_get_community(lg, offset); if (!comm) return NULL; =20 @@ -272,34 +257,6 @@ static bool lp_gpio_ioxapic_use(struct gpio_chip *chip= , unsigned int offset) return false; } =20 -static int lp_get_groups_count(struct pinctrl_dev *pctldev) -{ - struct intel_pinctrl *lg =3D pinctrl_dev_get_drvdata(pctldev); - - return lg->soc->ngroups; -} - -static const char *lp_get_group_name(struct pinctrl_dev *pctldev, - unsigned int selector) -{ - struct intel_pinctrl *lg =3D pinctrl_dev_get_drvdata(pctldev); - - return lg->soc->groups[selector].grp.name; -} - -static int lp_get_group_pins(struct pinctrl_dev *pctldev, - unsigned int selector, - const unsigned int **pins, - unsigned int *num_pins) -{ - struct intel_pinctrl *lg =3D pinctrl_dev_get_drvdata(pctldev); - - *pins =3D lg->soc->groups[selector].grp.pins; - *num_pins =3D lg->soc->groups[selector].grp.npins; - - return 0; -} - static void lp_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *= s, unsigned int pin) { @@ -323,40 +280,12 @@ static void lp_pin_dbg_show(struct pinctrl_dev *pctld= ev, struct seq_file *s, } =20 static const struct pinctrl_ops lptlp_pinctrl_ops =3D { - .get_groups_count =3D lp_get_groups_count, - .get_group_name =3D lp_get_group_name, - .get_group_pins =3D lp_get_group_pins, + .get_groups_count =3D intel_get_groups_count, + .get_group_name =3D intel_get_group_name, + .get_group_pins =3D intel_get_group_pins, .pin_dbg_show =3D lp_pin_dbg_show, }; =20 -static int lp_get_functions_count(struct pinctrl_dev *pctldev) -{ - struct intel_pinctrl *lg =3D pinctrl_dev_get_drvdata(pctldev); - - return lg->soc->nfunctions; -} - -static const char *lp_get_function_name(struct pinctrl_dev *pctldev, - unsigned int selector) -{ - struct intel_pinctrl *lg =3D pinctrl_dev_get_drvdata(pctldev); - - return lg->soc->functions[selector].func.name; -} - -static int lp_get_function_groups(struct pinctrl_dev *pctldev, - unsigned int selector, - const char * const **groups, - unsigned int *ngroups) -{ - struct intel_pinctrl *lg =3D pinctrl_dev_get_drvdata(pctldev); - - *groups =3D lg->soc->functions[selector].func.groups; - *ngroups =3D lg->soc->functions[selector].func.ngroups; - - return 0; -} - static int lp_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function, unsigned int group) { @@ -481,9 +410,9 @@ static int lp_gpio_set_direction(struct pinctrl_dev *pc= tldev, } =20 static const struct pinmux_ops lptlp_pinmux_ops =3D { - .get_functions_count =3D lp_get_functions_count, - .get_function_name =3D lp_get_function_name, - .get_function_groups =3D lp_get_function_groups, + .get_functions_count =3D intel_get_functions_count, + .get_function_name =3D intel_get_function_name, + .get_function_groups =3D intel_get_function_groups, .set_mux =3D lp_pinmux_set_mux, .gpio_request_enable =3D lp_gpio_request_enable, .gpio_disable_free =3D lp_gpio_disable_free, @@ -987,3 +916,4 @@ MODULE_AUTHOR("Andy Shevchenko (Intel)"); MODULE_DESCRIPTION("Intel Lynxpoint pinctrl driver"); MODULE_LICENSE("GPL v2"); MODULE_ALIAS("platform:lp_gpio"); +MODULE_IMPORT_NS(PINCTRL_INTEL); --=20 2.17.1