diff options
| author | Tero Kristo <t-kristo@ti.com> | 2014-10-27 08:39:25 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-10-27 08:39:25 -0700 |
| commit | ab6c9bbf28e2b251a61261a95e99d588da73e9a6 (patch) | |
| tree | 19e1225ce412e0611c88419d6e8b0d4ee3150837 /arch | |
| parent | 1bc28b3472dc44e6282b464fdb851adcea859be7 (diff) | |
| download | op-kernel-dev-ab6c9bbf28e2b251a61261a95e99d588da73e9a6.zip op-kernel-dev-ab6c9bbf28e2b251a61261a95e99d588da73e9a6.tar.gz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/cm44xx.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/cminst44xx.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/cm44xx.h b/arch/arm/mach-omap2/cm44xx.h index 3380bee..728d06a 100644 --- a/arch/arm/mach-omap2/cm44xx.h +++ b/arch/arm/mach-omap2/cm44xx.h @@ -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 diff --git a/arch/arm/mach-omap2/cminst44xx.h b/arch/arm/mach-omap2/cminst44xx.h index ffbd721..3ef3bf6 100644 --- a/arch/arm/mach-omap2/cminst44xx.h +++ b/arch/arm/mach-omap2/cminst44xx.h @@ -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 diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 55380bb..4fc8383 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -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" diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 48f0d4d..e8098ca 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -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" |
