From: <far...@us...> - 2006-10-31 06:35:43
|
Revision: 656 http://svn.sourceforge.net/hackndev/?rev=656&view=rev Author: farcaller Date: 2006-10-30 22:35:33 -0800 (Mon, 30 Oct 2006) Log Message: ----------- palmt3: moved lcd power to palmt3.c removed palmt3_bl_device until someone figures wtf is that (old backlight driver?) returned pxafb_backlight_power code Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c linux4palm/linux/trunk/drivers/video/pxafb.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c 2006-10-31 06:03:40 UTC (rev 655) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c 2006-10-31 06:35:33 UTC (rev 656) @@ -44,11 +44,34 @@ /*** BackLight ***/ +/* FIXME: wtf is this? Pending for removal static struct platform_device palmt3_bl_device = { .name = "palmt3-bl", .id = -1, }; +*/ +static void palmt3_pxafb_backlight_power(int level) +{ + // just turn it on/off, other controls via backlight class + if(level) + CKEN = CKEN | CKEN1_PWM1; + else + CKEN = CKEN & (~CKEN1_PWM1); +} + +static void palmt3_pxafb_lcd_power(int level) +{ + if(level) { + GPSR1 = GPIO_bit(38); + GPSR1 = GPIO_bit(41); + + } else { + GPLR1 = GPIO_bit(38); + GPLR1 = GPIO_bit(41); + } +} + static struct pxafb_mach_info palmt3lcd __initdata = { .pixclock = 0, .xres = 320, @@ -65,7 +88,8 @@ .lccr0 = 0x003008F9, .lccr3 = 0x03700002, - .pxafb_backlight_power = NULL, + .pxafb_backlight_power = palmt3_pxafb_backlight_power, + .pxafb_lcd_power = palmt3_pxafb_lcd_power, }; /*** SSP ***/ @@ -223,7 +247,7 @@ /*** INIT ***/ static struct platform_device *devices[] __initdata = { - &palmt3_bl_device, + //&palmt3_bl_device, &tsc2101_device, &palmt3_btn_device, &palmt3_backlight_device, Modified: linux4palm/linux/trunk/drivers/video/pxafb.c =================================================================== --- linux4palm/linux/trunk/drivers/video/pxafb.c 2006-10-31 06:03:40 UTC (rev 655) +++ linux4palm/linux/trunk/drivers/video/pxafb.c 2006-10-31 06:35:33 UTC (rev 656) @@ -747,11 +747,6 @@ pr_debug("reg_lccr2 0x%08x\n", (unsigned int) fbi->reg_lccr2); pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3); -#ifdef CONFIG_MACH_T3XSCALE - GPSR1 = GPIO_bit(38); - GPSR1 = GPIO_bit(41); -#endif - /* enable LCD controller clock */ pxa_set_cken(CKEN16_LCD, 1); @@ -791,10 +786,6 @@ /* disable LCD controller clock */ pxa_set_cken(CKEN16_LCD, 0); -#ifdef CONFIG_MACH_T3XSCALE - GPCR1 = GPIO_bit(38); - GPCR1 = GPIO_bit(41); -#endif } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |