iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: meson-gx: simplify setting timeout configuration parameters

Browse Source 
We don't need variable cmd_cfg_timeout, so remove it and simplify the
code a little.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
This commit is contained in:
Heiner Kallweit 2017-03-22 22:34:01 +01:00 committed by Ulf Hansson
parent 2c8d96a46d
commit a744c6fe13
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mmc/host/meson-gx-mmc.c
View File

@ -426,7 +426,7 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)
struct meson_host *host = mmc_priv(mmc); struct meson_host *host = mmc_priv(mmc);
struct mmc_data *data = cmd->data; struct mmc_data *data = cmd->data;
u32 cfg, cmd_cfg = 0, cmd_data = 0; u32 cfg, cmd_cfg = 0, cmd_data = 0;
u8 blk_len, cmd_cfg_timeout; u8 blk_len;
unsigned int xfer_bytes = 0; unsigned int xfer_bytes = 0;
/* Setup descriptors */ /* Setup descriptors */
@ -454,6 +454,9 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)
/* data? */ /* data? */
if (data) { if (data) {
cmd_cfg |= CMD_CFG_DATA_IO; cmd_cfg |= CMD_CFG_DATA_IO;
cmd_cfg |= ilog2(SD_EMMC_CMD_TIMEOUT_DATA) <<
CMD_CFG_TIMEOUT_SHIFT;
if (data->blocks > 1) { if (data->blocks > 1) {
cmd_cfg |= CMD_CFG_BLOCK_MODE; cmd_cfg |= CMD_CFG_BLOCK_MODE;
cmd_cfg |= (data->blocks & CMD_CFG_LENGTH_MASK) << cmd_cfg |= (data->blocks & CMD_CFG_LENGTH_MASK) <<
@ -488,13 +491,9 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)
} }
cmd_data = host->bounce_dma_addr & CMD_DATA_MASK; cmd_data = host->bounce_dma_addr & CMD_DATA_MASK;
cmd_cfg_timeout = ilog2(SD_EMMC_CMD_TIMEOUT_DATA);
} else { } else {
cmd_cfg_timeout = ilog2(SD_EMMC_CMD_TIMEOUT); cmd_cfg |= ilog2(SD_EMMC_CMD_TIMEOUT) << CMD_CFG_TIMEOUT_SHIFT;
} }
cmd_cfg |= (cmd_cfg_timeout & CMD_CFG_TIMEOUT_MASK) <<
CMD_CFG_TIMEOUT_SHIFT;
host->cmd = cmd; host->cmd = cmd;