On 11/6/20 6:27 PM, Neil Armstrong wrote: > 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 | 4 ++-- > .../asm/arch-meson/sd_emmc.h => drivers/mmc/meson_gx_mmc.h | 7 ++----- > 2 files changed, 4 insertions(+), 7 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 719dd1e5e5..9350edf3fa 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) > { > @@ -265,7 +265,7 @@ static int meson_mmc_probe(struct udevice *dev) > cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT | > MMC_MODE_HS_52MHz | MMC_MODE_HS; > cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV); > - cfg->f_max = 100000000; /* 100 MHz */ > + cfg->f_max = 100000000; /* 100 MHz */;
Don't need to touch. Remove ";" > cfg->b_max = 511; /* max 512 - 1 blocks */ > cfg->name = dev->name; > > 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 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 <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 >