summaryrefslogtreecommitdiff
path: root/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1
diff options
context:
space:
mode:
authorFrederic Bompart <frederic@unknown.openembedded.org>2005-09-19 15:28:24 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-19 15:28:24 +0000
commit9e78fbcaa42858a2df5ace75554c620ac048b729 (patch)
treeab8ec566801aeda092eaba2daa5f692e95e825ee /packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1
parent2f8389dfedb897cdda2a8f963f4bd8a93d2a42df (diff)
added opensimpad-2.4.27-vrs1-pxa1-jpm1 kernel. This contains the
following new patches over 2.4.25: - simpad-proc-sys-board.patch (/proc/sys/board patch from Till Harbaum) - simpad-serial.patch (DTR/RTS/CTS support patch from Till Harbaum) - mppe-20040216.patch (add MPPE encryption for PPP) - 2.4.27-mh1.patch (bluetooth patches from Marcel Holtmann) Common patches were placed in the "opensimpad" directory.
Diffstat (limited to 'packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1')
-rw-r--r--packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/disable-pcmcia-probe.patch17
-rw-r--r--packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/mkdep.patch16
-rw-r--r--packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-backlight-if.diff97
-rw-r--r--packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input.diff126
-rw-r--r--packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input2.diff41
-rw-r--r--packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-ts-noninput.diff11
-rw-r--r--packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/sound-volume-reversed.patch16
-rw-r--r--packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/support-128mb-flash.patch25
8 files changed, 0 insertions, 349 deletions
diff --git a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/disable-pcmcia-probe.patch b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/disable-pcmcia-probe.patch
deleted file mode 100644
index 79ba036323..0000000000
--- a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/disable-pcmcia-probe.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux/drivers/pcmcia/Config.in~disable-pcmcia-probe 2003-05-13 11:18:23.000000000 +0200
-+++ linux/drivers/pcmcia/Config.in 2004-05-27 13:59:50.000000000 +0200
-@@ -15,9 +15,6 @@
- tristate 'PCMCIA/CardBus support' CONFIG_PCMCIA
- if [ "$CONFIG_PCMCIA" != "n" ]; then
- # yes, I really mean the following...
-- if [ "$CONFIG_ISA" = "y" -o "$CONFIG_ARCH_SA1100" = "y" ]; then
-- define_bool CONFIG_PCMCIA_PROBE y
-- fi
- if [ "$CONFIG_PCI" != "n" ]; then
- bool ' CardBus support' CONFIG_CARDBUS
- fi
diff --git a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/mkdep.patch b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/mkdep.patch
deleted file mode 100644
index 57218a7d1a..0000000000
--- a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/mkdep.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux-2.4.25/Makefile~mkdep 2004-03-31 17:15:12.000000000 +0200
-+++ linux-2.4.25/Makefile 2004-03-31 17:18:50.000000000 +0200
-@@ -502,7 +502,7 @@
- ifdef CONFIG_MODVERSIONS
- $(MAKE) update-modverfile
- endif
-- scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
-+ $(foreach, dir, $(FINDHPATH), scripts/mkdep -- `find $(dir) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` >> .hdepend)
- scripts/mkdep -- init/*.c > .depend
-
- ifdef CONFIG_MODVERSIONS
diff --git a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-backlight-if.diff b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-backlight-if.diff
deleted file mode 100644
index 50a4ff7628..0000000000
--- a/packages/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
diff --git a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input.diff b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input.diff
deleted file mode 100644
index 6bf27bfdc0..0000000000
--- a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input.diff
+++ /dev/null
@@ -1,126 +0,0 @@
---- /mnt/bdisk/openembedded/oetmp/base/opensimpad-2.4.25-vrs2-pxa1-jpm1-r5/linux-2.4.25/drivers/misc/switches.h 2004-07-01 21:10:30.000000000 +0200
-+++ drivers/misc/switches.h 2004-07-03 23:45:46.000000000 +0200
-@@ -25,4 +25,14 @@
- extern int switches_ucb1x00_init(void);
- extern void switches_ucb1x00_exit(void);
-
-+#ifdef CONFIG_SA1100_SIMPAD
-+#define SIMPAD_KEY_SUSPEND 0x0002
-+#define SIMPAD_KEY_WWW 0x0008
-+#define SIMPAD_KEY_ENTER 0x0010
-+#define SIMPAD_KEY_UP 0x0020
-+#define SIMPAD_KEY_DOWN 0x0040
-+#define SIMPAD_KEY_LEFT 0x0080
-+#define SIMPAD_KEY_RIGHT 0x0100
-+#endif
-+
- #endif /* !defined(_SWITCHES_H) */
---- /mnt/bdisk/openembedded/oetmp/base/opensimpad-2.4.25-vrs2-pxa1-jpm1-r5/linux-2.4.25/drivers/misc/switches-core.c 2004-07-01 21:10:30.000000000 +0200
-+++ drivers/misc/switches-core.c 2004-07-04 17:57:37.000000000 +0200
-@@ -16,6 +16,9 @@
- * 11 September 2001 - UCB1200 driver framework support added.
- *
- * 19 December 2001 - separated out SA-1100 and UCB1x00 code.
-+ *
-+ * 3 July 2004 - Added generating of keyboard events.
-+ * Florian Boor <florian@handhelds.org>
- */
-
- #include <linux/config.h>
-@@ -30,7 +33,11 @@
- #include <linux/slab.h>
- #include <linux/wait.h>
-
-+#include <linux/input.h>
-+
- #include <asm/uaccess.h>
-+#include <asm/hardware.h>
-+#include <asm/keyboard.h>
-
- #include "switches.h"
-
-@@ -53,6 +60,19 @@
- DECLARE_WAIT_QUEUE_HEAD(switches_wait);
- LIST_HEAD(switches_event_queue);
-
-+#ifdef CONFIG_INPUT
-+static struct input_dev idev;
-+
-+int
-+dummy_k_translate(unsigned char scancode, unsigned char *keycode, char raw_mode)
-+{
-+ *keycode = scancode;
-+ return 1;
-+}
-+
-+extern int (*k_translate)(unsigned char, unsigned char *, char);
-+
-+#endif
-
- static ssize_t switches_read(struct file *file, char *buffer,
- size_t count, loff_t *pos)
-@@ -148,6 +168,31 @@
- {
- struct switches_action *action;
-
-+#ifdef CONFIG_INPUT
-+ /* create input events, the events to send depends on the platform */
-+#ifdef CONFIG_SA1100_SIMPAD
-+ if (machine_is_simpad()) {
-+ if (SWITCHES_COUNT(mask) > 0)
-+ {
-+ if (mask->events[0] & SIMPAD_KEY_SUSPEND)
-+ input_report_key(&idev, KEY_POWER, (mask->states[0] & SIMPAD_KEY_SUSPEND) ? 0 : 1);
-+ if (mask->events[0] & SIMPAD_KEY_ENTER)
-+ input_report_key(&idev, KEY_ENTER, (mask->states[0] & SIMPAD_KEY_ENTER) ? 1 : 0);
-+ if (mask->events[0] & SIMPAD_KEY_UP)
-+ input_report_key(&idev, KEY_UP, (mask->states[0] & SIMPAD_KEY_UP) ? 1 : 0);
-+ if (mask->events[0] & SIMPAD_KEY_DOWN)
-+ input_report_key(&idev, KEY_DOWN, (mask->states[0] & SIMPAD_KEY_DOWN) ? 1 : 0);
-+ if (mask->events[0] & SIMPAD_KEY_LEFT)
-+ input_report_key(&idev, KEY_LEFT, (mask->states[0] & SIMPAD_KEY_LEFT) ? 1 : 0);
-+ if (mask->events[0] & SIMPAD_KEY_RIGHT)
-+ input_report_key(&idev, KEY_RIGHT, (mask->states[0] & SIMPAD_KEY_RIGHT) ? 1 : 0);
-+ if (mask->events[0] & SIMPAD_KEY_WWW)
-+ input_report_key(&idev, KEY_F10, (mask->states[0] & SIMPAD_KEY_WWW) ? 1 : 0);
-+ }
-+ }
-+#endif
-+#endif
-+ /* take care of switches device */
- if ((switches_users > 0) && (SWITCHES_COUNT(mask) > 0)) {
-
- if ((action = (struct switches_action *)
-@@ -197,6 +242,21 @@
- return -EIO;
- }
-
-+#ifdef CONFIG_INPUT
-+ /* init input driver stuff */
-+ k_translate = dummy_k_translate;
-+ idev.evbit[0] = BIT(EV_KEY); /* handle key events */
-+
-+ idev.keybit[LONG(KEY_POWER)] |= BIT(KEY_POWER);
-+ idev.keybit[LONG(KEY_UP)] |= BIT(KEY_UP);
-+ idev.keybit[LONG(KEY_DOWN)] |= BIT(KEY_DOWN);
-+ idev.keybit[LONG(KEY_LEFT)] |= BIT(KEY_LEFT);
-+ idev.keybit[LONG(KEY_RIGHT)] |= BIT(KEY_RIGHT);
-+ idev.keybit[LONG(KEY_ENTER)] |= BIT(KEY_ENTER);
-+ idev.keybit[LONG(KEY_F10)] |= BIT(KEY_F10);
-+
-+ input_register_device(&idev);
-+#endif
- printk("Console switches initialized\n");
-
- return 0;
-@@ -214,6 +274,10 @@
- switches_ucb1x00_exit();
- #endif
-
-+#ifdef CONFIG_INPUT
-+ input_unregister_device(&idev);
-+#endif
-+
- if (misc_deregister(&switches_misc) < 0)
- printk(KERN_ERR "%s: unable to deregister misc device\n",
- SWITCHES_NAME);
diff --git a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input2.diff b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input2.diff
deleted file mode 100644
index 4f9d0bf93a..0000000000
--- a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input2.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- drivers/misc/switches-core.c~Fooo
-+++ drivers/misc/switches-core.c
-@@ -66,7 +66,32 @@
- int
- dummy_k_translate(unsigned char scancode, unsigned char *keycode, char raw_mode)
- {
-- *keycode = scancode;
-+ if (scancode == KEY_UP)
-+ *keycode = 144;
-+ else if (scancode == KEY_LEFT)
-+ *keycode = 146;
-+ else if (scancode == KEY_RIGHT)
-+ *keycode = 151;
-+ else if (scancode == KEY_DOWN)
-+ *keycode = 161;
-+ else if (scancode == 144)
-+ *keycode = KEY_UP;
-+ else if (scancode == 146)
-+ *keycode = KEY_LEFT;
-+ else if (scancode == 151)
-+ *keycode = KEY_RIGHT;
-+ else if (scancode == 161)
-+ *keycode = KEY_DOWN;
-+ else if (scancode == KEY_KP8)
-+ *keycode = KEY_UP;
-+ else if (scancode == KEY_KP4)
-+ *keycode = KEY_LEFT;
-+ else if (scancode == KEY_KP6)
-+ *keycode = KEY_RIGHT;
-+ else if (scancode == KEY_KP2)
-+ *keycode = KEY_DOWN;
-+ else
-+ *keycode = scancode;
- return 1;
- }
-
diff --git a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-ts-noninput.diff b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-ts-noninput.diff
deleted file mode 100644
index 08fffe5882..0000000000
--- a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-ts-noninput.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- /mnt/bdisk/openembedded/oetmp/base/opensimpad-2.4.25-vrs2-pxa1-jpm1-r5/linux-2.4.25/drivers/misc/ucb1x00-ts.c 2004-07-01 21:10:30.000000000 +0200
-+++ drivers/misc/ucb1x00-ts.c 2004-07-04 02:00:56.000000000 +0200
-@@ -35,7 +35,7 @@
- /*
- * Define this if you want the UCB1x00 stuff to talk to the input layer
- */
--#ifdef CONFIG_INPUT
-+#if defined(CONFIG_INPUT) && !defined(CONFIG_SA1100_SIMPAD)
- #define USE_INPUT
- #else
- #undef USE_INPUT
diff --git a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/sound-volume-reversed.patch b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/sound-volume-reversed.patch
deleted file mode 100644
index 11fa5c7ad5..0000000000
--- a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/sound-volume-reversed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- linux-2.4.25/drivers/misc/ucb1x00-audio.c~sound-volume-reversed.patch 2004-03-31 17:15:12.000000000 +0200
-+++ linux-2.4.25/drivers/misc/ucb1x00-audio.c 2004-03-31 17:15:13.000000000 +0200
-@@ -97,7 +97,7 @@
- ucba->output_level = gain | gain << 8;
- ucba->mod_cnt++;
- ucba->ctrl_b = (ucba->ctrl_b & 0xff00) |
-- ((gain * 31) / 100);
-+ (((100-gain) * 31) / 100);
- ucb1x00_reg_write(ucba->ucb, UCB_AC_B,
- ucba->ctrl_b);
- ret = 0;
diff --git a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/support-128mb-flash.patch b/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/support-128mb-flash.patch
deleted file mode 100644
index d5647d6299..0000000000
--- a/packages/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/support-128mb-flash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-2.4.25/arch/arm/mach-sa1100/simpad.c~support-128mb-flash
-+++ linux-2.4.25/arch/arm/mach-sa1100/simpad.c
-@@ -83,11 +83,16 @@
- {
- #ifdef CONFIG_SA1100_SIMPAD_SINUSPAD
- SET_BANK( 0, 0xc0000000, 32*1024*1024 );
-+ mi->nr_banks = 1;
- #else
- SET_BANK( 0, 0xc0000000, 64*1024*1024 );
--#endif
- mi->nr_banks = 1;
-+#endif
-
-+#ifdef CONFIG_SA1100_SIMPAD_128M
-+ SET_BANK( 1, 0xc8000000, 64*1024*1024 );
-+ mi->nr_banks = 2;
-+#endif
- setup_ramdisk( 1, 0, 0, 8192 );
- setup_initrd( __phys_to_virt(0xc0800000), 4*1024*1024 );
- }