summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-02-09 03:11:09 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-02-09 03:11:09 -0800
commit3b74b552e91e11fd73849a66498b43fd788430ad (patch)
treefd3109f55a60e73c4d9fb793a44e24888cc7be85 /drivers
parentf487064d899c2b6062f81cb2d85caf7e185cbfd3 (diff)
parentf5f7ed7afdcc9716286625f62e9e2cfd999b3017 (diff)
Merge "mmc: sdhci-msm: Provide module/cmdline parameter for disabling cmdq"
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci-msm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index f43f22503aa3..127a2602aa81 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -335,6 +335,9 @@ static int disable_slots;
/* root can write, others read */
module_param(disable_slots, int, S_IRUGO|S_IWUSR);
+static bool nocmdq;
+module_param(nocmdq, bool, S_IRUGO|S_IWUSR);
+
enum vdd_io_level {
/* set vdd_io_data->low_vol_level */
VDD_IO_LOW,
@@ -4135,6 +4138,11 @@ static void sdhci_msm_cmdq_init(struct sdhci_host *host,
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct sdhci_msm_host *msm_host = pltfm_host->priv;
+ if (nocmdq) {
+ dev_dbg(&pdev->dev, "CMDQ disabled via cmdline\n");
+ return;
+ }
+
host->cq_host = cmdq_pltfm_init(pdev);
if (IS_ERR(host->cq_host)) {
dev_dbg(&pdev->dev, "cmdq-pltfm init: failed: %ld\n",