diff options
| author | Neil Armstrong <narmstrong@baylibre.com> | 2020-11-11 08:22:09 +0900 |
|---|---|---|
| committer | Neil Armstrong <narmstrong@baylibre.com> | 2020-11-12 14:31:29 +0100 |
| commit | 77863d43eb2b40319619bbb4f781270d8f027189 (patch) | |
| tree | 95624e5ad6d99f7688688b7540e9512d97a3100e | |
| parent | b6a71e26c9caf0d2adbdbbd823498a006b994179 (diff) | |
| download | u-boot-77863d43eb2b40319619bbb4f781270d8f027189.tar.gz u-boot-77863d43eb2b40319619bbb4f781270d8f027189.tar.xz u-boot-77863d43eb2b40319619bbb4f781270d8f027189.zip | |
mmc: meson-gx: move arch header to local header
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 <narmstrong@baylibre.com>
| -rw-r--r-- | drivers/mmc/meson_gx_mmc.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/meson_gx_mmc.h (renamed from arch/arm/include/asm/arch-meson/sd_emmc.h) | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index 719dd1e5e5..eedebb317b 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 index 1e9f8cf498..b4544b5562 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 <carlo@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 |