On Mon, 15 Mar 2021 at 00:08, Fabio Estevam <festevam@xxxxxxxxx> wrote:
>
> i.MX has been converted to a devicetree only platform, so remove
> the non-DT stub for sdhci_esdhc_imx_probe_dt().
>
> Also, make the driver depend on OF now.
>
> Signed-off-by: Fabio Estevam <festevam@xxxxxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> Changes since v1:
> - Fix typo in Subject: immc --> mmc
>
> drivers/mmc/host/Kconfig | 1 +
> drivers/mmc/host/sdhci-esdhc-imx.c | 10 ----------
> 2 files changed, 1 insertion(+), 10 deletions(-)
>
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index b236dfe2e879..e911eb570fbc 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -278,6 +278,7 @@ config MMC_SDHCI_ESDHC_IMX
> tristate "SDHCI support for the Freescale eSDHC/uSDHC i.MX controller"
> depends on ARCH_MXC || COMPILE_TEST
> depends on MMC_SDHCI_PLTFM
> + depends on OF
> select MMC_SDHCI_IO_ACCESSORS
> select MMC_CQHCI
> help
> diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
> index 94327988da91..2a1fb1cd4433 100644
> --- a/drivers/mmc/host/sdhci-esdhc-imx.c
> +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
> @@ -1453,7 +1453,6 @@ static const struct cqhci_host_ops esdhc_cqhci_ops = {
> .dumpregs = esdhc_sdhci_dumpregs,
> };
>
> -#ifdef CONFIG_OF
> static int
> sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
> struct sdhci_host *host,
> @@ -1505,15 +1504,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
>
> return 0;
> }
> -#else
> -static inline int
> -sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
> - struct sdhci_host *host,
> - struct pltfm_imx_data *imx_data)
> -{
> - return -ENODEV;
> -}
> -#endif
>
> static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
> {
> --
> 2.25.1
>
