diff options
author | Wolfgang Denk <wd@denx.de> | 2010-09-09 21:39:46 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-09-09 21:39:46 +0200 |
commit | 8fea51a4acb0c7da6fb375c9a708c50c0a1b66ad (patch) | |
tree | f6a3d36e35f8f4d1009c367417e918c210b0baf0 /arch/arm/include/asm/arch-s5pc1xx/clk.h | |
parent | 40e74c852b76accfe27d832f23ea3020352bc120 (diff) | |
parent | ec99d983418897b120409f71712d41c01a21bf7c (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm/arch-s5pc1xx/clk.h')
-rw-r--r-- | arch/arm/include/asm/arch-s5pc1xx/clk.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-s5pc1xx/clk.h b/arch/arm/include/asm/arch-s5pc1xx/clk.h index 3e59abe78c..3488eb7c15 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/clk.h +++ b/arch/arm/include/asm/arch-s5pc1xx/clk.h @@ -29,10 +29,11 @@ #define HPLL 3 #define VPLL 4 -void s5pc1xx_clock_init(void); +void s5p_clock_init(void); extern unsigned long (*get_pll_clk)(int pllreg); extern unsigned long (*get_arm_clk)(void); -extern unsigned long (*get_pclk)(void); +extern unsigned long (*get_pwm_clk)(void); +extern unsigned long (*get_uart_clk)(int dev_index); #endif |