]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
ddr: altera: Clean up rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase_sweep_dq_in_delay...
authorMarek Vasut <marex@denx.de>
Sat, 18 Jul 2015 02:20:26 +0000 (04:20 +0200)
committerMarek Vasut <marex@denx.de>
Sat, 8 Aug 2015 12:14:18 +0000 (14:14 +0200)
The read_group and write_group params have the same value for all (one)
invocations of this function, just merge them into a single param.

Signed-off-by: Marek Vasut <marex@denx.de>
drivers/ddr/altera/sequencer.c

index c33a12a8a4550ad61b742d1f69afcd34a1f92fa9..a1be7357e313aa551ee08eba9c672b132b03bf76 100644 (file)
@@ -1772,7 +1772,7 @@ static uint32_t rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase(uint32_t grp)
  */
 static int
 rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase_sweep_dq_in_delay
-(uint32_t write_group, uint32_t read_group, uint32_t test_bgn)
+(const u32 rw_group, const u32 test_bgn)
 {
        /* We start at zero, so have one less dq to devide among */
        const u32 delay_step = IO_IO_IN_DELAY_MAX /
@@ -1780,8 +1780,7 @@ rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase_sweep_dq_in_delay
        int found;
        u32 i, p, d, r;
 
-       debug("%s:%d (%u,%u,%u)\n", __func__, __LINE__,
-             write_group, read_group, test_bgn);
+       debug("%s:%d (%u,%u)\n", __func__, __LINE__, rw_group, test_bgn);
 
        /* Try different dq_in_delays since the DQ path is shorter than DQS. */
        for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS;
@@ -1790,9 +1789,8 @@ rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase_sweep_dq_in_delay
                     i < RW_MGR_MEM_DQ_PER_READ_DQS;
                     i++, p++, d += delay_step) {
                        debug_cond(DLEVEL == 1,
-                                  "%s:%d: g=%u/%u r=%u i=%u p=%u d=%u\n",
-                                  __func__, __LINE__, write_group, read_group,
-                                  r, i, p, d);
+                                  "%s:%d: g=%u r=%u i=%u p=%u d=%u\n",
+                                  __func__, __LINE__, rw_group, r, i, p, d);
 
                        scc_mgr_set_dq_in_delay(p, d);
                        scc_mgr_load_dq(p);
@@ -1801,11 +1799,11 @@ rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase_sweep_dq_in_delay
                writel(0, &sdr_scc_mgr->update);
        }
 
-       found = rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase(read_group);
+       found = rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase(rw_group);
 
        debug_cond(DLEVEL == 1,
-                  "%s:%d: g=%u/%u found=%u; Reseting delay chain to zero\n",
-                  __func__, __LINE__, write_group, read_group, found);
+                  "%s:%d: g=%u found=%u; Reseting delay chain to zero\n",
+                  __func__, __LINE__, rw_group, found);
 
        for (r = 0; r < RW_MGR_MEM_NUMBER_OF_RANKS;
             r += NUM_RANKS_PER_SHADOW_REG) {
@@ -2259,7 +2257,7 @@ static int rw_mgr_mem_calibrate_dqs_enable_calibration(const u32 rw_group,
         * DQS and DQS Eanble Signal Relationships.
         */
        ret = rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase_sweep_dq_in_delay(
-                                               rw_group, rw_group, test_bgn);
+                                               rw_group, test_bgn);
        return ret;
 }