mmc: sdhci-esdhc-imx: Remove unneeded mmc-esdhc-imx.h header

After the i.MX conversion to a DT-only platform, the mmc-esdhc-imx.h
header file is no longer used outside the driver, so move its content
to the sdhci-esdhc-imx driver and remove the header.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20210719193413.3792615-1-festevam@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 72c0bf0c1887507a7db1b263ad13fae0d59a1823..57b19ca1ad6df7ae9089cde45af50e8c555e1320 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -24,7 +24,6 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/pinctrl/consumer.h>
-#include <linux/platform_data/mmc-esdhc-imx.h>
 #include <linux/pm_runtime.h>
 #include "sdhci-pltfm.h"
 #include "sdhci-esdhc.h"
@@ -191,6 +190,38 @@
  */
 #define ESDHC_FLAG_BROKEN_AUTO_CMD23   BIT(16)
 
+enum wp_types {
+       ESDHC_WP_NONE,          /* no WP, neither controller nor gpio */
+       ESDHC_WP_CONTROLLER,    /* mmc controller internal WP */
+       ESDHC_WP_GPIO,          /* external gpio pin for WP */
+};
+
+enum cd_types {
+       ESDHC_CD_NONE,          /* no CD, neither controller nor gpio */
+       ESDHC_CD_CONTROLLER,    /* mmc controller internal CD */
+       ESDHC_CD_GPIO,          /* external gpio pin for CD */
+       ESDHC_CD_PERMANENT,     /* no CD, card permanently wired to host */
+};
+
+/*
+ * struct esdhc_platform_data - platform data for esdhc on i.MX
+ *
+ * ESDHC_WP(CD)_CONTROLLER type is not available on i.MX25/35.
+ *
+ * @wp_type:   type of write_protect method (see wp_types enum above)
+ * @cd_type:   type of card_detect method (see cd_types enum above)
+ */
+
+struct esdhc_platform_data {
+       enum wp_types wp_type;
+       enum cd_types cd_type;
+       int max_bus_width;
+       unsigned int delay_line;
+       unsigned int tuning_step;       /* The delay cell steps in tuning procedure */
+       unsigned int tuning_start_tap;  /* The start delay cell point in tuning procedure */
+       unsigned int strobe_dll_delay_target;   /* The delay cell for strobe pad (read clock) */
+};
+
 struct esdhc_soc_data {
        u32 flags;
 };

diff --git a/include/linux/platform_data/mmc-esdhc-imx.h b/include/linux/platform_data/mmc-esdhc-imx.h
deleted file mode 100644 (file)
index cba1184..0000000
--- a/include/linux/platform_data/mmc-esdhc-imx.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright 2010 Wolfram Sang <kernel@pengutronix.de>
- */
-
-#ifndef __ASM_ARCH_IMX_ESDHC_H
-#define __ASM_ARCH_IMX_ESDHC_H
-
-#include <linux/types.h>
-
-enum wp_types {
-       ESDHC_WP_NONE,          /* no WP, neither controller nor gpio */
-       ESDHC_WP_CONTROLLER,    /* mmc controller internal WP */
-       ESDHC_WP_GPIO,          /* external gpio pin for WP */
-};
-
-enum cd_types {
-       ESDHC_CD_NONE,          /* no CD, neither controller nor gpio */
-       ESDHC_CD_CONTROLLER,    /* mmc controller internal CD */
-       ESDHC_CD_GPIO,          /* external gpio pin for CD */
-       ESDHC_CD_PERMANENT,     /* no CD, card permanently wired to host */
-};
-
-/**
- * struct esdhc_platform_data - platform data for esdhc on i.MX
- *
- * ESDHC_WP(CD)_CONTROLLER type is not available on i.MX25/35.
- *
- * @wp_type:   type of write_protect method (see wp_types enum above)
- * @cd_type:   type of card_detect method (see cd_types enum above)
- */
-
-struct esdhc_platform_data {
-       enum wp_types wp_type;
-       enum cd_types cd_type;
-       int max_bus_width;
-       unsigned int delay_line;
-       unsigned int tuning_step;       /* The delay cell steps in tuning procedure */
-       unsigned int tuning_start_tap;  /* The start delay cell point in tuning procedure */
-       unsigned int strobe_dll_delay_target;   /* The delay cell for strobe pad (read clock) */
-};
-#endif /* __ASM_ARCH_IMX_ESDHC_H */