From 5330c7d707f1117a95985ff6e770eb146703706a Mon Sep 17 00:00:00 2001 From: Peng Fan <van.freenix@gmail.com> Date: Tue, 15 Mar 2016 17:57:50 +0800 Subject: [PATCH] fsl: esdhc: consolidate fsl_esdhc_cfg structure We can use phys_addr_to for esdhc_base to discard the #ifdef. Signed-off-by: Peng Fan <van.freenix@gmail.com> Cc: York Sun <york.sun@nxp.com> Cc: Yangbo Lu <yangbo.lu@nxp.com> Cc: Eric Nelson <eric@nelint.com> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Pantelis Antoniou <panto@antoniou-consulting.com> Cc: Tom Rini <trini@konsulko.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: York Sun <york.sun@nxp.com> --- include/fsl_esdhc.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index 073048fb4b..fa760a57fb 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -168,11 +168,7 @@ #define ESDHC_VENDORSPEC_VSELECT 0x00000002 /* Use 1.8V */ struct fsl_esdhc_cfg { -#ifdef CONFIG_FSL_LAYERSCAPE - u64 esdhc_base; -#else - u32 esdhc_base; -#endif + phys_addr_t esdhc_base; u32 sdhc_clk; u8 max_bus_width; struct mmc_config cfg; -- 2.39.5