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

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

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ARM: mach-shmobile: sh7372 LCDC1 suspend fix V2 (incremental)
  OMAP: omap_device: only override _noirq methods, not normal suspend/resume
  PM / Runtime: Correct documentation of pm_runtime_irq_safe()
  ARM: mach-shmobile: sh7372 LCDC1 suspend fix
  sh-sci / PM: Use power.irq_safe
  PM: Use spinlock instead of mutex in clock management functions
parents 219f358e d0168fdc

Documentation/power/runtime_pm.txt

+1 −2
Original line number Diff line number Diff line
@@ -431,8 +431,7 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: 


  void pm_runtime_irq_safe(struct device *dev);

    - set the power.irq_safe flag for the device, causing the runtime-PM

      suspend and resume callbacks (but not the idle callback) to be invoked

      with interrupts disabled

      callbacks to be invoked with interrupts off



  void pm_runtime_mark_last_busy(struct device *dev);

    - set the power.last_busy field to the current time

arch/arm/mach-shmobile/board-ap4evb.c

+1 −0
Original line number Diff line number Diff line
@@ -1412,6 +1412,7 @@ static void __init ap4evb_init(void) 
	fsi_init_pm_clock();

	sh7372_pm_init();

	pm_clk_add(&fsi_device.dev, "spu2");

	pm_clk_add(&lcdc1_device.dev, "hdmi");

}



static void __init ap4evb_timer_init(void)

arch/arm/mach-shmobile/board-mackerel.c

+1 −0
Original line number Diff line number Diff line
@@ -1588,6 +1588,7 @@ static void __init mackerel_init(void) 
	hdmi_init_pm_clock();

	sh7372_pm_init();

	pm_clk_add(&fsi_device.dev, "spu2");

	pm_clk_add(&hdmi_lcdc_device.dev, "hdmi");

}



static void __init mackerel_timer_init(void)

arch/arm/mach-shmobile/clock-sh7372.c

+2 −0
Original line number Diff line number Diff line
@@ -655,6 +655,8 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("renesas_usbhs.1", &mstp_clks[MSTP406]), /* USB1 */

	CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[MSTP403]), /* KEYSC */



	CLKDEV_ICK_ID("hdmi", "sh_mobile_lcdc_fb.1",

		      &div6_reparent_clks[DIV6_HDMI]),

	CLKDEV_ICK_ID("ick", "sh-mobile-hdmi", &div6_reparent_clks[DIV6_HDMI]),

	CLKDEV_ICK_ID("icka", "sh_fsi2", &div6_reparent_clks[DIV6_FSIA]),

	CLKDEV_ICK_ID("ickb", "sh_fsi2", &div6_reparent_clks[DIV6_FSIB]),

arch/arm/plat-omap/omap_device.c

+2 −1
Original line number Diff line number Diff line
@@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = { 
		SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume,

				   _od_runtime_idle)

		USE_PLATFORM_PM_SLEEP_OPS

		SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq)

		.suspend_noirq = _od_suspend_noirq,

		.resume_noirq = _od_resume_noirq,

	}

};