mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-09 07:23:14 +00:00
[PATCH] fix hardcoded values in collie frontlight
In frontlight support, we should really use values from flash-ROM instead of hardcoding our own. Cleanup includes. Signed-off-by: Pavel Machek <pavel@suse.cz> Acked-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
bd34596239
commit
36a95bf5cd
@ -20,14 +20,10 @@
|
|||||||
|
|
||||||
#include <asm/hardware/locomo.h>
|
#include <asm/hardware/locomo.h>
|
||||||
#include <asm/irq.h>
|
#include <asm/irq.h>
|
||||||
|
#include <asm/mach/sharpsl_param.h>
|
||||||
|
#include <asm/mach-types.h>
|
||||||
|
|
||||||
#ifdef CONFIG_SA1100_COLLIE
|
#include "../../../arch/arm/mach-sa1100/generic.h"
|
||||||
#include <asm/arch/collie.h>
|
|
||||||
#else
|
|
||||||
#include <asm/arch/poodle.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern void (*sa1100fb_lcd_power)(int on);
|
|
||||||
|
|
||||||
static struct locomo_dev *locomolcd_dev;
|
static struct locomo_dev *locomolcd_dev;
|
||||||
|
|
||||||
@ -82,7 +78,7 @@ static void locomolcd_off(int comadj)
|
|||||||
|
|
||||||
void locomolcd_power(int on)
|
void locomolcd_power(int on)
|
||||||
{
|
{
|
||||||
int comadj = 118;
|
int comadj = sharpsl_param.comadj;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
local_irq_save(flags);
|
local_irq_save(flags);
|
||||||
@ -93,11 +89,12 @@ void locomolcd_power(int on)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* read comadj */
|
/* read comadj */
|
||||||
#ifdef CONFIG_MACH_POODLE
|
if (comadj == -1) {
|
||||||
comadj = 118;
|
if (machine_is_poodle())
|
||||||
#else
|
comadj = 118;
|
||||||
comadj = 128;
|
if (machine_is_collie())
|
||||||
#endif
|
comadj = 128;
|
||||||
|
}
|
||||||
|
|
||||||
if (on)
|
if (on)
|
||||||
locomolcd_on(comadj);
|
locomolcd_on(comadj);
|
||||||
|
Loading…
Reference in New Issue
Block a user