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

Commit 36a95bf5 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[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: default avatarPavel Machek <pavel@suse.cz>
Acked-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bd345962
Loading
Loading
Loading
Loading
+10 −13
Original line number Diff line number Diff line
@@ -20,14 +20,10 @@

#include <asm/hardware/locomo.h>
#include <asm/irq.h>
#include <asm/mach/sharpsl_param.h>
#include <asm/mach-types.h>

#ifdef CONFIG_SA1100_COLLIE
#include <asm/arch/collie.h>
#else
#include <asm/arch/poodle.h>
#endif

extern void (*sa1100fb_lcd_power)(int on);
#include "../../../arch/arm/mach-sa1100/generic.h"

static struct locomo_dev *locomolcd_dev;

@@ -82,7 +78,7 @@ static void locomolcd_off(int comadj)

void locomolcd_power(int on)
{
	int comadj = 118;
	int comadj = sharpsl_param.comadj;
	unsigned long flags;

	local_irq_save(flags);
@@ -93,11 +89,12 @@ void locomolcd_power(int on)
	}

	/* read comadj */
#ifdef CONFIG_MACH_POODLE
	if (comadj == -1) {
		if (machine_is_poodle())
			comadj = 118;
#else
		if (machine_is_collie())
			comadj = 128;
#endif
	}

	if (on)
		locomolcd_on(comadj);