From: Wan ZongShun <Vincent.Wan@amd.com>
To: <ulf.hansson@linaro.org>, <linux-mmc@vger.kernel.org>,
<linux-i2c@vger.kernel.org>, <bp@alien8.de>, <jdelvare@suse.de>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<mcuos.com@gmail.com>, Wan ZongShun <Vincent.Wan@amd.com>
Subject: [PATCH V2 3/3] SDHCI: Change AMD SDHCI quirk application scope
Date: Thu, 11 Jun 2015 20:11:47 +0800 [thread overview]
Message-ID: <1434024707-6245-3-git-send-email-Vincent.Wan@amd.com> (raw)
In-Reply-To: <1434024707-6245-1-git-send-email-Vincent.Wan@amd.com>
Change this quirk to apply to AMD Carrizo platform.
Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com>
Tested-by: Nath, Arindam <Arindam.Nath@amd.com>
Tested-by: Ramesh, Ramya <Ramya.Ramesh@amd.com>
---
drivers/mmc/host/sdhci-pci.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index f208f20..94f54d2 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -724,14 +724,37 @@ static const struct sdhci_pci_fixes sdhci_rtsx = {
.probe_slot = rtsx_probe_slot,
};
+/*AMD chipset generation*/
+enum amd_chipset_gen {
+ AMD_CHIPSET_BEFORE_ML,
+ AMD_CHIPSET_CZ,
+ AMD_CHIPSET_NL,
+ AMD_CHIPSET_UNKNOWN,
+};
+
static int amd_probe(struct sdhci_pci_chip *chip)
{
struct pci_dev *smbus_dev;
+ enum amd_chipset_gen gen;
smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD,
PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, NULL);
+ if (smbus_dev) {
+ gen = AMD_CHIPSET_BEFORE_ML;
+ } else {
+ smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD,
+ PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL);
+ if (smbus_dev) {
+ if (smbus_dev->revision < 0x51)
+ gen = AMD_CHIPSET_CZ;
+ else
+ gen = AMD_CHIPSET_NL;
+ } else {
+ gen = AMD_CHIPSET_UNKNOWN;
+ }
+ }
- if (smbus_dev && (smbus_dev->revision < 0x51)) {
+ if ((gen == AMD_CHIPSET_BEFORE_ML) || (gen == AMD_CHIPSET_CZ)) {
chip->quirks2 |= SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD;
chip->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200;
}
--
1.9.1
next prev parent reply other threads:[~2015-06-11 12:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-11 12:11 [PATCH V2 1/3] pci_ids: Add AMD KERNCZ device ID support Wan ZongShun
2015-06-11 12:11 ` [PATCH V2 2/3] i2c-piix4: Use Macro for AMD CZ SMBus device ID Wan ZongShun
2015-06-11 13:07 ` Wolfram Sang
2015-06-15 9:55 ` Ulf Hansson
2015-06-15 12:27 ` Jean Delvare
2015-06-11 12:11 ` Wan ZongShun [this message]
2015-06-15 9:55 ` [PATCH V2 3/3] SDHCI: Change AMD SDHCI quirk application scope Ulf Hansson
2015-06-12 20:34 ` [PATCH V2 1/3] pci_ids: Add AMD KERNCZ device ID support Bjorn Helgaas
2015-06-15 9:54 ` Ulf Hansson
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=1434024707-6245-3-git-send-email-Vincent.Wan@amd.com \
--to=vincent.wan@amd.com \
--cc=bp@alien8.de \
--cc=jdelvare@suse.de \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mcuos.com@gmail.com \
--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).