linux-rp: 2.6.25+2.6.26-rc4 -> 2.6.26 and apply the i2c suspend/resume fix for zaurus devices

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

31 files changed, 69 insertions, 0 deletions

diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/binutils-buildid-arm.patch b/meta/packages/linux/linux-rp-2.6.26/binutils-buildid-arm.patch
index 68e35e89e..68e35e89e 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/binutils-buildid-arm.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/binutils-buildid-arm.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/connectplus-prevent-oops-HACK.patch b/meta/packages/linux/linux-rp-2.6.26/connectplus-prevent-oops-HACK.patch
index b5439c62e..b5439c62e 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/connectplus-prevent-oops-HACK.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/connectplus-prevent-oops-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/connectplus-remove-ide-HACK.patch b/meta/packages/linux/linux-rp-2.6.26/connectplus-remove-ide-HACK.patch
index 4414b2119..4414b2119 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/connectplus-remove-ide-HACK.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/connectplus-remove-ide-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/cpufreq-fix.patch b/meta/packages/linux/linux-rp-2.6.26/cpufreq-fix.patch
index a3c996f7b..a3c996f7b 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/cpufreq-fix.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/cpufreq-fix.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-akita b/meta/packages/linux/linux-rp-2.6.26/defconfig-akita
index e630a9abf..e630a9abf 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-akita
+++ b/meta/packages/linux/linux-rp-2.6.26/defconfig-akita
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-bootcdx86 b/meta/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86
index 35e9b5cd2..35e9b5cd2 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-bootcdx86
+++ b/meta/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.26/defconfig-c7x0
index 830c8189a..830c8189a 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-c7x0
+++ b/meta/packages/linux/linux-rp-2.6.26/defconfig-c7x0
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-collie b/meta/packages/linux/linux-rp-2.6.26/defconfig-collie
index 271bfd588..271bfd588 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-collie
+++ b/meta/packages/linux/linux-rp-2.6.26/defconfig-collie
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-htcuniversal b/meta/packages/linux/linux-rp-2.6.26/defconfig-htcuniversal
index 8b2a31dbb..8b2a31dbb 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-htcuniversal
+++ b/meta/packages/linux/linux-rp-2.6.26/defconfig-htcuniversal
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.26/defconfig-hx2000
index 0f2557c0f..0f2557c0f 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-hx2000
+++ b/meta/packages/linux/linux-rp-2.6.26/defconfig-hx2000
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.26/defconfig-poodle
index 7d41252b1..7d41252b1 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-poodle
+++ b/meta/packages/linux/linux-rp-2.6.26/defconfig-poodle
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.26/defconfig-qemuarm
index e636b6c67..e636b6c67 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-qemuarm
+++ b/meta/packages/linux/linux-rp-2.6.26/defconfig-qemuarm
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.26/defconfig-qemux86
index 42f674020..42f674020 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.26/defconfig-qemux86
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.26/defconfig-spitz
index 9c8f0ae8a..9c8f0ae8a 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-spitz
+++ b/meta/packages/linux/linux-rp-2.6.26/defconfig-spitz
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-zylonite b/meta/packages/linux/linux-rp-2.6.26/defconfig-zylonite
index cc2fc482a..cc2fc482a 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-zylonite
+++ b/meta/packages/linux/linux-rp-2.6.26/defconfig-zylonite
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/hostap-monitor-mode.patch b/meta/packages/linux/linux-rp-2.6.26/hostap-monitor-mode.patch
index 641fd19e5..641fd19e5 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/hostap-monitor-mode.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/hostap-monitor-mode.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/hrw-hostapcard.patch b/meta/packages/linux/linux-rp-2.6.26/hrw-hostapcard.patch
index 67fc5b7c7..67fc5b7c7 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/hrw-hostapcard.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/hrw-hostapcard.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/htcuni-acx.patch b/meta/packages/linux/linux-rp-2.6.26/htcuni-acx.patch
index 1ccebddc8..1ccebddc8 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/htcuni-acx.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/htcuni-acx.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/htcuni.patch b/meta/packages/linux/linux-rp-2.6.26/htcuni.patch
index 783f55b06..783f55b06 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/htcuni.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/htcuni.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/pxa-serial-hack.patch b/meta/packages/linux/linux-rp-2.6.26/pxa-serial-hack.patch
index bf20f46a0..bf20f46a0 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/pxa-serial-hack.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/pxa-serial-hack.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/pxa_fb_overlay.patch b/meta/packages/linux/linux-rp-2.6.26/pxa_fb_overlay.patch
index 49c59b327..49c59b327 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/pxa_fb_overlay.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/pxa_fb_overlay.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/meta/packages/linux/linux-rp-2.6.26/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index b513ba146..b513ba146 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/sharpsl-rc-r1.patch b/meta/packages/linux/linux-rp-2.6.26/sharpsl-rc-r1.patch
index 93fac307a..93fac307a 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/sharpsl-rc-r1.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/sharpsl-rc-r1.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/spitz_h_rewrite.patch b/meta/packages/linux/linux-rp-2.6.26/spitz_h_rewrite.patch
index 3dcf4ed8a..3dcf4ed8a 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/spitz_h_rewrite.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/spitz_h_rewrite.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/versatile-armv6.patch b/meta/packages/linux/linux-rp-2.6.26/versatile-armv6.patch
index 6f2ca26a9..6f2ca26a9 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/versatile-armv6.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/versatile-armv6.patch
diff --git a/meta/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch b/meta/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch
new file mode 100644
index 000000000..40214e42b
--- /dev/null
+++ b/meta/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch
@@ -0,0 +1,68 @@
+Typo in poodle chunk fixed: set_pxa_i2c_info->pxa_set_i2c_info.
+
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+To: Richard Purdie <rpurdie@rpsys.net>
+Date: Wed, 16 Jul 2008 23:19:36 +0100
+Message-Id: <1216246776-4500-1-git-send-email-broonie@opensource.wolfsonmicro.com>
+List-Id: ARM Linux kernel discussions
+	<linux-arm-kernel.lists.arm.linux.org.uk>
+
+Both spitz and poodle have audio codecs on their primary I2C bus so need
+to call pxa_set_i2c_info() to set it up during init.  Tested on spitz by
+Stanislav.
+
+Reported-by: Stanislav Brabec <utx@penguin.cz>
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+---
+ arch/arm/mach-pxa/poodle.c |    2 ++
+ arch/arm/mach-pxa/spitz.c  |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
+index 39612cf..510018b 100644
+--- a/arch/arm/mach-pxa/poodle.c
++++ b/arch/arm/mach-pxa/poodle.c
+@@ -36,6 +36,7 @@
+ #include <asm/arch/pxa2xx-gpio.h>
+ #include <asm/arch/mmc.h>
+ #include <asm/arch/udc.h>
++#include <asm/arch/i2c.h>
+ #include <asm/arch/irda.h>
+ #include <asm/arch/poodle.h>
+ #include <asm/arch/pxafb.h>
+@@ -387,6 +388,7 @@ static void __init poodle_init(void)
+ 	pxa_set_udc_info(&udc_info);
+ 	pxa_set_mci_info(&poodle_mci_platform_data);
+ 	pxa_set_ficp_info(&poodle_ficp_platform_data);
++	pxa_set_i2c_info(NULL);
+ 
+ 	platform_scoop_config = &poodle_pcmcia_config;
+ 
+diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
+index 35616a5..e2bde09 100644
+--- a/arch/arm/mach-pxa/spitz.c
++++ b/arch/arm/mach-pxa/spitz.c
+@@ -38,6 +38,7 @@
+ #include <asm/arch/pxa-regs.h>
+ #include <asm/arch/pxa2xx-regs.h>
+ #include <asm/arch/pxa2xx-gpio.h>
++#include <asm/arch/i2c.h>
+ #include <asm/arch/irda.h>
+ #include <asm/arch/mmc.h>
+ #include <asm/arch/ohci.h>
+@@ -572,6 +573,7 @@ static void __init common_init(void)
+ 	pxa_set_ficp_info(&spitz_ficp_platform_data);
+ 	set_pxa_fb_parent(&spitzssp_device.dev);
+ 	set_pxa_fb_info(&spitz_pxafb_info);
++	pxa_set_i2c_info(NULL);
+ }
+ 
+ #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)
+-- 
+1.5.6.2
+
+
+-------------------------------------------------------------------
+List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
+FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
+Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite-boot.patch b/meta/packages/linux/linux-rp-2.6.26/zylonite-boot.patch
index f41928eca..f41928eca 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite-boot.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/zylonite-boot.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite_keypad-r0.patch b/meta/packages/linux/linux-rp-2.6.26/zylonite_keypad-r0.patch
index 1889b3884..1889b3884 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite_keypad-r0.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/zylonite_keypad-r0.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite_mtd-r0.patch b/meta/packages/linux/linux-rp-2.6.26/zylonite_mtd-r0.patch
index cb5a9c5f7..cb5a9c5f7 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite_mtd-r0.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/zylonite_mtd-r0.patch
diff --git a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite_touch-r0.patch b/meta/packages/linux/linux-rp-2.6.26/zylonite_touch-r0.patch
index 1c0069605..1c0069605 100644
--- a/meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite_touch-r0.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/zylonite_touch-r0.patch
diff --git a/meta/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb b/meta/packages/linux/linux-rp_2.6.26.bb
index 0cb8a62c6..b55b37fdf 100644
--- a/meta/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
+++ b/meta/packages/linux/linux-rp_2.6.26.bb
@@ -53,6 +53,7 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \
            file://htcuni.patch;patch=1 \
            file://versatile-armv6.patch;patch=1 \
 	   file://cpufreq-fix.patch;patch=1 \
+	   file://zaurus-i2c-init.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-akita \