From: Olof Johansson <olof@lixom.net>
Date: Fri, 30 Nov 2012 06:49:30 +0000 (-0800)
Subject: Merge tag 'omap-for-v3.8/devel-prcm-signed' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: firefly_0821_release~3680^2~1477^2^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9121dfca73d81fa886f15610cac2bf372391f3eb;p=firefly-linux-kernel-4.4.55.git

Merge tag 'omap-for-v3.8/devel-prcm-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/pm2

From Tony Lindgren:

omap prcm changes via Paul Walmsley <paul@pwsan.com>:

Some miscellaneous OMAP hwmod changes for 3.8, along with a PRM
change needed for one of the hwmod patches to function.

Basic test logs for this branch on top of Tony's
omap-for-v3.8/clock branch at commit
558a0780b0a04862a678f7823215424b4e5501f9 are here:

http://www.pwsan.com/omap/testlogs/hwmod_devel_a_3.8/20121121161522/

However, omap-for-v3.8/clock at 558a0780 does not include some fixes
that are needed for a successful test.  With several reverts,
fixes, and workarounds applied, the following test logs were
obtained:

http://www.pwsan.com/omap/testlogs/TEST_hwmod_devel_a_3.8/20121121162719/

which indicate that the series tests cleanly.

* tag 'omap-for-v3.8/devel-prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (49 commits)
  ARM: OMAP2+: omap_device: Correct resource handling for DT boot
  ARM: OMAP2+: hwmod: Add possibility to count hwmod resources based on type
  ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count
  ARM: OMAP2+: PRM: initialize some PRM functions early
  ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts
  ARM: OMAP2xxx: clock: drop obsolete clock data
  ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts
  ARM: OMAP3+: DPLL: drop !CONFIG_COMMON_CLK sections
  ARM: AM33xx: clock: drop obsolete clock data
  ARM: OMAP3xxx: clk: drop obsolete clock data
  ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts
  ARM: OMAP44xx: clock: drop obsolete clock data
  ARM: OMAP4: clock: Cleanup !CONFIG_COMMON_CLK parts
  ARM: OMAP: hwmod: Cleanup !CONFIG_COMMON_CLK parts
  ARM: OMAP: clock: Switch to COMMON clk
  ARM: OMAP2: clock: Add 24xx data using common struct clk
  ARM: OMAP3: clock: Add 3xxx data using common struct clk
  ARM: AM33XX: clock: add clock data in common clock format
  ARM: OMAP4: clock: Add 44xx data using common struct clk
  ARM: OMAP2+: clock: add OMAP CCF convenience macros to mach-omap2/clock.h
  ...

Some context conflicts due to nearby changes resolved in
arch/arm/mach-omap2/io.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

9121dfca73d81fa886f15610cac2bf372391f3eb
diff --cc arch/arm/mach-omap2/io.c
index 9df757644cce,007dc4d85d54..7c39238322e0
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@@ -387,7 -396,9 +390,8 @@@ void __init omap2420_init_early(void
  	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP2420_PRM_BASE));
  	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP2420_CM_BASE), NULL);
  	omap2xxx_check_revision();
+ 	omap2xxx_prm_init();
  	omap2xxx_cm_init();
 -	omap_common_init_early();
  	omap2xxx_voltagedomains_init();
  	omap242x_powerdomains_init();
  	omap242x_clockdomains_init();
@@@ -415,7 -427,9 +420,8 @@@ void __init omap2430_init_early(void
  	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP2430_PRM_BASE));
  	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP2430_CM_BASE), NULL);
  	omap2xxx_check_revision();
+ 	omap2xxx_prm_init();
  	omap2xxx_cm_init();
 -	omap_common_init_early();
  	omap2xxx_voltagedomains_init();
  	omap243x_powerdomains_init();
  	omap243x_clockdomains_init();
@@@ -448,7 -463,9 +455,8 @@@ void __init omap3_init_early(void
  	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP3430_CM_BASE), NULL);
  	omap3xxx_check_revision();
  	omap3xxx_check_features();
+ 	omap3xxx_prm_init();
  	omap3xxx_cm_init();
 -	omap_common_init_early();
  	omap3xxx_voltagedomains_init();
  	omap3xxx_powerdomains_init();
  	omap3xxx_clockdomains_init();
@@@ -573,6 -598,8 +587,7 @@@ void __init omap4430_init_early(void
  	omap_cm_base_init();
  	omap4xxx_check_revision();
  	omap4xxx_check_features();
+ 	omap44xx_prm_init();
 -	omap_common_init_early();
  	omap44xx_voltagedomains_init();
  	omap44xx_powerdomains_init();
  	omap44xx_clockdomains_init();