diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 16:48:45 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 16:48:45 +0200 |
| commit | 1c90e170fef7df71f09be837e65641cf5c687dce (patch) | |
| tree | 3c1fe713862dfd27e1d451331155284224b0b3af /arch/arm/mach-imx/common.h | |
| parent | Merge tag 'sunxi-core-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | ARM: imx: build cpuidle-imx6sx.o for imx6ul (diff) | |
| download | linux-1c90e170fef7df71f09be837e65641cf5c687dce.tar.xz linux-1c90e170fef7df71f09be837e65641cf5c687dce.zip | |
Merge tag 'imx-soc-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
Pull "i.MX SoC updates for 4.9" from Shawn Guo:
- Set INT_MEM_CLK_LPM bit to get proper WAIT mode support on i.MX6SX.
This is a workaround for i.MX6SX WAIT mode hardware issue.
- Enable cpuidle support with 3 low-power states (WFI, WAIT, POWER-OFF)
for i.MX6UL.
* tag 'imx-soc-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: build cpuidle-imx6sx.o for imx6ul
ARM: imx: add cpuidle support for i.mx6ul
ARM: imx: enable WAIT mode hardware workaround for imx6sx
ARM: imx: rename imx6q_set_int_mem_clk_lpm() function
Diffstat (limited to 'arch/arm/mach-imx/common.h')
| -rw-r--r-- | arch/arm/mach-imx/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index a8f469333027..fb644304446c 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -109,7 +109,7 @@ void imx_anatop_init(void); void imx_anatop_pre_suspend(void); void imx_anatop_post_resume(void); int imx6_set_lpm(enum mxc_cpu_pwr_mode mode); -void imx6q_set_int_mem_clk_lpm(bool enable); +void imx6_set_int_mem_clk_lpm(bool enable); void imx6sl_set_wait_clk(bool enter); int imx_mmdc_get_ddr_type(void); |