diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2024-03-22 10:43:43 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2024-03-22 10:43:43 +0300 |
| commit | 0b6f551daaf56eaa8e87aeca75b55c63e59eb3f3 (patch) | |
| tree | 9a1139aefa33de975666e344922bc119618f0cbb | |
| parent | 937fa63a3bab1a0d6bc611ff084a39cc6147e31e (diff) | |
| parent | 82052804fe6fd52ca6f7e777652bc9b0fe28315a (diff) | |
| download | linux-0b6f551daaf56eaa8e87aeca75b55c63e59eb3f3.tar.xz | |
Merge branch 'CR_6978_pinctrl_hal.feng' into 'jh7110-5.15.y-devel'
CR_6978_pinctrl_hal.feng
See merge request sdk/linux!1030
| -rwxr-xr-x | 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 b99cdeb4a95e..13ea658420da 100755 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -1052,6 +1052,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); } |