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: Jun Nie <jun.nie@linaro.org>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 2d8932a20161b533f51f96e785e97b6cb8711f60..94d8fe32126013281e1a0901b549cf550734952a 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -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;

diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
index 231a46f142d2d077ef2e70c8663399378b14f5a7..e08e3272a5ad82a110ba5dcc0bc7e0b9ec8ae504 100644 (file)
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
@@ -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;