diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-05-16 15:26:22 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-05-16 15:26:22 -0700 |
| commit | ea351c1603df0607b68eb4663b82ba7a70519d2e (patch) | |
| tree | 3288badcd529986d417c4b999cdba5006f469fd3 /arch/arm/mach-omap2/cminst44xx.c | |
| parent | be2d62844819b3536233b7fc726b8f17d9fa7f05 (diff) | |
| parent | 70fcebf1965b66d73bd8ae7955bd663ab8012c56 (diff) | |
| download | op-kernel-dev-ea351c1603df0607b68eb4663b82ba7a70519d2e.zip op-kernel-dev-ea351c1603df0607b68eb4663b82ba7a70519d2e.tar.gz | |
Merge tag 'for-v3.16/prcm-cleanup-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.16/prcm
Some OMAP PRCM cleanup patches. These help prepare to convert the PRCM
code into drivers.
Basic build, boot, and PM test results are available here:
http://www.pwsan.com/omap/testlogs/prcm-cleanup-v3.16/20140515213244/
Conflicts:
arch/arm/mach-omap2/cm3xxx.c
arch/arm/mach-omap2/cm44xx.c
Also fixed up new section mismatch warnings.
Diffstat (limited to 'arch/arm/mach-omap2/cminst44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cminst44xx.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index 2f44257..12aca56 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -21,8 +21,6 @@ #include <linux/err.h> #include <linux/io.h> -#include "iomap.h" -#include "common.h" #include "clockdomain.h" #include "cm.h" #include "cm1_44xx.h" @@ -30,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: * |
