mmc: core: restore detect line inversion semantics
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 2 Oct 2014 07:08:46 +0000 (09:08 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Thu, 2 Oct 2014 09:51:26 +0000 (11:51 +0200)
commit89168b48991537bec2573b3b6a8841df74465b12
treef79f45a7a70b995da2fb0d7de39809dc8d2bd273
parent6a98f1e83a2874a189754ded5254ae687828739e
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>
drivers/mmc/core/host.c
drivers/mmc/core/slot-gpio.c
drivers/mmc/host/mmci.c
drivers/mmc/host/sdhci-acpi.c
include/linux/mmc/slot-gpio.h