mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-08 05:43:21 +09:00
Fixes:
- rockchip: rk3399: fix missing braces in full pinctrl -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJcMhBpAAoJECaAFcEOcohNjAwH+wbGhR4gWkBei6YSQBURXl1G sV/Md208Y5kU6XRlksbk1lBzc6JKaUdb4gOSri4gPQa8SscVerEAAWbkGgLet78M rmjcp7J0ygEwrfWuaH+cFl3V1LYoDtl4Oy0Zzjz3P+gmn9YaKvt/MrJ01p7Mcf0M lPkB/5b0oQ7LUVhwfWblzX7tasT4zPRANYGvzV9uda9mjcm0yQQimKnQ82ZR+CZx zx2wMYI+ckoxPIGsIwmlsriE0hMo6rxw4IcA1dmGkUnhoQHkoIWklAOyg5pm1OZ0 uK7FniUdrLTXEFdIwRnL+5UDQsRvc2DY1oSCJVlCOTFuvdFRweQngZnYY98HWKY= =ThsE -----END PGP SIGNATURE----- Merge tag 'for-master-20190106' of git://git.denx.de/u-boot-rockchip Fixes: - rockchip: rk3399: fix missing braces in full pinctrl
This commit is contained in:
commit
7b84a20e68
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user