diff options
| author | Tero Kristo <t-kristo@ti.com> | 2014-03-31 18:15:52 +0300 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2014-05-15 22:35:10 -0600 |
| commit | 70fcebf1965b66d73bd8ae7955bd663ab8012c56 (patch) | |
| tree | 9d288a5810036f460a1aeb42e47738d4ea34dabf | |
| parent | b550e47f5e9e74999f754371bdc79331d19f84a3 (diff) | |
ARM: OMAP4: PRCM: remove references to cm-regbits-44xx.h from PRCM core files
Done in preparation to make PRCM a standalone driver.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
| -rw-r--r-- | arch/arm/mach-omap2/cm44xx.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/cminst44xx.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/powerdomain-common.c | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/cm44xx.c b/arch/arm/mach-omap2/cm44xx.c index 37ba6e8f9505..c440ba753882 100644 --- a/arch/arm/mach-omap2/cm44xx.c +++ b/arch/arm/mach-omap2/cm44xx.c @@ -21,7 +21,6 @@ #include "cm.h" #include "cm1_44xx.h" #include "cm2_44xx.h" -#include "cm-regbits-44xx.h" /* CM1 hardware module low-level functions */ diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index 434b52af0364..82984b2f2715 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -28,12 +28,18 @@ #include "cm44xx.h" #include "cminst44xx.h" #include "cm-regbits-34xx.h" -#include "cm-regbits-44xx.h" #include "prcm44xx.h" #include "prm44xx.h" #include "prcm_mpu44xx.h" #include "prcm-common.h" +#define OMAP4430_IDLEST_SHIFT 16 +#define OMAP4430_IDLEST_MASK (0x3 << 16) +#define OMAP4430_CLKTRCTRL_SHIFT 0 +#define OMAP4430_CLKTRCTRL_MASK (0x3 << 0) +#define OMAP4430_MODULEMODE_SHIFT 0 +#define OMAP4430_MODULEMODE_MASK (0x3 << 0) + /* * CLKCTRL_IDLEST_*: possible values for the CM_*_CLKCTRL.IDLEST bitfield: * diff --git a/arch/arm/mach-omap2/powerdomain-common.c b/arch/arm/mach-omap2/powerdomain-common.c index c0aeabfcf009..c40e5f009826 100644 --- a/arch/arm/mach-omap2/powerdomain-common.c +++ b/arch/arm/mach-omap2/powerdomain-common.c @@ -17,7 +17,6 @@ #include "pm.h" #include "cm.h" #include "cm-regbits-34xx.h" -#include "cm-regbits-44xx.h" #include "prm-regbits-34xx.h" #include "prm-regbits-44xx.h" |