mmc: sdhci-pci: Add support and PCI IDs for more Broxton host controllers

Add support and PCI IDs for more Broxton host controllers

Other BXT IDs were added in v4.4 so cc'ing stable. This patch
is dependent on commit 163cbe31e516 ("mmc: sdhci-pci: Fix card
detect race for Intel BXT/APL") but that is already in stable
since v4.4.4.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org # v4.4+
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by Adrian Hunter and committed by Ulf Hansson 01d6b2a4 1dceb041

Changed files
+28
drivers
+25
drivers/mmc/host/sdhci-pci-core.c
··· 390 390 slot->cd_idx = 0; 391 391 slot->cd_override_level = true; 392 392 if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXT_SD || 393 + slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BXTM_SD || 393 394 slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_APL_SD) 394 395 slot->host->mmc_host_ops.get_cd = bxt_get_cd; 395 396 ··· 1167 1166 { 1168 1167 .vendor = PCI_VENDOR_ID_INTEL, 1169 1168 .device = PCI_DEVICE_ID_INTEL_BXT_SD, 1169 + .subvendor = PCI_ANY_ID, 1170 + .subdevice = PCI_ANY_ID, 1171 + .driver_data = (kernel_ulong_t)&sdhci_intel_byt_sd, 1172 + }, 1173 + 1174 + { 1175 + .vendor = PCI_VENDOR_ID_INTEL, 1176 + .device = PCI_DEVICE_ID_INTEL_BXTM_EMMC, 1177 + .subvendor = PCI_ANY_ID, 1178 + .subdevice = PCI_ANY_ID, 1179 + .driver_data = (kernel_ulong_t)&sdhci_intel_byt_emmc, 1180 + }, 1181 + 1182 + { 1183 + .vendor = PCI_VENDOR_ID_INTEL, 1184 + .device = PCI_DEVICE_ID_INTEL_BXTM_SDIO, 1185 + .subvendor = PCI_ANY_ID, 1186 + .subdevice = PCI_ANY_ID, 1187 + .driver_data = (kernel_ulong_t)&sdhci_intel_byt_sdio, 1188 + }, 1189 + 1190 + { 1191 + .vendor = PCI_VENDOR_ID_INTEL, 1192 + .device = PCI_DEVICE_ID_INTEL_BXTM_SD, 1170 1193 .subvendor = PCI_ANY_ID, 1171 1194 .subdevice = PCI_ANY_ID, 1172 1195 .driver_data = (kernel_ulong_t)&sdhci_intel_byt_sd,
+3
drivers/mmc/host/sdhci-pci.h
··· 28 28 #define PCI_DEVICE_ID_INTEL_BXT_SD 0x0aca 29 29 #define PCI_DEVICE_ID_INTEL_BXT_EMMC 0x0acc 30 30 #define PCI_DEVICE_ID_INTEL_BXT_SDIO 0x0ad0 31 + #define PCI_DEVICE_ID_INTEL_BXTM_SD 0x1aca 32 + #define PCI_DEVICE_ID_INTEL_BXTM_EMMC 0x1acc 33 + #define PCI_DEVICE_ID_INTEL_BXTM_SDIO 0x1ad0 31 34 #define PCI_DEVICE_ID_INTEL_APL_SD 0x5aca 32 35 #define PCI_DEVICE_ID_INTEL_APL_EMMC 0x5acc 33 36 #define PCI_DEVICE_ID_INTEL_APL_SDIO 0x5ad0