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 13/13] mmc: mmci: Add Qualcomm Id to amba id table
Date: Fri, 30 May 2014 18:15:07 +0100	[thread overview]
Message-ID: <1401470107-27359-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 a fake Qualcomm ID 0x00051180 to the amba_ids, as Qualcomm
SDCC controller is pl180, but amba id registers read 0x0's.
The plan is to remove SDCC driver totally and use mmci as the main SD
controller driver for Qualcomm SOCs.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/mmc/host/mmci.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 7a11522..b07c3c3 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -190,6 +190,23 @@ static struct variant_data variant_ux500v2 = {
 	.pwrreg_nopower		= true,
 };
 
+static struct variant_data variant_qcom = {
+	.fifosize		= 16 * 4,
+	.fifohalfsize		= 8 * 4,
+	.clkreg			= MCI_CLK_ENABLE,
+	.clkreg_enable		= MCI_QCOM_CLK_FLOWENA |
+				  MCI_QCOM_CLK_SELECT_IN_FBCLK,
+	.clkreg_8bit_bus_enable = MCI_QCOM_CLK_WIDEBUS_8,
+	.datactrl_mask_ddrmode	= MCI_QCOM_CLK_SELECT_IN_DDR_MODE,
+	.data_cmd_enable	= MCI_QCOM_CSPM_DATCMD,
+	.blksz_datactrl4	= true,
+	.datalength_bits	= 24,
+	.pwrreg_powerup		= MCI_PWR_UP,
+	.f_max			= 208000000,
+	.explicit_mclk_control	= true,
+	.qcom_fifo		= true,
+};
+
 static int mmci_card_busy(struct mmc_host *mmc)
 {
 	struct mmci_host *host = mmc_priv(mmc);
@@ -1832,6 +1849,12 @@ static struct amba_id mmci_ids[] = {
 		.mask   = 0xf0ffffff,
 		.data	= &variant_ux500v2,
 	},
+	/* Qualcomm variants */
+	{
+		.id     = 0x00051180,
+		.mask	= 0x000fffff,
+		.data	= &variant_qcom,
+	},
 	{ 0, 0 },
 };
 
-- 
1.9.1

      parent reply	other threads:[~2014-05-30 17:15 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 ` [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 ` srinivas.kandagatla [this message]

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=1401470107-27359-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).