Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 474b62f5 authored by Jongpill Lee's avatar Jongpill Lee Committed by Ben Dooks
Browse files

ARM: S5P6440: Bug fix on PWM Timer 



This patch fixes return value in below functions
- pwm_cfg_src_is_tclk
- tcfg_to_divisor
- pwm_tdiv_has_div1
- pwm_tdiv_div_bits

And this patch changes Copyright ordering, and addes 'based on' information.

Signed-off-by: default avatarJongpill Lee <boyko.lee@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 7ebd4675

arch/arm/mach-s5p6440/include/mach/pwm-clock.h

+16 −8
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5p6440/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 2009 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 * Based on arch/arm/mach-s3c64xx/include/mach/pwm-clock.h

 *

 * S5P6440 - pwm clock and timer support

 *
@@ -14,16 +17,19 @@ 
 * published by the Free Software Foundation.

*/



#ifndef __ASM_ARCH_PWMCLK_H

#define __ASM_ARCH_PWMCLK_H __FILE__



/**

 * pwm_cfg_src_is_tclk() - return whether the given mux config is a tclk

 * @cfg: The timer TCFG1 register bits shifted down to 0.

 * @tcfg: 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 tcfg == S3C2410_TCFG1_MUX_TCLK;

	return 0;

}



/**
@@ -35,7 +41,7 @@ static inline int pwm_cfg_src_is_tclk(unsigned long tcfg) 
 */

static inline unsigned long tcfg_to_divisor(unsigned long tcfg1)

{

	return 1 << (1 + tcfg1);

	return 1 << tcfg1;

}



/**
@@ -45,7 +51,7 @@ static inline unsigned long tcfg_to_divisor(unsigned long tcfg1) 
 */

static inline unsigned int pwm_tdiv_has_div1(void)

{

	return 0;

	return 1;

}



/**
@@ -56,7 +62,9 @@ static inline unsigned int pwm_tdiv_has_div1(void) 
 */

static inline unsigned long pwm_tdiv_div_bits(unsigned int div)

{

	return ilog2(div) - 1;

	return ilog2(div);

}



#define S3C_TCFG1_MUX_TCLK S3C2410_TCFG1_MUX_TCLK
 
#define S3C_TCFG1_MUX_TCLK 0



#endif /* __ASM_ARCH_PWMCLK_H */