From: Hao Chang <ot_chhao.chang@mediatek.com>
To: Sean Wang <sean.wang@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>
Cc: Wenbin Mei <wenbin.mei@mediatek.com>,
Axe Yang <axe.yang@mediatek.com>,
Qingliang Li <qingliang.li@mediatek.com>,
<linux-mediatek@lists.infradead.org>,
<linux-gpio@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Hao Chang <ot_chhao.chang@mediatek.com>
Subject: [PATCH v2 2/3] pinctrl: mediatek: update EINT base retrieval method
Date: Wed, 22 Jan 2025 21:51:24 +0800 [thread overview]
Message-ID: <20250122135135.15234-3-ot_chhao.chang@mediatek.com> (raw)
In-Reply-To: <20250122135135.15234-1-ot_chhao.chang@mediatek.com>
Change the method of obtaining the EINT base from a single value to
multiple values.
Modify the EINT base and add nbase for counting.
Signed-off-by: Hao Chang <ot_chhao.chang@mediatek.com>
Signed-off-by: Qingliang Li <qingliang.li@mediatek.com>
---
drivers/pinctrl/mediatek/mtk-eint.h | 4 +-
.../pinctrl/mediatek/pinctrl-mtk-common-v2.c | 45 ++++++++++---------
2 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/drivers/pinctrl/mediatek/mtk-eint.h b/drivers/pinctrl/mediatek/mtk-eint.h
index 44360d97a34a..c1efdf02fb49 100644
--- a/drivers/pinctrl/mediatek/mtk-eint.h
+++ b/drivers/pinctrl/mediatek/mtk-eint.h
@@ -64,7 +64,9 @@ struct mtk_eint_xt {
struct mtk_eint {
struct device *dev;
- void __iomem *base;
+ void __iomem **base;
+ u8 nbase;
+ u16 *base_pin_num;
struct irq_domain *domain;
int irq;
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
index 00e95682b9f8..6411c10cb637 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
@@ -13,6 +13,7 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/module.h>
+#include <linux/of_address.h>
#include <linux/of_irq.h>
#include "mtk-eint.h"
@@ -367,34 +368,43 @@ static const struct mtk_eint_xt mtk_eint_xt = {
int mtk_build_eint(struct mtk_pinctrl *hw, struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
- int ret;
+ unsigned int i, j, count_reg_names;
if (!IS_ENABLED(CONFIG_EINT_MTK))
return 0;
- if (!of_property_read_bool(np, "interrupt-controller"))
+ if (!hw->soc->eint_hw)
return -ENODEV;
- hw->eint = devm_kzalloc(hw->dev, sizeof(*hw->eint), GFP_KERNEL);
+ count_reg_names = of_property_count_strings(np, "reg-names");
+ if (count_reg_names < 0 || count_reg_names < hw->soc->nbase_names)
+ return -EINVAL;
+
+ hw->eint = devm_kmalloc(hw->dev, sizeof(*hw->eint), GFP_KERNEL);
if (!hw->eint)
return -ENOMEM;
- hw->eint->base = devm_platform_ioremap_resource_byname(pdev, "eint");
- if (IS_ERR(hw->eint->base)) {
- ret = PTR_ERR(hw->eint->base);
- goto err_free_eint;
+ hw->eint->nbase = count_reg_names - hw->soc->nbase_names;
+ hw->eint->base = devm_kmalloc_array(&pdev->dev, hw->eint->nbase,
+ sizeof(*hw->eint->base), GFP_KERNEL);
+ if (!hw->eint->base)
+ return -ENOMEM;
+
+ for (i = hw->soc->nbase_names, j = 0; i < count_reg_names; i++, j++) {
+ hw->eint->base[j] = of_iomap(np, i);
+ if (IS_ERR(hw->eint->base[j]))
+ return PTR_ERR(hw->eint->base[j]);
}
+ if (!of_property_read_bool(np, "interrupt-controller"))
+ return -ENODEV;
+
hw->eint->irq = irq_of_parse_and_map(np, 0);
- if (!hw->eint->irq) {
- ret = -EINVAL;
- goto err_free_eint;
- }
+ if (!hw->eint->irq)
+ return -EINVAL;
- if (!hw->soc->eint_hw) {
- ret = -ENODEV;
- goto err_free_eint;
- }
+ if (hw->soc->eint_pin)
+ hw->eint->pins = hw->soc->eint_pin;
hw->eint->dev = &pdev->dev;
hw->eint->hw = hw->soc->eint_hw;
@@ -402,11 +412,6 @@ int mtk_build_eint(struct mtk_pinctrl *hw, struct platform_device *pdev)
hw->eint->gpio_xlate = &mtk_eint_xt;
return mtk_eint_do_init(hw->eint);
-
-err_free_eint:
- devm_kfree(hw->dev, hw->eint);
- hw->eint = NULL;
- return ret;
}
EXPORT_SYMBOL_GPL(mtk_build_eint);
--
2.34.1
next prev parent reply other threads:[~2025-01-22 13:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-22 13:51 [PATCH v2 0/3] pinctrl: mediatek: add support for multi-instance EINT Hao Chang
2025-01-22 13:51 ` [PATCH v2 1/3] " Hao Chang
2025-01-22 13:51 ` Hao Chang [this message]
2025-01-22 13:51 ` [PATCH v2 3/3] pinctrl: mediatek: adapt to multi-base design Hao Chang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250122135135.15234-3-ot_chhao.chang@mediatek.com \
--to=ot_chhao.chang@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=axe.yang@mediatek.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=qingliang.li@mediatek.com \
--cc=sean.wang@kernel.org \
--cc=wenbin.mei@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®