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

Commit 29229052 authored by Xiaochen Shen's avatar Xiaochen Shen Committed by Chris Ball
Browse files

mmc: sdhci: Intel Medfield support 



Basic support for the Intel Medfield devices

Give them their own quirks as we will need to update this later.

Signed-off-by: default avatarXiaochen Shen <xiaochen.shen@intel.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 225d85fe

drivers/mmc/host/sdhci-pci.c

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

};



static const struct sdhci_pci_fixes sdhci_intel_mfd_sd = {

	.quirks		= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,

};



static const struct sdhci_pci_fixes sdhci_intel_mfd_emmc_sdio = {

	.quirks		= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,

};



static int jmicron_pmos(struct sdhci_pci_chip *chip, int on)

{

	u8 scratch;
@@ -494,6 +502,46 @@ 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_MFD_SD,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_mfd_sd,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_MFD_SDIO1,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_mfd_emmc_sdio,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_MFD_SDIO2,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_mfd_emmc_sdio,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_MFD_EMMC0,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_mfd_emmc_sdio,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_MFD_EMMC1,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_mfd_emmc_sdio,

	},



	{	/* Generic SD host controller */

		PCI_DEVICE_CLASS((PCI_CLASS_SYSTEM_SDHCI << 8), 0xFFFF00)

	},

include/linux/pci_ids.h

+7 −0
Original line number Diff line number Diff line
@@ -2420,6 +2420,13 @@ 
#define PCI_DEVICE_ID_INTEL_82375	0x0482

#define PCI_DEVICE_ID_INTEL_82424	0x0483

#define PCI_DEVICE_ID_INTEL_82378	0x0484

#define PCI_DEVICE_ID_INTEL_MRST_SD0	0x0807

#define PCI_DEVICE_ID_INTEL_MRST_SD1	0x0808

#define PCI_DEVICE_ID_INTEL_MFD_SD	0x0820

#define PCI_DEVICE_ID_INTEL_MFD_SDIO1	0x0821

#define PCI_DEVICE_ID_INTEL_MFD_SDIO2	0x0822

#define PCI_DEVICE_ID_INTEL_MFD_EMMC0	0x0823

#define PCI_DEVICE_ID_INTEL_MFD_EMMC1	0x0824

#define PCI_DEVICE_ID_INTEL_I960	0x0960

#define PCI_DEVICE_ID_INTEL_I960RM	0x0962

#define PCI_DEVICE_ID_INTEL_8257X_SOL	0x1062