diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2014-11-23 15:07:02 +0800 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2014-11-23 15:07:02 +0800 |
commit | 2ce34b105c79ee0404b3a8f68c9ab2ce197dd06f (patch) | |
tree | 2111f40b612ccf19b0acb480f82c1e7a80d2e24a /arch/arm/mach-imx/mach-ls1021a.c | |
parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
parent | 3db47dc0ae4d370ec3c86fc357608132ca695c27 (diff) |
Merge tag 'imx-soc-3.19' into imx/dt
The i.MX SoC update for 3.19:
- Update i.MX6 suspend code to check DDR instead of CPU type, as the
difference we need to handle is between LPDDR2 and DDR3, not SoCs.
- Set anatop properly for LPDDR2 in DSM mode
- Add support for new SoC LS1021A which integrates dual Cortex-A7
- Add ENET initialization for i.MX6SX platform
- Add cpufreq support for i.MX53 platform
- Add a SNVS based poweroff driver for i.MX6 platforms
- Use ARM Global Timer as clocksource on VF610
Note: the change set is built on top of tag imx-fixes-3.18-2 to resolve
a conflict on file arch/arm/mach-imx/clk-vf610.c.
Diffstat (limited to 'arch/arm/mach-imx/mach-ls1021a.c')
-rw-r--r-- | arch/arm/mach-imx/mach-ls1021a.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-ls1021a.c b/arch/arm/mach-imx/mach-ls1021a.c new file mode 100644 index 00000000000..b89c858ebfd --- /dev/null +++ b/arch/arm/mach-imx/mach-ls1021a.c @@ -0,0 +1,22 @@ +/* + * Copyright 2013-2014 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include <asm/mach/arch.h> + +#include "common.h" + +static const char * const ls1021a_dt_compat[] __initconst = { + "fsl,ls1021a", + NULL, +}; + +DT_MACHINE_START(LS1021A, "Freescale LS1021A") + .smp = smp_ops(ls1021a_smp_ops), + .dt_compat = ls1021a_dt_compat, +MACHINE_END |