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

Commit ff4ae5d9 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

ARM: OMAP2+: CM/hwmod: split CM functions into OMAP2, OMAP3-specific files 



Move OMAP3xxx-specific CM functions & macros into cm3xxx.[ch] and
OMAP2xxx-specific macros into cm2xxx.[ch].  Move basic CM register
access functions into static inline functions in cm2xxx_3xxx.h,
leaving only OMAP2/3 hardreset functions in cm2xxx_3xxx.c.

As part of this, split the CM and hwmod code that waits for devices to
become ready into SoC-specific functions.

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

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Reviewed-by: default avatarRuss Dill <Russ.Dill@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
parent 49815399

arch/arm/mach-omap2/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -94,10 +94,8 @@ endif 


# PRCM

obj-y					+= prcm.o prm_common.o

obj-$(CONFIG_ARCH_OMAP2)		+= cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= prm2xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prm3xxx.o

obj-$(CONFIG_ARCH_OMAP2)		+= prm2xxx_3xxx.o prm2xxx.o cm2xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prm2xxx_3xxx.o prm3xxx.o cm3xxx.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 \

arch/arm/mach-omap2/clkt2xxx_apll.c

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


#include "clock.h"

#include "clock2xxx.h"

#include "cm2xxx_3xxx.h"

#include "cm2xxx.h"

#include "cm-regbits-24xx.h"



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

arch/arm/mach-omap2/clkt2xxx_dpll.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <plat/clock.h>



#include "clock.h"

#include "cm2xxx_3xxx.h"

#include "cm2xxx.h"

#include "cm-regbits-24xx.h"



/* Private functions */

arch/arm/mach-omap2/clock.c

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
#include "soc.h"

#include "clockdomain.h"

#include "clock.h"

#include "cm2xxx_3xxx.h"

#include "cm2xxx.h"

#include "cm3xxx.h"

#include "cm-regbits-24xx.h"

#include "cm-regbits-34xx.h"

arch/arm/mach-omap2/clock2420_data.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include "clock.h"

#include "clock2xxx.h"

#include "opp2xxx.h"

#include "cm2xxx_3xxx.h"

#include "cm2xxx.h"

#include "prm2xxx_3xxx.h"

#include "prm-regbits-24xx.h"

#include "cm-regbits-24xx.h"