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

Commit 139563ad authored Oct 21, 2012 by Paul Walmsley

ARM: OMAP2+: PRM: split PRM functions into OMAP2, OMAP3-specific files



Move OMAP3xxx-specific PRM functions & macros into prm3xxx.[ch] and
OMAP2xxx-specific macros into prm2xxx.h.  (prm2xxx.c will be created
by a subsequent patch when it's needed.)  Move basic PRM register
access functions into static inline functions in prm2xxx_3xxx.h, leaving
only OMAP2/3 hardreset functions in prm2xxx_3xxx.c.

Also clarify the initcall function naming to reinforce that this code
is specifically for the PRM IP block.

This is in preparation for the upcoming powerdomain series and the
upcoming move of this code to drivers/.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Reviewed-by: Russ Dill <Russ.Dill@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

parent 7a0c1933

arch/arm/mach-omap2/Makefile

+58 −42

Original line number	Diff line number	Diff line
		@@ -4,30 +4,36 @@

		# Common support
		obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \
		common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o
		common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o

		# INTCPS IP block support - XXX should be moved to drivers/
		obj-$(CONFIG_ARCH_OMAP2) += irq.o
		obj-$(CONFIG_ARCH_OMAP3) += irq.o
		obj-$(CONFIG_SOC_AM33XX) += irq.o
		omap-2-3-common = irq.o
		hwmod-common = omap_hwmod.o \
		omap_hwmod_common_data.o
		clock-common = clock.o clock_common_data.o \
		clkt_dpll.o clkt_clksel.o
		secure-common = omap-smc.o omap-secure.o

		# Secure monitor API support
		obj-$(CONFIG_ARCH_OMAP3) += omap-smc.o omap-secure.o
		obj-$(CONFIG_ARCH_OMAP4) += omap-smc.o omap-secure.o
		obj-$(CONFIG_SOC_OMAP5) += omap-smc.o omap-secure.o
		obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
		obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
		obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)
		obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common)
		obj-$(CONFIG_SOC_OMAP5) += prm44xx.o $(hwmod-common) $(secure-common)

		ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)
		obj-y += mcbsp.o
		endif

		obj-$(CONFIG_TWL4030_CORE) += omap_twl.o
		obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o

		# SMP support ONLY available for OMAP4

		obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o
		obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o
		obj-$(CONFIG_ARCH_OMAP4) += omap4-common.o omap-wakeupgen.o
		obj-$(CONFIG_SOC_OMAP5) += omap4-common.o omap-wakeupgen.o
		omap-4-5-common = omap4-common.o omap-wakeupgen.o \
		sleep44xx.o
		obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common)
		obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common)

		plus_sec := $(call as-instr,.arch_extension sec,+sec)
		AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec)
		@@ -52,7 +58,6 @@ obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o
		# SMS/SDRC
		obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o
		# obj-$(CONFIG_ARCH_OMAP3) += sdrc3xxx.o
		obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o

		# OPP table initialization
		ifeq ($(CONFIG_PM_OPP),y)
		@@ -63,11 +68,11 @@ endif

		# Power Management
		ifeq ($(CONFIG_PM),y)
		obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o sleep24xx.o
		obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o
		obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o
		obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o
		obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o omap-mpuss-lowpower.o
		obj-$(CONFIG_ARCH_OMAP4) += sleep44xx.o
		obj-$(CONFIG_SOC_OMAP5) += omap-mpuss-lowpower.o sleep44xx.o
		obj-$(CONFIG_SOC_OMAP5) += omap-mpuss-lowpower.o
		obj-$(CONFIG_PM_DEBUG) += pm-debug.o

		obj-$(CONFIG_POWER_AVS_OMAP) += sr_device.o
		@@ -91,68 +96,80 @@ endif
		obj-y += prcm.o prm_common.o
		obj-$(CONFIG_ARCH_OMAP2) += cm2xxx_3xxx.o prm2xxx_3xxx.o
		obj-$(CONFIG_ARCH_OMAP3) += cm2xxx_3xxx.o prm2xxx_3xxx.o
		obj-$(CONFIG_ARCH_OMAP3) += prm3xxx.o
		obj-$(CONFIG_ARCH_OMAP3) += vc3xxx_data.o vp3xxx_data.o
		obj-$(CONFIG_SOC_AM33XX) += prm33xx.o cm33xx.o
		omap-prcm-4-5-common = cminst44xx.o cm44xx.o prm44xx.o \
		prcm_mpu44xx.o prminst44xx.o \
		vc44xx_data.o vp44xx_data.o \
		prm44xx.o
		vc44xx_data.o vp44xx_data.o
		obj-$(CONFIG_ARCH_OMAP4) += $(omap-prcm-4-5-common)
		obj-$(CONFIG_SOC_OMAP5) += $(omap-prcm-4-5-common)

		# OMAP voltage domains
		obj-y += voltage.o vc.o vp.o
		voltagedomain-common := voltage.o vc.o vp.o
		obj-$(CONFIG_ARCH_OMAP2) += $(voltagedomain-common)
		obj-$(CONFIG_ARCH_OMAP2) += voltagedomains2xxx_data.o
		obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common)
		obj-$(CONFIG_ARCH_OMAP3) += voltagedomains3xxx_data.o
		obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common)
		obj-$(CONFIG_ARCH_OMAP4) += voltagedomains44xx_data.o
		obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common)
		obj-$(CONFIG_SOC_AM33XX) += voltagedomains33xx_data.o
		obj-$(CONFIG_SOC_OMAP5) += $(voltagedomain-common)

		# OMAP powerdomain framework
		obj-y += powerdomain.o powerdomain-common.o
		powerdomain-common += powerdomain.o powerdomain-common.o
		obj-$(CONFIG_ARCH_OMAP2) += $(powerdomain-common)
		obj-$(CONFIG_ARCH_OMAP2) += powerdomains2xxx_data.o
		obj-$(CONFIG_ARCH_OMAP2) += powerdomain2xxx_3xxx.o
		obj-$(CONFIG_ARCH_OMAP2) += powerdomains2xxx_3xxx_data.o
		obj-$(CONFIG_ARCH_OMAP3) += powerdomain2xxx_3xxx.o
		obj-$(CONFIG_ARCH_OMAP3) += $(powerdomain-common)
		obj-$(CONFIG_ARCH_OMAP3) += powerdomains3xxx_data.o
		obj-$(CONFIG_ARCH_OMAP3) += powerdomains2xxx_3xxx_data.o
		obj-$(CONFIG_ARCH_OMAP4) += powerdomain44xx.o
		obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common)
		obj-$(CONFIG_ARCH_OMAP4) += powerdomains44xx_data.o
		obj-$(CONFIG_SOC_AM33XX) += powerdomain33xx.o
		obj-$(CONFIG_SOC_AM33XX) += $(powerdomain-common)
		obj-$(CONFIG_SOC_AM33XX) += powerdomains33xx_data.o
		obj-$(CONFIG_SOC_OMAP5) += powerdomain44xx.o
		obj-$(CONFIG_SOC_OMAP5) += $(powerdomain-common)

		# PRCM clockdomain control
		obj-y += clockdomain.o
		clockdomain-common += clockdomain.o
		obj-$(CONFIG_ARCH_OMAP2) += $(clockdomain-common)
		obj-$(CONFIG_ARCH_OMAP2) += clockdomain2xxx_3xxx.o
		obj-$(CONFIG_ARCH_OMAP2) += clockdomains2xxx_3xxx_data.o
		obj-$(CONFIG_SOC_OMAP2420) += clockdomains2420_data.o
		obj-$(CONFIG_SOC_OMAP2430) += clockdomains2430_data.o
		obj-$(CONFIG_ARCH_OMAP3) += $(clockdomain-common)
		obj-$(CONFIG_ARCH_OMAP3) += clockdomain2xxx_3xxx.o
		obj-$(CONFIG_ARCH_OMAP3) += clockdomains2xxx_3xxx_data.o
		obj-$(CONFIG_ARCH_OMAP3) += clockdomains3xxx_data.o
		obj-$(CONFIG_ARCH_OMAP4) += $(clockdomain-common)
		obj-$(CONFIG_ARCH_OMAP4) += clockdomain44xx.o
		obj-$(CONFIG_ARCH_OMAP4) += clockdomains44xx_data.o
		obj-$(CONFIG_SOC_AM33XX) += $(clockdomain-common)
		obj-$(CONFIG_SOC_AM33XX) += clockdomain33xx.o
		obj-$(CONFIG_SOC_AM33XX) += clockdomains33xx_data.o
		obj-$(CONFIG_SOC_OMAP5) += $(clockdomain-common)
		obj-$(CONFIG_SOC_OMAP5) += clockdomain44xx.o

		# Clock framework
		obj-y += clock.o clock_common_data.o \
		clkt_dpll.o clkt_clksel.o
		obj-$(CONFIG_ARCH_OMAP2) += clock2xxx.o
		obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_dpllcore.o clkt2xxx_sys.o
		obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o
		obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_sys.o
		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_ARCH_OMAP3) += clock3xxx.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 clkt_iclk.o
		obj-$(CONFIG_ARCH_OMAP3) += clock3517.o clock36xx.o
		obj-$(CONFIG_ARCH_OMAP3) += dpll3xxx.o clock3xxx_data.o
		obj-$(CONFIG_ARCH_OMAP4) += clock44xx_data.o
		obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o
		obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) clock44xx_data.o
		obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o
		obj-$(CONFIG_SOC_AM33XX) += dpll3xxx.o clock33xx_data.o
		obj-$(CONFIG_SOC_AM33XX) += $(clock-common) dpll3xxx.o
		obj-$(CONFIG_SOC_AM33XX) += clock33xx_data.o
		obj-$(CONFIG_SOC_OMAP5) += $(clock-common)
		obj-$(CONFIG_SOC_OMAP5) += dpll3xxx.o dpll44xx.o

		# OMAP2 clock rate set data (old "OPP" data)
		@@ -160,7 +177,6 @@ obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o
		obj-$(CONFIG_SOC_OMAP2430) += opp2430_data.o

		# hwmod data
		obj-y += omap_hwmod_common_data.o
		obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_ipblock_data.o
		obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_3xxx_ipblock_data.o
		obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_interconnect_data.o

arch/arm/mach-omap2/control.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		#include "common.h"
		#include "cm-regbits-34xx.h"
		#include "prm-regbits-34xx.h"
		#include "prm2xxx_3xxx.h"
		#include "prm3xxx.h"
		#include "cm2xxx_3xxx.h"
		#include "sdrc.h"
		#include "pm.h"

arch/arm/mach-omap2/omap_hwmod.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@
		#include "cm2xxx_3xxx.h"
		#include "cminst44xx.h"
		#include "cm33xx.h"
		#include "prm2xxx_3xxx.h"
		#include "prm3xxx.h"
		#include "prm44xx.h"
		#include "prm33xx.h"
		#include "prminst44xx.h"

arch/arm/mach-omap2/pm24xx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@
		#include <plat/dma.h>

		#include "common.h"
		#include "prm2xxx_3xxx.h"
		#include "prm2xxx.h"
		#include "prm-regbits-24xx.h"
		#include "cm2xxx_3xxx.h"
		#include "cm-regbits-24xx.h"

arch/arm/mach-omap2/pm34xx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@
		#include "cm-regbits-34xx.h"
		#include "prm-regbits-34xx.h"

		#include "prm2xxx_3xxx.h"
		#include "prm3xxx.h"
		#include "pm.h"
		#include "sdrc.h"
		#include "control.h"