aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Brown <zach.brown@ni.com>2016-11-28 14:16:39 -0500
committerUlf Hansson <ulf.hansson@linaro.org>2016-12-05 04:31:19 -0500
commit3f23df72dc351e9ffe5eb577fcc38876dacba305 (patch)
tree15e8c19ff44db0c2cb2acb2ea84ce66bd59e376a
parent42b06496407c03f4c89e19c5b9d4973446d2f1af (diff)
mmc: sdhci-pci: Use ACPI to get max frequency for Intel NI byt sdio
On NI 9037 boards the max SDIO frequency is limited by trace lengths and other layout choices. The max SDIO frequency is stored in an ACPI table. The driver reads the ACPI entry MXFQ during sdio_probe_slot and sets the f_max field of the host. Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com> Reviewed-by: Jaeden Amero <jaeden.amero@ni.com> Reviewed-by: Josh Cartwright <joshc@ni.com> Signed-off-by: Zach Brown <zach.brown@ni.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/sdhci-pci-core.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index e6010f4dd9a8..1a72d32af07f 100644
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -27,6 +27,7 @@
27#include <linux/pm_runtime.h> 27#include <linux/pm_runtime.h>
28#include <linux/mmc/slot-gpio.h> 28#include <linux/mmc/slot-gpio.h>
29#include <linux/mmc/sdhci-pci-data.h> 29#include <linux/mmc/sdhci-pci-data.h>
30#include <linux/acpi.h>
30 31
31#include "sdhci.h" 32#include "sdhci.h"
32#include "sdhci-pci.h" 33#include "sdhci-pci.h"
@@ -375,8 +376,39 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot)
375 return 0; 376 return 0;
376} 377}
377 378
379#ifdef CONFIG_ACPI
380static int ni_set_max_freq(struct sdhci_pci_slot *slot)
381{
382 acpi_status status;
383 unsigned long long max_freq;
384
385 status = acpi_evaluate_integer(ACPI_HANDLE(&slot->chip->pdev->dev),
386 "MXFQ", NULL, &max_freq);
387 if (ACPI_FAILURE(status)) {
388 dev_err(&slot->chip->pdev->dev,
389 "MXFQ not found in acpi table\n");
390 return -EINVAL;
391 }
392
393 slot->host->mmc->f_max = max_freq * 1000000;
394
395 return 0;
396}
397#else
398static inline int ni_set_max_freq(struct sdhci_pci_slot *slot)
399{
400 return 0;
401}
402#endif
403
378static int ni_byt_sdio_probe_slot(struct sdhci_pci_slot *slot) 404static int ni_byt_sdio_probe_slot(struct sdhci_pci_slot *slot)
379{ 405{
406 int err;
407
408 err = ni_set_max_freq(slot);
409 if (err)
410 return err;
411
380 slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_NONREMOVABLE | 412 slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_NONREMOVABLE |
381 MMC_CAP_WAIT_WHILE_BUSY; 413 MMC_CAP_WAIT_WHILE_BUSY;
382 return 0; 414 return 0;