diff options
| -rw-r--r-- | arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 3 | ||||
| -rw-r--r-- | drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi index 011eea65eca0..7252e11bebdc 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi @@ -522,6 +522,9 @@ spl@0 { reg = <0x0 0x40000>; }; + uboot-env@f0000 { + reg = <0xf0000 0x10000>; + }; uboot@100000 { reg = <0x100000 0x300000>; }; 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); } |