linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: srinivas.kandagatla@linaro.org
To: Russell King <linux@arm.linux.org.uk>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	linux-mmc@vger.kernel.org
Cc: Chris Ball <chris@printf.net>,
	linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	linus.walleij@linaro.org,
	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: [PATCH v5 08/13] mmc: mmci: add edge support to data and command out in variant data.
Date: Fri, 30 May 2014 18:14:01 +0100	[thread overview]
Message-ID: <1401470041-27154-1-git-send-email-srinivas.kandagatla@linaro.org> (raw)
In-Reply-To: <1401469918-26817-1-git-send-email-srinivas.kandagatla@linaro.org>

From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

This patch adds edge support for data and command out to variant structure
giving more flexibility to the driver to support more SOCs which have
different clock register layout.

Without this patch other new SOCs like Qcom will have to add more code to
special case them

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/mmc/host/mmci.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index fa3ad83..4c95a9b 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -53,6 +53,7 @@ static unsigned int fmax = 515633;
  * @clkreg: default value for MCICLOCK register
  * @clkreg_enable: enable value for MMCICLOCK register
  * @clkreg_8bit_bus_enable: enable value for 8 bit bus
+ * @clkreg_neg_edge_enable: enable value for inverted data/cmd output
  * @datalength_bits: number of bits in the MMCIDATALENGTH register
  * @fifosize: number of bytes that can be written when MMCI_TXFIFOEMPTY
  *	      is asserted (likewise for RX)
@@ -74,6 +75,7 @@ struct variant_data {
 	unsigned int		clkreg;
 	unsigned int		clkreg_enable;
 	unsigned int		clkreg_8bit_bus_enable;
+	unsigned int		clkreg_neg_edge_enable;
 	unsigned int		datalength_bits;
 	unsigned int		fifosize;
 	unsigned int		fifohalfsize;
@@ -143,6 +145,7 @@ static struct variant_data variant_ux500 = {
 	.clkreg			= MCI_CLK_ENABLE,
 	.clkreg_enable		= MCI_ST_UX500_HWFCEN,
 	.clkreg_8bit_bus_enable = MCI_ST_8BIT_BUS,
+	.clkreg_neg_edge_enable	= MCI_ST_UX500_NEG_EDGE,
 	.datalength_bits	= 24,
 	.sdio			= true,
 	.st_clkdiv		= true,
@@ -159,6 +162,7 @@ static struct variant_data variant_ux500v2 = {
 	.clkreg			= MCI_CLK_ENABLE,
 	.clkreg_enable		= MCI_ST_UX500_HWFCEN,
 	.clkreg_8bit_bus_enable = MCI_ST_8BIT_BUS,
+	.clkreg_neg_edge_enable	= MCI_ST_UX500_NEG_EDGE,
 	.datactrl_mask_ddrmode	= MCI_ST_DPSM_DDRMODE,
 	.datalength_bits	= 24,
 	.sdio			= true,
@@ -313,7 +317,7 @@ static void mmci_set_clkreg(struct mmci_host *host, unsigned int desired)
 		clk |= variant->clkreg_8bit_bus_enable;
 
 	if (host->mmc->ios.timing == MMC_TIMING_UHS_DDR50)
-		clk |= MCI_ST_UX500_NEG_EDGE;
+		clk |= variant->clkreg_neg_edge_enable;
 
 	mmci_write_clkreg(host, clk);
 }
-- 
1.9.1

  parent reply	other threads:[~2014-05-30 17:14 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-30 17:11 [PATCH v5 00/13] Add Qualcomm SD Card Controller support srinivas.kandagatla
2014-05-30 17:12 ` [PATCH v5 01/13] mmc: mmci: use NSEC_PER_SEC macro srinivas.kandagatla
2014-05-30 17:13 ` [PATCH v5 02/13] mmc: mmci: convert register bits to use BIT() macro srinivas.kandagatla
2014-05-31 12:35   ` Russell King - ARM Linux
2014-06-02  7:12     ` Srinivas Kandagatla
2014-05-30 17:13 ` [PATCH v5 03/13] mmc: mmci: Add Qualcomm specific register defines srinivas.kandagatla
2014-05-30 17:13 ` [PATCH v5 04/13] mmc: mmci: Add enough delay between writes to CMD register srinivas.kandagatla
2014-05-30 17:13 ` [PATCH v5 05/13] mmc: mmci: Add Qcom datactrl register variant srinivas.kandagatla
2014-05-30 17:13 ` [PATCH v5 06/13] mmc: mmci: add ddrmode mask to variant data srinivas.kandagatla
2014-05-30 17:13 ` [PATCH v5 07/13] mmc: mmci: add 8bit bus support in " srinivas.kandagatla
2014-05-30 17:14 ` srinivas.kandagatla [this message]
2014-05-30 17:14 ` [PATCH v5 09/13] mmc: mmci: Add support to data commands via variant structure srinivas.kandagatla
2014-05-30 17:14 ` [PATCH v5 10/13] mmc: mmci: add f_max to " srinivas.kandagatla
2014-05-30 17:14 ` [PATCH v5 11/13] mmc: mmci: add explicit clk control srinivas.kandagatla
2014-05-31 12:29   ` Russell King - ARM Linux
2014-06-01 18:13     ` Srinivas Kandagatla
2014-05-30 17:14 ` [PATCH v5 12/13] mmc: mmci: Add Qcom specific rx_fifocnt logic srinivas.kandagatla
2014-05-30 17:15 ` [PATCH v5 13/13] mmc: mmci: Add Qualcomm Id to amba id table srinivas.kandagatla

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=1401470041-27154-1-git-send-email-srinivas.kandagatla@linaro.org \
    --to=srinivas.kandagatla@linaro.org \
    --cc=chris@printf.net \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=ulf.hansson@linaro.org \
    /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).