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

Commit 603aa14d authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Ulf Hansson
Browse files

mmc: tmio, renesas-sdhi: add max_{segs, blk_count} to tmio_mmc_data 



Allow TMIO and SDHI driver implementations to provide values for
max_segs and max_blk_count.

A follow-up patch will set these values for Renesas Gen3 SoCs
the using an SDHI driver.

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarAi Kyuse <ai.kyuse.uw@renesas.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6bba4064

drivers/mmc/host/renesas_sdhi.h

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ struct renesas_sdhi_of_data { 
	int scc_offset;

	struct renesas_sdhi_scc *taps;

	int taps_num;

	unsigned int max_blk_count;

	unsigned short max_segs;

};



int renesas_sdhi_probe(struct platform_device *pdev,

drivers/mmc/host/renesas_sdhi_core.c

+2 −0
Original line number Diff line number Diff line
@@ -526,6 +526,8 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
		mmc_data->capabilities |= of_data->capabilities;

		mmc_data->capabilities2 |= of_data->capabilities2;

		mmc_data->dma_rx_offset = of_data->dma_rx_offset;

		mmc_data->max_blk_count = of_data->max_blk_count;

		mmc_data->max_segs = of_data->max_segs;

		dma_priv->dma_buswidth = of_data->dma_buswidth;

		host->bus_shift = of_data->bus_shift;

	}

drivers/mmc/host/tmio_mmc_core.c

+3 −3
Original line number Diff line number Diff line
@@ -1251,10 +1251,10 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, 


	mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities;

	mmc->caps2 |= pdata->capabilities2;

	mmc->max_segs = 32;

	mmc->max_segs = pdata->max_segs ? : 32;

	mmc->max_blk_size = 512;

	mmc->max_blk_count = (PAGE_SIZE / mmc->max_blk_size) *

		mmc->max_segs;

	mmc->max_blk_count = pdata->max_blk_count ? :

		(PAGE_SIZE / mmc->max_blk_size) * mmc->max_segs;

	mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;

	mmc->max_seg_size = mmc->max_req_size;

include/linux/mfd/tmio.h

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ struct tmio_mmc_data { 
	unsigned int			cd_gpio;

	int				alignment_shift;

	dma_addr_t			dma_rx_offset;

	unsigned int			max_blk_count;

	unsigned short			max_segs;

	void (*set_pwr)(struct platform_device *host, int state);

	void (*set_clk_div)(struct platform_device *host, int state);

};