| Message ID | 20200617100900.6506-2-yangbo.lu@nxp.com |
|---|---|
| State | Accepted |
| Commit | 4f73897b99cba1c051f4f5ed8a0e77619dedf8d6 |
| Headers | show |
| Series | Move eSDHC adapter card code to board files | expand |
> Subject: [PATCH 1/4] Drop global data sdhc_adapter for powerpc > > The sdhc_adapter of global data has not been used, and we do not have to > use it as global data even we may need it in the future. > > Signed-off-by: Yangbo Lu <yangbo.lu at nxp.com> Reviewed-by: Peng Fan <peng.fan at nxp.com> Regards, Peng. > --- > arch/powerpc/include/asm/global_data.h | 4 +--- > drivers/mmc/fsl_esdhc.c | 1 - > 2 files changed, 1 insertion(+), 4 deletions(-) > > diff --git a/arch/powerpc/include/asm/global_data.h > b/arch/powerpc/include/asm/global_data.h > index 1620fba..192a02d 100644 > --- a/arch/powerpc/include/asm/global_data.h > +++ b/arch/powerpc/include/asm/global_data.h > @@ -1,6 +1,7 @@ > /* SPDX-License-Identifier: GPL-2.0+ */ > /* > * (C) Copyright 2002-2010 > + * Copyright 2020 NXP > * Wolfgang Denk, DENX Software Engineering, wd at denx.de. > */ > > @@ -15,9 +16,6 @@ struct arch_global_data { #if > defined(CONFIG_FSL_ESDHC) > u32 sdhc_clk; > u32 sdhc_per_clk; > -#if defined(CONFIG_FSL_ESDHC_ADAPTER_IDENT) > - u8 sdhc_adapter; > -#endif > #endif > #if defined(CONFIG_MPC8xx) > unsigned long brg_clk; > diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index > a4b923a..38cbca1 100644 > --- a/drivers/mmc/fsl_esdhc.c > +++ b/drivers/mmc/fsl_esdhc.c > @@ -678,7 +678,6 @@ void mmc_adapter_card_type_ident(void) > u8 value; > > card_id = QIXIS_READ(present) & QIXIS_SDID_MASK; > - gd->arch.sdhc_adapter = card_id; > > switch (card_id) { > case QIXIS_ESDHC_ADAPTER_TYPE_EMMC45: > -- > 2.7.4
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index 1620fba..192a02d 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002-2010 + * Copyright 2020 NXP * Wolfgang Denk, DENX Software Engineering, wd at denx.de. */ @@ -15,9 +16,6 @@ struct arch_global_data { #if defined(CONFIG_FSL_ESDHC) u32 sdhc_clk; u32 sdhc_per_clk; -#if defined(CONFIG_FSL_ESDHC_ADAPTER_IDENT) - u8 sdhc_adapter; -#endif #endif #if defined(CONFIG_MPC8xx) unsigned long brg_clk; diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index a4b923a..38cbca1 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -678,7 +678,6 @@ void mmc_adapter_card_type_ident(void) u8 value; card_id = QIXIS_READ(present) & QIXIS_SDID_MASK; - gd->arch.sdhc_adapter = card_id; switch (card_id) { case QIXIS_ESDHC_ADAPTER_TYPE_EMMC45:
The sdhc_adapter of global data has not been used, and we do not have to use it as global data even we may need it in the future. Signed-off-by: Yangbo Lu <yangbo.lu at nxp.com> --- arch/powerpc/include/asm/global_data.h | 4 +--- drivers/mmc/fsl_esdhc.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-)