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

Commit 59fb659b authored Dec 21, 2010 by Paul Walmsley

OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files



In preparation for adding OMAP4-specific PRCM accessor/mutator
functions, split the existing OMAP2/3 PRCM code into OMAP2/3-specific
files.  Most of what was in mach-omap2/{cm,prm}.{c,h} has now been
moved into mach-omap2/{cm,prm}2xxx_3xxx.{c,h}, since it was
OMAP2xxx/3xxx-specific.

This process also requires the #includes in each of these files to be
changed to reference the new file name.  As part of doing so, add some
comments into plat-omap/sram.c and plat-omap/mcbsp.c, which use
"sideways includes", to indicate that these users of the PRM/CM includes
should not be doing so.

Thanks to Felipe Contreras <felipe.contreras@gmail.com> for comments on this
patch.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jarkko Nikula <jhnikula@gmail.com>
Cc: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>
Acked-by: Omar Ramirez Luna <omar.ramirez@ti.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Greg Kroah-Hartman <greg@kroah.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com>
Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
Tested-by: Rajendra Nayak <rnayak@ti.com>
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

parent cdb54c44

arch/arm/mach-omap2/Makefile

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@
	obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \		obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \
	common.o gpio.o dma.o wd_timer.o		common.o gpio.o dma.o wd_timer.o

	omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o		omap-2-3-common = irq.o sdrc.o
	hwmod-common = omap_hwmod.o \		hwmod-common = omap_hwmod.o \
	omap_hwmod_common_data.o		omap_hwmod_common_data.o
	clock-common = clock.o clock_common_data.o \		clock-common = clock.o clock_common_data.o \
	@@ -72,9 +72,12 @@ endif
	endif		endif

	# PRCM		# PRCM
	obj-$(CONFIG_ARCH_OMAP2) += prcm.o cm.o		obj-$(CONFIG_ARCH_OMAP2) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o
	obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm.o		obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o
	obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm4xxx.o		# XXX The presence of cm2xxx_3xxx.o on the line below is temporary and
			# will be removed once the OMAP4 part of the codebase is converted to
			# use OMAP4-specific PRCM functions.
			obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cm4xxx.o

	# OMAP powerdomain framework		# OMAP powerdomain framework
	powerdomain-common += powerdomain.o powerdomain-common.o		powerdomain-common += powerdomain.o powerdomain-common.o

arch/arm/mach-omap2/clkt2xxx_apll.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@

	#include "clock.h"		#include "clock.h"
	#include "clock2xxx.h"		#include "clock2xxx.h"
	#include "cm.h"		#include "cm2xxx_3xxx.h"
	#include "cm-regbits-24xx.h"		#include "cm-regbits-24xx.h"

	/* CM_CLKEN_PLL.EN_{54,96}M_PLL options (24XX) */		/* CM_CLKEN_PLL.EN_{54,96}M_PLL options (24XX) */

arch/arm/mach-omap2/clkt2xxx_dpllcore.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@
	#include "clock.h"		#include "clock.h"
	#include "clock2xxx.h"		#include "clock2xxx.h"
	#include "opp2xxx.h"		#include "opp2xxx.h"
	#include "cm.h"		#include "cm2xxx_3xxx.h"
	#include "cm-regbits-24xx.h"		#include "cm-regbits-24xx.h"

	/* #define DOWN_VARIABLE_DPLL 1 / / Experimental */		/* #define DOWN_VARIABLE_DPLL 1 / / Experimental */

arch/arm/mach-omap2/clkt2xxx_osc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,7 @@

	#include "clock.h"		#include "clock.h"
	#include "clock2xxx.h"		#include "clock2xxx.h"
	#include "prm.h"		#include "prm2xxx_3xxx.h"
	#include "prm-regbits-24xx.h"		#include "prm-regbits-24xx.h"

	static int omap2_enable_osc_ck(struct clk *clk)		static int omap2_enable_osc_ck(struct clk *clk)

arch/arm/mach-omap2/clkt2xxx_sys.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@

	#include "clock.h"		#include "clock.h"
	#include "clock2xxx.h"		#include "clock2xxx.h"
	#include "prm.h"		#include "prm2xxx_3xxx.h"
	#include "prm-regbits-24xx.h"		#include "prm-regbits-24xx.h"

	void __iomem *prcm_clksrc_ctrl;		void __iomem *prcm_clksrc_ctrl;