linux-openzaurus: updated pcmcia-ids patch

- added one more CF card
- patch acked by Alan Cox and added into -mm

diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch
deleted file mode 100644 (file)
index b27fd09..0000000
--- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-The ident for Seagate 8GB microdrive is
-"SEAGATE", "ST1"
-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 <openembedded@hrw.one.pl>
-
- drivers/ide/legacy/ide-cs.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c
-===================================================================
---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c      2006-06-18 03:49:35.000000000 +0200
-+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c   2006-07-10 23:29:28.696446000 +0200
-@@ -402,6 +402,9 @@
-       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("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
-       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/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch
new file mode 100644 (file)
index 0000000..5e3a5ea
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch
@@ -0,0 +1,48 @@
+From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+Few cards informations submitted by OpenZaurus users.
+
+Seagate 8GB microdrive:
+ product info: "SEAGATE", "ST1"
+ manfid 0x0111, 0x0000
+
+One CF card:
+ product info: "SAMSUNG", "04/05/06", "", ""
+ manfid : 0x0000, 0x0000
+
+Ridata 8GB Pro 150X Compact Flash Card:
+ product info: "SMI VENDOR", "SMI PRODUCT", ""
+ manfid: 0x000a, 0x0000
+
+ product info: "M-Systems", "CF500", ""
+ manfid: 0x000a, 0x0000
+
+Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+---
+Patch follow kernel version 2.6.17
+
+Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel
+
+ ide-cs.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: linux/drivers/ide/legacy/ide-cs.c
+===================================================================
+--- linux.orig/drivers/ide/legacy/ide-cs.c     2006-07-10 23:25:59.479162976 +0200
++++ linux/drivers/ide/legacy/ide-cs.c  2006-08-02 23:02:22.997684384 +0200
+@@ -398,10 +398,14 @@
+       PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
+       PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674),
+       PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2      ", 0xe37be2b5, 0x8671043b),
++      PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c),
+       PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79),
+       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),
++      PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
++      PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
+       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.17+git/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch
deleted file mode 100644 (file)
index b27fd09..0000000
--- a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-The ident for Seagate 8GB microdrive is
-"SEAGATE", "ST1"
-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 <openembedded@hrw.one.pl>
-
- drivers/ide/legacy/ide-cs.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c
-===================================================================
---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c      2006-06-18 03:49:35.000000000 +0200
-+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c   2006-07-10 23:29:28.696446000 +0200
-@@ -402,6 +402,9 @@
-       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("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
-       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.17+git/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch
new file mode 100644 (file)
index 0000000..5e3a5ea
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch
@@ -0,0 +1,48 @@
+From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+Few cards informations submitted by OpenZaurus users.
+
+Seagate 8GB microdrive:
+ product info: "SEAGATE", "ST1"
+ manfid 0x0111, 0x0000
+
+One CF card:
+ product info: "SAMSUNG", "04/05/06", "", ""
+ manfid : 0x0000, 0x0000
+
+Ridata 8GB Pro 150X Compact Flash Card:
+ product info: "SMI VENDOR", "SMI PRODUCT", ""
+ manfid: 0x000a, 0x0000
+
+ product info: "M-Systems", "CF500", ""
+ manfid: 0x000a, 0x0000
+
+Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+---
+Patch follow kernel version 2.6.17
+
+Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel
+
+ ide-cs.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: linux/drivers/ide/legacy/ide-cs.c
+===================================================================
+--- linux.orig/drivers/ide/legacy/ide-cs.c     2006-07-10 23:25:59.479162976 +0200
++++ linux/drivers/ide/legacy/ide-cs.c  2006-08-02 23:02:22.997684384 +0200
+@@ -398,10 +398,14 @@
+       PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
+       PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674),
+       PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2      ", 0xe37be2b5, 0x8671043b),
++      PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c),
+       PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79),
+       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),
++      PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
++      PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
+       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.17/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch
deleted file mode 100644 (file)
index b27fd09..0000000
--- a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-The ident for Seagate 8GB microdrive is
-"SEAGATE", "ST1"
-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 <openembedded@hrw.one.pl>
-
- drivers/ide/legacy/ide-cs.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c
-===================================================================
---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c      2006-06-18 03:49:35.000000000 +0200
-+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c   2006-07-10 23:29:28.696446000 +0200
-@@ -402,6 +402,9 @@
-       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("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
-       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.17/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch
new file mode 100644 (file)
index 0000000..5e3a5ea
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch
@@ -0,0 +1,48 @@
+From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+Few cards informations submitted by OpenZaurus users.
+
+Seagate 8GB microdrive:
+ product info: "SEAGATE", "ST1"
+ manfid 0x0111, 0x0000
+
+One CF card:
+ product info: "SAMSUNG", "04/05/06", "", ""
+ manfid : 0x0000, 0x0000
+
+Ridata 8GB Pro 150X Compact Flash Card:
+ product info: "SMI VENDOR", "SMI PRODUCT", ""
+ manfid: 0x000a, 0x0000
+
+ product info: "M-Systems", "CF500", ""
+ manfid: 0x000a, 0x0000
+
+Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
+
+---
+Patch follow kernel version 2.6.17
+
+Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel
+
+ ide-cs.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: linux/drivers/ide/legacy/ide-cs.c
+===================================================================
+--- linux.orig/drivers/ide/legacy/ide-cs.c     2006-07-10 23:25:59.479162976 +0200
++++ linux/drivers/ide/legacy/ide-cs.c  2006-08-02 23:02:22.997684384 +0200
+@@ -398,10 +398,14 @@
+       PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
+       PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674),
+       PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2      ", 0xe37be2b5, 0x8671043b),
++      PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c),
+       PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79),
+       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),
++      PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
++      PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
+       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.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 270d6d7..4a667b8 100644 (file)
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r41"
+PR = "r42"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -87,7 +87,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
            ${DOSRC}/kexec-arm-r2.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
-           file://hrw-pcmcia-ids-r3.patch;patch=1 \
+           file://hrw-pcmcia-ids-r4.patch;patch=1 \
            file://locomo-kbd-hotkeys.patch;patch=1 \
            file://locomo-sysrq+keyrepeat.patch;patch=1 \
            file://locomo-lcd-def-bightness.patch;patch=1 \

diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb
index 56b7995..49e1888 100644 (file)
--- a/packages/linux/linux-openzaurus_2.6.17+git.bb
+++ b/packages/linux/linux-openzaurus_2.6.17+git.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r7"
+PR = "r8"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -38,7 +38,7 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi
            ${RPSRC}/poodle_audio-r0.patch;patch=1 \
            ${RPSRC}/nand_sharpsl_fix-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
-           file://hrw-pcmcia-ids-r3.patch;patch=1 \
+           file://hrw-pcmcia-ids-r4.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \

diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index 822cfca..09855ef 100644 (file)
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r14"
+PR = "r15"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -48,7 +48,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \
            ${RPSRC}/poodle_audio-r1.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
-           file://hrw-pcmcia-ids-r3.patch;patch=1 \
+           file://hrw-pcmcia-ids-r4.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \