[Armadeus-commitlog] SF.net SVN: armadeus:[1265] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.29

[<th...@us...>]

Revision: 1265
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1265&view=rev
Author:   thom25
Date:     2009-05-11 13:32:46 +0000 (Mon, 11 May 2009)

Log Message:
-----------
[LINUX] fix colormap bug at startup
[LINUX] fix backlight flash effect at startup

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch	2009-05-07 15:12:28 UTC (rev 1264)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch	2009-05-11 13:32:46 UTC (rev 1265)
@@ -5,7 +5,29 @@
 ===================================================================
 --- linux-2.6.29.orig/drivers/video/imxfb.c	2009-03-24 00:12:14.000000000 +0100
 +++ linux-2.6.29/drivers/video/imxfb.c	2009-04-29 15:15:10.000000000 +0200
-@@ -437,6 +437,7 @@
+@@ -288,7 +288,7 @@ static int imxfb_check_var(struct fb_var
+ 	switch (var->bits_per_pixel) {
+ 	case 16:
+ 	default:
+-		if (readl(fbi->regs + LCDC_PCR) & PCR_TFT)
++		if ( fbi->pcr & PCR_TFT)
+ 			rgb = &def_rgb_16_tft;
+ 		else
+ 			rgb = &def_rgb_16_stn;
+@@ -373,10 +373,10 @@ static void imxfb_enable_controller(stru
+ 
+ 	writel(RMCR_LCDC_EN, fbi->regs + LCDC_RMCR);
+ 
+-	if (fbi->backlight_power)
+-		fbi->backlight_power(1);
+ 	if (fbi->lcd_power)
+ 		fbi->lcd_power(1);
++	if (fbi->backlight_power)
++		fbi->backlight_power(1);
+ }
+ 
+ static void imxfb_disable_controller(struct imxfb_info *fbi)
+@@ -437,6 +437,7 @@ static int imxfb_activate_var(struct fb_
  	pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
  		var->yres, var->vsync_len,
  		var->upper_margin, var->lower_margin);
@@ -13,7 +35,7 @@
  
  #if DEBUG_VAR
  	if (var->xres < 16        || var->xres > 1024)
-@@ -661,6 +662,12 @@
+@@ -667,6 +668,12 @@ static int __init imxfb_probe(struct pla
  		goto failed_cmap;
  
  	imxfb_set_par(info);

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch	2009-05-07 15:12:28 UTC (rev 1264)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch	2009-05-11 13:32:46 UTC (rev 1265)
@@ -797,7 +797,7 @@
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.29/arch/arm/mach-imx/apf9328_lcd_config.h	2009-05-06 18:37:00.000000000 +0200
-@@ -0,0 +1,278 @@
+@@ -0,0 +1,277 @@
 +/*
 + *
 + * Armadeus LCD configuration file
@@ -860,6 +860,7 @@
 +		} while ((isr & LCDISR_EOF) == 0);
 +
 +		gpio_set_value(SHARP_LQ043_POWER_DOWN, 1);
++		mdelay(200);
 +	} else {
 +		gpio_set_value(SHARP_LQ043_POWER_DOWN, 0);
 +		mdelay(200); /* needs to wait 10 frames after DISP goes down
@@ -884,6 +885,8 @@
 +	pr_debug("apf9328_lcd_backlight_power: %s\n", on ? "on":"off");
 +
 +	pwmr = readl(IO_ADDRESS(LCDC_BASE_ADDR) + 0x2c);
++	if( pwmr )
++		imx_gpio_mode(PD11_PF_CONTRAST);
 +	if (on) {
 +		pwmr |= PWMR_CC_EN;
 +	} else {
@@ -1056,13 +1059,9 @@
 +		imx_gpio_mode(PD10_PF_SPL_SPR);
 +	}
 +
-+	if (fb_inf->pwmr) {
-+		imx_gpio_mode(PD11_PF_CONTRAST);
-+	} else {
-+		gpio_set_value(CONTRAST_LINE, 0); /* Initializes it Low */
-+		/* GPIO Function for CONTRAST pin */
-+		imx_gpio_mode(CONTRAST_LINE | GPIO_OUT | GPIO_GIUS | GPIO_DR);
-+	}
++	gpio_set_value(CONTRAST_LINE, 0); /* Initializes it Low */
++	/* GPIO Function for CONTRAST pin */
++	imx_gpio_mode(CONTRAST_LINE | GPIO_OUT | GPIO_GIUS | GPIO_DR);
 +
 +	return 0;
 +}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.