linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: b29396@freescale.com (Dong Aisheng)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/10] mmc: sdhci-esdhc-imx: fix reading cap_1 register value for mx6sl
Date: Wed, 9 Oct 2013 19:20:10 +0800	[thread overview]
Message-ID: <1381317616-1229-5-git-send-email-b29396@freescale.com> (raw)
In-Reply-To: <1381317616-1229-1-git-send-email-b29396@freescale.com>

When reading CAP_1 register for mx6sl, ignore bit[0-15] as it stores
CAP_2 register value which is new introduced in mx6sl.

Without this fix, the max clock for mx6sl may not be correct since
it's wrongly calculated by reading CAP_1 register.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
---
 drivers/mmc/host/sdhci-esdhc-imx.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 2cce244..8721549 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -216,6 +216,10 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
 	}
 
 	if (unlikely(reg == SDHCI_CAPABILITIES)) {
+		/* ignore bit[0-15] as it stores cap_2 register val for mx6sl */
+		if (is_imx6sl_usdhc(imx_data))
+			val &= 0xffff0000;
+
 		/* In FSL esdhc IC module, only bit20 is used to indicate the
 		 * ADMA2 capability of esdhc, but this bit is messed up on
 		 * some SOCs (e.g. on MX25, MX35 this bit is set, but they
-- 
1.7.2.rc3

  parent reply	other threads:[~2013-10-09 11:20 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-09 11:20 [PATCH 00/10] mmc: sdhci-esdhc-imx: add std tuning for mx6sl and DDR mode support Dong Aisheng
2013-10-09 11:20 ` [PATCH 01/10] ARM: dts: imx6sl: add pinctrl uhs states for usdhc Dong Aisheng
2013-10-12  8:49   ` Shawn Guo
2013-10-09 11:20 ` [PATCH 02/10] mmc: sdhci-esdhc-imx: add std tuning support for mx6sl Dong Aisheng
2013-10-15  7:18   ` Shawn Guo
2013-10-15  7:41     ` Dong Aisheng
2013-10-09 11:20 ` [PATCH 03/10] ARM: dts: imx6sl: change usdhc compatible with imx6sl only Dong Aisheng
2013-10-09 11:20 ` Dong Aisheng [this message]
2013-10-09 11:20 ` [PATCH 05/10] mmc: sdhci: report error once the maximum tuning loops exhausted or timeout Dong Aisheng
2013-10-09 11:20 ` [PATCH 06/10] mmc: sdhci-esdhc-imx: add DDR mode support for mx6 Dong Aisheng
2013-10-09 11:20 ` [PATCH 07/10] mmc: sdhci-esdhc-imx: add delay line setting support Dong Aisheng
2013-10-15  7:37   ` Shawn Guo
2013-10-15  7:55     ` Dong Aisheng
2013-10-09 11:20 ` [PATCH 08/10] mmc: sdhci-esdhc-imx: enable SDR50 tuning for imx6q/dl Dong Aisheng
2013-10-09 11:20 ` [PATCH 09/10] mmc: sdhci-esdhc-imx: add preset value quirk for mx6 Dong Aisheng
2013-10-09 11:20 ` [PATCH 10/10] mmc: sdhci: remove unneeded call when have preset value quirk Dong Aisheng

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=1381317616-1229-5-git-send-email-b29396@freescale.com \
    --to=b29396@freescale.com \
    --cc=linux-arm-kernel@lists.infradead.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).