git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5pv210
/
include
/
mach
/
pwm-clock.h
diff --git
a/arch/arm/mach-s5pv210/include/mach/pwm-clock.h
b/arch/arm/mach-s5pv210/include/mach/pwm-clock.h
index
69027fe
..
f8a9f1b
100644
(file)
--- a/
arch/arm/mach-s5pv210/include/mach/pwm-clock.h
+++ b/
arch/arm/mach-s5pv210/include/mach/pwm-clock.h
@@
-1,13
+1,14
@@
/* linux/arch/arm/mach-s5pv210/include/mach/pwm-clock.h
*
/* linux/arch/arm/mach-s5pv210/include/mach/pwm-clock.h
*
+ * Copyright (c) 2009 Samsung Electronics Co., Ltd.
+ * http://www.samsung.com/
+ *
+ * Copyright 2008 Openmoko, Inc.
* Copyright 2008 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
* http://armlinux.simtec.co.uk/
*
* Copyright 2008 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
* http://armlinux.simtec.co.uk/
*
- * Copyright (c) 2009 Samsung Electronics Co., Ltd.
- * http://www.samsung.com/
- *
- * Based on arch/arm/plat-s3c24xx/include/mach/pwm-clock.h
+ * Based on arch/arm/mach-s3c64xx/include/mach/pwm-clock.h
*
* S5PV210 - pwm clock and timer support
*
*
* S5PV210 - pwm clock and timer support
*
@@
-21,14
+22,14
@@
/**
* pwm_cfg_src_is_tclk() - return whether the given mux config is a tclk
/**
* pwm_cfg_src_is_tclk() - return whether the given mux config is a tclk
- * @cfg: The timer TCFG1 register bits shifted down to 0.
+ * @
t
cfg: The timer TCFG1 register bits shifted down to 0.
*
* Return true if the given configuration from TCFG1 is a TCLK instead
* any of the TDIV clocks.
*/
static inline int pwm_cfg_src_is_tclk(unsigned long tcfg)
{
*
* Return true if the given configuration from TCFG1 is a TCLK instead
* any of the TDIV clocks.
*/
static inline int pwm_cfg_src_is_tclk(unsigned long tcfg)
{
- return tcfg == S3C
2410
_TCFG1_MUX_TCLK;
+ return tcfg == S3C
64XX
_TCFG1_MUX_TCLK;
}
/**
}
/**
@@
-40,7
+41,7
@@
static inline int pwm_cfg_src_is_tclk(unsigned long tcfg)
*/
static inline unsigned long tcfg_to_divisor(unsigned long tcfg1)
{
*/
static inline unsigned long tcfg_to_divisor(unsigned long tcfg1)
{
- return 1 <<
(1 + tcfg1)
;
+ return 1 <<
tcfg1
;
}
/**
}
/**
@@
-50,7
+51,7
@@
static inline unsigned long tcfg_to_divisor(unsigned long tcfg1)
*/
static inline unsigned int pwm_tdiv_has_div1(void)
{
*/
static inline unsigned int pwm_tdiv_has_div1(void)
{
- return
0
;
+ return
1
;
}
/**
}
/**
@@
-61,9
+62,9
@@
static inline unsigned int pwm_tdiv_has_div1(void)
*/
static inline unsigned long pwm_tdiv_div_bits(unsigned int div)
{
*/
static inline unsigned long pwm_tdiv_div_bits(unsigned int div)
{
- return ilog2(div)
- 1
;
+ return ilog2(div);
}
}
-#define S3C_TCFG1_MUX_TCLK S3C
2410
_TCFG1_MUX_TCLK
+#define S3C_TCFG1_MUX_TCLK S3C
64XX
_TCFG1_MUX_TCLK
#endif /* __ASM_ARCH_PWMCLK_H */
#endif /* __ASM_ARCH_PWMCLK_H */