Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9ee3eab authored by Alan Cox's avatar Alan Cox Committed by Chris Ball
Browse files

mmc: sdhci: Add Moorestown device support 



This adds the basic identifiers. Due to the various chip quirks it's not
enough to make MRST support very useful for earlier steppings but that can
follow.

(I'm currently trying to verify which steps actually matter outside Intel
 so I can avoid unneeded stuff going upstream)

[Extracted from original development]
Signed-off-by: default avatarJiebingLi <jiebing.li@intel.com>
[Folds in fixes]
Signed-off-by: default avatarChuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 29229052

drivers/mmc/host/sdhci-pci.c

+39 −0
Original line number Diff line number Diff line
@@ -145,6 +145,29 @@ static const struct sdhci_pci_fixes sdhci_cafe = { 
			  SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,

};



/*

 * ADMA operation is disabled for Moorestown platform due to

 * hardware bugs.

 */

static int mrst_hc1_probe(struct sdhci_pci_chip *chip)

{

	/*

	 * slots number is fixed here for MRST as SDIO3 is never used and has

	 * hardware bugs.

	 */

	chip->num_slots = 1;

	return 0;

}



static const struct sdhci_pci_fixes sdhci_intel_mrst_hc0 = {

	.quirks		= SDHCI_QUIRK_BROKEN_ADMA | SDHCI_QUIRK_NO_HISPD_BIT,

};



static const struct sdhci_pci_fixes sdhci_intel_mrst_hc1 = {

	.quirks		= SDHCI_QUIRK_BROKEN_ADMA | SDHCI_QUIRK_NO_HISPD_BIT,

	.probe		= mrst_hc1_probe,

};



static const struct sdhci_pci_fixes sdhci_intel_mfd_sd = {

	.quirks		= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,

};
@@ -502,6 +525,22 @@ static const struct pci_device_id pci_ids[] __devinitdata = { 
		.driver_data	= (kernel_ulong_t)&sdhci_via,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_MRST_SD0,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_mrst_hc0,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_MRST_SD1,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_mrst_hc1,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_MFD_SD,