Commit 43c487c2 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: remove 'alignment_shift' from platform data 



There is only one alignment shift for one type of Renesas SDHI. Encode
it directly in its DMA driver to reduce complexity and ease further
simplifications.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20221102125430.28466-3-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 8840e1c1

drivers/mmc/host/renesas_sdhi_core.c

+0 −1
Original line number Diff line number Diff line
@@ -1018,7 +1018,6 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
	dma_priv->filter = shdma_chan_filter;

	dma_priv->enable = renesas_sdhi_enable_dma;



	mmc_data->alignment_shift = 1; /* 2-byte alignment */

	mmc_data->capabilities |= MMC_CAP_MMC_HIGHSPEED;



	/*

drivers/mmc/host/renesas_sdhi_sys_dmac.c

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void renesas_sdhi_sys_dmac_start_dma_rx(struct tmio_mmc_host *host) 
	dma_cookie_t cookie;

	int ret, i;

	bool aligned = true, multiple = true;

	unsigned int align = (1 << host->pdata->alignment_shift) - 1;

	unsigned int align = 1;	/* 2-byte alignment */



	for_each_sg(sg, sg_tmp, host->sg_len, i) {

		if (sg_tmp->offset & align)
@@ -232,7 +232,7 @@ static void renesas_sdhi_sys_dmac_start_dma_tx(struct tmio_mmc_host *host) 
	dma_cookie_t cookie;

	int ret, i;

	bool aligned = true, multiple = true;

	unsigned int align = (1 << host->pdata->alignment_shift) - 1;

	unsigned int align = 1;	/* 2-byte alignment */



	for_each_sg(sg, sg_tmp, host->sg_len, i) {

		if (sg_tmp->offset & align)

include/linux/mfd/tmio.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ struct tmio_mmc_data { 
	unsigned long			capabilities2;

	unsigned long			flags;

	u32				ocr_mask;	/* available voltages */

	int				alignment_shift;

	dma_addr_t			dma_rx_offset;

	unsigned int			max_blk_count;

	unsigned short			max_segs;