diff options
| author | Tom Rini <[email protected]> | 2023-06-29 09:52:48 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-06-29 09:52:48 -0400 |
| commit | bd8de8f4fcbd4572b0987619073dff5a7c47cb40 (patch) | |
| tree | 592d802b3486037aba638f69044a50bc67a7b0b9 /board | |
| parent | 580eb31199be8a822e62f20965854a242f895d03 (diff) | |
| parent | d77d5301d7dc333db0425ee82499fe362abd259d (diff) | |
Merge tag 'u-boot-rockchip-20230629' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
- rockchip inno phy fix;
- pinctrl driver in SPL arort in specific case;
- fix IO port voltage for rock5b-rk3588 board;
Diffstat (limited to 'board')
| -rw-r--r-- | board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c index eb639cd0d07..b6ccbb9c1c4 100644 --- a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c +++ b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c @@ -15,7 +15,8 @@ #include <asm/arch-rockchip/misc.h> #include <power/regulator.h> -#define GRF_IO_VSEL_BT565_SHIFT 0 +#define GRF_IO_VSEL_BT565_GPIO2AB 1 +#define GRF_IO_VSEL_AUDIO_GPIO3D4A 2 #define PMUGRF_CON0_VSEL_SHIFT 8 #ifndef CONFIG_SPL_BUILD @@ -48,7 +49,8 @@ static void setup_iodomain(void) syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF); /* BT565 is in 1.8v domain */ - rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_BT565_SHIFT); + rk_setreg(&grf->io_vsel, + GRF_IO_VSEL_BT565_GPIO2AB | GRF_IO_VSEL_AUDIO_GPIO3D4A); /* Set GPIO1 1.8v/3.0v source select to PMU1830_VOL */ rk_setreg(&pmugrf->soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT); |