From: <mar...@us...> - 2007-07-17 09:05:44
|
Revision: 1172 http://svn.sourceforge.net/hackndev/?rev=1172&view=rev Author: marex_z71 Date: 2007-07-17 02:05:42 -0700 (Tue, 17 Jul 2007) Log Message: ----------- PalmTT5: migrate to corgi_bl Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/configs/palmtt5_defconfig linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt5/palmtt5.c linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt5-init.h Modified: linux4palm/linux/trunk/arch/arm/configs/palmtt5_defconfig =================================================================== --- linux4palm/linux/trunk/arch/arm/configs/palmtt5_defconfig 2007-07-17 08:50:45 UTC (rev 1171) +++ linux4palm/linux/trunk/arch/arm/configs/palmtt5_defconfig 2007-07-17 09:05:42 UTC (rev 1172) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hnd2 -# Fri Jul 13 01:44:04 2007 +# Tue Jul 17 10:07:03 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -901,8 +901,8 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_LCD_CLASS_DEVICE=m -# CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_PXAPWM=m +CONFIG_BACKLIGHT_CORGI=m +# CONFIG_BACKLIGHT_PXAPWM is not set CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt5/palmtt5.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt5/palmtt5.c 2007-07-17 08:50:45 UTC (rev 1171) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt5/palmtt5.c 2007-07-17 09:05:42 UTC (rev 1172) @@ -21,6 +21,7 @@ #include <linux/input.h> #include <linux/delay.h> #include <linux/irq.h> +#include <linux/corgi_bl.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -38,27 +39,10 @@ #include <asm/arch/udc.h> #include <asm/arch/irda.h> #include <asm/arch/pxa27x_keyboard.h> -#include <asm/arch/pxapwm-bl.h> #include <asm/arch/serial.h> #include "../generic.h" -static void palmtt5_backlight_power(int on) -{ - if(on) { - /* setup backlight PWM settings */ - PWM_CTRL0 = 0x7; - PWM_PWDUTY0 = 0x11a; - PWM_PERVAL0 = 0x16c; - - /* turn on PWMs */ - CKEN |= CKEN0_PWM0 | CKEN1_PWM1; - } else { - /* turn off PWMs */ - CKEN &= ~(CKEN0_PWM0 | CKEN1_PWM1); - } -} - /************************** * SD/MMC card controller * **************************/ @@ -165,32 +149,37 @@ * Backlight * *************/ -static void palmtt5_bl_on(void){ - SET_GPIO(GPIO_NR_PALMTT5_BL_POWER, 1); - mdelay(50); +static void palmtt5_bl_power(int on) +{ + SET_PALMTT5_GPIO(BL_POWER, on); + pxa_set_cken(CKEN0_PWM0, on); + pxa_set_cken(CKEN1_PWM1, on); + mdelay(50); } -static void palmtt5_bl_off(void){ - SET_GPIO(GPIO_NR_PALMTT5_BL_POWER, 0); - mdelay(50); +static void palmtt5_set_bl_intensity(int intensity) +{ + palmtt5_bl_power(intensity ? 1 : 0); + if(intensity) { + PWM_CTRL0 = 0x7; + PWM_PERVAL0 = PALMTT5_PERIOD; + PWM_PWDUTY0 = intensity; + } } -static struct pxapwmbl_platform_data palmtt5_backlight_data = { - .pwm = 0, - .max_intensity = 0x16c, - .default_intensity = 0xc7, - .limit_mask = 0x6d, - .prescaler = 7, - .period = 0x16c, - .turn_bl_on = palmtt5_bl_on, - .turn_bl_off = palmtt5_bl_off, +static struct corgibl_machinfo palmtt5_bl_machinfo = { + .max_intensity = PALMTT5_MAX_INTENSITY, + .default_intensity = PALMTT5_MAX_INTENSITY, + .set_bl_intensity = palmtt5_set_bl_intensity, + .limit_mask = PALMTT5_LIMIT_MASK, }; static struct platform_device palmtt5_backlight = { - .name = "pxapwm-bl", - .dev = { - .platform_data = &palmtt5_backlight_data, - }, + .name = "corgi-bl", + .id = 0, + .dev = { + .platform_data = &palmtt5_bl_machinfo, + }, }; @@ -400,7 +389,7 @@ /* Set divisor to 2 to get rid of screen whining */ .lccr3 = LCCR3_PixClkDiv(2) | LCCR3_HorSnchL | LCCR3_VrtSnchL | LCCR3_PixFlEdg | LCCR3_Bpp(4), - .pxafb_backlight_power = palmtt5_backlight_power, + .pxafb_backlight_power = NULL, }; static struct map_desc palmtt5_io_desc[] __initdata = { Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt5-init.h =================================================================== --- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt5-init.h 2007-07-17 08:50:45 UTC (rev 1171) +++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt5-init.h 2007-07-17 09:05:42 UTC (rev 1172) @@ -32,21 +32,29 @@ #define PALMTT5_KM_COLS 3 -// TOUCHSCREEN +/* TOUCHSCREEN */ #define AC97_LINK_FRAME 21 -// BATTERY +/* BATTERY */ -#define PALMTT5_BAT_MAX_VOLTAGE 4000 // 4.00v current voltage at max charge as from Filez -#define PALMTT5_BAT_MIN_VOLTAGE 3550 // 3.55v critical voltage as from FileZ -#define PALMTT5_BAT_MAX_CURRENT 0 // unknokn -#define PALMTT5_BAT_MIN_CURRENT 0 // unknown -#define PALMTT5_BAT_MAX_CHARGE 1 // unknown -#define PALMTT5_BAT_MIN_CHARGE 1 // unknown -#define PALMTT5_MAX_LIFE_MINS 360 // on-life in minutes +#define PALMTT5_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage at max charge as from Filez */ +#define PALMTT5_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage as from FileZ */ +#define PALMTT5_BAT_MAX_CURRENT 0 /* unknokn */ +#define PALMTT5_BAT_MIN_CURRENT 0 /* unknown */ +#define PALMTT5_BAT_MAX_CHARGE 1 /* unknown */ +#define PALMTT5_BAT_MIN_CHARGE 1 /* unknown */ +#define PALMTT5_MAX_LIFE_MINS 360 /* on-life in minutes */ #define PALMTT5_BAT_MEASURE_DELAY (HZ * 1) +/* BACKLIGHT */ + +#define PALMTT5_MAX_INTENSITY 0xFE +#define PALMTT5_DEFAULT_INTENSITY 0x7E +#define PALMTT5_LIMIT_MASK 0x7F +#define PALMTT5_PRESCALER 0x3F +#define PALMTT5_PERIOD 0x12C + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |