From: Jun Nie <jun.nie@linaro.org>
To: robh+dt@kernel.org, mark.rutland@arm.com, shawn.guo@linaro.org,
xie.baoyou@zte.com.cn, devicetree@vger.kernel.org
Cc: ulf.hansson@linaro.org, jh80.chung@samsung.com,
jason.liu@linaro.org, chen.chaokai@zte.com.cn,
lai.binz@zte.com.cn, linux-mmc@vger.kernel.org,
Jun Nie <jun.nie@linaro.org>
Subject: [PATCH v8 2/5] mmc: dw: Add fifo address property
Date: Thu, 22 Dec 2016 12:57:34 +0800 [thread overview]
Message-ID: <1482382657-16681-3-git-send-email-jun.nie@linaro.org> (raw)
In-Reply-To: <1482382657-16681-1-git-send-email-jun.nie@linaro.org>
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>
---
drivers/mmc/host/dw_mmc.c | 6 +++++-
include/linux/mmc/dw_mmc.h | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index b44306b..b600170 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2977,6 +2977,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;
@@ -3180,7 +3182,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 15db6f8..1c09cca 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -113,6 +113,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.
@@ -160,6 +161,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;
--
1.9.1
next prev parent reply other threads:[~2016-12-22 4:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20161222045752epcas5p3ed15c57243cee4c65c0c2e784baf9e02@epcas5p3.samsung.com>
2016-12-22 4:57 ` [PATCH v8 0/5] Add intial support to DW MMC host on ZTE SoC Jun Nie
2016-12-22 4:57 ` [PATCH v8 1/5] Documentation: synopsys-dw-mshc: add binding for fifo quirks Jun Nie
2016-12-22 23:04 ` Rob Herring
2016-12-22 4:57 ` Jun Nie [this message]
2016-12-22 4:57 ` [PATCH v8 3/5] mmc: dw: Add fifo watermark alignment property Jun Nie
2016-12-22 4:57 ` [PATCH v8 4/5] mmc: dt-bindings: add ZTE ZX296718 MMC bindings Jun Nie
[not found] ` <1482382657-16681-5-git-send-email-jun.nie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-12-22 23:13 ` Rob Herring
2016-12-26 2:24 ` [PATCH v8 0/5] Add intial support to DW MMC host on ZTE SoC Jun Nie
[not found] ` <1482382657-16681-1-git-send-email-jun.nie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-12-22 4:57 ` [PATCH v8 5/5] mmc: zx: Initial support for ZX mmc controller Jun Nie
2017-01-04 8:25 ` [PATCH v8 0/5] Add intial support to DW MMC host on ZTE SoC Jaehoon Chung
[not found] ` <a7014d59-7071-917e-27d8-a1dffc373737-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2017-01-05 1:09 ` Jaehoon Chung
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1482382657-16681-3-git-send-email-jun.nie@linaro.org \
--to=jun.nie@linaro.org \
--cc=chen.chaokai@zte.com.cn \
--cc=devicetree@vger.kernel.org \
--cc=jason.liu@linaro.org \
--cc=jh80.chung@samsung.com \
--cc=lai.binz@zte.com.cn \
--cc=linux-mmc@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=shawn.guo@linaro.org \
--cc=ulf.hansson@linaro.org \
--cc=xie.baoyou@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).