diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-23 10:12:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-23 10:12:41 -0500 |
| commit | d38de7cb03adf88e18c05d840c2528b7a5af2f9b (patch) | |
| tree | 35be69932e53e4c58260af58ae841a3d1a2523b6 /arch/arm/mach-uniphier/dram/umc-pxs2.c | |
| parent | b24cf8540a85a9bf97975aadd6a7542f166c78a3 (diff) | |
| parent | bc647958047cd03193e19cd8c08a6771fea828b7 (diff) | |
| download | u-boot-imx-d38de7cb03adf88e18c05d840c2528b7a5af2f9b.zip u-boot-imx-d38de7cb03adf88e18c05d840c2528b7a5af2f9b.tar.gz u-boot-imx-d38de7cb03adf88e18c05d840c2528b7a5af2f9b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Fix regressions caused by the previous reworks
- Add pin configuration support
- Re-work SPL code
- Update DRAM and PLL setup code
- Enable needed configs, disable unneeded configs
Diffstat (limited to 'arch/arm/mach-uniphier/dram/umc-pxs2.c')
| -rw-r--r-- | arch/arm/mach-uniphier/dram/umc-pxs2.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c index 05a62de..7fa29f1 100644 --- a/arch/arm/mach-uniphier/dram/umc-pxs2.c +++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c @@ -619,15 +619,17 @@ int uniphier_pxs2_umc_init(const struct uniphier_board_data *bd) return -EINVAL; } - for (ch = 0; ch < bd->dram_nr_ch; ch++) { + for (ch = 0; ch < DRAM_CH_NR; ch++) { unsigned long size = bd->dram_ch[ch].size; unsigned int width = bd->dram_ch[ch].width; - ret = umc_ch_init(umc_ch_base, freq, size / (width / 16), - width, ch); - if (ret) { - pr_err("failed to initialize UMC ch%d\n", ch); - return ret; + if (size) { + ret = umc_ch_init(umc_ch_base, freq, + size / (width / 16), width, ch); + if (ret) { + pr_err("failed to initialize UMC ch%d\n", ch); + return ret; + } } umc_ch_base += 0x00200000; |