linux-oz-2.6: Rehash spitz patches after advice from mainline. Add delay to mmc_detect_change() and update corgi and spitz to use this. hx2750 and tosa need updating. More patches pushed. hrw moved the collie/poodle keymap into initscripts so the collie.keymap patch is no longer needed.

1 files changed, 18 insertions, 31 deletions

diff --git a/packages/linux/linux-openzaurus_2.6.13-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-mm1.bb
index a1d6305f37..16d554fa6b 100644
--- a/packages/linux/linux-openzaurus_2.6.13-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r4"
+PR = "r5"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -19,21 +19,6 @@ BASRC = "http://www.orca.cx/zaurus/patches"
 # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc6.bz2;patch=1 \
 
 #           ${RPSRC}/rmk_devbuff-r0.patch;patch=1 \
-#           ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \
-#           ${RPSRC}/w100_core-r1.patch;patch=1 \
-#           ${RPSRC}/w100_corgi-r1.patch;patch=1 \
-#           ${RPSRC}/corgikbd_compilefix-r0.patch;patch=1 \
-#           ${RPSRC}/corgikbd_pm-r0.patch;patch=1 \
-#           ${RPSRC}/corgikbd_tidyup-r0.patch;patch=1 \
-#           ${RPSRC}/corgikbd_switch-r0.patch;patch=1 \
-#           ${RPSRC}/corgikbd_temphack-r0.patch;patch=1 \
-#           ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \
-#           ${RPSRC}/mmc_sd-r5.patch;patch=1 \
-#           ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \
-#           ${RPSRC}/oprofile_typo-r0.patch;patch=1 \
-#           ${RPSRC}/mmc_bytefix-r0.patch;patch=1 \
-#           ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \
-#           ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \
 #           ${RPSRC}/corgi_base_extras1-r4.patch;patch=1 \	   
 #           ${RPSRC}/reverse_pagefault-r3.patch;patch=1 \
 #           ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \
@@ -52,22 +37,25 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/sharp_multi_pcmcia-r4.patch;patch=1 \
            ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
            ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
+           ${RPSRC}/rmk_mmc_updates-r0.patch;patch=1 \
            ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \	   
+           ${RPSRC}/sharpsl_detection-r1.patch;patch=1 \
+           ${RPSRC}/corgi_mmc_detect-r0.patch;patch=1 \
+           ${RPSRC}/scoop_typefix-r0.patch;patch=1 \
            ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
-           ${RPSRC}/sharpsl_detection-r1.patch;patch=1 \
-           ${RPSRC}/sharpsl_ssp-r2.patch;patch=1 \
-           ${RPSRC}/sharpsl_lcd-r2.patch;patch=1 \
-           ${RPSRC}/sharpsl_ts-r3.patch;patch=1 \
-           ${RPSRC}/sharpsl_bl-r3.patch;patch=1 \
-           ${RPSRC}/sharpsl_pm-r7.patch;patch=1 \
-           ${RPSRC}/spitz_base-r15.patch;patch=1 \
-           ${RPSRC}/spitz_base_extras-r1.patch;patch=1 \
-           ${RPSRC}/corgi_pm-r2.patch;patch=1 \
-           ${RPSRC}/spitz_pm-r2.patch;patch=1 \
-           ${RPSRC}/spitzkbd-r2.patch;patch=1 \
-           ${RPSRC}/spitzcf-r2.patch;patch=1 \
+           ${RPSRC}/sharpsl_ssp-r4.patch;patch=1 \
+           ${RPSRC}/sharpsl_lcd-r4.patch;patch=1 \
+           ${RPSRC}/sharpsl_ts-r6.patch;patch=1 \
+           ${RPSRC}/sharpsl_bl-r5.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
+           ${RPSRC}/spitz_base-r17.patch;patch=1 \
+           ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \
+           ${RPSRC}/corgi_pm-r3.patch;patch=1 \
+           ${RPSRC}/spitz_pm-r3.patch;patch=1 \
+           ${RPSRC}/spitzkbd-r3.patch;patch=1 \
+           ${RPSRC}/spitzcf-r3.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
            ${RPSRC}/pxa_irda-r3.patch;patch=1 \
            ${RPSRC}/corgi_irda-r3.patch;patch=1 \
@@ -76,7 +64,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \
            ${RPSRC}/corgi_snd-r10.patch;patch=1 \
            ${RPSRC}/rmk-i2c-pxa-r2.patch;patch=1 \
-           ${RPSRC}/sharpsl_mtd_extras-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
@@ -96,7 +84,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
            ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
            ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
-           ${RPSRC}/scoop_susres-r0.patch;patch=1 \
+           ${RPSRC}/scoop_susres-r1.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
@@ -117,7 +105,6 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
 #           ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \
 #           ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
 
-SRC_URI_append_collie = "${RPSRC}/jl1/collie_keymap.patch;patch=1 "
 SRC_URI_append_poodle = "${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 \
                          ${RPSRC}/rpextra_poodle-r0.patch;patch=1 "
 SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \