diff options
| -rwxr-xr-x | arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 6 | ||||
| -rwxr-xr-x | drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi index 604fdeecd1da..9e24b2570e48 100755 --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi @@ -773,9 +773,9 @@ spl@0 { reg = <0x0 0x40000>; }; - uboot-env@100000 { - reg = <0xf0000 0x10000>; - }; + 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 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); } |