Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

1 files changed, 0 insertions, 97 deletions

diff --git a/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-backlight-if.diff b/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-backlight-if.diff
deleted file mode 100644
index 50a4ff7628..0000000000
--- a/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-backlight-if.diff
+++ /dev/null
@@ -1,97 +0,0 @@
---- /mnt/bdisk/openembedded/oetmp/base/opensimpad-2.4.25-vrs2-pxa1-jpm1-r5/linux-2.4.25/drivers/video/mq200fb.c	2004-07-01 21:10:30.000000000 +0200
-+++ drivers/video/mq200fb.c	2004-07-03 20:58:59.000000000 +0200
-@@ -82,6 +82,20 @@
- 	write:	proc_write_reg
- };
- 
-+#ifdef CONFIG_SA1100_SIMPAD
-+
-+static ssize_t proc_read_light(struct file * file, char * buf,
-+		size_t nbytes, loff_t *ppos);
-+static ssize_t proc_write_light(struct file * file, const char * buffer,
-+		size_t count, loff_t *ppos);
-+
-+static struct file_operations proc_light_operations = {
-+	read:	proc_read_light,
-+	write:	proc_write_light
-+};
-+#endif
-+
-+
- typedef struct sa1110_reg_entry {
- 	u32 phyaddr;
- 	char* name;
-@@ -622,6 +636,20 @@
-        }
-     }
- 
-+#ifdef CONFIG_SA1100_SIMPAD
-+	entry = create_proc_entry("backlight",
-+				 S_IRWXU | S_IRWXG | S_IRWXO,
-+				 mq200dir);
-+	if(entry) {
-+	  entry->proc_fops = &proc_light_operations;
-+	} 
-+    else {
-+	  printk( KERN_ERR
-+		  "mq200fb: can't create /proc/" MQ200_DIRNAME
-+		  "/backlight\n");
-+	  return(-ENOMEM);
-+    }
-+ #endif
- 
- #ifdef MQ_SA1110
- 
-@@ -1879,7 +1907,7 @@
- static void writeBrightness(void *pMQMMIO, int brightness)
- {
-     unsigned long dutyCycle, pwmcontrol;
--    int MAX_BRIGHT_REG = 0x000000fc; /* int 254 */
-+    int MAX_BRIGHT_REG = 0x000000fe; /* int 254 */
-     
-     if(brightness > MAX_BRIGHT_REG)
-       return;
-@@ -1961,3 +1989,43 @@
- 	return (count+endp-buffer);
- }
- 
-+#ifdef CONFIG_SA1100_SIMPAD
-+
-+#define SIMPAD_BACKLIGHT_MASK	0x00a10044
-+
-+static int proc_read_light(struct file * file, char * buf,
-+		size_t nbytes, loff_t *ppos)
-+{
-+	char outputbuf[15];
-+	int count;
-+	u32 pwmctl;
-+	if (*ppos>0) /* Assume reading completed in previous read*/
-+		return 0;
-+
-+	pwmctl = *((volatile *) mq200_p2v(0x4be0e03c));
-+	pwmctl &= ~SIMPAD_BACKLIGHT_MASK;
-+	pwmctl = pwmctl >> 8;	
-+	pwmctl = 254 - pwmctl;
-+		
-+	count = sprintf(outputbuf, "%d\n",pwmctl);
-+	*ppos+=count;
-+	if (count>nbytes)  /* Assume output can be read at one time */
-+		return -EINVAL;
-+	if (copy_to_user(buf, outputbuf, count))
-+		return -EFAULT;
-+	return count;
-+}
-+
-+static ssize_t proc_write_light(struct file * file, const char * buffer,
-+		size_t count, loff_t *ppos)
-+{
-+	void * pMQMMIO = (void *) mqMmioAddr;
-+	char *endp;
-+	unsigned long newvalue = simple_strtoul(buffer,&endp,0);
-+	if (newvalue > 254)
-+		newvalue = 254;
-+	writeBrightness(pMQMMIO,newvalue);
-+	mq200_backlight(pMQMMIO,(int)newvalue);
-+	return (count+endp-buffer);
-+}
-+#endif