* [meta-handheld][PATCH 1/3] linux-yocto_3.4: move MTD common options to zaurus-hardware.cfg
@ 2012-12-06 0:07 Andrea Adami
2012-12-06 0:07 ` [meta-handheld][PATCH 2/3] linux-yocto_3.4: remove superseded patch for collie and fix do_patch Andrea Adami
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andrea Adami @ 2012-12-06 0:07 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
.../linux/linux-yocto-3.4/akita/akita.cfg | 6 ------
recipes-kernel/linux/linux-yocto-3.4/c7x0/c7x0.cfg | 6 ------
.../linux/linux-yocto-3.4/collie/collie.cfg | 6 ------
.../linux/linux-yocto-3.4/poodle/poodle.cfg | 6 ------
.../linux/linux-yocto-3.4/spitz/spitz.cfg | 6 ------
recipes-kernel/linux/linux-yocto-3.4/tosa/tosa.cfg | 6 ------
.../linux/linux-yocto-3.4/zaurus-hardware.cfg | 6 ++++++
7 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/recipes-kernel/linux/linux-yocto-3.4/akita/akita.cfg b/recipes-kernel/linux/linux-yocto-3.4/akita/akita.cfg
index 6abee5d..59feb2d 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/akita/akita.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.4/akita/akita.cfg
@@ -28,12 +28,6 @@ CONFIG_SHARPSL_PM_MAX1111=y
CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 loglevel=3"
#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
# Disk-On-Chip Device Drivers
#
CONFIG_MTD_NAND_SHARPSL=y
diff --git a/recipes-kernel/linux/linux-yocto-3.4/c7x0/c7x0.cfg b/recipes-kernel/linux/linux-yocto-3.4/c7x0/c7x0.cfg
index 4898aa3..2d12380 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/c7x0/c7x0.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.4/c7x0/c7x0.cfg
@@ -22,12 +22,6 @@ CONFIG_SHARPSL_PM_MAX1111=y
CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 loglevel=3"
#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
# Disk-On-Chip Device Drivers
#
CONFIG_MTD_NAND_SHARPSL=y
diff --git a/recipes-kernel/linux/linux-yocto-3.4/collie/collie.cfg b/recipes-kernel/linux/linux-yocto-3.4/collie/collie.cfg
index d223b35..ed3d507 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/collie/collie.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.4/collie/collie.cfg
@@ -36,12 +36,6 @@ CONFIG_SPARSEMEM_EXTREME=y
CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1 loglevel=3"
#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
# Multimedia Capabilities Port drivers
#
CONFIG_MCP=y
diff --git a/recipes-kernel/linux/linux-yocto-3.4/poodle/poodle.cfg b/recipes-kernel/linux/linux-yocto-3.4/poodle/poodle.cfg
index 5b983ef..0da402d 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/poodle/poodle.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.4/poodle/poodle.cfg
@@ -22,12 +22,6 @@ CONFIG_PXA25x=y
CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 loglevel=3"
#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
# Disk-On-Chip Device Drivers
#
CONFIG_MTD_NAND_SHARPSL=y
diff --git a/recipes-kernel/linux/linux-yocto-3.4/spitz/spitz.cfg b/recipes-kernel/linux/linux-yocto-3.4/spitz/spitz.cfg
index a7173f0..be1f9a0 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/spitz/spitz.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.4/spitz/spitz.cfg
@@ -27,12 +27,6 @@ CONFIG_SHARPSL_PM_MAX1111=y
CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 loglevel=3"
#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
# Disk-On-Chip Device Drivers
#
CONFIG_MTD_NAND_SHARPSL=y
diff --git a/recipes-kernel/linux/linux-yocto-3.4/tosa/tosa.cfg b/recipes-kernel/linux/linux-yocto-3.4/tosa/tosa.cfg
index e339e91..75786b6 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/tosa/tosa.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.4/tosa/tosa.cfg
@@ -25,12 +25,6 @@ CONFIG_MFD_TMIO=y
CONFIG_MFD_TC6393XB=y
#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
# Disk-On-Chip Device Drivers
#
CONFIG_MTD_NAND_TMIO=y
diff --git a/recipes-kernel/linux/linux-yocto-3.4/zaurus-hardware.cfg b/recipes-kernel/linux/linux-yocto-3.4/zaurus-hardware.cfg
index 09c900c..554faa8 100644
--- a/recipes-kernel/linux/linux-yocto-3.4/zaurus-hardware.cfg
+++ b/recipes-kernel/linux/linux-yocto-3.4/zaurus-hardware.cfg
@@ -58,6 +58,12 @@ CONFIG_MTD_BLKDEVS=y
CONFIG_MTD_BLOCK=y
#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=y
+
+#
# Disk-On-Chip Device Drivers
#
CONFIG_MTD_NAND_ECC=y
--
1.7.8.6
^ permalink raw reply related [flat|nested] 4+ messages in thread* [meta-handheld][PATCH 2/3] linux-yocto_3.4: remove superseded patch for collie and fix do_patch 2012-12-06 0:07 [meta-handheld][PATCH 1/3] linux-yocto_3.4: move MTD common options to zaurus-hardware.cfg Andrea Adami @ 2012-12-06 0:07 ` Andrea Adami 2012-12-06 0:07 ` [meta-handheld][PATCH 3/3] linux-yocto_3.4: use a single copy of the locomo keymap patch Andrea Adami 2012-12-09 23:56 ` [meta-handheld][PATCH 1/3] linux-yocto_3.4: move MTD common options to zaurus-hardware.cfg Paul Eggleton 2 siblings, 0 replies; 4+ messages in thread From: Andrea Adami @ 2012-12-06 0:07 UTC (permalink / raw) To: openembedded-devel * there have been two commits fixing drivers/pcmcia/pxa2xx-sharpsl.c * PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio managemen * a9bb5a4bf9f84256499c802fd397d56d55227e4f * * pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops * fdc858a466b738d35d3492bc7cf77b1dac98bf7c Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- ...xx_sharpsl-retain-ops-structure-on-collie.patch | 34 -------------------- .../linux/linux-yocto-3.4/collie/collie.scc | 1 - 2 files changed, 0 insertions(+), 35 deletions(-) delete mode 100644 recipes-kernel/linux/linux-yocto-3.4/collie/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch diff --git a/recipes-kernel/linux/linux-yocto-3.4/collie/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch b/recipes-kernel/linux/linux-yocto-3.4/collie/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch deleted file mode 100644 index d86b47d..0000000 --- a/recipes-kernel/linux/linux-yocto-3.4/collie/0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 31d99c4c9f14e571ca0e22c5862dd5b6a871e2dd Mon Sep 17 00:00:00 2001 -From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> -Date: Fri, 5 Aug 2011 15:32:23 +0400 -Subject: [PATCH] pcmcia/pxa2xx_sharpsl: retain ops structure on collie - -The pxa2xx_sharpsl driver part is also used on collie, which (as -a StrongARM board) has different expectations for PCMCIA drivers. -So, on collie place sharpsl_pcmcia_ops in .data section rather than -in __initdata. - -Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> ---- - drivers/pcmcia/pxa2xx_sharpsl.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c -index 81af2b3..1b5b749 100644 ---- a/drivers/pcmcia/pxa2xx_sharpsl.c -+++ b/drivers/pcmcia/pxa2xx_sharpsl.c -@@ -222,7 +222,11 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) - sharpsl_pcmcia_init_reset(skt); - } - -+#ifdef CONFIG_SA1100_COLLIE -+static struct pcmcia_low_level sharpsl_pcmcia_ops = { -+#else - static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = { -+#endif - .owner = THIS_MODULE, - .hw_init = sharpsl_pcmcia_hw_init, - .hw_shutdown = sharpsl_pcmcia_hw_shutdown, --- -1.7.2.5 - diff --git a/recipes-kernel/linux/linux-yocto-3.4/collie/collie.scc b/recipes-kernel/linux/linux-yocto-3.4/collie/collie.scc index 45ac852..b7c11fa 100644 --- a/recipes-kernel/linux/linux-yocto-3.4/collie/collie.scc +++ b/recipes-kernel/linux/linux-yocto-3.4/collie/collie.scc @@ -3,4 +3,3 @@ kconf hardware collie.cfg include ../zaurus-common.scc patch locomo_kbd_tweak-r2.patch -patch 0001-pcmcia-pxa2xx_sharpsl-retain-ops-structure-on-collie.patch -- 1.7.8.6 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-handheld][PATCH 3/3] linux-yocto_3.4: use a single copy of the locomo keymap patch 2012-12-06 0:07 [meta-handheld][PATCH 1/3] linux-yocto_3.4: move MTD common options to zaurus-hardware.cfg Andrea Adami 2012-12-06 0:07 ` [meta-handheld][PATCH 2/3] linux-yocto_3.4: remove superseded patch for collie and fix do_patch Andrea Adami @ 2012-12-06 0:07 ` Andrea Adami 2012-12-09 23:56 ` [meta-handheld][PATCH 1/3] linux-yocto_3.4: move MTD common options to zaurus-hardware.cfg Paul Eggleton 2 siblings, 0 replies; 4+ messages in thread From: Andrea Adami @ 2012-12-06 0:07 UTC (permalink / raw) To: openembedded-devel * shared by collie and poodle Signed-off-by: Andrea Adami <andrea.adami@gmail.com> --- .../{collie => }/locomo_kbd_tweak-r2.patch | 0 .../poodle/locomo_kbd_tweak-r2.patch | 80 -------------------- 2 files changed, 0 insertions(+), 80 deletions(-) rename recipes-kernel/linux/linux-yocto-3.4/{collie => }/locomo_kbd_tweak-r2.patch (100%) delete mode 100644 recipes-kernel/linux/linux-yocto-3.4/poodle/locomo_kbd_tweak-r2.patch diff --git a/recipes-kernel/linux/linux-yocto-3.4/collie/locomo_kbd_tweak-r2.patch b/recipes-kernel/linux/linux-yocto-3.4/locomo_kbd_tweak-r2.patch similarity index 100% rename from recipes-kernel/linux/linux-yocto-3.4/collie/locomo_kbd_tweak-r2.patch rename to recipes-kernel/linux/linux-yocto-3.4/locomo_kbd_tweak-r2.patch diff --git a/recipes-kernel/linux/linux-yocto-3.4/poodle/locomo_kbd_tweak-r2.patch b/recipes-kernel/linux/linux-yocto-3.4/poodle/locomo_kbd_tweak-r2.patch deleted file mode 100644 index e6178e2..0000000 --- a/recipes-kernel/linux/linux-yocto-3.4/poodle/locomo_kbd_tweak-r2.patch +++ /dev/null @@ -1,80 +0,0 @@ -From e60a4a9a3336a24a8e6ca3ea69587c60cb953881 Mon Sep 17 00:00:00 2001 -From: Andrea Adami <andrea.adami@gmail.com> -Date: Sat, 21 Apr 2012 23:48:57 +0200 -Subject: [PATCH 43/43] locomokbd: apply tweaks for Zaurus - -* from http://www.rpsys.net/openzaurus/patches/ - -Signed-off-by: Richard Purdie <rpurdie@rpsys.net> -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- - drivers/input/keyboard/locomokbd.c | 45 ++++++++++++++++++++--------------- - 1 files changed, 26 insertions(+), 19 deletions(-) - -diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c -index b1ab298..9bb5bc6 100644 ---- a/drivers/input/keyboard/locomokbd.c -+++ b/drivers/input/keyboard/locomokbd.c -@@ -41,25 +41,32 @@ MODULE_LICENSE("GPL"); - - #define LOCOMOKBD_NUMKEYS 128 - --#define KEY_ACTIVITY KEY_F16 --#define KEY_CONTACT KEY_F18 --#define KEY_CENTER KEY_F15 -- --static const unsigned char -+#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 const unsigned char - locomokbd_keycode[LOCOMOKBD_NUMKEYS] __devinitconst = { -- 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, 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 */ -+ 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, 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 */ - }; - - #define KB_ROWS 16 -@@ -68,7 +75,7 @@ locomokbd_keycode[LOCOMOKBD_NUMKEYS] __devinitconst = { - #define SCANCODE(c,r) ( ((c)<<4) + (r) + 1 ) - - #define KB_DELAY 8 --#define SCAN_INTERVAL (HZ/10) -+#define SCAN_INTERVAL (HZ/20) - - struct locomokbd { - unsigned char keycode[LOCOMOKBD_NUMKEYS]; --- -1.7.3.4 - -- 1.7.8.6 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-handheld][PATCH 1/3] linux-yocto_3.4: move MTD common options to zaurus-hardware.cfg 2012-12-06 0:07 [meta-handheld][PATCH 1/3] linux-yocto_3.4: move MTD common options to zaurus-hardware.cfg Andrea Adami 2012-12-06 0:07 ` [meta-handheld][PATCH 2/3] linux-yocto_3.4: remove superseded patch for collie and fix do_patch Andrea Adami 2012-12-06 0:07 ` [meta-handheld][PATCH 3/3] linux-yocto_3.4: use a single copy of the locomo keymap patch Andrea Adami @ 2012-12-09 23:56 ` Paul Eggleton 2 siblings, 0 replies; 4+ messages in thread From: Paul Eggleton @ 2012-12-09 23:56 UTC (permalink / raw) To: openembedded-devel On Thursday 06 December 2012 01:07:08 Andrea Adami wrote: > Signed-off-by: Andrea Adami <andrea.adami@gmail.com> > --- > .../linux/linux-yocto-3.4/akita/akita.cfg | 6 ------ > recipes-kernel/linux/linux-yocto-3.4/c7x0/c7x0.cfg | 6 ------ > .../linux/linux-yocto-3.4/collie/collie.cfg | 6 ------ > .../linux/linux-yocto-3.4/poodle/poodle.cfg | 6 ------ > .../linux/linux-yocto-3.4/spitz/spitz.cfg | 6 ------ > recipes-kernel/linux/linux-yocto-3.4/tosa/tosa.cfg | 6 ------ > .../linux/linux-yocto-3.4/zaurus-hardware.cfg | 6 ++++++ > 7 files changed, 6 insertions(+), 36 deletions(-) Merged these three to meta-handheld master, thanks. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-12-10 0:11 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-12-06 0:07 [meta-handheld][PATCH 1/3] linux-yocto_3.4: move MTD common options to zaurus-hardware.cfg Andrea Adami 2012-12-06 0:07 ` [meta-handheld][PATCH 2/3] linux-yocto_3.4: remove superseded patch for collie and fix do_patch Andrea Adami 2012-12-06 0:07 ` [meta-handheld][PATCH 3/3] linux-yocto_3.4: use a single copy of the locomo keymap patch Andrea Adami 2012-12-09 23:56 ` [meta-handheld][PATCH 1/3] linux-yocto_3.4: move MTD common options to zaurus-hardware.cfg Paul Eggleton
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.