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

Commit beca98c9 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Olof Johansson
Browse files

ARM: fix lcd power build failure in collie_defconfig 



Commit 086ada54

  "FB: sa1100: remove global sa1100fb_.*_power function pointers"

got rid of all instances but one in locomolcd.c -- which was
conditional on CONFIG_SA1100_COLLIE.  The associated .power
field which replaces the global is populated in mach-sa1100/collie.c
so move the assignment there, but make it conditional on the
locomolcd support, so use CONFIG_BACKLIGHT_LOCOMO in that file.

Cc: arm@kernel.org
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent ee5324ea

arch/arm/mach-sa1100/collie.c

+4 −0
Original line number Diff line number Diff line
@@ -313,6 +313,10 @@ static struct sa1100fb_mach_info collie_lcd_info = { 


	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,

	.lccr3		= LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),



#ifdef CONFIG_BACKLIGHT_LOCOMO

	.lcd_power	= locomolcd_power

#endif

};



static void __init collie_init(void)

arch/arm/mach-sa1100/include/mach/collie.h

+2 −1
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-sa1100/include/mach/collie.h

 *

 * This file contains the hardware specific definitions for Assabet

 * This file contains the hardware specific definitions for Collie

 * Only include this file from SA1100-specific files.

 *

 * ChangeLog:
@@ -13,6 +13,7 @@ 
#ifndef __ASM_ARCH_COLLIE_H

#define __ASM_ARCH_COLLIE_H



extern void locomolcd_power(int on);



#define COLLIE_SCOOP_GPIO_BASE	(GPIO_MAX + 1)

#define COLLIE_GPIO_CHARGE_ON	(COLLIE_SCOOP_GPIO_BASE + 0)

drivers/video/backlight/locomolcd.c

+1 −8
Original line number Diff line number Diff line
@@ -229,14 +229,7 @@ static struct locomo_driver poodle_lcd_driver = { 


static int __init locomolcd_init(void)

{

	int ret = locomo_driver_register(&poodle_lcd_driver);

	if (ret)

		return ret;



#ifdef CONFIG_SA1100_COLLIE

	sa1100fb_lcd_power = locomolcd_power;

#endif

	return 0;

	return locomo_driver_register(&poodle_lcd_driver);

}



static void __exit locomolcd_exit(void)