From: Neil Armstrong <narmstr...@baylibre.com>
Move the asm/arch-meson/sd_emmc.h to a local meson_gx_mmc.h,
remove the useless if/then and fix the meson_gx_mmc.c include.
Signed-off-by: Neil Armstrong <narmstr...@baylibre.com>
---
drivers/mmc/meson_gx_mmc.c | 2 +-
.../asm/arch-meson/sd_emmc.h => drivers/mmc/meson_gx_mmc.h | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
rename arch/arm/include/asm/arch-meson/sd_emmc.h => drivers/mmc/meson_gx_mmc.h
(97%)
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index 719dd1e5e570..eedebb317b5f 100644
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -13,9 +13,9 @@
#include <mmc.h>
#include <asm/io.h>
#include <asm/gpio.h>
-#include <asm/arch/sd_emmc.h>
#include <linux/delay.h>
#include <linux/log2.h>
+#include "meson_gx_mmc.h"
static inline void *get_regbase(const struct mmc *mmc)
{
diff --git a/arch/arm/include/asm/arch-meson/sd_emmc.h
b/drivers/mmc/meson_gx_mmc.h
similarity index 97%
rename from arch/arm/include/asm/arch-meson/sd_emmc.h
rename to drivers/mmc/meson_gx_mmc.h
index 1e9f8cf498b4..b4544b55628f 100644
--- a/arch/arm/include/asm/arch-meson/sd_emmc.h
+++ b/drivers/mmc/meson_gx_mmc.h
@@ -3,14 +3,11 @@
* (C) Copyright 2016 Carlo Caione <ca...@caione.org>
*/
-#ifndef __SD_EMMC_H__
-#define __SD_EMMC_H__
+#ifndef __MESON_GX_MMC_H__
+#define __MESON_GX_MMC_H__
#include <mmc.h>
-#ifndef __ASSEMBLY__
#include <linux/bitops.h>
-#endif
-
#define SDIO_PORT_A 0
#define SDIO_PORT_B 1
--
2.29.0
