Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75c7fd96 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Ulf Hansson
Browse files

mmc: meson-gx: factor out setting response configuration bits 



Factor out setting the response configuration bits thus further reducing
complexity of function meson_mmc_start_cmd.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 3d03f6a9

drivers/mmc/host/meson-gx-mmc.c

+18 −14
Original line number Diff line number Diff line
@@ -456,6 +456,23 @@ static void meson_mmc_set_blksz(struct mmc_host *mmc, unsigned int blksz) 
	writel(cfg, host->regs + SD_EMMC_CFG);

}



static void meson_mmc_set_response_bits(struct mmc_command *cmd, u32 *cmd_cfg)

{

	if (cmd->flags & MMC_RSP_PRESENT) {

		if (cmd->flags & MMC_RSP_136)

			*cmd_cfg |= CMD_CFG_RESP_128;

		*cmd_cfg |= CMD_CFG_RESP_NUM;



		if (!(cmd->flags & MMC_RSP_CRC))

			*cmd_cfg |= CMD_CFG_RESP_NOCRC;



		if (cmd->flags & MMC_RSP_BUSY)

			*cmd_cfg |= CMD_CFG_R1B;

	} else {

		*cmd_cfg |= CMD_CFG_NO_RESP;

	}

}



static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)

{

	struct meson_host *host = mmc_priv(mmc);
@@ -469,20 +486,7 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) 
	cmd_cfg |= FIELD_PREP(CMD_CFG_CMD_INDEX_MASK, cmd->opcode);

	cmd_cfg |= CMD_CFG_OWNER;  /* owned by CPU */



	/* Response */

	if (cmd->flags & MMC_RSP_PRESENT) {

		if (cmd->flags & MMC_RSP_136)

			cmd_cfg |= CMD_CFG_RESP_128;

		cmd_cfg |= CMD_CFG_RESP_NUM;



		if (!(cmd->flags & MMC_RSP_CRC))

			cmd_cfg |= CMD_CFG_RESP_NOCRC;



		if (cmd->flags & MMC_RSP_BUSY)

			cmd_cfg |= CMD_CFG_R1B;

	} else {

		cmd_cfg |= CMD_CFG_NO_RESP;

	}

	meson_mmc_set_response_bits(cmd, &cmd_cfg);



	/* data? */

	if (data) {