mmc: sdhci-pci: add another device id

Add another PCI device id for an eMMC host controller.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index b2a635e73aee8141cbe137fd48842b5cfa0ed4fc..15039e2d1c122e30a48cb62a8e00a2a5d99d2916 100644 (file)
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -121,6 +121,13 @@ static void esdhc_writeb(struct sdhci_host *host, u8 val, int reg)
        if (reg == SDHCI_HOST_CONTROL) {
                u32 dma_bits;
 
+               /*
+                * If host control register is not standard, exit
+                * this function
+                */
+               if (host->quirks2 & SDHCI_QUIRK2_BROKEN_HOST_CONTROL)
+                       return;
+
                /* DMA select is 22,23 bits in Protocol Control Register */
                dma_bits = (val & SDHCI_CTRL_DMA_MASK) << 5;
                clrsetbits_be32(host->ioaddr + reg , SDHCI_CTRL_DMA_MASK << 5,
@@ -289,6 +296,7 @@ static const struct sdhci_pltfm_data sdhci_esdhc_pdata = {
 static int sdhci_esdhc_probe(struct platform_device *pdev)
 {
        struct sdhci_host *host;
+       struct device_node *np;
        int ret;
 
        host = sdhci_pltfm_init(pdev, &sdhci_esdhc_pdata, 0);
@@ -297,6 +305,15 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
 
        sdhci_get_of_property(pdev);
 
+       np = pdev->dev.of_node;
+       if (of_device_is_compatible(np, "fsl,p2020-esdhc")) {
+               /*
+                * Freescale messed up with P2020 as it has a non-standard
+                * host control register
+                */
+               host->quirks2 |= SDHCI_QUIRK2_BROKEN_HOST_CONTROL;
+       }
+
        /* call to generic mmc_of_parse to support additional capabilities */
        mmc_of_parse(host->mmc);
 

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index e082fac6bc96b5569a9294afcffac44040d08fa0..d7d6bc8968d2422d8b2e9fb44a695b35b17927d4 100644 (file)
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -36,6 +36,7 @@
 #define PCI_DEVICE_ID_INTEL_BYT_EMMC   0x0f14
 #define PCI_DEVICE_ID_INTEL_BYT_SDIO   0x0f15
 #define PCI_DEVICE_ID_INTEL_BYT_SD     0x0f16
+#define PCI_DEVICE_ID_INTEL_BYT_EMMC2  0x0f50
 
 /*
  * PCI registers
@@ -930,6 +931,14 @@ 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_BYT_EMMC2,
+               .subvendor      = PCI_ANY_ID,
+               .subdevice      = PCI_ANY_ID,
+               .driver_data    = (kernel_ulong_t)&sdhci_intel_byt_emmc,
+       },
+
        {
                .vendor         = PCI_VENDOR_ID_O2,
                .device         = PCI_DEVICE_ID_O2_8120,

diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index a74518009099e07b55fba204624777ee9cb650dd..e3c6a74d980adc43312c35184f1b581261177ed4 100644 (file)
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -96,6 +96,8 @@ struct sdhci_host {
 #define SDHCI_QUIRK2_NO_1_8_V                          (1<<2)
 #define SDHCI_QUIRK2_PRESET_VALUE_BROKEN               (1<<3)
 #define SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON              (1<<4)
+/* Controller has a non-standard host control register */
+#define SDHCI_QUIRK2_BROKEN_HOST_CONTROL               (1<<5)
 
        int irq;                /* Device IRQ */
        void __iomem *ioaddr;   /* Mapped address */