| Message ID | 20190416135102.26667-5-david.wu@rock-chips.com |
|---|---|
| State | Accepted |
| Commit | cd8f00ce08102d2dbb350c76bbb53f7b0f804b7d |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | pinctrl: Split the common mux/drive/pull/schmitt func into per Soc | expand |
On 04/16/2019 09:50 PM, David Wu wrote: > RK3288 pmu_gpio0 iomux setting have no higher 16 writing corresponding > bits, need to read before write the register. > > Signed-off-by: David Wu <david.wu@rock-chips.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > > Change in v3: > - Add some comment > > drivers/pinctrl/rockchip/pinctrl-rk3288.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c > index 1fa601d954..5040cd8f48 100644 > --- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c > +++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c > @@ -54,7 +54,15 @@ static int rk3288_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) > } > } > > - data = (mask << (bit + 16)); > + /* bank0 is special, there are no higher 16 bit writing bits. */ > + if (bank->bank_num == 0) { > + regmap_read(regmap, reg, &data); > + data &= ~(mask << bit); > + } else { > + /* enable the write to the equivalent lower bits */ > + data = (mask << (bit + 16)); > + } > + > data |= (mux & mask) << bit; > ret = regmap_write(regmap, reg, data); >
On 05/07/2019 11:43 AM, Kever Yang wrote: > > On 04/16/2019 09:50 PM, David Wu wrote: >> RK3288 pmu_gpio0 iomux setting have no higher 16 writing corresponding >> bits, need to read before write the register. >> >> Signed-off-by: David Wu <david.wu@rock-chips.com> > Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Applied to u-boot-rockchip, thanks! > Thanks, > - Kever >> --- >> >> Change in v3: >> - Add some comment >> >> drivers/pinctrl/rockchip/pinctrl-rk3288.c | 10 +++++++++- >> 1 file changed, 9 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c >> index 1fa601d954..5040cd8f48 100644 >> --- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c >> +++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c >> @@ -54,7 +54,15 @@ static int rk3288_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) >> } >> } >> >> - data = (mask << (bit + 16)); >> + /* bank0 is special, there are no higher 16 bit writing bits. */ >> + if (bank->bank_num == 0) { >> + regmap_read(regmap, reg, &data); >> + data &= ~(mask << bit); >> + } else { >> + /* enable the write to the equivalent lower bits */ >> + data = (mask << (bit + 16)); >> + } >> + >> data |= (mux & mask) << bit; >> ret = regmap_write(regmap, reg, data); >> > > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c index 1fa601d954..5040cd8f48 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c @@ -54,7 +54,15 @@ static int rk3288_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) } } - data = (mask << (bit + 16)); + /* bank0 is special, there are no higher 16 bit writing bits. */ + if (bank->bank_num == 0) { + regmap_read(regmap, reg, &data); + data &= ~(mask << bit); + } else { + /* enable the write to the equivalent lower bits */ + data = (mask << (bit + 16)); + } + data |= (mux & mask) << bit; ret = regmap_write(regmap, reg, data);
RK3288 pmu_gpio0 iomux setting have no higher 16 writing corresponding bits, need to read before write the register. Signed-off-by: David Wu <david.wu@rock-chips.com> --- Change in v3: - Add some comment drivers/pinctrl/rockchip/pinctrl-rk3288.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)