diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-06-24 22:21:35 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-24 22:21:35 +0100 |
| commit | c1e08adc86f886ba0ad7c8f29c240d6e833e7ec7 (patch) | |
| tree | 67e66ff524c6d51c61475a3c0df7d8d4850b4284 /include | |
| parent | 52e3e772a098274df3c6f5f1ad58cd7fe24089bf (diff) | |
| parent | 1f64eb379cfc95d5f627b779685f7ac6721df322 (diff) | |
| download | linux-c1e08adc86f886ba0ad7c8f29c240d6e833e7ec7.tar.gz linux-c1e08adc86f886ba0ad7c8f29c240d6e833e7ec7.tar.bz2 linux-c1e08adc86f886ba0ad7c8f29c240d6e833e7ec7.zip | |
Merge ep93xx branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-ep93xx/ep93xx-regs.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-ep93xx/platform.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-arm/arch-ep93xx/ep93xx-regs.h b/include/asm-arm/arch-ep93xx/ep93xx-regs.h index 71cea0b5841b..8c322975f96e 100644 --- a/include/asm-arm/arch-ep93xx/ep93xx-regs.h +++ b/include/asm-arm/arch-ep93xx/ep93xx-regs.h @@ -115,6 +115,8 @@ #define EP93XX_SYSCON_CLOCK_USH_EN 0x10000000 #define EP93XX_SYSCON_HALT EP93XX_SYSCON_REG(0x08) #define EP93XX_SYSCON_STANDBY EP93XX_SYSCON_REG(0x0c) +#define EP93XX_SYSCON_CLOCK_SET1 EP93XX_SYSCON_REG(0x20) +#define EP93XX_SYSCON_CLOCK_SET2 EP93XX_SYSCON_REG(0x24) #define EP93XX_SYSCON_DEVICE_CONFIG EP93XX_SYSCON_REG(0x80) #define EP93XX_SYSCON_DEVICE_CONFIG_CRUNCH_ENABLE 0x00800000 #define EP93XX_SYSCON_SWLOCK EP93XX_SYSCON_REG(0xc0) diff --git a/include/asm-arm/arch-ep93xx/platform.h b/include/asm-arm/arch-ep93xx/platform.h index df9cbb6ef660..d7a34ce20293 100644 --- a/include/asm-arm/arch-ep93xx/platform.h +++ b/include/asm-arm/arch-ep93xx/platform.h @@ -8,6 +8,7 @@ void ep93xx_map_io(void); void ep93xx_init_irq(void); void ep93xx_init_time(unsigned long); void ep93xx_init_devices(void); +void ep93xx_clock_init(void); extern struct sys_timer ep93xx_timer; |