Commit 84275775 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents bee15491 f0d2f153

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

+8 −7
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ struct meson_host { 
	int irq;



	bool vqmmc_enabled;

	bool needs_pre_post_req;



};



#define CMD_CFG_LENGTH_MASK GENMASK(8, 0)
@@ -663,6 +665,8 @@ static void meson_mmc_request_done(struct mmc_host *mmc, 
	struct meson_host *host = mmc_priv(mmc);



	host->cmd = NULL;

	if (host->needs_pre_post_req)

		meson_mmc_post_req(mmc, mrq, 0);

	mmc_request_done(host->mmc, mrq);

}
@@ -880,7 +884,7 @@ static int meson_mmc_validate_dram_access(struct mmc_host *mmc, struct mmc_data 
static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)

{

	struct meson_host *host = mmc_priv(mmc);

	bool needs_pre_post_req = mrq->data &&

	host->needs_pre_post_req = mrq->data &&

			!(mrq->data->host_cookie & SD_EMMC_PRE_REQ_DONE);



	/*
@@ -896,22 +900,19 @@ static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq) 
		}

	}



	if (needs_pre_post_req) {

	if (host->needs_pre_post_req) {

		meson_mmc_get_transfer_mode(mmc, mrq);

		if (!meson_mmc_desc_chain_mode(mrq->data))

			needs_pre_post_req = false;

			host->needs_pre_post_req = false;

	}



	if (needs_pre_post_req)

	if (host->needs_pre_post_req)

		meson_mmc_pre_req(mmc, mrq);



	/* Stop execution */

	writel(0, host->regs + SD_EMMC_START);



	meson_mmc_start_cmd(mmc, mrq->sbc ?: mrq->cmd);



	if (needs_pre_post_req)

		meson_mmc_post_req(mmc, mrq, 0);

}



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