diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-21 10:01:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-21 10:01:11 -0400 |
| commit | 226ecf8be4c6a29caa86d1c9f33d5794c5732375 (patch) | |
| tree | db9c1de1ba2419da90cb0984cdf9a2d7014c087f /arch/arm/include/asm | |
| parent | e7f7e2e1e22fd719a8810ba488a9451635b13d1b (diff) | |
| parent | ecb896cec75e98d6e5f9bcbf0a87976119443985 (diff) | |
| download | u-boot-226ecf8be4c6a29caa86d1c9f33d5794c5732375.zip u-boot-226ecf8be4c6a29caa86d1c9f33d5794c5732375.tar.gz u-boot-226ecf8be4c6a29caa86d1c9f33d5794c5732375.tar.bz2 | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxiWIP/21Jul2023
For once this adds USB support for two SoCs: the H616 and the F1C100s
series. The rest is support for LPDDR3 DRAM chips on H616 boards.
Gitlab CI passed, and I booted that briefly on an H616 and an F1C200s
board. I don't have an H616 board with LPDDR3 DRAM, but reportedly that
works for Mikhail, and doesn't regress on my DDR3 boards.
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h index 6db869c..11774de 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h @@ -148,10 +148,6 @@ check_member(sunxi_mctl_ctl_reg, unk_0x4240, 0x4240); struct dram_para { u32 clk; enum sunxi_dram_type type; - u8 cols; - u8 rows; - u8 ranks; - u8 bus_full_width; u32 dx_odt; u32 dx_dri; u32 ca_dri; @@ -163,6 +159,12 @@ struct dram_para { u32 tpr12; }; +struct dram_config { + u8 cols; + u8 rows; + u8 ranks; + u8 bus_full_width; +}; static inline int ns_to_t(int nanoseconds) { @@ -171,6 +173,6 @@ static inline int ns_to_t(int nanoseconds) return DIV_ROUND_UP(ctrl_freq * nanoseconds, 1000); } -void mctl_set_timing_params(struct dram_para *para); +void mctl_set_timing_params(const struct dram_para *para); #endif /* _SUNXI_DRAM_SUN50I_H616_H */ |