linux-openzaurus: Switch from 2.6.14+2.6.15-rc5 to 2.6.15

git-svn-id: https://svn.o-hand.com/repos/poky@231 311d38ba-8fff-0310-9ca6-ca027cbcb966

12 files changed, 43 insertions, 86 deletions

diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/dtl1_cs-add-socket-revE.patch b/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/dtl1_cs-add-socket-revE.patch
deleted file mode 100644
index 9fe3bd06d3..0000000000
--- a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/dtl1_cs-add-socket-revE.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-
-Patch was sent upstream to Marcel Holtmann <marcel@holtmann.org>
-
-Response:
-
-Hi Marcin,
-
-> I use Socket Bluetooth CompactFlash card in my Zaurus. Some time ago we 
-> switched to 2.6.12-rcX-mmY so we get PCMCIA hotplug support. On my device 
-> I also switched from pcmcia-cs 3.2.8 to pcmciautils 003 (will check 005 
-> later).
-> 
-> With my config I lost automatic module loading after BT card insert so I 
-> looked into kernel driver and added infos about my card. Patch attached.
-
-there are some pending patches from Dominic that I want to see merged
-mainline first, before I am going to submit patches for the Bluetooth
-PCMCIA drivers.
-
-> BTW - any plans on adding suspend/resume support into this driver? Now I 
-> have to eject/insert card after resume and restart bluez-utils to get it 
-> working.
-
-Maybe with the new PCMCIA subsystem this will be possible. Feel free to
-send in patches.
-
-Regards
-
-Marcel
-
---- linux-2.6.12/drivers/bluetooth/dtl1_cs.c.orig       2005-07-05 11:19:50.000000000 +0200
-+++ linux-2.6.12/drivers/bluetooth/dtl1_cs.c    2005-07-05 11:19:51.000000000 +0200
-@@ -810,6 +810,7 @@
- static struct pcmcia_device_id dtl1_ids[] = {
-        PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d),
-        PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863),
-+       PCMCIA_DEVICE_PROD_ID12("Socket", "CF+ Personal Network Card", 0xb38bcc2e, 0xe732bae3),
-        PCMCIA_DEVICE_NULL
- };
- MODULE_DEVICE_TABLE(pcmcia, dtl1_ids);
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/add-oz-release-string.patch b/openembedded/packages/linux/linux-openzaurus-2.6.15/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/add-oz-release-string.patch
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.15/add-oz-release-string.patch
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/connectplus-remove-ide-HACK.patch b/openembedded/packages/linux/linux-openzaurus-2.6.15/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/connectplus-remove-ide-HACK.patch
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.15/connectplus-remove-ide-HACK.patch
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-c7x0 b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-c7x0
index bbdc12f5f3..706726e60c 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-c7x0
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-c7x0
@@ -492,8 +492,8 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 
 #
 # Device Drivers
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-collie b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-collie
index cbe06f9c3a..cbe06f9c3a 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-collie
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-collie
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-cxx00 b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-cxx00
index 5095564476..9941367a3b 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-cxx00
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-cxx00
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-rc2
-# Fri Nov 25 16:39:44 2005
+# Linux kernel version: 2.6.15-rc7
+# Mon Jan  2 09:25:11 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -34,6 +34,7 @@ CONFIG_HOTPLUG=y
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
@@ -43,7 +44,6 @@ CONFIG_BUG=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SHMEM=y
 CONFIG_CC_ALIGN_FUNCTIONS=0
 CONFIG_CC_ALIGN_LABELS=0
@@ -120,7 +120,6 @@ CONFIG_PXA_SHARPSL_27x=y
 CONFIG_MACH_AKITA=y
 CONFIG_MACH_SPITZ=y
 CONFIG_MACH_BORZOI=y
-# CONFIG_MACH_TOSA is not set
 CONFIG_PXA27x=y
 # CONFIG_PXA_KEYS is not set
 CONFIG_IWMMXT=y
@@ -143,6 +142,7 @@ CONFIG_CPU_TLB_V4WBI=y
 CONFIG_ARM_THUMB=y
 CONFIG_XSCALE_PMU=y
 CONFIG_SHARP_PARAM=y
+CONFIG_SHARPSL_PM=y
 CONFIG_SHARP_SCOOP=y
 
 #
@@ -480,8 +480,8 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 
 #
 # Device Drivers
@@ -1081,25 +1081,26 @@ CONFIG_SND_SOC=m
 #
 # Soc Platforms
 #
-CONFIG_SND_PXA2xx_SOC=m
-# CONFIG_SND_PXA2xx_SOC_AC97 is not set
-CONFIG_SND_PXA2xx_SOC_I2S=m
-# CONFIG_SND_PXA2xx_SOC_SSP is not set
 
 #
-# PXA2xx machine support
+# SoC Audio for the Intel PXA2xx
 #
+CONFIG_SND_PXA2xx_SOC=m
+CONFIG_SND_PXA2xx_SOC_I2S=m
 # CONFIG_SND_PXA2xx_SOC_MAINSTONE is not set
-# CONFIG_SND_PXA2xx_SOC_CORGI=m
+# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM8753 is not set
+# CONFIG_SND_PXA2xx_SOC_CORGI is not set
 CONFIG_SND_PXA2xx_SOC_SPITZ=m
+# CONFIG_SND_PXA2xx_SOC_TOSA is not set
 
 #
 # Soc Codecs
 #
 # CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SOC_WM8753 is not set
 # CONFIG_SND_SOC_WM8731 is not set
 CONFIG_SND_SOC_WM8750=m
+# CONFIG_SND_SOC_WM8753 is not set
+# CONFIG_SND_SOC_WM8772 is not set
 # CONFIG_SND_SOC_WM8971 is not set
 
 #
@@ -1302,12 +1303,13 @@ CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
+CONFIG_USB_GADGET_PXA27X=y
+CONFIG_USB_PXA27X=m
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
-CONFIG_USB_GADGET_DUMMY_HCD=y
-CONFIG_USB_DUMMY_HCD=m
-CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-ipaq-pxa270 b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-ipaq-pxa270
index d826d06886..d826d06886 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-ipaq-pxa270
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-ipaq-pxa270
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-poodle b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-poodle
index 646e08305a..646e08305a 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-poodle
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-poodle
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-tosa b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-tosa
index 14acb3c56c..14acb3c56c 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/defconfig-tosa
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.15/defconfig-tosa
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/pxa-serial-hack.patch b/openembedded/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch
index b3a7f786ea..b3a7f786ea 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/pxa-serial-hack.patch
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.15/pxa-serial-hack.patch
diff --git a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/openembedded/packages/linux/linux-openzaurus-2.6.15/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/openembedded/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc5/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/openembedded/packages/linux/linux-openzaurus-2.6.15/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc5.bb b/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
index c2bddbe855..99a22936f2 100644
--- a/openembedded/packages/linux/linux-openzaurus_2.6.14+2.6.15-rc5.bb
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r4"
+PR = "r0"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -12,27 +12,28 @@ PR = "r4"
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.tar.bz2 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc2-rc3.bz2;patch=1 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc3-rc4.bz2;patch=1 \
-           http://www.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.15-rc4-rc5.bz2;patch=1 \
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${RPSRC}/pxa_ohci_platform-r5.patch;patch=1 \
            ${RPSRC}/pxa_ohci_suspend-r5.patch;patch=1 \
            ${RPSRC}/pxa_ohci_fixes-r0.patch;patch=1 \
            ${RPSRC}/spitz_ohci-r0.patch;patch=1 \
-           ${RPSRC}/pxa_i2c_fixes-r4.patch;patch=1 \
+           ${RPSRC}/pxa_i2c_fixes-r5.patch;patch=1 \
+           ${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \
+           ${RPSRC}/pxa2xx_release-r1.patch;patch=1 \
            ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \
-           ${RPSRC}/led_core-r6.patch;patch=1 \
-           ${RPSRC}/led_triggers-r5.patch;patch=1 \
-           ${RPSRC}/led_trig_timer-r2.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \
+           ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \
+           ${RPSRC}/led_core-r10.patch;patch=1 \
+           ${RPSRC}/led_triggers-r8.patch;patch=1 \
+           ${RPSRC}/led_trig_timer-r3.patch;patch=1 \
            ${RPSRC}/led_trig_sharpsl_pm-r2.patch;patch=1 \
-           ${RPSRC}/led_zaurus-r6.patch;patch=1 \
-           ${RPSRC}/led_locomo-r3.patch;patch=1 \
+           ${RPSRC}/led_zaurus-r7.patch;patch=1 \
+           ${RPSRC}/led_locomo-r4.patch;patch=1 \
            ${RPSRC}/led_ide-r1.patch;patch=1 \
            ${RPSRC}/led_nand-r1.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
-           ${RPSRC}/pxa_rtc-r2.patch;patch=1 \
+           ${RPSRC}/pxa_rtc-r3.patch;patch=1 \
            ${RPSRC}/input_power-r4.patch;patch=1 \
            ${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
@@ -53,24 +54,19 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.
            ${DOSRC}/tosa-lcd-r6.patch;patch=1 \
            ${DOSRC}/tosa-bl-r9.patch;patch=1 \
            ${DOSRC}/tosa-bluetooth-r2.patch;patch=1 \
-           ${RPSRC}/pcmcia_dev_ids-r2.patch;patch=1 \
+           ${RPSRC}/led_tosa-r0.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \         
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
-           ${RPSRC}/alsa/alsa-soc-0.8.patch;patch=1 \
-           ${RPSRC}/alsa/alsa-soc-0.8-0.8.1.patch;patch=1 \
-           ${RPSRC}/alsa/alsa-soc-0.8.1-0.9rc1.patch;patch=1 \
-           ${RPSRC}/alsa/alsa-soc-0.9rc1-rc2.patch;patch=1 \
-           ${RPSRC}/alsa/alsa-soc-0.9rc2-rc4.patch;patch=1 \
-           ${RPSRC}/alsa/alsa-soc-0.9rc4-rc5.patch;patch=1 \
-           ${RPSRC}/alsa/alsa-soc-0.9rc5-rc6.patch;patch=1 \
+           ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
+           ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
+           ${RPSRC}/alsa/alsa-soc-0.9.patch;patch=1 \
+           ${RPSRC}/alsa/alsa-soc-0.9-0.10rc1.patch;patch=1 \
            ${RPSRC}/alsa_soc_rpupdate7-r2.patch;patch=1 \
-           ${RPSRC}/alsa_soc_rpupdate8-r0.patch;patch=1 \
-           ${RPSRC}/alsa_soc_rpupdate9-r0.patch;patch=1 \
+           ${RPSRC}/alsa_akita_fix-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r0.patch;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
            ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
-           file://dtl1_cs-add-socket-revE.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://connectplus-remove-ide-HACK.patch;patch=1 \
            file://defconfig-c7x0 \
@@ -80,9 +76,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.15-rc2.
            file://defconfig-cxx00 \
            file://defconfig-tosa "
 
-# Old things we don't care about anymore
-#           ${RPSRC}/corgi_snd-r14.patch;patch=1 \         
-#           file://add-elpp-stuff.patch;patch=1 
+# Disabled until I find the reason this gives issues with cdc_subset
+#            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \
 
 # These patches would really help collie/poodle but we 
 # need someone to maintain them
@@ -99,7 +94,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
                        ${DOSRC}/wm97xx-touch-lg2-r0.patch;patch=1 \
                        ${DOSRC}/wm9712-pm-r0.patch;patch=1 "
 
-S = "${WORKDIR}/linux-2.6.15-rc2"
+S = "${WORKDIR}/linux-2.6.15"
 
 # to get module dependencies working
-KERNEL_RELEASE = "2.6.15-rc5"
+KERNEL_RELEASE = "2.6.15"