diff options
author | Tom Rini <trini@konsulko.com> | 2022-05-23 09:25:39 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-05-23 09:25:39 -0400 |
commit | 004d30c786056d443d40428c4b1c11e2f8f0bc32 (patch) | |
tree | a6c7d28590d20c5f88f292804bcb22ebfa36d942 /drivers/ddr/imx | |
parent | 6f00b97d7e5760d92566317dde6c4b9224790827 (diff) | |
parent | 4d573d5c98234cad328de77c773c3c3d79258255 (diff) |
Merge tag 'u-boot-imx-20220523' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20220523
-------------------
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/12087
Additionally to u-boot-imx20200520:
- DH MX8MP
- i.MX GPIO: reading GPIO when direction is output
- Menlo i.MX53: switch to DM
And from u-boot-imx20200520:
- fix Verdin hang
- add pca9450 regulator
- conversion to DM_SERIAL
- NAND block handling
- fix crypto
- enable cache on some boards
- add ACC board (MX6)
Diffstat (limited to 'drivers/ddr/imx')
-rw-r--r-- | drivers/ddr/imx/imx8m/ddrphy_utils.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/ddr/imx/imx8m/ddrphy_utils.c b/drivers/ddr/imx/imx8m/ddrphy_utils.c index a54449e5f14..975d553674a 100644 --- a/drivers/ddr/imx/imx8m/ddrphy_utils.c +++ b/drivers/ddr/imx/imx8m/ddrphy_utils.c @@ -198,9 +198,14 @@ unsigned int lpddr4_mr_read(unsigned int mr_rank, unsigned int mr_addr) tmp = reg32_read(DRC_PERF_MON_MRR0_DAT(0)); } while ((tmp & 0x8) == 0); tmp = reg32_read(DRC_PERF_MON_MRR1_DAT(0)); - tmp = tmp & 0xff; reg32_write(DRC_PERF_MON_MRR0_DAT(0), 0x4); - + while (tmp) { //try to find a significant byte in the word + if (tmp & 0xff) { + tmp &= 0xff; + break; + } + tmp >>= 8; + } return tmp; } |