Re: [PATCH v5 4/5] mmc: dw: Add fifo address property

[Shawn Lin <shawn.lin@rock-chips.com>]

On 2016/11/8 9:24, Jun Nie wrote:
> 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: Jun Nie <jun.nie@linaro.org>
> ---
>  drivers/mmc/host/dw_mmc.c  | 6 +++++-
>  include/linux/mmc/dw_mmc.h | 2 ++
>  2 files changed, 7 insertions(+), 1 deletion(-)
>

Looks good to me,

Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>

> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 1c9ee36..696b5e6 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -2955,6 +2955,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;
>
> @@ -3158,7 +3160,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;
> diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
> index f5af2bd..17cb95a 100644
> --- a/include/linux/mmc/dw_mmc.h
> +++ b/include/linux/mmc/dw_mmc.h
> @@ -107,6 +107,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.
> @@ -154,6 +155,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;
>


-- 
Best Regards
Shawn Lin