| Message ID | 1472463221-11948-2-git-send-email-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 29/08/16 12:33, Andy Shevchenko wrote: > Intel Merrifield is known to have an SDIO interface and on Intel Edison board a > WiFi card is wired to it. > > Enable the interface here to allow WiFi card enumeration. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/mmc/host/sdhci-pci-core.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c > index 40f4fe8..d38d701 100644 > --- a/drivers/mmc/host/sdhci-pci-core.c > +++ b/drivers/mmc/host/sdhci-pci-core.c > @@ -419,6 +419,7 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sd = { > /* Define Host controllers for Intel Merrifield platform */ > #define INTEL_MRFLD_EMMC_0 0 > #define INTEL_MRFLD_EMMC_1 1 > +#define INTEL_MRFLD_SDIO 3 > > static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot) > { > @@ -431,6 +432,10 @@ static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot) > MMC_CAP_8_BIT_DATA | > MMC_CAP_1_8V_DDR; > break; > + case INTEL_MRFLD_SDIO: > + slot->host->mmc->caps |= MMC_CAP_NONREMOVABLE | > + MMC_CAP_POWER_OFF_CARD; > + break; > default: > /* SD support is not ready yet */ > return -ENODEV; > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 29 August 2016 at 11:33, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > Intel Merrifield is known to have an SDIO interface and on Intel Edison board a > WiFi card is wired to it. > > Enable the interface here to allow WiFi card enumeration. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/sdhci-pci-core.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c > index 40f4fe8..d38d701 100644 > --- a/drivers/mmc/host/sdhci-pci-core.c > +++ b/drivers/mmc/host/sdhci-pci-core.c > @@ -419,6 +419,7 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sd = { > /* Define Host controllers for Intel Merrifield platform */ > #define INTEL_MRFLD_EMMC_0 0 > #define INTEL_MRFLD_EMMC_1 1 > +#define INTEL_MRFLD_SDIO 3 > > static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot) > { > @@ -431,6 +432,10 @@ static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot) > MMC_CAP_8_BIT_DATA | > MMC_CAP_1_8V_DDR; > break; > + case INTEL_MRFLD_SDIO: > + slot->host->mmc->caps |= MMC_CAP_NONREMOVABLE | > + MMC_CAP_POWER_OFF_CARD; > + break; > default: > /* SD support is not ready yet */ > return -ENODEV; > -- > 2.8.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 40f4fe8..d38d701 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -419,6 +419,7 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sd = { /* Define Host controllers for Intel Merrifield platform */ #define INTEL_MRFLD_EMMC_0 0 #define INTEL_MRFLD_EMMC_1 1 +#define INTEL_MRFLD_SDIO 3 static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot) { @@ -431,6 +432,10 @@ static int intel_mrfld_mmc_probe_slot(struct sdhci_pci_slot *slot) MMC_CAP_8_BIT_DATA | MMC_CAP_1_8V_DDR; break; + case INTEL_MRFLD_SDIO: + slot->host->mmc->caps |= MMC_CAP_NONREMOVABLE | + MMC_CAP_POWER_OFF_CARD; + break; default: /* SD support is not ready yet */ return -ENODEV;
Intel Merrifield is known to have an SDIO interface and on Intel Edison board a WiFi card is wired to it. Enable the interface here to allow WiFi card enumeration. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/mmc/host/sdhci-pci-core.c | 5 +++++ 1 file changed, 5 insertions(+)