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

Commit ab6c9bbf authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

ARM: OMAP4: CM: move public definitions from cminst44xx.h to cm44xx.h 



cminst44xx.h will be removed, thus move the public APIs to cm44xx.h header.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Tested-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1bc28b34

arch/arm/mach-omap2/cm44xx.h

+3 −0
Original line number Diff line number Diff line
@@ -23,4 +23,7 @@ 
#define OMAP4_CM_CLKSTCTRL				0x0000

#define OMAP4_CM_STATICDEP				0x0004



void omap_cm_base_init(void);

int omap4_cm_init(void);



#endif

arch/arm/mach-omap2/cminst44xx.h

+0 −3
Original line number Diff line number Diff line
@@ -26,7 +26,4 @@ u32 omap4_cminst_clear_inst_reg_bits(u32 bits, u8 part, u16 inst, 
extern u32 omap4_cminst_read_inst_reg_bits(u8 part, u16 inst, s16 idx,

					   u32 mask);



extern void omap_cm_base_init(void);

int omap4_cm_init(void);



#endif

arch/arm/mach-omap2/io.c

+1 −1
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ 
#include "cm2xxx.h"

#include "cm3xxx.h"

#include "cm33xx.h"

#include "cm44xx.h"

#include "prm.h"

#include "cm.h"

#include "prcm_mpu44xx.h"

#include "prminst44xx.h"

#include "cminst44xx.h"

#include "prm2xxx.h"

#include "prm3xxx.h"

#include "prm33xx.h"

arch/arm/mach-omap2/omap_hwmod.c

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 
#include "powerdomain.h"

#include "cm2xxx.h"

#include "cm3xxx.h"

#include "cminst44xx.h"

#include "cm33xx.h"

#include "prm.h"

#include "prm3xxx.h"