From: Bai Ping Date: Fri, 11 Dec 2015 06:59:10 +0000 (+0800) Subject: MLK-11996 ARM: imx: fix ddr_type config error X-Git-Tag: C0P2-H0.0--20200415~3923 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=11f20e11557e23afcd1c7bd66acab5986c47dc98;p=linux.git MLK-11996 ARM: imx: fix ddr_type config error The config option for getting DDR type should be 'HAVE_IMX_MMDC' and 'HAVE_IMX_DDRC'. Otherwise, get_ddr type will always return 0(DDR3). Signed-off-by: Bai Ping (cherry picked from commit 6e8048311f854184ae5f16c822e6f6f0fd122e54) --- diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 8feadf05b078..ddaba1e060fb 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -148,7 +148,7 @@ int imx_mmdc_get_ddr_type(void); #else static inline int imx_mmdc_get_ddr_type(void) { return 0; } #endif -#ifdef CONFIG_HAVE_DDRC +#ifdef CONFIG_HAVE_IMX_DDRC int imx_ddrc_get_ddr_type(void); #else static inline int imx_ddrc_get_ddr_type(void) { return 0; }