]> git.baikalelectronics.ru Git - kernel.git/commit
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)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 1 Jun 2015 07:07:01 +0000 (09:07 +0200)
commit966281fcca82cd5f12e6d5ac94ea86c58f217dfb
treea100bb51be5d8d1ef88c368b1caf03ba64559c6c
parentd9a9d457ff98441ff9a3373cf84cca56aab29d6e
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 944abfd167ad1ec ("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>
drivers/mmc/host/sdhci-esdhc-imx.c