[Hackndev-commit] SF.net SVN: hackndev: [1167] linux4palm/linux/trunk

[<mar...@us...>]

Revision: 1167
          http://svn.sourceforge.net/hackndev/?rev=1167&view=rev
Author:   marex_z71
Date:     2007-07-16 21:44:11 -0700 (Mon, 16 Jul 2007)

Log Message:
-----------
PalmLD: switch to corgi_bl

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/configs/palmld_defconfig
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
    linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-init.h

Modified: linux4palm/linux/trunk/arch/arm/configs/palmld_defconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/configs/palmld_defconfig	2007-07-17 04:42:39 UTC (rev 1166)
+++ linux4palm/linux/trunk/arch/arm/configs/palmld_defconfig	2007-07-17 04:44:11 UTC (rev 1167)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hnd2
-# Thu Jul 12 23:49:34 2007
+# Tue Jul 17 05:31:54 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -974,8 +974,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/palmld/palmld.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c	2007-07-17 04:42:39 UTC (rev 1166)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c	2007-07-17 04:44:11 UTC (rev 1167)
@@ -16,6 +16,7 @@
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/gpio_keys.h>
+#include <linux/corgi_bl.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -29,8 +30,8 @@
 #include <asm/arch/bitfield.h>
 #include <asm/arch/irda.h>
 #include <asm/arch/palmld-gpio.h>
+#include <asm/arch/palmld-init.h>
 #include <asm/arch/pxa27x_keyboard.h>
-#include <asm/arch/pxapwm-bl.h>
 #include <asm/arch/pxa-pm_ll.h>
 #include <asm/arch/sx2.h>
 #include <asm/arch/serial.h>
@@ -43,24 +44,6 @@
 
 #include "../generic.h"
 
-
-static void palmld_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
  */
@@ -250,20 +233,37 @@
  * Backlight
  */
 
-static struct pxapwmbl_platform_data palmld_backlight_data = {
-	.pwm			= 0,
-	.max_intensity		= 0xff,
-	.default_intensity	= 0x7f,
-	.limit_mask		= 0x7f,
-	.prescaler		= 1,
-	.period			= 0x12c,
+static void palmld_bl_power(int on)
+{
+/*    SET_PALMLD_GPIO(BL_POWER, on); */ /* to be determined */
+    pxa_set_cken(CKEN0_PWM0, on);
+    pxa_set_cken(CKEN1_PWM1, on);
+    mdelay(50);
+}
+
+static void palmld_set_bl_intensity(int intensity)
+{
+    palmld_bl_power(intensity ? 1 : 0);
+    if(intensity) {
+        PWM_CTRL0   = 0x7;
+        PWM_PERVAL0 = PALMLD_PERIOD;
+        PWM_PWDUTY0 = intensity;
+    }
+}
+
+static struct corgibl_machinfo palmld_bl_machinfo = {
+    .max_intensity	= PALMLD_MAX_INTENSITY,
+    .default_intensity	= PALMLD_MAX_INTENSITY,
+    .set_bl_intensity	= palmld_set_bl_intensity,
+    .limit_mask		= PALMLD_LIMIT_MASK,
 };
 
 static struct platform_device palmld_backlight = {
-	.name	= "pxapwm-bl",
-	.dev = {
-			.platform_data = &palmld_backlight_data,
-	},
+    .name	= "corgi-bl",
+    .id		= 0,
+    .dev	= {
+	    .platform_data = &palmld_bl_machinfo,
+    },
 };
 
 /*********************************************************
@@ -411,7 +411,7 @@
 	.lccr3			= LCCR3_PixClkDiv(2) | LCCR3_HorSnchL | LCCR3_VrtSnchL |
 				  LCCR3_PixFlEdg     | LCCR3_Bpp(4),
 	
-	.pxafb_backlight_power	= palmld_backlight_power,
+	.pxafb_backlight_power	= NULL,
 };
 
 

Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-init.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-init.h	2007-07-17 04:42:39 UTC (rev 1166)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmld-init.h	2007-07-17 04:44:11 UTC (rev 1167)
@@ -18,17 +18,24 @@
 
 #define _INCLUDE_PALMLD_INIT_H_
 
+/* BACKLIGHT */
 
-// BATTERY 
+#define PALMLD_MAX_INTENSITY		0xFE
+#define PALMLD_DEFAULT_INTENSITY	0x7E
+#define PALMLD_LIMIT_MASK		0x7F
+#define PALMLD_PRESCALER		0x3F
+#define PALMLD_PERIOD			0x12C
 
-#define PALMLD_BAT_MAX_VOLTAGE		4000	// 4.00V current voltage at max charge as from PalmOS
-#define PALMLD_BAT_MIN_VOLTAGE		3550	// 3.55V critical voltage
-#define PALMLD_BAT_MAX_CURRENT		0	// unknokn
-#define PALMLD_BAT_MIN_CURRENT		0	// unknown
-#define PALMLD_BAT_MAX_CHARGE		1	// unknown
-#define PALMLD_BAT_MIN_CHARGE		1	// unknown
+/* BATTERY */
+
+#define PALMLD_BAT_MAX_VOLTAGE		4000	/* 4.00V current voltage at max charge as from PalmOS */
+#define PALMLD_BAT_MIN_VOLTAGE		3550	/* 3.55V critical voltage */
+#define PALMLD_BAT_MAX_CURRENT		0	/* unknokn */
+#define PALMLD_BAT_MIN_CURRENT		0	/* unknown */
+#define PALMLD_BAT_MAX_CHARGE		1	/* unknown */
+#define PALMLD_BAT_MIN_CHARGE		1	/* unknown */
 #define PALMLD_BAT_MEASURE_DELAY (HZ * 1)
-#define PALMLD_MAX_LIFE_MINS		240	// my LifeDrive on-life in minutes
+#define PALMLD_MAX_LIFE_MINS		240	/* my LifeDrive on-life in minutes */
 
 
 #endif


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