diff options
| author | Gerrit Code Review <gerrit2@git-master.nvidia.com> | 2010-01-14 04:37:32 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git-master.nvidia.com> | 2010-01-14 04:37:32 +0200 |
| commit | 4bbea3a2cc22051dbda9233f0cd8faaa03233363 (patch) | |
| tree | ae1faec7d04fa4cbe49349dc1902663e8ca41bee /arch/arm/mach-tegra/nvrm | |
| parent | a3b4bd056966216bcfc9f1194c67c1f40bfaa035 (diff) | |
| parent | 8930c80f0ece9edf667f7ad593e15233367cb1dc (diff) | |
Merge change I8930c80f into android-tegra-2.6.29
* changes:
tegra RM: Fix PWM scaling calculation in RM for backlight intensity.
Diffstat (limited to 'arch/arm/mach-tegra/nvrm')
| -rw-r--r-- | arch/arm/mach-tegra/nvrm/io/ap15/ap15rm_pwm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/nvrm/io/ap15/ap15rm_pwm.c b/arch/arm/mach-tegra/nvrm/io/ap15/ap15rm_pwm.c index dbaf41563bd4..14c58e4e28f3 100644 --- a/arch/arm/mach-tegra/nvrm/io/ap15/ap15rm_pwm.c +++ b/arch/arm/mach-tegra/nvrm/io/ap15/ap15rm_pwm.c @@ -316,7 +316,7 @@ void NvRmPwmClose(NvRmPwmHandle hPwm) NvOsMutexUnlock(s_hPwmMutex); } -#define MAX_DUTY_CYCLE 256 +#define MAX_DUTY_CYCLE 255 NvError NvRmPwmConfig( NvRmPwmHandle hPwm, @@ -416,7 +416,9 @@ NvError NvRmPwmConfig( * Convert from percentage unsigned 15.16 fixed point * format to actual register value */ - DCycle = (NvU8)((DutyCycle * MAX_DUTY_CYCLE/100)>>16); + DCycle = (DutyCycle * MAX_DUTY_CYCLE/100)>>16; + if (DCycle > MAX_DUTY_CYCLE) + DCycle = MAX_DUTY_CYCLE; RegValue = PWM_SETNUM(CSR_0, ENB, PwmMode) | PWM_SETNUM(CSR_0, PWM_0, DCycle); |