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/pwm.h | |
| parent | 40e74c852b76accfe27d832f23ea3020352bc120 (diff) | |
| parent | ec99d983418897b120409f71712d41c01a21bf7c (diff) | |
| download | olio-uboot-2014.01-8fea51a4acb0c7da6fb375c9a708c50c0a1b66ad.tar.xz olio-uboot-2014.01-8fea51a4acb0c7da6fb375c9a708c50c0a1b66ad.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm/arch-s5pc1xx/pwm.h')
| -rw-r--r-- | arch/arm/include/asm/arch-s5pc1xx/pwm.h | 12 | 
1 files changed, 4 insertions, 8 deletions
| diff --git a/arch/arm/include/asm/arch-s5pc1xx/pwm.h b/arch/arm/include/asm/arch-s5pc1xx/pwm.h index e02a8d8fb..0369968d4 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/pwm.h +++ b/arch/arm/include/asm/arch-s5pc1xx/pwm.h @@ -22,19 +22,15 @@  #ifndef __ASM_ARM_ARCH_PWM_H_  #define __ASM_ARM_ARCH_PWM_H_ -/* PWM timer addressing */ -#define S5PC100_TIMER_BASE	S5PC100_PWMTIMER_BASE -#define S5PC110_TIMER_BASE	S5PC110_PWMTIMER_BASE -  /* Interval mode(Auto Reload) of PWM Timer 4 */ -#define S5PC1XX_TCON4_AUTO_RELOAD	(1 << 22) +#define TCON4_AUTO_RELOAD	(1 << 22)  /* Update TCNTB4 */ -#define S5PC1XX_TCON4_UPDATE		(1 << 21) +#define TCON4_UPDATE		(1 << 21)  /* start bit of PWM Timer 4 */ -#define S5PC1XX_TCON4_START		(1 << 20) +#define TCON4_START		(1 << 20)  #ifndef __ASSEMBLY__ -struct s5pc1xx_timer { +struct s5p_timer {  	unsigned int	tcfg0;  	unsigned int	tcfg1;  	unsigned int	tcon; |