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

Commit 97d9a3d0 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'for-v4.3/omap-hwmod-prcm-a' of... 

Merge tag 'for-v4.3/omap-hwmod-prcm-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.3/soc

ARM: OMAP2+: PRCM and hwmod changes for v4.3

This series adds:

- I/O wakeup support for AM43xx
- register lock and unlock support to the hwmod code (needed for the RTC
  IP blocks on some chips)
- several fixes for sparse warnings and an unnecessary null pointer test
- a DRA7xx clockdomain configuration workaround, to deal with some hardware
  bugs

Basic build, boot, and PM tests are here:

http://www.pwsan.com/omap/testlogs/hwmod-prcm-for-v4.3/20150723080012/

Since I do not have an AM43xx or DRA7xx device, I can't test on those
platforms.
parents 228e5fad 3b86616e

arch/arm/boot/dts/am4372.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
			prcm: prcm@1f0000 {

				compatible = "ti,am4-prcm";

				reg = <0x1f0000 0x11000>;

				interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;



				prcm_clocks: clocks {

					#address-cells = <1>;

arch/arm/mach-omap2/clockdomains7xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static struct clockdomain l4per2_7xx_clkdm = { 
	.dep_bit	  = DRA7XX_L4PER2_STATDEP_SHIFT,

	.wkdep_srcs	  = l4per2_wkup_sleep_deps,

	.sleepdep_srcs	  = l4per2_wkup_sleep_deps,

	.flags		  = CLKDM_CAN_HWSUP_SWSUP,

	.flags		  = CLKDM_CAN_SWSUP,

};



static struct clockdomain mpu0_7xx_clkdm = {

arch/arm/mach-omap2/omap-mpuss-lowpower.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void) 
static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)

{}



struct cpu_pm_ops omap_pm_ops = {

static struct cpu_pm_ops omap_pm_ops = {

	.finish_suspend		= default_finish_suspend,

	.resume			= dummy_cpu_resume,

	.scu_prepare		= dummy_scu_prepare,

arch/arm/mach-omap2/omap3-restart.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/init.h>

#include <linux/reboot.h>



#include "common.h"

#include "control.h"

#include "prm.h"

arch/arm/mach-omap2/omap4-restart.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/types.h>

#include <linux/reboot.h>

#include "common.h"

#include "prm.h"



/**