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

Commit a0361c1a authored by Jun Nie's avatar Jun Nie Committed by Ulf Hansson
Browse files

mmc: dw_mmc: Add fifo address property 



The FIFO address may break default address assumption of 0x100
(version < 0x240A) and 0x200(version >= 0x240A) in current driver.
The new property is introduced to override fifo address via DT
node information.

Signed-off-by: default avatarJun Nie <jun.nie@linaro.org>
Reviewed-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 4a80f776

drivers/mmc/host/dw_mmc.c

+5 −1
Original line number Diff line number Diff line
@@ -2976,6 +2976,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) 


	of_property_read_u32(np, "card-detect-delay", &pdata->detect_delay_ms);



	of_property_read_u32(np, "data-addr", &host->data_addr_override);



	if (!of_property_read_u32(np, "clock-frequency", &clock_frequency))

		pdata->bus_hz = clock_frequency;
@@ -3179,7 +3181,9 @@ int dw_mci_probe(struct dw_mci *host) 
	host->verid = SDMMC_GET_VERID(mci_readl(host, VERID));

	dev_info(host->dev, "Version ID is %04x\n", host->verid);



	if (host->verid < DW_MMC_240A)

	if (host->data_addr_override)

		host->fifo_reg = host->regs + host->data_addr_override;

	else if (host->verid < DW_MMC_240A)

		host->fifo_reg = host->regs + DATA_OFFSET;

	else

		host->fifo_reg = host->regs + DATA_240A_OFFSET;

drivers/mmc/host/dw_mmc.h

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ struct dw_mci_dma_slave { 
 * @ciu_clk: Pointer to card interface unit clock instance.

 * @slot: Slots sharing this MMC controller.

 * @fifo_depth: depth of FIFO.

 * @data_addr_override: override fifo reg offset with this value.

 * @data_shift: log2 of FIFO item size.

 * @part_buf_start: Start index in part_buf.

 * @part_buf_count: Bytes of partial data in part_buf.
@@ -161,6 +162,7 @@ struct dw_mci { 
	spinlock_t		irq_lock;

	void __iomem		*regs;

	void __iomem		*fifo_reg;

	u32			data_addr_override;



	struct scatterlist	*sg;

	struct sg_mapping_iter	sg_miter;