leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'for-master-20190106' of git://git.denx.de/u-boot-rockchip

Browse Source 
Fixes:
 - rockchip: rk3399: fix missing braces in full pinctrl
This commit is contained in:
Tom Rini
2019-01-06 10:33:28 -05:00
parent 5324027566 33502f371d
commit 7b84a20e68
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pinctrl/rockchip/pinctrl_rk3399.c
View File

@@ -130,13 +130,14 @@ static void rk3399_pinctrl_set_pin_pupd(uintptr_t grf_addr,
if (pinconfig & (1 << PIN_CONFIG_BIAS_PULL_UP)) if (pinconfig & (1 << PIN_CONFIG_BIAS_PULL_UP))
pupdval = RK_GRF_P_PULLUP; 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; pupdval = RK_GRF_P_PULLDOWN;
else } else {
/* Flag not supported. */ /* Flag not supported. */
pr_warn("%s: Unsupported pinconfig flag: 0x%x\n", __func__, pr_warn("%s: Unsupported pinconfig flag: 0x%x\n", __func__,
pinconfig); pinconfig);
return; return;
}
pupd_base = grf_addr + (uintptr_t)bank->pupd_offset; pupd_base = grf_addr + (uintptr_t)bank->pupd_offset;
rk_pinctrl_get_info(pupd_base, index, &addr, &shift, &mask); rk_pinctrl_get_info(pupd_base, index, &addr, &shift, &mask);