Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fb76a07 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx6: set initial power mode in pm function 



Rather than setting initial low-power mode in every single i.MX6 clock
initialization function, we should really do that in pm code.  Let's
move imx6q_set_lpm(WAIT_CLOCKED) call into imx6_pm_common_init().

While at it, let's rename the function to imx6_set_lpm() since it's
actually common for all i.MX6 SoCs.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent f3a9249d

arch/arm/mach-imx/clk-imx6q.c

+0 −3
Original line number Diff line number Diff line
@@ -527,8 +527,5 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) 
	/* All existing boards with PCIe use LVDS1 */

	if (IS_ENABLED(CONFIG_PCI_IMX6))

		clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);



	/* Set initial power mode */

	imx6q_set_lpm(WAIT_CLOCKED);

}

CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init);

arch/arm/mach-imx/clk-imx6sl.c

+0 −3
Original line number Diff line number Diff line
@@ -443,8 +443,5 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node) 


	clk_set_parent(clks[IMX6SL_CLK_LCDIF_AXI_SEL],

		       clks[IMX6SL_CLK_PLL2_PFD2]);



	/* Set initial power mode */

	imx6q_set_lpm(WAIT_CLOCKED);

}

CLK_OF_DECLARE(imx6sl, "fsl,imx6sl-ccm", imx6sl_clocks_init);

arch/arm/mach-imx/clk-imx6sx.c

+0 −3
Original line number Diff line number Diff line
@@ -560,8 +560,5 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) 


	clk_set_parent(clks[IMX6SX_CLK_QSPI1_SEL], clks[IMX6SX_CLK_PLL2_BUS]);

	clk_set_parent(clks[IMX6SX_CLK_QSPI2_SEL], clks[IMX6SX_CLK_PLL2_BUS]);



	/* Set initial power mode */

	imx6q_set_lpm(WAIT_CLOCKED);

}

CLK_OF_DECLARE(imx6sx, "fsl,imx6sx-ccm", imx6sx_clocks_init);

arch/arm/mach-imx/common.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ void imx_gpc_hwirq_unmask(unsigned int hwirq); 
void imx_anatop_init(void);

void imx_anatop_pre_suspend(void);

void imx_anatop_post_resume(void);

int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);

int imx6_set_lpm(enum mxc_cpu_pwr_mode mode);

void imx6q_set_int_mem_clk_lpm(bool enable);

void imx6sl_set_wait_clk(bool enter);

int imx_mmdc_get_ddr_type(void);

arch/arm/mach-imx/cpuidle-imx6q.c

+2 −2
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ static int imx6q_enter_wait(struct cpuidle_device *dev, 
		 */

		if (!spin_trylock(&master_lock))

			goto idle;

		imx6q_set_lpm(WAIT_UNCLOCKED);

		imx6_set_lpm(WAIT_UNCLOCKED);

		cpu_do_idle();

		imx6q_set_lpm(WAIT_CLOCKED);

		imx6_set_lpm(WAIT_CLOCKED);

		spin_unlock(&master_lock);

		goto done;

	}