From 8885ae67a74cc797319f82ff9d2afb54dadfdfc7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 21 Jul 2008 15:09:18 +0000 Subject: [PATCH] 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 --- .../binutils-buildid-arm.patch | 0 .../connectplus-prevent-oops-HACK.patch | 0 .../connectplus-remove-ide-HACK.patch | 0 .../cpufreq-fix.patch | 0 .../defconfig-akita | 0 .../defconfig-bootcdx86 | 0 .../defconfig-c7x0 | 0 .../defconfig-collie | 0 .../defconfig-htcuniversal | 0 .../defconfig-hx2000 | 0 .../defconfig-poodle | 0 .../defconfig-qemuarm | 0 .../defconfig-qemux86 | 0 .../defconfig-spitz | 0 .../defconfig-zylonite | 0 .../hostap-monitor-mode.patch | 0 .../hrw-hostapcard.patch | 0 .../htcuni-acx.patch | 0 .../htcuni.patch | 0 .../pxa-serial-hack.patch | 0 .../pxa_fb_overlay.patch | 0 ...-non-standard-xtals-to-16c950-driver.patch | 0 .../sharpsl-rc-r1.patch | 0 .../spitz_h_rewrite.patch | 0 .../versatile-armv6.patch | 0 .../linux-rp-2.6.26/zaurus-i2c-init.patch | 68 +++++++++++++++++++ .../zylonite-boot.patch | 0 .../zylonite_keypad-r0.patch | 0 .../zylonite_mtd-r0.patch | 0 .../zylonite_touch-r0.patch | 0 ....6.25+2.6.26-rc4.bb => linux-rp_2.6.26.bb} | 1 + 31 files changed, 69 insertions(+) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/binutils-buildid-arm.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/connectplus-prevent-oops-HACK.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/connectplus-remove-ide-HACK.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/cpufreq-fix.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/defconfig-akita (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/defconfig-bootcdx86 (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/defconfig-c7x0 (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/defconfig-collie (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/defconfig-htcuniversal (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/defconfig-hx2000 (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/defconfig-poodle (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/defconfig-qemuarm (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/defconfig-qemux86 (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/defconfig-spitz (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/defconfig-zylonite (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/hostap-monitor-mode.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/hrw-hostapcard.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/htcuni-acx.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/htcuni.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/pxa-serial-hack.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/pxa_fb_overlay.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/sharpsl-rc-r1.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/spitz_h_rewrite.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/versatile-armv6.patch (100%) create mode 100644 meta/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/zylonite-boot.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/zylonite_keypad-r0.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/zylonite_mtd-r0.patch (100%) rename meta/packages/linux/{linux-rp-2.6.25+2.6.26-rc4 => linux-rp-2.6.26}/zylonite_touch-r0.patch (100%) rename meta/packages/linux/{linux-rp_2.6.25+2.6.26-rc4.bb => linux-rp_2.6.26.bb} (99%) 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/binutils-buildid-arm.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/connectplus-prevent-oops-HACK.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/connectplus-remove-ide-HACK.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/cpufreq-fix.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-akita rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-bootcdx86 rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-c7x0 rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-collie rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-htcuniversal rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-hx2000 rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-poodle rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-qemuarm rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-qemux86 rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-spitz rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/defconfig-zylonite rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/hostap-monitor-mode.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/hrw-hostapcard.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/htcuni-acx.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/htcuni.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/pxa-serial-hack.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/pxa_fb_overlay.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/sharpsl-rc-r1.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/spitz_h_rewrite.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/versatile-armv6.patch rename to 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 0000000000..40214e42b0 --- /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 +To: Richard Purdie +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 + + +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 +Signed-off-by: Mark Brown +--- + 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 + #include + #include ++#include + #include + #include + #include +@@ -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 + #include + #include ++#include + #include + #include + #include +@@ -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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite-boot.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite_keypad-r0.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite_mtd-r0.patch rename to 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 similarity index 100% rename from meta/packages/linux/linux-rp-2.6.25+2.6.26-rc4/zylonite_touch-r0.patch rename to 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 similarity index 99% rename from meta/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb rename to meta/packages/linux/linux-rp_2.6.26.bb index 0cb8a62c60..b55b37fdf3 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 \ -- 2.40.1