diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 05:04:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 05:04:24 -0400 |
| commit | 42f1d2e06a25628ae4ceaadccc4fa67c7787e2b4 (patch) | |
| tree | 8aac83e399de7ad13748a59853a0feea9ed2c5cb /arch/arm/mach-ep93xx/include | |
| parent | 9af5324a070e0b2dcb6e22c89e17424eba245fcc (diff) | |
| parent | 77bbca138c64cb80259732db6f70e1668123f2a7 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel
Diffstat (limited to 'arch/arm/mach-ep93xx/include')
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h index 78ac1bddc8bc..420f71b85123 100644 --- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | |||
| @@ -160,7 +160,10 @@ | |||
| 160 | #define EP93XX_SYSCON_CLOCK_SET1 EP93XX_SYSCON_REG(0x20) | 160 | #define EP93XX_SYSCON_CLOCK_SET1 EP93XX_SYSCON_REG(0x20) |
| 161 | #define EP93XX_SYSCON_CLOCK_SET2 EP93XX_SYSCON_REG(0x24) | 161 | #define EP93XX_SYSCON_CLOCK_SET2 EP93XX_SYSCON_REG(0x24) |
| 162 | #define EP93XX_SYSCON_DEVICE_CONFIG EP93XX_SYSCON_REG(0x80) | 162 | #define EP93XX_SYSCON_DEVICE_CONFIG EP93XX_SYSCON_REG(0x80) |
| 163 | #define EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE 0x00800000 | 163 | #define EP93XX_SYSCON_DEVICE_CONFIG_U3EN (1<<24) |
| 164 | #define EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE (1<<23) | ||
| 165 | #define EP93XX_SYSCON_DEVICE_CONFIG_U2EN (1<<20) | ||
| 166 | #define EP93XX_SYSCON_DEVICE_CONFIG_U1EN (1<<18) | ||
| 164 | #define EP93XX_SYSCON_SWLOCK EP93XX_SYSCON_REG(0xc0) | 167 | #define EP93XX_SYSCON_SWLOCK EP93XX_SYSCON_REG(0xc0) |
| 165 | 168 | ||
| 166 | #define EP93XX_WATCHDOG_BASE (EP93XX_APB_VIRT_BASE + 0x00140000) | 169 | #define EP93XX_WATCHDOG_BASE (EP93XX_APB_VIRT_BASE + 0x00140000) |