mmc: mediatek: drop too much code of tuning method

the tuning code is becoming more and more bloated, let's make the
set cmd/data delay to inline function to avoid too much redundant code.

Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index 5b26f2f8b9664a08228458a9f7e188d65b87514c..6334cc752d8b75e1fa80cb286a28420f7178bf8a 100644 (file)
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -1661,6 +1661,30 @@ static struct msdc_delay_phase get_best_delay(struct msdc_host *host, u32 delay)
        return delay_phase;
 }
 
+static inline void msdc_set_cmd_delay(struct msdc_host *host, u32 value)
+{
+       u32 tune_reg = host->dev_comp->pad_tune_reg;
+
+       if (host->top_base)
+               sdr_set_field(host->top_base + EMMC_TOP_CMD, PAD_CMD_RXDLY,
+                             value);
+       else
+               sdr_set_field(host->base + tune_reg, MSDC_PAD_TUNE_CMDRDLY,
+                             value);
+}
+
+static inline void msdc_set_data_delay(struct msdc_host *host, u32 value)
+{
+       u32 tune_reg = host->dev_comp->pad_tune_reg;
+
+       if (host->top_base)
+               sdr_set_field(host->top_base + EMMC_TOP_CONTROL,
+                             PAD_DAT_RD_RXDLY, value);
+       else
+               sdr_set_field(host->base + tune_reg, MSDC_PAD_TUNE_DATRRDLY,
+                             value);
+}
+
 static int msdc_tune_response(struct mmc_host *mmc, u32 opcode)
 {
        struct msdc_host *host = mmc_priv(mmc);
@@ -1681,12 +1705,7 @@ static int msdc_tune_response(struct mmc_host *mmc, u32 opcode)
 
        sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_RSPL);
        for (i = 0 ; i < PAD_DELAY_MAX; i++) {
-               if (host->top_base)
-                       sdr_set_field(host->top_base + EMMC_TOP_CMD,
-                                     PAD_CMD_RXDLY, i);
-               else
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_CMDRDLY, i);
+               msdc_set_cmd_delay(host, i);
                /*
                 * Using the same parameters, it may sometimes pass the test,
                 * but sometimes it may fail. To make sure the parameters are
@@ -1710,12 +1729,7 @@ static int msdc_tune_response(struct mmc_host *mmc, u32 opcode)
 
        sdr_set_bits(host->base + MSDC_IOCON, MSDC_IOCON_RSPL);
        for (i = 0; i < PAD_DELAY_MAX; i++) {
-               if (host->top_base)
-                       sdr_set_field(host->top_base + EMMC_TOP_CMD,
-                                     PAD_CMD_RXDLY, i);
-               else
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_CMDRDLY, i);
+               msdc_set_cmd_delay(host, i);
                /*
                 * Using the same parameters, it may sometimes pass the test,
                 * but sometimes it may fail. To make sure the parameters are
@@ -1739,25 +1753,13 @@ skip_fall:
                final_maxlen = final_fall_delay.maxlen;
        if (final_maxlen == final_rise_delay.maxlen) {
                sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_RSPL);
-               if (host->top_base)
-                       sdr_set_field(host->base + EMMC_TOP_CMD, PAD_CMD_RXDLY,
-                                     final_rise_delay.final_phase);
-               else
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_CMDRDLY,
-                                     final_rise_delay.final_phase);
                final_delay = final_rise_delay.final_phase;
        } else {
                sdr_set_bits(host->base + MSDC_IOCON, MSDC_IOCON_RSPL);
-               if (host->top_base)
-                       sdr_set_field(host->base + EMMC_TOP_CMD, PAD_CMD_RXDLY,
-                                     final_fall_delay.final_phase);
-               else
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_CMDRDLY,
-                                     final_fall_delay.final_phase);
                final_delay = final_fall_delay.final_phase;
        }
+       msdc_set_cmd_delay(host, final_delay);
+
        if (host->dev_comp->async_fifo || host->hs200_cmd_int_delay)
                goto skip_internal;
 
@@ -1832,7 +1834,6 @@ static int msdc_tune_data(struct mmc_host *mmc, u32 opcode)
        u32 rise_delay = 0, fall_delay = 0;
        struct msdc_delay_phase final_rise_delay, final_fall_delay = { 0,};
        u8 final_delay, final_maxlen;
-       u32 tune_reg = host->dev_comp->pad_tune_reg;
        int i, ret;
 
        sdr_set_field(host->base + MSDC_PATCH_BIT, MSDC_INT_DAT_LATCH_CK_SEL,
@@ -1840,12 +1841,7 @@ static int msdc_tune_data(struct mmc_host *mmc, u32 opcode)
        sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_DSPL);
        sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_W_DSPL);
        for (i = 0 ; i < PAD_DELAY_MAX; i++) {
-               if (host->top_base)
-                       sdr_set_field(host->top_base + EMMC_TOP_CONTROL,
-                                     PAD_DAT_RD_RXDLY, i);
-               else
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_DATRRDLY, i);
+               msdc_set_data_delay(host, i);
                ret = mmc_send_tuning(mmc, opcode, NULL);
                if (!ret)
                        rise_delay |= (1 << i);
@@ -1859,12 +1855,7 @@ static int msdc_tune_data(struct mmc_host *mmc, u32 opcode)
        sdr_set_bits(host->base + MSDC_IOCON, MSDC_IOCON_DSPL);
        sdr_set_bits(host->base + MSDC_IOCON, MSDC_IOCON_W_DSPL);
        for (i = 0; i < PAD_DELAY_MAX; i++) {
-               if (host->top_base)
-                       sdr_set_field(host->top_base + EMMC_TOP_CONTROL,
-                                     PAD_DAT_RD_RXDLY, i);
-               else
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_DATRRDLY, i);
+               msdc_set_data_delay(host, i);
                ret = mmc_send_tuning(mmc, opcode, NULL);
                if (!ret)
                        fall_delay |= (1 << i);
@@ -1876,28 +1867,13 @@ skip_fall:
        if (final_maxlen == final_rise_delay.maxlen) {
                sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_DSPL);
                sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_W_DSPL);
-               if (host->top_base)
-                       sdr_set_field(host->top_base + EMMC_TOP_CONTROL,
-                                     PAD_DAT_RD_RXDLY,
-                                     final_rise_delay.final_phase);
-               else
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_DATRRDLY,
-                                     final_rise_delay.final_phase);
                final_delay = final_rise_delay.final_phase;
        } else {
                sdr_set_bits(host->base + MSDC_IOCON, MSDC_IOCON_DSPL);
                sdr_set_bits(host->base + MSDC_IOCON, MSDC_IOCON_W_DSPL);
-               if (host->top_base)
-                       sdr_set_field(host->top_base + EMMC_TOP_CONTROL,
-                                     PAD_DAT_RD_RXDLY,
-                                     final_fall_delay.final_phase);
-               else
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_DATRRDLY,
-                                     final_fall_delay.final_phase);
                final_delay = final_fall_delay.final_phase;
        }
+       msdc_set_data_delay(host, final_delay);
 
        dev_dbg(host->dev, "Final data pad delay: %x\n", final_delay);
        return final_delay == 0xff ? -EIO : 0;
@@ -1913,7 +1889,6 @@ static int msdc_tune_together(struct mmc_host *mmc, u32 opcode)
        u32 rise_delay = 0, fall_delay = 0;
        struct msdc_delay_phase final_rise_delay, final_fall_delay = { 0,};
        u8 final_delay, final_maxlen;
-       u32 tune_reg = host->dev_comp->pad_tune_reg;
        int i, ret;
 
        sdr_set_field(host->base + MSDC_PATCH_BIT, MSDC_INT_DAT_LATCH_CK_SEL,
@@ -1923,17 +1898,8 @@ static int msdc_tune_together(struct mmc_host *mmc, u32 opcode)
        sdr_clr_bits(host->base + MSDC_IOCON,
                     MSDC_IOCON_DSPL | MSDC_IOCON_W_DSPL);
        for (i = 0 ; i < PAD_DELAY_MAX; i++) {
-               if (host->top_base) {
-                       sdr_set_field(host->top_base + EMMC_TOP_CMD,
-                                     PAD_CMD_RXDLY, i);
-                       sdr_set_field(host->top_base + EMMC_TOP_CONTROL,
-                                     PAD_DAT_RD_RXDLY, i);
-               } else {
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_CMDRDLY, i);
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_DATRRDLY, i);
-               }
+               msdc_set_cmd_delay(host, i);
+               msdc_set_data_delay(host, i);
                ret = mmc_send_tuning(mmc, opcode, NULL);
                if (!ret)
                        rise_delay |= (1 << i);
@@ -1948,17 +1914,8 @@ static int msdc_tune_together(struct mmc_host *mmc, u32 opcode)
        sdr_set_bits(host->base + MSDC_IOCON,
                     MSDC_IOCON_DSPL | MSDC_IOCON_W_DSPL);
        for (i = 0; i < PAD_DELAY_MAX; i++) {
-               if (host->top_base) {
-                       sdr_set_field(host->top_base + EMMC_TOP_CMD,
-                                     PAD_CMD_RXDLY, i);
-                       sdr_set_field(host->top_base + EMMC_TOP_CONTROL,
-                                     PAD_DAT_RD_RXDLY, i);
-               } else {
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_CMDRDLY, i);
-                       sdr_set_field(host->base + tune_reg,
-                                     MSDC_PAD_TUNE_DATRRDLY, i);
-               }
+               msdc_set_cmd_delay(host, i);
+               msdc_set_data_delay(host, i);
                ret = mmc_send_tuning(mmc, opcode, NULL);
                if (!ret)
                        fall_delay |= (1 << i);
@@ -1979,17 +1936,8 @@ skip_fall:
                final_delay = final_fall_delay.final_phase;
        }
 
-       if (host->top_base) {
-               sdr_set_field(host->top_base + EMMC_TOP_CMD,
-                             PAD_CMD_RXDLY, final_delay);
-               sdr_set_field(host->top_base + EMMC_TOP_CONTROL,
-                             PAD_DAT_RD_RXDLY, final_delay);
-       } else {
-               sdr_set_field(host->base + tune_reg, MSDC_PAD_TUNE_CMDRDLY,
-                             final_delay);
-               sdr_set_field(host->base + tune_reg,
-                             MSDC_PAD_TUNE_DATRRDLY, final_delay);
-       }
+       msdc_set_cmd_delay(host, final_delay);
+       msdc_set_data_delay(host, final_delay);
 
        dev_dbg(host->dev, "Final pad delay: %x\n", final_delay);
        return final_delay == 0xff ? -EIO : 0;
@@ -2006,12 +1954,7 @@ static int msdc_execute_tuning(struct mmc_host *mmc, u32 opcode)
                if (host->hs400_mode) {
                        sdr_clr_bits(host->base + MSDC_IOCON,
                                     MSDC_IOCON_DSPL | MSDC_IOCON_W_DSPL);
-                       if (host->top_base)
-                               sdr_set_field(host->top_base + EMMC_TOP_CONTROL,
-                                             PAD_DAT_RD_RXDLY, 0);
-                       else
-                               sdr_set_field(host->base + tune_reg,
-                                             MSDC_PAD_TUNE_DATRRDLY, 0);
+                       msdc_set_data_delay(host, 0);
                }
                goto tune_done;
        }