linux-mmc.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 06/13] mmc: mmci: add ddrmode mask to variant data
Date: Fri, 30 May 2014 18:13:39 +0100	[thread overview]
Message-ID: <1401470019-27072-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 ddrmode mask to variant structure giving more flexibility
to the driver to support more SOCs which have different datactrl register
layout.

Without this patch datactrl register is updated with incorrect ddrmode mask,
resulting in failures on Qualcomm SD Card Controller.

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

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 72981f6..ad7e538 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -59,6 +59,7 @@ static unsigned int fmax = 515633;
  *		  is asserted (likewise for RX)
  * @sdio: variant supports SDIO
  * @st_clkdiv: true if using a ST-specific clock divider algorithm
+ * @datactrl_mask_ddrmode: ddr mode mask in datactrl register.
  * @blksz_datactrl16: true if Block size is at b16..b30 position in datactrl register
  * @blksz_datactrl4: true if Block size is at b4..b16 position in datactrl
  *		     register
@@ -74,6 +75,7 @@ struct variant_data {
 	unsigned int		datalength_bits;
 	unsigned int		fifosize;
 	unsigned int		fifohalfsize;
+	unsigned int		datactrl_mask_ddrmode;
 	bool			sdio;
 	bool			st_clkdiv;
 	bool			blksz_datactrl16;
@@ -152,6 +154,7 @@ static struct variant_data variant_ux500v2 = {
 	.fifohalfsize		= 8 * 4,
 	.clkreg			= MCI_CLK_ENABLE,
 	.clkreg_enable		= MCI_ST_UX500_HWFCEN,
+	.datactrl_mask_ddrmode	= MCI_ST_DPSM_DDRMODE,
 	.datalength_bits	= 24,
 	.sdio			= true,
 	.st_clkdiv		= true,
@@ -770,7 +773,7 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)
 		}
 
 	if (host->mmc->ios.timing == MMC_TIMING_UHS_DDR50)
-		datactrl |= MCI_ST_DPSM_DDRMODE;
+		datactrl |= variant->datactrl_mask_ddrmode;
 
 	/*
 	 * Attempt to use DMA operation mode, if this
-- 
1.9.1

  parent reply	other threads:[~2014-05-30 17:13 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 ` srinivas.kandagatla [this message]
2014-05-30 17:13 ` [PATCH v5 07/13] mmc: mmci: add 8bit bus support in variant data srinivas.kandagatla
2014-05-30 17:14 ` [PATCH v5 08/13] mmc: mmci: add edge support to data and command out " srinivas.kandagatla
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=1401470019-27072-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).