Skip to contentSkip to conversation

ARM: fix lcd power build failure in collie_defconfig

PATCH New Paul Gortmaker 2 participants 3 messages Mar 6, 2012 – Mar 21, 2012

Subsystems (5)
Arm (32-bit) Arm sub-architectures Linux-next tree Framebuffer layer +1 more subsystems
lore
Share & tools
lore

Paul Gortmaker

author
#0 lore raw

PATCH 1/1 ARM: fix lcd power build failure in collie_defconfig

Commit 086ada54abaa4316e8603f02410fe8ebc9ba2de1 (linux-next)

"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.

Signed-off-by Paul Gortmaker <[email protected]>
arch/arm/mach-sa1100/collie.c +4 -0
index 48885b7..c7f418b 100644
@@ -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
index 52acda7..f33679d 100644
@@ -1,7 +1,7 @@
 /*
  * 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
index be20b5c..3a6d541 100644
@@ -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)
Signature · 1 line
1.7.9.1
#1 lore raw

PATCH 1/1 ARM: fix lcd power build failure in collie_defconfig

Quoted 11 lines · Paul Gortmaker

Commit 086ada54abaa4316e8603f02410fe8ebc9ba2de1 (linux-next)

"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.

Signed-off-by Paul Gortmaker <[email protected]>

What about this patch?
I assumed Russel would pick it up as the commit referenced is also in his tree but it looks like this patch is still not in -next. Any reasons for this?

Best regards,

Florian Tobias Schandinat

Quoted 57 lines
arch/arm/mach-sa1100/collie.c +4 -0
index 48885b7..c7f418b 100644
@@ -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
index 52acda7..f33679d 100644
@@ -1,7 +1,7 @@
 /*
  * 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
index be20b5c..3a6d541 100644
@@ -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)
author
#2 lore raw

PATCH 1/1 ARM: fix lcd power build failure in collie_defconfig

Quoted 11 lines · Florian Tobias Schandinat
Quoted 10 lines · Paul Gortmaker

Commit 086ada54abaa4316e8603f02410fe8ebc9ba2de1 (linux-next)

"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.

Quoted 6 lines
Quoted 1 line
Signed-off-by Paul Gortmaker <[email protected]>

What about this patch?
I assumed Russel would pick it up as the commit referenced is also in his tree but it looks like this patch is still not in -next. Any reasons for this?

Not that I'm aware of. I didn't get any negative feedback or change
requests asking for a v2. There are probably about a half dozen
linux-next build failures in my triage list that I've fixed but the commits have not yet looped back around through the various maintainers for one reason or another.

http://marc.info/?l=linux-next&m=133227360822405&w=2

It would be nice to have them all crossed off...

Paul.
---

Quoted 64 lines

Best regards,

Florian Tobias Schandinat

Quoted 57 lines
arch/arm/mach-sa1100/collie.c +4 -0
index 48885b7..c7f418b 100644
@@ -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
index 52acda7..f33679d 100644
@@ -1,7 +1,7 @@
 /*
  * 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
index be20b5c..3a6d541 100644
@@ -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)