Re: [U-Boot] [v3, 2/5] mmc: split fsl_esdhc driver for i.MX
> -Original Message-
> From: Y.b. Lu
> Sent: 2019年5月29日 15:10
> To: Lukasz Majewski
> Cc: u-boot@lists.denx.de; Stefano Babic ; Fabio Estevam
> ; dl-uboot-imx ; Albert Aribaud
> ; Eddy Petrișor ;
> Akshay Bhat ; Ken Lin
> ; Heiko Schocher ; Christian
> Gmeiner ; Stefan Roese ; Patrick
> Bruenn ; Troy Kisky
> ; Uri Mashiach
> ; Nikita Kiryanov ;
> Otavio Salvador ; Andreas Geisreiter
> ; Ludwig Zenz ;
> Peng Fan ; Jason Liu ; Ye Li
> ; Adrian Alonso ; Alison Wang
> ; thar...@gateworks.com; Ian Ray
> ; Marcin Niestroj ; Andrej
> Rosano ; Marek Vasut ; Adam
> Ford ; Olaf Mandel ;
> Martyn Welch ; Ingo Schroeck
> ; Soeren Moch ; Richard Hu
> ; Vanessa Maegima
> ; Max Krummenacher
> ; Stefan Agner
> ; Markus Niebel ;
> Breno Matheus Lima ; Francesco Montefoschi
> ; Parthiban Nallathambi
> ; Albert ARIBAUD ; Jagan
> Teki ; Raffaele RECALCATI
> ; Simone CIANNI ;
> Bhaskar Upadhaya ; Prabhakar Kushwaha
> ; Rajesh Bhagat ;
> Antti Mäentausta ; Sébastien Szymanski
> ; Lucile Quirion
> ; Alexey Brodkin
> ; Trevor Woerner ;
> Anatolij Gustschin ; Denis Zalevskiy
> ; Fabien Lahoudere
> ; Joe Hershberger
> ; Simon Goldschmidt
> ; James Byrne
> ; Angelo Dureghello
> Subject: RE: [v3, 2/5] mmc: split fsl_esdhc driver for i.MX
>
> > -Original Message-
> > From: Lukasz Majewski
> > Sent: 2019年5月29日 14:30
> > To: Y.b. Lu
> > Cc: u-boot@lists.denx.de; Stefano Babic ; Fabio
> > Estevam ; dl-uboot-imx ;
> Albert
> > Aribaud ; Eddy Petrișor
> > ; Akshay Bhat ; Ken
> > Lin ; Heiko Schocher ; Christian
> > Gmeiner ; Stefan Roese ;
> > Patrick Bruenn ; Troy Kisky
> > ; Uri Mashiach
> > ; Nikita Kiryanov
> > ; Otavio Salvador ;
> > Andreas Geisreiter ; Ludwig Zenz
> > ; Eric Bénard ; Peng Fan
> > ; Jason Liu ; Ye Li
> > ; Adrian Alonso ; Alison Wang
> > ; thar...@gateworks.com; Ian Ray
> > ; Marcin Niestroj ;
> > Andrej Rosano ; Marek Vasut ;
> > Adam Ford ; Olaf Mandel
> > ; Martyn Welch
> > ; Ingo Schroeck ;
> > Boris Brezillon ; Soeren Moch
> > ; Richard Hu ; Vanessa
> > Maegima ; Max Krummenacher
> > ; Stefan Agner
> > ; Markus Niebel
> > ; Breno Matheus Lima
> ;
> > Francesco Montefoschi ; Parthiban
> > Nallathambi ; Albert ARIBAUD
> > ; Jagan Teki ;
> > Raffaele RECALCATI ; Simone CIANNI
> > ; Bhaskar Upadhaya
> > ; Vinitha V Pillai ;
> > Prabhakar Kushwaha ; Rajesh Bhagat
> > ; Antti Mäentausta ;
> > Sébastien Szymanski ; Lucile Quirion
> > ; Alexey Brodkin
> > ; Trevor Woerner ;
> > Anatolij Gustschin ; Denis Zalevskiy
> > ; Fabien Lahoudere
> > ; Joe Hershberger
> > ; Simon Goldschmidt
> > ; James Byrne
> > ; Angelo Dureghello
> > Subject: Re: [v3, 2/5] mmc: split fsl_esdhc driver for i.MX
> >
> > Hi Y.b. Lu,
> >
> > > The fsl_esdhc driver was for Freescale eSDHC on MPC83XX/MPC85XX
> > > initially. The later QoriQ series PowerPC processors (which were
> > > evolutions of MPC83XX/MPC85XX), QorIQ series ARM processors, and
> > > i.MX series processors were using this driver for their eSDHCs too.
> > >
> > > For the two series processors, the eSDHCs are becoming more and more
> > > different. We should have split it into two drivers, like them
> > > (sdhci-of-esdhc.c/sdhci-esdhc-imx.c) in linux kernel.
> > >
> > > This patch is just to create a fsl_esdhc_imx driver which is a copy
> > > of fsl_esdhc driver for i.MX processors. We will convert i.MX
> > > processors to use fsl_esdhc_imx, and clean up the two drivers
> > > separately in the future patches.
> > >
> > > Signed-off-by: Yangbo Lu
> > > ---
> > > Changes for v2:
> > > - None.
> > > Changes for v3:
> > > - None.
> > > ---
> > > drivers/mmc/Kconfig | 6 ++
> > > drivers/mmc/Makefile | 1 +
> > > drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} | 5 +++--
> > > include/{fsl_esdhc.h => fsl_esdhc_imx.h} | 11 ++-
> > > 4 files changed, 16 insertions(+), 7 deletions(-) copy
> > > drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} (99%) copy
> > > include/{fsl_esdhc.h => fsl_esdhc_imx.h} (97%)
> > >
> > > diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index
> > > c23299ea96..4e33fa1b2d 100644
> > > --- a/drivers/mmc/Kconfig
> > > +++ b/drivers/mmc/Kconfig
> > > @@ -671,6 +671,12 @@ config FSL_ESDHC
> > > This selects support for the eSDHC (enhanced secure digital host
> > > controller) found on numerous Freescale/NXP SoCs.
> > >
> > > +config FSL_ESDHC_IMX
> > > + bool "Freescale/NXP i.MX eSDHC controller support"
> > > + help
> > > + This selects support for the i.MX eSDHC (enhanced secure
> > > digital host
> > > + controller) found on numerous Freescale/NXP SoCs.
> > > +
> >
> > You shall use capital letters for "Enhanced Secure Digital Host"
>
> [Y.b. Lu] Get it. Will fix that.
>
> >
> > > endmenu
> > >
> > > config SYS_FSL_ERRATUM_ESDHC111
> > > diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index
> > > 0076fc393b..3c8c53a9e1 100644
> > > --- a/drivers/mmc/Makefile
> > > +++ b/drivers/mmc/Makefile
> > > @@ -26,6 +26,7 @@ obj-$(CONFIG_MMC_DW_ROCKCHIP)
Re: [U-Boot] [v3, 2/5] mmc: split fsl_esdhc driver for i.MX
> -Original Message-
> From: Lukasz Majewski
> Sent: 2019年5月29日 14:30
> To: Y.b. Lu
> Cc: u-boot@lists.denx.de; Stefano Babic ; Fabio Estevam
> ; dl-uboot-imx ; Albert Aribaud
> ; Eddy Petrișor ;
> Akshay Bhat ; Ken Lin
> ; Heiko Schocher ; Christian
> Gmeiner ; Stefan Roese ; Patrick
> Bruenn ; Troy Kisky
> ; Uri Mashiach
> ; Nikita Kiryanov ;
> Otavio Salvador ; Andreas Geisreiter
> ; Ludwig Zenz ; Eric
> Bénard ; Peng Fan ; Jason Liu
> ; Ye Li ; Adrian Alonso
> ; Alison Wang ;
> thar...@gateworks.com; Ian Ray ; Marcin Niestroj
> ; Andrej Rosano ;
> Marek Vasut ; Adam Ford ; Olaf
> Mandel ; Martyn Welch
> ; Ingo Schroeck ;
> Boris Brezillon ; Soeren Moch
> ; Richard Hu ; Vanessa
> Maegima ; Max Krummenacher
> ; Stefan Agner
> ; Markus Niebel ;
> Breno Matheus Lima ; Francesco Montefoschi
> ; Parthiban Nallathambi
> ; Albert ARIBAUD ; Jagan
> Teki ; Raffaele RECALCATI
> ; Simone CIANNI ;
> Bhaskar Upadhaya ; Vinitha V Pillai
> ; Prabhakar Kushwaha
> ; Rajesh Bhagat ;
> Antti Mäentausta ; Sébastien Szymanski
> ; Lucile Quirion
> ; Alexey Brodkin
> ; Trevor Woerner ;
> Anatolij Gustschin ; Denis Zalevskiy
> ; Fabien Lahoudere
> ; Joe Hershberger
> ; Simon Goldschmidt
> ; James Byrne
> ; Angelo Dureghello
> Subject: Re: [v3, 2/5] mmc: split fsl_esdhc driver for i.MX
>
> Hi Y.b. Lu,
>
> > The fsl_esdhc driver was for Freescale eSDHC on MPC83XX/MPC85XX
> > initially. The later QoriQ series PowerPC processors (which were
> > evolutions of MPC83XX/MPC85XX), QorIQ series ARM processors, and i.MX
> > series processors were using this driver for their eSDHCs too.
> >
> > For the two series processors, the eSDHCs are becoming more and more
> > different. We should have split it into two drivers, like them
> > (sdhci-of-esdhc.c/sdhci-esdhc-imx.c) in linux kernel.
> >
> > This patch is just to create a fsl_esdhc_imx driver which is a copy of
> > fsl_esdhc driver for i.MX processors. We will convert i.MX processors
> > to use fsl_esdhc_imx, and clean up the two drivers separately in the
> > future patches.
> >
> > Signed-off-by: Yangbo Lu
> > ---
> > Changes for v2:
> > - None.
> > Changes for v3:
> > - None.
> > ---
> > drivers/mmc/Kconfig | 6 ++
> > drivers/mmc/Makefile | 1 +
> > drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} | 5 +++--
> > include/{fsl_esdhc.h => fsl_esdhc_imx.h} | 11 ++-
> > 4 files changed, 16 insertions(+), 7 deletions(-) copy
> > drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} (99%) copy
> > include/{fsl_esdhc.h => fsl_esdhc_imx.h} (97%)
> >
> > diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index
> > c23299ea96..4e33fa1b2d 100644
> > --- a/drivers/mmc/Kconfig
> > +++ b/drivers/mmc/Kconfig
> > @@ -671,6 +671,12 @@ config FSL_ESDHC
> > This selects support for the eSDHC (enhanced secure digital host
> > controller) found on numerous Freescale/NXP SoCs.
> >
> > +config FSL_ESDHC_IMX
> > + bool "Freescale/NXP i.MX eSDHC controller support"
> > + help
> > + This selects support for the i.MX eSDHC (enhanced secure
> > digital host
> > + controller) found on numerous Freescale/NXP SoCs.
> > +
>
> You shall use capital letters for "Enhanced Secure Digital Host"
[Y.b. Lu] Get it. Will fix that.
>
> > endmenu
> >
> > config SYS_FSL_ERRATUM_ESDHC111
> > diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index
> > 0076fc393b..3c8c53a9e1 100644
> > --- a/drivers/mmc/Makefile
> > +++ b/drivers/mmc/Makefile
> > @@ -26,6 +26,7 @@ obj-$(CONFIG_MMC_DW_ROCKCHIP) +=
> > rockchip_dw_mmc.o obj-$(CONFIG_MMC_DW_SOCFPGA) +=
> > socfpga_dw_mmc.o obj-$(CONFIG_MMC_DW_SNPS) +=
> > snps_dw_mmc.o obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o
> > +obj-$(CONFIG_FSL_ESDHC_IMX) += fsl_esdhc_imx.o
> > obj-$(CONFIG_FTSDC010) += ftsdc010_mci.o
> > obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o
> > obj-$(CONFIG_MMC_MESON_GX) += meson_gx_mmc.o diff --git
> > a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc_imx.c similarity
> > index 99% copy from drivers/mmc/fsl_esdhc.c copy to
> > drivers/mmc/fsl_esdhc_imx.c index 1b7de74a72..faf133390f 100644
> > --- a/drivers/mmc/fsl_esdhc.c
> > +++ b/drivers/mmc/fsl_esdhc_imx.c
> > @@ -2,6 +2,7 @@
> > /*
> > * Copyright 2007, 2010-2011 Freescale Semiconductor, Inc
> > * Andy Fleming
> > + * Copyright 2019 NXP
>
> This line shall be on top of the comment. Also you shall state your name and
> e-mail.
>
[Y.b. Lu] Ok. Will do that.
> > *
> > * Based vaguely on the pxa mmc code:
> > * (C) Copyright 2003
> > @@ -18,7 +19,7 @@
> > #include
> > #include
> > #include
> > -#include
> > +#include
> > #include
> > #include
> > #include
> > @@ -110,7 +111,7 @@ struct esdhc_soc_data {
> > * @non_removable: 0: removable; 1: non-removable
> > * @wp_enable: 1: enable checking wp; 0: no check
> > * @vs18_enable: 1: use 1.8V voltage; 0: use 3.3V
> > - * @flags: ESDHC_FLAG_xx in include/fsl_esdhc.h
> > + * @flags:
Re: [U-Boot] [v3, 2/5] mmc: split fsl_esdhc driver for i.MX
Hi Y.b. Lu,
> The fsl_esdhc driver was for Freescale eSDHC on MPC83XX/MPC85XX
> initially. The later QoriQ series PowerPC processors (which were
> evolutions of MPC83XX/MPC85XX), QorIQ series ARM processors, and
> i.MX series processors were using this driver for their eSDHCs too.
>
> For the two series processors, the eSDHCs are becoming more and
> more different. We should have split it into two drivers, like them
> (sdhci-of-esdhc.c/sdhci-esdhc-imx.c) in linux kernel.
>
> This patch is just to create a fsl_esdhc_imx driver which is a copy
> of fsl_esdhc driver for i.MX processors. We will convert i.MX
> processors to use fsl_esdhc_imx, and clean up the two drivers
> separately in the future patches.
>
> Signed-off-by: Yangbo Lu
> ---
> Changes for v2:
> - None.
> Changes for v3:
> - None.
> ---
> drivers/mmc/Kconfig | 6 ++
> drivers/mmc/Makefile | 1 +
> drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} | 5 +++--
> include/{fsl_esdhc.h => fsl_esdhc_imx.h} | 11 ++-
> 4 files changed, 16 insertions(+), 7 deletions(-)
> copy drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} (99%)
> copy include/{fsl_esdhc.h => fsl_esdhc_imx.h} (97%)
>
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
> index c23299ea96..4e33fa1b2d 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -671,6 +671,12 @@ config FSL_ESDHC
> This selects support for the eSDHC (enhanced secure
> digital host controller) found on numerous Freescale/NXP SoCs.
>
> +config FSL_ESDHC_IMX
> + bool "Freescale/NXP i.MX eSDHC controller support"
> + help
> + This selects support for the i.MX eSDHC (enhanced secure
> digital host
> + controller) found on numerous Freescale/NXP SoCs.
> +
You shall use capital letters for "Enhanced Secure Digital Host"
> endmenu
>
> config SYS_FSL_ERRATUM_ESDHC111
> diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
> index 0076fc393b..3c8c53a9e1 100644
> --- a/drivers/mmc/Makefile
> +++ b/drivers/mmc/Makefile
> @@ -26,6 +26,7 @@ obj-$(CONFIG_MMC_DW_ROCKCHIP) +=
> rockchip_dw_mmc.o obj-$(CONFIG_MMC_DW_SOCFPGA)+=
> socfpga_dw_mmc.o obj-$(CONFIG_MMC_DW_SNPS)+=
> snps_dw_mmc.o obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o
> +obj-$(CONFIG_FSL_ESDHC_IMX) += fsl_esdhc_imx.o
> obj-$(CONFIG_FTSDC010) += ftsdc010_mci.o
> obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o
> obj-$(CONFIG_MMC_MESON_GX) += meson_gx_mmc.o
> diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc_imx.c
> similarity index 99%
> copy from drivers/mmc/fsl_esdhc.c
> copy to drivers/mmc/fsl_esdhc_imx.c
> index 1b7de74a72..faf133390f 100644
> --- a/drivers/mmc/fsl_esdhc.c
> +++ b/drivers/mmc/fsl_esdhc_imx.c
> @@ -2,6 +2,7 @@
> /*
> * Copyright 2007, 2010-2011 Freescale Semiconductor, Inc
> * Andy Fleming
> + * Copyright 2019 NXP
This line shall be on top of the comment. Also you shall state your
name and e-mail.
> *
> * Based vaguely on the pxa mmc code:
> * (C) Copyright 2003
> @@ -18,7 +19,7 @@
> #include
> #include
> #include
> -#include
> +#include
> #include
> #include
> #include
> @@ -110,7 +111,7 @@ struct esdhc_soc_data {
> * @non_removable: 0: removable; 1: non-removable
> * @wp_enable: 1: enable checking wp; 0: no check
> * @vs18_enable: 1: use 1.8V voltage; 0: use 3.3V
> - * @flags: ESDHC_FLAG_xx in include/fsl_esdhc.h
> + * @flags: ESDHC_FLAG_xx in include/fsl_esdhc_imx.h
> * @caps: controller capabilities
> * @tuning_step: tuning step setting in tuning_ctrl register
> * @start_tuning_tap: the start point for tuning in tuning_ctrl
> register diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc_imx.h
> similarity index 97%
> copy from include/fsl_esdhc.h
> copy to include/fsl_esdhc_imx.h
> index 8dbd5249a7..e05b24e7e8 100644
> --- a/include/fsl_esdhc.h
> +++ b/include/fsl_esdhc_imx.h
> @@ -4,10 +4,11 @@
> *---
> *
> * Copyright 2007-2008,2010-2011 Freescale Semiconductor, Inc
> + * Copyright 2019 NXP
The same comment as above applies.
> */
>
> -#ifndef __FSL_ESDHC_H__
> -#define __FSL_ESDHC_H__
> +#ifndef __FSL_ESDHC_IMX_H__
> +#define __FSL_ESDHC_IMX_H__
>
> #include
> #include
> @@ -258,15 +259,15 @@ struct fsl_esdhc_cfg {
> #error "Endianess is not defined: please fix to continue"
> #endif
>
> -#ifdef CONFIG_FSL_ESDHC
> +#ifdef CONFIG_FSL_ESDHC_IMX
> int fsl_esdhc_mmc_init(bd_t *bis);
> int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg);
> void fdt_fixup_esdhc(void *blob, bd_t *bd);
> #else
> static inline int fsl_esdhc_mmc_init(bd_t *bis) { return -ENOSYS; }
> static inline void fdt_fixup_esdhc(void *blob, bd_t *bd) {}
> -#endif /* CONFIG_FSL_ESDHC */
> +#endif /* CONFIG_FSL_ESDHC_IMX */
> void __noreturn mmc_boot(void);
> void mmc_spl_load_image(uint32_t offs, unsigned int size, void
> *vdst);
> -#endif /*
Re: [U-Boot] [v3, 2/5] mmc: split fsl_esdhc driver for i.MX
> Subject: [v3, 2/5] mmc: split fsl_esdhc driver for i.MX
>
> The fsl_esdhc driver was for Freescale eSDHC on MPC83XX/MPC85XX initially.
> The later QoriQ series PowerPC processors (which were evolutions of
> MPC83XX/MPC85XX), QorIQ series ARM processors, and i.MX series
> processors were using this driver for their eSDHCs too.
>
> For the two series processors, the eSDHCs are becoming more and more
> different. We should have split it into two drivers, like them
> (sdhci-of-esdhc.c/sdhci-esdhc-imx.c) in linux kernel.
>
> This patch is just to create a fsl_esdhc_imx driver which is a copy of
> fsl_esdhc
> driver for i.MX processors. We will convert i.MX processors to use
> fsl_esdhc_imx, and clean up the two drivers separately in the future patches.
>
> Signed-off-by: Yangbo Lu
> ---
> Changes for v2:
> - None.
> Changes for v3:
> - None.
> ---
> drivers/mmc/Kconfig | 6 ++
> drivers/mmc/Makefile | 1 +
> drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} | 5 +++--
> include/{fsl_esdhc.h => fsl_esdhc_imx.h} | 11 ++-
> 4 files changed, 16 insertions(+), 7 deletions(-) copy
> drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} (99%) copy
> include/{fsl_esdhc.h => fsl_esdhc_imx.h} (97%)
>
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index
> c23299ea96..4e33fa1b2d 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -671,6 +671,12 @@ config FSL_ESDHC
> This selects support for the eSDHC (enhanced secure digital host
> controller) found on numerous Freescale/NXP SoCs.
>
> +config FSL_ESDHC_IMX
> + bool "Freescale/NXP i.MX eSDHC controller support"
> + help
> + This selects support for the i.MX eSDHC (enhanced secure digital host
> + controller) found on numerous Freescale/NXP SoCs.
> +
> endmenu
>
> config SYS_FSL_ERRATUM_ESDHC111
> diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index
> 0076fc393b..3c8c53a9e1 100644
> --- a/drivers/mmc/Makefile
> +++ b/drivers/mmc/Makefile
> @@ -26,6 +26,7 @@ obj-$(CONFIG_MMC_DW_ROCKCHIP) +=
> rockchip_dw_mmc.o
> obj-$(CONFIG_MMC_DW_SOCFPGA) += socfpga_dw_mmc.o
> obj-$(CONFIG_MMC_DW_SNPS)+= snps_dw_mmc.o
> obj-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o
> +obj-$(CONFIG_FSL_ESDHC_IMX) += fsl_esdhc_imx.o
> obj-$(CONFIG_FTSDC010) += ftsdc010_mci.o
> obj-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o
> obj-$(CONFIG_MMC_MESON_GX) += meson_gx_mmc.o diff --git
> a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc_imx.c similarity index
> 99% copy from drivers/mmc/fsl_esdhc.c copy to
> drivers/mmc/fsl_esdhc_imx.c index 1b7de74a72..faf133390f 100644
> --- a/drivers/mmc/fsl_esdhc.c
> +++ b/drivers/mmc/fsl_esdhc_imx.c
> @@ -2,6 +2,7 @@
> /*
> * Copyright 2007, 2010-2011 Freescale Semiconductor, Inc
> * Andy Fleming
> + * Copyright 2019 NXP
> *
> * Based vaguely on the pxa mmc code:
> * (C) Copyright 2003
> @@ -18,7 +19,7 @@
> #include
> #include
> #include
> -#include
> +#include
> #include
> #include
> #include
> @@ -110,7 +111,7 @@ struct esdhc_soc_data {
> * @non_removable: 0: removable; 1: non-removable
> * @wp_enable: 1: enable checking wp; 0: no check
> * @vs18_enable: 1: use 1.8V voltage; 0: use 3.3V
> - * @flags: ESDHC_FLAG_xx in include/fsl_esdhc.h
> + * @flags: ESDHC_FLAG_xx in include/fsl_esdhc_imx.h
> * @caps: controller capabilities
> * @tuning_step: tuning step setting in tuning_ctrl register
> * @start_tuning_tap: the start point for tuning in tuning_ctrl register diff
> --git a/include/fsl_esdhc.h b/include/fsl_esdhc_imx.h similarity index 97%
> copy from include/fsl_esdhc.h copy to include/fsl_esdhc_imx.h index
> 8dbd5249a7..e05b24e7e8 100644
> --- a/include/fsl_esdhc.h
> +++ b/include/fsl_esdhc_imx.h
> @@ -4,10 +4,11 @@
> *---
> *
> * Copyright 2007-2008,2010-2011 Freescale Semiconductor, Inc
> + * Copyright 2019 NXP
> */
>
> -#ifndef __FSL_ESDHC_H__
> -#define __FSL_ESDHC_H__
> +#ifndef __FSL_ESDHC_IMX_H__
> +#define __FSL_ESDHC_IMX_H__
>
> #include
> #include
> @@ -258,15 +259,15 @@ struct fsl_esdhc_cfg { #error "Endianess is not
> defined: please fix to continue"
> #endif
>
> -#ifdef CONFIG_FSL_ESDHC
> +#ifdef CONFIG_FSL_ESDHC_IMX
> int fsl_esdhc_mmc_init(bd_t *bis);
> int fsl_esdhc_initialize(bd_t *bis, struct fsl_esdhc_cfg *cfg); void
> fdt_fixup_esdhc(void *blob, bd_t *bd); #else static inline int
> fsl_esdhc_mmc_init(bd_t *bis) { return -ENOSYS; } static inline void
> fdt_fixup_esdhc(void *blob, bd_t *bd) {} -#endif /* CONFIG_FSL_ESDHC */
> +#endif /* CONFIG_FSL_ESDHC_IMX */
> void __noreturn mmc_boot(void);
> void mmc_spl_load_image(uint32_t offs, unsigned int size, void *vdst);
>
> -#endif /* __FSL_ESDHC_H__ */
> +#endif /* __FSL_ESDHC_IMX_H__ */
Reviewed-by: Peng Fan
> --
> 2.17.1
___
U-Boot mailing
