diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2024-03-22 10:42:02 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2024-03-22 10:42:02 +0300 |
| commit | d2ff3a0efbfc0aa4cd13df080470259209ac325f (patch) | |
| tree | cb7715be3b0eba341700c6577facb71e755e7874 | |
| parent | da8555a2379073dbc8f2273735f421aab3c8adca (diff) | |
| parent | e76ee911cf54920d2d1ddd23056c21948d1e8645 (diff) | |
| download | linux-d2ff3a0efbfc0aa4cd13df080470259209ac325f.tar.xz | |
Merge branch 'CR_6978_pinctrl_6.1_hal.feng' into 'jh7110-6.1.y-devel'
CR_6978_pinctrl_6.1_hal.feng
See merge request sdk/linux!1031
| -rw-r--r-- | drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index cbf79bb06621..dcd0f09361fa 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -1051,6 +1051,8 @@ static int starfive_jh7110_pinconf_set(struct pinctrl_dev *pctldev, value = readl_relaxed(pctl->padctl_base + pin_reg->io_conf_reg); value = value|(configs[i] & 0xFF); + if (!(configs[i] & JH7110_PADCFG_IE)) + value &= ~JH7110_PADCFG_IE; writel_relaxed(value, pctl->padctl_base + pin_reg->io_conf_reg); } |