diff options
| author | Ye Li <ye.li@nxp.com> | 2018-03-23 02:04:35 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-04-26 02:26:39 -0700 |
| commit | f0f452da4b7aecbb80c240d83a08869bd0cad082 (patch) | |
| tree | d86f1bab6b58de432213c4f010b86de4c58ef630 /arch/arm/mach-imx/mx6 | |
| parent | a56c1d98d8d56a34ca1226e15fe05b75cd9b3686 (diff) | |
MLK-18144 mx6: Change CONFIG_MX6D kconfig to select MX6Q
The i.MX6D is a variant of i.MX6Q. The only difference is the core number.
So we can select CONFIG_MX6Q to reduce duplicated codes and remove duplicated
usages of CONFIG_MX6D.
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'arch/arm/mach-imx/mx6')
| -rw-r--r-- | arch/arm/mach-imx/mx6/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mx6/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mx6/ddr.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 029660b9bb..09ebe005a3 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -15,8 +15,7 @@ config MX6 imply CMD_FUSE config MX6D - select HAS_CAAM - select MX6_SMP + select MX6Q bool config MX6DL diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c index 71a9e6bca0..50b4028994 100644 --- a/arch/arm/mach-imx/mx6/clock.c +++ b/arch/arm/mach-imx/mx6/clock.c @@ -1328,7 +1328,7 @@ void enable_ipu_clock(void) } #endif -#if defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) || defined(CONFIG_MX6DL) || \ +#if defined(CONFIG_MX6Q) || defined(CONFIG_MX6DL) || \ defined(CONFIG_MX6S) static void disable_ldb_di_clock_sources(void) { diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c index 43b77cfa41..1fbff6ba86 100644 --- a/arch/arm/mach-imx/mx6/ddr.c +++ b/arch/arm/mach-imx/mx6/ddr.c @@ -730,7 +730,7 @@ void mx6sl_dram_iocfg(unsigned width, } #endif -#if defined(CONFIG_MX6QDL) || defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) +#if defined(CONFIG_MX6QDL) || defined(CONFIG_MX6Q) /* Configure MX6DQ mmdc iomux */ void mx6dq_dram_iocfg(unsigned width, const struct mx6dq_iomux_ddr_regs *ddr, |