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: Tero Kristo <t-kristo@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tero Kristo 2014-10-27 08:39:25 -07:00 committed by Tony Lindgren
parent 1bc28b3472
commit ab6c9bbf28
4 changed files with 4 additions and 5 deletions

View File

@ -23,4 +23,7 @@
#define OMAP4_CM_CLKSTCTRL 0x0000 #define OMAP4_CM_CLKSTCTRL 0x0000
#define OMAP4_CM_STATICDEP 0x0004 #define OMAP4_CM_STATICDEP 0x0004
void omap_cm_base_init(void);
int omap4_cm_init(void);
#endif #endif

View File

@ -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, extern u32 omap4_cminst_read_inst_reg_bits(u8 part, u16 inst, s16 idx,
u32 mask); u32 mask);
extern void omap_cm_base_init(void);
int omap4_cm_init(void);
#endif #endif

View File

@ -46,11 +46,11 @@
#include "cm2xxx.h" #include "cm2xxx.h"
#include "cm3xxx.h" #include "cm3xxx.h"
#include "cm33xx.h" #include "cm33xx.h"
#include "cm44xx.h"
#include "prm.h" #include "prm.h"
#include "cm.h" #include "cm.h"
#include "prcm_mpu44xx.h" #include "prcm_mpu44xx.h"
#include "prminst44xx.h" #include "prminst44xx.h"
#include "cminst44xx.h"
#include "prm2xxx.h" #include "prm2xxx.h"
#include "prm3xxx.h" #include "prm3xxx.h"
#include "prm33xx.h" #include "prm33xx.h"

View File

@ -153,7 +153,6 @@
#include "powerdomain.h" #include "powerdomain.h"
#include "cm2xxx.h" #include "cm2xxx.h"
#include "cm3xxx.h" #include "cm3xxx.h"
#include "cminst44xx.h"
#include "cm33xx.h" #include "cm33xx.h"
#include "prm.h" #include "prm.h"
#include "prm3xxx.h" #include "prm3xxx.h"