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

Commit 2d1956d0 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci-pci: Add support for Intel GLK 



Add support for eMMC/SD/SDIO Intel GLK host controllers.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 02e4293d

drivers/mmc/host/sdhci-pci-core.c

+26 −1
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ static int byt_sd_probe_slot(struct sdhci_pci_slot *slot) 
	slot->cd_override_level = true;

	if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD ||

	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXTM_SD ||

	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD) {

	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD ||

	    slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_GLK_SD) {

		slot->host->mmc_host_ops.get_cd = bxt_get_cd;

		slot->host->mmc->caps |= MMC_CAP_AGGRESSIVE_PM;

	}
@@ -1276,6 +1277,30 @@ static const struct pci_device_id pci_ids[] = { 
		.driver_data	= (kernel_ulong_t)&sdhci_intel_byt_sd,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_GLK_EMMC,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_byt_emmc,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_GLK_SDIO,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_byt_sdio,

	},



	{

		.vendor		= PCI_VENDOR_ID_INTEL,

		.device		= PCI_DEVICE_ID_INTEL_GLK_SD,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (kernel_ulong_t)&sdhci_intel_byt_sd,

	},



	{

		.vendor		= PCI_VENDOR_ID_O2,

		.device		= PCI_DEVICE_ID_O2_8120,

drivers/mmc/host/sdhci-pci.h

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ 
#define PCI_DEVICE_ID_INTEL_APL_SD	0x5aca

#define PCI_DEVICE_ID_INTEL_APL_EMMC	0x5acc

#define PCI_DEVICE_ID_INTEL_APL_SDIO	0x5ad0

#define PCI_DEVICE_ID_INTEL_GLK_SD	0x31ca

#define PCI_DEVICE_ID_INTEL_GLK_EMMC	0x31cc

#define PCI_DEVICE_ID_INTEL_GLK_SDIO	0x31d0



/*

 * PCI registers