diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 18:20:13 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 18:20:13 +0400 |
| commit | 24e71ef6d97eed957bdcc2f161d21120c4207124 (patch) | |
| tree | 2859bc4f497ec00574551b49252f505149954ad9 /arch/arm/mach-davinci/include/mach/psc.h | |
| parent | af72617279f6d56163328802cf6545b95a538345 (diff) | |
| parent | 45fc4cce939adc883fba5e02f1f3e0e9ff020c30 (diff) | |
| download | linux-24e71ef6d97eed957bdcc2f161d21120c4207124.tar.xz | |
Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into fixes
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/psc.h')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/psc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/include/mach/psc.h b/arch/arm/mach-davinci/include/mach/psc.h index fa59c097223d..8bc3fc256171 100644 --- a/arch/arm/mach-davinci/include/mach/psc.h +++ b/arch/arm/mach-davinci/include/mach/psc.h @@ -233,7 +233,7 @@ #define PTCMD 0x120 #define PTSTAT 0x128 #define PDSTAT 0x200 -#define PDCTL1 0x304 +#define PDCTL 0x300 #define MDSTAT 0x800 #define MDCTL 0xA00 @@ -244,7 +244,10 @@ #define PSC_STATE_ENABLE 3 #define MDSTAT_STATE_MASK 0x3f +#define PDSTAT_STATE_MASK 0x1f #define MDCTL_FORCE BIT(31) +#define PDCTL_NEXT BIT(1) +#define PDCTL_EPCGOOD BIT(8) #ifndef __ASSEMBLER__ |