lkml.org 
[lkml]   [2016]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.5 116/124] mmc: sdhci-pci: Add support and PCI IDs for more Broxton host controllers
    Date
    4.5-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Adrian Hunter <adrian.hunter@intel.com>

    commit 01d6b2a40a0fa73c90e05b1033f181a51fec9292 upstream.

    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>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mmc/host/sdhci-pci-core.c | 25 +++++++++++++++++++++++++
    drivers/mmc/host/sdhci-pci.h | 3 +++
    2 files changed, 28 insertions(+)

    --- a/drivers/mmc/host/sdhci-pci-core.c
    +++ b/drivers/mmc/host/sdhci-pci-core.c
    @@ -390,6 +390,7 @@ static int byt_sd_probe_slot(struct sdhc
    slot->cd_idx = 0;
    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->host->mmc_host_ops.get_cd = bxt_get_cd;

    @@ -1169,6 +1170,30 @@ static const struct pci_device_id pci_id
    .subvendor = PCI_ANY_ID,
    .subdevice = PCI_ANY_ID,
    .driver_data = (kernel_ulong_t)&sdhci_intel_byt_sd,
    + },
    +
    + {
    + .vendor = PCI_VENDOR_ID_INTEL,
    + .device = PCI_DEVICE_ID_INTEL_BXTM_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_BXTM_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_BXTM_SD,
    + .subvendor = PCI_ANY_ID,
    + .subdevice = PCI_ANY_ID,
    + .driver_data = (kernel_ulong_t)&sdhci_intel_byt_sd,
    },

    {
    --- a/drivers/mmc/host/sdhci-pci.h
    +++ b/drivers/mmc/host/sdhci-pci.h
    @@ -28,6 +28,9 @@
    #define PCI_DEVICE_ID_INTEL_BXT_SD 0x0aca
    #define PCI_DEVICE_ID_INTEL_BXT_EMMC 0x0acc
    #define PCI_DEVICE_ID_INTEL_BXT_SDIO 0x0ad0
    +#define PCI_DEVICE_ID_INTEL_BXTM_SD 0x1aca
    +#define PCI_DEVICE_ID_INTEL_BXTM_EMMC 0x1acc
    +#define PCI_DEVICE_ID_INTEL_BXTM_SDIO 0x1ad0
    #define PCI_DEVICE_ID_INTEL_APL_SD 0x5aca
    #define PCI_DEVICE_ID_INTEL_APL_EMMC 0x5acc
    #define PCI_DEVICE_ID_INTEL_APL_SDIO 0x5ad0

    \
     
     \ /
      Last update: 2016-04-18 05:21    [W:5.256 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site