diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-06 10:33:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-06 10:33:28 -0500 |
| commit | 7b84a20e68af7757fbb5722eb7bc9685000dfbed (patch) | |
| tree | 7c38fd876cc1415ad3b8fcc8ae77e067d5050384 | |
| parent | 53240275666acf32cb9811e44eaf2fd571a6cb75 (diff) | |
| parent | 33502f371d49161a66f7c1f3752dbfc1358129c0 (diff) | |
Merge tag 'for-master-20190106' of git://git.denx.de/u-boot-rockchip
Fixes:
- rockchip: rk3399: fix missing braces in full pinctrl
| -rw-r--r-- | drivers/pinctrl/rockchip/pinctrl_rk3399.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pinctrl/rockchip/pinctrl_rk3399.c b/drivers/pinctrl/rockchip/pinctrl_rk3399.c index c4746b0122..5c5af3a0bd 100644 --- a/drivers/pinctrl/rockchip/pinctrl_rk3399.c +++ b/drivers/pinctrl/rockchip/pinctrl_rk3399.c @@ -130,13 +130,14 @@ static void rk3399_pinctrl_set_pin_pupd(uintptr_t grf_addr, if (pinconfig & (1 << PIN_CONFIG_BIAS_PULL_UP)) pupdval = RK_GRF_P_PULLUP; - else if (pinconfig & (1 << PIN_CONFIG_BIAS_PULL_DOWN)) + else if (pinconfig & (1 << PIN_CONFIG_BIAS_PULL_DOWN)) { pupdval = RK_GRF_P_PULLDOWN; - else + } else { /* Flag not supported. */ pr_warn("%s: Unsupported pinconfig flag: 0x%x\n", __func__, pinconfig); return; + } pupd_base = grf_addr + (uintptr_t)bank->pupd_offset; rk_pinctrl_get_info(pupd_base, index, &addr, &shift, &mask); |