Commit 9121dfca authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.8/devel-prcm-signed' of... 

Merge tag 'omap-for-v3.8/devel-prcm-signed' of git://git.kernel.org/pub/scm/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
558a0780 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: default avatarOlof Johansson <olof@lixom.net>
parents 77f9db89 8b9c1ac2

arch/arm/mach-omap2/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ config ARCH_OMAP2 
	select CPU_V6

	select MULTI_IRQ_HANDLER

	select SOC_HAS_OMAP2_SDRC

	select COMMON_CLK



config ARCH_OMAP3

	bool "TI OMAP3"
@@ -47,6 +48,7 @@ config ARCH_OMAP3 
	select PM_OPP if PM

	select PM_RUNTIME if CPU_IDLE

	select SOC_HAS_OMAP2_SDRC

	select COMMON_CLK

	select USB_ARCH_HAS_EHCI if USB_SUPPORT



config ARCH_OMAP4
@@ -68,6 +70,7 @@ config ARCH_OMAP4 
	select PM_OPP if PM

	select PM_RUNTIME if CPU_IDLE

	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select COMMON_CLK



config SOC_OMAP5

	bool "TI OMAP5"
@@ -77,6 +80,7 @@ config SOC_OMAP5 
	select CPU_V7

	select HAVE_SMP

	select SOC_HAS_REALTIME_COUNTER

	select COMMON_CLK



comment "OMAP Core Type"

	depends on ARCH_OMAP2
@@ -111,6 +115,7 @@ config SOC_AM33XX 
	select ARM_CPU_SUSPEND if PM

	select CPU_V7

	select MULTI_IRQ_HANDLER

	select COMMON_CLK



config OMAP_PACKAGE_ZAF

       bool

arch/arm/mach-omap2/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -160,17 +160,17 @@ obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_dpllcore.o 
obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_virt_prcm_set.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_apll.o clkt2xxx_osc.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpll.o clkt_iclk.o

obj-$(CONFIG_SOC_OMAP2420)		+= clock2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o clock2430_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= cclock2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o cclock2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o clock3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o cclock3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) cclock44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o

obj-$(CONFIG_SOC_AM33XX)		+= $(clock-common) dpll3xxx.o

obj-$(CONFIG_SOC_AM33XX)		+= clock33xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= cclock33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= $(clock-common)

obj-$(CONFIG_SOC_OMAP5)			+= dpll3xxx.o dpll44xx.o

arch/arm/mach-omap2/clock2420_data.c→arch/arm/mach-omap2/cclock2420_data.c

+1950 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/clock2430_data.c→arch/arm/mach-omap2/cclock2430_data.c

+2065 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/clock33xx_data.c→arch/arm/mach-omap2/cclock33xx_data.c

+961 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE