diff options
| author | Tom Rini <[email protected]> | 2025-09-01 09:50:01 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-09-01 09:50:01 -0600 |
| commit | d367be2b13a388fdb0dc2720f66c30ddcec8a4fd (patch) | |
| tree | b122767f7a491b65abbab60bc8012879f9dd4cf4 /include | |
| parent | 5e711fe26b6f051151f1ef665a4587faa9056319 (diff) | |
| parent | 0e68a93d7c220e37cf6ffe88ba47373e39fe5001 (diff) | |
Merge tag 'u-boot-rockchip-20250831' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/27522
- New Board support:
rk3588 Xunlong Orange Pi 5 Ultra;
rk3588s GameForce Ace;
rk3576 ArmSoM Sige5;
- rk3328 soc fixes;
- usb controller and phy fixes;
- new rk3328 ddr timing;
- other board level updates;
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/rk3288_common.h | 3 | ||||
| -rw-r--r-- | include/power/rk8xx_pmic.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 0c449e31099..52c3695ff8e 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -18,7 +18,8 @@ #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00000000\0" \ "pxefile_addr_r=0x00100000\0" \ - "fdt_addr_r=0x01f00000\0" \ + "fdt_addr_r=0x01e00000\0" \ + "fdtoverlay_addr_r=0x01f00000\0" \ "kernel_addr_r=0x02000000\0" \ "ramdisk_addr_r=0x04000000\0" diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h index 31221aa46b6..913b6ebe6d9 100644 --- a/include/power/rk8xx_pmic.h +++ b/include/power/rk8xx_pmic.h @@ -212,6 +212,8 @@ enum { #define RK817_POWER_EN_SAVE0 0x99 #define RK817_POWER_EN_SAVE1 0xa4 +#define RK806_RST_FUN_MSK GENMASK(7, 6) + #define RK806_POWER_EN(x) (0x00 + (x)) /* POWER_ENx register lower 4 bits are write-protected unless the associated top bit is set */ #define RK806_POWER_EN_CLRSETBITS(bit, val) (((val) << (bit)) | (1 << ((bit) + 4))) |