From: Ye Zhang <ye.zhang@rock-chips.com>
To: Ye Zhang <ye.zhang@rock-chips.com>,
Linus Walleij <linus.walleij@linaro.org>,
Heiko Stuebner <heiko@sntech.de>
Cc: Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
linux-gpio@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
tao.huang@rock-chips.com
Subject: [PATCH v1 3/3] pinctrl: rockchip: add rk3506 rmio support
Date: Tue, 4 Nov 2025 10:12:23 +0800 [thread overview]
Message-ID: <20251104021223.2375116-4-ye.zhang@rock-chips.com> (raw)
In-Reply-To: <20251104021223.2375116-1-ye.zhang@rock-chips.com>
Support rockchip matrix io
Signed-off-by: Ye Zhang <ye.zhang@rock-chips.com>
---
drivers/pinctrl/pinctrl-rockchip.c | 75 ++++++++++++++++++++++++++++++
drivers/pinctrl/pinctrl-rockchip.h | 1 +
2 files changed, 76 insertions(+)
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index e44ef262beec..89ff8d8c7fcc 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -1258,6 +1258,74 @@ static int rockchip_verify_mux(struct rockchip_pin_bank *bank,
return 0;
}
+static int rockchip_set_rmio(struct rockchip_pin_bank *bank, int pin, int *mux)
+{
+ struct rockchip_pinctrl *info = bank->drvdata;
+ struct rockchip_pin_ctrl *ctrl = info->ctrl;
+ struct regmap *regmap;
+ int reg, function;
+ u32 data, rmask;
+ int ret = 0;
+ int iomux_num = (pin / 8);
+ u32 iomux_max, mux_type;
+
+ mux_type = bank->iomux[iomux_num].type;
+ if (mux_type & IOMUX_WIDTH_4BIT)
+ iomux_max = (1 << 4) - 1;
+ else if (mux_type & IOMUX_WIDTH_3BIT)
+ iomux_max = (1 << 3) - 1;
+ else
+ iomux_max = (1 << 2) - 1;
+
+ if (*mux > iomux_max)
+ function = *mux - iomux_max;
+ else
+ return 0;
+
+ switch (ctrl->type) {
+ case RK3506:
+ regmap = info->regmap_rmio;
+ if (bank->bank_num == 0) {
+ if (pin < 24)
+ reg = 0x80 + 0x4 * pin;
+ else
+ ret = -EINVAL;
+ } else if (bank->bank_num == 1) {
+ if (pin >= 9 && pin <= 11)
+ reg = 0xbc + 0x4 * pin;
+ else if (pin >= 18 && pin <= 19)
+ reg = 0xa4 + 0x4 * pin;
+ else if (pin >= 25 && pin <= 27)
+ reg = 0x90 + 0x4 * pin;
+ else
+ ret = -EINVAL;
+ } else {
+ ret = -EINVAL;
+ }
+
+ if (ret) {
+ dev_err(info->dev,
+ "rmio unsupported bank_num %d function %d\n",
+ bank->bank_num, function);
+
+ return -EINVAL;
+ }
+
+ rmask = 0x7f007f;
+ data = 0x7f0000 | function;
+ *mux = 7;
+ ret = regmap_update_bits(regmap, reg, rmask, data);
+ if (ret)
+ return ret;
+ break;
+
+ default:
+ break;
+ }
+
+ return 0;
+}
+
/*
* Set a new mux function for a pin.
*
@@ -1291,6 +1359,10 @@ static int rockchip_set_mux(struct rockchip_pin_bank *bank, int pin, int mux)
dev_dbg(dev, "setting mux of GPIO%d-%d to %d\n", bank->bank_num, pin, mux);
+ ret = rockchip_set_rmio(bank, pin, &mux);
+ if (ret)
+ return ret;
+
if (bank->iomux[iomux_num].type & IOMUX_SOURCE_PMU)
regmap = info->regmap_pmu;
else if (bank->iomux[iomux_num].type & IOMUX_L_SOURCE_PMU)
@@ -4247,6 +4319,9 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
/* try to find the optional reference to the ioc1 syscon */
info->regmap_ioc1 = syscon_regmap_lookup_by_phandle_optional(np, "rockchip,ioc1");
+ /* try to find the optional reference to the rmio syscon */
+ info->regmap_rmio = syscon_regmap_lookup_by_phandle_optional(np, "rockchip,rmio");
+
ret = rockchip_pinctrl_register(pdev, info);
if (ret)
return ret;
diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h
index 4f4aff42a80a..6d79ccf73b71 100644
--- a/drivers/pinctrl/pinctrl-rockchip.h
+++ b/drivers/pinctrl/pinctrl-rockchip.h
@@ -462,6 +462,7 @@ struct rockchip_pinctrl {
struct regmap *regmap_pull;
struct regmap *regmap_pmu;
struct regmap *regmap_ioc1;
+ struct regmap *regmap_rmio;
struct device *dev;
struct rockchip_pin_ctrl *ctrl;
struct pinctrl_desc pctl;
--
2.34.1
next prev parent reply other threads:[~2025-11-04 2:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-04 2:12 [PATCH v1 0/3] pinctrl: rockchip: Add RK3506 pinctrl support Ye Zhang
2025-11-04 2:12 ` [PATCH v1 1/3] dt-bindings: pinctrl: Add rk3506 " Ye Zhang
2025-11-04 10:43 ` Heiko Stübner
2025-11-04 14:06 ` Krzysztof Kozlowski
2025-11-04 2:12 ` [PATCH v1 2/3] pinctrl: rockchip: " Ye Zhang
2025-11-04 10:43 ` Heiko Stübner
2025-11-04 2:12 ` Ye Zhang [this message]
2025-11-04 11:08 ` [PATCH v1 3/3] pinctrl: rockchip: add rk3506 rmio support Heiko Stübner
2025-11-10 22:24 ` [PATCH v1 0/3] pinctrl: rockchip: Add RK3506 pinctrl support Linus Walleij
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=20251104021223.2375116-4-ye.zhang@rock-chips.com \
--to=ye.zhang@rock-chips.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=krzk+dt@kernel.org \
--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-rockchip@lists.infradead.org \
--cc=robh@kernel.org \
--cc=tao.huang@rock-chips.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