mmc: core: restore detect line inversion semantics

commit 98e90de99a0c43bd434da814c882c4332441871e
"mmc: host: switch OF parser to use gpio descriptors"
switched the semantic behaviour of card detect and read
only flags such that the inversion capability flag would
only be set if inversion was explicitly specified in the
device tree, in the hopes that no-one was using double
inversion.

It turns out that the XOR:ing between the explicit
inversion was indeed in use, so we need to restore the
old semantics where both ways of inversion are checked
and the end result XOR:ed.

Reported-by: Javier Martinez Canillas <javier@dowhile0.org>
Tested-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index c9dafed550f2..43af791e2e45 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1682,7 +1682,7 @@ static int mmci_probe(struct amba_device *dev,
          * silently of these do not exist and proceed to try platform data
          */
         if (!np) {
-                ret = mmc_gpiod_request_cd(mmc, "cd", 0, false, 0);
+                ret = mmc_gpiod_request_cd(mmc, "cd", 0, false, 0, NULL);
                 if (ret < 0) {
                         if (ret == -EPROBE_DEFER)
                                 goto clk_disable;
@@ -1693,7 +1693,7 @@ static int mmci_probe(struct amba_device *dev,
                         }
                 }
 
-                ret = mmc_gpiod_request_ro(mmc, "wp", 0, false, 0);
+                ret = mmc_gpiod_request_ro(mmc, "wp", 0, false, 0, NULL);
                 if (ret < 0) {
                         if (ret == -EPROBE_DEFER)
                                 goto clk_disable;
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 3483c089baa7..327bc24ec8ce 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -352,7 +352,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
         if (sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD)) {
                 bool v = sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD_OVERRIDE_LEVEL);
 
-                if (mmc_gpiod_request_cd(host->mmc, NULL, 0, v, 0)) {
+                if (mmc_gpiod_request_cd(host->mmc, NULL, 0, v, 0, NULL)) {
                         dev_warn(dev, "failed to setup card detect gpio\n");
                         c->use_runtime_pm = false;
                 }