dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-18 00:11:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v2021.10-rc5' into next

Browse Source 
Prepare v2021.10-rc5
This commit is contained in:
Tom Rini
2021-09-27 09:45:36 -04:00
parent bb38d77ca7 0b9bcf665c
commit e908d20fcb
76 changed files with 940 additions and 1119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ddr/altera/sequencer.c
View File

@@ -3714,7 +3714,7 @@ static void debug_mem_calibrate(struct socfpga_sdrseq *seq, int pass)
u32 debug_info;
if (pass) {
debug("%s: CALIBRATION PASSED\n", __FILE__);
debug(KBUILD_BASENAME ": CALIBRATION PASSED\n");
seq->gbl.fom_in /= 2;
seq->gbl.fom_out /= 2;
@@ -3733,7 +3733,7 @@ static void debug_mem_calibrate(struct socfpga_sdrseq *seq, int pass)
writel(debug_info, &phy_mgr_cfg->cal_debug_info);
writel(PHY_MGR_CAL_SUCCESS, &phy_mgr_cfg->cal_status);
} else {
debug("%s: CALIBRATION FAILED\n", __FILE__);
debug(KBUILD_BASENAME ": CALIBRATION FAILED\n");
debug_info = seq->gbl.error_stage;
debug_info |= seq->gbl.error_substage << 8;
@@ -3750,7 +3750,7 @@ static void debug_mem_calibrate(struct socfpga_sdrseq *seq, int pass)
writel(debug_info, &sdr_reg_file->failing_stage);
}
debug("%s: Calibration complete\n", __FILE__);
debug(KBUILD_BASENAME ": Calibration complete\n");
}
/**
@@ -3934,7 +3934,7 @@ int sdram_calibration_full(struct socfpga_sdr *sdr)
initialize_tracking(&seq);
debug("%s: Preparing to start memory calibration\n", __FILE__);
debug(KBUILD_BASENAME ": Preparing to start memory calibration\n");
debug("%s:%d\n", __func__, __LINE__);
debug_cond(DLEVEL >= 1,