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

Commit a5ebba6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull arm-soc power management changes from Arnd Bergmann:
 "These are various power management related changes, mainly concerning
  cpuidle on i.MX and OMAP, as well as a the move of the omap
  smartreflex driver to live in the power subsystem."

Fix up conflicts in arch/arm/mach-{imx/mach-imx6q.c,omap2/prm2xxx_3xxx.h}

* tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
  ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
  ARM: OMAP2+: do not allow SmartReflex to be built as a module
  ARM: OMAP2: Use hwmod to initialize mmc for 2420
  ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state
  ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state
  ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
  ARM: OMAP3: PM: cleanup cam_pwrdm leftovers
  ARM: OMAP3: PM: call pre/post transition per powerdomain
  ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm
  ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
  ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux
  ARM: OMAP3+: PRM: Enable IO wake up
  ARM: OMAP4: PRM: Add IO Daisychain support
  ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file
  ARM: OMAP3: PM: correct enable/disable of daisy io chain
  ARM: OMAP2+: PRM: fix compile for OMAP4-only build
  W1: OMAP HDQ1W: use runtime PM
  ARM: OMAP2+: HDQ1W: use omap_device
  W1: OMAP HDQ1W: use 32-bit register accesses
  W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
  ...
parents e81218f5 6b21a9ce

arch/arm/mach-imx/clk-imx51-imx53.c

+1 −1
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil, 
	clk_register_clkdev(clk[dummy], NULL, "imx-keypad");

	clk_register_clkdev(clk[tve_gate], NULL, "imx-tve.0");

	clk_register_clkdev(clk[ipu_di1_gate], "di1", "imx-tve.0");

	clk_register_clkdev(clk[gpc_dvfs], "gpc_dvfs", NULL);



	/* Set SDHC parents to be PLL2 */

	clk_set_parent(clk[esdhc_a_sel], clk[pll2_sw]);
@@ -336,7 +337,6 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, 
	clk_register_clkdev(clk[mx51_mipi], "mipi_hsp", NULL);

	clk_register_clkdev(clk[vpu_gate], NULL, "imx51-vpu.0");

	clk_register_clkdev(clk[fec_gate], NULL, "imx27-fec.0");

	clk_register_clkdev(clk[gpc_dvfs], "gpc_dvfs", NULL);

	clk_register_clkdev(clk[ipu_gate], "bus", "imx51-ipu");

	clk_register_clkdev(clk[ipu_di0_gate], "di0", "imx51-ipu");

	clk_register_clkdev(clk[ipu_di1_gate], "di1", "imx51-ipu");

arch/arm/mach-imx/imx53-dt.c

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ DT_MACHINE_START(IMX53_DT, "Freescale i.MX53 (Device Tree Support)") 
	.handle_irq	= imx53_handle_irq,

	.timer		= &imx53_timer,

	.init_machine	= imx53_dt_init,

	.init_late	= imx53_init_late,

	.dt_compat	= imx53_dt_board_compat,

	.restart	= mxc_restart,

MACHINE_END

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

+19 −0
Original line number Diff line number Diff line
@@ -12,7 +12,9 @@ 


#include <linux/clk.h>

#include <linux/clkdev.h>

#include <linux/cpuidle.h>

#include <linux/delay.h>

#include <linux/export.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/irq.h>
@@ -24,6 +26,7 @@ 
#include <linux/phy.h>

#include <linux/micrel_phy.h>

#include <linux/mfd/anatop.h>

#include <asm/cpuidle.h>

#include <asm/smp_twd.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/hardware/gic.h>
@@ -31,8 +34,10 @@ 
#include <asm/mach/time.h>

#include <asm/system_misc.h>

#include <mach/common.h>

#include <mach/cpuidle.h>

#include <mach/hardware.h>





void imx6q_restart(char mode, const char *cmd)

{

	struct device_node *np;
@@ -169,6 +174,19 @@ static void __init imx6q_init_machine(void) 
	imx6q_usb_init();

}



static struct cpuidle_driver imx6q_cpuidle_driver = {

	.name			= "imx6q_cpuidle",

	.owner			= THIS_MODULE,

	.en_core_tk_irqen	= 1,

	.states[0]		= ARM_CPUIDLE_WFI_STATE,

	.state_count		= 1,

};



static void __init imx6q_init_late(void)

{

	imx_cpuidle_init(&imx6q_cpuidle_driver);

}



static void __init imx6q_map_io(void)

{

	imx_lluart_map_io();
@@ -213,6 +231,7 @@ DT_MACHINE_START(IMX6Q, "Freescale i.MX6 Quad (Device Tree)") 
	.handle_irq	= imx6q_handle_irq,

	.timer		= &imx6q_timer,

	.init_machine	= imx6q_init_machine,

	.init_late      = imx6q_init_late,

	.dt_compat	= imx6q_dt_compat,

	.restart	= imx6q_restart,

MACHINE_END

arch/arm/mach-imx/mach-mx53_ard.c

+1 −0
Original line number Diff line number Diff line
@@ -267,5 +267,6 @@ MACHINE_START(MX53_ARD, "Freescale MX53 ARD Board") 
	.handle_irq = imx53_handle_irq,

	.timer = &mx53_ard_timer,

	.init_machine = mx53_ard_board_init,

	.init_late	= imx53_init_late,

	.restart	= mxc_restart,

MACHINE_END

arch/arm/mach-imx/mach-mx53_evk.c

+1 −0
Original line number Diff line number Diff line
@@ -174,5 +174,6 @@ MACHINE_START(MX53_EVK, "Freescale MX53 EVK Board") 
	.handle_irq = imx53_handle_irq,

	.timer = &mx53_evk_timer,

	.init_machine = mx53_evk_board_init,

	.init_late	= imx53_init_late,

	.restart	= mxc_restart,

MACHINE_END