| Message ID | 20240512121633.1632597-4-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | c924f7efbb4fe6c57b63cb74130a9c14db5a3f8d |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: pinctrl: Minor fixes and add support for pinmux status cmd | expand |
On 2024/5/12 20:16, Jonas Karlman wrote: > GPIO IOMUX control is located at PMU2_IOC or BUS_IOC offset on RK3588. > > Based on Linux commit fdc33eba11c5 ("pinctrl/rockchip: add rk3588 > support"). > > Compared to the Linux commit, this include a fix so that the iomux of > GPIO0_B4-D7 is reported correctly. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > The fix to report correct iomux for GPIO0_B4-D7 will be sent to Linux. > --- > .../pinctrl/rockchip/pinctrl-rockchip-core.c | 24 ++++++++++++++++++- > 1 file changed, 23 insertions(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c > index 973e6a4f6db9..efc2070d32d9 100644 > --- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c > +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c > @@ -14,10 +14,10 @@ > #include <linux/libfdt.h> > > #include "pinctrl-rockchip.h" > +#include <dt-bindings/pinctrl/rockchip.h> > > #define MAX_ROCKCHIP_PINS_ENTRIES 30 > #define MAX_ROCKCHIP_GPIO_PER_BANK 32 > -#define RK_FUNC_GPIO 0 > > static int rockchip_verify_config(struct udevice *dev, u32 bank, u32 pin) > { > @@ -147,6 +147,28 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) > if (bank->recalced_mask & BIT(pin)) > rockchip_get_recalced_mux(bank, pin, ®, &bit, &mask); > > + if (IS_ENABLED(CONFIG_ROCKCHIP_RK3588)) { > + if (bank->bank_num == 0) { > + if (pin >= RK_PB4 && pin <= RK_PD7) { > + u32 reg0 = 0; > + > + reg0 = reg + 0x4000 - 0xC; /* PMU2_IOC_BASE */ > + ret = regmap_read(regmap, reg0, &val); > + if (ret) > + return ret; > + > + ret = ((val >> bit) & mask); > + if (ret != 8) > + return ret; > + > + reg = reg + 0x8000; /* BUS_IOC_BASE */ > + regmap = priv->regmap_base; > + } > + } else if (bank->bank_num > 0) { > + reg += 0x8000; /* BUS_IOC_BASE */ > + } > + } > + > ret = regmap_read(regmap, reg, &val); > if (ret) > return ret;
Hi Jonas, On 2024/6/7 18:27, Kever Yang wrote: > > On 2024/5/12 20:16, Jonas Karlman wrote: >> GPIO IOMUX control is located at PMU2_IOC or BUS_IOC offset on RK3588. >> >> Based on Linux commit fdc33eba11c5 ("pinctrl/rockchip: add rk3588 >> support"). >> >> Compared to the Linux commit, this include a fix so that the iomux of >> GPIO0_B4-D7 is reported correctly. >> >> Signed-off-by: Jonas Karlman <jonas@kwiboo.se> > Reviewed-by: Kever Yang <kever.yang@rock-chips.com> I have apply the first 3 patches of this patch for master, and please rebase other patches for next. Thanks, - Kever > > Thanks, > - Kever >> --- >> The fix to report correct iomux for GPIO0_B4-D7 will be sent to Linux. >> --- >> .../pinctrl/rockchip/pinctrl-rockchip-core.c | 24 ++++++++++++++++++- >> 1 file changed, 23 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c >> b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c >> index 973e6a4f6db9..efc2070d32d9 100644 >> --- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c >> +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c >> @@ -14,10 +14,10 @@ >> #include <linux/libfdt.h> >> #include "pinctrl-rockchip.h" >> +#include <dt-bindings/pinctrl/rockchip.h> >> #define MAX_ROCKCHIP_PINS_ENTRIES 30 >> #define MAX_ROCKCHIP_GPIO_PER_BANK 32 >> -#define RK_FUNC_GPIO 0 >> static int rockchip_verify_config(struct udevice *dev, u32 bank, >> u32 pin) >> { >> @@ -147,6 +147,28 @@ static int rockchip_get_mux(struct >> rockchip_pin_bank *bank, int pin) >> if (bank->recalced_mask & BIT(pin)) >> rockchip_get_recalced_mux(bank, pin, ®, &bit, &mask); >> + if (IS_ENABLED(CONFIG_ROCKCHIP_RK3588)) { >> + if (bank->bank_num == 0) { >> + if (pin >= RK_PB4 && pin <= RK_PD7) { >> + u32 reg0 = 0; >> + >> + reg0 = reg + 0x4000 - 0xC; /* PMU2_IOC_BASE */ >> + ret = regmap_read(regmap, reg0, &val); >> + if (ret) >> + return ret; >> + >> + ret = ((val >> bit) & mask); >> + if (ret != 8) >> + return ret; >> + >> + reg = reg + 0x8000; /* BUS_IOC_BASE */ >> + regmap = priv->regmap_base; >> + } >> + } else if (bank->bank_num > 0) { >> + reg += 0x8000; /* BUS_IOC_BASE */ >> + } >> + } >> + >> ret = regmap_read(regmap, reg, &val); >> if (ret) >> return ret;
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c index 973e6a4f6db9..efc2070d32d9 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c @@ -14,10 +14,10 @@ #include <linux/libfdt.h> #include "pinctrl-rockchip.h" +#include <dt-bindings/pinctrl/rockchip.h> #define MAX_ROCKCHIP_PINS_ENTRIES 30 #define MAX_ROCKCHIP_GPIO_PER_BANK 32 -#define RK_FUNC_GPIO 0 static int rockchip_verify_config(struct udevice *dev, u32 bank, u32 pin) { @@ -147,6 +147,28 @@ static int rockchip_get_mux(struct rockchip_pin_bank *bank, int pin) if (bank->recalced_mask & BIT(pin)) rockchip_get_recalced_mux(bank, pin, ®, &bit, &mask); + if (IS_ENABLED(CONFIG_ROCKCHIP_RK3588)) { + if (bank->bank_num == 0) { + if (pin >= RK_PB4 && pin <= RK_PD7) { + u32 reg0 = 0; + + reg0 = reg + 0x4000 - 0xC; /* PMU2_IOC_BASE */ + ret = regmap_read(regmap, reg0, &val); + if (ret) + return ret; + + ret = ((val >> bit) & mask); + if (ret != 8) + return ret; + + reg = reg + 0x8000; /* BUS_IOC_BASE */ + regmap = priv->regmap_base; + } + } else if (bank->bank_num > 0) { + reg += 0x8000; /* BUS_IOC_BASE */ + } + } + ret = regmap_read(regmap, reg, &val); if (ret) return ret;
GPIO IOMUX control is located at PMU2_IOC or BUS_IOC offset on RK3588. Based on Linux commit fdc33eba11c5 ("pinctrl/rockchip: add rk3588 support"). Compared to the Linux commit, this include a fix so that the iomux of GPIO0_B4-D7 is reported correctly. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- The fix to report correct iomux for GPIO0_B4-D7 will be sent to Linux. --- .../pinctrl/rockchip/pinctrl-rockchip-core.c | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)