mmc: sdhci-esdhc-imx: Do not break platform data boards
authorFabio Estevam <fabio.estevam@freescale.com>
Sat, 9 May 2015 12:57:09 +0000 (09:57 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Oct 2015 21:43:21 +0000 (14:43 -0700)
commit9a2d8c9f46a31ace6a2bc66b3b367938a177af84
treeb87ee31798a45a4c9db0d4f140e59f2dd08ee303
parentda81f3e68a13c4ab431119ed590b22e24e3e3469
mmc: sdhci-esdhc-imx: Do not break platform data boards

commit 7ccddeb08a632c713eca0a5f13bcbfa7e6e83982 upstream.

The only user of this driver that has not been converted to fully
device tree is the i.MX35 SoC.

There is a i.MX35-based board (mach-pcm043.c) that uses platform data
to pass wp_gpio and cd_gpio information.

Commit 8d86e4fcccf61ba ("mmc: sdhci-esdhc-imx: Call mmc_of_parse()")
broke the platform data case by removing mmc_gpio_request_ro() and
mmc_gpio_request_cd(), so restore the functionality for the non-dt
case.

Also, restore the check for ESDHC_CD_CONTROLLER so that we can still
support the "fsl,cd-controller" property.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mmc/host/sdhci-esdhc-imx.c