From 59dd32c83d45a68ffd97331bf473b849960f7863 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 15 Jun 2006 14:43:40 +0000 Subject: linux-oz-2.6: Rearrange patches to reflect submission status. Minor tweaks to make the defconfigs more equal. Update git kernel to a more recent version of the kernel. --- .../hrw-pcmcia-ids-r2.patch | 9 +++- .../locomo-kbd-hotkeys.patch | 48 +++++++++++++++++++++ .../locomo-lcd-def-bightness.patch | 11 +++++ .../locomo-sysrq+keyrepeat.patch | 49 ++++++++++++++++++++++ 4 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-openzaurus-2.6.16+git/locomo-kbd-hotkeys.patch create mode 100644 packages/linux/linux-openzaurus-2.6.16+git/locomo-lcd-def-bightness.patch create mode 100644 packages/linux/linux-openzaurus-2.6.16+git/locomo-sysrq+keyrepeat.patch (limited to 'packages/linux/linux-openzaurus-2.6.16+git') diff --git a/packages/linux/linux-openzaurus-2.6.16+git/hrw-pcmcia-ids-r2.patch b/packages/linux/linux-openzaurus-2.6.16+git/hrw-pcmcia-ids-r2.patch index 3d5d197920..6f77d51dee 100644 --- a/packages/linux/linux-openzaurus-2.6.16+git/hrw-pcmcia-ids-r2.patch +++ b/packages/linux/linux-openzaurus-2.6.16+git/hrw-pcmcia-ids-r2.patch @@ -4,6 +4,12 @@ The ident for Seagate 8GB microdrive is hash 0x76dc4190, 0xcfba9599 manfid 0x0111, 0x0000 +CF card: + product info: "SAMSUNG", "04/05/06", "", "" + manfid : 0x0000, 0x0000 + function 4 (fixed disk) + + Signed-off-by: Marcin Juszkiewicz drivers/ide/legacy/ide-cs.c | 1 + @@ -13,11 +19,12 @@ Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c =================================================================== --- linux-2.6.16.orig/drivers/ide/legacy/ide-cs.c 2006-04-20 12:41:41.000000000 +0200 +++ linux-2.6.16/drivers/ide/legacy/ide-cs.c 2006-04-20 12:45:19.640621552 +0200 -@@ -444,6 +444,7 @@ +@@ -444,6 +444,8 @@ PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), + PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.16+git/locomo-kbd-hotkeys.patch b/packages/linux/linux-openzaurus-2.6.16+git/locomo-kbd-hotkeys.patch new file mode 100644 index 0000000000..8b296780d4 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16+git/locomo-kbd-hotkeys.patch @@ -0,0 +1,48 @@ +--- linux-2.6.16/drivers/input/keyboard/locomokbd.c 2006-05-11 18:15:17.392063008 +0200 ++++ linux-2.6.16/drivers/input/keyboard/locomokbd.c.ok 2006-05-11 18:14:55.870334808 +0200 +@@ -44,24 +44,29 @@ + + #define LOCOMOKBD_NUMKEYS 128 + +-#define KEY_ACTIVITY KEY_F16 +-#define KEY_CONTACT KEY_F18 +-#define KEY_CENTER KEY_F15 ++ ++#define LOCOMO_KEY_CALENDER KEY_F1 ++#define LOCOMO_KEY_ADDRESS KEY_F2 ++#define LOCOMO_KEY_CANCEL KEY_F4 ++#define LOCOMO_KEY_CENTER KEY_F5 ++#define LOCOMO_KEY_MAIL KEY_F10 ++#define LOCOMO_KEY_OK KEY_F11 ++#define LOCOMO_KEY_MENU KEY_F12 + + static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = { +- 0, KEY_ESC, KEY_ACTIVITY, 0, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ +- 0, 0, 0, 0, 0, 0, 0, KEY_MENU, KEY_HOME, KEY_CONTACT, /* 10 - 19 */ +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 20 - 29 */ +- 0, 0, 0, KEY_CENTER, 0, KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */ +- 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */ +- KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */ +- KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, KEY_ENTER, 0, 0, /* 60 - 69 */ +- KEY_BACKSPACE, 0, KEY_L, KEY_U, KEY_H, KEY_R, KEY_D, KEY_Q, 0, 0, /* 70 - 79 */ +- 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */ +- KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ +- 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ +- KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ +- KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ ++ 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ ++ KEY_HOME, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, KEY_HOME, LOCOMO_KEY_ADDRESS, /* 10 - 19 */ ++ 0, 0, 0, 0, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 20 - 29 */ ++ 0, 0, 0, LOCOMO_KEY_CENTER, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */ ++ KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */ ++ KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, LOCOMO_KEY_OK, 0, 0, /* 60 - 69 */ ++ KEY_BACKSPACE, 0, KEY_L, KEY_U, KEY_H, KEY_R, KEY_D, KEY_Q, 0, 0, /* 70 - 79 */ ++ 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */ ++ KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ ++ 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ ++ KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ ++ KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ + }; + + #define KB_ROWS 16 diff --git a/packages/linux/linux-openzaurus-2.6.16+git/locomo-lcd-def-bightness.patch b/packages/linux/linux-openzaurus-2.6.16+git/locomo-lcd-def-bightness.patch new file mode 100644 index 0000000000..6408ef9551 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16+git/locomo-lcd-def-bightness.patch @@ -0,0 +1,11 @@ +--- linux-2.6.16/drivers/video/backlight/locomolcd.c.orig 2006-05-14 13:24:01.354435088 +0200 ++++ linux-2.6.16/drivers/video/backlight/locomolcd.c 2006-05-14 13:24:11.920828752 +0200 +@@ -201,7 +201,7 @@ + return PTR_ERR (locomolcd_bl_device); + + /* Set up frontlight so that screen is readable */ +- locomobl_data.brightness = 2; ++ locomobl_data.brightness = 3; + locomolcd_set_intensity(locomolcd_bl_device); + + return 0; diff --git a/packages/linux/linux-openzaurus-2.6.16+git/locomo-sysrq+keyrepeat.patch b/packages/linux/linux-openzaurus-2.6.16+git/locomo-sysrq+keyrepeat.patch new file mode 100644 index 0000000000..7e233277da --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16+git/locomo-sysrq+keyrepeat.patch @@ -0,0 +1,49 @@ +--- linux-2.6.16/drivers/input/keyboard/locomokbd.c.orig 2006-05-13 22:53:33.810228656 +0200 ++++ linux-2.6.16/drivers/input/keyboard/locomokbd.c 2006-05-13 22:56:56.544408376 +0200 +@@ -45,17 +45,20 @@ + #define LOCOMOKBD_NUMKEYS 128 + + +-#define LOCOMO_KEY_CALENDER KEY_F1 +-#define LOCOMO_KEY_ADDRESS KEY_F2 +-#define LOCOMO_KEY_CANCEL KEY_F4 +-#define LOCOMO_KEY_CENTER KEY_F5 +-#define LOCOMO_KEY_MAIL KEY_F10 +-#define LOCOMO_KEY_OK KEY_F11 ++#define LOCOMO_KEY_CALENDER KEY_LEFTCTRL ++#define LOCOMO_KEY_ADDRESS KEY_LEFTALT /* Needed for SysRQ */ ++#define LOCOMO_KEY_HOME KEY_SYSRQ /* Needed for SysRQ */ + #define LOCOMO_KEY_MENU KEY_F12 ++#define LOCOMO_KEY_MAIL KEY_F10 ++#define LOCOMO_KEY_OK KEY_F11 /* Don't hardwire to KEY_RETURN */ ++#define LOCOMO_KEY_CANCEL KEY_POWER ++#define LOCOMO_KEY_CENTER KEY_F5 /* Don't hardwire to KEY_RETURN */ ++ ++#define LOCOMO_KEY_FN KEY_F9 + + static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = { +- 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ +- KEY_HOME, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, KEY_HOME, LOCOMO_KEY_ADDRESS, /* 10 - 19 */ ++ 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, LOCOMO_KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */ ++ 0, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, 0, LOCOMO_KEY_ADDRESS, /* 10 - 19 */ + 0, 0, 0, 0, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 20 - 29 */ + 0, 0, 0, LOCOMO_KEY_CENTER, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */ +@@ -65,7 +68,7 @@ + 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */ + KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ + 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ +- KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ ++ KEY_LEFTSHIFT, KEY_TAB, LOCOMO_KEY_FN, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ + KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ + }; + +@@ -76,7 +79,7 @@ + #define NR_SCANCODES 128 + + #define KB_DELAY 8 +-#define SCAN_INTERVAL (HZ/10) ++#define SCAN_INTERVAL (HZ/20) + #define LOCOMOKBD_PRESSED 1 + + struct locomokbd { -- cgit v1.2.3