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

Commit b8d11962 authored by Shinobu Uehara's avatar Shinobu Uehara Committed by Ulf Hansson
Browse files

mmc: tmio: control multiple block transfer mode 



Renesas SDHI has "Multiple Block Transfer Mode" settings
on SD_CMD register which controls CMD12 automatically.

This patch cares it, because
CMD12 is not needed when CMD53 (= SD_IO_RW_EXTENDED)

[Kuninori Morimoto: tidyuped for upstreaming
                    enabled this flags for all SH-Mobile/R-Car]

Tested-by: default avatarNguyen Xuan Nui <nx-nui@jinso.co.jp>
Tested-by: default avatarHiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: default avatarShinobu Uehara <shinobu.uehara.xc@renesas.com>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f83bfa75

drivers/mmc/host/sh_mobile_sdhi.c

+5 −0
Original line number Diff line number Diff line
@@ -225,6 +225,11 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) 
	 */

	mmc_data->flags |= TMIO_MMC_SDIO_IRQ;



	/*

	 * All SDHI have CMD12 controll bit

	 */

	mmc_data->flags |= TMIO_MMC_HAVE_CMD12_CTRL;



	if (of_id && of_id->data) {

		const struct sh_mobile_sdhi_of_data *of_data = of_id->data;

		mmc_data->flags |= of_data->tmio_flags;

drivers/mmc/host/tmio_mmc_pio.c

+10 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <linux/pm_qos.h>

#include <linux/pm_runtime.h>

#include <linux/regulator/consumer.h>

#include <linux/mmc/sdio.h>

#include <linux/scatterlist.h>

#include <linux/spinlock.h>

#include <linux/workqueue.h>
@@ -310,6 +311,7 @@ static void tmio_mmc_done_work(struct work_struct *work) 
#define TRANSFER_READ  0x1000

#define TRANSFER_MULTI 0x2000

#define SECURITY_CMD   0x4000

#define NO_CMD12_ISSUE 0x4000 /* TMIO_MMC_HAVE_CMD12_CTRL */



static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command *cmd)

{
@@ -346,6 +348,14 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command 
		if (data->blocks > 1) {

			sd_ctrl_write16(host, CTL_STOP_INTERNAL_ACTION, 0x100);

			c |= TRANSFER_MULTI;



			/*

			 * Disable auto CMD12 at IO_RW_EXTENDED when

			 * multiple block transfer

			 */

			if ((host->pdata->flags & TMIO_MMC_HAVE_CMD12_CTRL) &&

			    (cmd->opcode == SD_IO_RW_EXTENDED))

				c |= NO_CMD12_ISSUE;

		}

		if (data->flags & MMC_DATA_READ)

			c |= TRANSFER_READ;

include/linux/mfd/tmio.h

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,12 @@ 
 */

#define TMIO_MMC_HAVE_HIGH_REG		(1 << 6)



/*

 * Some controllers have CMD12 automatically

 * issue/non-issue register

 */

#define TMIO_MMC_HAVE_CMD12_CTRL	(1 << 7)



int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base);

int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base);

void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state);