diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2015-05-09 09:57:09 -0300 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-06-01 09:07:01 +0200 |
commit | 7ccddeb08a632c713eca0a5f13bcbfa7e6e83982 (patch) | |
tree | a100bb51be5d8d1ef88c368b1caf03ba64559c6c /drivers/mmc/card | |
parent | 15064119273735c115fba381823b0746508bae3a (diff) | |
download | op-kernel-dev-7ccddeb08a632c713eca0a5f13bcbfa7e6e83982.zip op-kernel-dev-7ccddeb08a632c713eca0a5f13bcbfa7e6e83982.tar.gz |
mmc: sdhci-esdhc-imx: Do not break platform data boards
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>
Diffstat (limited to 'drivers/mmc/card')
0 files changed, 0 insertions, 0 deletions