diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-16 20:58:37 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-16 20:58:37 -0500 |
| commit | 4a986156258d456237d0dda753a39afbddf9dcfd (patch) | |
| tree | 40a4bf69c2591234635709de1a3d342d7557b2de /drivers/pinctrl/rockchip/pinctrl-rk3288.c | |
| parent | 348064ee2c8f9494b91b55729ac60c5db79ef129 (diff) | |
| parent | c925be73a0a8b1d90060c4b5255a2d9e87967e23 (diff) | |
| download | u-boot-4a986156258d456237d0dda753a39afbddf9dcfd.zip u-boot-4a986156258d456237d0dda753a39afbddf9dcfd.tar.gz u-boot-4a986156258d456237d0dda753a39afbddf9dcfd.tar.bz2 | |
Merge tag 'u-boot-rockchip-20230117' of https://source.denx.de/u-boot/custodians/u-boot-rockchipWIP/16Jan2023
- Add support for rv1126 soc and rv1126 neu2 io board;
- Add support for rk3399 pine64 pinephone pro board;
- dts sync from linux for rk3399 and px30;
- Add support for PX30 Ringneck SoM board;
Diffstat (limited to 'drivers/pinctrl/rockchip/pinctrl-rk3288.c')
| -rw-r--r-- | drivers/pinctrl/rockchip/pinctrl-rk3288.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c index 5894f47..a976b7a 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c @@ -37,7 +37,7 @@ static int rk3288_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) struct regmap *regmap; int reg, ret, mask, mux_type; u8 bit; - u32 data, route_reg, route_val; + u32 data; regmap = (bank->iomux[iomux_num].type & IOMUX_SOURCE_PMU) ? priv->regmap_pmu : priv->regmap_base; @@ -47,15 +47,6 @@ static int rk3288_set_mux(struct rockchip_pin_bank *bank, int pin, int mux) reg = bank->iomux[iomux_num].offset; reg += rockchip_get_mux_data(mux_type, pin, &bit, &mask); - if (bank->route_mask & BIT(pin)) { - if (rockchip_get_mux_route(bank, pin, mux, &route_reg, - &route_val)) { - ret = regmap_write(regmap, route_reg, route_val); - if (ret) - return ret; - } - } - /* bank0 is special, there are no higher 16 bit writing bits. */ if (bank->bank_num == 0) { regmap_read(regmap, reg, &data); |