From 766d6121655517dea5e6c37352d4436f00deb331 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 4 Feb 2012 11:51:09 +0100 Subject: [PATCH] linux: downgrade to linux-3.1.10 for RPi Signed-off-by: Stephan Raue --- .../linux-3.1.10-000_crosscompile.patch | 22 + .../linux-3.1.10-003-no_dev_console.patch | 20 + ....10-004_lower_undefined_mode_timeout.patch | 24 + .../linux-3.1.10-006_enable_utf8.patch | 25 + .../linux-3.1.10-007_die_floppy_die.patch | 30 + ...009_disable_i8042_check_on_apple_mac.patch | 59 + ...x-3.1.10-052-aureal_remote_quirk-0.1.patch | 113 + ...nux-3.1.10-053-spinelplus-remote-0.1.patch | 145 + ...90a1056c5564eec8a1b169c6e84ff3f54c13.patch | 12 + ...1.10-071-silence_i915_agp-module-0.1.patch | 12 + .../linux-3.1.10-081-drm_cea_modes.patch | 358 ++ ...0-203-stb0899_enable_low_symbol_rate.patch | 12 + ...-add_Formosa_eHome_Infrared_Receiver.patch | 11 + .../linux-3.1.10-251-acpi-5.0_support.patch | 5444 +++++++++++++++++ ...w_mac_address_to_be_set_in_smsc95xx.patch} | 0 ...-3.1.10-601-add_bcm2708_support-0.1.patch} | 524 +- ...1.10-602-add_bcm2708_mmc_driver-0.1.patch} | 1032 +++- ...10-602-add_bcm2708_vchiq_driver-0.1.patch} | 452 +- ...603-add_bcm2708_watchdog_driver-0.1.patch} | 80 +- ...-add_bcm2708_framebuffer_driver-0.1.patch} | 104 +- ...x-3.1.10-605-add_dwc_otg_driver-0.1.patch} | 371 +- .../linux-3.1.10-716_mm-zero_swappiness.patch | 17 + .../linux-3.1.10-901_broken_bluetooth.patch | 13 + ...3-Remove_BUILD_BUG_ON_from_asm-bug.h.patch | 11 - projects/RPi/linux/linux.arm.conf | 693 +-- 25 files changed, 8291 insertions(+), 1293 deletions(-) create mode 100644 packages/linux/patches/linux-3.1.10-000_crosscompile.patch create mode 100644 packages/linux/patches/linux-3.1.10-003-no_dev_console.patch create mode 100644 packages/linux/patches/linux-3.1.10-004_lower_undefined_mode_timeout.patch create mode 100644 packages/linux/patches/linux-3.1.10-006_enable_utf8.patch create mode 100644 packages/linux/patches/linux-3.1.10-007_die_floppy_die.patch create mode 100644 packages/linux/patches/linux-3.1.10-009_disable_i8042_check_on_apple_mac.patch create mode 100644 packages/linux/patches/linux-3.1.10-052-aureal_remote_quirk-0.1.patch create mode 100644 packages/linux/patches/linux-3.1.10-053-spinelplus-remote-0.1.patch create mode 100644 packages/linux/patches/linux-3.1.10-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch create mode 100644 packages/linux/patches/linux-3.1.10-071-silence_i915_agp-module-0.1.patch create mode 100644 packages/linux/patches/linux-3.1.10-081-drm_cea_modes.patch create mode 100644 packages/linux/patches/linux-3.1.10-203-stb0899_enable_low_symbol_rate.patch create mode 100644 packages/linux/patches/linux-3.1.10-204-add_Formosa_eHome_Infrared_Receiver.patch create mode 100644 packages/linux/patches/linux-3.1.10-251-acpi-5.0_support.patch rename packages/linux/patches/{linux-3.2.2-271-Allow_mac_address_to_be_set_in_smsc95xx.patch => linux-3.1.10-271-Allow_mac_address_to_be_set_in_smsc95xx.patch} (100%) rename packages/linux/patches/{linux-3.2.2-601-add_bcm2708_support-0.1.patch => linux-3.1.10-601-add_bcm2708_support-0.1.patch} (90%) rename packages/linux/patches/{linux-3.2.2-602-add_bcm2708_mmc_driver-0.1.patch => linux-3.1.10-602-add_bcm2708_mmc_driver-0.1.patch} (74%) rename packages/linux/patches/{linux-3.2.2-602-add_bcm2708_vchiq_driver-0.1.patch => linux-3.1.10-602-add_bcm2708_vchiq_driver-0.1.patch} (94%) rename packages/linux/patches/{linux-3.2.2-603-add_bcm2708_watchdog_driver-0.1.patch => linux-3.1.10-603-add_bcm2708_watchdog_driver-0.1.patch} (89%) rename packages/linux/patches/{linux-3.2.2-604-add_bcm2708_framebuffer_driver-0.1.patch => linux-3.1.10-604-add_bcm2708_framebuffer_driver-0.1.patch} (98%) rename packages/linux/patches/{linux-3.2.2-605-add_dwc_otg_driver-0.1.patch => linux-3.1.10-605-add_dwc_otg_driver-0.1.patch} (98%) create mode 100644 packages/linux/patches/linux-3.1.10-716_mm-zero_swappiness.patch create mode 100644 packages/linux/patches/linux-3.1.10-901_broken_bluetooth.patch delete mode 100644 packages/linux/patches/linux-3.2.2-903-Remove_BUILD_BUG_ON_from_asm-bug.h.patch diff --git a/packages/linux/patches/linux-3.1.10-000_crosscompile.patch b/packages/linux/patches/linux-3.1.10-000_crosscompile.patch new file mode 100644 index 0000000000..b4fc575828 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-000_crosscompile.patch @@ -0,0 +1,22 @@ +--- linux-2.6.24-rc2.orig/arch/x86/boot/tools/build.c 2007-10-06 12:26:14.000000000 +0200 ++++ linux-2.6.24-rc2/arch/x86/boot/tools/build.c 2007-10-06 12:27:36.000000000 +0200 +@@ -29,7 +29,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -42,6 +41,11 @@ + #define DEFAULT_MAJOR_ROOT 0 + #define DEFAULT_MINOR_ROOT 0 + ++#undef major ++#define major(dev) ((int)(((dev) >> 8) & 0xff)) ++#undef minor ++#define minor(dev) ((int)((dev) & 0xff)) ++ + /* Minimal number of setup sectors */ + #define SETUP_SECT_MIN 5 + #define SETUP_SECT_MAX 64 diff --git a/packages/linux/patches/linux-3.1.10-003-no_dev_console.patch b/packages/linux/patches/linux-3.1.10-003-no_dev_console.patch new file mode 100644 index 0000000000..9b5e51437d --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-003-no_dev_console.patch @@ -0,0 +1,20 @@ +diff -Naur linux-2.6.34-rc7/init/main.c linux-2.6.34-rc7.patch/init/main.c +--- linux-2.6.34-rc7/init/main.c 2010-05-10 03:36:28.000000000 +0200 ++++ linux-2.6.34-rc7.patch/init/main.c 2010-05-15 12:28:34.767241760 +0200 +@@ -886,8 +886,14 @@ + do_basic_setup(); + + /* Open the /dev/console on the rootfs, this should never fail */ +- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) +- printk(KERN_WARNING "Warning: unable to open an initial console.\n"); ++ char *console = "/dev_console"; ++ ++ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) { ++ sys_mknod(console, S_IFCHR|0600, (TTYAUX_MAJOR<<8)|1); ++ if (sys_open(console, O_RDWR, 0) < 0) ++ printk(KERN_WARNING "Warning: unable to open an initial console.\n"); ++ sys_unlink(console); ++ } + + (void) sys_dup(0); + (void) sys_dup(0); diff --git a/packages/linux/patches/linux-3.1.10-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-3.1.10-004_lower_undefined_mode_timeout.patch new file mode 100644 index 0000000000..a0aca61d23 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-004_lower_undefined_mode_timeout.patch @@ -0,0 +1,24 @@ +diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/tty.c linux-2.6.23-rc9/arch/i386/boot/tty.c +--- linux-2.6.23-rc9.orig/arch/x86/boot/tty.c 2007-10-06 12:26:14.000000000 +0200 ++++ linux-2.6.23-rc9/arch/x86/boot/tty.c 2007-10-06 12:37:47.000000000 +0200 +@@ -92,7 +92,7 @@ + + int getchar_timeout(void) + { +- int cnt = 30; ++ int cnt = 3; + int t0, t1; + + t0 = gettime(); +diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/video.c linux-2.6.23-rc9/arch/i386/boot/video.c +--- linux-2.6.23-rc9.orig/arch/x86/boot/video.c 2007-10-06 12:26:14.000000000 +0200 ++++ linux-2.6.23-rc9/arch/x86/boot/video.c 2007-10-06 12:36:05.000000000 +0200 +@@ -329,7 +329,7 @@ + unsigned int sel; + + puts("Press to see video modes available, " +- " to continue, or wait 30 sec\n"); ++ " to continue, or wait 3 sec\n"); + + kbd_flush(); + while (1) { diff --git a/packages/linux/patches/linux-3.1.10-006_enable_utf8.patch b/packages/linux/patches/linux-3.1.10-006_enable_utf8.patch new file mode 100644 index 0000000000..bee1cf3da8 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-006_enable_utf8.patch @@ -0,0 +1,25 @@ +diff -Naur linux-2.6.31-rc4.orig/fs/fat/inode.c linux-2.6.31-rc4/fs/fat/inode.c +--- linux-2.6.31-rc4.orig/fs/fat/inode.c 2009-07-25 12:47:41.000000000 +0200 ++++ linux-2.6.31-rc4/fs/fat/inode.c 2009-07-25 13:38:18.000000000 +0200 +@@ -979,7 +979,8 @@ + } + opts->name_check = 'n'; + opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK = 0; +- opts->utf8 = opts->unicode_xlate = 0; ++ opts->utf8 = 1; ++ opts->unicode_xlate = 0; + opts->numtail = 1; + opts->usefree = opts->nocase = 0; + opts->tz_utc = 0; +diff -Naur linux-2.6.31-rc4.orig/fs/isofs/inode.c linux-2.6.31-rc4/fs/isofs/inode.c +--- linux-2.6.31-rc4.orig/fs/isofs/inode.c 2009-07-25 12:47:41.000000000 +0200 ++++ linux-2.6.31-rc4/fs/isofs/inode.c 2009-07-25 13:38:49.000000000 +0200 +@@ -377,7 +377,7 @@ + popt->gid = 0; + popt->uid = 0; + popt->iocharset = NULL; +- popt->utf8 = 0; ++ popt->utf8 = 1; + popt->overriderockperm = 0; + popt->session=-1; + popt->sbsector=-1; diff --git a/packages/linux/patches/linux-3.1.10-007_die_floppy_die.patch b/packages/linux/patches/linux-3.1.10-007_die_floppy_die.patch new file mode 100644 index 0000000000..76db312182 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-007_die_floppy_die.patch @@ -0,0 +1,30 @@ +From 4ff58b642f80dedb20533978123d89b5ac9b1ed5 Mon Sep 17 00:00:00 2001 +From: Kyle McMartin +Date: Tue, 30 Mar 2010 00:04:29 -0400 +Subject: die-floppy-die + +Kill the floppy.ko pnp modalias. We were surviving just fine without +autoloading floppy drivers, tyvm. + +Please feel free to register all complaints in the wastepaper bin. +--- + drivers/block/floppy.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c +index 90c4038..f4a0b90 100644 +--- a/drivers/block/floppy.c ++++ b/drivers/block/floppy.c +@@ -4619,8 +4619,7 @@ static const struct pnp_device_id floppy_pnpids[] = { + {"PNP0700", 0}, + {} + }; +- +-MODULE_DEVICE_TABLE(pnp, floppy_pnpids); ++/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */ + + #else + +-- +1.7.0.1 + diff --git a/packages/linux/patches/linux-3.1.10-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-3.1.10-009_disable_i8042_check_on_apple_mac.patch new file mode 100644 index 0000000000..f99d0f900c --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-009_disable_i8042_check_on_apple_mac.patch @@ -0,0 +1,59 @@ +From 2a79554c864ac58fa2ad982f0fcee2cc2aa33eb5 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 20 May 2010 10:30:31 -0400 +Subject: Disable i8042 checks on Intel Apple Macs + +As those computers never had any i8042 controllers, and the +current lookup code could potentially lock up/hang/wait for +timeout for long periods of time. + +Fixes intermittent hangs on boot on a MacbookAir1,1 + +Signed-off-by: Bastien Nocera +--- + drivers/input/serio/i8042.c | 22 ++++++++++++++++++++++ + 1 files changed, 22 insertions(+), 0 deletions(-) + +diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c +index 6440a8f..4d7cf98 100644 +--- a/drivers/input/serio/i8042.c ++++ b/drivers/input/serio/i8042.c +@@ -1451,6 +1451,22 @@ static struct platform_driver i8042_driver = { + .shutdown = i8042_shutdown, + }; + ++#ifdef CONFIG_DMI ++static struct dmi_system_id __initdata dmi_system_table[] = { ++ { ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VENDOR, "Apple Computer, Inc.") ++ }, ++ }, ++ { ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VENDOR, "Apple Inc.") ++ }, ++ }, ++ {} ++}; ++#endif /*CONFIG_DMI*/ ++ + static int __init i8042_init(void) + { + struct platform_device *pdev; +@@ -1458,6 +1474,12 @@ static int __init i8042_init(void) + + dbg_init(); + ++#ifdef CONFIG_DMI ++ /* Intel Apple Macs never have an i8042 controller */ ++ if (dmi_check_system(dmi_system_table) > 0) ++ return -ENODEV; ++#endif /*CONFIG_DMI*/ ++ + err = i8042_platform_init(); + if (err) + return err; +-- +1.7.0.1 + diff --git a/packages/linux/patches/linux-3.1.10-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-3.1.10-052-aureal_remote_quirk-0.1.patch new file mode 100644 index 0000000000..60cdbf0938 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-052-aureal_remote_quirk-0.1.patch @@ -0,0 +1,113 @@ +diff -Naur linux-2.6.37/drivers/hid/hid-aureal.c linux-2.6.37.patch/drivers/hid/hid-aureal.c +--- linux-2.6.37/drivers/hid/hid-aureal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.37.patch/drivers/hid/hid-aureal.c 2011-01-07 22:35:31.413389936 +0100 +@@ -0,0 +1,60 @@ ++/* ++ * HID driver for some sunplus "special" devices ++ * ++ * Copyright (c) 1999 Andreas Gal ++ * Copyright (c) 2000-2005 Vojtech Pavlik ++ * Copyright (c) 2005 Michael Haboustak for Concept2, Inc ++ * Copyright (c) 2006-2007 Jiri Kosina ++ * Copyright (c) 2007 Paul Walmsley ++ * Copyright (c) 2008 Jiri Slaby ++ * Copyright (c) 2010 Franco Catrin ++ */ ++ ++/* ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the Free ++ * Software Foundation; either version 2 of the License, or (at your option) ++ * any later version. ++ */ ++ ++#include ++#include ++#include ++ ++#include "hid-ids.h" ++ ++static __u8 *aureal_report_fixup(struct hid_device *hdev, __u8 *rdesc, ++ unsigned int *rsize) ++{ ++ if (*rsize >= 54 && rdesc[52] == 0x25 && rdesc[53] == 0x01) { ++ dev_info(&hdev->dev, "fixing Aureal Cy se W-01RN USB_V3.1 " ++ "report descriptor. Keyboard Logical Maximum = 101\n"); ++ rdesc[53] = 0x65; ++ } return rdesc; ++} ++ ++static const struct hid_device_id aureal_devices[] = { ++ { HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) }, ++ { } ++}; ++MODULE_DEVICE_TABLE(hid, aureal_devices); ++ ++static struct hid_driver aureal_driver = { ++ .name = "aureal", ++ .id_table = aureal_devices, ++ .report_fixup = aureal_report_fixup, ++}; ++ ++static int __init aureal_init(void) ++{ ++ return hid_register_driver(&aureal_driver); ++} ++ ++static void __exit aureal_exit(void) ++{ ++ hid_unregister_driver(&aureal_driver); ++} ++ ++module_init(aureal_init); ++module_exit(aureal_exit); ++MODULE_LICENSE("GPL"); +diff -Naur linux-2.6.37/drivers/hid/hid-ids.h linux-2.6.37.patch/drivers/hid/hid-ids.h +--- linux-2.6.37/drivers/hid/hid-ids.h 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37.patch/drivers/hid/hid-ids.h 2011-01-07 22:35:31.414389949 +0100 +@@ -6,6 +6,7 @@ + * Copyright (c) 2005 Michael Haboustak for Concept2, Inc + * Copyright (c) 2006-2007 Jiri Kosina + * Copyright (c) 2007 Paul Walmsley ++ * Copyright (c) 2010 Franco Catrin + */ + + /* +@@ -327,6 +328,9 @@ + #define USB_DEVICE_ID_KYE_ERGO_525V 0x0087 + #define USB_DEVICE_ID_KYE_GPEN_560 0x5003 + ++#define USB_VENDOR_ID_AUREAL 0x0755 ++#define USB_DEVICE_ID_AUREAL_W01RN 0x2626 ++ + #define USB_VENDOR_ID_LABTEC 0x1020 + #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD 0x0006 + +diff -Naur linux-2.6.37/drivers/hid/Kconfig linux-2.6.37.patch/drivers/hid/Kconfig +--- linux-2.6.37/drivers/hid/Kconfig 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37.patch/drivers/hid/Kconfig 2011-01-07 22:35:31.467390603 +0100 +@@ -87,6 +87,13 @@ + Say Y here if you want support for keyboards of Apple iBooks, PowerBooks, + MacBooks, MacBook Pros and Apple Aluminum. + ++config HID_AUREAL ++ tristate "Aureal" if EMBEDDED ++ depends on USB_HID ++ default !EMBEDDED ++ ---help--- ++ Support for Aureal Cy se W-01RN Remote Controller ++ + config HID_BELKIN + tristate "Belkin Flip KVM and Wireless keyboard" if EMBEDDED + depends on USB_HID +diff -Naur linux-2.6.37/drivers/hid/Makefile linux-2.6.37.patch/drivers/hid/Makefile +--- linux-2.6.37/drivers/hid/Makefile 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37.patch/drivers/hid/Makefile 2011-01-07 22:35:31.547391590 +0100 +@@ -29,6 +29,7 @@ + obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o + obj-$(CONFIG_HID_ACRUX_FF) += hid-axff.o + obj-$(CONFIG_HID_APPLE) += hid-apple.o ++obj-$(CONFIG_HID_AUREAL) += hid-aureal.o + obj-$(CONFIG_HID_BELKIN) += hid-belkin.o + obj-$(CONFIG_HID_CANDO) += hid-cando.o + obj-$(CONFIG_HID_CHERRY) += hid-cherry.o diff --git a/packages/linux/patches/linux-3.1.10-053-spinelplus-remote-0.1.patch b/packages/linux/patches/linux-3.1.10-053-spinelplus-remote-0.1.patch new file mode 100644 index 0000000000..5ba9474abc --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-053-spinelplus-remote-0.1.patch @@ -0,0 +1,145 @@ +diff -Naur linux-3.2/drivers/hid/hid-ids.h linux-3.2.patch/drivers/hid/hid-ids.h +--- linux-3.2/drivers/hid/hid-ids.h 2012-01-05 00:55:44.000000000 +0100 ++++ linux-3.2.patch/drivers/hid/hid-ids.h 2012-01-05 20:09:15.707390369 +0100 +@@ -567,6 +567,8 @@ + + #define USB_VENDOR_ID_PHILIPS 0x0471 + #define USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE 0x0617 ++#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1 0x206c ++#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2 0x20cc + + #define USB_VENDOR_ID_PI_ENGINEERING 0x05f3 + #define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL 0xff +diff -Naur linux-3.2/drivers/hid/hid-spinelplus.c linux-3.2.patch/drivers/hid/hid-spinelplus.c +--- linux-3.2/drivers/hid/hid-spinelplus.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.patch/drivers/hid/hid-spinelplus.c 2012-01-06 20:23:30.709596152 +0100 +@@ -0,0 +1,102 @@ ++/* ++ * HID driver for "PHILIPS MCE USB IR Receiver- Spinel plus" remotes ++ * ++ * Copyright (c) 2010 Panagiotis Skintzos ++ * ++ * Renamed to Spinel, cleanup and modified to also support ++ * Spinel Plus 0471:20CC by Stephan Raue 2012. ++ */ ++ ++/* ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the Free ++ * Software Foundation; either version 2 of the License, or (at your option) ++ * any later version. ++ */ ++ ++#include ++#include ++#include ++#include ++ ++#include "hid-ids.h" ++ ++#define spinelplus_map_key(c) set_bit(EV_REP, hi->input->evbit); \ ++ hid_map_usage_clear(hi, usage, bit, max, EV_KEY, (c)) ++ ++static int spinelplus_input_mapping(struct hid_device *hdev, ++ struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, ++ unsigned long **bit, int *max) ++{ ++ switch (usage->hid) { ++ case 0xffbc000d: spinelplus_map_key(KEY_MEDIA); break; ++ case 0xffbc0024: spinelplus_map_key(KEY_MEDIA); break; ++ case 0xffbc0027: spinelplus_map_key(KEY_ZOOM); break; ++ case 0xffbc0035: spinelplus_map_key(KEY_CAMERA); break; ++ case 0xffbc0036: spinelplus_map_key(KEY_EPG); break; ++ case 0xffbc0037: spinelplus_map_key(KEY_DVD); break; ++ case 0xffbc0038: spinelplus_map_key(KEY_HOME); break; ++ case 0xffbc0039: spinelplus_map_key(KEY_MP3); break; ++ case 0xffbc003a: spinelplus_map_key(KEY_VIDEO); break; ++ case 0xffbc005a: spinelplus_map_key(KEY_TEXT); break; ++ case 0xffbc005b: spinelplus_map_key(KEY_RED); break; ++ case 0xffbc005c: spinelplus_map_key(KEY_GREEN); break; ++ case 0xffbc005d: spinelplus_map_key(KEY_YELLOW); break; ++ case 0xffbc005e: spinelplus_map_key(KEY_BLUE); break; ++ default: ++ return 0; ++ } ++ return 1; ++} ++ ++static int spinelplus_probe(struct hid_device *hdev, ++ const struct hid_device_id *id) ++{ ++ int ret; ++ /* Connect only to hid input (not hiddev & hidraw)*/ ++ unsigned int cmask = HID_CONNECT_HIDINPUT; ++ ++ ret = hid_parse(hdev); ++ if (ret) { ++ dev_err(&hdev->dev, "parse failed\n"); ++ goto err_free; ++ } ++ ++ ret = hid_hw_start(hdev, cmask); ++ if (ret) { ++ dev_err(&hdev->dev, "hw start failed\n"); ++ goto err_free; ++ } ++ ++ return 0; ++err_free: ++ return ret; ++} ++ ++static const struct hid_device_id spinelplus_devices[] = { ++ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1) }, ++ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2) }, ++ { } ++}; ++MODULE_DEVICE_TABLE(hid, spinelplus_devices); ++ ++static struct hid_driver spinelplus_driver = { ++ .name = "SpinelPlus", ++ .id_table = spinelplus_devices, ++ .input_mapping = spinelplus_input_mapping, ++ .probe = spinelplus_probe, ++}; ++ ++static int __init spinelplus_init(void) ++{ ++ return hid_register_driver(&spinelplus_driver); ++} ++ ++static void __exit spinelplus_exit(void) ++{ ++ hid_unregister_driver(&spinelplus_driver); ++} ++ ++module_init(spinelplus_init); ++module_exit(spinelplus_exit); ++MODULE_LICENSE("GPL"); +diff -Naur linux-3.2/drivers/hid/Kconfig linux-3.2.patch/drivers/hid/Kconfig +--- linux-3.2/drivers/hid/Kconfig 2012-01-05 00:55:44.000000000 +0100 ++++ linux-3.2.patch/drivers/hid/Kconfig 2012-01-06 15:57:41.506995453 +0100 +@@ -538,6 +538,12 @@ + ---help--- + Support for Speedlink Vicious and Divine Cezanne mouse. + ++config HID_SPINELPLUS ++ tristate "Spinel Plus remote control" ++ depends on USB_HID ++ ---help--- ++ Say Y here if you have a Spinel Plus (0471:206c or 0471:20cc) remote ++ + config HID_SUNPLUS + tristate "Sunplus wireless desktop" + depends on USB_HID +diff -Naur linux-3.2/drivers/hid/Makefile linux-3.2.patch/drivers/hid/Makefile +--- linux-3.2/drivers/hid/Makefile 2012-01-05 00:55:44.000000000 +0100 ++++ linux-3.2.patch/drivers/hid/Makefile 2012-01-06 15:57:20.878623877 +0100 +@@ -67,6 +67,7 @@ + obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o + obj-$(CONFIG_HID_SONY) += hid-sony.o + obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o ++obj-$(CONFIG_HID_SPINELPLUS) += hid-spinelplus.o + obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o + obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o + obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o diff --git a/packages/linux/patches/linux-3.1.10-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch b/packages/linux/patches/linux-3.1.10-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch new file mode 100644 index 0000000000..08566d1f13 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3f54c13.patch @@ -0,0 +1,12 @@ +diff -Naur linux-3.0/drivers/media/rc/nuvoton-cir.c linux-3.0.patch/drivers/media/rc/nuvoton-cir.c +--- linux-3.0/drivers/media/rc/nuvoton-cir.c 2011-07-22 04:17:23.000000000 +0200 ++++ linux-3.0.patch/drivers/media/rc/nuvoton-cir.c 2011-07-22 21:30:48.374591146 +0200 +@@ -1110,7 +1110,7 @@ + rdev->dev.parent = &pdev->dev; + rdev->driver_name = NVT_DRIVER_NAME; + rdev->map_name = RC_MAP_RC6_MCE; +- rdev->timeout = MS_TO_NS(100); ++ rdev->timeout = US_TO_NS(1000); + /* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */ + rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD); + #if 0 diff --git a/packages/linux/patches/linux-3.1.10-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-3.1.10-071-silence_i915_agp-module-0.1.patch new file mode 100644 index 0000000000..81bbc8c362 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-071-silence_i915_agp-module-0.1.patch @@ -0,0 +1,12 @@ +diff -Naur linux-2.6.39-rc5/drivers/gpu/drm/i915/i915_drv.c linux-2.6.39-rc5.patch/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.39-rc5/drivers/gpu/drm/i915/i915_drv.c 2011-04-27 05:48:50.000000000 +0200 ++++ linux-2.6.39-rc5.patch/drivers/gpu/drm/i915/i915_drv.c 2011-04-29 02:51:28.773622809 +0200 +@@ -760,7 +760,7 @@ + static int __init i915_init(void) + { + if (!intel_agp_enabled) { +- DRM_ERROR("drm/i915 can't work without intel_agp module!\n"); ++ DRM_INFO("drm/i915 can't work without intel_agp module!\n"); + return -ENODEV; + } + diff --git a/packages/linux/patches/linux-3.1.10-081-drm_cea_modes.patch b/packages/linux/patches/linux-3.1.10-081-drm_cea_modes.patch new file mode 100644 index 0000000000..57058c1107 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-081-drm_cea_modes.patch @@ -0,0 +1,358 @@ +diff -Naur linux-3.1.2/drivers/gpu/drm/drm_edid.c linux-3.1.2.patch/drivers/gpu/drm/drm_edid.c +--- linux-3.1.2/drivers/gpu/drm/drm_edid.c 2011-11-21 23:47:46.000000000 +0100 ++++ linux-3.1.2.patch/drivers/gpu/drm/drm_edid.c 2011-11-23 00:35:54.444938016 +0100 +@@ -1318,6 +1318,7 @@ + + #define HDMI_IDENTIFIER 0x000C03 + #define AUDIO_BLOCK 0x01 ++#define VIDEO_BLOCK 0x02 + #define VENDOR_BLOCK 0x03 + #define EDID_BASIC_AUDIO (1 << 6) + +@@ -1347,6 +1348,47 @@ + } + EXPORT_SYMBOL(drm_find_cea_extension); + ++static int ++do_cea_modes (struct drm_connector *connector, u8 *db, u8 len) ++{ ++ struct drm_device *dev = connector->dev; ++ u8 * mode, cea_mode; ++ int modes = 0; ++ ++ for (mode = db; mode < db + len; mode++) { ++ cea_mode = (*mode & 127) - 1; /* CEA modes are numbered 1..127 */ ++ if (cea_mode < drm_num_cea_modes) { ++ struct drm_display_mode *newmode; ++ newmode = drm_mode_duplicate(dev, ++ &edid_cea_modes[cea_mode]); ++ if (newmode) { ++ drm_mode_probed_add(connector, newmode); ++ modes++; ++ } ++ } ++ } ++ ++ return modes; ++} ++ ++static int ++add_cea_modes(struct drm_connector *connector, struct edid *edid) ++{ ++ u8 * cea = drm_find_cea_extension(edid); ++ u8 * db, dbl; ++ int modes = 0; ++ ++ if (cea && cea[1] >= 3) { ++ for (db = cea + 4; db < cea + cea[2]; db += dbl + 1) { ++ dbl = db[0] & 0x1f; ++ if (((db[0] & 0xe0) >> 5) == VIDEO_BLOCK) ++ modes += do_cea_modes (connector, db+1, dbl); ++ } ++ } ++ ++ return modes; ++} ++ + /** + * drm_detect_hdmi_monitor - detect whether monitor is hdmi. + * @edid: monitor EDID information +@@ -1550,6 +1592,7 @@ + num_modes += add_standard_modes(connector, edid); + num_modes += add_established_modes(connector, edid); + num_modes += add_inferred_modes(connector, edid); ++ num_modes += add_cea_modes(connector, edid); + + if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75)) + edid_fixup_preferred(connector, quirks); +diff -Naur linux-3.1.2/drivers/gpu/drm/drm_edid_modes.h linux-3.1.2.patch/drivers/gpu/drm/drm_edid_modes.h +--- linux-3.1.2/drivers/gpu/drm/drm_edid_modes.h 2011-11-21 23:47:46.000000000 +0100 ++++ linux-3.1.2.patch/drivers/gpu/drm/drm_edid_modes.h 2011-11-23 00:31:42.218643364 +0100 +@@ -378,3 +378,287 @@ + { 1920, 1440, 75, 0 }, + }; + static const int num_est3_modes = sizeof(est3_modes) / sizeof(est3_modes[0]); ++ ++/* ++ * Probably taken from CEA-861 spec. ++ * This table is converted from xorg's hw/xfree86/modes/xf86EdidModes.c. ++ */ ++static const struct drm_display_mode edid_cea_modes[] = { ++ /* 640x480@60Hz */ ++ { DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 25175, 640, 656, ++ 752, 800, 0, 480, 490, 492, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 720x480@60Hz */ ++ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736, ++ 798, 858, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 720x480@60Hz */ ++ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736, ++ 798, 858, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1280x720@60Hz */ ++ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1390, ++ 1430, 1650, 0, 720, 725, 730, 750, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 1920x1080i@60Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008, ++ 2052, 2200, 0, 1080, 1084, 1094, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1440x480i@60Hz */ ++ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478, ++ 1602, 1716, 0, 480, 488, 494, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1440x480i@60Hz */ ++ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478, ++ 1602, 1716, 0, 480, 488, 494, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1440x240@60Hz */ ++ { DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478, ++ 1602, 1716, 0, 240, 244, 247, 262, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1440x240@60Hz */ ++ { DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478, ++ 1602, 1716, 0, 240, 244, 247, 262, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 2880x480i@60Hz */ ++ { DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956, ++ 3204, 3432, 0, 480, 488, 494, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 2880x480i@60Hz */ ++ { DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956, ++ 3204, 3432, 0, 480, 488, 494, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 2880x240@60Hz */ ++ { DRM_MODE("2880x240", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956, ++ 3204, 3432, 0, 240, 244, 247, 262, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 2880x240@60Hz */ ++ { DRM_MODE("2880x240", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2956, ++ 3204, 3432, 0, 240, 244, 247, 262, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1440x480@60Hz */ ++ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1472, ++ 1596, 1716, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1440x480@60Hz */ ++ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1472, ++ 1596, 1716, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1920x1080@60Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008, ++ 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 720x576@50Hz */ ++ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732, ++ 796, 864, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 720x576@50Hz */ ++ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732, ++ 796, 864, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1280x720@50Hz */ ++ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 1720, ++ 1760, 1980, 0, 720, 725, 730, 750, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 1920x1080i@50Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2448, ++ 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1440x576i@50Hz */ ++ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464, ++ 1590, 1728, 0, 576, 580, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1440x576i@50Hz */ ++ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464, ++ 1590, 1728, 0, 576, 580, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1440x288@50Hz */ ++ { DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464, ++ 1590, 1728, 0, 288, 290, 293, 312, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1440x288@50Hz */ ++ { DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464, ++ 1590, 1728, 0, 288, 290, 293, 312, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 2880x576i@50Hz */ ++ { DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928, ++ 3180, 3456, 0, 576, 580, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 2880x576i@50Hz */ ++ { DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928, ++ 3180, 3456, 0, 576, 580, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 2880x288@50Hz */ ++ { DRM_MODE("2880x288", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928, ++ 3180, 3456, 0, 288, 290, 293, 312, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 2880x288@50Hz */ ++ { DRM_MODE("2880x288", DRM_MODE_TYPE_DRIVER, 54000, 2880, 2928, ++ 3180, 3456, 0, 288, 290, 293, 312, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1440x576@50Hz */ ++ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464, ++ 1592, 1728, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1440x576@50Hz */ ++ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464, ++ 1592, 1728, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1920x1080@50Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448, ++ 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 1920x1080@24Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2558, ++ 2602, 2750, 0, 1080, 1084, 1089, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 1920x1080@25Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2448, ++ 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 1920x1080@30Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 74250, 1920, 2008, ++ 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 2880x480@60Hz */ ++ { DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2944, ++ 3192, 3432, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 2880x480@60Hz */ ++ { DRM_MODE("2880x480", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2944, ++ 3192, 3432, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 2880x576@50Hz */ ++ { DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2928, ++ 3184, 3456, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 2880x576@50Hz */ ++ { DRM_MODE("2880x576", DRM_MODE_TYPE_DRIVER, 108000, 2880, 2928, ++ 3184, 3456, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1920x1080i@50Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 72000, 1920, 1952, ++ 2120, 2304, 0, 1080, 1126, 1136, 1250, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1920x1080i@100Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2448, ++ 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1280x720@100Hz */ ++ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1720, ++ 1760, 1980, 0, 720, 725, 730, 750, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 720x576@100Hz */ ++ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 54000, 720, 732, ++ 796, 864, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 720x576@100Hz */ ++ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 54000, 720, 732, ++ 796, 864, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1440x576i@100Hz */ ++ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464, ++ 1590, 1728, 0, 576, 580, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1440x576i@100Hz */ ++ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464, ++ 1590, 1728, 0, 576, 580, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1920x1080i@120Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008, ++ 2052, 2200, 0, 1080, 1084, 1094, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1280x720@120Hz */ ++ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 148500, 1280, 1390, ++ 1430, 1650, 0, 720, 725, 730, 750, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 720x480@120Hz */ ++ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 54000, 720, 736, ++ 798, 858, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 720x480@120Hz */ ++ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 54000, 720, 736, ++ 798, 858, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1440x480i@120Hz */ ++ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478, ++ 1602, 1716, 0, 480, 488, 494, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1440x480i@120Hz */ ++ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478, ++ 1602, 1716, 0, 480, 488, 494, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 720x576@200Hz */ ++ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 108000, 720, 732, ++ 796, 864, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 720x576@200Hz */ ++ { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 108000, 720, 732, ++ 796, 864, 0, 576, 581, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1440x576i@200Hz */ ++ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464, ++ 1590, 1728, 0, 576, 580, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1440x576i@200Hz */ ++ { DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464, ++ 1590, 1728, 0, 576, 580, 586, 625, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 720x480@240Hz */ ++ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 108000, 720, 736, ++ 798, 858, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 720x480@240Hz */ ++ { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 108000, 720, 736, ++ 798, 858, 0, 480, 489, 495, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, ++ /* 1440x480i@240 */ ++ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478, ++ 1602, 1716, 0, 480, 488, 494, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1440x480i@240 */ ++ { DRM_MODE("1440x480", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478, ++ 1602, 1716, 0, 480, 488, 494, 525, 0, ++ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | ++ DRM_MODE_FLAG_INTERLACE) }, ++ /* 1280x720@24Hz */ ++ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 59400, 1280, 3040, ++ 3080, 3300, 0, 720, 725, 730, 750, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 1280x720@25Hz */ ++ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3700, ++ 3740, 3960, 0, 720, 725, 730, 750, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 1280x720@30Hz */ ++ { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 74250, 1280, 3040, ++ 3080, 3300, 0, 720, 725, 730, 750, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 1920x1080@120Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2008, ++ 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++ /* 1920x1080@100Hz */ ++ { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 297000, 1920, 2448, ++ 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, ++ DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, ++}; ++static const int drm_num_cea_modes = ++ sizeof (edid_cea_modes) / sizeof (edid_cea_modes[0]); diff --git a/packages/linux/patches/linux-3.1.10-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/linux-3.1.10-203-stb0899_enable_low_symbol_rate.patch new file mode 100644 index 0000000000..353893f011 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-203-stb0899_enable_low_symbol_rate.patch @@ -0,0 +1,12 @@ +diff -Naur linux-3.2.1/drivers/media/dvb/frontends/stb0899_drv.c linux-3.2.1.patch/drivers/media/dvb/frontends/stb0899_drv.c +--- linux-3.2.1/drivers/media/dvb/frontends/stb0899_drv.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/media/dvb/frontends/stb0899_drv.c 2012-01-23 10:47:29.311211860 +0100 +@@ -1614,7 +1614,7 @@ + .frequency_max = 2150000, + .frequency_stepsize = 0, + .frequency_tolerance = 0, +- .symbol_rate_min = 5000000, ++ .symbol_rate_min = 1000000, + .symbol_rate_max = 45000000, + + .caps = FE_CAN_INVERSION_AUTO | diff --git a/packages/linux/patches/linux-3.1.10-204-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/linux-3.1.10-204-add_Formosa_eHome_Infrared_Receiver.patch new file mode 100644 index 0000000000..e2afb63e3d --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-204-add_Formosa_eHome_Infrared_Receiver.patch @@ -0,0 +1,11 @@ +--- linux-3.2.2.orig/drivers/media/rc/mceusb.c 2012-01-30 23:37:12.374473509 +0100 ++++ linux-3.2.2/drivers/media/rc/mceusb.c 2012-01-30 23:40:57.989652931 +0100 +@@ -350,6 +350,8 @@ + { USB_DEVICE(VENDOR_FORMOSA, 0xe015) }, + /* Formosa21 / eHome Infrared Receiver */ + { USB_DEVICE(VENDOR_FORMOSA, 0xe016) }, ++ /* Formosa21 / eHome Infrared Receiver */ ++ { USB_DEVICE(VENDOR_FORMOSA, 0xe042) }, + /* Formosa aim / Trust MCE Infrared Receiver */ + { USB_DEVICE(VENDOR_FORMOSA, 0xe017), + .driver_info = MCE_GEN2_NO_TX }, diff --git a/packages/linux/patches/linux-3.1.10-251-acpi-5.0_support.patch b/packages/linux/patches/linux-3.1.10-251-acpi-5.0_support.patch new file mode 100644 index 0000000000..88ae8c6f89 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-251-acpi-5.0_support.patch @@ -0,0 +1,5444 @@ +diff -Naur linux-3.2.1/drivers/acpi/acpica/acconfig.h linux-3.2.1.patch/drivers/acpi/acpica/acconfig.h +--- linux-3.2.1/drivers/acpi/acpica/acconfig.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/acconfig.h 2012-01-24 15:55:55.200434254 +0100 +@@ -202,9 +202,10 @@ + #define ACPI_RSDP_CHECKSUM_LENGTH 20 + #define ACPI_RSDP_XCHECKSUM_LENGTH 36 + +-/* SMBus and IPMI bidirectional buffer size */ ++/* SMBus, GSBus and IPMI bidirectional buffer size */ + + #define ACPI_SMBUS_BUFFER_SIZE 34 ++#define ACPI_GSBUS_BUFFER_SIZE 34 + #define ACPI_IPMI_BUFFER_SIZE 66 + + /* _sx_d and _sx_w control methods */ +diff -Naur linux-3.2.1/drivers/acpi/acpica/acevents.h linux-3.2.1.patch/drivers/acpi/acpica/acevents.h +--- linux-3.2.1/drivers/acpi/acpica/acevents.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/acevents.h 2012-01-24 15:55:50.978361261 +0100 +@@ -162,6 +162,7 @@ + + acpi_status + acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, ++ union acpi_operand_object *field_obj, + u32 function, + u32 region_offset, u32 bit_width, u64 *value); + +diff -Naur linux-3.2.1/drivers/acpi/acpica/acglobal.h linux-3.2.1.patch/drivers/acpi/acpica/acglobal.h +--- linux-3.2.1/drivers/acpi/acpica/acglobal.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/acglobal.h 2012-01-24 15:55:37.020119945 +0100 +@@ -140,8 +140,19 @@ + acpi_name acpi_gbl_trace_method_name; + u8 acpi_gbl_system_awake_and_running; + ++/* ++ * ACPI 5.0 introduces the concept of a "reduced hardware platform", meaning ++ * that the ACPI hardware is no longer required. A flag in the FADT indicates ++ * a reduced HW machine, and that flag is duplicated here for convenience. ++ */ ++u8 acpi_gbl_reduced_hardware; ++ + #endif + ++/* Do not disassemble buffers to resource descriptors */ ++ ++ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_no_resource_disassembly, FALSE); ++ + /***************************************************************************** + * + * Debug support +@@ -207,7 +218,7 @@ + + /***************************************************************************** + * +- * Mutual exlusion within ACPICA subsystem ++ * Mutual exclusion within ACPICA subsystem + * + ****************************************************************************/ + +diff -Naur linux-3.2.1/drivers/acpi/acpica/acinterp.h linux-3.2.1.patch/drivers/acpi/acpica/acinterp.h +--- linux-3.2.1/drivers/acpi/acpica/acinterp.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/acinterp.h 2012-01-24 15:55:29.923997264 +0100 +@@ -468,6 +468,8 @@ + + void acpi_ex_integer_to_string(char *dest, u64 value); + ++u8 acpi_is_valid_space_id(u8 space_id); ++ + /* + * exregion - default op_region handlers + */ +diff -Naur linux-3.2.1/drivers/acpi/acpica/aclocal.h linux-3.2.1.patch/drivers/acpi/acpica/aclocal.h +--- linux-3.2.1/drivers/acpi/acpica/aclocal.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/aclocal.h 2012-01-24 15:56:12.258729163 +0100 +@@ -53,7 +53,7 @@ + + /* Total number of aml opcodes defined */ + +-#define AML_NUM_OPCODES 0x7F ++#define AML_NUM_OPCODES 0x81 + + /* Forward declarations */ + +@@ -249,12 +249,16 @@ + struct acpi_namespace_node *field_node; + struct acpi_namespace_node *register_node; + struct acpi_namespace_node *data_register_node; ++ struct acpi_namespace_node *connection_node; ++ u8 *resource_buffer; + u32 bank_value; + u32 field_bit_position; + u32 field_bit_length; ++ u16 resource_length; + u8 field_flags; + u8 attribute; + u8 field_type; ++ u8 access_length; + }; + + typedef +@@ -315,7 +319,8 @@ + + /* + * Used for ACPI_PTYPE1_FIXED, ACPI_PTYPE1_VAR, ACPI_PTYPE2, +- * ACPI_PTYPE2_MIN, ACPI_PTYPE2_PKG_COUNT, ACPI_PTYPE2_COUNT ++ * ACPI_PTYPE2_MIN, ACPI_PTYPE2_PKG_COUNT, ACPI_PTYPE2_COUNT, ++ * ACPI_PTYPE2_FIX_VAR + */ + struct acpi_package_info { + u8 type; +@@ -951,7 +956,7 @@ + #define ACPI_RESOURCE_NAME_END_DEPENDENT 0x38 + #define ACPI_RESOURCE_NAME_IO 0x40 + #define ACPI_RESOURCE_NAME_FIXED_IO 0x48 +-#define ACPI_RESOURCE_NAME_RESERVED_S1 0x50 ++#define ACPI_RESOURCE_NAME_FIXED_DMA 0x50 + #define ACPI_RESOURCE_NAME_RESERVED_S2 0x58 + #define ACPI_RESOURCE_NAME_RESERVED_S3 0x60 + #define ACPI_RESOURCE_NAME_RESERVED_S4 0x68 +@@ -973,7 +978,9 @@ + #define ACPI_RESOURCE_NAME_EXTENDED_IRQ 0x89 + #define ACPI_RESOURCE_NAME_ADDRESS64 0x8A + #define ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64 0x8B +-#define ACPI_RESOURCE_NAME_LARGE_MAX 0x8B ++#define ACPI_RESOURCE_NAME_GPIO 0x8C ++#define ACPI_RESOURCE_NAME_SERIAL_BUS 0x8E ++#define ACPI_RESOURCE_NAME_LARGE_MAX 0x8E + + /***************************************************************************** + * +diff -Naur linux-3.2.1/drivers/acpi/acpica/acobject.h linux-3.2.1.patch/drivers/acpi/acpica/acobject.h +--- linux-3.2.1/drivers/acpi/acpica/acobject.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/acobject.h 2012-01-24 15:55:50.980361296 +0100 +@@ -254,6 +254,7 @@ + u32 base_byte_offset; /* Byte offset within containing object */\ + u32 value; /* Value to store into the Bank or Index register */\ + u8 start_field_bit_offset;/* Bit offset within first field datum (0-63) */\ ++ u8 access_length; /* For serial regions/fields */ + + + struct acpi_object_field_common { /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */ +@@ -261,7 +262,9 @@ + }; + + struct acpi_object_region_field { +- ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO union acpi_operand_object *region_obj; /* Containing op_region object */ ++ ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO u16 resource_length; ++ union acpi_operand_object *region_obj; /* Containing op_region object */ ++ u8 *resource_buffer; /* resource_template for serial regions/fields */ + }; + + struct acpi_object_bank_field { +@@ -358,6 +361,7 @@ + */ + struct acpi_object_extra { + ACPI_OBJECT_COMMON_HEADER struct acpi_namespace_node *method_REG; /* _REG method for this region (if any) */ ++ struct acpi_namespace_node *scope_node; + void *region_context; /* Region-specific data */ + u8 *aml_start; + u32 aml_length; +diff -Naur linux-3.2.1/drivers/acpi/acpica/acopcode.h linux-3.2.1.patch/drivers/acpi/acpica/acopcode.h +--- linux-3.2.1/drivers/acpi/acpica/acopcode.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/acopcode.h 2012-01-24 15:55:50.981361313 +0100 +@@ -93,6 +93,7 @@ + #define ARGP_CONCAT_OP ARGP_LIST3 (ARGP_TERMARG, ARGP_TERMARG, ARGP_TARGET) + #define ARGP_CONCAT_RES_OP ARGP_LIST3 (ARGP_TERMARG, ARGP_TERMARG, ARGP_TARGET) + #define ARGP_COND_REF_OF_OP ARGP_LIST2 (ARGP_SUPERNAME, ARGP_SUPERNAME) ++#define ARGP_CONNECTFIELD_OP ARGP_LIST1 (ARGP_NAMESTRING) + #define ARGP_CONTINUE_OP ARG_NONE + #define ARGP_COPY_OP ARGP_LIST2 (ARGP_TERMARG, ARGP_SIMPLENAME) + #define ARGP_CREATE_BIT_FIELD_OP ARGP_LIST3 (ARGP_TERMARG, ARGP_TERMARG, ARGP_NAME) +@@ -164,6 +165,7 @@ + #define ARGP_RETURN_OP ARGP_LIST1 (ARGP_TERMARG) + #define ARGP_REVISION_OP ARG_NONE + #define ARGP_SCOPE_OP ARGP_LIST3 (ARGP_PKGLENGTH, ARGP_NAME, ARGP_TERMLIST) ++#define ARGP_SERIALFIELD_OP ARGP_LIST1 (ARGP_NAMESTRING) + #define ARGP_SHIFT_LEFT_OP ARGP_LIST3 (ARGP_TERMARG, ARGP_TERMARG, ARGP_TARGET) + #define ARGP_SHIFT_RIGHT_OP ARGP_LIST3 (ARGP_TERMARG, ARGP_TERMARG, ARGP_TARGET) + #define ARGP_SIGNAL_OP ARGP_LIST1 (ARGP_SUPERNAME) +@@ -223,6 +225,7 @@ + #define ARGI_CONCAT_OP ARGI_LIST3 (ARGI_COMPUTEDATA,ARGI_COMPUTEDATA, ARGI_TARGETREF) + #define ARGI_CONCAT_RES_OP ARGI_LIST3 (ARGI_BUFFER, ARGI_BUFFER, ARGI_TARGETREF) + #define ARGI_COND_REF_OF_OP ARGI_LIST2 (ARGI_OBJECT_REF, ARGI_TARGETREF) ++#define ARGI_CONNECTFIELD_OP ARGI_INVALID_OPCODE + #define ARGI_CONTINUE_OP ARGI_INVALID_OPCODE + #define ARGI_COPY_OP ARGI_LIST2 (ARGI_ANYTYPE, ARGI_SIMPLE_TARGET) + #define ARGI_CREATE_BIT_FIELD_OP ARGI_LIST3 (ARGI_BUFFER, ARGI_INTEGER, ARGI_REFERENCE) +@@ -294,6 +297,7 @@ + #define ARGI_RETURN_OP ARGI_INVALID_OPCODE + #define ARGI_REVISION_OP ARG_NONE + #define ARGI_SCOPE_OP ARGI_INVALID_OPCODE ++#define ARGI_SERIALFIELD_OP ARGI_INVALID_OPCODE + #define ARGI_SHIFT_LEFT_OP ARGI_LIST3 (ARGI_INTEGER, ARGI_INTEGER, ARGI_TARGETREF) + #define ARGI_SHIFT_RIGHT_OP ARGI_LIST3 (ARGI_INTEGER, ARGI_INTEGER, ARGI_TARGETREF) + #define ARGI_SIGNAL_OP ARGI_LIST1 (ARGI_EVENT) +diff -Naur linux-3.2.1/drivers/acpi/acpica/acpredef.h linux-3.2.1.patch/drivers/acpi/acpica/acpredef.h +--- linux-3.2.1/drivers/acpi/acpica/acpredef.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/acpredef.h 2012-01-24 15:56:12.259729180 +0100 +@@ -94,6 +94,14 @@ + * ACPI_PTYPE2_REV_FIXED: Revision at start, each subpackage is Fixed-length + * (Used for _ART, _FPS) + * ++ * ACPI_PTYPE2_FIX_VAR: Each subpackage consists of some fixed-length elements ++ * followed by an optional element ++ * object type ++ * count ++ * object type ++ * count = 0 (optional) ++ * (Used for _DLM) ++ * + *****************************************************************************/ + + enum acpi_return_package_types { +@@ -105,7 +113,8 @@ + ACPI_PTYPE2_PKG_COUNT = 6, + ACPI_PTYPE2_FIXED = 7, + ACPI_PTYPE2_MIN = 8, +- ACPI_PTYPE2_REV_FIXED = 9 ++ ACPI_PTYPE2_REV_FIXED = 9, ++ ACPI_PTYPE2_FIX_VAR = 10 + }; + + #ifdef ACPI_CREATE_PREDEFINED_TABLE +@@ -154,6 +163,7 @@ + {{"_AC8", 0, ACPI_RTYPE_INTEGER}}, + {{"_AC9", 0, ACPI_RTYPE_INTEGER}}, + {{"_ADR", 0, ACPI_RTYPE_INTEGER}}, ++ {{"_AEI", 0, ACPI_RTYPE_BUFFER}}, + {{"_AL0", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ + {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}}, + +@@ -229,6 +239,13 @@ + {{"_CID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints/Strs) */ + {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING, 0,0}, 0,0}}, + ++ {{"_CLS", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (3 Int) */ ++ {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}}, ++ ++ {{"_CPC", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints/Bufs) */ ++ {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0, 0}, 0, ++ 0}}, ++ + {{"_CRS", 0, ACPI_RTYPE_BUFFER}}, + {{"_CRT", 0, ACPI_RTYPE_INTEGER}}, + {{"_CSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n-1 Int) */ +@@ -237,12 +254,21 @@ + {{"_CST", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n Pkg (1 Buf/3 Int) */ + {{{ACPI_PTYPE2_PKG_COUNT,ACPI_RTYPE_BUFFER, 1, ACPI_RTYPE_INTEGER}, 3,0}}, + ++ {{"_CWS", 1, ACPI_RTYPE_INTEGER}}, + {{"_DCK", 1, ACPI_RTYPE_INTEGER}}, + {{"_DCS", 0, ACPI_RTYPE_INTEGER}}, + {{"_DDC", 1, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER}}, + {{"_DDN", 0, ACPI_RTYPE_STRING}}, ++ {{"_DEP", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ ++ {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}}, ++ + {{"_DGS", 0, ACPI_RTYPE_INTEGER}}, + {{"_DIS", 0, 0}}, ++ ++ {{"_DLM", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (1 Ref, 0/1 Optional Buf/Ref) */ ++ {{{ACPI_PTYPE2_FIX_VAR, ACPI_RTYPE_REFERENCE, 1, ++ ACPI_RTYPE_REFERENCE | ACPI_RTYPE_BUFFER}, 0, 0}}, ++ + {{"_DMA", 0, ACPI_RTYPE_BUFFER}}, + {{"_DOD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */ + {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}}, +@@ -262,6 +288,7 @@ + {{"_EJ3", 1, 0}}, + {{"_EJ4", 1, 0}}, + {{"_EJD", 0, ACPI_RTYPE_STRING}}, ++ {{"_EVT", 1, 0}}, + {{"_FDE", 0, ACPI_RTYPE_BUFFER}}, + {{"_FDI", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (16 Int) */ + {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16,0}, 0,0}}, +@@ -281,14 +308,17 @@ + {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}}, + + {{"_GAI", 0, ACPI_RTYPE_INTEGER}}, ++ {{"_GCP", 0, ACPI_RTYPE_INTEGER}}, + {{"_GHL", 0, ACPI_RTYPE_INTEGER}}, + {{"_GLK", 0, ACPI_RTYPE_INTEGER}}, + {{"_GPD", 0, ACPI_RTYPE_INTEGER}}, + {{"_GPE", 0, ACPI_RTYPE_INTEGER}}, /* _GPE method, not _GPE scope */ ++ {{"_GRT", 0, ACPI_RTYPE_BUFFER}}, + {{"_GSB", 0, ACPI_RTYPE_INTEGER}}, + {{"_GTF", 0, ACPI_RTYPE_BUFFER}}, + {{"_GTM", 0, ACPI_RTYPE_BUFFER}}, + {{"_GTS", 1, 0}}, ++ {{"_GWS", 1, ACPI_RTYPE_INTEGER}}, + {{"_HID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}}, + {{"_HOT", 0, ACPI_RTYPE_INTEGER}}, + {{"_HPP", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */ +@@ -303,6 +333,7 @@ + {{"_HPX", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (var Ints) */ + {{{ACPI_PTYPE2_MIN, ACPI_RTYPE_INTEGER, 5,0}, 0,0}}, + ++ {{"_HRV", 0, ACPI_RTYPE_INTEGER}}, + {{"_IFT", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */ + {{"_INI", 0, 0}}, + {{"_IRC", 0, 0}}, +@@ -361,6 +392,9 @@ + {{"_PR3", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ + {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}}, + ++ {{"_PRE", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ ++ {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}}, ++ + {{"_PRL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ + {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}}, + +@@ -391,6 +425,7 @@ + {{"_PSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (5 Int) with count */ + {{{ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER,0,0}, 0,0}}, + ++ {{"_PSE", 1, 0}}, + {{"_PSL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ + {{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}}, + +@@ -457,6 +492,7 @@ + {{"_SLI", 0, ACPI_RTYPE_BUFFER}}, + {{"_SPD", 1, ACPI_RTYPE_INTEGER}}, + {{"_SRS", 1, 0}}, ++ {{"_SRT", 1, ACPI_RTYPE_INTEGER}}, + {{"_SRV", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */ + {{"_SST", 1, 0}}, + {{"_STA", 0, ACPI_RTYPE_INTEGER}}, +@@ -464,6 +500,7 @@ + {{"_STP", 2, ACPI_RTYPE_INTEGER}}, + {{"_STR", 0, ACPI_RTYPE_BUFFER}}, + {{"_STV", 2, ACPI_RTYPE_INTEGER}}, ++ {{"_SUB", 0, ACPI_RTYPE_STRING}}, + {{"_SUN", 0, ACPI_RTYPE_INTEGER}}, + {{"_SWS", 0, ACPI_RTYPE_INTEGER}}, + {{"_TC1", 0, ACPI_RTYPE_INTEGER}}, +diff -Naur linux-3.2.1/drivers/acpi/acpica/acresrc.h linux-3.2.1.patch/drivers/acpi/acpica/acresrc.h +--- linux-3.2.1/drivers/acpi/acpica/acresrc.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/acresrc.h 2012-01-24 15:56:05.878618861 +0100 +@@ -73,28 +73,40 @@ + + /* Resource conversion opcodes */ + +-#define ACPI_RSC_INITGET 0 +-#define ACPI_RSC_INITSET 1 +-#define ACPI_RSC_FLAGINIT 2 +-#define ACPI_RSC_1BITFLAG 3 +-#define ACPI_RSC_2BITFLAG 4 +-#define ACPI_RSC_COUNT 5 +-#define ACPI_RSC_COUNT16 6 +-#define ACPI_RSC_LENGTH 7 +-#define ACPI_RSC_MOVE8 8 +-#define ACPI_RSC_MOVE16 9 +-#define ACPI_RSC_MOVE32 10 +-#define ACPI_RSC_MOVE64 11 +-#define ACPI_RSC_SET8 12 +-#define ACPI_RSC_DATA8 13 +-#define ACPI_RSC_ADDRESS 14 +-#define ACPI_RSC_SOURCE 15 +-#define ACPI_RSC_SOURCEX 16 +-#define ACPI_RSC_BITMASK 17 +-#define ACPI_RSC_BITMASK16 18 +-#define ACPI_RSC_EXIT_NE 19 +-#define ACPI_RSC_EXIT_LE 20 +-#define ACPI_RSC_EXIT_EQ 21 ++typedef enum { ++ ACPI_RSC_INITGET = 0, ++ ACPI_RSC_INITSET, ++ ACPI_RSC_FLAGINIT, ++ ACPI_RSC_1BITFLAG, ++ ACPI_RSC_2BITFLAG, ++ ACPI_RSC_3BITFLAG, ++ ACPI_RSC_ADDRESS, ++ ACPI_RSC_BITMASK, ++ ACPI_RSC_BITMASK16, ++ ACPI_RSC_COUNT, ++ ACPI_RSC_COUNT16, ++ ACPI_RSC_COUNT_GPIO_PIN, ++ ACPI_RSC_COUNT_GPIO_RES, ++ ACPI_RSC_COUNT_GPIO_VEN, ++ ACPI_RSC_COUNT_SERIAL_RES, ++ ACPI_RSC_COUNT_SERIAL_VEN, ++ ACPI_RSC_DATA8, ++ ACPI_RSC_EXIT_EQ, ++ ACPI_RSC_EXIT_LE, ++ ACPI_RSC_EXIT_NE, ++ ACPI_RSC_LENGTH, ++ ACPI_RSC_MOVE_GPIO_PIN, ++ ACPI_RSC_MOVE_GPIO_RES, ++ ACPI_RSC_MOVE_SERIAL_RES, ++ ACPI_RSC_MOVE_SERIAL_VEN, ++ ACPI_RSC_MOVE8, ++ ACPI_RSC_MOVE16, ++ ACPI_RSC_MOVE32, ++ ACPI_RSC_MOVE64, ++ ACPI_RSC_SET8, ++ ACPI_RSC_SOURCE, ++ ACPI_RSC_SOURCEX ++} ACPI_RSCONVERT_OPCODES; + + /* Resource Conversion sub-opcodes */ + +@@ -106,6 +118,9 @@ + #define ACPI_RS_OFFSET(f) (u8) ACPI_OFFSET (struct acpi_resource,f) + #define AML_OFFSET(f) (u8) ACPI_OFFSET (union aml_resource,f) + ++/* ++ * Individual entry for the resource dump tables ++ */ + typedef const struct acpi_rsdump_info { + u8 opcode; + u8 offset; +@@ -116,20 +131,25 @@ + + /* Values for the Opcode field above */ + +-#define ACPI_RSD_TITLE 0 +-#define ACPI_RSD_LITERAL 1 +-#define ACPI_RSD_STRING 2 +-#define ACPI_RSD_UINT8 3 +-#define ACPI_RSD_UINT16 4 +-#define ACPI_RSD_UINT32 5 +-#define ACPI_RSD_UINT64 6 +-#define ACPI_RSD_1BITFLAG 7 +-#define ACPI_RSD_2BITFLAG 8 +-#define ACPI_RSD_SHORTLIST 9 +-#define ACPI_RSD_LONGLIST 10 +-#define ACPI_RSD_DWORDLIST 11 +-#define ACPI_RSD_ADDRESS 12 +-#define ACPI_RSD_SOURCE 13 ++typedef enum { ++ ACPI_RSD_TITLE = 0, ++ ACPI_RSD_1BITFLAG, ++ ACPI_RSD_2BITFLAG, ++ ACPI_RSD_3BITFLAG, ++ ACPI_RSD_ADDRESS, ++ ACPI_RSD_DWORDLIST, ++ ACPI_RSD_LITERAL, ++ ACPI_RSD_LONGLIST, ++ ACPI_RSD_SHORTLIST, ++ ACPI_RSD_SHORTLISTX, ++ ACPI_RSD_SOURCE, ++ ACPI_RSD_STRING, ++ ACPI_RSD_UINT8, ++ ACPI_RSD_UINT16, ++ ACPI_RSD_UINT32, ++ ACPI_RSD_UINT64, ++ ACPI_RSD_WORDLIST ++} ACPI_RSDUMP_OPCODES; + + /* restore default alignment */ + +@@ -138,13 +158,18 @@ + /* Resource tables indexed by internal resource type */ + + extern const u8 acpi_gbl_aml_resource_sizes[]; ++extern const u8 acpi_gbl_aml_resource_serial_bus_sizes[]; + extern struct acpi_rsconvert_info *acpi_gbl_set_resource_dispatch[]; + + /* Resource tables indexed by raw AML resource descriptor type */ + + extern const u8 acpi_gbl_resource_struct_sizes[]; ++extern const u8 acpi_gbl_resource_struct_serial_bus_sizes[]; + extern struct acpi_rsconvert_info *acpi_gbl_get_resource_dispatch[]; + ++extern struct acpi_rsconvert_info ++ *acpi_gbl_convert_resource_serial_bus_dispatch[]; ++ + struct acpi_vendor_walk_info { + struct acpi_vendor_uuid *uuid; + struct acpi_buffer *buffer; +@@ -190,6 +215,10 @@ + acpi_rs_set_srs_method_data(struct acpi_namespace_node *node, + struct acpi_buffer *ret_buffer); + ++acpi_status ++acpi_rs_get_aei_method_data(struct acpi_namespace_node *node, ++ struct acpi_buffer *ret_buffer); ++ + /* + * rscalc + */ +@@ -293,6 +322,11 @@ + extern struct acpi_rsconvert_info acpi_rs_convert_ext_irq[]; + extern struct acpi_rsconvert_info acpi_rs_convert_address64[]; + extern struct acpi_rsconvert_info acpi_rs_convert_ext_address64[]; ++extern struct acpi_rsconvert_info acpi_rs_convert_gpio[]; ++extern struct acpi_rsconvert_info acpi_rs_convert_fixed_dma[]; ++extern struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[]; ++extern struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[]; ++extern struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[]; + + /* These resources require separate get/set tables */ + +@@ -310,6 +344,7 @@ + * rsinfo + */ + extern struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[]; ++extern struct acpi_rsdump_info *acpi_gbl_dump_serial_bus_dispatch[]; + + /* + * rsdump +@@ -331,6 +366,12 @@ + extern struct acpi_rsdump_info acpi_rs_dump_ext_address64[]; + extern struct acpi_rsdump_info acpi_rs_dump_ext_irq[]; + extern struct acpi_rsdump_info acpi_rs_dump_generic_reg[]; ++extern struct acpi_rsdump_info acpi_rs_dump_gpio[]; ++extern struct acpi_rsdump_info acpi_rs_dump_fixed_dma[]; ++extern struct acpi_rsdump_info acpi_rs_dump_common_serial_bus[]; ++extern struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[]; ++extern struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[]; ++extern struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[]; + #endif + + #endif /* __ACRESRC_H__ */ +diff -Naur linux-3.2.1/drivers/acpi/acpica/acutils.h linux-3.2.1.patch/drivers/acpi/acpica/acutils.h +--- linux-3.2.1/drivers/acpi/acpica/acutils.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/acutils.h 2012-01-24 15:56:00.173520230 +0100 +@@ -45,6 +45,7 @@ + #define _ACUTILS_H + + extern const u8 acpi_gbl_resource_aml_sizes[]; ++extern const u8 acpi_gbl_resource_aml_serial_bus_sizes[]; + + /* Strings used by the disassembler and debugger resource dump routines */ + +diff -Naur linux-3.2.1/drivers/acpi/acpica/amlcode.h linux-3.2.1.patch/drivers/acpi/acpica/amlcode.h +--- linux-3.2.1/drivers/acpi/acpica/amlcode.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/amlcode.h 2012-01-24 15:55:55.201434271 +0100 +@@ -189,6 +189,14 @@ + #define AML_LNOTEQUAL_OP (u16) 0x9293 + + /* ++ * Opcodes for "Field" operators ++ */ ++#define AML_FIELD_OFFSET_OP (u8) 0x00 ++#define AML_FIELD_ACCESS_OP (u8) 0x01 ++#define AML_FIELD_CONNECTION_OP (u8) 0x02 /* ACPI 5.0 */ ++#define AML_FIELD_EXT_ACCESS_OP (u8) 0x03 /* ACPI 5.0 */ ++ ++/* + * Internal opcodes + * Use only "Unknown" AML opcodes, don't attempt to use + * any valid ACPI ASCII values (A-Z, 0-9, '-') +@@ -202,6 +210,8 @@ + #define AML_INT_METHODCALL_OP (u16) 0x0035 + #define AML_INT_RETURN_VALUE_OP (u16) 0x0036 + #define AML_INT_EVAL_SUBTREE_OP (u16) 0x0037 ++#define AML_INT_CONNECTION_OP (u16) 0x0038 ++#define AML_INT_EXTACCESSFIELD_OP (u16) 0x0039 + + #define ARG_NONE 0x0 + +@@ -456,13 +466,16 @@ + * access_as keyword + */ + typedef enum { +- AML_FIELD_ATTRIB_SMB_QUICK = 0x02, +- AML_FIELD_ATTRIB_SMB_SEND_RCV = 0x04, +- AML_FIELD_ATTRIB_SMB_BYTE = 0x06, +- AML_FIELD_ATTRIB_SMB_WORD = 0x08, +- AML_FIELD_ATTRIB_SMB_BLOCK = 0x0A, +- AML_FIELD_ATTRIB_SMB_WORD_CALL = 0x0C, +- AML_FIELD_ATTRIB_SMB_BLOCK_CALL = 0x0D ++ AML_FIELD_ATTRIB_QUICK = 0x02, ++ AML_FIELD_ATTRIB_SEND_RCV = 0x04, ++ AML_FIELD_ATTRIB_BYTE = 0x06, ++ AML_FIELD_ATTRIB_WORD = 0x08, ++ AML_FIELD_ATTRIB_BLOCK = 0x0A, ++ AML_FIELD_ATTRIB_MULTIBYTE = 0x0B, ++ AML_FIELD_ATTRIB_WORD_CALL = 0x0C, ++ AML_FIELD_ATTRIB_BLOCK_CALL = 0x0D, ++ AML_FIELD_ATTRIB_RAW_BYTES = 0x0E, ++ AML_FIELD_ATTRIB_RAW_PROCESS = 0x0F + } AML_ACCESS_ATTRIBUTE; + + /* Bit fields in the AML method_flags byte */ +diff -Naur linux-3.2.1/drivers/acpi/acpica/amlresrc.h linux-3.2.1.patch/drivers/acpi/acpica/amlresrc.h +--- linux-3.2.1/drivers/acpi/acpica/amlresrc.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/amlresrc.h 2012-01-24 15:56:00.175520264 +0100 +@@ -58,29 +58,48 @@ + #define ACPI_RESTAG_TYPESPECIFICATTRIBUTES "_ATT" + #define ACPI_RESTAG_BASEADDRESS "_BAS" + #define ACPI_RESTAG_BUSMASTER "_BM_" /* Master(1), Slave(0) */ ++#define ACPI_RESTAG_DEBOUNCETIME "_DBT" + #define ACPI_RESTAG_DECODE "_DEC" ++#define ACPI_RESTAG_DEVICEPOLARITY "_DPL" + #define ACPI_RESTAG_DMA "_DMA" + #define ACPI_RESTAG_DMATYPE "_TYP" /* Compatible(0), A(1), B(2), F(3) */ ++#define ACPI_RESTAG_DRIVESTRENGTH "_DRS" ++#define ACPI_RESTAG_ENDIANNESS "_END" ++#define ACPI_RESTAG_FLOWCONTROL "_FLC" + #define ACPI_RESTAG_GRANULARITY "_GRA" + #define ACPI_RESTAG_INTERRUPT "_INT" + #define ACPI_RESTAG_INTERRUPTLEVEL "_LL_" /* active_lo(1), active_hi(0) */ + #define ACPI_RESTAG_INTERRUPTSHARE "_SHR" /* Shareable(1), no_share(0) */ + #define ACPI_RESTAG_INTERRUPTTYPE "_HE_" /* Edge(1), Level(0) */ ++#define ACPI_RESTAG_IORESTRICTION "_IOR" + #define ACPI_RESTAG_LENGTH "_LEN" ++#define ACPI_RESTAG_LINE "_LIN" + #define ACPI_RESTAG_MEMATTRIBUTES "_MTP" /* Memory(0), Reserved(1), ACPI(2), NVS(3) */ + #define ACPI_RESTAG_MEMTYPE "_MEM" /* non_cache(0), Cacheable(1) Cache+combine(2), Cache+prefetch(3) */ + #define ACPI_RESTAG_MAXADDR "_MAX" + #define ACPI_RESTAG_MINADDR "_MIN" + #define ACPI_RESTAG_MAXTYPE "_MAF" + #define ACPI_RESTAG_MINTYPE "_MIF" ++#define ACPI_RESTAG_MODE "_MOD" ++#define ACPI_RESTAG_PARITY "_PAR" ++#define ACPI_RESTAG_PHASE "_PHA" ++#define ACPI_RESTAG_PIN "_PIN" ++#define ACPI_RESTAG_PINCONFIG "_PPI" ++#define ACPI_RESTAG_POLARITY "_POL" + #define ACPI_RESTAG_REGISTERBITOFFSET "_RBO" + #define ACPI_RESTAG_REGISTERBITWIDTH "_RBW" + #define ACPI_RESTAG_RANGETYPE "_RNG" + #define ACPI_RESTAG_READWRITETYPE "_RW_" /* read_only(0), Writeable (1) */ ++#define ACPI_RESTAG_LENGTH_RX "_RXL" ++#define ACPI_RESTAG_LENGTH_TX "_TXL" ++#define ACPI_RESTAG_SLAVEMODE "_SLV" ++#define ACPI_RESTAG_SPEED "_SPE" ++#define ACPI_RESTAG_STOPBITS "_STB" + #define ACPI_RESTAG_TRANSLATION "_TRA" + #define ACPI_RESTAG_TRANSTYPE "_TRS" /* Sparse(1), Dense(0) */ + #define ACPI_RESTAG_TYPE "_TTP" /* Translation(1), Static (0) */ + #define ACPI_RESTAG_XFERTYPE "_SIZ" /* 8(0), 8_and16(1), 16(2) */ ++#define ACPI_RESTAG_VENDORDATA "_VEN" + + /* Default sizes for "small" resource descriptors */ + +@@ -90,6 +109,7 @@ + #define ASL_RDESC_END_DEPEND_SIZE 0x00 + #define ASL_RDESC_IO_SIZE 0x07 + #define ASL_RDESC_FIXED_IO_SIZE 0x03 ++#define ASL_RDESC_FIXED_DMA_SIZE 0x05 + #define ASL_RDESC_END_TAG_SIZE 0x01 + + struct asl_resource_node { +@@ -164,6 +184,12 @@ + AML_RESOURCE_SMALL_HEADER_COMMON u8 checksum; + }; + ++struct aml_resource_fixed_dma { ++ AML_RESOURCE_SMALL_HEADER_COMMON u16 request_lines; ++ u16 channels; ++ u8 width; ++}; ++ + /* + * LARGE descriptors + */ +@@ -263,6 +289,110 @@ + u64 address; + }; + ++/* Common descriptor for gpio_int and gpio_io (ACPI 5.0) */ ++ ++struct aml_resource_gpio { ++ AML_RESOURCE_LARGE_HEADER_COMMON u8 revision_id; ++ u8 connection_type; ++ u16 flags; ++ u16 int_flags; ++ u8 pin_config; ++ u16 drive_strength; ++ u16 debounce_timeout; ++ u16 pin_table_offset; ++ u8 res_source_index; ++ u16 res_source_offset; ++ u16 vendor_offset; ++ u16 vendor_length; ++ /* ++ * Optional fields follow immediately: ++ * 1) PIN list (Words) ++ * 2) Resource Source String ++ * 3) Vendor Data bytes ++ */ ++}; ++ ++#define AML_RESOURCE_GPIO_REVISION 1 /* ACPI 5.0 */ ++ ++/* Values for connection_type above */ ++ ++#define AML_RESOURCE_GPIO_TYPE_INT 0 ++#define AML_RESOURCE_GPIO_TYPE_IO 1 ++#define AML_RESOURCE_MAX_GPIOTYPE 1 ++ ++/* Common preamble for all serial descriptors (ACPI 5.0) */ ++ ++#define AML_RESOURCE_SERIAL_COMMON \ ++ u8 revision_id; \ ++ u8 res_source_index; \ ++ u8 type; \ ++ u8 flags; \ ++ u16 type_specific_flags; \ ++ u8 type_revision_id; \ ++ u16 type_data_length; \ ++ ++/* Values for the type field above */ ++ ++#define AML_RESOURCE_I2C_SERIALBUSTYPE 1 ++#define AML_RESOURCE_SPI_SERIALBUSTYPE 2 ++#define AML_RESOURCE_UART_SERIALBUSTYPE 3 ++#define AML_RESOURCE_MAX_SERIALBUSTYPE 3 ++#define AML_RESOURCE_VENDOR_SERIALBUSTYPE 192 /* Vendor defined is 0xC0-0xFF (NOT SUPPORTED) */ ++ ++struct aml_resource_common_serialbus { ++AML_RESOURCE_LARGE_HEADER_COMMON AML_RESOURCE_SERIAL_COMMON}; ++ ++struct aml_resource_i2c_serialbus { ++ AML_RESOURCE_LARGE_HEADER_COMMON ++ AML_RESOURCE_SERIAL_COMMON u32 connection_speed; ++ u16 slave_address; ++ /* ++ * Optional fields follow immediately: ++ * 1) Vendor Data bytes ++ * 2) Resource Source String ++ */ ++}; ++ ++#define AML_RESOURCE_I2C_REVISION 1 /* ACPI 5.0 */ ++#define AML_RESOURCE_I2C_TYPE_REVISION 1 /* ACPI 5.0 */ ++#define AML_RESOURCE_I2C_MIN_DATA_LEN 6 ++ ++struct aml_resource_spi_serialbus { ++ AML_RESOURCE_LARGE_HEADER_COMMON ++ AML_RESOURCE_SERIAL_COMMON u32 connection_speed; ++ u8 data_bit_length; ++ u8 clock_phase; ++ u8 clock_polarity; ++ u16 device_selection; ++ /* ++ * Optional fields follow immediately: ++ * 1) Vendor Data bytes ++ * 2) Resource Source String ++ */ ++}; ++ ++#define AML_RESOURCE_SPI_REVISION 1 /* ACPI 5.0 */ ++#define AML_RESOURCE_SPI_TYPE_REVISION 1 /* ACPI 5.0 */ ++#define AML_RESOURCE_SPI_MIN_DATA_LEN 9 ++ ++struct aml_resource_uart_serialbus { ++ AML_RESOURCE_LARGE_HEADER_COMMON ++ AML_RESOURCE_SERIAL_COMMON u32 default_baud_rate; ++ u16 rx_fifo_size; ++ u16 tx_fifo_size; ++ u8 parity; ++ u8 lines_enabled; ++ /* ++ * Optional fields follow immediately: ++ * 1) Vendor Data bytes ++ * 2) Resource Source String ++ */ ++}; ++ ++#define AML_RESOURCE_UART_REVISION 1 /* ACPI 5.0 */ ++#define AML_RESOURCE_UART_TYPE_REVISION 1 /* ACPI 5.0 */ ++#define AML_RESOURCE_UART_MIN_DATA_LEN 10 ++ + /* restore default alignment */ + + #pragma pack() +@@ -284,6 +414,7 @@ + struct aml_resource_end_dependent end_dpf; + struct aml_resource_io io; + struct aml_resource_fixed_io fixed_io; ++ struct aml_resource_fixed_dma fixed_dma; + struct aml_resource_vendor_small vendor_small; + struct aml_resource_end_tag end_tag; + +@@ -299,6 +430,11 @@ + struct aml_resource_address64 address64; + struct aml_resource_extended_address64 ext_address64; + struct aml_resource_extended_irq extended_irq; ++ struct aml_resource_gpio gpio; ++ struct aml_resource_i2c_serialbus i2c_serial_bus; ++ struct aml_resource_spi_serialbus spi_serial_bus; ++ struct aml_resource_uart_serialbus uart_serial_bus; ++ struct aml_resource_common_serialbus common_serial_bus; + + /* Utility overlays */ + +diff -Naur linux-3.2.1/drivers/acpi/acpica/dsargs.c linux-3.2.1.patch/drivers/acpi/acpica/dsargs.c +--- linux-3.2.1/drivers/acpi/acpica/dsargs.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/dsargs.c 2012-01-24 15:55:14.624732766 +0100 +@@ -384,7 +384,7 @@ + + /* Execute the argument AML */ + +- status = acpi_ds_execute_arguments(node, node->parent, ++ status = acpi_ds_execute_arguments(node, extra_desc->extra.scope_node, + extra_desc->extra.aml_length, + extra_desc->extra.aml_start); + return_ACPI_STATUS(status); +diff -Naur linux-3.2.1/drivers/acpi/acpica/dsfield.c linux-3.2.1.patch/drivers/acpi/acpica/dsfield.c +--- linux-3.2.1/drivers/acpi/acpica/dsfield.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/dsfield.c 2012-01-24 15:55:50.983361347 +0100 +@@ -221,6 +221,7 @@ + { + acpi_status status; + u64 position; ++ union acpi_parse_object *child; + + ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info); + +@@ -232,10 +233,11 @@ + + while (arg) { + /* +- * Three types of field elements are handled: +- * 1) Offset - specifies a bit offset +- * 2) access_as - changes the access mode +- * 3) Name - Enters a new named field into the namespace ++ * Four types of field elements are handled: ++ * 1) Name - Enters a new named field into the namespace ++ * 2) Offset - specifies a bit offset ++ * 3) access_as - changes the access mode/attributes ++ * 4) Connection - Associate a resource template with the field + */ + switch (arg->common.aml_opcode) { + case AML_INT_RESERVEDFIELD_OP: +@@ -253,21 +255,70 @@ + break; + + case AML_INT_ACCESSFIELD_OP: +- ++ case AML_INT_EXTACCESSFIELD_OP: + /* +- * Get a new access_type and access_attribute -- to be used for all +- * field units that follow, until field end or another access_as +- * keyword. ++ * Get new access_type, access_attribute, and access_length fields ++ * -- to be used for all field units that follow, until the ++ * end-of-field or another access_as keyword is encountered. ++ * NOTE. These three bytes are encoded in the integer value ++ * of the parseop for convenience. + * + * In field_flags, preserve the flag bits other than the +- * ACCESS_TYPE bits ++ * ACCESS_TYPE bits. + */ ++ ++ /* access_type (byte_acc, word_acc, etc.) */ ++ + info->field_flags = (u8) + ((info-> + field_flags & ~(AML_FIELD_ACCESS_TYPE_MASK)) | +- ((u8) ((u32) arg->common.value.integer >> 8))); ++ ((u8)((u32)(arg->common.value.integer & 0x07)))); ++ ++ /* access_attribute (attrib_quick, attrib_byte, etc.) */ ++ ++ info->attribute = ++ (u8)((arg->common.value.integer >> 8) & 0xFF); ++ ++ /* access_length (for serial/buffer protocols) */ + +- info->attribute = (u8) (arg->common.value.integer); ++ info->access_length = ++ (u8)((arg->common.value.integer >> 16) & 0xFF); ++ break; ++ ++ case AML_INT_CONNECTION_OP: ++ /* ++ * Clear any previous connection. New connection is used for all ++ * fields that follow, similar to access_as ++ */ ++ info->resource_buffer = NULL; ++ info->connection_node = NULL; ++ ++ /* ++ * A Connection() is either an actual resource descriptor (buffer) ++ * or a named reference to a resource template ++ */ ++ child = arg->common.value.arg; ++ if (child->common.aml_opcode == AML_INT_BYTELIST_OP) { ++ info->resource_buffer = child->named.data; ++ info->resource_length = ++ (u16)child->named.value.integer; ++ } else { ++ /* Lookup the Connection() namepath, it should already exist */ ++ ++ status = acpi_ns_lookup(walk_state->scope_info, ++ child->common.value. ++ name, ACPI_TYPE_ANY, ++ ACPI_IMODE_EXECUTE, ++ ACPI_NS_DONT_OPEN_SCOPE, ++ walk_state, ++ &info->connection_node); ++ if (ACPI_FAILURE(status)) { ++ ACPI_ERROR_NAMESPACE(child->common. ++ value.name, ++ status); ++ return_ACPI_STATUS(status); ++ } ++ } + break; + + case AML_INT_NAMEDFIELD_OP: +@@ -374,6 +425,8 @@ + } + } + ++ ACPI_MEMSET(&info, 0, sizeof(struct acpi_create_field_info)); ++ + /* Second arg is the field flags */ + + arg = arg->common.next; +@@ -386,7 +439,6 @@ + info.region_node = region_node; + + status = acpi_ds_get_field_names(&info, walk_state, arg->common.next); +- + return_ACPI_STATUS(status); + } + +@@ -474,8 +526,8 @@ + */ + while (arg) { + /* +- * Ignore OFFSET and ACCESSAS terms here; we are only interested in the +- * field names in order to enter them into the namespace. ++ * Ignore OFFSET/ACCESSAS/CONNECTION terms here; we are only interested ++ * in the field names in order to enter them into the namespace. + */ + if (arg->common.aml_opcode == AML_INT_NAMEDFIELD_OP) { + status = acpi_ns_lookup(walk_state->scope_info, +@@ -651,6 +703,5 @@ + info.region_node = region_node; + + status = acpi_ds_get_field_names(&info, walk_state, arg->common.next); +- + return_ACPI_STATUS(status); + } +diff -Naur linux-3.2.1/drivers/acpi/acpica/evevent.c linux-3.2.1.patch/drivers/acpi/acpica/evevent.c +--- linux-3.2.1/drivers/acpi/acpica/evevent.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/evevent.c 2012-01-24 15:55:37.021119963 +0100 +@@ -71,6 +71,12 @@ + + ACPI_FUNCTION_TRACE(ev_initialize_events); + ++ /* If Hardware Reduced flag is set, there are no fixed events */ ++ ++ if (acpi_gbl_reduced_hardware) { ++ return_ACPI_STATUS(AE_OK); ++ } ++ + /* + * Initialize the Fixed and General Purpose Events. This is done prior to + * enabling SCIs to prevent interrupts from occurring before the handlers +@@ -111,6 +117,12 @@ + + ACPI_FUNCTION_TRACE(ev_install_xrupt_handlers); + ++ /* If Hardware Reduced flag is set, there is no ACPI h/w */ ++ ++ if (acpi_gbl_reduced_hardware) { ++ return_ACPI_STATUS(AE_OK); ++ } ++ + /* Install the SCI handler */ + + status = acpi_ev_install_sci_handler(); +diff -Naur linux-3.2.1/drivers/acpi/acpica/evglock.c linux-3.2.1.patch/drivers/acpi/acpica/evglock.c +--- linux-3.2.1/drivers/acpi/acpica/evglock.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/evglock.c 2012-01-24 15:55:37.022119980 +0100 +@@ -70,6 +70,12 @@ + + ACPI_FUNCTION_TRACE(ev_init_global_lock_handler); + ++ /* If Hardware Reduced flag is set, there is no global lock */ ++ ++ if (acpi_gbl_reduced_hardware) { ++ return_ACPI_STATUS(AE_OK); ++ } ++ + /* Attempt installation of the global lock handler */ + + status = acpi_install_fixed_event_handler(ACPI_EVENT_GLOBAL, +diff -Naur linux-3.2.1/drivers/acpi/acpica/evregion.c linux-3.2.1.patch/drivers/acpi/acpica/evregion.c +--- linux-3.2.1/drivers/acpi/acpica/evregion.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/evregion.c 2012-01-24 15:55:50.984361364 +0100 +@@ -329,6 +329,7 @@ + * FUNCTION: acpi_ev_address_space_dispatch + * + * PARAMETERS: region_obj - Internal region object ++ * field_obj - Corresponding field. Can be NULL. + * Function - Read or Write operation + * region_offset - Where in the region to read or write + * bit_width - Field width in bits (8, 16, 32, or 64) +@@ -344,6 +345,7 @@ + + acpi_status + acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj, ++ union acpi_operand_object *field_obj, + u32 function, + u32 region_offset, u32 bit_width, u64 *value) + { +@@ -353,6 +355,7 @@ + union acpi_operand_object *handler_desc; + union acpi_operand_object *region_obj2; + void *region_context = NULL; ++ struct acpi_connection_info *context; + + ACPI_FUNCTION_TRACE(ev_address_space_dispatch); + +@@ -375,6 +378,8 @@ + return_ACPI_STATUS(AE_NOT_EXIST); + } + ++ context = handler_desc->address_space.context; ++ + /* + * It may be the case that the region has never been initialized. + * Some types of regions require special init code +@@ -404,8 +409,7 @@ + acpi_ex_exit_interpreter(); + + status = region_setup(region_obj, ACPI_REGION_ACTIVATE, +- handler_desc->address_space.context, +- ®ion_context); ++ context, ®ion_context); + + /* Re-enter the interpreter */ + +@@ -455,6 +459,25 @@ + acpi_ut_get_region_name(region_obj->region. + space_id))); + ++ /* ++ * Special handling for generic_serial_bus and general_purpose_io: ++ * There are three extra parameters that must be passed to the ++ * handler via the context: ++ * 1) Connection buffer, a resource template from Connection() op. ++ * 2) Length of the above buffer. ++ * 3) Actual access length from the access_as() op. ++ */ ++ if (((region_obj->region.space_id == ACPI_ADR_SPACE_GSBUS) || ++ (region_obj->region.space_id == ACPI_ADR_SPACE_GPIO)) && ++ context && field_obj) { ++ ++ /* Get the Connection (resource_template) buffer */ ++ ++ context->connection = field_obj->field.resource_buffer; ++ context->length = field_obj->field.resource_length; ++ context->access_length = field_obj->field.access_length; ++ } ++ + if (!(handler_desc->address_space.handler_flags & + ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) { + /* +@@ -469,7 +492,7 @@ + + status = handler(function, + (region_obj->region.address + region_offset), +- bit_width, value, handler_desc->address_space.context, ++ bit_width, value, context, + region_obj2->extra.region_context); + + if (ACPI_FAILURE(status)) { +diff -Naur linux-3.2.1/drivers/acpi/acpica/exconfig.c linux-3.2.1.patch/drivers/acpi/acpica/exconfig.c +--- linux-3.2.1/drivers/acpi/acpica/exconfig.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/exconfig.c 2012-01-24 15:55:50.985361381 +0100 +@@ -297,9 +297,9 @@ + /* Bytewise reads */ + + for (i = 0; i < length; i++) { +- status = acpi_ev_address_space_dispatch(obj_desc, ACPI_READ, +- region_offset, 8, +- &value); ++ status = ++ acpi_ev_address_space_dispatch(obj_desc, NULL, ACPI_READ, ++ region_offset, 8, &value); + if (ACPI_FAILURE(status)) { + return status; + } +diff -Naur linux-3.2.1/drivers/acpi/acpica/excreate.c linux-3.2.1.patch/drivers/acpi/acpica/excreate.c +--- linux-3.2.1/drivers/acpi/acpica/excreate.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/excreate.c 2012-01-24 15:55:29.924997281 +0100 +@@ -267,7 +267,7 @@ + * + * PARAMETERS: aml_start - Pointer to the region declaration AML + * aml_length - Max length of the declaration AML +- * region_space - space_iD for the region ++ * space_id - Address space ID for the region + * walk_state - Current state + * + * RETURN: Status +@@ -279,7 +279,7 @@ + acpi_status + acpi_ex_create_region(u8 * aml_start, + u32 aml_length, +- u8 region_space, struct acpi_walk_state *walk_state) ++ u8 space_id, struct acpi_walk_state *walk_state) + { + acpi_status status; + union acpi_operand_object *obj_desc; +@@ -304,16 +304,19 @@ + * Space ID must be one of the predefined IDs, or in the user-defined + * range + */ +- if ((region_space >= ACPI_NUM_PREDEFINED_REGIONS) && +- (region_space < ACPI_USER_REGION_BEGIN) && +- (region_space != ACPI_ADR_SPACE_DATA_TABLE)) { +- ACPI_ERROR((AE_INFO, "Invalid AddressSpace type 0x%X", +- region_space)); +- return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID); ++ if (!acpi_is_valid_space_id(space_id)) { ++ /* ++ * Print an error message, but continue. We don't want to abort ++ * a table load for this exception. Instead, if the region is ++ * actually used at runtime, abort the executing method. ++ */ ++ ACPI_ERROR((AE_INFO, ++ "Invalid/unknown Address Space ID: 0x%2.2X", ++ space_id)); + } + + ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Region Type - %s (0x%X)\n", +- acpi_ut_get_region_name(region_space), region_space)); ++ acpi_ut_get_region_name(space_id), space_id)); + + /* Create the region descriptor */ + +@@ -330,10 +333,16 @@ + region_obj2 = obj_desc->common.next_object; + region_obj2->extra.aml_start = aml_start; + region_obj2->extra.aml_length = aml_length; ++ if (walk_state->scope_info) { ++ region_obj2->extra.scope_node = ++ walk_state->scope_info->scope.node; ++ } else { ++ region_obj2->extra.scope_node = node; ++ } + + /* Init the region from the operands */ + +- obj_desc->region.space_id = region_space; ++ obj_desc->region.space_id = space_id; + obj_desc->region.address = 0; + obj_desc->region.length = 0; + obj_desc->region.node = node; +diff -Naur linux-3.2.1/drivers/acpi/acpica/exdump.c linux-3.2.1.patch/drivers/acpi/acpica/exdump.c +--- linux-3.2.1/drivers/acpi/acpica/exdump.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/exdump.c 2012-01-24 15:55:50.987361415 +0100 +@@ -192,10 +192,13 @@ + "Buffer Object"} + }; + +-static struct acpi_exdump_info acpi_ex_dump_region_field[3] = { ++static struct acpi_exdump_info acpi_ex_dump_region_field[5] = { + {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_region_field), NULL}, + {ACPI_EXD_FIELD, 0, NULL}, +- {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.region_obj), "Region Object"} ++ {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(field.access_length), "AccessLength"}, ++ {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.region_obj), "Region Object"}, ++ {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(field.resource_buffer), ++ "ResourceBuffer"} + }; + + static struct acpi_exdump_info acpi_ex_dump_bank_field[5] = { +diff -Naur linux-3.2.1/drivers/acpi/acpica/exfield.c linux-3.2.1.patch/drivers/acpi/acpica/exfield.c +--- linux-3.2.1/drivers/acpi/acpica/exfield.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/exfield.c 2012-01-24 15:55:55.202434288 +0100 +@@ -100,18 +100,25 @@ + (obj_desc->field.region_obj->region.space_id == + ACPI_ADR_SPACE_SMBUS + || obj_desc->field.region_obj->region.space_id == ++ ACPI_ADR_SPACE_GSBUS ++ || obj_desc->field.region_obj->region.space_id == + ACPI_ADR_SPACE_IPMI)) { + /* +- * This is an SMBus or IPMI read. We must create a buffer to hold ++ * This is an SMBus, GSBus or IPMI read. We must create a buffer to hold + * the data and then directly access the region handler. + * +- * Note: Smbus protocol value is passed in upper 16-bits of Function ++ * Note: SMBus and GSBus protocol value is passed in upper 16-bits of Function + */ + if (obj_desc->field.region_obj->region.space_id == + ACPI_ADR_SPACE_SMBUS) { + length = ACPI_SMBUS_BUFFER_SIZE; + function = + ACPI_READ | (obj_desc->field.attribute << 16); ++ } else if (obj_desc->field.region_obj->region.space_id == ++ ACPI_ADR_SPACE_GSBUS) { ++ length = ACPI_GSBUS_BUFFER_SIZE; ++ function = ++ ACPI_READ | (obj_desc->field.attribute << 16); + } else { /* IPMI */ + + length = ACPI_IPMI_BUFFER_SIZE; +@@ -248,21 +255,23 @@ + (obj_desc->field.region_obj->region.space_id == + ACPI_ADR_SPACE_SMBUS + || obj_desc->field.region_obj->region.space_id == ++ ACPI_ADR_SPACE_GSBUS ++ || obj_desc->field.region_obj->region.space_id == + ACPI_ADR_SPACE_IPMI)) { + /* +- * This is an SMBus or IPMI write. We will bypass the entire field ++ * This is an SMBus, GSBus or IPMI write. We will bypass the entire field + * mechanism and handoff the buffer directly to the handler. For + * these address spaces, the buffer is bi-directional; on a write, + * return data is returned in the same buffer. + * + * Source must be a buffer of sufficient size: +- * ACPI_SMBUS_BUFFER_SIZE or ACPI_IPMI_BUFFER_SIZE. ++ * ACPI_SMBUS_BUFFER_SIZE, ACPI_GSBUS_BUFFER_SIZE, or ACPI_IPMI_BUFFER_SIZE. + * +- * Note: SMBus protocol type is passed in upper 16-bits of Function ++ * Note: SMBus and GSBus protocol type is passed in upper 16-bits of Function + */ + if (source_desc->common.type != ACPI_TYPE_BUFFER) { + ACPI_ERROR((AE_INFO, +- "SMBus or IPMI write requires Buffer, found type %s", ++ "SMBus/IPMI/GenericSerialBus write requires Buffer, found type %s", + acpi_ut_get_object_type_name(source_desc))); + + return_ACPI_STATUS(AE_AML_OPERAND_TYPE); +@@ -273,6 +282,11 @@ + length = ACPI_SMBUS_BUFFER_SIZE; + function = + ACPI_WRITE | (obj_desc->field.attribute << 16); ++ } else if (obj_desc->field.region_obj->region.space_id == ++ ACPI_ADR_SPACE_GSBUS) { ++ length = ACPI_GSBUS_BUFFER_SIZE; ++ function = ++ ACPI_WRITE | (obj_desc->field.attribute << 16); + } else { /* IPMI */ + + length = ACPI_IPMI_BUFFER_SIZE; +@@ -281,7 +295,7 @@ + + if (source_desc->buffer.length < length) { + ACPI_ERROR((AE_INFO, +- "SMBus or IPMI write requires Buffer of length %u, found length %u", ++ "SMBus/IPMI/GenericSerialBus write requires Buffer of length %u, found length %u", + length, source_desc->buffer.length)); + + return_ACPI_STATUS(AE_AML_BUFFER_LIMIT); +diff -Naur linux-3.2.1/drivers/acpi/acpica/exfldio.c linux-3.2.1.patch/drivers/acpi/acpica/exfldio.c +--- linux-3.2.1/drivers/acpi/acpica/exfldio.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/exfldio.c 2012-01-24 15:55:55.203434305 +0100 +@@ -86,6 +86,7 @@ + { + acpi_status status = AE_OK; + union acpi_operand_object *rgn_desc; ++ u8 space_id; + + ACPI_FUNCTION_TRACE_U32(ex_setup_region, field_datum_byte_offset); + +@@ -101,6 +102,17 @@ + return_ACPI_STATUS(AE_AML_OPERAND_TYPE); + } + ++ space_id = rgn_desc->region.space_id; ++ ++ /* Validate the Space ID */ ++ ++ if (!acpi_is_valid_space_id(space_id)) { ++ ACPI_ERROR((AE_INFO, ++ "Invalid/unknown Address Space ID: 0x%2.2X", ++ space_id)); ++ return_ACPI_STATUS(AE_AML_INVALID_SPACE_ID); ++ } ++ + /* + * If the Region Address and Length have not been previously evaluated, + * evaluate them now and save the results. +@@ -119,11 +131,12 @@ + } + + /* +- * Exit now for SMBus or IPMI address space, it has a non-linear ++ * Exit now for SMBus, GSBus or IPMI address space, it has a non-linear + * address space and the request cannot be directly validated + */ +- if (rgn_desc->region.space_id == ACPI_ADR_SPACE_SMBUS || +- rgn_desc->region.space_id == ACPI_ADR_SPACE_IPMI) { ++ if (space_id == ACPI_ADR_SPACE_SMBUS || ++ space_id == ACPI_ADR_SPACE_GSBUS || ++ space_id == ACPI_ADR_SPACE_IPMI) { + + /* SMBus or IPMI has a non-linear address space */ + +@@ -271,11 +284,12 @@ + + /* Invoke the appropriate address_space/op_region handler */ + +- status = +- acpi_ev_address_space_dispatch(rgn_desc, function, region_offset, +- ACPI_MUL_8(obj_desc->common_field. +- access_byte_width), +- value); ++ status = acpi_ev_address_space_dispatch(rgn_desc, obj_desc, ++ function, region_offset, ++ ACPI_MUL_8(obj_desc-> ++ common_field. ++ access_byte_width), ++ value); + + if (ACPI_FAILURE(status)) { + if (status == AE_NOT_IMPLEMENTED) { +@@ -316,6 +330,7 @@ + static u8 + acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value) + { ++ ACPI_FUNCTION_NAME(ex_register_overflow); + + if (obj_desc->common_field.bit_length >= ACPI_INTEGER_BIT_SIZE) { + /* +@@ -330,6 +345,11 @@ + * The Value is larger than the maximum value that can fit into + * the register. + */ ++ ACPI_ERROR((AE_INFO, ++ "Index value 0x%8.8X%8.8X overflows field width 0x%X", ++ ACPI_FORMAT_UINT64(value), ++ obj_desc->common_field.bit_length)); ++ + return (TRUE); + } + +diff -Naur linux-3.2.1/drivers/acpi/acpica/exprep.c linux-3.2.1.patch/drivers/acpi/acpica/exprep.c +--- linux-3.2.1/drivers/acpi/acpica/exprep.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/exprep.c 2012-01-24 15:55:50.988361432 +0100 +@@ -47,6 +47,7 @@ + #include "acinterp.h" + #include "amlcode.h" + #include "acnamesp.h" ++#include "acdispat.h" + + #define _COMPONENT ACPI_EXECUTER + ACPI_MODULE_NAME("exprep") +@@ -455,6 +456,30 @@ + obj_desc->field.region_obj = + acpi_ns_get_attached_object(info->region_node); + ++ /* Fields specific to generic_serial_bus fields */ ++ ++ obj_desc->field.access_length = info->access_length; ++ ++ if (info->connection_node) { ++ second_desc = info->connection_node->object; ++ if (!(second_desc->common.flags & AOPOBJ_DATA_VALID)) { ++ status = ++ acpi_ds_get_buffer_arguments(second_desc); ++ if (ACPI_FAILURE(status)) { ++ acpi_ut_delete_object_desc(obj_desc); ++ return_ACPI_STATUS(status); ++ } ++ } ++ ++ obj_desc->field.resource_buffer = ++ second_desc->buffer.pointer; ++ obj_desc->field.resource_length = ++ (u16)second_desc->buffer.length; ++ } else if (info->resource_buffer) { ++ obj_desc->field.resource_buffer = info->resource_buffer; ++ obj_desc->field.resource_length = info->resource_length; ++ } ++ + /* Allow full data read from EC address space */ + + if ((obj_desc->field.region_obj->region.space_id == +diff -Naur linux-3.2.1/drivers/acpi/acpica/exutils.c linux-3.2.1.patch/drivers/acpi/acpica/exutils.c +--- linux-3.2.1/drivers/acpi/acpica/exutils.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/exutils.c 2012-01-24 15:55:29.929997369 +0100 +@@ -435,4 +435,29 @@ + } + } + ++/******************************************************************************* ++ * ++ * FUNCTION: acpi_is_valid_space_id ++ * ++ * PARAMETERS: space_id - ID to be validated ++ * ++ * RETURN: TRUE if valid/supported ID. ++ * ++ * DESCRIPTION: Validate an operation region space_iD. ++ * ++ ******************************************************************************/ ++ ++u8 acpi_is_valid_space_id(u8 space_id) ++{ ++ ++ if ((space_id >= ACPI_NUM_PREDEFINED_REGIONS) && ++ (space_id < ACPI_USER_REGION_BEGIN) && ++ (space_id != ACPI_ADR_SPACE_DATA_TABLE) && ++ (space_id != ACPI_ADR_SPACE_FIXED_HARDWARE)) { ++ return (FALSE); ++ } ++ ++ return (TRUE); ++} ++ + #endif +diff -Naur linux-3.2.1/drivers/acpi/acpica/hwvalid.c linux-3.2.1.patch/drivers/acpi/acpica/hwvalid.c +--- linux-3.2.1/drivers/acpi/acpica/hwvalid.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/hwvalid.c 2012-01-24 15:55:18.446798842 +0100 +@@ -134,6 +134,8 @@ + /* Supported widths are 8/16/32 */ + + if ((bit_width != 8) && (bit_width != 16) && (bit_width != 32)) { ++ ACPI_ERROR((AE_INFO, ++ "Bad BitWidth parameter: %8.8X", bit_width)); + return AE_BAD_PARAMETER; + } + +diff -Naur linux-3.2.1/drivers/acpi/acpica/Makefile linux-3.2.1.patch/drivers/acpi/acpica/Makefile +--- linux-3.2.1/drivers/acpi/acpica/Makefile 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/Makefile 2012-01-24 15:56:19.783859260 +0100 +@@ -8,41 +8,150 @@ + # use acpi.o to put all files here into acpi.o modparam namespace + obj-y += acpi.o + +-acpi-y := dsfield.o dsmthdat.o dsopcode.o dswexec.o dswscope.o \ +- dsmethod.o dsobject.o dsutils.o dswload.o dswstate.o \ +- dsinit.o dsargs.o dscontrol.o dswload2.o +- +-acpi-y += evevent.o evregion.o evsci.o evxfevnt.o \ +- evmisc.o evrgnini.o evxface.o evxfregn.o \ +- evgpe.o evgpeblk.o evgpeinit.o evgpeutil.o evxfgpe.o evglock.o +- +-acpi-y += exconfig.o exfield.o exnames.o exoparg6.o exresolv.o exstorob.o\ +- exconvrt.o exfldio.o exoparg1.o exprep.o exresop.o exsystem.o\ +- excreate.o exmisc.o exoparg2.o exregion.o exstore.o exutils.o \ +- exdump.o exmutex.o exoparg3.o exresnte.o exstoren.o exdebug.o +- +-acpi-y += hwacpi.o hwgpe.o hwregs.o hwsleep.o hwxface.o hwvalid.o hwpci.o ++acpi-y := \ ++ dsargs.o \ ++ dscontrol.o \ ++ dsfield.o \ ++ dsinit.o \ ++ dsmethod.o \ ++ dsmthdat.o \ ++ dsobject.o \ ++ dsopcode.o \ ++ dsutils.o \ ++ dswexec.o \ ++ dswload.o \ ++ dswload2.o \ ++ dswscope.o \ ++ dswstate.o ++ ++acpi-y += \ ++ evevent.o \ ++ evgpe.o \ ++ evgpeblk.o \ ++ evgpeinit.o \ ++ evgpeutil.o \ ++ evglock.o \ ++ evmisc.o \ ++ evregion.o \ ++ evrgnini.o \ ++ evsci.o \ ++ evxface.o \ ++ evxfevnt.o \ ++ evxfgpe.o \ ++ evxfregn.o ++ ++acpi-y += \ ++ exconfig.o \ ++ exconvrt.o \ ++ excreate.o \ ++ exdebug.o \ ++ exdump.o \ ++ exfield.o \ ++ exfldio.o \ ++ exmutex.o \ ++ exnames.o \ ++ exoparg1.o \ ++ exoparg2.o \ ++ exoparg3.o \ ++ exoparg6.o \ ++ exprep.o \ ++ exmisc.o \ ++ exregion.o \ ++ exresnte.o \ ++ exresolv.o \ ++ exresop.o \ ++ exstore.o \ ++ exstoren.o \ ++ exstorob.o \ ++ exsystem.o \ ++ exutils.o ++ ++acpi-y += \ ++ hwacpi.o \ ++ hwgpe.o \ ++ hwpci.o \ ++ hwregs.o \ ++ hwsleep.o \ ++ hwvalid.o \ ++ hwxface.o + + acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o + +-acpi-y += nsaccess.o nsload.o nssearch.o nsxfeval.o \ +- nsalloc.o nseval.o nsnames.o nsutils.o nsxfname.o \ +- nsdump.o nsinit.o nsobject.o nswalk.o nsxfobj.o \ +- nsparse.o nspredef.o nsrepair.o nsrepair2.o ++acpi-y += \ ++ nsaccess.o \ ++ nsalloc.o \ ++ nsdump.o \ ++ nseval.o \ ++ nsinit.o \ ++ nsload.o \ ++ nsnames.o \ ++ nsobject.o \ ++ nsparse.o \ ++ nspredef.o \ ++ nsrepair.o \ ++ nsrepair2.o \ ++ nssearch.o \ ++ nsutils.o \ ++ nswalk.o \ ++ nsxfeval.o \ ++ nsxfname.o \ ++ nsxfobj.o + + acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o + +-acpi-y += psargs.o psparse.o psloop.o pstree.o pswalk.o \ +- psopcode.o psscope.o psutils.o psxface.o +- +-acpi-y += rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \ +- rscalc.o rsirq.o rsmemory.o rsutils.o ++acpi-y += \ ++ psargs.o \ ++ psloop.o \ ++ psopcode.o \ ++ psparse.o \ ++ psscope.o \ ++ pstree.o \ ++ psutils.o \ ++ pswalk.o \ ++ psxface.o ++ ++acpi-y += \ ++ rsaddr.o \ ++ rscalc.o \ ++ rscreate.o \ ++ rsinfo.o \ ++ rsio.o \ ++ rsirq.o \ ++ rslist.o \ ++ rsmemory.o \ ++ rsmisc.o \ ++ rsserial.o \ ++ rsutils.o \ ++ rsxface.o + + acpi-$(ACPI_FUTURE_USAGE) += rsdump.o + +-acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o +- +-acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \ +- utcopy.o utdelete.o utglobal.o utmath.o utobject.o \ +- utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \ +- utosi.o utxferror.o utdecode.o ++acpi-y += \ ++ tbfadt.o \ ++ tbfind.o \ ++ tbinstal.o \ ++ tbutils.o \ ++ tbxface.o \ ++ tbxfroot.o ++ ++acpi-y += \ ++ utalloc.o \ ++ utcopy.o \ ++ utdebug.o \ ++ utdecode.o \ ++ utdelete.o \ ++ uteval.o \ ++ utglobal.o \ ++ utids.o \ ++ utinit.o \ ++ utlock.o \ ++ utmath.o \ ++ utmisc.o \ ++ utmutex.o \ ++ utobject.o \ ++ utosi.o \ ++ utresrc.o \ ++ utstate.o \ ++ utxface.o \ ++ utxferror.o \ ++ utxfmutex.o +diff -Naur linux-3.2.1/drivers/acpi/acpica/nspredef.c linux-3.2.1.patch/drivers/acpi/acpica/nspredef.c +--- linux-3.2.1/drivers/acpi/acpica/nspredef.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/nspredef.c 2012-01-24 15:56:12.265729284 +0100 +@@ -620,6 +620,7 @@ + case ACPI_PTYPE2_FIXED: + case ACPI_PTYPE2_MIN: + case ACPI_PTYPE2_COUNT: ++ case ACPI_PTYPE2_FIX_VAR: + + /* + * These types all return a single Package that consists of a +@@ -757,6 +758,34 @@ + if (ACPI_FAILURE(status)) { + return (status); + } ++ break; ++ ++ case ACPI_PTYPE2_FIX_VAR: ++ /* ++ * Each subpackage has a fixed number of elements and an ++ * optional element ++ */ ++ expected_count = ++ package->ret_info.count1 + package->ret_info.count2; ++ if (sub_package->package.count < expected_count) { ++ goto package_too_small; ++ } ++ ++ status = ++ acpi_ns_check_package_elements(data, sub_elements, ++ package->ret_info. ++ object_type1, ++ package->ret_info. ++ count1, ++ package->ret_info. ++ object_type2, ++ sub_package->package. ++ count - ++ package->ret_info. ++ count1, 0); ++ if (ACPI_FAILURE(status)) { ++ return (status); ++ } + break; + + case ACPI_PTYPE2_FIXED: +diff -Naur linux-3.2.1/drivers/acpi/acpica/nsrepair2.c linux-3.2.1.patch/drivers/acpi/acpica/nsrepair2.c +--- linux-3.2.1/drivers/acpi/acpica/nsrepair2.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/nsrepair2.c 2012-01-24 15:56:12.266729301 +0100 +@@ -467,11 +467,12 @@ + } + + /* +- * Copy and uppercase the string. From the ACPI specification: ++ * Copy and uppercase the string. From the ACPI 5.0 specification: + * + * A valid PNP ID must be of the form "AAA####" where A is an uppercase + * letter and # is a hex digit. A valid ACPI ID must be of the form +- * "ACPI####" where # is a hex digit. ++ * "NNNN####" where N is an uppercase letter or decimal digit, and ++ * # is a hex digit. + */ + for (dest = new_string->string.pointer; *source; dest++, source++) { + *dest = (char)ACPI_TOUPPER(*source); +diff -Naur linux-3.2.1/drivers/acpi/acpica/nsrepair.c linux-3.2.1.patch/drivers/acpi/acpica/nsrepair.c +--- linux-3.2.1/drivers/acpi/acpica/nsrepair.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/nsrepair.c 2012-01-24 15:56:12.266729301 +0100 +@@ -634,6 +634,7 @@ + case ACPI_PTYPE2_FIXED: + case ACPI_PTYPE2_MIN: + case ACPI_PTYPE2_REV_FIXED: ++ case ACPI_PTYPE2_FIX_VAR: + break; + + default: +diff -Naur linux-3.2.1/drivers/acpi/acpica/psargs.c linux-3.2.1.patch/drivers/acpi/acpica/psargs.c +--- linux-3.2.1/drivers/acpi/acpica/psargs.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/psargs.c 2012-01-24 15:55:50.989361449 +0100 +@@ -484,34 +484,54 @@ + static union acpi_parse_object *acpi_ps_get_next_field(struct acpi_parse_state + *parser_state) + { +- u32 aml_offset = (u32) +- ACPI_PTR_DIFF(parser_state->aml, +- parser_state->aml_start); ++ u32 aml_offset; + union acpi_parse_object *field; ++ union acpi_parse_object *arg = NULL; + u16 opcode; + u32 name; ++ u8 access_type; ++ u8 access_attribute; ++ u8 access_length; ++ u32 pkg_length; ++ u8 *pkg_end; ++ u32 buffer_length; + + ACPI_FUNCTION_TRACE(ps_get_next_field); + ++ aml_offset = ++ (u32)ACPI_PTR_DIFF(parser_state->aml, parser_state->aml_start); ++ + /* Determine field type */ + + switch (ACPI_GET8(parser_state->aml)) { +- default: ++ case AML_FIELD_OFFSET_OP: + +- opcode = AML_INT_NAMEDFIELD_OP; ++ opcode = AML_INT_RESERVEDFIELD_OP; ++ parser_state->aml++; + break; + +- case 0x00: ++ case AML_FIELD_ACCESS_OP: + +- opcode = AML_INT_RESERVEDFIELD_OP; ++ opcode = AML_INT_ACCESSFIELD_OP; + parser_state->aml++; + break; + +- case 0x01: ++ case AML_FIELD_CONNECTION_OP: + +- opcode = AML_INT_ACCESSFIELD_OP; ++ opcode = AML_INT_CONNECTION_OP; ++ parser_state->aml++; ++ break; ++ ++ case AML_FIELD_EXT_ACCESS_OP: ++ ++ opcode = AML_INT_EXTACCESSFIELD_OP; + parser_state->aml++; + break; ++ ++ default: ++ ++ opcode = AML_INT_NAMEDFIELD_OP; ++ break; + } + + /* Allocate a new field op */ +@@ -549,16 +569,111 @@ + break; + + case AML_INT_ACCESSFIELD_OP: ++ case AML_INT_EXTACCESSFIELD_OP: + + /* + * Get access_type and access_attrib and merge into the field Op +- * access_type is first operand, access_attribute is second ++ * access_type is first operand, access_attribute is second. stuff ++ * these bytes into the node integer value for convenience. + */ +- field->common.value.integer = +- (((u32) ACPI_GET8(parser_state->aml) << 8)); ++ ++ /* Get the two bytes (Type/Attribute) */ ++ ++ access_type = ACPI_GET8(parser_state->aml); + parser_state->aml++; +- field->common.value.integer |= ACPI_GET8(parser_state->aml); ++ access_attribute = ACPI_GET8(parser_state->aml); + parser_state->aml++; ++ ++ field->common.value.integer = (u8)access_type; ++ field->common.value.integer |= (u16)(access_attribute << 8); ++ ++ /* This opcode has a third byte, access_length */ ++ ++ if (opcode == AML_INT_EXTACCESSFIELD_OP) { ++ access_length = ACPI_GET8(parser_state->aml); ++ parser_state->aml++; ++ ++ field->common.value.integer |= ++ (u32)(access_length << 16); ++ } ++ break; ++ ++ case AML_INT_CONNECTION_OP: ++ ++ /* ++ * Argument for Connection operator can be either a Buffer ++ * (resource descriptor), or a name_string. ++ */ ++ if (ACPI_GET8(parser_state->aml) == AML_BUFFER_OP) { ++ parser_state->aml++; ++ ++ pkg_end = parser_state->aml; ++ pkg_length = ++ acpi_ps_get_next_package_length(parser_state); ++ pkg_end += pkg_length; ++ ++ if (parser_state->aml < pkg_end) { ++ ++ /* Non-empty list */ ++ ++ arg = acpi_ps_alloc_op(AML_INT_BYTELIST_OP); ++ if (!arg) { ++ return_PTR(NULL); ++ } ++ ++ /* Get the actual buffer length argument */ ++ ++ opcode = ACPI_GET8(parser_state->aml); ++ parser_state->aml++; ++ ++ switch (opcode) { ++ case AML_BYTE_OP: /* AML_BYTEDATA_ARG */ ++ buffer_length = ++ ACPI_GET8(parser_state->aml); ++ parser_state->aml += 1; ++ break; ++ ++ case AML_WORD_OP: /* AML_WORDDATA_ARG */ ++ buffer_length = ++ ACPI_GET16(parser_state->aml); ++ parser_state->aml += 2; ++ break; ++ ++ case AML_DWORD_OP: /* AML_DWORDATA_ARG */ ++ buffer_length = ++ ACPI_GET32(parser_state->aml); ++ parser_state->aml += 4; ++ break; ++ ++ default: ++ buffer_length = 0; ++ break; ++ } ++ ++ /* Fill in bytelist data */ ++ ++ arg->named.value.size = buffer_length; ++ arg->named.data = parser_state->aml; ++ } ++ ++ /* Skip to End of byte data */ ++ ++ parser_state->aml = pkg_end; ++ } else { ++ arg = acpi_ps_alloc_op(AML_INT_NAMEPATH_OP); ++ if (!arg) { ++ return_PTR(NULL); ++ } ++ ++ /* Get the Namestring argument */ ++ ++ arg->common.value.name = ++ acpi_ps_get_next_namestring(parser_state); ++ } ++ ++ /* Link the buffer/namestring to parent (CONNECTION_OP) */ ++ ++ acpi_ps_append_arg(field, arg); + break; + + default: +diff -Naur linux-3.2.1/drivers/acpi/acpica/psopcode.c linux-3.2.1.patch/drivers/acpi/acpica/psopcode.c +--- linux-3.2.1/drivers/acpi/acpica/psopcode.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/psopcode.c 2012-01-24 15:55:50.990361467 +0100 +@@ -638,7 +638,16 @@ + + /* 7E */ ACPI_OP("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY, + AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R, +- AML_FLAGS_EXEC_0A_0T_1R) ++ AML_FLAGS_EXEC_0A_0T_1R), ++ ++/* ACPI 5.0 opcodes */ ++ ++/* 7F */ ACPI_OP("-ConnectField-", ARGP_CONNECTFIELD_OP, ++ ARGI_CONNECTFIELD_OP, ACPI_TYPE_ANY, ++ AML_CLASS_INTERNAL, AML_TYPE_BOGUS, AML_HAS_ARGS), ++/* 80 */ ACPI_OP("-ExtAccessField-", ARGP_CONNECTFIELD_OP, ++ ARGI_CONNECTFIELD_OP, ACPI_TYPE_ANY, ++ AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0) + + /*! [End] no source code translation !*/ + }; +@@ -657,7 +666,7 @@ + /* 0x20 */ _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, + /* 0x28 */ _UNK, _UNK, _UNK, _UNK, _UNK, 0x63, _PFX, _PFX, + /* 0x30 */ 0x67, 0x66, 0x68, 0x65, 0x69, 0x64, 0x6A, 0x7D, +-/* 0x38 */ _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, ++/* 0x38 */ 0x7F, 0x80, _UNK, _UNK, _UNK, _UNK, _UNK, _UNK, + /* 0x40 */ _UNK, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, + /* 0x48 */ _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, + /* 0x50 */ _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, _ASC, +diff -Naur linux-3.2.1/drivers/acpi/acpica/pstree.c linux-3.2.1.patch/drivers/acpi/acpica/pstree.c +--- linux-3.2.1/drivers/acpi/acpica/pstree.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/pstree.c 2012-01-24 15:55:50.991361485 +0100 +@@ -74,6 +74,12 @@ + + ACPI_FUNCTION_ENTRY(); + ++/* ++ if (Op->Common.aml_opcode == AML_INT_CONNECTION_OP) ++ { ++ return (Op->Common.Value.Arg); ++ } ++*/ + /* Get the info structure for this opcode */ + + op_info = acpi_ps_get_opcode_info(op->common.aml_opcode); +diff -Naur linux-3.2.1/drivers/acpi/acpica/rscalc.c linux-3.2.1.patch/drivers/acpi/acpica/rscalc.c +--- linux-3.2.1/drivers/acpi/acpica/rscalc.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/rscalc.c 2012-01-24 15:56:00.176520281 +0100 +@@ -313,6 +313,38 @@ + resource_source)); + break; + ++ case ACPI_RESOURCE_TYPE_GPIO: ++ ++ total_size = ++ (acpi_rs_length) (total_size + ++ (resource->data.gpio. ++ pin_table_length * 2) + ++ resource->data.gpio. ++ resource_source.string_length + ++ resource->data.gpio. ++ vendor_length); ++ ++ break; ++ ++ case ACPI_RESOURCE_TYPE_SERIAL_BUS: ++ ++ total_size = ++ acpi_gbl_aml_resource_serial_bus_sizes[resource-> ++ data. ++ common_serial_bus. ++ type]; ++ ++ total_size = (acpi_rs_length) (total_size + ++ resource->data. ++ i2c_serial_bus. ++ resource_source. ++ string_length + ++ resource->data. ++ i2c_serial_bus. ++ vendor_length); ++ ++ break; ++ + default: + break; + } +@@ -362,10 +394,11 @@ + u32 extra_struct_bytes; + u8 resource_index; + u8 minimum_aml_resource_length; ++ union aml_resource *aml_resource; + + ACPI_FUNCTION_TRACE(rs_get_list_length); + +- *size_needed = 0; ++ *size_needed = ACPI_RS_SIZE_MIN; /* Minimum size is one end_tag */ + end_aml = aml_buffer + aml_buffer_length; + + /* Walk the list of AML resource descriptors */ +@@ -376,9 +409,15 @@ + + status = acpi_ut_validate_resource(aml_buffer, &resource_index); + if (ACPI_FAILURE(status)) { ++ /* ++ * Exit on failure. Cannot continue because the descriptor length ++ * may be bogus also. ++ */ + return_ACPI_STATUS(status); + } + ++ aml_resource = (void *)aml_buffer; ++ + /* Get the resource length and base (minimum) AML size */ + + resource_length = acpi_ut_get_resource_length(aml_buffer); +@@ -422,10 +461,8 @@ + + case ACPI_RESOURCE_NAME_END_TAG: + /* +- * End Tag: +- * This is the normal exit, add size of end_tag ++ * End Tag: This is the normal exit + */ +- *size_needed += ACPI_RS_SIZE_MIN; + return_ACPI_STATUS(AE_OK); + + case ACPI_RESOURCE_NAME_ADDRESS32: +@@ -457,6 +494,33 @@ + minimum_aml_resource_length); + break; + ++ case ACPI_RESOURCE_NAME_GPIO: ++ ++ /* Vendor data is optional */ ++ ++ if (aml_resource->gpio.vendor_length) { ++ extra_struct_bytes += ++ aml_resource->gpio.vendor_offset - ++ aml_resource->gpio.pin_table_offset + ++ aml_resource->gpio.vendor_length; ++ } else { ++ extra_struct_bytes += ++ aml_resource->large_header.resource_length + ++ sizeof(struct aml_resource_large_header) - ++ aml_resource->gpio.pin_table_offset; ++ } ++ break; ++ ++ case ACPI_RESOURCE_NAME_SERIAL_BUS: ++ ++ minimum_aml_resource_length = ++ acpi_gbl_resource_aml_serial_bus_sizes ++ [aml_resource->common_serial_bus.type]; ++ extra_struct_bytes += ++ aml_resource->common_serial_bus.resource_length - ++ minimum_aml_resource_length; ++ break; ++ + default: + break; + } +@@ -467,9 +531,18 @@ + * Important: Round the size up for the appropriate alignment. This + * is a requirement on IA64. + */ +- buffer_size = acpi_gbl_resource_struct_sizes[resource_index] + +- extra_struct_bytes; +- buffer_size = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(buffer_size); ++ if (acpi_ut_get_resource_type(aml_buffer) == ++ ACPI_RESOURCE_NAME_SERIAL_BUS) { ++ buffer_size = ++ acpi_gbl_resource_struct_serial_bus_sizes ++ [aml_resource->common_serial_bus.type] + ++ extra_struct_bytes; ++ } else { ++ buffer_size = ++ acpi_gbl_resource_struct_sizes[resource_index] + ++ extra_struct_bytes; ++ } ++ buffer_size = (u32)ACPI_ROUND_UP_TO_NATIVE_WORD(buffer_size); + + *size_needed += buffer_size; + +diff -Naur linux-3.2.1/drivers/acpi/acpica/rscreate.c linux-3.2.1.patch/drivers/acpi/acpica/rscreate.c +--- linux-3.2.1/drivers/acpi/acpica/rscreate.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/rscreate.c 2012-01-24 15:56:09.048673666 +0100 +@@ -51,6 +51,70 @@ + + /******************************************************************************* + * ++ * FUNCTION: acpi_buffer_to_resource ++ * ++ * PARAMETERS: aml_buffer - Pointer to the resource byte stream ++ * aml_buffer_length - Length of the aml_buffer ++ * resource_ptr - Where the converted resource is returned ++ * ++ * RETURN: Status ++ * ++ * DESCRIPTION: Convert a raw AML buffer to a resource list ++ * ++ ******************************************************************************/ ++acpi_status ++acpi_buffer_to_resource(u8 *aml_buffer, ++ u16 aml_buffer_length, ++ struct acpi_resource **resource_ptr) ++{ ++ acpi_status status; ++ acpi_size list_size_needed; ++ void *resource; ++ void *current_resource_ptr; ++ ++ /* ++ * Note: we allow AE_AML_NO_RESOURCE_END_TAG, since an end tag ++ * is not required here. ++ */ ++ ++ /* Get the required length for the converted resource */ ++ ++ status = acpi_rs_get_list_length(aml_buffer, aml_buffer_length, ++ &list_size_needed); ++ if (status == AE_AML_NO_RESOURCE_END_TAG) { ++ status = AE_OK; ++ } ++ if (ACPI_FAILURE(status)) { ++ return (status); ++ } ++ ++ /* Allocate a buffer for the converted resource */ ++ ++ resource = ACPI_ALLOCATE_ZEROED(list_size_needed); ++ current_resource_ptr = resource; ++ if (!resource) { ++ return (AE_NO_MEMORY); ++ } ++ ++ /* Perform the AML-to-Resource conversion */ ++ ++ status = acpi_ut_walk_aml_resources(aml_buffer, aml_buffer_length, ++ acpi_rs_convert_aml_to_resources, ++ ¤t_resource_ptr); ++ if (status == AE_AML_NO_RESOURCE_END_TAG) { ++ status = AE_OK; ++ } ++ if (ACPI_FAILURE(status)) { ++ ACPI_FREE(resource); ++ } else { ++ *resource_ptr = resource; ++ } ++ ++ return (status); ++} ++ ++/******************************************************************************* ++ * + * FUNCTION: acpi_rs_create_resource_list + * + * PARAMETERS: aml_buffer - Pointer to the resource byte stream +@@ -66,9 +130,10 @@ + * of device resources. + * + ******************************************************************************/ ++ + acpi_status + acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer, +- struct acpi_buffer *output_buffer) ++ struct acpi_buffer * output_buffer) + { + + acpi_status status; +diff -Naur linux-3.2.1/drivers/acpi/acpica/rsdump.c linux-3.2.1.patch/drivers/acpi/acpica/rsdump.c +--- linux-3.2.1/drivers/acpi/acpica/rsdump.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/rsdump.c 2012-01-24 15:56:00.178520315 +0100 +@@ -61,11 +61,13 @@ + + static void acpi_rs_out_title(char *title); + +-static void acpi_rs_dump_byte_list(u16 length, u8 * data); ++static void acpi_rs_dump_byte_list(u16 length, u8 *data); + +-static void acpi_rs_dump_dword_list(u8 length, u32 * data); ++static void acpi_rs_dump_word_list(u16 length, u16 *data); + +-static void acpi_rs_dump_short_byte_list(u8 length, u8 * data); ++static void acpi_rs_dump_dword_list(u8 length, u32 *data); ++ ++static void acpi_rs_dump_short_byte_list(u8 length, u8 *data); + + static void + acpi_rs_dump_resource_source(struct acpi_resource_source *resource_source); +@@ -309,6 +311,125 @@ + {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(generic_reg.address), "Address", NULL} + }; + ++struct acpi_rsdump_info acpi_rs_dump_gpio[16] = { ++ {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_gpio), "GPIO", NULL}, ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.revision_id), "RevisionId", NULL}, ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.connection_type), ++ "ConnectionType", acpi_gbl_ct_decode}, ++ {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(gpio.producer_consumer), ++ "ProducerConsumer", acpi_gbl_consume_decode}, ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.pin_config), "PinConfig", ++ acpi_gbl_ppc_decode}, ++ {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.sharable), "Sharable", ++ acpi_gbl_shr_decode}, ++ {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.io_restriction), ++ "IoRestriction", acpi_gbl_ior_decode}, ++ {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(gpio.triggering), "Triggering", ++ acpi_gbl_he_decode}, ++ {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.polarity), "Polarity", ++ acpi_gbl_ll_decode}, ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.drive_strength), "DriveStrength", ++ NULL}, ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.debounce_timeout), ++ "DebounceTimeout", NULL}, ++ {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(gpio.resource_source), ++ "ResourceSource", NULL}, ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.pin_table_length), ++ "PinTableLength", NULL}, ++ {ACPI_RSD_WORDLIST, ACPI_RSD_OFFSET(gpio.pin_table), "PinTable", NULL}, ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(gpio.vendor_length), "VendorLength", ++ NULL}, ++ {ACPI_RSD_SHORTLISTX, ACPI_RSD_OFFSET(gpio.vendor_data), "VendorData", ++ NULL}, ++}; ++ ++struct acpi_rsdump_info acpi_rs_dump_fixed_dma[4] = { ++ {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_fixed_dma), ++ "FixedDma", NULL}, ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(fixed_dma.request_lines), ++ "RequestLines", NULL}, ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(fixed_dma.channels), "Channels", ++ NULL}, ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(fixed_dma.width), "TransferWidth", ++ acpi_gbl_dts_decode}, ++}; ++ ++#define ACPI_RS_DUMP_COMMON_SERIAL_BUS \ ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (common_serial_bus.revision_id), "RevisionId", NULL}, \ ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (common_serial_bus.type), "Type", acpi_gbl_sbt_decode}, \ ++ {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (common_serial_bus.producer_consumer), "ProducerConsumer", acpi_gbl_consume_decode}, \ ++ {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (common_serial_bus.slave_mode), "SlaveMode", acpi_gbl_sm_decode}, \ ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (common_serial_bus.type_revision_id), "TypeRevisionId", NULL}, \ ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (common_serial_bus.type_data_length), "TypeDataLength", NULL}, \ ++ {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (common_serial_bus.resource_source), "ResourceSource", NULL}, \ ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (common_serial_bus.vendor_length), "VendorLength", NULL}, \ ++ {ACPI_RSD_SHORTLISTX,ACPI_RSD_OFFSET (common_serial_bus.vendor_data), "VendorData", NULL}, ++ ++struct acpi_rsdump_info acpi_rs_dump_common_serial_bus[10] = { ++ {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_common_serial_bus), ++ "Common Serial Bus", NULL}, ++ ACPI_RS_DUMP_COMMON_SERIAL_BUS ++}; ++ ++struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[13] = { ++ {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_i2c_serial_bus), ++ "I2C Serial Bus", NULL}, ++ ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_1BITFLAG, ++ ACPI_RSD_OFFSET(i2c_serial_bus. ++ access_mode), ++ "AccessMode", acpi_gbl_am_decode}, ++ {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(i2c_serial_bus.connection_speed), ++ "ConnectionSpeed", NULL}, ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(i2c_serial_bus.slave_address), ++ "SlaveAddress", NULL}, ++}; ++ ++struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[17] = { ++ {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_spi_serial_bus), ++ "Spi Serial Bus", NULL}, ++ ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_1BITFLAG, ++ ACPI_RSD_OFFSET(spi_serial_bus. ++ wire_mode), "WireMode", ++ acpi_gbl_wm_decode}, ++ {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(spi_serial_bus.device_polarity), ++ "DevicePolarity", acpi_gbl_dp_decode}, ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.data_bit_length), ++ "DataBitLength", NULL}, ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.clock_phase), ++ "ClockPhase", acpi_gbl_cph_decode}, ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(spi_serial_bus.clock_polarity), ++ "ClockPolarity", acpi_gbl_cpo_decode}, ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(spi_serial_bus.device_selection), ++ "DeviceSelection", NULL}, ++ {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(spi_serial_bus.connection_speed), ++ "ConnectionSpeed", NULL}, ++}; ++ ++struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[19] = { ++ {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_uart_serial_bus), ++ "Uart Serial Bus", NULL}, ++ ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_2BITFLAG, ++ ACPI_RSD_OFFSET(uart_serial_bus. ++ flow_control), ++ "FlowControl", acpi_gbl_fc_decode}, ++ {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.stop_bits), ++ "StopBits", acpi_gbl_sb_decode}, ++ {ACPI_RSD_3BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.data_bits), ++ "DataBits", acpi_gbl_bpb_decode}, ++ {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(uart_serial_bus.endian), "Endian", ++ acpi_gbl_ed_decode}, ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(uart_serial_bus.parity), "Parity", ++ acpi_gbl_pt_decode}, ++ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(uart_serial_bus.lines_enabled), ++ "LinesEnabled", NULL}, ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(uart_serial_bus.rx_fifo_size), ++ "RxFifoSize", NULL}, ++ {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(uart_serial_bus.tx_fifo_size), ++ "TxFifoSize", NULL}, ++ {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(uart_serial_bus.default_baud_rate), ++ "ConnectionSpeed", NULL}, ++}; ++ + /* + * Tables used for common address descriptor flag fields + */ +@@ -413,7 +534,14 @@ + /* Data items, 8/16/32/64 bit */ + + case ACPI_RSD_UINT8: +- acpi_rs_out_integer8(name, ACPI_GET8(target)); ++ if (table->pointer) { ++ acpi_rs_out_string(name, ACPI_CAST_PTR(char, ++ table-> ++ pointer ++ [*target])); ++ } else { ++ acpi_rs_out_integer8(name, ACPI_GET8(target)); ++ } + break; + + case ACPI_RSD_UINT16: +@@ -444,6 +572,13 @@ + 0x03])); + break; + ++ case ACPI_RSD_3BITFLAG: ++ acpi_rs_out_string(name, ACPI_CAST_PTR(char, ++ table-> ++ pointer[*target & ++ 0x07])); ++ break; ++ + case ACPI_RSD_SHORTLIST: + /* + * Short byte list (single line output) for DMA and IRQ resources +@@ -456,6 +591,20 @@ + } + break; + ++ case ACPI_RSD_SHORTLISTX: ++ /* ++ * Short byte list (single line output) for GPIO vendor data ++ * Note: The list length is obtained from the previous table entry ++ */ ++ if (previous_target) { ++ acpi_rs_out_title(name); ++ acpi_rs_dump_short_byte_list(*previous_target, ++ * ++ (ACPI_CAST_INDIRECT_PTR ++ (u8, target))); ++ } ++ break; ++ + case ACPI_RSD_LONGLIST: + /* + * Long byte list for Vendor resource data +@@ -480,6 +629,18 @@ + } + break; + ++ case ACPI_RSD_WORDLIST: ++ /* ++ * Word list for GPIO Pin Table ++ * Note: The list length is obtained from the previous table entry ++ */ ++ if (previous_target) { ++ acpi_rs_dump_word_list(*previous_target, ++ *(ACPI_CAST_INDIRECT_PTR ++ (u16, target))); ++ } ++ break; ++ + case ACPI_RSD_ADDRESS: + /* + * Common flags for all Address resources +@@ -627,14 +788,20 @@ + + /* Dump the resource descriptor */ + +- acpi_rs_dump_descriptor(&resource_list->data, +- acpi_gbl_dump_resource_dispatch[type]); ++ if (type == ACPI_RESOURCE_TYPE_SERIAL_BUS) { ++ acpi_rs_dump_descriptor(&resource_list->data, ++ acpi_gbl_dump_serial_bus_dispatch ++ [resource_list->data. ++ common_serial_bus.type]); ++ } else { ++ acpi_rs_dump_descriptor(&resource_list->data, ++ acpi_gbl_dump_resource_dispatch ++ [type]); ++ } + + /* Point to the next resource structure */ + +- resource_list = +- ACPI_ADD_PTR(struct acpi_resource, resource_list, +- resource_list->length); ++ resource_list = ACPI_NEXT_RESOURCE(resource_list); + + /* Exit when END_TAG descriptor is reached */ + +@@ -768,4 +935,13 @@ + } + } + ++static void acpi_rs_dump_word_list(u16 length, u16 *data) ++{ ++ u16 i; ++ ++ for (i = 0; i < length; i++) { ++ acpi_os_printf("%25s%2.2X : %4.4X\n", "Word", i, data[i]); ++ } ++} ++ + #endif +diff -Naur linux-3.2.1/drivers/acpi/acpica/rsinfo.c linux-3.2.1.patch/drivers/acpi/acpica/rsinfo.c +--- linux-3.2.1/drivers/acpi/acpica/rsinfo.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/rsinfo.c 2012-01-24 15:56:00.179520332 +0100 +@@ -76,7 +76,10 @@ + acpi_rs_convert_address64, /* 0x0D, ACPI_RESOURCE_TYPE_ADDRESS64 */ + acpi_rs_convert_ext_address64, /* 0x0E, ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */ + acpi_rs_convert_ext_irq, /* 0x0F, ACPI_RESOURCE_TYPE_EXTENDED_IRQ */ +- acpi_rs_convert_generic_reg /* 0x10, ACPI_RESOURCE_TYPE_GENERIC_REGISTER */ ++ acpi_rs_convert_generic_reg, /* 0x10, ACPI_RESOURCE_TYPE_GENERIC_REGISTER */ ++ acpi_rs_convert_gpio, /* 0x11, ACPI_RESOURCE_TYPE_GPIO */ ++ acpi_rs_convert_fixed_dma, /* 0x12, ACPI_RESOURCE_TYPE_FIXED_DMA */ ++ NULL, /* 0x13, ACPI_RESOURCE_TYPE_SERIAL_BUS - Use subtype table below */ + }; + + /* Dispatch tables for AML-to-resource (Get Resource) conversion functions */ +@@ -94,7 +97,7 @@ + acpi_rs_convert_end_dpf, /* 0x07, ACPI_RESOURCE_NAME_END_DEPENDENT */ + acpi_rs_convert_io, /* 0x08, ACPI_RESOURCE_NAME_IO */ + acpi_rs_convert_fixed_io, /* 0x09, ACPI_RESOURCE_NAME_FIXED_IO */ +- NULL, /* 0x0A, Reserved */ ++ acpi_rs_convert_fixed_dma, /* 0x0A, ACPI_RESOURCE_NAME_FIXED_DMA */ + NULL, /* 0x0B, Reserved */ + NULL, /* 0x0C, Reserved */ + NULL, /* 0x0D, Reserved */ +@@ -114,7 +117,19 @@ + acpi_rs_convert_address16, /* 0x08, ACPI_RESOURCE_NAME_ADDRESS16 */ + acpi_rs_convert_ext_irq, /* 0x09, ACPI_RESOURCE_NAME_EXTENDED_IRQ */ + acpi_rs_convert_address64, /* 0x0A, ACPI_RESOURCE_NAME_ADDRESS64 */ +- acpi_rs_convert_ext_address64 /* 0x0B, ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64 */ ++ acpi_rs_convert_ext_address64, /* 0x0B, ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64 */ ++ acpi_rs_convert_gpio, /* 0x0C, ACPI_RESOURCE_NAME_GPIO */ ++ NULL, /* 0x0D, Reserved */ ++ NULL, /* 0x0E, ACPI_RESOURCE_NAME_SERIAL_BUS - Use subtype table below */ ++}; ++ ++/* Subtype table for serial_bus -- I2C, SPI, and UART */ ++ ++struct acpi_rsconvert_info *acpi_gbl_convert_resource_serial_bus_dispatch[] = { ++ NULL, ++ acpi_rs_convert_i2c_serial_bus, ++ acpi_rs_convert_spi_serial_bus, ++ acpi_rs_convert_uart_serial_bus, + }; + + #ifdef ACPI_FUTURE_USAGE +@@ -140,6 +155,16 @@ + acpi_rs_dump_ext_address64, /* ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */ + acpi_rs_dump_ext_irq, /* ACPI_RESOURCE_TYPE_EXTENDED_IRQ */ + acpi_rs_dump_generic_reg, /* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */ ++ acpi_rs_dump_gpio, /* ACPI_RESOURCE_TYPE_GPIO */ ++ acpi_rs_dump_fixed_dma, /* ACPI_RESOURCE_TYPE_FIXED_DMA */ ++ NULL, /* ACPI_RESOURCE_TYPE_SERIAL_BUS */ ++}; ++ ++struct acpi_rsdump_info *acpi_gbl_dump_serial_bus_dispatch[] = { ++ NULL, ++ acpi_rs_dump_i2c_serial_bus, /* AML_RESOURCE_I2C_BUS_TYPE */ ++ acpi_rs_dump_spi_serial_bus, /* AML_RESOURCE_SPI_BUS_TYPE */ ++ acpi_rs_dump_uart_serial_bus, /* AML_RESOURCE_UART_BUS_TYPE */ + }; + #endif + +@@ -166,7 +191,10 @@ + sizeof(struct aml_resource_address64), /* ACPI_RESOURCE_TYPE_ADDRESS64 */ + sizeof(struct aml_resource_extended_address64), /*ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 */ + sizeof(struct aml_resource_extended_irq), /* ACPI_RESOURCE_TYPE_EXTENDED_IRQ */ +- sizeof(struct aml_resource_generic_register) /* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */ ++ sizeof(struct aml_resource_generic_register), /* ACPI_RESOURCE_TYPE_GENERIC_REGISTER */ ++ sizeof(struct aml_resource_gpio), /* ACPI_RESOURCE_TYPE_GPIO */ ++ sizeof(struct aml_resource_fixed_dma), /* ACPI_RESOURCE_TYPE_FIXED_DMA */ ++ sizeof(struct aml_resource_common_serialbus), /* ACPI_RESOURCE_TYPE_SERIAL_BUS */ + }; + + const u8 acpi_gbl_resource_struct_sizes[] = { +@@ -182,7 +210,7 @@ + ACPI_RS_SIZE_MIN, + ACPI_RS_SIZE(struct acpi_resource_io), + ACPI_RS_SIZE(struct acpi_resource_fixed_io), +- 0, ++ ACPI_RS_SIZE(struct acpi_resource_fixed_dma), + 0, + 0, + 0, +@@ -202,5 +230,21 @@ + ACPI_RS_SIZE(struct acpi_resource_address16), + ACPI_RS_SIZE(struct acpi_resource_extended_irq), + ACPI_RS_SIZE(struct acpi_resource_address64), +- ACPI_RS_SIZE(struct acpi_resource_extended_address64) ++ ACPI_RS_SIZE(struct acpi_resource_extended_address64), ++ ACPI_RS_SIZE(struct acpi_resource_gpio), ++ ACPI_RS_SIZE(struct acpi_resource_common_serialbus) ++}; ++ ++const u8 acpi_gbl_aml_resource_serial_bus_sizes[] = { ++ 0, ++ sizeof(struct aml_resource_i2c_serialbus), ++ sizeof(struct aml_resource_spi_serialbus), ++ sizeof(struct aml_resource_uart_serialbus), ++}; ++ ++const u8 acpi_gbl_resource_struct_serial_bus_sizes[] = { ++ 0, ++ ACPI_RS_SIZE(struct acpi_resource_i2c_serialbus), ++ ACPI_RS_SIZE(struct acpi_resource_spi_serialbus), ++ ACPI_RS_SIZE(struct acpi_resource_uart_serialbus), + }; +diff -Naur linux-3.2.1/drivers/acpi/acpica/rsirq.c linux-3.2.1.patch/drivers/acpi/acpica/rsirq.c +--- linux-3.2.1/drivers/acpi/acpica/rsirq.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/rsirq.c 2012-01-24 15:56:00.182520386 +0100 +@@ -264,3 +264,34 @@ + AML_OFFSET(dma.dma_channel_mask), + ACPI_RS_OFFSET(data.dma.channel_count)} + }; ++ ++/******************************************************************************* ++ * ++ * acpi_rs_convert_fixed_dma ++ * ++ ******************************************************************************/ ++ ++struct acpi_rsconvert_info acpi_rs_convert_fixed_dma[4] = { ++ {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_FIXED_DMA, ++ ACPI_RS_SIZE(struct acpi_resource_fixed_dma), ++ ACPI_RSC_TABLE_SIZE(acpi_rs_convert_fixed_dma)}, ++ ++ {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_FIXED_DMA, ++ sizeof(struct aml_resource_fixed_dma), ++ 0}, ++ ++ /* ++ * These fields are contiguous in both the source and destination: ++ * request_lines ++ * Channels ++ */ ++ ++ {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.fixed_dma.request_lines), ++ AML_OFFSET(fixed_dma.request_lines), ++ 2}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.fixed_dma.width), ++ AML_OFFSET(fixed_dma.width), ++ 1}, ++ ++}; +diff -Naur linux-3.2.1/drivers/acpi/acpica/rslist.c linux-3.2.1.patch/drivers/acpi/acpica/rslist.c +--- linux-3.2.1/drivers/acpi/acpica/rslist.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/rslist.c 2012-01-24 15:56:00.183520403 +0100 +@@ -70,6 +70,8 @@ + struct acpi_resource **resource_ptr = + ACPI_CAST_INDIRECT_PTR(struct acpi_resource, context); + struct acpi_resource *resource; ++ union aml_resource *aml_resource; ++ struct acpi_rsconvert_info *conversion_table; + acpi_status status; + + ACPI_FUNCTION_TRACE(rs_convert_aml_to_resources); +@@ -84,14 +86,37 @@ + "Misaligned resource pointer %p", resource)); + } + ++ /* Get the appropriate conversion info table */ ++ ++ aml_resource = ACPI_CAST_PTR(union aml_resource, aml); ++ if (acpi_ut_get_resource_type(aml) == ACPI_RESOURCE_NAME_SERIAL_BUS) { ++ if (aml_resource->common_serial_bus.type > ++ AML_RESOURCE_MAX_SERIALBUSTYPE) { ++ conversion_table = NULL; ++ } else { ++ /* This is an I2C, SPI, or UART serial_bus descriptor */ ++ ++ conversion_table = ++ acpi_gbl_convert_resource_serial_bus_dispatch ++ [aml_resource->common_serial_bus.type]; ++ } ++ } else { ++ conversion_table = ++ acpi_gbl_get_resource_dispatch[resource_index]; ++ } ++ ++ if (!conversion_table) { ++ ACPI_ERROR((AE_INFO, ++ "Invalid/unsupported resource descriptor: Type 0x%2.2X", ++ resource_index)); ++ return (AE_AML_INVALID_RESOURCE_TYPE); ++ } ++ + /* Convert the AML byte stream resource to a local resource struct */ + + status = +- acpi_rs_convert_aml_to_resource(resource, +- ACPI_CAST_PTR(union aml_resource, +- aml), +- acpi_gbl_get_resource_dispatch +- [resource_index]); ++ acpi_rs_convert_aml_to_resource(resource, aml_resource, ++ conversion_table); + if (ACPI_FAILURE(status)) { + ACPI_EXCEPTION((AE_INFO, status, + "Could not convert AML resource (Type 0x%X)", +@@ -106,7 +131,7 @@ + + /* Point to the next structure in the output buffer */ + +- *resource_ptr = ACPI_ADD_PTR(void, resource, resource->length); ++ *resource_ptr = ACPI_NEXT_RESOURCE(resource); + return_ACPI_STATUS(AE_OK); + } + +@@ -135,6 +160,7 @@ + { + u8 *aml = output_buffer; + u8 *end_aml = output_buffer + aml_size_needed; ++ struct acpi_rsconvert_info *conversion_table; + acpi_status status; + + ACPI_FUNCTION_TRACE(rs_convert_resources_to_aml); +@@ -154,11 +180,34 @@ + + /* Perform the conversion */ + +- status = acpi_rs_convert_resource_to_aml(resource, ACPI_CAST_PTR(union +- aml_resource, +- aml), +- acpi_gbl_set_resource_dispatch +- [resource->type]); ++ if (resource->type == ACPI_RESOURCE_TYPE_SERIAL_BUS) { ++ if (resource->data.common_serial_bus.type > ++ AML_RESOURCE_MAX_SERIALBUSTYPE) { ++ conversion_table = NULL; ++ } else { ++ /* This is an I2C, SPI, or UART serial_bus descriptor */ ++ ++ conversion_table = ++ acpi_gbl_convert_resource_serial_bus_dispatch ++ [resource->data.common_serial_bus.type]; ++ } ++ } else { ++ conversion_table = ++ acpi_gbl_set_resource_dispatch[resource->type]; ++ } ++ ++ if (!conversion_table) { ++ ACPI_ERROR((AE_INFO, ++ "Invalid/unsupported resource descriptor: Type 0x%2.2X", ++ resource->type)); ++ return (AE_AML_INVALID_RESOURCE_TYPE); ++ } ++ ++ status = acpi_rs_convert_resource_to_aml(resource, ++ ACPI_CAST_PTR(union ++ aml_resource, ++ aml), ++ conversion_table); + if (ACPI_FAILURE(status)) { + ACPI_EXCEPTION((AE_INFO, status, + "Could not convert resource (type 0x%X) to AML", +@@ -192,9 +241,7 @@ + + /* Point to the next input resource descriptor */ + +- resource = +- ACPI_ADD_PTR(struct acpi_resource, resource, +- resource->length); ++ resource = ACPI_NEXT_RESOURCE(resource); + } + + /* Completed buffer, but did not find an end_tag resource descriptor */ +diff -Naur linux-3.2.1/drivers/acpi/acpica/rsmisc.c linux-3.2.1.patch/drivers/acpi/acpica/rsmisc.c +--- linux-3.2.1/drivers/acpi/acpica/rsmisc.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/rsmisc.c 2012-01-24 15:56:00.184520420 +0100 +@@ -83,6 +83,10 @@ + + ACPI_FUNCTION_TRACE(rs_convert_aml_to_resource); + ++ if (!info) { ++ return_ACPI_STATUS(AE_BAD_PARAMETER); ++ } ++ + if (((acpi_size) resource) & 0x3) { + + /* Each internal resource struct is expected to be 32-bit aligned */ +@@ -101,7 +105,6 @@ + * table length (# of table entries) + */ + count = INIT_TABLE_LENGTH(info); +- + while (count) { + /* + * Source is the external AML byte stream buffer, +@@ -145,6 +148,14 @@ + ((ACPI_GET8(source) >> info->value) & 0x03); + break; + ++ case ACPI_RSC_3BITFLAG: ++ /* ++ * Mask and shift the flag bits ++ */ ++ ACPI_SET8(destination) = (u8) ++ ((ACPI_GET8(source) >> info->value) & 0x07); ++ break; ++ + case ACPI_RSC_COUNT: + + item_count = ACPI_GET8(source); +@@ -163,6 +174,69 @@ + (info->value * (item_count - 1)); + break; + ++ case ACPI_RSC_COUNT_GPIO_PIN: ++ ++ target = ACPI_ADD_PTR(void, aml, info->value); ++ item_count = ACPI_GET16(target) - ACPI_GET16(source); ++ ++ resource->length = resource->length + item_count; ++ item_count = item_count / 2; ++ ACPI_SET16(destination) = item_count; ++ break; ++ ++ case ACPI_RSC_COUNT_GPIO_VEN: ++ ++ item_count = ACPI_GET8(source); ++ ACPI_SET8(destination) = (u8)item_count; ++ ++ resource->length = resource->length + ++ (info->value * item_count); ++ break; ++ ++ case ACPI_RSC_COUNT_GPIO_RES: ++ ++ /* ++ * Vendor data is optional (length/offset may both be zero) ++ * Examine vendor data length field first ++ */ ++ target = ACPI_ADD_PTR(void, aml, (info->value + 2)); ++ if (ACPI_GET16(target)) { ++ ++ /* Use vendor offset to get resource source length */ ++ ++ target = ACPI_ADD_PTR(void, aml, info->value); ++ item_count = ++ ACPI_GET16(target) - ACPI_GET16(source); ++ } else { ++ /* No vendor data to worry about */ ++ ++ item_count = aml->large_header.resource_length + ++ sizeof(struct aml_resource_large_header) - ++ ACPI_GET16(source); ++ } ++ ++ resource->length = resource->length + item_count; ++ ACPI_SET16(destination) = item_count; ++ break; ++ ++ case ACPI_RSC_COUNT_SERIAL_VEN: ++ ++ item_count = ACPI_GET16(source) - info->value; ++ ++ resource->length = resource->length + item_count; ++ ACPI_SET16(destination) = item_count; ++ break; ++ ++ case ACPI_RSC_COUNT_SERIAL_RES: ++ ++ item_count = (aml_resource_length + ++ sizeof(struct aml_resource_large_header)) ++ - ACPI_GET16(source) - info->value; ++ ++ resource->length = resource->length + item_count; ++ ACPI_SET16(destination) = item_count; ++ break; ++ + case ACPI_RSC_LENGTH: + + resource->length = resource->length + info->value; +@@ -183,6 +257,72 @@ + info->opcode); + break; + ++ case ACPI_RSC_MOVE_GPIO_PIN: ++ ++ /* Generate and set the PIN data pointer */ ++ ++ target = (char *)ACPI_ADD_PTR(void, resource, ++ (resource->length - ++ item_count * 2)); ++ *(u16 **)destination = ACPI_CAST_PTR(u16, target); ++ ++ /* Copy the PIN data */ ++ ++ source = ACPI_ADD_PTR(void, aml, ACPI_GET16(source)); ++ acpi_rs_move_data(target, source, item_count, ++ info->opcode); ++ break; ++ ++ case ACPI_RSC_MOVE_GPIO_RES: ++ ++ /* Generate and set the resource_source string pointer */ ++ ++ target = (char *)ACPI_ADD_PTR(void, resource, ++ (resource->length - ++ item_count)); ++ *(u8 **)destination = ACPI_CAST_PTR(u8, target); ++ ++ /* Copy the resource_source string */ ++ ++ source = ACPI_ADD_PTR(void, aml, ACPI_GET16(source)); ++ acpi_rs_move_data(target, source, item_count, ++ info->opcode); ++ break; ++ ++ case ACPI_RSC_MOVE_SERIAL_VEN: ++ ++ /* Generate and set the Vendor Data pointer */ ++ ++ target = (char *)ACPI_ADD_PTR(void, resource, ++ (resource->length - ++ item_count)); ++ *(u8 **)destination = ACPI_CAST_PTR(u8, target); ++ ++ /* Copy the Vendor Data */ ++ ++ source = ACPI_ADD_PTR(void, aml, info->value); ++ acpi_rs_move_data(target, source, item_count, ++ info->opcode); ++ break; ++ ++ case ACPI_RSC_MOVE_SERIAL_RES: ++ ++ /* Generate and set the resource_source string pointer */ ++ ++ target = (char *)ACPI_ADD_PTR(void, resource, ++ (resource->length - ++ item_count)); ++ *(u8 **)destination = ACPI_CAST_PTR(u8, target); ++ ++ /* Copy the resource_source string */ ++ ++ source = ++ ACPI_ADD_PTR(void, aml, ++ (ACPI_GET16(source) + info->value)); ++ acpi_rs_move_data(target, source, item_count, ++ info->opcode); ++ break; ++ + case ACPI_RSC_SET8: + + ACPI_MEMSET(destination, info->aml_offset, info->value); +@@ -219,13 +359,18 @@ + * Optional resource_source (Index and String). This is the more + * complicated case used by the Interrupt() macro + */ +- target = +- ACPI_ADD_PTR(char, resource, +- info->aml_offset + (item_count * 4)); ++ target = ACPI_ADD_PTR(char, resource, ++ info->aml_offset + ++ (item_count * 4)); + + resource->length += + acpi_rs_get_resource_source(aml_resource_length, +- (acpi_rs_length) (((item_count - 1) * sizeof(u32)) + info->value), destination, aml, target); ++ (acpi_rs_length) ++ (((item_count - ++ 1) * sizeof(u32)) + ++ info->value), ++ destination, aml, ++ target); + break; + + case ACPI_RSC_BITMASK: +@@ -327,6 +472,7 @@ + { + void *source = NULL; + void *destination; ++ char *target; + acpi_rsdesc_size aml_length = 0; + u8 count; + u16 temp16 = 0; +@@ -334,6 +480,10 @@ + + ACPI_FUNCTION_TRACE(rs_convert_resource_to_aml); + ++ if (!info) { ++ return_ACPI_STATUS(AE_BAD_PARAMETER); ++ } ++ + /* + * First table entry must be ACPI_RSC_INITxxx and must contain the + * table length (# of table entries) +@@ -383,6 +533,14 @@ + ((ACPI_GET8(source) & 0x03) << info->value); + break; + ++ case ACPI_RSC_3BITFLAG: ++ /* ++ * Mask and shift the flag bits ++ */ ++ ACPI_SET8(destination) |= (u8) ++ ((ACPI_GET8(source) & 0x07) << info->value); ++ break; ++ + case ACPI_RSC_COUNT: + + item_count = ACPI_GET8(source); +@@ -400,6 +558,63 @@ + acpi_rs_set_resource_length(aml_length, aml); + break; + ++ case ACPI_RSC_COUNT_GPIO_PIN: ++ ++ item_count = ACPI_GET16(source); ++ ACPI_SET16(destination) = (u16)aml_length; ++ ++ aml_length = (u16)(aml_length + item_count * 2); ++ target = ACPI_ADD_PTR(void, aml, info->value); ++ ACPI_SET16(target) = (u16)aml_length; ++ acpi_rs_set_resource_length(aml_length, aml); ++ break; ++ ++ case ACPI_RSC_COUNT_GPIO_VEN: ++ ++ item_count = ACPI_GET16(source); ++ ACPI_SET16(destination) = (u16)item_count; ++ ++ aml_length = ++ (u16)(aml_length + (info->value * item_count)); ++ acpi_rs_set_resource_length(aml_length, aml); ++ break; ++ ++ case ACPI_RSC_COUNT_GPIO_RES: ++ ++ /* Set resource source string length */ ++ ++ item_count = ACPI_GET16(source); ++ ACPI_SET16(destination) = (u16)aml_length; ++ ++ /* Compute offset for the Vendor Data */ ++ ++ aml_length = (u16)(aml_length + item_count); ++ target = ACPI_ADD_PTR(void, aml, info->value); ++ ++ /* Set vendor offset only if there is vendor data */ ++ ++ if (resource->data.gpio.vendor_length) { ++ ACPI_SET16(target) = (u16)aml_length; ++ } ++ ++ acpi_rs_set_resource_length(aml_length, aml); ++ break; ++ ++ case ACPI_RSC_COUNT_SERIAL_VEN: ++ ++ item_count = ACPI_GET16(source); ++ ACPI_SET16(destination) = item_count + info->value; ++ aml_length = (u16)(aml_length + item_count); ++ acpi_rs_set_resource_length(aml_length, aml); ++ break; ++ ++ case ACPI_RSC_COUNT_SERIAL_RES: ++ ++ item_count = ACPI_GET16(source); ++ aml_length = (u16)(aml_length + item_count); ++ acpi_rs_set_resource_length(aml_length, aml); ++ break; ++ + case ACPI_RSC_LENGTH: + + acpi_rs_set_resource_length(info->value, aml); +@@ -416,6 +631,48 @@ + acpi_rs_move_data(destination, source, item_count, + info->opcode); + break; ++ ++ case ACPI_RSC_MOVE_GPIO_PIN: ++ ++ destination = (char *)ACPI_ADD_PTR(void, aml, ++ ACPI_GET16 ++ (destination)); ++ source = *(u16 **)source; ++ acpi_rs_move_data(destination, source, item_count, ++ info->opcode); ++ break; ++ ++ case ACPI_RSC_MOVE_GPIO_RES: ++ ++ /* Used for both resource_source string and vendor_data */ ++ ++ destination = (char *)ACPI_ADD_PTR(void, aml, ++ ACPI_GET16 ++ (destination)); ++ source = *(u8 **)source; ++ acpi_rs_move_data(destination, source, item_count, ++ info->opcode); ++ break; ++ ++ case ACPI_RSC_MOVE_SERIAL_VEN: ++ ++ destination = (char *)ACPI_ADD_PTR(void, aml, ++ (aml_length - ++ item_count)); ++ source = *(u8 **)source; ++ acpi_rs_move_data(destination, source, item_count, ++ info->opcode); ++ break; ++ ++ case ACPI_RSC_MOVE_SERIAL_RES: ++ ++ destination = (char *)ACPI_ADD_PTR(void, aml, ++ (aml_length - ++ item_count)); ++ source = *(u8 **)source; ++ acpi_rs_move_data(destination, source, item_count, ++ info->opcode); ++ break; + + case ACPI_RSC_ADDRESS: + +diff -Naur linux-3.2.1/drivers/acpi/acpica/rsserial.c linux-3.2.1.patch/drivers/acpi/acpica/rsserial.c +--- linux-3.2.1/drivers/acpi/acpica/rsserial.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/rsserial.c 2012-01-24 15:56:00.205520782 +0100 +@@ -0,0 +1,441 @@ ++/******************************************************************************* ++ * ++ * Module Name: rsserial - GPIO/serial_bus resource descriptors ++ * ++ ******************************************************************************/ ++ ++/* ++ * Copyright (C) 2000 - 2011, Intel Corp. ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce at minimum a disclaimer ++ * substantially similar to the "NO WARRANTY" disclaimer below ++ * ("Disclaimer") and any redistribution must be conditioned upon ++ * including a substantially similar Disclaimer requirement for further ++ * binary redistribution. ++ * 3. Neither the names of the above-listed copyright holders nor the names ++ * of any contributors may be used to endorse or promote products derived ++ * from this software without specific prior written permission. ++ * ++ * Alternatively, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2 as published by the Free ++ * Software Foundation. ++ * ++ * NO WARRANTY ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR ++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING ++ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ++ * POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#include ++#include "accommon.h" ++#include "acresrc.h" ++ ++#define _COMPONENT ACPI_RESOURCES ++ACPI_MODULE_NAME("rsserial") ++ ++/******************************************************************************* ++ * ++ * acpi_rs_convert_gpio ++ * ++ ******************************************************************************/ ++struct acpi_rsconvert_info acpi_rs_convert_gpio[17] = { ++ {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_GPIO, ++ ACPI_RS_SIZE(struct acpi_resource_gpio), ++ ACPI_RSC_TABLE_SIZE(acpi_rs_convert_gpio)}, ++ ++ {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_GPIO, ++ sizeof(struct aml_resource_gpio), ++ 0}, ++ ++ /* ++ * These fields are contiguous in both the source and destination: ++ * revision_id ++ * connection_type ++ */ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.revision_id), ++ AML_OFFSET(gpio.revision_id), ++ 2}, ++ ++ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.producer_consumer), ++ AML_OFFSET(gpio.flags), ++ 0}, ++ ++ {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.sharable), ++ AML_OFFSET(gpio.int_flags), ++ 3}, ++ ++ {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.io_restriction), ++ AML_OFFSET(gpio.int_flags), ++ 0}, ++ ++ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.triggering), ++ AML_OFFSET(gpio.int_flags), ++ 0}, ++ ++ {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.gpio.polarity), ++ AML_OFFSET(gpio.int_flags), ++ 1}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.pin_config), ++ AML_OFFSET(gpio.pin_config), ++ 1}, ++ ++ /* ++ * These fields are contiguous in both the source and destination: ++ * drive_strength ++ * debounce_timeout ++ */ ++ {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.gpio.drive_strength), ++ AML_OFFSET(gpio.drive_strength), ++ 2}, ++ ++ /* Pin Table */ ++ ++ {ACPI_RSC_COUNT_GPIO_PIN, ACPI_RS_OFFSET(data.gpio.pin_table_length), ++ AML_OFFSET(gpio.pin_table_offset), ++ AML_OFFSET(gpio.res_source_offset)}, ++ ++ {ACPI_RSC_MOVE_GPIO_PIN, ACPI_RS_OFFSET(data.gpio.pin_table), ++ AML_OFFSET(gpio.pin_table_offset), ++ 0}, ++ ++ /* Resource Source */ ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.gpio.resource_source.index), ++ AML_OFFSET(gpio.res_source_index), ++ 1}, ++ ++ {ACPI_RSC_COUNT_GPIO_RES, ++ ACPI_RS_OFFSET(data.gpio.resource_source.string_length), ++ AML_OFFSET(gpio.res_source_offset), ++ AML_OFFSET(gpio.vendor_offset)}, ++ ++ {ACPI_RSC_MOVE_GPIO_RES, ++ ACPI_RS_OFFSET(data.gpio.resource_source.string_ptr), ++ AML_OFFSET(gpio.res_source_offset), ++ 0}, ++ ++ /* Vendor Data */ ++ ++ {ACPI_RSC_COUNT_GPIO_VEN, ACPI_RS_OFFSET(data.gpio.vendor_length), ++ AML_OFFSET(gpio.vendor_length), ++ 1}, ++ ++ {ACPI_RSC_MOVE_GPIO_RES, ACPI_RS_OFFSET(data.gpio.vendor_data), ++ AML_OFFSET(gpio.vendor_offset), ++ 0}, ++}; ++ ++/******************************************************************************* ++ * ++ * acpi_rs_convert_i2c_serial_bus ++ * ++ ******************************************************************************/ ++ ++struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[16] = { ++ {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS, ++ ACPI_RS_SIZE(struct acpi_resource_i2c_serialbus), ++ ACPI_RSC_TABLE_SIZE(acpi_rs_convert_i2c_serial_bus)}, ++ ++ {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS, ++ sizeof(struct aml_resource_i2c_serialbus), ++ 0}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id), ++ AML_OFFSET(common_serial_bus.revision_id), ++ 1}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type), ++ AML_OFFSET(common_serial_bus.type), ++ 1}, ++ ++ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode), ++ AML_OFFSET(common_serial_bus.flags), ++ 0}, ++ ++ {ACPI_RSC_1BITFLAG, ++ ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer), ++ AML_OFFSET(common_serial_bus.flags), ++ 1}, ++ ++ {ACPI_RSC_MOVE8, ++ ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id), ++ AML_OFFSET(common_serial_bus.type_revision_id), ++ 1}, ++ ++ {ACPI_RSC_MOVE16, ++ ACPI_RS_OFFSET(data.common_serial_bus.type_data_length), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ 1}, ++ ++ /* Vendor data */ ++ ++ {ACPI_RSC_COUNT_SERIAL_VEN, ++ ACPI_RS_OFFSET(data.common_serial_bus.vendor_length), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ AML_RESOURCE_I2C_MIN_DATA_LEN}, ++ ++ {ACPI_RSC_MOVE_SERIAL_VEN, ++ ACPI_RS_OFFSET(data.common_serial_bus.vendor_data), ++ 0, ++ sizeof(struct aml_resource_i2c_serialbus)}, ++ ++ /* Resource Source */ ++ ++ {ACPI_RSC_MOVE8, ++ ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index), ++ AML_OFFSET(common_serial_bus.res_source_index), ++ 1}, ++ ++ {ACPI_RSC_COUNT_SERIAL_RES, ++ ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ sizeof(struct aml_resource_common_serialbus)}, ++ ++ {ACPI_RSC_MOVE_SERIAL_RES, ++ ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ sizeof(struct aml_resource_common_serialbus)}, ++ ++ /* I2C bus type specific */ ++ ++ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.i2c_serial_bus.access_mode), ++ AML_OFFSET(i2c_serial_bus.type_specific_flags), ++ 0}, ++ ++ {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.i2c_serial_bus.connection_speed), ++ AML_OFFSET(i2c_serial_bus.connection_speed), ++ 1}, ++ ++ {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.i2c_serial_bus.slave_address), ++ AML_OFFSET(i2c_serial_bus.slave_address), ++ 1}, ++}; ++ ++/******************************************************************************* ++ * ++ * acpi_rs_convert_spi_serial_bus ++ * ++ ******************************************************************************/ ++ ++struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[20] = { ++ {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS, ++ ACPI_RS_SIZE(struct acpi_resource_spi_serialbus), ++ ACPI_RSC_TABLE_SIZE(acpi_rs_convert_spi_serial_bus)}, ++ ++ {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS, ++ sizeof(struct aml_resource_spi_serialbus), ++ 0}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id), ++ AML_OFFSET(common_serial_bus.revision_id), ++ 1}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type), ++ AML_OFFSET(common_serial_bus.type), ++ 1}, ++ ++ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode), ++ AML_OFFSET(common_serial_bus.flags), ++ 0}, ++ ++ {ACPI_RSC_1BITFLAG, ++ ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer), ++ AML_OFFSET(common_serial_bus.flags), ++ 1}, ++ ++ {ACPI_RSC_MOVE8, ++ ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id), ++ AML_OFFSET(common_serial_bus.type_revision_id), ++ 1}, ++ ++ {ACPI_RSC_MOVE16, ++ ACPI_RS_OFFSET(data.common_serial_bus.type_data_length), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ 1}, ++ ++ /* Vendor data */ ++ ++ {ACPI_RSC_COUNT_SERIAL_VEN, ++ ACPI_RS_OFFSET(data.common_serial_bus.vendor_length), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ AML_RESOURCE_SPI_MIN_DATA_LEN}, ++ ++ {ACPI_RSC_MOVE_SERIAL_VEN, ++ ACPI_RS_OFFSET(data.common_serial_bus.vendor_data), ++ 0, ++ sizeof(struct aml_resource_spi_serialbus)}, ++ ++ /* Resource Source */ ++ ++ {ACPI_RSC_MOVE8, ++ ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index), ++ AML_OFFSET(common_serial_bus.res_source_index), ++ 1}, ++ ++ {ACPI_RSC_COUNT_SERIAL_RES, ++ ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ sizeof(struct aml_resource_common_serialbus)}, ++ ++ {ACPI_RSC_MOVE_SERIAL_RES, ++ ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ sizeof(struct aml_resource_common_serialbus)}, ++ ++ /* Spi bus type specific */ ++ ++ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.spi_serial_bus.wire_mode), ++ AML_OFFSET(spi_serial_bus.type_specific_flags), ++ 0}, ++ ++ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.spi_serial_bus.device_polarity), ++ AML_OFFSET(spi_serial_bus.type_specific_flags), ++ 1}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.data_bit_length), ++ AML_OFFSET(spi_serial_bus.data_bit_length), ++ 1}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.clock_phase), ++ AML_OFFSET(spi_serial_bus.clock_phase), ++ 1}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.spi_serial_bus.clock_polarity), ++ AML_OFFSET(spi_serial_bus.clock_polarity), ++ 1}, ++ ++ {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.spi_serial_bus.device_selection), ++ AML_OFFSET(spi_serial_bus.device_selection), ++ 1}, ++ ++ {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.spi_serial_bus.connection_speed), ++ AML_OFFSET(spi_serial_bus.connection_speed), ++ 1}, ++}; ++ ++/******************************************************************************* ++ * ++ * acpi_rs_convert_uart_serial_bus ++ * ++ ******************************************************************************/ ++ ++struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[22] = { ++ {ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS, ++ ACPI_RS_SIZE(struct acpi_resource_uart_serialbus), ++ ACPI_RSC_TABLE_SIZE(acpi_rs_convert_uart_serial_bus)}, ++ ++ {ACPI_RSC_INITSET, ACPI_RESOURCE_NAME_SERIAL_BUS, ++ sizeof(struct aml_resource_uart_serialbus), ++ 0}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.revision_id), ++ AML_OFFSET(common_serial_bus.revision_id), ++ 1}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.common_serial_bus.type), ++ AML_OFFSET(common_serial_bus.type), ++ 1}, ++ ++ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.common_serial_bus.slave_mode), ++ AML_OFFSET(common_serial_bus.flags), ++ 0}, ++ ++ {ACPI_RSC_1BITFLAG, ++ ACPI_RS_OFFSET(data.common_serial_bus.producer_consumer), ++ AML_OFFSET(common_serial_bus.flags), ++ 1}, ++ ++ {ACPI_RSC_MOVE8, ++ ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id), ++ AML_OFFSET(common_serial_bus.type_revision_id), ++ 1}, ++ ++ {ACPI_RSC_MOVE16, ++ ACPI_RS_OFFSET(data.common_serial_bus.type_data_length), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ 1}, ++ ++ /* Vendor data */ ++ ++ {ACPI_RSC_COUNT_SERIAL_VEN, ++ ACPI_RS_OFFSET(data.common_serial_bus.vendor_length), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ AML_RESOURCE_UART_MIN_DATA_LEN}, ++ ++ {ACPI_RSC_MOVE_SERIAL_VEN, ++ ACPI_RS_OFFSET(data.common_serial_bus.vendor_data), ++ 0, ++ sizeof(struct aml_resource_uart_serialbus)}, ++ ++ /* Resource Source */ ++ ++ {ACPI_RSC_MOVE8, ++ ACPI_RS_OFFSET(data.common_serial_bus.resource_source.index), ++ AML_OFFSET(common_serial_bus.res_source_index), ++ 1}, ++ ++ {ACPI_RSC_COUNT_SERIAL_RES, ++ ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_length), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ sizeof(struct aml_resource_common_serialbus)}, ++ ++ {ACPI_RSC_MOVE_SERIAL_RES, ++ ACPI_RS_OFFSET(data.common_serial_bus.resource_source.string_ptr), ++ AML_OFFSET(common_serial_bus.type_data_length), ++ sizeof(struct aml_resource_common_serialbus)}, ++ ++ /* Uart bus type specific */ ++ ++ {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.flow_control), ++ AML_OFFSET(uart_serial_bus.type_specific_flags), ++ 0}, ++ ++ {ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.stop_bits), ++ AML_OFFSET(uart_serial_bus.type_specific_flags), ++ 2}, ++ ++ {ACPI_RSC_3BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.data_bits), ++ AML_OFFSET(uart_serial_bus.type_specific_flags), ++ 4}, ++ ++ {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.uart_serial_bus.endian), ++ AML_OFFSET(uart_serial_bus.type_specific_flags), ++ 7}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.uart_serial_bus.parity), ++ AML_OFFSET(uart_serial_bus.parity), ++ 1}, ++ ++ {ACPI_RSC_MOVE8, ACPI_RS_OFFSET(data.uart_serial_bus.lines_enabled), ++ AML_OFFSET(uart_serial_bus.lines_enabled), ++ 1}, ++ ++ {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.uart_serial_bus.rx_fifo_size), ++ AML_OFFSET(uart_serial_bus.rx_fifo_size), ++ 1}, ++ ++ {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.uart_serial_bus.tx_fifo_size), ++ AML_OFFSET(uart_serial_bus.tx_fifo_size), ++ 1}, ++ ++ {ACPI_RSC_MOVE32, ++ ACPI_RS_OFFSET(data.uart_serial_bus.default_baud_rate), ++ AML_OFFSET(uart_serial_bus.default_baud_rate), ++ 1}, ++}; +diff -Naur linux-3.2.1/drivers/acpi/acpica/rsutils.c linux-3.2.1.patch/drivers/acpi/acpica/rsutils.c +--- linux-3.2.1/drivers/acpi/acpica/rsutils.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/rsutils.c 2012-01-24 15:56:05.879618878 +0100 +@@ -144,6 +144,9 @@ + * since there are no alignment or endian issues + */ + case ACPI_RSC_MOVE8: ++ case ACPI_RSC_MOVE_GPIO_RES: ++ case ACPI_RSC_MOVE_SERIAL_VEN: ++ case ACPI_RSC_MOVE_SERIAL_RES: + ACPI_MEMCPY(destination, source, item_count); + return; + +@@ -153,6 +156,7 @@ + * misaligned memory transfers + */ + case ACPI_RSC_MOVE16: ++ case ACPI_RSC_MOVE_GPIO_PIN: + ACPI_MOVE_16_TO_16(&ACPI_CAST_PTR(u16, destination)[i], + &ACPI_CAST_PTR(u16, source)[i]); + break; +@@ -590,6 +594,56 @@ + + /******************************************************************************* + * ++ * FUNCTION: acpi_rs_get_aei_method_data ++ * ++ * PARAMETERS: Node - Device node ++ * ret_buffer - Pointer to a buffer structure for the ++ * results ++ * ++ * RETURN: Status ++ * ++ * DESCRIPTION: This function is called to get the _AEI value of an object ++ * contained in an object specified by the handle passed in ++ * ++ * If the function fails an appropriate status will be returned ++ * and the contents of the callers buffer is undefined. ++ * ++ ******************************************************************************/ ++ ++acpi_status ++acpi_rs_get_aei_method_data(struct acpi_namespace_node *node, ++ struct acpi_buffer *ret_buffer) ++{ ++ union acpi_operand_object *obj_desc; ++ acpi_status status; ++ ++ ACPI_FUNCTION_TRACE(rs_get_aei_method_data); ++ ++ /* Parameters guaranteed valid by caller */ ++ ++ /* Execute the method, no parameters */ ++ ++ status = acpi_ut_evaluate_object(node, METHOD_NAME__AEI, ++ ACPI_BTYPE_BUFFER, &obj_desc); ++ if (ACPI_FAILURE(status)) { ++ return_ACPI_STATUS(status); ++ } ++ ++ /* ++ * Make the call to create a resource linked list from the ++ * byte stream buffer that comes back from the _CRS method ++ * execution. ++ */ ++ status = acpi_rs_create_resource_list(obj_desc, ret_buffer); ++ ++ /* On exit, we must delete the object returned by evaluate_object */ ++ ++ acpi_ut_remove_reference(obj_desc); ++ return_ACPI_STATUS(status); ++} ++ ++/******************************************************************************* ++ * + * FUNCTION: acpi_rs_get_method_data + * + * PARAMETERS: Handle - Handle to the containing object +diff -Naur linux-3.2.1/drivers/acpi/acpica/rsxface.c linux-3.2.1.patch/drivers/acpi/acpica/rsxface.c +--- linux-3.2.1/drivers/acpi/acpica/rsxface.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/rsxface.c 2012-01-24 15:56:15.788790193 +0100 +@@ -307,6 +307,46 @@ + + ACPI_EXPORT_SYMBOL(acpi_set_current_resources) + ++/******************************************************************************* ++ * ++ * FUNCTION: acpi_get_event_resources ++ * ++ * PARAMETERS: device_handle - Handle to the device object for the ++ * device we are getting resources ++ * in_buffer - Pointer to a buffer containing the ++ * resources to be set for the device ++ * ++ * RETURN: Status ++ * ++ * DESCRIPTION: This function is called to get the event resources for a ++ * specific device. The caller must first acquire a handle for ++ * the desired device. The resource data is passed to the routine ++ * the buffer pointed to by the in_buffer variable. Uses the ++ * _AEI method. ++ * ++ ******************************************************************************/ ++acpi_status ++acpi_get_event_resources(acpi_handle device_handle, ++ struct acpi_buffer *ret_buffer) ++{ ++ acpi_status status; ++ struct acpi_namespace_node *node; ++ ++ ACPI_FUNCTION_TRACE(acpi_get_event_resources); ++ ++ /* Validate parameters then dispatch to internal routine */ ++ ++ status = acpi_rs_validate_parameters(device_handle, ret_buffer, &node); ++ if (ACPI_FAILURE(status)) { ++ return_ACPI_STATUS(status); ++ } ++ ++ status = acpi_rs_get_aei_method_data(node, ret_buffer); ++ return_ACPI_STATUS(status); ++} ++ ++ACPI_EXPORT_SYMBOL(acpi_get_event_resources) ++ + /****************************************************************************** + * + * FUNCTION: acpi_resource_to_address64 +@@ -486,8 +526,9 @@ + * + * PARAMETERS: device_handle - Handle to the device object for the + * device we are querying +- * Name - Method name of the resources we want +- * (METHOD_NAME__CRS or METHOD_NAME__PRS) ++ * Name - Method name of the resources we want. ++ * (METHOD_NAME__CRS, METHOD_NAME__PRS, or ++ * METHOD_NAME__AEI) + * user_function - Called for each resource + * Context - Passed to user_function + * +@@ -514,11 +555,12 @@ + + if (!device_handle || !user_function || !name || + (!ACPI_COMPARE_NAME(name, METHOD_NAME__CRS) && +- !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS))) { ++ !ACPI_COMPARE_NAME(name, METHOD_NAME__PRS) && ++ !ACPI_COMPARE_NAME(name, METHOD_NAME__AEI))) { + return_ACPI_STATUS(AE_BAD_PARAMETER); + } + +- /* Get the _CRS or _PRS resource list */ ++ /* Get the _CRS/_PRS/_AEI resource list */ + + buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER; + status = acpi_rs_get_method_data(device_handle, name, &buffer); +diff -Naur linux-3.2.1/drivers/acpi/acpica/tbfadt.c linux-3.2.1.patch/drivers/acpi/acpica/tbfadt.c +--- linux-3.2.1/drivers/acpi/acpica/tbfadt.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/tbfadt.c 2012-01-24 15:55:37.023119997 +0100 +@@ -253,8 +253,13 @@ + acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xdsdt, + ACPI_SIG_DSDT, ACPI_TABLE_INDEX_DSDT); + +- acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xfacs, +- ACPI_SIG_FACS, ACPI_TABLE_INDEX_FACS); ++ /* If Hardware Reduced flag is set, there is no FACS */ ++ ++ if (!acpi_gbl_reduced_hardware) { ++ acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT. ++ Xfacs, ACPI_SIG_FACS, ++ ACPI_TABLE_INDEX_FACS); ++ } + } + + /******************************************************************************* +@@ -277,12 +282,12 @@ + { + /* + * Check if the FADT is larger than the largest table that we expect +- * (the ACPI 2.0/3.0 version). If so, truncate the table, and issue ++ * (the ACPI 5.0 version). If so, truncate the table, and issue + * a warning. + */ + if (length > sizeof(struct acpi_table_fadt)) { + ACPI_WARNING((AE_INFO, +- "FADT (revision %u) is longer than ACPI 2.0 version, " ++ "FADT (revision %u) is longer than ACPI 5.0 version, " + "truncating length %u to %u", + table->revision, length, + (u32)sizeof(struct acpi_table_fadt))); +@@ -297,6 +302,13 @@ + ACPI_MEMCPY(&acpi_gbl_FADT, table, + ACPI_MIN(length, sizeof(struct acpi_table_fadt))); + ++ /* Take a copy of the Hardware Reduced flag */ ++ ++ acpi_gbl_reduced_hardware = FALSE; ++ if (acpi_gbl_FADT.flags & ACPI_FADT_HW_REDUCED) { ++ acpi_gbl_reduced_hardware = TRUE; ++ } ++ + /* Convert the local copy of the FADT to the common internal format */ + + acpi_tb_convert_fadt(); +@@ -502,6 +514,12 @@ + acpi_gbl_FADT.Xdsdt = (u64) acpi_gbl_FADT.dsdt; + } + ++ /* If Hardware Reduced flag is set, we are all done */ ++ ++ if (acpi_gbl_reduced_hardware) { ++ return; ++ } ++ + /* Examine all of the 64-bit extended address fields (X fields) */ + + for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) { +diff -Naur linux-3.2.1/drivers/acpi/acpica/tbutils.c linux-3.2.1.patch/drivers/acpi/acpica/tbutils.c +--- linux-3.2.1/drivers/acpi/acpica/tbutils.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/tbutils.c 2012-01-24 15:55:37.024120014 +0100 +@@ -135,6 +135,13 @@ + { + acpi_status status; + ++ /* If Hardware Reduced flag is set, there is no FACS */ ++ ++ if (acpi_gbl_reduced_hardware) { ++ acpi_gbl_FACS = NULL; ++ return (AE_OK); ++ } ++ + status = acpi_get_table_by_index(ACPI_TABLE_INDEX_FACS, + ACPI_CAST_INDIRECT_PTR(struct + acpi_table_header, +diff -Naur linux-3.2.1/drivers/acpi/acpica/utdecode.c linux-3.2.1.patch/drivers/acpi/acpica/utdecode.c +--- linux-3.2.1/drivers/acpi/acpica/utdecode.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/utdecode.c 2012-01-24 15:55:55.204434322 +0100 +@@ -171,7 +171,9 @@ + "SMBus", + "SystemCMOS", + "PCIBARTarget", +- "IPMI" ++ "IPMI", ++ "GeneralPurposeIo", ++ "GenericSerialBus" + }; + + char *acpi_ut_get_region_name(u8 space_id) +diff -Naur linux-3.2.1/drivers/acpi/acpica/utmutex.c linux-3.2.1.patch/drivers/acpi/acpica/utmutex.c +--- linux-3.2.1/drivers/acpi/acpica/utmutex.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/utmutex.c 2012-01-24 15:55:09.132637816 +0100 +@@ -293,14 +293,10 @@ + + acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id) + { +- acpi_thread_id this_thread_id; +- + ACPI_FUNCTION_NAME(ut_release_mutex); + +- this_thread_id = acpi_os_get_thread_id(); +- + ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Thread %u releasing Mutex [%s]\n", +- (u32)this_thread_id, ++ (u32)acpi_os_get_thread_id(), + acpi_ut_get_mutex_name(mutex_id))); + + if (mutex_id > ACPI_MAX_MUTEX) { +@@ -329,7 +325,8 @@ + * the ACPI subsystem code. + */ + for (i = mutex_id; i < ACPI_NUM_MUTEX; i++) { +- if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) { ++ if (acpi_gbl_mutex_info[i].thread_id == ++ acpi_os_get_thread_id()) { + if (i == mutex_id) { + continue; + } +diff -Naur linux-3.2.1/drivers/acpi/acpica/utresrc.c linux-3.2.1.patch/drivers/acpi/acpica/utresrc.c +--- linux-3.2.1/drivers/acpi/acpica/utresrc.c 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/utresrc.c 2012-01-24 15:56:00.215520955 +0100 +@@ -43,7 +43,7 @@ + + #include + #include "accommon.h" +-#include "amlresrc.h" ++#include "acresrc.h" + + #define _COMPONENT ACPI_UTILITIES + ACPI_MODULE_NAME("utresrc") +@@ -154,6 +154,138 @@ + "TypeF" + }; + ++const char *acpi_gbl_ppc_decode[] = { ++ "PullDefault", ++ "PullUp", ++ "PullDown", ++ "PullNone" ++}; ++ ++const char *acpi_gbl_ior_decode[] = { ++ "IoRestrictionNone", ++ "IoRestrictionInputOnly", ++ "IoRestrictionOutputOnly", ++ "IoRestrictionNoneAndPreserve" ++}; ++ ++const char *acpi_gbl_dts_decode[] = { ++ "Width8bit", ++ "Width16bit", ++ "Width32bit", ++ "Width64bit", ++ "Width128bit", ++ "Width256bit", ++}; ++ ++/* GPIO connection type */ ++ ++const char *acpi_gbl_ct_decode[] = { ++ "Interrupt", ++ "I/O" ++}; ++ ++/* Serial bus type */ ++ ++const char *acpi_gbl_sbt_decode[] = { ++ "/* UNKNOWN serial bus type */", ++ "I2C", ++ "SPI", ++ "UART" ++}; ++ ++/* I2C serial bus access mode */ ++ ++const char *acpi_gbl_am_decode[] = { ++ "AddressingMode7Bit", ++ "AddressingMode10Bit" ++}; ++ ++/* I2C serial bus slave mode */ ++ ++const char *acpi_gbl_sm_decode[] = { ++ "ControllerInitiated", ++ "DeviceInitiated" ++}; ++ ++/* SPI serial bus wire mode */ ++ ++const char *acpi_gbl_wm_decode[] = { ++ "FourWireMode", ++ "ThreeWireMode" ++}; ++ ++/* SPI serial clock phase */ ++ ++const char *acpi_gbl_cph_decode[] = { ++ "ClockPhaseFirst", ++ "ClockPhaseSecond" ++}; ++ ++/* SPI serial bus clock polarity */ ++ ++const char *acpi_gbl_cpo_decode[] = { ++ "ClockPolarityLow", ++ "ClockPolarityHigh" ++}; ++ ++/* SPI serial bus device polarity */ ++ ++const char *acpi_gbl_dp_decode[] = { ++ "PolarityLow", ++ "PolarityHigh" ++}; ++ ++/* UART serial bus endian */ ++ ++const char *acpi_gbl_ed_decode[] = { ++ "LittleEndian", ++ "BigEndian" ++}; ++ ++/* UART serial bus bits per byte */ ++ ++const char *acpi_gbl_bpb_decode[] = { ++ "DataBitsFive", ++ "DataBitsSix", ++ "DataBitsSeven", ++ "DataBitsEight", ++ "DataBitsNine", ++ "/* UNKNOWN Bits per byte */", ++ "/* UNKNOWN Bits per byte */", ++ "/* UNKNOWN Bits per byte */" ++}; ++ ++/* UART serial bus stop bits */ ++ ++const char *acpi_gbl_sb_decode[] = { ++ "StopBitsNone", ++ "StopBitsOne", ++ "StopBitsOnePlusHalf", ++ "StopBitsTwo" ++}; ++ ++/* UART serial bus flow control */ ++ ++const char *acpi_gbl_fc_decode[] = { ++ "FlowControlNone", ++ "FlowControlHardware", ++ "FlowControlXON", ++ "/* UNKNOWN flow control keyword */" ++}; ++ ++/* UART serial bus parity type */ ++ ++const char *acpi_gbl_pt_decode[] = { ++ "ParityTypeNone", ++ "ParityTypeEven", ++ "ParityTypeOdd", ++ "ParityTypeMark", ++ "ParityTypeSpace", ++ "/* UNKNOWN parity keyword */", ++ "/* UNKNOWN parity keyword */", ++ "/* UNKNOWN parity keyword */" ++}; ++ + #endif + + /* +@@ -173,7 +305,7 @@ + ACPI_AML_SIZE_SMALL(struct aml_resource_end_dependent), + ACPI_AML_SIZE_SMALL(struct aml_resource_io), + ACPI_AML_SIZE_SMALL(struct aml_resource_fixed_io), +- 0, ++ ACPI_AML_SIZE_SMALL(struct aml_resource_fixed_dma), + 0, + 0, + 0, +@@ -193,7 +325,17 @@ + ACPI_AML_SIZE_LARGE(struct aml_resource_address16), + ACPI_AML_SIZE_LARGE(struct aml_resource_extended_irq), + ACPI_AML_SIZE_LARGE(struct aml_resource_address64), +- ACPI_AML_SIZE_LARGE(struct aml_resource_extended_address64) ++ ACPI_AML_SIZE_LARGE(struct aml_resource_extended_address64), ++ ACPI_AML_SIZE_LARGE(struct aml_resource_gpio), ++ 0, ++ ACPI_AML_SIZE_LARGE(struct aml_resource_common_serialbus), ++}; ++ ++const u8 acpi_gbl_resource_aml_serial_bus_sizes[] = { ++ 0, ++ ACPI_AML_SIZE_LARGE(struct aml_resource_i2c_serialbus), ++ ACPI_AML_SIZE_LARGE(struct aml_resource_spi_serialbus), ++ ACPI_AML_SIZE_LARGE(struct aml_resource_uart_serialbus), + }; + + /* +@@ -209,35 +351,49 @@ + 0, + 0, + 0, +- ACPI_SMALL_VARIABLE_LENGTH, +- ACPI_FIXED_LENGTH, +- ACPI_SMALL_VARIABLE_LENGTH, +- ACPI_FIXED_LENGTH, +- ACPI_FIXED_LENGTH, +- ACPI_FIXED_LENGTH, +- 0, ++ ACPI_SMALL_VARIABLE_LENGTH, /* 04 IRQ */ ++ ACPI_FIXED_LENGTH, /* 05 DMA */ ++ ACPI_SMALL_VARIABLE_LENGTH, /* 06 start_dependent_functions */ ++ ACPI_FIXED_LENGTH, /* 07 end_dependent_functions */ ++ ACPI_FIXED_LENGTH, /* 08 IO */ ++ ACPI_FIXED_LENGTH, /* 09 fixed_iO */ ++ ACPI_FIXED_LENGTH, /* 0_a fixed_dMA */ + 0, + 0, + 0, +- ACPI_VARIABLE_LENGTH, +- ACPI_FIXED_LENGTH, ++ ACPI_VARIABLE_LENGTH, /* 0_e vendor_short */ ++ ACPI_FIXED_LENGTH, /* 0_f end_tag */ + + /* Large descriptors */ + + 0, +- ACPI_FIXED_LENGTH, +- ACPI_FIXED_LENGTH, ++ ACPI_FIXED_LENGTH, /* 01 Memory24 */ ++ ACPI_FIXED_LENGTH, /* 02 generic_register */ ++ 0, ++ ACPI_VARIABLE_LENGTH, /* 04 vendor_long */ ++ ACPI_FIXED_LENGTH, /* 05 Memory32 */ ++ ACPI_FIXED_LENGTH, /* 06 memory32_fixed */ ++ ACPI_VARIABLE_LENGTH, /* 07 Dword* address */ ++ ACPI_VARIABLE_LENGTH, /* 08 Word* address */ ++ ACPI_VARIABLE_LENGTH, /* 09 extended_iRQ */ ++ ACPI_VARIABLE_LENGTH, /* 0_a Qword* address */ ++ ACPI_FIXED_LENGTH, /* 0_b Extended* address */ ++ ACPI_VARIABLE_LENGTH, /* 0_c Gpio* */ + 0, +- ACPI_VARIABLE_LENGTH, +- ACPI_FIXED_LENGTH, +- ACPI_FIXED_LENGTH, +- ACPI_VARIABLE_LENGTH, +- ACPI_VARIABLE_LENGTH, +- ACPI_VARIABLE_LENGTH, +- ACPI_VARIABLE_LENGTH, +- ACPI_FIXED_LENGTH ++ ACPI_VARIABLE_LENGTH /* 0_e *serial_bus */ + }; + ++/* ++ * For the i_aSL compiler/disassembler, we don't want any error messages ++ * because the disassembler uses the resource validation code to determine ++ * if Buffer objects are actually Resource Templates. ++ */ ++#ifdef ACPI_ASL_COMPILER ++#define ACPI_RESOURCE_ERROR(plist) ++#else ++#define ACPI_RESOURCE_ERROR(plist) ACPI_ERROR(plist) ++#endif ++ + /******************************************************************************* + * + * FUNCTION: acpi_ut_walk_aml_resources +@@ -265,6 +421,7 @@ + u8 resource_index; + u32 length; + u32 offset = 0; ++ u8 end_tag[2] = { 0x79, 0x00 }; + + ACPI_FUNCTION_TRACE(ut_walk_aml_resources); + +@@ -286,6 +443,10 @@ + + status = acpi_ut_validate_resource(aml, &resource_index); + if (ACPI_FAILURE(status)) { ++ /* ++ * Exit on failure. Cannot continue because the descriptor length ++ * may be bogus also. ++ */ + return_ACPI_STATUS(status); + } + +@@ -300,7 +461,7 @@ + user_function(aml, length, offset, resource_index, + context); + if (ACPI_FAILURE(status)) { +- return (status); ++ return_ACPI_STATUS(status); + } + } + +@@ -333,7 +494,19 @@ + + /* Did not find an end_tag descriptor */ + +- return (AE_AML_NO_RESOURCE_END_TAG); ++ if (user_function) { ++ ++ /* Insert an end_tag anyway. acpi_rs_get_list_length always leaves room */ ++ ++ (void)acpi_ut_validate_resource(end_tag, &resource_index); ++ status = ++ user_function(end_tag, 2, offset, resource_index, context); ++ if (ACPI_FAILURE(status)) { ++ return_ACPI_STATUS(status); ++ } ++ } ++ ++ return_ACPI_STATUS(AE_AML_NO_RESOURCE_END_TAG); + } + + /******************************************************************************* +@@ -354,6 +527,7 @@ + + acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index) + { ++ union aml_resource *aml_resource; + u8 resource_type; + u8 resource_index; + acpi_rs_length resource_length; +@@ -375,7 +549,7 @@ + /* Verify the large resource type (name) against the max */ + + if (resource_type > ACPI_RESOURCE_NAME_LARGE_MAX) { +- return (AE_AML_INVALID_RESOURCE_TYPE); ++ goto invalid_resource; + } + + /* +@@ -392,15 +566,17 @@ + ((resource_type & ACPI_RESOURCE_NAME_SMALL_MASK) >> 3); + } + +- /* Check validity of the resource type, zero indicates name is invalid */ +- ++ /* ++ * Check validity of the resource type, via acpi_gbl_resource_types. Zero ++ * indicates an invalid resource. ++ */ + if (!acpi_gbl_resource_types[resource_index]) { +- return (AE_AML_INVALID_RESOURCE_TYPE); ++ goto invalid_resource; + } + + /* +- * 2) Validate the resource_length field. This ensures that the length +- * is at least reasonable, and guarantees that it is non-zero. ++ * Validate the resource_length field. This ensures that the length ++ * is at least reasonable, and guarantees that it is non-zero. + */ + resource_length = acpi_ut_get_resource_length(aml); + minimum_resource_length = acpi_gbl_resource_aml_sizes[resource_index]; +@@ -413,7 +589,7 @@ + /* Fixed length resource, length must match exactly */ + + if (resource_length != minimum_resource_length) { +- return (AE_AML_BAD_RESOURCE_LENGTH); ++ goto bad_resource_length; + } + break; + +@@ -422,7 +598,7 @@ + /* Variable length resource, length must be at least the minimum */ + + if (resource_length < minimum_resource_length) { +- return (AE_AML_BAD_RESOURCE_LENGTH); ++ goto bad_resource_length; + } + break; + +@@ -432,7 +608,7 @@ + + if ((resource_length > minimum_resource_length) || + (resource_length < (minimum_resource_length - 1))) { +- return (AE_AML_BAD_RESOURCE_LENGTH); ++ goto bad_resource_length; + } + break; + +@@ -440,7 +616,23 @@ + + /* Shouldn't happen (because of validation earlier), but be sure */ + +- return (AE_AML_INVALID_RESOURCE_TYPE); ++ goto invalid_resource; ++ } ++ ++ aml_resource = ACPI_CAST_PTR(union aml_resource, aml); ++ if (resource_type == ACPI_RESOURCE_NAME_SERIAL_BUS) { ++ ++ /* Validate the bus_type field */ ++ ++ if ((aml_resource->common_serial_bus.type == 0) || ++ (aml_resource->common_serial_bus.type > ++ AML_RESOURCE_MAX_SERIALBUSTYPE)) { ++ ACPI_RESOURCE_ERROR((AE_INFO, ++ "Invalid/unsupported SerialBus resource descriptor: BusType 0x%2.2X", ++ aml_resource->common_serial_bus. ++ type)); ++ return (AE_AML_INVALID_RESOURCE_TYPE); ++ } + } + + /* Optionally return the resource table index */ +@@ -450,6 +642,22 @@ + } + + return (AE_OK); ++ ++ invalid_resource: ++ ++ ACPI_RESOURCE_ERROR((AE_INFO, ++ "Invalid/unsupported resource descriptor: Type 0x%2.2X", ++ resource_type)); ++ return (AE_AML_INVALID_RESOURCE_TYPE); ++ ++ bad_resource_length: ++ ++ ACPI_RESOURCE_ERROR((AE_INFO, ++ "Invalid resource descriptor length: Type " ++ "0x%2.2X, Length 0x%4.4X, MinLength 0x%4.4X", ++ resource_type, resource_length, ++ minimum_resource_length)); ++ return (AE_AML_BAD_RESOURCE_LENGTH); + } + + /******************************************************************************* +diff -Naur linux-3.2.1/drivers/acpi/acpica/utxfmutex.c linux-3.2.1.patch/drivers/acpi/acpica/utxfmutex.c +--- linux-3.2.1/drivers/acpi/acpica/utxfmutex.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.1.patch/drivers/acpi/acpica/utxfmutex.c 2012-01-24 15:55:46.333280955 +0100 +@@ -0,0 +1,187 @@ ++/******************************************************************************* ++ * ++ * Module Name: utxfmutex - external AML mutex access functions ++ * ++ ******************************************************************************/ ++ ++/* ++ * Copyright (C) 2000 - 2011, Intel Corp. ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce at minimum a disclaimer ++ * substantially similar to the "NO WARRANTY" disclaimer below ++ * ("Disclaimer") and any redistribution must be conditioned upon ++ * including a substantially similar Disclaimer requirement for further ++ * binary redistribution. ++ * 3. Neither the names of the above-listed copyright holders nor the names ++ * of any contributors may be used to endorse or promote products derived ++ * from this software without specific prior written permission. ++ * ++ * Alternatively, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2 as published by the Free ++ * Software Foundation. ++ * ++ * NO WARRANTY ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR ++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING ++ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ++ * POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#include ++#include "accommon.h" ++#include "acnamesp.h" ++ ++#define _COMPONENT ACPI_UTILITIES ++ACPI_MODULE_NAME("utxfmutex") ++ ++/* Local prototypes */ ++static acpi_status ++acpi_ut_get_mutex_object(acpi_handle handle, ++ acpi_string pathname, ++ union acpi_operand_object **ret_obj); ++ ++/******************************************************************************* ++ * ++ * FUNCTION: acpi_ut_get_mutex_object ++ * ++ * PARAMETERS: Handle - Mutex or prefix handle (optional) ++ * Pathname - Mutex pathname (optional) ++ * ret_obj - Where the mutex object is returned ++ * ++ * RETURN: Status ++ * ++ * DESCRIPTION: Get an AML mutex object. The mutex node is pointed to by ++ * Handle:Pathname. Either Handle or Pathname can be NULL, but ++ * not both. ++ * ++ ******************************************************************************/ ++ ++static acpi_status ++acpi_ut_get_mutex_object(acpi_handle handle, ++ acpi_string pathname, ++ union acpi_operand_object **ret_obj) ++{ ++ struct acpi_namespace_node *mutex_node; ++ union acpi_operand_object *mutex_obj; ++ acpi_status status; ++ ++ /* Parameter validation */ ++ ++ if (!ret_obj || (!handle && !pathname)) { ++ return (AE_BAD_PARAMETER); ++ } ++ ++ /* Get a the namespace node for the mutex */ ++ ++ mutex_node = handle; ++ if (pathname != NULL) { ++ status = acpi_get_handle(handle, pathname, ++ ACPI_CAST_PTR(acpi_handle, ++ &mutex_node)); ++ if (ACPI_FAILURE(status)) { ++ return (status); ++ } ++ } ++ ++ /* Ensure that we actually have a Mutex object */ ++ ++ if (!mutex_node || (mutex_node->type != ACPI_TYPE_MUTEX)) { ++ return (AE_TYPE); ++ } ++ ++ /* Get the low-level mutex object */ ++ ++ mutex_obj = acpi_ns_get_attached_object(mutex_node); ++ if (!mutex_obj) { ++ return (AE_NULL_OBJECT); ++ } ++ ++ *ret_obj = mutex_obj; ++ return (AE_OK); ++} ++ ++/******************************************************************************* ++ * ++ * FUNCTION: acpi_acquire_mutex ++ * ++ * PARAMETERS: Handle - Mutex or prefix handle (optional) ++ * Pathname - Mutex pathname (optional) ++ * Timeout - Max time to wait for the lock (millisec) ++ * ++ * RETURN: Status ++ * ++ * DESCRIPTION: Acquire an AML mutex. This is a device driver interface to ++ * AML mutex objects, and allows for transaction locking between ++ * drivers and AML code. The mutex node is pointed to by ++ * Handle:Pathname. Either Handle or Pathname can be NULL, but ++ * not both. ++ * ++ ******************************************************************************/ ++ ++acpi_status ++acpi_acquire_mutex(acpi_handle handle, acpi_string pathname, u16 timeout) ++{ ++ acpi_status status; ++ union acpi_operand_object *mutex_obj; ++ ++ /* Get the low-level mutex associated with Handle:Pathname */ ++ ++ status = acpi_ut_get_mutex_object(handle, pathname, &mutex_obj); ++ if (ACPI_FAILURE(status)) { ++ return (status); ++ } ++ ++ /* Acquire the OS mutex */ ++ ++ status = acpi_os_acquire_mutex(mutex_obj->mutex.os_mutex, timeout); ++ return (status); ++} ++ ++/******************************************************************************* ++ * ++ * FUNCTION: acpi_release_mutex ++ * ++ * PARAMETERS: Handle - Mutex or prefix handle (optional) ++ * Pathname - Mutex pathname (optional) ++ * ++ * RETURN: Status ++ * ++ * DESCRIPTION: Release an AML mutex. This is a device driver interface to ++ * AML mutex objects, and allows for transaction locking between ++ * drivers and AML code. The mutex node is pointed to by ++ * Handle:Pathname. Either Handle or Pathname can be NULL, but ++ * not both. ++ * ++ ******************************************************************************/ ++ ++acpi_status acpi_release_mutex(acpi_handle handle, acpi_string pathname) ++{ ++ acpi_status status; ++ union acpi_operand_object *mutex_obj; ++ ++ /* Get the low-level mutex associated with Handle:Pathname */ ++ ++ status = acpi_ut_get_mutex_object(handle, pathname, &mutex_obj); ++ if (ACPI_FAILURE(status)) { ++ return (status); ++ } ++ ++ /* Release the OS mutex */ ++ ++ acpi_os_release_mutex(mutex_obj->mutex.os_mutex); ++ return (AE_OK); ++} +diff -Naur linux-3.2.1/include/acpi/acnames.h linux-3.2.1.patch/include/acpi/acnames.h +--- linux-3.2.1/include/acpi/acnames.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/include/acpi/acnames.h 2012-01-24 15:56:15.789790210 +0100 +@@ -58,6 +58,7 @@ + #define METHOD_NAME__PRT "_PRT" + #define METHOD_NAME__CRS "_CRS" + #define METHOD_NAME__PRS "_PRS" ++#define METHOD_NAME__AEI "_AEI" + #define METHOD_NAME__PRW "_PRW" + #define METHOD_NAME__SRS "_SRS" + +diff -Naur linux-3.2.1/include/acpi/acpixf.h linux-3.2.1.patch/include/acpi/acpixf.h +--- linux-3.2.1/include/acpi/acpixf.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/include/acpi/acpixf.h 2012-01-24 15:56:22.894913046 +0100 +@@ -47,7 +47,7 @@ + + /* Current ACPICA subsystem version in YYYYMMDD format */ + +-#define ACPI_CA_VERSION 0x20110623 ++#define ACPI_CA_VERSION 0x20111123 + + #include "actypes.h" + #include "actbl.h" +@@ -74,6 +74,7 @@ + extern u32 acpi_current_gpe_count; + extern struct acpi_table_fadt acpi_gbl_FADT; + extern u8 acpi_gbl_system_awake_and_running; ++extern u8 acpi_gbl_reduced_hardware; /* ACPI 5.0 */ + + extern u32 acpi_rsdt_forced; + /* +@@ -276,12 +277,23 @@ + acpi_status acpi_install_interface_handler(acpi_interface_handler handler); + + /* +- * Event interfaces ++ * Global Lock interfaces + */ + acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle); + + acpi_status acpi_release_global_lock(u32 handle); + ++/* ++ * Interfaces to AML mutex objects ++ */ ++acpi_status ++acpi_acquire_mutex(acpi_handle handle, acpi_string pathname, u16 timeout); ++ ++acpi_status acpi_release_mutex(acpi_handle handle, acpi_string pathname); ++ ++/* ++ * Fixed Event interfaces ++ */ + acpi_status acpi_enable_event(u32 event, u32 flags); + + acpi_status acpi_disable_event(u32 event, u32 flags); +@@ -291,7 +303,7 @@ + acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status); + + /* +- * GPE Interfaces ++ * General Purpose Event (GPE) Interfaces + */ + acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number); + +@@ -346,6 +358,10 @@ + #endif + + acpi_status ++acpi_get_event_resources(acpi_handle device_handle, ++ struct acpi_buffer *ret_buffer); ++ ++acpi_status + acpi_walk_resources(acpi_handle device, + char *name, + acpi_walk_resource_callback user_function, void *context); +@@ -360,6 +376,11 @@ + acpi_resource_to_address64(struct acpi_resource *resource, + struct acpi_resource_address64 *out); + ++acpi_status ++acpi_buffer_to_resource(u8 *aml_buffer, ++ u16 aml_buffer_length, ++ struct acpi_resource **resource_ptr); ++ + /* + * Hardware (ACPI device) interfaces + */ +diff -Naur linux-3.2.1/include/acpi/acrestyp.h linux-3.2.1.patch/include/acpi/acrestyp.h +--- linux-3.2.1/include/acpi/acrestyp.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/include/acpi/acrestyp.h 2012-01-24 15:56:00.223521094 +0100 +@@ -61,11 +61,14 @@ + #define ACPI_WRITE_COMBINING_MEMORY (u8) 0x02 + #define ACPI_PREFETCHABLE_MEMORY (u8) 0x03 + ++/*! [Begin] no source code translation */ + /* + * IO Attributes +- * The ISA IO ranges are: n000-n0_fFh, n400-n4_fFh, n800-n8_fFh, n_c00-n_cFFh. +- * The non-ISA IO ranges are: n100-n3_fFh, n500-n7_fFh, n900-n_bFFh, n_cd0-n_fFFh. ++ * The ISA IO ranges are: n000-n0FFh, n400-n4FFh, n800-n8FFh, nC00-nCFFh. ++ * The non-ISA IO ranges are: n100-n3FFh, n500-n7FFh, n900-nBFFh, nCD0-nFFFh. + */ ++/*! [End] no source code translation !*/ ++ + #define ACPI_NON_ISA_ONLY_RANGES (u8) 0x01 + #define ACPI_ISA_ONLY_RANGES (u8) 0x02 + #define ACPI_ENTIRE_RANGE (ACPI_NON_ISA_ONLY_RANGES | ACPI_ISA_ONLY_RANGES) +@@ -81,16 +84,26 @@ + #define ACPI_DECODE_16 (u8) 0x01 /* 16-bit IO address decode */ + + /* +- * IRQ Attributes ++ * Interrupt attributes - used in multiple descriptors + */ ++ ++/* Triggering */ ++ + #define ACPI_LEVEL_SENSITIVE (u8) 0x00 + #define ACPI_EDGE_SENSITIVE (u8) 0x01 + ++/* Polarity */ ++ + #define ACPI_ACTIVE_HIGH (u8) 0x00 + #define ACPI_ACTIVE_LOW (u8) 0x01 ++#define ACPI_ACTIVE_BOTH (u8) 0x02 ++ ++/* Sharing */ + + #define ACPI_EXCLUSIVE (u8) 0x00 + #define ACPI_SHARED (u8) 0x01 ++#define ACPI_EXCLUSIVE_AND_WAKE (u8) 0x02 ++#define ACPI_SHARED_AND_WAKE (u8) 0x03 + + /* + * DMA Attributes +@@ -127,6 +140,8 @@ + #define ACPI_POS_DECODE (u8) 0x00 + #define ACPI_SUB_DECODE (u8) 0x01 + ++/* Producer/Consumer */ ++ + #define ACPI_PRODUCER (u8) 0x00 + #define ACPI_CONSUMER (u8) 0x01 + +@@ -192,6 +207,21 @@ + u8 address_length; + }; + ++struct acpi_resource_fixed_dma { ++ u16 request_lines; ++ u16 channels; ++ u8 width; ++}; ++ ++/* Values for Width field above */ ++ ++#define ACPI_DMA_WIDTH8 0 ++#define ACPI_DMA_WIDTH16 1 ++#define ACPI_DMA_WIDTH32 2 ++#define ACPI_DMA_WIDTH64 3 ++#define ACPI_DMA_WIDTH128 4 ++#define ACPI_DMA_WIDTH256 5 ++ + struct acpi_resource_vendor { + u16 byte_length; + u8 byte_data[1]; +@@ -329,6 +359,166 @@ + u64 address; + }; + ++struct acpi_resource_gpio { ++ u8 revision_id; ++ u8 connection_type; ++ u8 producer_consumer; /* For values, see Producer/Consumer above */ ++ u8 pin_config; ++ u8 sharable; /* For values, see Interrupt Attributes above */ ++ u8 io_restriction; ++ u8 triggering; /* For values, see Interrupt Attributes above */ ++ u8 polarity; /* For values, see Interrupt Attributes above */ ++ u16 drive_strength; ++ u16 debounce_timeout; ++ u16 pin_table_length; ++ u16 vendor_length; ++ struct acpi_resource_source resource_source; ++ u16 *pin_table; ++ u8 *vendor_data; ++}; ++ ++/* Values for GPIO connection_type field above */ ++ ++#define ACPI_RESOURCE_GPIO_TYPE_INT 0 ++#define ACPI_RESOURCE_GPIO_TYPE_IO 1 ++ ++/* Values for pin_config field above */ ++ ++#define ACPI_PIN_CONFIG_DEFAULT 0 ++#define ACPI_PIN_CONFIG_PULLUP 1 ++#define ACPI_PIN_CONFIG_PULLDOWN 2 ++#define ACPI_PIN_CONFIG_NOPULL 3 ++ ++/* Values for io_restriction field above */ ++ ++#define ACPI_IO_RESTRICT_NONE 0 ++#define ACPI_IO_RESTRICT_INPUT 1 ++#define ACPI_IO_RESTRICT_OUTPUT 2 ++#define ACPI_IO_RESTRICT_NONE_PRESERVE 3 ++ ++/* Common structure for I2C, SPI, and UART serial descriptors */ ++ ++#define ACPI_RESOURCE_SERIAL_COMMON \ ++ u8 revision_id; \ ++ u8 type; \ ++ u8 producer_consumer; /* For values, see Producer/Consumer above */\ ++ u8 slave_mode; \ ++ u8 type_revision_id; \ ++ u16 type_data_length; \ ++ u16 vendor_length; \ ++ struct acpi_resource_source resource_source; \ ++ u8 *vendor_data; ++ ++struct acpi_resource_common_serialbus { ++ACPI_RESOURCE_SERIAL_COMMON}; ++ ++/* Values for the Type field above */ ++ ++#define ACPI_RESOURCE_SERIAL_TYPE_I2C 1 ++#define ACPI_RESOURCE_SERIAL_TYPE_SPI 2 ++#define ACPI_RESOURCE_SERIAL_TYPE_UART 3 ++ ++/* Values for slave_mode field above */ ++ ++#define ACPI_CONTROLLER_INITIATED 0 ++#define ACPI_DEVICE_INITIATED 1 ++ ++struct acpi_resource_i2c_serialbus { ++ ACPI_RESOURCE_SERIAL_COMMON u8 access_mode; ++ u16 slave_address; ++ u32 connection_speed; ++}; ++ ++/* Values for access_mode field above */ ++ ++#define ACPI_I2C_7BIT_MODE 0 ++#define ACPI_I2C_10BIT_MODE 1 ++ ++struct acpi_resource_spi_serialbus { ++ ACPI_RESOURCE_SERIAL_COMMON u8 wire_mode; ++ u8 device_polarity; ++ u8 data_bit_length; ++ u8 clock_phase; ++ u8 clock_polarity; ++ u16 device_selection; ++ u32 connection_speed; ++}; ++ ++/* Values for wire_mode field above */ ++ ++#define ACPI_SPI_4WIRE_MODE 0 ++#define ACPI_SPI_3WIRE_MODE 1 ++ ++/* Values for device_polarity field above */ ++ ++#define ACPI_SPI_ACTIVE_LOW 0 ++#define ACPI_SPI_ACTIVE_HIGH 1 ++ ++/* Values for clock_phase field above */ ++ ++#define ACPI_SPI_FIRST_PHASE 0 ++#define ACPI_SPI_SECOND_PHASE 1 ++ ++/* Values for clock_polarity field above */ ++ ++#define ACPI_SPI_START_LOW 0 ++#define ACPI_SPI_START_HIGH 1 ++ ++struct acpi_resource_uart_serialbus { ++ ACPI_RESOURCE_SERIAL_COMMON u8 endian; ++ u8 data_bits; ++ u8 stop_bits; ++ u8 flow_control; ++ u8 parity; ++ u8 lines_enabled; ++ u16 rx_fifo_size; ++ u16 tx_fifo_size; ++ u32 default_baud_rate; ++}; ++ ++/* Values for Endian field above */ ++ ++#define ACPI_UART_LITTLE_ENDIAN 0 ++#define ACPI_UART_BIG_ENDIAN 1 ++ ++/* Values for data_bits field above */ ++ ++#define ACPI_UART_5_DATA_BITS 0 ++#define ACPI_UART_6_DATA_BITS 1 ++#define ACPI_UART_7_DATA_BITS 2 ++#define ACPI_UART_8_DATA_BITS 3 ++#define ACPI_UART_9_DATA_BITS 4 ++ ++/* Values for stop_bits field above */ ++ ++#define ACPI_UART_NO_STOP_BITS 0 ++#define ACPI_UART_1_STOP_BIT 1 ++#define ACPI_UART_1P5_STOP_BITS 2 ++#define ACPI_UART_2_STOP_BITS 3 ++ ++/* Values for flow_control field above */ ++ ++#define ACPI_UART_FLOW_CONTROL_NONE 0 ++#define ACPI_UART_FLOW_CONTROL_HW 1 ++#define ACPI_UART_FLOW_CONTROL_XON_XOFF 2 ++ ++/* Values for Parity field above */ ++ ++#define ACPI_UART_PARITY_NONE 0 ++#define ACPI_UART_PARITY_EVEN 1 ++#define ACPI_UART_PARITY_ODD 2 ++#define ACPI_UART_PARITY_MARK 3 ++#define ACPI_UART_PARITY_SPACE 4 ++ ++/* Values for lines_enabled bitfield above */ ++ ++#define ACPI_UART_CARRIER_DETECT (1<<2) ++#define ACPI_UART_RING_INDICATOR (1<<3) ++#define ACPI_UART_DATA_SET_READY (1<<4) ++#define ACPI_UART_DATA_TERMINAL_READY (1<<5) ++#define ACPI_UART_CLEAR_TO_SEND (1<<6) ++#define ACPI_UART_REQUEST_TO_SEND (1<<7) ++ + /* ACPI_RESOURCE_TYPEs */ + + #define ACPI_RESOURCE_TYPE_IRQ 0 +@@ -348,7 +538,10 @@ + #define ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64 14 /* ACPI 3.0 */ + #define ACPI_RESOURCE_TYPE_EXTENDED_IRQ 15 + #define ACPI_RESOURCE_TYPE_GENERIC_REGISTER 16 +-#define ACPI_RESOURCE_TYPE_MAX 16 ++#define ACPI_RESOURCE_TYPE_GPIO 17 /* ACPI 5.0 */ ++#define ACPI_RESOURCE_TYPE_FIXED_DMA 18 /* ACPI 5.0 */ ++#define ACPI_RESOURCE_TYPE_SERIAL_BUS 19 /* ACPI 5.0 */ ++#define ACPI_RESOURCE_TYPE_MAX 19 + + /* Master union for resource descriptors */ + +@@ -358,6 +551,7 @@ + struct acpi_resource_start_dependent start_dpf; + struct acpi_resource_io io; + struct acpi_resource_fixed_io fixed_io; ++ struct acpi_resource_fixed_dma fixed_dma; + struct acpi_resource_vendor vendor; + struct acpi_resource_vendor_typed vendor_typed; + struct acpi_resource_end_tag end_tag; +@@ -370,6 +564,11 @@ + struct acpi_resource_extended_address64 ext_address64; + struct acpi_resource_extended_irq extended_irq; + struct acpi_resource_generic_register generic_reg; ++ struct acpi_resource_gpio gpio; ++ struct acpi_resource_i2c_serialbus i2c_serial_bus; ++ struct acpi_resource_spi_serialbus spi_serial_bus; ++ struct acpi_resource_uart_serialbus uart_serial_bus; ++ struct acpi_resource_common_serialbus common_serial_bus; + + /* Common fields */ + +diff -Naur linux-3.2.1/include/acpi/actbl1.h linux-3.2.1.patch/include/acpi/actbl1.h +--- linux-3.2.1/include/acpi/actbl1.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/include/acpi/actbl1.h 2012-01-24 15:55:42.006206146 +0100 +@@ -228,7 +228,8 @@ + ACPI_EINJ_EXECUTE_OPERATION = 5, + ACPI_EINJ_CHECK_BUSY_STATUS = 6, + ACPI_EINJ_GET_COMMAND_STATUS = 7, +- ACPI_EINJ_ACTION_RESERVED = 8, /* 8 and greater are reserved */ ++ ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS = 8, ++ ACPI_EINJ_ACTION_RESERVED = 9, /* 9 and greater are reserved */ + ACPI_EINJ_TRIGGER_ERROR = 0xFF /* Except for this value */ + }; + +@@ -240,7 +241,27 @@ + ACPI_EINJ_WRITE_REGISTER = 2, + ACPI_EINJ_WRITE_REGISTER_VALUE = 3, + ACPI_EINJ_NOOP = 4, +- ACPI_EINJ_INSTRUCTION_RESERVED = 5 /* 5 and greater are reserved */ ++ ACPI_EINJ_FLUSH_CACHELINE = 5, ++ ACPI_EINJ_INSTRUCTION_RESERVED = 6 /* 6 and greater are reserved */ ++}; ++ ++struct acpi_einj_error_type_with_addr { ++ u32 error_type; ++ u32 vendor_struct_offset; ++ u32 flags; ++ u32 apic_id; ++ u64 address; ++ u64 range; ++ u32 pcie_id; ++}; ++ ++struct acpi_einj_vendor { ++ u32 length; ++ u32 pcie_id; ++ u16 vendor_id; ++ u16 device_id; ++ u8 revision_id; ++ u8 reserved[3]; + }; + + /* EINJ Trigger Error Action Table */ +@@ -275,6 +296,7 @@ + #define ACPI_EINJ_PLATFORM_CORRECTABLE (1<<9) + #define ACPI_EINJ_PLATFORM_UNCORRECTABLE (1<<10) + #define ACPI_EINJ_PLATFORM_FATAL (1<<11) ++#define ACPI_EINJ_VENDOR_DEFINED (1<<31) + + /******************************************************************************* + * +@@ -631,7 +653,9 @@ + ACPI_MADT_TYPE_INTERRUPT_SOURCE = 8, + ACPI_MADT_TYPE_LOCAL_X2APIC = 9, + ACPI_MADT_TYPE_LOCAL_X2APIC_NMI = 10, +- ACPI_MADT_TYPE_RESERVED = 11 /* 11 and greater are reserved */ ++ ACPI_MADT_TYPE_GENERIC_INTERRUPT = 11, ++ ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR = 12, ++ ACPI_MADT_TYPE_RESERVED = 13 /* 13 and greater are reserved */ + }; + + /* +@@ -752,11 +776,36 @@ + u8 reserved[3]; + }; + ++/* 11: Generic Interrupt (ACPI 5.0) */ ++ ++struct acpi_madt_generic_interrupt { ++ struct acpi_subtable_header header; ++ u16 reserved; /* Reserved - must be zero */ ++ u32 gic_id; ++ u32 uid; ++ u32 flags; ++ u32 parking_version; ++ u32 performance_interrupt; ++ u64 parked_address; ++ u64 base_address; ++}; ++ ++/* 12: Generic Distributor (ACPI 5.0) */ ++ ++struct acpi_madt_generic_distributor { ++ struct acpi_subtable_header header; ++ u16 reserved; /* Reserved - must be zero */ ++ u32 gic_id; ++ u64 base_address; ++ u32 global_irq_base; ++ u32 reserved2; /* Reserved - must be zero */ ++}; ++ + /* + * Common flags fields for MADT subtables + */ + +-/* MADT Local APIC flags (lapic_flags) */ ++/* MADT Local APIC flags (lapic_flags) and GIC flags */ + + #define ACPI_MADT_ENABLED (1) /* 00: Processor is usable if set */ + +diff -Naur linux-3.2.1/include/acpi/actbl3.h linux-3.2.1.patch/include/acpi/actbl3.h +--- linux-3.2.1/include/acpi/actbl3.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.1.patch/include/acpi/actbl3.h 2012-01-24 15:55:43.054224265 +0100 +@@ -0,0 +1,552 @@ ++/****************************************************************************** ++ * ++ * Name: actbl3.h - ACPI Table Definitions ++ * ++ *****************************************************************************/ ++ ++/* ++ * Copyright (C) 2000 - 2011, Intel Corp. ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce at minimum a disclaimer ++ * substantially similar to the "NO WARRANTY" disclaimer below ++ * ("Disclaimer") and any redistribution must be conditioned upon ++ * including a substantially similar Disclaimer requirement for further ++ * binary redistribution. ++ * 3. Neither the names of the above-listed copyright holders nor the names ++ * of any contributors may be used to endorse or promote products derived ++ * from this software without specific prior written permission. ++ * ++ * Alternatively, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2 as published by the Free ++ * Software Foundation. ++ * ++ * NO WARRANTY ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR ++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING ++ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ++ * POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#ifndef __ACTBL3_H__ ++#define __ACTBL3_H__ ++ ++/******************************************************************************* ++ * ++ * Additional ACPI Tables (3) ++ * ++ * These tables are not consumed directly by the ACPICA subsystem, but are ++ * included here to support device drivers and the AML disassembler. ++ * ++ * The tables in this file are fully defined within the ACPI specification. ++ * ++ ******************************************************************************/ ++ ++/* ++ * Values for description table header signatures for tables defined in this ++ * file. Useful because they make it more difficult to inadvertently type in ++ * the wrong signature. ++ */ ++#define ACPI_SIG_BGRT "BGRT" /* Boot Graphics Resource Table */ ++#define ACPI_SIG_DRTM "DRTM" /* Dynamic Root of Trust for Measurement table */ ++#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance Data Table */ ++#define ACPI_SIG_GTDT "GTDT" /* Generic Timer Description Table */ ++#define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ ++#define ACPI_SIG_PCCT "PCCT" /* Platform Communications Channel Table */ ++#define ACPI_SIG_PMTT "PMTT" /* Platform Memory Topology Table */ ++#define ACPI_SIG_RASF "RASF" /* RAS Feature table */ ++ ++#define ACPI_SIG_S3PT "S3PT" /* S3 Performance (sub)Table */ ++#define ACPI_SIG_PCCS "PCC" /* PCC Shared Memory Region */ ++ ++/* Reserved table signatures */ ++ ++#define ACPI_SIG_CSRT "CSRT" /* Core System Resources Table */ ++#define ACPI_SIG_DBG2 "DBG2" /* Debug Port table 2 */ ++#define ACPI_SIG_MATR "MATR" /* Memory Address Translation Table */ ++#define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table */ ++#define ACPI_SIG_WPBT "WPBT" /* Windows Platform Binary Table */ ++ ++/* ++ * All tables must be byte-packed to match the ACPI specification, since ++ * the tables are provided by the system BIOS. ++ */ ++#pragma pack(1) ++ ++/* ++ * Note about bitfields: The u8 type is used for bitfields in ACPI tables. ++ * This is the only type that is even remotely portable. Anything else is not ++ * portable, so do not use any other bitfield types. ++ */ ++ ++/******************************************************************************* ++ * ++ * BGRT - Boot Graphics Resource Table (ACPI 5.0) ++ * Version 1 ++ * ++ ******************************************************************************/ ++ ++struct acpi_table_bgrt { ++ struct acpi_table_header header; /* Common ACPI table header */ ++ u16 version; ++ u8 status; ++ u8 image_type; ++ u64 image_address; ++ u32 image_offset_x; ++ u32 image_offset_y; ++}; ++ ++/******************************************************************************* ++ * ++ * DRTM - Dynamic Root of Trust for Measurement table ++ * ++ ******************************************************************************/ ++ ++struct acpi_table_drtm { ++ struct acpi_table_header header; /* Common ACPI table header */ ++ u64 entry_base_address; ++ u64 entry_length; ++ u32 entry_address32; ++ u64 entry_address64; ++ u64 exit_address; ++ u64 log_area_address; ++ u32 log_area_length; ++ u64 arch_dependent_address; ++ u32 flags; ++}; ++ ++/* 1) Validated Tables List */ ++ ++struct acpi_drtm_vtl_list { ++ u32 validated_table_list_count; ++}; ++ ++/* 2) Resources List */ ++ ++struct acpi_drtm_resource_list { ++ u32 resource_list_count; ++}; ++ ++/* 3) Platform-specific Identifiers List */ ++ ++struct acpi_drtm_id_list { ++ u32 id_list_count; ++}; ++ ++/******************************************************************************* ++ * ++ * FPDT - Firmware Performance Data Table (ACPI 5.0) ++ * Version 1 ++ * ++ ******************************************************************************/ ++ ++struct acpi_table_fpdt { ++ struct acpi_table_header header; /* Common ACPI table header */ ++}; ++ ++/* FPDT subtable header */ ++ ++struct acpi_fpdt_header { ++ u16 type; ++ u8 length; ++ u8 revision; ++}; ++ ++/* Values for Type field above */ ++ ++enum acpi_fpdt_type { ++ ACPI_FPDT_TYPE_BOOT = 0, ++ ACPI_FPDT_TYPE_S3PERF = 1, ++}; ++ ++/* ++ * FPDT subtables ++ */ ++ ++/* 0: Firmware Basic Boot Performance Record */ ++ ++struct acpi_fpdt_boot { ++ struct acpi_fpdt_header header; ++ u8 reserved[4]; ++ u64 reset_end; ++ u64 load_start; ++ u64 startup_start; ++ u64 exit_services_entry; ++ u64 exit_services_exit; ++}; ++ ++/* 1: S3 Performance Table Pointer Record */ ++ ++struct acpi_fpdt_s3pt_ptr { ++ struct acpi_fpdt_header header; ++ u8 reserved[4]; ++ u64 address; ++}; ++ ++/* ++ * S3PT - S3 Performance Table. This table is pointed to by the ++ * FPDT S3 Pointer Record above. ++ */ ++struct acpi_table_s3pt { ++ u8 signature[4]; /* "S3PT" */ ++ u32 length; ++}; ++ ++/* ++ * S3PT Subtables ++ */ ++struct acpi_s3pt_header { ++ u16 type; ++ u8 length; ++ u8 revision; ++}; ++ ++/* Values for Type field above */ ++ ++enum acpi_s3pt_type { ++ ACPI_S3PT_TYPE_RESUME = 0, ++ ACPI_S3PT_TYPE_SUSPEND = 1, ++}; ++ ++struct acpi_s3pt_resume { ++ struct acpi_s3pt_header header; ++ u32 resume_count; ++ u64 full_resume; ++ u64 average_resume; ++}; ++ ++struct acpi_s3pt_suspend { ++ struct acpi_s3pt_header header; ++ u64 suspend_start; ++ u64 suspend_end; ++}; ++ ++/******************************************************************************* ++ * ++ * GTDT - Generic Timer Description Table (ACPI 5.0) ++ * Version 1 ++ * ++ ******************************************************************************/ ++ ++struct acpi_table_gtdt { ++ struct acpi_table_header header; /* Common ACPI table header */ ++ u64 address; ++ u32 flags; ++ u32 secure_pl1_interrupt; ++ u32 secure_pl1_flags; ++ u32 non_secure_pl1_interrupt; ++ u32 non_secure_pl1_flags; ++ u32 virtual_timer_interrupt; ++ u32 virtual_timer_flags; ++ u32 non_secure_pl2_interrupt; ++ u32 non_secure_pl2_flags; ++}; ++ ++/* Values for Flags field above */ ++ ++#define ACPI_GTDT_MAPPED_BLOCK_PRESENT 1 ++ ++/* Values for all "TimerFlags" fields above */ ++ ++#define ACPI_GTDT_INTERRUPT_MODE 1 ++#define ACPI_GTDT_INTERRUPT_POLARITY 2 ++ ++/******************************************************************************* ++ * ++ * MPST - Memory Power State Table (ACPI 5.0) ++ * Version 1 ++ * ++ ******************************************************************************/ ++ ++#define ACPI_MPST_CHANNEL_INFO \ ++ u16 reserved1; \ ++ u8 channel_id; \ ++ u8 reserved2; \ ++ u16 power_node_count; ++ ++/* Main table */ ++ ++struct acpi_table_mpst { ++ struct acpi_table_header header; /* Common ACPI table header */ ++ ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ ++}; ++ ++/* Memory Platform Communication Channel Info */ ++ ++struct acpi_mpst_channel { ++ ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ ++}; ++ ++/* Memory Power Node Structure */ ++ ++struct acpi_mpst_power_node { ++ u8 flags; ++ u8 reserved1; ++ u16 node_id; ++ u32 length; ++ u64 range_address; ++ u64 range_length; ++ u8 num_power_states; ++ u8 num_physical_components; ++ u16 reserved2; ++}; ++ ++/* Values for Flags field above */ ++ ++#define ACPI_MPST_ENABLED 1 ++#define ACPI_MPST_POWER_MANAGED 2 ++#define ACPI_MPST_HOT_PLUG_CAPABLE 4 ++ ++/* Memory Power State Structure (follows POWER_NODE above) */ ++ ++struct acpi_mpst_power_state { ++ u8 power_state; ++ u8 info_index; ++}; ++ ++/* Physical Component ID Structure (follows POWER_STATE above) */ ++ ++struct acpi_mpst_component { ++ u16 component_id; ++}; ++ ++/* Memory Power State Characteristics Structure (follows all POWER_NODEs) */ ++ ++struct acpi_mpst_data_hdr { ++ u16 characteristics_count; ++}; ++ ++struct acpi_mpst_power_data { ++ u8 revision; ++ u8 flags; ++ u16 reserved1; ++ u32 average_power; ++ u32 power_saving; ++ u64 exit_latency; ++ u64 reserved2; ++}; ++ ++/* Values for Flags field above */ ++ ++#define ACPI_MPST_PRESERVE 1 ++#define ACPI_MPST_AUTOENTRY 2 ++#define ACPI_MPST_AUTOEXIT 4 ++ ++/* Shared Memory Region (not part of an ACPI table) */ ++ ++struct acpi_mpst_shared { ++ u32 signature; ++ u16 pcc_command; ++ u16 pcc_status; ++ u16 command_register; ++ u16 status_register; ++ u16 power_state_id; ++ u16 power_node_id; ++ u64 energy_consumed; ++ u64 average_power; ++}; ++ ++/******************************************************************************* ++ * ++ * PCCT - Platform Communications Channel Table (ACPI 5.0) ++ * Version 1 ++ * ++ ******************************************************************************/ ++ ++struct acpi_table_pcct { ++ struct acpi_table_header header; /* Common ACPI table header */ ++ u32 flags; ++ u32 latency; ++ u32 reserved; ++}; ++ ++/* Values for Flags field above */ ++ ++#define ACPI_PCCT_DOORBELL 1 ++ ++/* ++ * PCCT subtables ++ */ ++ ++/* 0: Generic Communications Subspace */ ++ ++struct acpi_pcct_subspace { ++ struct acpi_subtable_header header; ++ u8 reserved[6]; ++ u64 base_address; ++ u64 length; ++ struct acpi_generic_address doorbell_register; ++ u64 preserve_mask; ++ u64 write_mask; ++}; ++ ++/* ++ * PCC memory structures (not part of the ACPI table) ++ */ ++ ++/* Shared Memory Region */ ++ ++struct acpi_pcct_shared_memory { ++ u32 signature; ++ u16 command; ++ u16 status; ++}; ++ ++/******************************************************************************* ++ * ++ * PMTT - Platform Memory Topology Table (ACPI 5.0) ++ * Version 1 ++ * ++ ******************************************************************************/ ++ ++struct acpi_table_pmtt { ++ struct acpi_table_header header; /* Common ACPI table header */ ++ u32 reserved; ++}; ++ ++/* Common header for PMTT subtables that follow main table */ ++ ++struct acpi_pmtt_header { ++ u8 type; ++ u8 reserved1; ++ u16 length; ++ u16 flags; ++ u16 reserved2; ++}; ++ ++/* Values for Type field above */ ++ ++#define ACPI_PMTT_TYPE_SOCKET 0 ++#define ACPI_PMTT_TYPE_CONTROLLER 1 ++#define ACPI_PMTT_TYPE_DIMM 2 ++#define ACPI_PMTT_TYPE_RESERVED 3 /* 0x03-0xFF are reserved */ ++ ++/* Values for Flags field above */ ++ ++#define ACPI_PMTT_TOP_LEVEL 0x0001 ++#define ACPI_PMTT_PHYSICAL 0x0002 ++#define ACPI_PMTT_MEMORY_TYPE 0x000C ++ ++/* ++ * PMTT subtables, correspond to Type in struct acpi_pmtt_header ++ */ ++ ++/* 0: Socket Structure */ ++ ++struct acpi_pmtt_socket { ++ struct acpi_pmtt_header header; ++ u16 socket_id; ++ u16 reserved; ++}; ++ ++/* 1: Memory Controller subtable */ ++ ++struct acpi_pmtt_controller { ++ struct acpi_pmtt_header header; ++ u32 read_latency; ++ u32 write_latency; ++ u32 read_bandwidth; ++ u32 write_bandwidth; ++ u16 access_width; ++ u16 alignment; ++ u16 reserved; ++ u16 domain_count; ++}; ++ ++/* 1a: Proximity Domain substructure */ ++ ++struct acpi_pmtt_domain { ++ u32 proximity_domain; ++}; ++ ++/* 2: Physical Component Identifier (DIMM) */ ++ ++struct acpi_pmtt_physical_component { ++ struct acpi_pmtt_header header; ++ u16 component_id; ++ u16 reserved; ++ u32 memory_size; ++ u32 bios_handle; ++}; ++ ++/******************************************************************************* ++ * ++ * RASF - RAS Feature Table (ACPI 5.0) ++ * Version 1 ++ * ++ ******************************************************************************/ ++ ++struct acpi_table_rasf { ++ struct acpi_table_header header; /* Common ACPI table header */ ++ u8 channel_id[12]; ++}; ++ ++/* RASF Platform Communication Channel Shared Memory Region */ ++ ++struct acpi_rasf_shared_memory { ++ u32 signature; ++ u16 command; ++ u16 status; ++ u64 requested_address; ++ u64 requested_length; ++ u64 actual_address; ++ u64 actual_length; ++ u16 flags; ++ u8 speed; ++}; ++ ++/* Masks for Flags and Speed fields above */ ++ ++#define ACPI_RASF_SCRUBBER_RUNNING 1 ++#define ACPI_RASF_SPEED (7<<1) ++ ++/* Channel Commands */ ++ ++enum acpi_rasf_commands { ++ ACPI_RASF_GET_RAS_CAPABILITIES = 1, ++ ACPI_RASF_GET_PATROL_PARAMETERS = 2, ++ ACPI_RASF_START_PATROL_SCRUBBER = 3, ++ ACPI_RASF_STOP_PATROL_SCRUBBER = 4 ++}; ++ ++/* Channel Command flags */ ++ ++#define ACPI_RASF_GENERATE_SCI (1<<15) ++ ++/* Status values */ ++ ++enum acpi_rasf_status { ++ ACPI_RASF_SUCCESS = 0, ++ ACPI_RASF_NOT_VALID = 1, ++ ACPI_RASF_NOT_SUPPORTED = 2, ++ ACPI_RASF_BUSY = 3, ++ ACPI_RASF_FAILED = 4, ++ ACPI_RASF_ABORTED = 5, ++ ACPI_RASF_INVALID_DATA = 6 ++}; ++ ++/* Status flags */ ++ ++#define ACPI_RASF_COMMAND_COMPLETE (1) ++#define ACPI_RASF_SCI_DOORBELL (1<<1) ++#define ACPI_RASF_ERROR (1<<2) ++#define ACPI_RASF_STATUS (0x1F<<3) ++ ++/* Reset to default packing */ ++ ++#pragma pack() ++ ++#endif /* __ACTBL3_H__ */ +diff -Naur linux-3.2.1/include/acpi/actbl.h linux-3.2.1.patch/include/acpi/actbl.h +--- linux-3.2.1/include/acpi/actbl.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/include/acpi/actbl.h 2012-01-24 15:55:42.004206112 +0100 +@@ -255,6 +255,8 @@ + struct acpi_generic_address xpm_timer_block; /* 64-bit Extended Power Mgt Timer Ctrl Reg Blk address */ + struct acpi_generic_address xgpe0_block; /* 64-bit Extended General Purpose Event 0 Reg Blk address */ + struct acpi_generic_address xgpe1_block; /* 64-bit Extended General Purpose Event 1 Reg Blk address */ ++ struct acpi_generic_address sleep_control; /* 64-bit Sleep Control register */ ++ struct acpi_generic_address sleep_status; /* 64-bit Sleep Status register */ + }; + + /* Masks for FADT Boot Architecture Flags (boot_flags) */ +@@ -264,6 +266,7 @@ + #define ACPI_FADT_NO_VGA (1<<2) /* 02: [V4] It is not safe to probe for VGA hardware */ + #define ACPI_FADT_NO_MSI (1<<3) /* 03: [V4] Message Signaled Interrupts (MSI) must not be enabled */ + #define ACPI_FADT_NO_ASPM (1<<4) /* 04: [V4] PCIe ASPM control must not be enabled */ ++#define ACPI_FADT_NO_CMOS_RTC (1<<5) /* 05: [V5] No CMOS real-time clock present */ + + #define FADT2_REVISION_ID 3 + +@@ -289,6 +292,8 @@ + #define ACPI_FADT_REMOTE_POWER_ON (1<<17) /* 17: [V4] System is compatible with remote power on (ACPI 3.0) */ + #define ACPI_FADT_APIC_CLUSTER (1<<18) /* 18: [V4] All local APICs must use cluster model (ACPI 3.0) */ + #define ACPI_FADT_APIC_PHYSICAL (1<<19) /* 19: [V4] All local x_aPICs must use physical dest mode (ACPI 3.0) */ ++#define ACPI_FADT_HW_REDUCED (1<<20) /* 20: [V5] ACPI hardware is not implemented (ACPI 5.0) */ ++#define ACPI_FADT_LOW_POWER_S0 (1<<21) /* 21: [V5] S0 power savings are equal or better than S3 (ACPI 5.0) */ + + /* Values for preferred_profile (Preferred Power Management Profiles) */ + +@@ -299,14 +304,16 @@ + PM_WORKSTATION = 3, + PM_ENTERPRISE_SERVER = 4, + PM_SOHO_SERVER = 5, +- PM_APPLIANCE_PC = 6 ++ PM_APPLIANCE_PC = 6, ++ PM_PERFORMANCE_SERVER = 7, ++ PM_TABLET = 8 + }; + + /* Reset to default packing */ + + #pragma pack() + +-#define ACPI_FADT_OFFSET(f) (u8) ACPI_OFFSET (struct acpi_table_fadt, f) ++#define ACPI_FADT_OFFSET(f) (u16) ACPI_OFFSET (struct acpi_table_fadt, f) + + /* + * Internal table-related structures +@@ -342,6 +349,7 @@ + + #include + #include ++#include + + /* + * Sizes of the various flavors of FADT. We need to look closely +@@ -351,12 +359,15 @@ + * FADT is the bottom line as to what the version really is. + * + * For reference, the values below are as follows: +- * FADT V1 size: 0x74 +- * FADT V2 size: 0x84 +- * FADT V3+ size: 0xF4 ++ * FADT V1 size: 0x074 ++ * FADT V2 size: 0x084 ++ * FADT V3 size: 0x0F4 ++ * FADT V4 size: 0x0F4 ++ * FADT V5 size: 0x10C + */ + #define ACPI_FADT_V1_SIZE (u32) (ACPI_FADT_OFFSET (flags) + 4) + #define ACPI_FADT_V2_SIZE (u32) (ACPI_FADT_OFFSET (reserved4[0]) + 3) +-#define ACPI_FADT_V3_SIZE (u32) (sizeof (struct acpi_table_fadt)) ++#define ACPI_FADT_V3_SIZE (u32) (ACPI_FADT_OFFSET (sleep_control)) ++#define ACPI_FADT_V5_SIZE (u32) (sizeof (struct acpi_table_fadt)) + + #endif /* __ACTBL_H__ */ +diff -Naur linux-3.2.1/include/acpi/actypes.h linux-3.2.1.patch/include/acpi/actypes.h +--- linux-3.2.1/include/acpi/actypes.h 2012-01-12 20:42:45.000000000 +0100 ++++ linux-3.2.1.patch/include/acpi/actypes.h 2012-01-24 15:55:55.205434339 +0100 +@@ -712,8 +712,10 @@ + #define ACPI_ADR_SPACE_CMOS (acpi_adr_space_type) 5 + #define ACPI_ADR_SPACE_PCI_BAR_TARGET (acpi_adr_space_type) 6 + #define ACPI_ADR_SPACE_IPMI (acpi_adr_space_type) 7 ++#define ACPI_ADR_SPACE_GPIO (acpi_adr_space_type) 8 ++#define ACPI_ADR_SPACE_GSBUS (acpi_adr_space_type) 9 + +-#define ACPI_NUM_PREDEFINED_REGIONS 8 ++#define ACPI_NUM_PREDEFINED_REGIONS 10 + + /* + * Special Address Spaces +@@ -957,6 +959,14 @@ + + #define ACPI_DEFAULT_HANDLER NULL + ++/* Special Context data for generic_serial_bus/general_purpose_io (ACPI 5.0) */ ++ ++struct acpi_connection_info { ++ u8 *connection; ++ u16 length; ++ u8 access_length; ++}; ++ + typedef + acpi_status(*acpi_adr_space_setup) (acpi_handle region_handle, + u32 function, diff --git a/packages/linux/patches/linux-3.2.2-271-Allow_mac_address_to_be_set_in_smsc95xx.patch b/packages/linux/patches/linux-3.1.10-271-Allow_mac_address_to_be_set_in_smsc95xx.patch similarity index 100% rename from packages/linux/patches/linux-3.2.2-271-Allow_mac_address_to_be_set_in_smsc95xx.patch rename to packages/linux/patches/linux-3.1.10-271-Allow_mac_address_to_be_set_in_smsc95xx.patch diff --git a/packages/linux/patches/linux-3.2.2-601-add_bcm2708_support-0.1.patch b/packages/linux/patches/linux-3.1.10-601-add_bcm2708_support-0.1.patch similarity index 90% rename from packages/linux/patches/linux-3.2.2-601-add_bcm2708_support-0.1.patch rename to packages/linux/patches/linux-3.1.10-601-add_bcm2708_support-0.1.patch index b6243d5e3c..3c85bf4011 100644 --- a/packages/linux/patches/linux-3.2.2-601-add_bcm2708_support-0.1.patch +++ b/packages/linux/patches/linux-3.1.10-601-add_bcm2708_support-0.1.patch @@ -1,6 +1,6 @@ -diff -Naur linux-3.2.2/arch/arm/boot/compressed/divdi3.c linux-3.2.2.patch/arch/arm/boot/compressed/divdi3.c ---- linux-3.2.2/arch/arm/boot/compressed/divdi3.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/boot/compressed/divdi3.c 2012-01-26 15:51:18.046779892 +0100 +diff -Naur linux-3.1.10/arch/arm/boot/compressed/divdi3.c linux-3.1.10.patch/arch/arm/boot/compressed/divdi3.c +--- linux-3.1.10/arch/arm/boot/compressed/divdi3.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/boot/compressed/divdi3.c 2012-02-03 23:03:54.311346055 +0100 @@ -0,0 +1,338 @@ +/* 64-bit multiplication and division + Copyright (C) 1989, 1992-1999, 2000, 2001, 2002, 2003 @@ -340,9 +340,9 @@ diff -Naur linux-3.2.2/arch/arm/boot/compressed/divdi3.c linux-3.2.2.patch/arch/ + *remainder = a - b * quotient; + return quotient; +} -diff -Naur linux-3.2.2/arch/arm/boot/compressed/longlong.h linux-3.2.2.patch/arch/arm/boot/compressed/longlong.h ---- linux-3.2.2/arch/arm/boot/compressed/longlong.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/boot/compressed/longlong.h 2012-01-26 15:51:18.046779892 +0100 +diff -Naur linux-3.1.10/arch/arm/boot/compressed/longlong.h linux-3.1.10.patch/arch/arm/boot/compressed/longlong.h +--- linux-3.1.10/arch/arm/boot/compressed/longlong.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/boot/compressed/longlong.h 2012-02-03 23:03:54.311346055 +0100 @@ -0,0 +1,151 @@ +/* longlong.h -- based on code from gcc-2.95.3 + @@ -495,17 +495,17 @@ diff -Naur linux-3.2.2/arch/arm/boot/compressed/longlong.h linux-3.2.2.patch/arc + +#define UDIV_NEEDS_NORMALIZATION 1 +#define udiv_qrnnd __udiv_qrnnd_c -diff -Naur linux-3.2.2/arch/arm/boot/compressed/Makefile linux-3.2.2.patch/arch/arm/boot/compressed/Makefile ---- linux-3.2.2/arch/arm/boot/compressed/Makefile 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/boot/compressed/Makefile 2012-01-26 15:53:12.398062851 +0100 -@@ -145,11 +145,17 @@ +diff -Naur linux-3.1.10/arch/arm/boot/compressed/Makefile linux-3.1.10.patch/arch/arm/boot/compressed/Makefile +--- linux-3.1.10/arch/arm/boot/compressed/Makefile 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/boot/compressed/Makefile 2012-02-03 23:03:54.310346035 +0100 +@@ -121,11 +121,17 @@ LDFLAGS_vmlinux += -T # For __aeabi_uidivmod -lib1funcs = $(obj)/lib1funcs.o +lib1funcs = $(obj)/lib1funcs.o $(obj)/divdi3.o - $(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S + $(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S FORCE $(call cmd,shipped) +$(obj)/longlong.h: $(srctree)/arch/$(SRCARCH)/lib/longlong.h FORCE @@ -517,9 +517,9 @@ diff -Naur linux-3.2.2/arch/arm/boot/compressed/Makefile linux-3.2.2.patch/arch/ # We need to prevent any GOTOFF relocs being used with references # to symbols in the .bss section since we cannot relocate them # independently from the rest at run time. This can be achieved by -diff -Naur linux-3.2.2/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.2.2.patch/arch/arm/configs/bcmrpi_cutdown_defconfig ---- linux-3.2.2/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-01-26 15:51:18.072780411 +0100 +diff -Naur linux-3.1.10/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1.10.patch/arch/arm/configs/bcmrpi_cutdown_defconfig +--- linux-3.1.10/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-02-03 23:03:54.314346114 +0100 @@ -0,0 +1,1558 @@ +# +# Automatically generated file; DO NOT EDIT. @@ -2079,10 +2079,10 @@ diff -Naur linux-3.2.2/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.2.2.pat +CONFIG_GENERIC_ATOMIC64=y +# CONFIG_AVERAGE is not set +# CONFIG_CORDIC is not set -diff -Naur linux-3.2.2/arch/arm/Kconfig linux-3.2.2.patch/arch/arm/Kconfig ---- linux-3.2.2/arch/arm/Kconfig 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/Kconfig 2012-01-26 15:51:18.043779832 +0100 -@@ -955,6 +955,19 @@ +diff -Naur linux-3.1.10/arch/arm/Kconfig linux-3.1.10.patch/arch/arm/Kconfig +--- linux-3.1.10/arch/arm/Kconfig 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/Kconfig 2012-02-03 23:03:54.309346016 +0100 +@@ -896,6 +896,19 @@ help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -2102,7 +2102,7 @@ diff -Naur linux-3.2.2/arch/arm/Kconfig linux-3.2.2.patch/arch/arm/Kconfig config ARCH_VT8500 bool "VIA/WonderMedia 85xx" select CPU_ARM926T -@@ -1098,6 +1111,7 @@ +@@ -1042,6 +1055,7 @@ source "arch/arm/mach-vt8500/Kconfig" source "arch/arm/mach-w90x900/Kconfig" @@ -2110,10 +2110,9 @@ diff -Naur linux-3.2.2/arch/arm/Kconfig linux-3.2.2.patch/arch/arm/Kconfig # Definitions to make life easier config ARCH_ACORN -diff -Naur linux-3.2.2/arch/arm/Kconfig.orig linux-3.2.2.patch/arch/arm/Kconfig.orig -diff -Naur linux-3.2.2/arch/arm/kernel/armksyms.c linux-3.2.2.patch/arch/arm/kernel/armksyms.c ---- linux-3.2.2/arch/arm/kernel/armksyms.c 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/kernel/armksyms.c 2012-01-26 15:51:18.078780531 +0100 +diff -Naur linux-3.1.10/arch/arm/kernel/armksyms.c linux-3.1.10.patch/arch/arm/kernel/armksyms.c +--- linux-3.1.10/arch/arm/kernel/armksyms.c 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/kernel/armksyms.c 2012-02-03 23:03:54.314346114 +0100 @@ -46,6 +46,8 @@ extern void __aeabi_uidiv(void); extern void __aeabi_uidivmod(void); @@ -2123,7 +2122,7 @@ diff -Naur linux-3.2.2/arch/arm/kernel/armksyms.c linux-3.2.2.patch/arch/arm/ker extern void fpundefinstr(void); -@@ -131,6 +133,8 @@ +@@ -134,6 +136,8 @@ EXPORT_SYMBOL(__aeabi_uidiv); EXPORT_SYMBOL(__aeabi_uidivmod); EXPORT_SYMBOL(__aeabi_ulcmp); @@ -2132,10 +2131,9 @@ diff -Naur linux-3.2.2/arch/arm/kernel/armksyms.c linux-3.2.2.patch/arch/arm/ker #endif /* bitops */ -diff -Naur linux-3.2.2/arch/arm/kernel/armksyms.c.orig linux-3.2.2.patch/arch/arm/kernel/armksyms.c.orig -diff -Naur linux-3.2.2/arch/arm/lib/divdi3.c linux-3.2.2.patch/arch/arm/lib/divdi3.c ---- linux-3.2.2/arch/arm/lib/divdi3.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/lib/divdi3.c 2012-01-26 15:51:18.085780671 +0100 +diff -Naur linux-3.1.10/arch/arm/lib/divdi3.c linux-3.1.10.patch/arch/arm/lib/divdi3.c +--- linux-3.1.10/arch/arm/lib/divdi3.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/lib/divdi3.c 2012-02-03 23:03:54.316346152 +0100 @@ -0,0 +1,338 @@ +/* 64-bit multiplication and division + Copyright (C) 1989, 1992-1999, 2000, 2001, 2002, 2003 @@ -2475,9 +2473,9 @@ diff -Naur linux-3.2.2/arch/arm/lib/divdi3.c linux-3.2.2.patch/arch/arm/lib/divd + *remainder = a - b * quotient; + return quotient; +} -diff -Naur linux-3.2.2/arch/arm/lib/lib1funcs.S linux-3.2.2.patch/arch/arm/lib/lib1funcs.S ---- linux-3.2.2/arch/arm/lib/lib1funcs.S 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/lib/lib1funcs.S 2012-01-26 15:51:18.092780811 +0100 +diff -Naur linux-3.1.10/arch/arm/lib/lib1funcs.S linux-3.1.10.patch/arch/arm/lib/lib1funcs.S +--- linux-3.1.10/arch/arm/lib/lib1funcs.S 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/lib/lib1funcs.S 2012-02-03 23:03:54.316346152 +0100 @@ -349,6 +349,33 @@ UNWIND(.fnend) ENDPROC(__aeabi_idivmod) @@ -2512,9 +2510,9 @@ diff -Naur linux-3.2.2/arch/arm/lib/lib1funcs.S linux-3.2.2.patch/arch/arm/lib/l #endif Ldiv0: -diff -Naur linux-3.2.2/arch/arm/lib/longlong.h linux-3.2.2.patch/arch/arm/lib/longlong.h ---- linux-3.2.2/arch/arm/lib/longlong.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/lib/longlong.h 2012-01-26 15:51:18.092780811 +0100 +diff -Naur linux-3.1.10/arch/arm/lib/longlong.h linux-3.1.10.patch/arch/arm/lib/longlong.h +--- linux-3.1.10/arch/arm/lib/longlong.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/lib/longlong.h 2012-02-03 23:03:54.317346172 +0100 @@ -0,0 +1,151 @@ +/* longlong.h -- based on code from gcc-2.95.3 + @@ -2667,9 +2665,9 @@ diff -Naur linux-3.2.2/arch/arm/lib/longlong.h linux-3.2.2.patch/arch/arm/lib/lo + +#define UDIV_NEEDS_NORMALIZATION 1 +#define udiv_qrnnd __udiv_qrnnd_c -diff -Naur linux-3.2.2/arch/arm/lib/Makefile linux-3.2.2.patch/arch/arm/lib/Makefile ---- linux-3.2.2/arch/arm/lib/Makefile 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/lib/Makefile 2012-01-26 15:51:18.084780651 +0100 +diff -Naur linux-3.1.10/arch/arm/lib/Makefile linux-3.1.10.patch/arch/arm/lib/Makefile +--- linux-3.1.10/arch/arm/lib/Makefile 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/lib/Makefile 2012-02-03 23:03:54.315346133 +0100 @@ -13,7 +13,8 @@ testchangebit.o testclearbit.o testsetbit.o \ ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ @@ -2680,9 +2678,9 @@ diff -Naur linux-3.2.2/arch/arm/lib/Makefile linux-3.2.2.patch/arch/arm/lib/Make mmu-y := clear_user.o copy_page.o getuser.o putuser.o -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/armctrl.c linux-3.2.2.patch/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.2.2/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/armctrl.c 2012-01-26 15:51:18.094780850 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/armctrl.c linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.1.10/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.c 2012-02-03 23:03:54.347346755 +0100 @@ -0,0 +1,399 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -3083,9 +3081,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/armctrl.c linux-3.2.2.patch/arch/ar + armctrl_pm_register(base, irq_start, resume_sources); + return 0; +} -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/armctrl.h linux-3.2.2.patch/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.2.2/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/armctrl.h 2012-01-26 15:51:18.095780870 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/armctrl.h linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.1.10/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/armctrl.h 2012-02-03 23:03:54.347346755 +0100 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -3114,9 +3112,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/armctrl.h linux-3.2.2.patch/arch/ar + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/bcm2708.c linux-3.2.2.patch/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.2.2/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/bcm2708.c 2012-01-26 15:51:18.096780890 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.c linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.c 2012-02-03 23:03:54.348346774 +0100 @@ -0,0 +1,658 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3776,9 +3774,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/bcm2708.c linux-3.2.2.patch/arch/ar + .timer = &bcm2708_timer, + .init_machine = bcm2708_init, +MACHINE_END -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.2.2.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.2.2/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-01-26 15:51:18.097780910 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.1.10/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-02-03 23:03:54.350346814 +0100 @@ -0,0 +1,323 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -4103,9 +4101,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.2.2.patch/ar +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); + -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/bcm2708.h linux-3.2.2.patch/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.2.2/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/bcm2708.h 2012-01-26 15:51:18.096780890 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.h linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.1.10/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/bcm2708.h 2012-02-03 23:03:54.349346794 +0100 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4158,9 +4156,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/bcm2708.h linux-3.2.2.patch/arch/ar +} + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/clock.c linux-3.2.2.patch/arch/arm/mach-bcm2708/clock.c ---- linux-3.2.2/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/clock.c 2012-01-26 15:51:18.098780930 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/clock.c linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.c +--- linux-3.1.10/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.c 2012-02-03 23:03:54.350346814 +0100 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4223,9 +4221,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/clock.c linux-3.2.2.patch/arch/arm/ + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/clock.h linux-3.2.2.patch/arch/arm/mach-bcm2708/clock.h ---- linux-3.2.2/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/clock.h 2012-01-26 15:51:18.098780930 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/clock.h linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.h +--- linux-3.1.10/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/clock.h 2012-02-03 23:03:54.351346833 +0100 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4251,9 +4249,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/clock.h linux-3.2.2.patch/arch/arm/ +struct clk { + unsigned long rate; +}; -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/dma.c linux-3.2.2.patch/arch/arm/mach-bcm2708/dma.c ---- linux-3.2.2/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/dma.c 2012-01-26 15:51:18.099780950 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/dma.c linux-3.1.10.patch/arch/arm/mach-bcm2708/dma.c +--- linux-3.1.10/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/dma.c 2012-02-03 23:03:54.352346852 +0100 @@ -0,0 +1,397 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4652,9 +4650,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/dma.c linux-3.2.2.patch/arch/arm/ma +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-01-26 15:51:18.101780990 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-02-03 23:03:54.353346871 +0100 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5075,9 +5073,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3. +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-01-26 15:51:18.102781010 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-02-03 23:03:54.354346891 +0100 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5139,9 +5137,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.2. +}; + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-01-26 15:51:18.102781010 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-02-03 23:03:54.354346891 +0100 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5150,9 +5148,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.2.2.p +#define __clk_put(clk) do { } while (0) + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-01-26 15:51:18.103781030 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-02-03 23:03:54.354346891 +0100 @@ -0,0 +1,24 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -5178,9 +5176,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3. + .endm + +#include -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/dma.h 2012-01-26 15:51:18.103781030 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/dma.h 2012-02-03 23:03:54.355346911 +0100 @@ -0,0 +1,84 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -5266,9 +5264,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.2.2.patc + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-01-26 15:51:18.104781050 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-02-03 23:03:54.355346911 +0100 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -5339,9 +5337,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3. +1020: @ EQ will be set if no irqs pending + + .endm -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/frc.h 2012-01-26 15:51:18.104781050 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/frc.h 2012-02-03 23:03:54.356346931 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -5381,9 +5379,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.2.2.patc +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-01-26 15:51:18.104781050 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-02-03 23:03:54.356346931 +0100 @@ -0,0 +1,48 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -5433,9 +5431,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.2.2.pat +#endif /* CONFIG_GPIOLIB */ + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-01-26 15:51:18.105781070 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-02-03 23:03:54.357346950 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -5465,9 +5463,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.2.2 +#include + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/io.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/io.h 2012-01-26 15:51:18.105781070 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/io.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/io.h 2012-02-03 23:03:54.357346950 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -5497,9 +5495,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/io.h linux-3.2.2.patch +#define __mem_pci(a) (a) + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-01-26 15:51:18.106781090 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-02-03 23:03:54.358346969 +0100 @@ -0,0 +1,190 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -5691,9 +5689,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.2.2.pat +#define NR_IRQS (64 + 21) + +#endif /* _BCM2708_IRQS_H_ */ -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/irqs.h.orig linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/irqs.h.orig ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/irqs.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/irqs.h.orig 2012-01-26 15:51:18.107781110 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h.orig linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h.orig +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/irqs.h.orig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/irqs.h.orig 2012-02-03 23:03:54.358346969 +0100 @@ -0,0 +1,185 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -5880,9 +5878,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/irqs.h.orig linux-3.2. +#define FIQ_PENDING2 INT_PENDING2 + +#define NR_IRQS (64 + 21) -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/memory.h 2012-01-26 15:51:18.108781130 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/memory.h 2012-02-03 23:03:54.359346988 +0100 @@ -0,0 +1,59 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -5943,9 +5941,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.2.2.p +#define CONSISTENT_DMA_SIZE 0x00200000 + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/platform.h 2012-01-26 15:51:18.109781150 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h 2012-02-03 23:03:54.360347007 +0100 @@ -0,0 +1,210 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6157,10 +6155,223 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.2.2 +#endif + +/* END */ -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/platform.h.orig linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/platform.h.orig -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/power.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/power.h 2012-01-26 15:51:18.110781170 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h.orig linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h.orig +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/platform.h.orig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/platform.h.orig 2012-02-03 23:03:54.361347027 +0100 +@@ -0,0 +1,210 @@ ++/* ++ * arch/arm/mach-bcm2708/include/mach/platform.h ++ * ++ * Copyright (C) 2010 Broadcom ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef _BCM2708_PLATFORM_H ++#define _BCM2708_PLATFORM_H ++ ++ ++/* macros to get at IO space when running virtually */ ++#define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) ++ ++#define __io_address(a) __io(IO_ADDRESS(a)) ++ ++ ++/* ++ * SDRAM ++ */ ++#define BCM2708_SDRAM_BASE 0x00000000 ++ ++/* ++ * Logic expansion modules ++ * ++ */ ++ ++ ++/* ------------------------------------------------------------------------ ++ * BCM2708 ARMCTRL Registers ++ * ------------------------------------------------------------------------ ++ */ ++ ++#define HW_REGISTER_RW(addr) (addr) ++#define HW_REGISTER_RO(addr) (addr) ++ ++#include "arm_control.h" ++#undef ARM_BASE ++ ++/* ++ * Definitions and addresses for the ARM CONTROL logic ++ * This file is manually generated. ++ */ ++ ++#define BCM2708_PERI_BASE 0x20000000 ++#define ST_BASE (BCM2708_PERI_BASE + 0x3000) /* System Timer */ ++#define DMA_BASE (BCM2708_PERI_BASE + 0x7000) /* DMA controller */ ++#define ARM_BASE (BCM2708_PERI_BASE + 0xB000) /* BCM2708 ARM control block */ ++#define PM_BASE (BCM2708_PERI_BASE + 0x100000) /* Power Management, Reset controller and Watchdog registers */ ++#define GPIO_BASE (BCM2708_PERI_BASE + 0x200000) /* GPIO */ ++#define UART0_BASE (BCM2708_PERI_BASE + 0x201000) /* Uart 0 */ ++#define MMCI0_BASE (BCM2708_PERI_BASE + 0x202000) /* MMC interface */ ++#define UART1_BASE (BCM2708_PERI_BASE + 0x215000) /* Uart 1 */ ++#define EMMC_BASE (BCM2708_PERI_BASE + 0x300000) /* eMMC interface */ ++#define SMI_BASE (BCM2708_PERI_BASE + 0x600000) /* SMI */ ++#define USB_BASE (BCM2708_PERI_BASE + 0x980000) /* DTC_OTG USB controller */ ++ ++ ++#define ARMCTRL_BASE (ARM_BASE + 0x000) ++#define ARMCTRL_IC_BASE (ARM_BASE + 0x200) /* ARM interrupt controller */ ++#define ARMCTRL_TIMER0_1_BASE (ARM_BASE + 0x400) /* Timer 0 and 1 */ ++#define ARMCTRL_0_SBM_BASE (ARM_BASE + 0x800) /* User 0 (ARM)'s Semaphores Doorbells and Mailboxes */ ++ ++ ++/* ++ * Interrupt assignments ++ */ ++ ++#define ARM_IRQ1_BASE 0 ++#define INTERRUPT_TIMER0 (ARM_IRQ1_BASE + 0) ++#define INTERRUPT_TIMER1 (ARM_IRQ1_BASE + 1) ++#define INTERRUPT_TIMER2 (ARM_IRQ1_BASE + 2) ++#define INTERRUPT_TIMER3 (ARM_IRQ1_BASE + 3) ++#define INTERRUPT_CODEC0 (ARM_IRQ1_BASE + 4) ++#define INTERRUPT_CODEC1 (ARM_IRQ1_BASE + 5) ++#define INTERRUPT_CODEC2 (ARM_IRQ1_BASE + 6) ++#define INTERRUPT_VC_JPEG (ARM_IRQ1_BASE + 7) ++#define INTERRUPT_ISP (ARM_IRQ1_BASE + 8) ++#define INTERRUPT_VC_USB (ARM_IRQ1_BASE + 9) ++#define INTERRUPT_VC_3D (ARM_IRQ1_BASE + 10) ++#define INTERRUPT_TRANSPOSER (ARM_IRQ1_BASE + 11) ++#define INTERRUPT_MULTICORESYNC0 (ARM_IRQ1_BASE + 12) ++#define INTERRUPT_MULTICORESYNC1 (ARM_IRQ1_BASE + 13) ++#define INTERRUPT_MULTICORESYNC2 (ARM_IRQ1_BASE + 14) ++#define INTERRUPT_MULTICORESYNC3 (ARM_IRQ1_BASE + 15) ++#define INTERRUPT_DMA0 (ARM_IRQ1_BASE + 16) ++#define INTERRUPT_DMA1 (ARM_IRQ1_BASE + 17) ++#define INTERRUPT_VC_DMA2 (ARM_IRQ1_BASE + 18) ++#define INTERRUPT_VC_DMA3 (ARM_IRQ1_BASE + 19) ++#define INTERRUPT_DMA4 (ARM_IRQ1_BASE + 20) ++#define INTERRUPT_DMA5 (ARM_IRQ1_BASE + 21) ++#define INTERRUPT_DMA6 (ARM_IRQ1_BASE + 22) ++#define INTERRUPT_DMA7 (ARM_IRQ1_BASE + 23) ++#define INTERRUPT_DMA8 (ARM_IRQ1_BASE + 24) ++#define INTERRUPT_DMA9 (ARM_IRQ1_BASE + 25) ++#define INTERRUPT_DMA10 (ARM_IRQ1_BASE + 26) ++#define INTERRUPT_DMA11 (ARM_IRQ1_BASE + 27) ++#define INTERRUPT_DMA12 (ARM_IRQ1_BASE + 28) ++#define INTERRUPT_AUX (ARM_IRQ1_BASE + 29) ++#define INTERRUPT_ARM (ARM_IRQ1_BASE + 30) ++#define INTERRUPT_VPUDMA (ARM_IRQ1_BASE + 31) ++ ++#define ARM_IRQ2_BASE 32 ++#define INTERRUPT_HOSTPORT (ARM_IRQ2_BASE + 0) ++#define INTERRUPT_VIDEOSCALER (ARM_IRQ2_BASE + 1) ++#define INTERRUPT_CCP2TX (ARM_IRQ2_BASE + 2) ++#define INTERRUPT_SDC (ARM_IRQ2_BASE + 3) ++#define INTERRUPT_DSI0 (ARM_IRQ2_BASE + 4) ++#define INTERRUPT_AVE (ARM_IRQ2_BASE + 5) ++#define INTERRUPT_CAM0 (ARM_IRQ2_BASE + 6) ++#define INTERRUPT_CAM1 (ARM_IRQ2_BASE + 7) ++#define INTERRUPT_HDMI0 (ARM_IRQ2_BASE + 8) ++#define INTERRUPT_HDMI1 (ARM_IRQ2_BASE + 9) ++#define INTERRUPT_PIXELVALVE1 (ARM_IRQ2_BASE + 10) ++#define INTERRUPT_I2CSPISLV (ARM_IRQ2_BASE + 11) ++#define INTERRUPT_DSI1 (ARM_IRQ2_BASE + 12) ++#define INTERRUPT_PWA0 (ARM_IRQ2_BASE + 13) ++#define INTERRUPT_PWA1 (ARM_IRQ2_BASE + 14) ++#define INTERRUPT_CPR (ARM_IRQ2_BASE + 15) ++#define INTERRUPT_SMI (ARM_IRQ2_BASE + 16) ++#define INTERRUPT_GPIO0 (ARM_IRQ2_BASE + 17) ++#define INTERRUPT_GPIO1 (ARM_IRQ2_BASE + 18) ++#define INTERRUPT_GPIO2 (ARM_IRQ2_BASE + 19) ++#define INTERRUPT_GPIO3 (ARM_IRQ2_BASE + 20) ++#define INTERRUPT_VC_I2C (ARM_IRQ2_BASE + 21) ++#define INTERRUPT_VC_SPI (ARM_IRQ2_BASE + 22) ++#define INTERRUPT_VC_I2SPCM (ARM_IRQ2_BASE + 23) ++#define INTERRUPT_VC_SDIO (ARM_IRQ2_BASE + 24) ++#define INTERRUPT_VC_UART (ARM_IRQ2_BASE + 25) ++#define INTERRUPT_SLIMBUS (ARM_IRQ2_BASE + 26) ++#define INTERRUPT_VEC (ARM_IRQ2_BASE + 27) ++#define INTERRUPT_CPG (ARM_IRQ2_BASE + 28) ++#define INTERRUPT_RNG (ARM_IRQ2_BASE + 29) ++#define INTERRUPT_VC_ARASANSDIO (ARM_IRQ2_BASE + 30) ++#define INTERRUPT_AVSPMON (ARM_IRQ2_BASE + 31) ++ ++#define ARM_IRQ0_BASE 64 ++#define INTERRUPT_ARM_TIMER (ARM_IRQ0_BASE + 0) ++#define INTERRUPT_ARM_MAILBOX (ARM_IRQ0_BASE + 1) ++#define INTERRUPT_ARM_DOORBELL_0 (ARM_IRQ0_BASE + 2) ++#define INTERRUPT_ARM_DOORBELL_1 (ARM_IRQ0_BASE + 3) ++#define INTERRUPT_VPU0_HALTED (ARM_IRQ0_BASE + 4) ++#define INTERRUPT_VPU1_HALTED (ARM_IRQ0_BASE + 5) ++#define INTERRUPT_ILLEGAL_TYPE0 (ARM_IRQ0_BASE + 6) ++#define INTERRUPT_ILLEGAL_TYPE1 (ARM_IRQ0_BASE + 7) ++#define INTERRUPT_PENDING1 (ARM_IRQ0_BASE + 8) ++#define INTERRUPT_PENDING2 (ARM_IRQ0_BASE + 9) ++#define INTERRUPT_JPEG (ARM_IRQ0_BASE + 10) ++#define INTERRUPT_USB (ARM_IRQ0_BASE + 11) ++#define INTERRUPT_3D (ARM_IRQ0_BASE + 12) ++#define INTERRUPT_DMA2 (ARM_IRQ0_BASE + 13) ++#define INTERRUPT_DMA3 (ARM_IRQ0_BASE + 14) ++#define INTERRUPT_I2C (ARM_IRQ0_BASE + 15) ++#define INTERRUPT_SPI (ARM_IRQ0_BASE + 16) ++#define INTERRUPT_I2SPCM (ARM_IRQ0_BASE + 17) ++#define INTERRUPT_SDIO (ARM_IRQ0_BASE + 18) ++#define INTERRUPT_UART (ARM_IRQ0_BASE + 19) ++#define INTERRUPT_ARASANSDIO (ARM_IRQ0_BASE + 20) ++ ++#define MAXIRQNUM (32 + 32 + 20) ++#define MAXFIQNUM (32 + 32 + 20) ++ ++#define MAX_TIMER 2 ++#define MAX_PERIOD 699050 ++#define TICKS_PER_uSEC 1 ++ ++/* ++ * These are useconds NOT ticks. ++ * ++ */ ++#define mSEC_1 1000 ++#define mSEC_5 (mSEC_1 * 5) ++#define mSEC_10 (mSEC_1 * 10) ++#define mSEC_25 (mSEC_1 * 25) ++#define SEC_1 (mSEC_1 * 1000) ++ ++/* ++ * Watchdog ++ */ ++#define PM_RSTC (PM_BASE+0x1c) ++#define PM_WDOG (PM_BASE+0x24) ++ ++#define PM_WDOG_RESET 0000000000 ++#define PM_PASSWORD 0x5a000000 ++#define PM_WDOG_TIME_SET 0x000fffff ++#define PM_RSTC_WRCFG_CLR 0xffffffcf ++#define PM_RSTC_WRCFG_SET 0x00000030 ++#define PM_RSTC_WRCFG_FULL_RESET 0x00000020 ++#define PM_RSTC_RESET 0x00000102 ++ ++ ++ ++ ++ ++#endif ++ ++/* END */ +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/power.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/power.h 2012-02-03 23:03:54.361347027 +0100 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6188,9 +6399,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/power.h linux-3.2.2.pa +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/system.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/system.h 2012-01-26 15:51:18.111781190 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/system.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/system.h 2012-02-03 23:03:54.362347047 +0100 @@ -0,0 +1,53 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6245,9 +6456,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/system.h linux-3.2.2.p +} + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/timex.h 2012-01-26 15:51:18.111781190 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/timex.h 2012-02-03 23:03:54.362347047 +0100 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6272,9 +6483,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.2.2.pa + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-01-26 15:51:18.111781190 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-02-03 23:03:54.363347067 +0100 @@ -0,0 +1,49 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -6325,9 +6536,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.2 + */ +#define arch_decomp_setup() +#define arch_decomp_wdog() -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/vcio.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-01-26 15:51:18.112781210 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vcio.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-02-03 23:03:54.364347086 +0100 @@ -0,0 +1,42 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -6371,9 +6582,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.2.2.pat +extern int /*rc*/ bcm_mailbox_write(unsigned chan, uint32_t data28); + +#endif -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-01-26 15:51:18.112781210 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-02-03 23:03:54.363347067 +0100 @@ -0,0 +1,34 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -6409,9 +6620,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.2.2.p + +#endif /* VC_MEM_H */ + -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-3.2.2/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-01-26 15:51:18.113781230 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-3.1.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-02-03 23:03:54.364347086 +0100 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -6433,9 +6644,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.2.2. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xd8000000) -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/Kconfig linux-3.2.2.patch/arch/arm/mach-bcm2708/Kconfig ---- linux-3.2.2/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/Kconfig 2012-01-26 15:51:18.093780830 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Kconfig linux-3.1.10.patch/arch/arm/mach-bcm2708/Kconfig +--- linux-3.1.10/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Kconfig 2012-02-03 23:03:54.345346717 +0100 @@ -0,0 +1,25 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -6462,9 +6673,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/Kconfig linux-3.2.2.patch/arch/arm/ + Helper for videocore memory access and total size allocation. + +endmenu -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/Makefile linux-3.2.2.patch/arch/arm/mach-bcm2708/Makefile ---- linux-3.2.2/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/Makefile 2012-01-26 15:51:18.093780830 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Makefile linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile +--- linux-3.1.10/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile 2012-02-03 23:03:54.346346736 +0100 @@ -0,0 +1,8 @@ +# +# Makefile for the linux kernel. @@ -6474,16 +6685,16 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/Makefile linux-3.2.2.patch/arch/arm +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o + -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/Makefile.boot linux-3.2.2.patch/arch/arm/mach-bcm2708/Makefile.boot ---- linux-3.2.2/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/Makefile.boot 2012-01-26 15:51:18.094780850 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/Makefile.boot linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile.boot +--- linux-3.1.10/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/Makefile.boot 2012-02-03 23:03:54.346346736 +0100 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/power.c linux-3.2.2.patch/arch/arm/mach-bcm2708/power.c ---- linux-3.2.2/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/power.c 2012-01-26 15:51:18.113781230 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/power.c linux-3.1.10.patch/arch/arm/mach-bcm2708/power.c +--- linux-3.1.10/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/power.c 2012-02-03 23:03:54.365347105 +0100 @@ -0,0 +1,193 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -6678,9 +6889,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/power.c linux-3.2.2.patch/arch/arm/ +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/vcio.c linux-3.2.2.patch/arch/arm/mach-bcm2708/vcio.c ---- linux-3.2.2/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/vcio.c 2012-01-26 15:51:18.115781270 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/vcio.c linux-3.1.10.patch/arch/arm/mach-bcm2708/vcio.c +--- linux-3.1.10/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/vcio.c 2012-02-03 23:03:54.367347143 +0100 @@ -0,0 +1,309 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -6991,9 +7202,9 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/vcio.c linux-3.2.2.patch/arch/arm/m +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/vc_mem.c linux-3.2.2.patch/arch/arm/mach-bcm2708/vc_mem.c ---- linux-3.2.2/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mach-bcm2708/vc_mem.c 2012-01-26 15:51:18.114781250 +0100 +diff -Naur linux-3.1.10/arch/arm/mach-bcm2708/vc_mem.c linux-3.1.10.patch/arch/arm/mach-bcm2708/vc_mem.c +--- linux-3.1.10/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mach-bcm2708/vc_mem.c 2012-02-03 23:03:54.366347124 +0100 @@ -0,0 +1,467 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7462,10 +7673,10 @@ diff -Naur linux-3.2.2/arch/arm/mach-bcm2708/vc_mem.c linux-3.2.2.patch/arch/arm +module_exit(vc_mem_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Naur linux-3.2.2/arch/arm/Makefile linux-3.2.2.patch/arch/arm/Makefile ---- linux-3.2.2/arch/arm/Makefile 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/Makefile 2012-01-26 15:51:18.044779852 +0100 -@@ -198,6 +198,7 @@ +diff -Naur linux-3.1.10/arch/arm/Makefile linux-3.1.10.patch/arch/arm/Makefile +--- linux-3.1.10/arch/arm/Makefile 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/Makefile 2012-02-03 23:03:54.310346035 +0100 +@@ -196,6 +196,7 @@ machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx machine-$(CONFIG_ARCH_ZYNQ) := zynq @@ -7473,10 +7684,9 @@ diff -Naur linux-3.2.2/arch/arm/Makefile linux-3.2.2.patch/arch/arm/Makefile # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -diff -Naur linux-3.2.2/arch/arm/Makefile.orig linux-3.2.2.patch/arch/arm/Makefile.orig -diff -Naur linux-3.2.2/arch/arm/mm/alignment.c linux-3.2.2.patch/arch/arm/mm/alignment.c ---- linux-3.2.2/arch/arm/mm/alignment.c 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mm/alignment.c 2012-01-26 15:51:18.116781290 +0100 +diff -Naur linux-3.1.10/arch/arm/mm/alignment.c linux-3.1.10.patch/arch/arm/mm/alignment.c +--- linux-3.1.10/arch/arm/mm/alignment.c 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mm/alignment.c 2012-02-03 23:03:54.369347183 +0100 @@ -855,9 +855,11 @@ case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) @@ -7491,9 +7701,9 @@ diff -Naur linux-3.2.2/arch/arm/mm/alignment.c linux-3.2.2.patch/arch/arm/mm/ali default: goto bad; -diff -Naur linux-3.2.2/arch/arm/mm/Kconfig linux-3.2.2.patch/arch/arm/mm/Kconfig ---- linux-3.2.2/arch/arm/mm/Kconfig 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mm/Kconfig 2012-01-26 15:51:18.116781290 +0100 +diff -Naur linux-3.1.10/arch/arm/mm/Kconfig linux-3.1.10.patch/arch/arm/mm/Kconfig +--- linux-3.1.10/arch/arm/mm/Kconfig 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mm/Kconfig 2012-02-03 23:03:54.368347163 +0100 @@ -390,7 +390,7 @@ # ARMv6 @@ -7503,9 +7713,9 @@ diff -Naur linux-3.2.2/arch/arm/mm/Kconfig linux-3.2.2.patch/arch/arm/mm/Kconfig select CPU_32v6 select CPU_ABRT_EV6 select CPU_PABRT_V6 -diff -Naur linux-3.2.2/arch/arm/mm/proc-v6.S linux-3.2.2.patch/arch/arm/mm/proc-v6.S ---- linux-3.2.2/arch/arm/mm/proc-v6.S 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/mm/proc-v6.S 2012-01-26 15:51:18.117781310 +0100 +diff -Naur linux-3.1.10/arch/arm/mm/proc-v6.S linux-3.1.10.patch/arch/arm/mm/proc-v6.S +--- linux-3.1.10/arch/arm/mm/proc-v6.S 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/arch/arm/mm/proc-v6.S 2012-02-03 23:03:54.370347203 +0100 @@ -70,10 +70,19 @@ * * IRQs are already disabled. diff --git a/packages/linux/patches/linux-3.2.2-602-add_bcm2708_mmc_driver-0.1.patch b/packages/linux/patches/linux-3.1.10-602-add_bcm2708_mmc_driver-0.1.patch similarity index 74% rename from packages/linux/patches/linux-3.2.2-602-add_bcm2708_mmc_driver-0.1.patch rename to packages/linux/patches/linux-3.1.10-602-add_bcm2708_mmc_driver-0.1.patch index 45d2b35aa2..0385727c55 100644 --- a/packages/linux/patches/linux-3.2.2-602-add_bcm2708_mmc_driver-0.1.patch +++ b/packages/linux/patches/linux-3.1.10-602-add_bcm2708_mmc_driver-0.1.patch @@ -1,6 +1,6 @@ -diff -Naur linux-3.2.2/drivers/mmc/host/bcm2708_mci.c linux-3.2.2.patch/drivers/mmc/host/bcm2708_mci.c ---- linux-3.2.2/drivers/mmc/host/bcm2708_mci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/mmc/host/bcm2708_mci.c 2012-02-03 03:47:00.203972196 +0100 +diff -Naur linux-3.1.10/drivers/mmc/host/bcm2708_mci.c linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.c +--- linux-3.1.10/drivers/mmc/host/bcm2708_mci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.c 2012-02-03 23:06:15.097082507 +0100 @@ -0,0 +1,889 @@ +/* + * linux/drivers/mmc/host/bcm2708_mci.c - Broadcom BCM2708 MCI driver @@ -891,9 +891,9 @@ diff -Naur linux-3.2.2/drivers/mmc/host/bcm2708_mci.c linux-3.2.2.patch/drivers/ +MODULE_DESCRIPTION("BCM2708 Multimedia Card Interface driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2708_mci"); -diff -Naur linux-3.2.2/drivers/mmc/host/bcm2708_mci.h linux-3.2.2.patch/drivers/mmc/host/bcm2708_mci.h ---- linux-3.2.2/drivers/mmc/host/bcm2708_mci.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/mmc/host/bcm2708_mci.h 2012-02-03 03:47:00.203972196 +0100 +diff -Naur linux-3.1.10/drivers/mmc/host/bcm2708_mci.h linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.h +--- linux-3.1.10/drivers/mmc/host/bcm2708_mci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/mmc/host/bcm2708_mci.h 2012-02-03 23:06:15.122082992 +0100 @@ -0,0 +1,101 @@ +/* + * linux/drivers/mmc/host/bcm2708_mci.c - Broadcom BCM2708 MCI driver @@ -996,9 +996,9 @@ diff -Naur linux-3.2.2/drivers/mmc/host/bcm2708_mci.h linux-3.2.2.patch/drivers/ + kunmap_atomic(buffer, KM_BIO_SRC_IRQ); +// local_irq_restore(*flags); +} -diff -Naur linux-3.2.2/drivers/mmc/host/Kconfig linux-3.2.2.patch/drivers/mmc/host/Kconfig ---- linux-3.2.2/drivers/mmc/host/Kconfig 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/mmc/host/Kconfig 2012-02-03 03:47:00.201972159 +0100 +diff -Naur linux-3.1.10/drivers/mmc/host/Kconfig linux-3.1.10.patch/drivers/mmc/host/Kconfig +--- linux-3.1.10/drivers/mmc/host/Kconfig 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/mmc/host/Kconfig 2012-02-03 23:06:15.068081944 +0100 @@ -229,6 +229,27 @@ YMMV. @@ -1042,9 +1042,9 @@ diff -Naur linux-3.2.2/drivers/mmc/host/Kconfig linux-3.2.2.patch/drivers/mmc/ho config MMC_ATMELMCI_DMA bool "Atmel MCI DMA support" -diff -Naur linux-3.2.2/drivers/mmc/host/Makefile linux-3.2.2.patch/drivers/mmc/host/Makefile ---- linux-3.2.2/drivers/mmc/host/Makefile 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/mmc/host/Makefile 2012-02-03 03:47:00.202972178 +0100 +diff -Naur linux-3.1.10/drivers/mmc/host/Makefile linux-3.1.10.patch/drivers/mmc/host/Makefile +--- linux-3.1.10/drivers/mmc/host/Makefile 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/mmc/host/Makefile 2012-02-03 23:06:15.068081944 +0100 @@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-pxav2.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o @@ -1061,9 +1061,9 @@ diff -Naur linux-3.2.2/drivers/mmc/host/Makefile linux-3.2.2.patch/drivers/mmc/h obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o obj-$(CONFIG_MMC_DW) += dw_mmc.o obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o -diff -Naur linux-3.2.2/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.2.patch/drivers/mmc/host/sdhci-bcm2708.c ---- linux-3.2.2/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/mmc/host/sdhci-bcm2708.c 2012-02-03 03:47:00.206972250 +0100 +diff -Naur linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c linux-3.1.10.patch/drivers/mmc/host/sdhci-bcm2708.c +--- linux-3.1.10/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/mmc/host/sdhci-bcm2708.c 2012-02-03 23:06:15.124083032 +0100 @@ -0,0 +1,1461 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 @@ -2526,10 +2526,21 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.2.patch/driver +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:"DRIVER_NAME); + -diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/host/sdhci.c ---- linux-3.2.2/drivers/mmc/host/sdhci.c 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/mmc/host/sdhci.c 2012-02-03 04:56:26.000000000 +0100 -@@ -27,6 +27,7 @@ +diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.c linux-3.1.10.patch/drivers/mmc/host/sdhci.c +--- linux-3.1.10/drivers/mmc/host/sdhci.c 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/mmc/host/sdhci.c 2012-02-03 23:06:15.128083110 +0100 +@@ -16,15 +16,18 @@ + #include + #include + #include ++#include + #include + #include + #include + #include ++#include + + #include #include #include @@ -2537,7 +2548,133 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho #include "sdhci.h" -@@ -296,7 +297,7 @@ +@@ -41,6 +44,7 @@ + #define MAX_TUNING_LOOP 40 + + static unsigned int debug_quirks = 0; ++static unsigned int debug_quirks2; + + static void sdhci_finish_data(struct sdhci_host *); + +@@ -49,53 +53,67 @@ + static int sdhci_execute_tuning(struct mmc_host *mmc); + static void sdhci_tuning_timer(unsigned long data); + ++#ifdef CONFIG_PM_RUNTIME ++static int sdhci_runtime_pm_get(struct sdhci_host *host); ++static int sdhci_runtime_pm_put(struct sdhci_host *host); ++#else ++static inline int sdhci_runtime_pm_get(struct sdhci_host *host) ++{ ++ return 0; ++} ++static inline int sdhci_runtime_pm_put(struct sdhci_host *host) ++{ ++ return 0; ++} ++#endif ++ + static void sdhci_dumpregs(struct sdhci_host *host) + { +- printk(KERN_DEBUG DRIVER_NAME ": =========== REGISTER DUMP (%s)===========\n", ++ pr_debug(DRIVER_NAME ": =========== REGISTER DUMP (%s)===========\n", + mmc_hostname(host->mmc)); + +- printk(KERN_DEBUG DRIVER_NAME ": Sys addr: 0x%08x | Version: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": Sys addr: 0x%08x | Version: 0x%08x\n", + sdhci_readl(host, SDHCI_DMA_ADDRESS), + sdhci_readw(host, SDHCI_HOST_VERSION)); +- printk(KERN_DEBUG DRIVER_NAME ": Blk size: 0x%08x | Blk cnt: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": Blk size: 0x%08x | Blk cnt: 0x%08x\n", + sdhci_readw(host, SDHCI_BLOCK_SIZE), + sdhci_readw(host, SDHCI_BLOCK_COUNT)); +- printk(KERN_DEBUG DRIVER_NAME ": Argument: 0x%08x | Trn mode: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": Argument: 0x%08x | Trn mode: 0x%08x\n", + sdhci_readl(host, SDHCI_ARGUMENT), + sdhci_readw(host, SDHCI_TRANSFER_MODE)); +- printk(KERN_DEBUG DRIVER_NAME ": Present: 0x%08x | Host ctl: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": Present: 0x%08x | Host ctl: 0x%08x\n", + sdhci_readl(host, SDHCI_PRESENT_STATE), + sdhci_readb(host, SDHCI_HOST_CONTROL)); +- printk(KERN_DEBUG DRIVER_NAME ": Power: 0x%08x | Blk gap: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": Power: 0x%08x | Blk gap: 0x%08x\n", + sdhci_readb(host, SDHCI_POWER_CONTROL), + sdhci_readb(host, SDHCI_BLOCK_GAP_CONTROL)); +- printk(KERN_DEBUG DRIVER_NAME ": Wake-up: 0x%08x | Clock: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": Wake-up: 0x%08x | Clock: 0x%08x\n", + sdhci_readb(host, SDHCI_WAKE_UP_CONTROL), + sdhci_readw(host, SDHCI_CLOCK_CONTROL)); +- printk(KERN_DEBUG DRIVER_NAME ": Timeout: 0x%08x | Int stat: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": Timeout: 0x%08x | Int stat: 0x%08x\n", + sdhci_readb(host, SDHCI_TIMEOUT_CONTROL), + sdhci_readl(host, SDHCI_INT_STATUS)); +- printk(KERN_DEBUG DRIVER_NAME ": Int enab: 0x%08x | Sig enab: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": Int enab: 0x%08x | Sig enab: 0x%08x\n", + sdhci_readl(host, SDHCI_INT_ENABLE), + sdhci_readl(host, SDHCI_SIGNAL_ENABLE)); +- printk(KERN_DEBUG DRIVER_NAME ": AC12 err: 0x%08x | Slot int: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": AC12 err: 0x%08x | Slot int: 0x%08x\n", + sdhci_readw(host, SDHCI_ACMD12_ERR), + sdhci_readw(host, SDHCI_SLOT_INT_STATUS)); +- printk(KERN_DEBUG DRIVER_NAME ": Caps: 0x%08x | Caps_1: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": Caps: 0x%08x | Caps_1: 0x%08x\n", + sdhci_readl(host, SDHCI_CAPABILITIES), + sdhci_readl(host, SDHCI_CAPABILITIES_1)); +- printk(KERN_DEBUG DRIVER_NAME ": Cmd: 0x%08x | Max curr: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": Cmd: 0x%08x | Max curr: 0x%08x\n", + sdhci_readw(host, SDHCI_COMMAND), + sdhci_readl(host, SDHCI_MAX_CURRENT)); +- printk(KERN_DEBUG DRIVER_NAME ": Host ctl2: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": Host ctl2: 0x%08x\n", + sdhci_readw(host, SDHCI_HOST_CONTROL2)); + + if (host->flags & SDHCI_USE_ADMA) +- printk(KERN_DEBUG DRIVER_NAME ": ADMA Err: 0x%08x | ADMA Ptr: 0x%08x\n", ++ pr_debug(DRIVER_NAME ": ADMA Err: 0x%08x | ADMA Ptr: 0x%08x\n", + readl(host->ioaddr + SDHCI_ADMA_ERROR), + readl(host->ioaddr + SDHCI_ADMA_ADDRESS)); + +- printk(KERN_DEBUG DRIVER_NAME ": ===========================================\n"); ++ pr_debug(DRIVER_NAME ": ===========================================\n"); + } + + /*****************************************************************************\ +@@ -132,6 +150,9 @@ + if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) + return; + ++ if (host->quirks2 & SDHCI_QUIRK2_OWN_CARD_DETECTION) ++ return; ++ + present = sdhci_readl(host, SDHCI_PRESENT_STATE) & + SDHCI_CARD_PRESENT; + irqs = present ? SDHCI_INT_CARD_REMOVE : SDHCI_INT_CARD_INSERT; +@@ -180,7 +201,7 @@ + /* hw clears the bit when it's done */ + while (sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask) { + if (timeout == 0) { +- printk(KERN_ERR "%s: Reset 0x%x never completed.\n", ++ pr_err("%s: Reset 0x%x never completed.\n", + mmc_hostname(host->mmc), (int)mask); + sdhci_dumpregs(host); + return; +@@ -251,11 +272,14 @@ + + spin_lock_irqsave(&host->lock, flags); + ++ if (host->runtime_suspended) ++ goto out; ++ + if (brightness == LED_OFF) + sdhci_deactivate_led(host); + else + sdhci_activate_led(host); +- ++out: + spin_unlock_irqrestore(&host->lock, flags); + } + #endif +@@ -273,7 +297,7 @@ u32 uninitialized_var(scratch); u8 *buf; @@ -2546,7 +2683,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho blksize = host->data->blksz; chunk = 0; -@@ -341,7 +342,7 @@ +@@ -318,7 +342,7 @@ u32 scratch; u8 *buf; @@ -2555,7 +2692,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho blksize = host->data->blksz; chunk = 0; -@@ -380,19 +381,28 @@ +@@ -357,19 +381,28 @@ local_irq_restore(flags); } @@ -2587,7 +2724,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho /* * Some controllers (JMicron JMB38x) mess up the buffer bits -@@ -403,7 +413,7 @@ +@@ -380,7 +413,7 @@ (host->data->blocks == 1)) mask = ~0; @@ -2596,7 +2733,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho if (host->quirks & SDHCI_QUIRK_PIO_NEEDS_DELAY) udelay(100); -@@ -415,9 +425,11 @@ +@@ -392,9 +425,11 @@ host->blocks--; if (host->blocks == 0) break; @@ -2609,7 +2746,16 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho } static char *sdhci_kmap_atomic(struct scatterlist *sg, unsigned long *flags) -@@ -690,7 +702,9 @@ +@@ -654,7 +689,7 @@ + } + + if (count >= 0xF) { +- printk(KERN_WARNING "%s: Too large timeout requested for CMD%d!\n", ++ pr_warning("%s: Too large timeout requested for CMD%d!\n", + mmc_hostname(host->mmc), cmd->opcode); + count = 0xE; + } +@@ -667,7 +702,9 @@ u32 pio_irqs = SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL; u32 dma_irqs = SDHCI_INT_DMA_END | SDHCI_INT_ADMA_ERROR; @@ -2620,7 +2766,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho sdhci_clear_set_irqs(host, pio_irqs, dma_irqs); else sdhci_clear_set_irqs(host, dma_irqs, pio_irqs); -@@ -722,44 +736,25 @@ +@@ -699,44 +736,25 @@ host->data_early = 0; host->data->bytes_xfered = 0; @@ -2673,7 +2819,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho int broken, i; struct scatterlist *sg; -@@ -818,7 +813,8 @@ +@@ -795,7 +813,8 @@ */ WARN_ON(1); host->flags &= ~SDHCI_REQ_USE_DMA; @@ -2683,7 +2829,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho WARN_ON(sg_cnt != 1); sdhci_writel(host, sg_dma_address(data->sg), SDHCI_DMA_ADDRESS); -@@ -834,11 +830,13 @@ +@@ -811,11 +830,13 @@ if (host->version >= SDHCI_SPEC_200) { ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); ctrl &= ~SDHCI_CTRL_DMA_MASK; @@ -2702,7 +2848,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); } -@@ -890,7 +888,8 @@ +@@ -867,7 +888,8 @@ if (data->flags & MMC_DATA_READ) mode |= SDHCI_TRNS_READ; @@ -2712,7 +2858,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho mode |= SDHCI_TRNS_DMA; sdhci_writew(host, mode, SDHCI_TRANSFER_MODE); -@@ -906,13 +905,16 @@ +@@ -883,13 +905,16 @@ host->data = NULL; if (host->flags & SDHCI_REQ_USE_DMA) { @@ -2733,7 +2879,16 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho } /* -@@ -982,10 +984,16 @@ +@@ -949,7 +974,7 @@ + + while (sdhci_readl(host, SDHCI_PRESENT_STATE) & mask) { + if (timeout == 0) { +- printk(KERN_ERR "%s: Controller never released " ++ pr_err("%s: Controller never released " + "inhibit bit(s).\n", mmc_hostname(host->mmc)); + sdhci_dumpregs(host); + cmd->error = -EIO; +@@ -959,10 +984,16 @@ timeout--; mdelay(1); } @@ -2750,7 +2905,25 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho sdhci_prepare_data(host, cmd); -@@ -1218,6 +1226,35 @@ +@@ -971,7 +1002,7 @@ + sdhci_set_transfer_mode(host, cmd); + + if ((cmd->flags & MMC_RSP_136) && (cmd->flags & MMC_RSP_BUSY)) { +- printk(KERN_ERR "%s: Unsupported response type!\n", ++ pr_err("%s: Unsupported response type!\n", + mmc_hostname(host->mmc)); + cmd->error = -EINVAL; + tasklet_schedule(&host->finish_tasklet); +@@ -1121,7 +1152,7 @@ + while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL)) + & SDHCI_CLOCK_INT_STABLE)) { + if (timeout == 0) { +- printk(KERN_ERR "%s: Internal clock never " ++ pr_err("%s: Internal clock never " + "stabilised.\n", mmc_hostname(host->mmc)); + sdhci_dumpregs(host); + return; +@@ -1195,6 +1226,35 @@ mdelay(10); } @@ -2786,15 +2959,32 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho /*****************************************************************************\ * * * MMC callbacks * -@@ -1298,6 +1335,7 @@ +@@ -1209,6 +1269,8 @@ + + host = mmc_priv(mmc); + ++ sdhci_runtime_pm_get(host); ++ + spin_lock_irqsave(&host->lock, flags); + + WARN_ON(host->mrq != NULL); +@@ -1269,13 +1331,11 @@ + spin_unlock_irqrestore(&host->lock, flags); + } + +-static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) ++static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) { +- struct sdhci_host *host; unsigned long flags; u8 ctrl; +- +- host = mmc_priv(mmc); + int rc; spin_lock_irqsave(&host->lock, flags); -@@ -1356,7 +1394,7 @@ +@@ -1334,7 +1394,7 @@ else ctrl &= ~SDHCI_CTRL_HISPD; @@ -2803,17 +2993,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho u16 clk, ctrl_2; unsigned int clock; -@@ -1364,7 +1402,8 @@ - if ((ios->timing == MMC_TIMING_UHS_SDR50) || - (ios->timing == MMC_TIMING_UHS_SDR104) || - (ios->timing == MMC_TIMING_UHS_DDR50) || -- (ios->timing == MMC_TIMING_UHS_SDR25)) -+ (ios->timing == MMC_TIMING_UHS_SDR25) || -+ (ios->timing == MMC_TIMING_UHS_SDR12)) - ctrl |= SDHCI_CTRL_HISPD; - - ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); -@@ -1445,6 +1484,12 @@ +@@ -1424,9 +1484,24 @@ out: mmiowb(); spin_unlock_irqrestore(&host->lock, flags); @@ -2823,10 +3003,252 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho + rc = sdhci_set_plat_power(host, ios->power_mode); + while (rc == -EINTR); + } ++} ++ ++static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) ++{ ++ struct sdhci_host *host = mmc_priv(mmc); ++ ++ sdhci_runtime_pm_get(host); ++ sdhci_do_set_ios(host, ios); ++ sdhci_runtime_pm_put(host); } - static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) -@@ -1888,6 +1933,8 @@ +-static int check_ro(struct sdhci_host *host) ++static int sdhci_check_ro(struct sdhci_host *host) + { + unsigned long flags; + int is_readonly; +@@ -1450,19 +1525,16 @@ + + #define SAMPLE_COUNT 5 + +-static int sdhci_get_ro(struct mmc_host *mmc) ++static int sdhci_do_get_ro(struct sdhci_host *host) + { +- struct sdhci_host *host; + int i, ro_count; + +- host = mmc_priv(mmc); +- + if (!(host->quirks & SDHCI_QUIRK_UNSTABLE_RO_DETECT)) +- return check_ro(host); ++ return sdhci_check_ro(host); + + ro_count = 0; + for (i = 0; i < SAMPLE_COUNT; i++) { +- if (check_ro(host)) { ++ if (sdhci_check_ro(host)) { + if (++ro_count > SAMPLE_COUNT / 2) + return 1; + } +@@ -1471,38 +1543,64 @@ + return 0; + } + +-static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable) ++static void sdhci_hw_reset(struct mmc_host *mmc) + { +- struct sdhci_host *host; +- unsigned long flags; ++ struct sdhci_host *host = mmc_priv(mmc); + +- host = mmc_priv(mmc); ++ if (host->ops && host->ops->hw_reset) ++ host->ops->hw_reset(host); ++} + +- spin_lock_irqsave(&host->lock, flags); ++static int sdhci_get_ro(struct mmc_host *mmc) ++{ ++ struct sdhci_host *host = mmc_priv(mmc); ++ int ret; + ++ sdhci_runtime_pm_get(host); ++ ret = sdhci_do_get_ro(host); ++ sdhci_runtime_pm_put(host); ++ return ret; ++} ++ ++static void sdhci_enable_sdio_irq_nolock(struct sdhci_host *host, int enable) ++{ + if (host->flags & SDHCI_DEVICE_DEAD) + goto out; + + if (enable) ++ host->flags |= SDHCI_SDIO_IRQ_ENABLED; ++ else ++ host->flags &= ~SDHCI_SDIO_IRQ_ENABLED; ++ ++ /* SDIO IRQ will be enabled as appropriate in runtime resume */ ++ if (host->runtime_suspended) ++ goto out; ++ ++ if (enable) + sdhci_unmask_irqs(host, SDHCI_INT_CARD_INT); + else + sdhci_mask_irqs(host, SDHCI_INT_CARD_INT); + out: + mmiowb(); ++} ++ ++static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable) ++{ ++ struct sdhci_host *host = mmc_priv(mmc); ++ unsigned long flags; + ++ spin_lock_irqsave(&host->lock, flags); ++ sdhci_enable_sdio_irq_nolock(host, enable); + spin_unlock_irqrestore(&host->lock, flags); + } + +-static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, +- struct mmc_ios *ios) ++static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, ++ struct mmc_ios *ios) + { +- struct sdhci_host *host; + u8 pwr; + u16 clk, ctrl; + u32 present_state; + +- host = mmc_priv(mmc); +- + /* + * Signal Voltage Switching is only applicable for Host Controllers + * v3.00 and above. +@@ -1528,7 +1626,7 @@ + if (!(ctrl & SDHCI_CTRL_VDD_180)) + return 0; + else { +- printk(KERN_INFO DRIVER_NAME ": Switching to 3.3V " ++ pr_info(DRIVER_NAME ": Switching to 3.3V " + "signalling voltage failed\n"); + return -EIO; + } +@@ -1587,7 +1685,7 @@ + pwr |= SDHCI_POWER_ON; + sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL); + +- printk(KERN_INFO DRIVER_NAME ": Switching to 1.8V signalling " ++ pr_info(DRIVER_NAME ": Switching to 1.8V signalling " + "voltage failed, retrying with S18R set to 0\n"); + return -EAGAIN; + } else +@@ -1595,6 +1693,20 @@ + return 0; + } + ++static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, ++ struct mmc_ios *ios) ++{ ++ struct sdhci_host *host = mmc_priv(mmc); ++ int err; ++ ++ if (host->version < SDHCI_SPEC_300) ++ return 0; ++ sdhci_runtime_pm_get(host); ++ err = sdhci_do_start_signal_voltage_switch(host, ios); ++ sdhci_runtime_pm_put(host); ++ return err; ++} ++ + static int sdhci_execute_tuning(struct mmc_host *mmc) + { + struct sdhci_host *host; +@@ -1606,6 +1718,7 @@ + + host = mmc_priv(mmc); + ++ sdhci_runtime_pm_get(host); + disable_irq(host->irq); + spin_lock(&host->lock); + +@@ -1623,6 +1736,7 @@ + else { + spin_unlock(&host->lock); + enable_irq(host->irq); ++ sdhci_runtime_pm_put(host); + return 0; + } + +@@ -1648,7 +1762,7 @@ + timeout = 150; + do { + struct mmc_command cmd = {0}; +- struct mmc_request mrq = {0}; ++ struct mmc_request mrq = {NULL}; + + if (!tuning_loop_counter && !timeout) + break; +@@ -1694,7 +1808,7 @@ + spin_lock(&host->lock); + + if (!host->tuning_done) { +- printk(KERN_INFO DRIVER_NAME ": Timeout waiting for " ++ pr_info(DRIVER_NAME ": Timeout waiting for " + "Buffer Read Ready interrupt during tuning " + "procedure, falling back to fixed sampling " + "clock\n"); +@@ -1724,7 +1838,7 @@ + sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); + } else { + if (!(ctrl & SDHCI_CTRL_TUNED_CLK)) { +- printk(KERN_INFO DRIVER_NAME ": Tuning procedure" ++ pr_info(DRIVER_NAME ": Tuning procedure" + " failed, falling back to fixed sampling" + " clock\n"); + err = -EIO; +@@ -1766,18 +1880,16 @@ + sdhci_clear_set_irqs(host, SDHCI_INT_DATA_AVAIL, ier); + spin_unlock(&host->lock); + enable_irq(host->irq); ++ sdhci_runtime_pm_put(host); + + return err; + } + +-static void sdhci_enable_preset_value(struct mmc_host *mmc, bool enable) ++static void sdhci_do_enable_preset_value(struct sdhci_host *host, bool enable) + { +- struct sdhci_host *host; + u16 ctrl; + unsigned long flags; + +- host = mmc_priv(mmc); +- + /* Host Controller v3.00 defines preset value registers */ + if (host->version < SDHCI_SPEC_300) + return; +@@ -1793,22 +1905,36 @@ + if (enable && !(ctrl & SDHCI_CTRL_PRESET_VAL_ENABLE)) { + ctrl |= SDHCI_CTRL_PRESET_VAL_ENABLE; + sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); ++ host->flags |= SDHCI_PV_ENABLED; + } else if (!enable && (ctrl & SDHCI_CTRL_PRESET_VAL_ENABLE)) { + ctrl &= ~SDHCI_CTRL_PRESET_VAL_ENABLE; + sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); ++ host->flags &= ~SDHCI_PV_ENABLED; + } + + spin_unlock_irqrestore(&host->lock, flags); + } + ++static void sdhci_enable_preset_value(struct mmc_host *mmc, bool enable) ++{ ++ struct sdhci_host *host = mmc_priv(mmc); ++ ++ sdhci_runtime_pm_get(host); ++ sdhci_do_enable_preset_value(host, enable); ++ sdhci_runtime_pm_put(host); ++} ++ + static const struct mmc_host_ops sdhci_ops = { + .request = sdhci_request, + .set_ios = sdhci_set_ios, + .get_ro = sdhci_get_ro, ++ .hw_reset = sdhci_hw_reset, + .enable_sdio_irq = sdhci_enable_sdio_irq, .start_signal_voltage_switch = sdhci_start_signal_voltage_switch, .execute_tuning = sdhci_execute_tuning, .enable_preset_value = sdhci_enable_preset_value, @@ -2835,11 +3257,79 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho }; /*****************************************************************************\ -@@ -2045,10 +2092,13 @@ +@@ -1826,19 +1952,19 @@ + + spin_lock_irqsave(&host->lock, flags); + +- if (!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)) { +- if (host->mrq) { +- printk(KERN_ERR "%s: Card removed during transfer!\n", +- mmc_hostname(host->mmc)); +- printk(KERN_ERR "%s: Resetting controller.\n", +- mmc_hostname(host->mmc)); ++ /* Check host->mrq first in case we are runtime suspended */ ++ if (host->mrq && ++ !(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)) { ++ pr_err("%s: Card removed during transfer!\n", ++ mmc_hostname(host->mmc)); ++ pr_err("%s: Resetting controller.\n", ++ mmc_hostname(host->mmc)); + +- sdhci_reset(host, SDHCI_RESET_CMD); +- sdhci_reset(host, SDHCI_RESET_DATA); ++ sdhci_reset(host, SDHCI_RESET_CMD); ++ sdhci_reset(host, SDHCI_RESET_DATA); + +- host->mrq->cmd->error = -ENOMEDIUM; +- tasklet_schedule(&host->finish_tasklet); +- } ++ host->mrq->cmd->error = -ENOMEDIUM; ++ tasklet_schedule(&host->finish_tasklet); + } + + spin_unlock_irqrestore(&host->lock, flags); +@@ -1854,14 +1980,16 @@ + + host = (struct sdhci_host*)param; + ++ spin_lock_irqsave(&host->lock, flags); ++ + /* + * If this tasklet gets rescheduled while running, it will + * be run again afterwards but without any active request. + */ +- if (!host->mrq) ++ if (!host->mrq) { ++ spin_unlock_irqrestore(&host->lock, flags); + return; +- +- spin_lock_irqsave(&host->lock, flags); ++ } + + del_timer(&host->timer); + +@@ -1905,6 +2033,7 @@ + spin_unlock_irqrestore(&host->lock, flags); + + mmc_request_done(host->mmc, mrq); ++ sdhci_runtime_pm_put(host); + } + + static void sdhci_timeout_timer(unsigned long data) +@@ -1917,7 +2046,7 @@ + spin_lock_irqsave(&host->lock, flags); + + if (host->mrq) { +- printk(KERN_ERR "%s: Timeout waiting for hardware " ++ pr_err("%s: Timeout waiting for hardware " + "interrupt.\n", mmc_hostname(host->mmc)); + sdhci_dumpregs(host); + +@@ -1963,10 +2092,13 @@ BUG_ON(intmask == 0); if (!host->cmd) { -- pr_err("%s: Got command interrupt 0x%08x even " +- printk(KERN_ERR "%s: Got command interrupt 0x%08x even " - "though no command operation was in progress.\n", - mmc_hostname(host->mmc), (unsigned)intmask); - sdhci_dumpregs(host); @@ -2853,7 +3343,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho return; } -@@ -2118,6 +2168,19 @@ +@@ -2036,6 +2168,19 @@ static void sdhci_show_adma_error(struct sdhci_host *host) { } #endif @@ -2873,12 +3363,12 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) { BUG_ON(intmask == 0); -@@ -2144,34 +2207,56 @@ +@@ -2062,34 +2207,56 @@ return; } } - -- pr_err("%s: Got data interrupt 0x%08x even " +- printk(KERN_ERR "%s: Got data interrupt 0x%08x even " - "though no data operation was in progress.\n", - mmc_hostname(host->mmc), (unsigned)intmask); - sdhci_dumpregs(host); @@ -2912,6 +3402,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho - != MMC_BUS_TEST_R) - host->data->error = -EILSEQ; - else if (intmask & SDHCI_INT_ADMA_ERROR) { +- printk(KERN_ERR "%s: ADMA error\n", mmc_hostname(host->mmc)); + != MMC_BUS_TEST_R) { + DBG("crc error in cmd %d\n", host->last_cmdop); + if (host->ops->spurious_crc_acmd51 && @@ -2921,7 +3412,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho + } else + host->data->error = -EILSEQ; + } else if (intmask & SDHCI_INT_ADMA_ERROR) { - pr_err("%s: ADMA error\n", mmc_hostname(host->mmc)); ++ pr_err("%s: ADMA error\n", mmc_hostname(host->mmc)); sdhci_show_adma_error(host); host->data->error = -EIO; } @@ -2945,7 +3436,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho /* * We currently don't do anything fancy with DMA -@@ -2200,18 +2285,8 @@ +@@ -2118,30 +2285,27 @@ sdhci_writel(host, dmanow, SDHCI_DMA_ADDRESS); } @@ -2966,7 +3457,27 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho } } -@@ -2266,6 +2341,22 @@ + static irqreturn_t sdhci_irq(int irq, void *dev_id) + { + irqreturn_t result; +- struct sdhci_host* host = dev_id; ++ struct sdhci_host *host = dev_id; + u32 intmask; + int cardint = 0; + + spin_lock(&host->lock); + ++ if (host->runtime_suspended) { ++ spin_unlock(&host->lock); ++ pr_warning("%s: got irq while runtime suspended\n", ++ mmc_hostname(host->mmc)); ++ return IRQ_HANDLED; ++ } ++ + intmask = sdhci_readl(host, SDHCI_INT_STATUS); + + if (!intmask || intmask == 0xffffffff) { +@@ -2177,6 +2341,22 @@ tasklet_schedule(&host->card_tasklet); } @@ -2989,7 +3500,7 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho if (intmask & SDHCI_INT_CMD_MASK) { sdhci_writel(host, intmask & SDHCI_INT_CMD_MASK, SDHCI_INT_STATUS); -@@ -2280,7 +2371,13 @@ +@@ -2191,10 +2371,16 @@ intmask &= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK); @@ -3003,38 +3514,141 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho + intmask &= ~SDHCI_INT_ERROR_MASK; if (intmask & SDHCI_INT_BUS_POWER) { - pr_err("%s: Card is consuming too much power!\n", -@@ -2326,7 +2423,7 @@ - - #ifdef CONFIG_PM - --int sdhci_suspend_host(struct sdhci_host *host) -+int sdhci_suspend_host(struct sdhci_host *host) - { - int ret; - -@@ -2335,8 +2432,9 @@ - /* Disable tuning since we are suspending */ - if (host->version >= SDHCI_SPEC_300 && host->tuning_count && - host->tuning_mode == SDHCI_TUNING_MODE_1) { -- del_timer_sync(&host->tuning_timer); - host->flags &= ~SDHCI_NEEDS_RETUNING; -+ mod_timer(&host->tuning_timer, jiffies + -+ host->tuning_count * HZ); +- printk(KERN_ERR "%s: Card is consuming too much power!\n", ++ pr_err("%s: Card is consuming too much power!\n", + mmc_hostname(host->mmc)); + sdhci_writel(host, SDHCI_INT_BUS_POWER, SDHCI_INT_STATUS); } +@@ -2207,7 +2393,7 @@ + intmask &= ~SDHCI_INT_CARD_INT; - ret = mmc_suspend_host(host->mmc); -@@ -2363,7 +2461,8 @@ + if (intmask) { +- printk(KERN_ERR "%s: Unexpected interrupt 0x%08x.\n", ++ pr_err("%s: Unexpected interrupt 0x%08x.\n", + mmc_hostname(host->mmc), intmask); + sdhci_dumpregs(host); + +@@ -2275,8 +2461,8 @@ return ret; } +- - if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { + if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA | + SDHCI_USE_PLATDMA)) { if (host->ops->enable_dma) host->ops->enable_dma(host); } -@@ -2570,14 +2669,16 @@ +@@ -2314,6 +2500,90 @@ + + #endif /* CONFIG_PM */ + ++#ifdef CONFIG_PM_RUNTIME ++ ++static int sdhci_runtime_pm_get(struct sdhci_host *host) ++{ ++ return pm_runtime_get_sync(host->mmc->parent); ++} ++ ++static int sdhci_runtime_pm_put(struct sdhci_host *host) ++{ ++ pm_runtime_mark_last_busy(host->mmc->parent); ++ return pm_runtime_put_autosuspend(host->mmc->parent); ++} ++ ++int sdhci_runtime_suspend_host(struct sdhci_host *host) ++{ ++ unsigned long flags; ++ int ret = 0; ++ ++ /* Disable tuning since we are suspending */ ++ if (host->version >= SDHCI_SPEC_300 && ++ host->tuning_mode == SDHCI_TUNING_MODE_1) { ++ del_timer_sync(&host->tuning_timer); ++ host->flags &= ~SDHCI_NEEDS_RETUNING; ++ } ++ ++ spin_lock_irqsave(&host->lock, flags); ++ sdhci_mask_irqs(host, SDHCI_INT_ALL_MASK); ++ spin_unlock_irqrestore(&host->lock, flags); ++ ++ synchronize_irq(host->irq); ++ ++ spin_lock_irqsave(&host->lock, flags); ++ host->runtime_suspended = true; ++ spin_unlock_irqrestore(&host->lock, flags); ++ ++ return ret; ++} ++EXPORT_SYMBOL_GPL(sdhci_runtime_suspend_host); ++ ++int sdhci_runtime_resume_host(struct sdhci_host *host) ++{ ++ unsigned long flags; ++ int ret = 0, host_flags = host->flags; ++ ++ if (host_flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { ++ if (host->ops->enable_dma) ++ host->ops->enable_dma(host); ++ } ++ ++ sdhci_init(host, 0); ++ ++ /* Force clock and power re-program */ ++ host->pwr = 0; ++ host->clock = 0; ++ sdhci_do_set_ios(host, &host->mmc->ios); ++ ++ sdhci_do_start_signal_voltage_switch(host, &host->mmc->ios); ++ if (host_flags & SDHCI_PV_ENABLED) ++ sdhci_do_enable_preset_value(host, true); ++ ++ /* Set the re-tuning expiration flag */ ++ if ((host->version >= SDHCI_SPEC_300) && host->tuning_count && ++ (host->tuning_mode == SDHCI_TUNING_MODE_1)) ++ host->flags |= SDHCI_NEEDS_RETUNING; ++ ++ spin_lock_irqsave(&host->lock, flags); ++ ++ host->runtime_suspended = false; ++ ++ /* Enable SDIO IRQ */ ++ if ((host->flags & SDHCI_SDIO_IRQ_ENABLED)) ++ sdhci_enable_sdio_irq_nolock(host, true); ++ ++ /* Enable Card Detection */ ++ sdhci_enable_card_detection(host); ++ ++ spin_unlock_irqrestore(&host->lock, flags); ++ ++ return ret; ++} ++EXPORT_SYMBOL_GPL(sdhci_runtime_resume_host); ++ ++#endif ++ + /*****************************************************************************\ + * * + * Device allocation/registration * +@@ -2356,6 +2626,8 @@ + + if (debug_quirks) + host->quirks = debug_quirks; ++ if (debug_quirks2) ++ host->quirks2 = debug_quirks2; + + sdhci_reset(host, SDHCI_RESET_ALL); + +@@ -2363,7 +2635,7 @@ + host->version = (host->version & SDHCI_SPEC_VER_MASK) + >> SDHCI_SPEC_VER_SHIFT; + if (host->version > SDHCI_SPEC_300) { +- printk(KERN_ERR "%s: Unknown controller version (%d). " ++ pr_err("%s: Unknown controller version (%d). " + "You may experience problems.\n", mmc_hostname(mmc), + host->version); + } +@@ -2397,14 +2669,16 @@ host->flags &= ~SDHCI_USE_ADMA; } @@ -3043,7 +3657,8 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho + SDHCI_USE_PLATDMA)) { if (host->ops->enable_dma) { if (host->ops->enable_dma(host)) { - pr_warning("%s: No suitable DMA " +- printk(KERN_WARNING "%s: No suitable DMA " ++ pr_warning("%s: No suitable DMA " "available. Falling back to PIO.\n", mmc_hostname(mmc)); host->flags &= @@ -3053,7 +3668,36 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho } } } -@@ -2688,7 +2789,7 @@ +@@ -2420,7 +2694,7 @@ + if (!host->adma_desc || !host->align_buffer) { + kfree(host->adma_desc); + kfree(host->align_buffer); +- printk(KERN_WARNING "%s: Unable to allocate ADMA " ++ pr_warning("%s: Unable to allocate ADMA " + "buffers. Falling back to standard DMA.\n", + mmc_hostname(mmc)); + host->flags &= ~SDHCI_USE_ADMA; +@@ -2448,8 +2722,7 @@ + if (host->max_clk == 0 || host->quirks & + SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN) { + if (!host->ops->get_max_clock) { +- printk(KERN_ERR +- "%s: Hardware doesn't specify base clock " ++ pr_err("%s: Hardware doesn't specify base clock " + "frequency.\n", mmc_hostname(mmc)); + return -ENODEV; + } +@@ -2495,8 +2768,7 @@ + host->timeout_clk = host->ops->get_timeout_clock(host); + } else if (!(host->quirks & + SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) { +- printk(KERN_ERR +- "%s: Hardware doesn't specify timeout clock " ++ pr_err("%s: Hardware doesn't specify timeout clock " + "frequency.\n", mmc_hostname(mmc)); + return -ENODEV; + } +@@ -2517,7 +2789,7 @@ /* Auto-CMD23 stuff only works in ADMA or PIO. */ if ((host->version >= SDHCI_SPEC_300) && ((host->flags & SDHCI_USE_ADMA) || @@ -3062,7 +3706,23 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho host->flags |= SDHCI_AUTO_CMD23; DBG("%s: Auto-CMD23 available\n", mmc_hostname(mmc)); } else { -@@ -2821,6 +2922,9 @@ +@@ -2566,6 +2838,15 @@ + if (caps[1] & SDHCI_DRIVER_TYPE_D) + mmc->caps |= MMC_CAP_DRIVER_TYPE_D; + ++ /* ++ * If Power Off Notify capability is enabled by the host, ++ * set notify to short power off notify timeout value. ++ */ ++ if (mmc->caps2 & MMC_CAP2_POWEROFF_NOTIFY) ++ mmc->power_notify_type = MMC_HOST_PW_NOTIFY_SHORT; ++ else ++ mmc->power_notify_type = MMC_HOST_PW_NOTIFY_NONE; ++ + /* Initial value for re-tuning timer count */ + host->tuning_count = (caps[1] & SDHCI_RETUNING_TIMER_COUNT_MASK) >> + SDHCI_RETUNING_TIMER_COUNT_SHIFT; +@@ -2641,6 +2922,9 @@ mmc->caps |= MMC_CAP_MAX_CURRENT_200; } @@ -3072,22 +3732,84 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.c linux-3.2.2.patch/drivers/mmc/ho mmc->ocr_avail = ocr_avail; mmc->ocr_avail_sdio = ocr_avail; if (host->ocr_avail_sdio) -@@ -2953,6 +3057,7 @@ +@@ -2655,7 +2939,7 @@ + mmc->ocr_avail_mmc &= host->ocr_avail_mmc; - pr_info("%s: SDHCI controller on %s [%s] using %s\n", + if (mmc->ocr_avail == 0) { +- printk(KERN_ERR "%s: Hardware doesn't report any " ++ pr_err("%s: Hardware doesn't report any " + "support voltages.\n", mmc_hostname(mmc)); + return -ENODEV; + } +@@ -2703,7 +2987,7 @@ + mmc->max_blk_size = (caps[0] & SDHCI_MAX_BLOCK_MASK) >> + SDHCI_MAX_BLOCK_SHIFT; + if (mmc->max_blk_size >= 3) { +- printk(KERN_WARNING "%s: Invalid maximum block size, " ++ pr_warning("%s: Invalid maximum block size, " + "assuming 512 bytes\n", mmc_hostname(mmc)); + mmc->max_blk_size = 0; + } +@@ -2742,7 +3026,7 @@ + + host->vmmc = regulator_get(mmc_dev(mmc), "vmmc"); + if (IS_ERR(host->vmmc)) { +- printk(KERN_INFO "%s: no vmmc regulator found\n", mmc_hostname(mmc)); ++ pr_info("%s: no vmmc regulator found\n", mmc_hostname(mmc)); + host->vmmc = NULL; + } else { + regulator_enable(host->vmmc); +@@ -2771,8 +3055,9 @@ + + mmc_add_host(mmc); + +- printk(KERN_INFO "%s: SDHCI controller on %s [%s] using %s\n", ++ pr_info("%s: SDHCI controller on %s [%s] using %s\n", mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)), + (host->flags & SDHCI_USE_PLATDMA) ? "platform's DMA" : (host->flags & SDHCI_USE_ADMA) ? "ADMA" : (host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"); -diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.h linux-3.2.2.patch/drivers/mmc/host/sdhci.h ---- linux-3.2.2/drivers/mmc/host/sdhci.h 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/mmc/host/sdhci.h 2012-02-03 04:56:29.000000000 +0100 -@@ -273,6 +273,24 @@ - void (*platform_reset_enter)(struct sdhci_host *host, u8 mask); +@@ -2804,7 +3089,7 @@ + host->flags |= SDHCI_DEVICE_DEAD; + + if (host->mrq) { +- printk(KERN_ERR "%s: Controller removed during " ++ pr_err("%s: Controller removed during " + " transfer!\n", mmc_hostname(host->mmc)); + + host->mrq->cmd->error = -ENOMEDIUM; +@@ -2863,9 +3148,9 @@ + + static int __init sdhci_drv_init(void) + { +- printk(KERN_INFO DRIVER_NAME ++ pr_info(DRIVER_NAME + ": Secure Digital Host Controller Interface driver\n"); +- printk(KERN_INFO DRIVER_NAME ": Copyright(c) Pierre Ossman\n"); ++ pr_info(DRIVER_NAME ": Copyright(c) Pierre Ossman\n"); + + return 0; + } +@@ -2878,9 +3163,11 @@ + module_exit(sdhci_drv_exit); + + module_param(debug_quirks, uint, 0444); ++module_param(debug_quirks2, uint, 0444); + + MODULE_AUTHOR("Pierre Ossman "); + MODULE_DESCRIPTION("Secure Digital Host Controller Interface core driver"); + MODULE_LICENSE("GPL"); + + MODULE_PARM_DESC(debug_quirks, "Force certain quirks."); ++MODULE_PARM_DESC(debug_quirks2, "Force certain other quirks."); +diff -Naur linux-3.1.10/drivers/mmc/host/sdhci.h linux-3.1.10.patch/drivers/mmc/host/sdhci.h +--- linux-3.1.10/drivers/mmc/host/sdhci.h 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/mmc/host/sdhci.h 2012-02-03 23:06:15.129083129 +0100 +@@ -274,6 +274,24 @@ void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); int (*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs); -+ + + int (*enable)(struct sdhci_host *mmc); + int (*disable)(struct sdhci_host *mmc, int lazy); + int (*set_plat_power)(struct sdhci_host *mmc, @@ -3105,16 +3827,11 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.h linux-3.2.2.patch/drivers/mmc/ho + unsigned int (*voltage_broken)(struct sdhci_host *host); + unsigned int (*uhs_broken)(struct sdhci_host *host); + - void (*hw_reset)(struct sdhci_host *host); ++ void (*hw_reset)(struct sdhci_host *host); }; -@@ -374,11 +392,34 @@ - extern void sdhci_remove_host(struct sdhci_host *host, int dead); - - #ifdef CONFIG_PM --extern int sdhci_suspend_host(struct sdhci_host *host); -+extern int sdhci_suspend_host(struct sdhci_host *host); - extern int sdhci_resume_host(struct sdhci_host *host); + #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS +@@ -379,4 +397,32 @@ extern void sdhci_enable_irq_wakeups(struct sdhci_host *host); #endif @@ -3141,22 +3858,123 @@ diff -Naur linux-3.2.2/drivers/mmc/host/sdhci.h linux-3.2.2.patch/drivers/mmc/ho + host->ops->pdma_reset(host, data); +} + - #ifdef CONFIG_PM_RUNTIME - extern int sdhci_runtime_suspend_host(struct sdhci_host *host); - extern int sdhci_runtime_resume_host(struct sdhci_host *host); -diff -Naur linux-3.2.2/include/linux/mmc/sdhci.h linux-3.2.2.patch/include/linux/mmc/sdhci.h ---- linux-3.2.2/include/linux/mmc/sdhci.h 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/include/linux/mmc/sdhci.h 2012-02-03 03:54:53.766602291 +0100 -@@ -121,6 +121,7 @@ ++#ifdef CONFIG_PM_RUNTIME ++extern int sdhci_runtime_suspend_host(struct sdhci_host *host); ++extern int sdhci_runtime_resume_host(struct sdhci_host *host); ++#endif ++ + #endif /* __SDHCI_HW_H */ +diff -Naur linux-3.1.10/include/linux/mmc/host.h linux-3.1.10.patch/include/linux/mmc/host.h +--- linux-3.1.10/include/linux/mmc/host.h 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/include/linux/mmc/host.h 2012-02-03 23:06:15.129083129 +0100 +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + #include + #include +@@ -108,6 +109,9 @@ + * It is optional for the host to implement pre_req and post_req in + * order to support double buffering of requests (prepare one + * request while another request is active). ++ * pre_req() must always be followed by a post_req(). ++ * To undo a call made to pre_req(), call post_req() with ++ * a nonzero err condition. + */ + void (*post_req)(struct mmc_host *host, struct mmc_request *req, + int err); +@@ -147,6 +151,7 @@ + int (*execute_tuning)(struct mmc_host *host); + void (*enable_preset_value)(struct mmc_host *host, bool enable); + int (*select_drive_strength)(unsigned int max_dtr, int host_drv, int card_drv); ++ void (*hw_reset)(struct mmc_host *host); + }; + + struct mmc_card; +@@ -229,8 +234,20 @@ + #define MMC_CAP_MAX_CURRENT_600 (1 << 28) /* Host max current limit is 600mA */ + #define MMC_CAP_MAX_CURRENT_800 (1 << 29) /* Host max current limit is 800mA */ + #define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */ ++#define MMC_CAP_HW_RESET (1 << 31) /* Hardware reset */ ++ ++ unsigned int caps2; /* More host capabilities */ ++ ++#define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */ ++#define MMC_CAP2_CACHE_CTRL (1 << 1) /* Allow cache control */ ++#define MMC_CAP2_POWEROFF_NOTIFY (1 << 2) /* Notify poweroff supported */ ++#define MMC_CAP2_NO_MULTI_READ (1 << 3) /* Multiblock reads don't work */ + + mmc_pm_flag_t pm_caps; /* supported pm features */ ++ unsigned int power_notify_type; ++#define MMC_HOST_PW_NOTIFY_NONE 0 ++#define MMC_HOST_PW_NOTIFY_SHORT 1 ++#define MMC_HOST_PW_NOTIFY_LONG 2 + + #ifdef CONFIG_MMC_CLKGATE + int clk_requests; /* internal reference counter */ +@@ -302,6 +319,10 @@ + + struct mmc_async_req *areq; /* active async req */ + ++#ifdef CONFIG_FAIL_MMC_REQUEST ++ struct fault_attr fail_mmc_request; ++#endif ++ + unsigned long private[0] ____cacheline_aligned; + }; + +@@ -330,6 +351,8 @@ + extern void mmc_detect_change(struct mmc_host *, unsigned long delay); + extern void mmc_request_done(struct mmc_host *, struct mmc_request *); + ++extern int mmc_cache_ctrl(struct mmc_host *, u8); ++ + static inline void mmc_signal_sdio_irq(struct mmc_host *host) + { + host->ops->enable_sdio_irq(host, 0); +@@ -394,4 +417,10 @@ + { + return host->caps & MMC_CAP_CMD23; + } ++ ++static inline int mmc_boot_partition_access(struct mmc_host *host) ++{ ++ return !(host->caps2 & MMC_CAP2_BOOTPART_NOACC); ++} ++ + #endif /* LINUX_MMC_HOST_H */ +diff -Naur linux-3.1.10/include/linux/mmc/sdhci.h linux-3.1.10.patch/include/linux/mmc/sdhci.h +--- linux-3.1.10/include/linux/mmc/sdhci.h 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/include/linux/mmc/sdhci.h 2012-02-03 23:06:15.130083148 +0100 +@@ -88,6 +88,10 @@ + /* The read-only detection via SDHCI_PRESENT_STATE register is unstable */ + #define SDHCI_QUIRK_UNSTABLE_RO_DETECT (1<<31) + ++ unsigned int quirks2; /* More deviations from spec. */ ++ ++#define SDHCI_QUIRK2_OWN_CARD_DETECTION (1<<0) ++ + int irq; /* Device IRQ */ + void __iomem *ioaddr; /* Mapped address */ + +@@ -115,6 +119,9 @@ + #define SDHCI_NEEDS_RETUNING (1<<5) /* Host needs retuning */ + #define SDHCI_AUTO_CMD12 (1<<6) /* Auto CMD12 support */ #define SDHCI_AUTO_CMD23 (1<<7) /* Auto CMD23 support */ - #define SDHCI_PV_ENABLED (1<<8) /* Preset value enabled */ - #define SDHCI_SDIO_IRQ_ENABLED (1<<9) /* SDIO irq enabled */ -+#define SDHCI_USE_PLATDMA (1<<10) /* Host uses 3rd party DMA */ ++#define SDHCI_PV_ENABLED (1<<8) /* Preset value enabled */ ++#define SDHCI_SDIO_IRQ_ENABLED (1<<9) /* SDIO irq enabled */ ++#define SDHCI_USE_PLATDMA (1<<10) /* Host uses 3rd party DMA */ unsigned int version; /* SDHCI spec. version */ -@@ -135,6 +136,7 @@ +@@ -125,8 +132,11 @@ + unsigned int clock; /* Current clock (MHz) */ + u8 pwr; /* Current voltage */ ++ bool runtime_suspended; /* Host is runtime suspended */ ++ struct mmc_request *mrq; /* Current request */ struct mmc_command *cmd; /* Current command */ + int last_cmdop; /* Opcode of last cmd sent */ diff --git a/packages/linux/patches/linux-3.2.2-602-add_bcm2708_vchiq_driver-0.1.patch b/packages/linux/patches/linux-3.1.10-602-add_bcm2708_vchiq_driver-0.1.patch similarity index 94% rename from packages/linux/patches/linux-3.2.2-602-add_bcm2708_vchiq_driver-0.1.patch rename to packages/linux/patches/linux-3.1.10-602-add_bcm2708_vchiq_driver-0.1.patch index 3601f01ab9..25612a7ec6 100644 --- a/packages/linux/patches/linux-3.2.2-602-add_bcm2708_vchiq_driver-0.1.patch +++ b/packages/linux/patches/linux-3.1.10-602-add_bcm2708_vchiq_driver-0.1.patch @@ -1,24 +1,24 @@ -diff -Naur linux-3.2.2/drivers/misc/Kconfig linux-3.2.2.patch/drivers/misc/Kconfig ---- linux-3.2.2/drivers/misc/Kconfig 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/Kconfig 2012-01-26 17:12:37.139209029 +0100 -@@ -508,5 +508,6 @@ +diff -Naur linux-3.1.10/drivers/misc/Kconfig linux-3.1.10.patch/drivers/misc/Kconfig +--- linux-3.1.10/drivers/misc/Kconfig 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/Kconfig 2012-02-03 23:10:20.048843633 +0100 +@@ -507,5 +507,6 @@ + source "drivers/misc/ti-st/Kconfig" source "drivers/misc/lis3lv02d/Kconfig" source "drivers/misc/carma/Kconfig" - source "drivers/misc/altera-stapl/Kconfig" +source "drivers/misc/vc04_services/Kconfig" endif # MISC_DEVICES -diff -Naur linux-3.2.2/drivers/misc/Makefile linux-3.2.2.patch/drivers/misc/Makefile ---- linux-3.2.2/drivers/misc/Makefile 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/Makefile 2012-01-26 17:13:01.957704429 +0100 -@@ -48,3 +48,4 @@ +diff -Naur linux-3.1.10/drivers/misc/Makefile linux-3.1.10.patch/drivers/misc/Makefile +--- linux-3.1.10/drivers/misc/Makefile 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/Makefile 2012-02-03 23:10:20.060843868 +0100 +@@ -47,3 +47,4 @@ + obj-y += lis3lv02d/ obj-y += carma/ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o - obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ +obj-y += vc04_services/ -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-01-26 17:11:57.912426032 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-02-03 23:10:46.833364244 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -47,9 +47,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux +#define VCHI_MEM_HANDLE_INVALID 0 + +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-01-26 17:11:46.185191946 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-02-03 23:10:23.909918682 +0100 @@ -0,0 +1,487 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -538,9 +538,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 + vcos_unused(state); + return VCHIQ_ERROR; +} -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-01-26 17:11:46.184191926 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-02-03 23:10:23.328907389 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -569,9 +569,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 +#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1 + +#endif /* VCHIQ_2835_H */ -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-01-26 17:11:46.188192004 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-02-03 23:10:24.012920684 +0100 @@ -0,0 +1,1293 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -1866,9 +1866,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. +module_exit(vchiq_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-01-26 17:11:46.189192025 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-02-03 23:10:24.024920916 +0100 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -1908,9 +1908,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. +vchiq_get_state(void); + +#endif /* VCHIQ_ARM_H */ -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-01-26 17:11:46.189192025 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-02-03 23:10:24.373927700 +0100 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -1955,9 +1955,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg. +#endif + +#endif /* VCHIQ_CFG_H */ -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-01-26 17:11:46.190192046 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-02-03 23:10:24.401928244 +0100 @@ -0,0 +1,101 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -2060,9 +2060,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn +} + +EXPORT_SYMBOL( vchiq_add_connected_callback ); -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-01-26 17:11:46.190192046 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-02-03 23:10:24.402928264 +0100 @@ -0,0 +1,32 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -2096,9 +2096,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn + +#endif /* VCHIQ_CONNECTED_H */ + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-01-26 17:11:46.196192166 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-02-03 23:10:24.406928342 +0100 @@ -0,0 +1,2604 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -4704,9 +4704,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + + vchiq_dump_platform_service_state(dump_context, service); +} -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-01-26 17:11:46.198192206 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-02-03 23:10:24.407928361 +0100 @@ -0,0 +1,480 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -5188,9 +5188,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + VCHIQ_SERVICE_T *service); + +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-01-26 17:11:46.183191906 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-02-03 23:10:22.940899847 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -5219,9 +5219,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h li + +#endif + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-01-26 17:11:46.199192226 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-02-03 23:10:24.408928380 +0100 @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -5371,9 +5371,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h +extern VCHIQ_STATUS_T vchiq_dump_phys_mem( VCHIQ_SERVICE_HANDLE_T service, void *ptr, size_t num_bytes ); + +#endif /* VCHIQ_IF_H */ -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-01-26 17:11:46.199192226 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-02-03 23:10:24.408928380 +0100 @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -5480,9 +5480,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioct +#define VCHIQ_IOC_MAX 15 + +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-01-26 17:11:46.200192246 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-02-03 23:10:24.409928399 +0100 @@ -0,0 +1,297 @@ +/***************************************************************************** +* Copyright 2001 - 2011 Broadcom Corporation. All rights reserved. @@ -5781,9 +5781,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern +EXPORT_SYMBOL(vchiq_open_service); +EXPORT_SYMBOL(vchiq_add_service_params); +EXPORT_SYMBOL(vchiq_open_service_params); -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 2012-01-26 17:11:46.203192306 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 2012-02-03 23:10:24.411928438 +0100 @@ -0,0 +1,1518 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7303,9 +7303,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib. + free_msgbufs = buf; + vcos_mutex_unlock(&vchiq_lib_mutex); +} -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-01-26 17:11:46.204192325 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-02-03 23:10:24.412928458 +0100 @@ -0,0 +1,45 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -7352,9 +7352,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memd +VCHIQ_STATUS_T vchiq_memdrv_initialise(void); + +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-01-26 17:11:46.205192345 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-02-03 23:10:24.412928458 +0100 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7399,9 +7399,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_page +} FRAGMENTS_T; + +#endif /* VCHIQ_PAGELIST_H */ -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-01-26 17:11:46.207192385 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-02-03 23:10:24.414928498 +0100 @@ -0,0 +1,970 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8373,9 +8373,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim +EXPORT_SYMBOL(vchi_service_use); +EXPORT_SYMBOL(vchi_service_release); +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-01-26 17:11:46.208192405 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-02-03 23:10:24.414928498 +0100 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8474,9 +8474,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util + + return header; +} -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-01-26 17:11:46.208192405 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-02-03 23:10:24.415928517 +0100 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8525,9 +8525,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util + +#endif + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 2012-01-26 17:11:46.210192445 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 2012-02-03 23:10:24.416928536 +0100 @@ -0,0 +1,681 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -9210,9 +9210,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_cm + return VCOS_SUCCESS; +} + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 2012-01-26 17:11:57.914426072 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 2012-02-03 23:10:46.833364244 +0100 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -9301,9 +9301,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_co +VCOSPRE_ void VCOSPOST_ vcos_timer_init(void); +#endif + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 2012-01-26 17:11:57.915426092 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 2012-02-03 23:10:46.834364263 +0100 @@ -0,0 +1,271 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -9576,9 +9576,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_ge +#endif +#endif /* VCOS_GENERIC_BLOCKPOOL_H */ + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 2012-01-26 17:11:57.916426112 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 2012-02-03 23:10:46.834364263 +0100 @@ -0,0 +1,311 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -9891,9 +9891,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_ge +} + +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 2012-01-26 17:11:57.916426112 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 2012-02-03 23:10:46.835364282 +0100 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -10013,9 +10013,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_ge +#endif +#endif + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 2012-01-26 17:11:57.917426132 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 2012-02-03 23:10:46.835364282 +0100 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -10109,9 +10109,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_ge +#endif + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 2012-01-26 17:11:57.918426152 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 2012-02-03 23:10:46.836364302 +0100 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -10199,9 +10199,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_ge +#endif + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 2012-01-26 17:11:57.919426172 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 2012-02-03 23:10:46.836364302 +0100 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -10289,9 +10289,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_ge +#endif + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 2012-01-26 17:11:57.919426172 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 2012-02-03 23:10:46.837364322 +0100 @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -10448,9 +10448,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_ge +#endif + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 2012-01-26 17:11:57.920426192 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 2012-02-03 23:10:46.837364322 +0100 @@ -0,0 +1,214 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -10666,9 +10666,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_jo +} +#endif +#endif /* VCOS_JOINABLE_THREAD_FROM_PLAIN_H */ -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 2012-01-26 17:11:57.921426212 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 2012-02-03 23:10:46.838364341 +0100 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -10729,9 +10729,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_la + +#endif /* VCOS_INLINE_BODIES */ + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 2012-01-26 17:11:57.922426232 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 2012-02-03 23:10:46.838364341 +0100 @@ -0,0 +1,560 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -11293,9 +11293,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_lo + } +} + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 2012-01-26 17:11:57.922426232 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 2012-02-03 23:10:46.839364360 +0100 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -11381,9 +11381,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_me + _vcos_platform_free(h->ptr); +} + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 2012-01-26 17:11:57.923426252 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 2012-02-03 23:10:46.839364360 +0100 @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -11450,9 +11450,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_me +#endif /* VCOS_INLINE_BODIES */ + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 2012-01-26 17:11:57.923426252 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 2012-02-03 23:10:46.840364379 +0100 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -11533,9 +11533,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_mu + + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 2012-01-26 17:11:57.924426272 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 2012-02-03 23:10:46.840364379 +0100 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -11583,9 +11583,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/generic/vcos_th +#endif + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 2012-01-26 17:11:57.924426272 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 2012-02-03 23:10:46.841364399 +0100 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -11618,9 +11618,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/std +#include /* includes integer types */ + +#endif /* _VCOS_PLATFORM_LINUX_STDINT_H */ -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 2012-01-26 17:11:57.925426292 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 2012-02-03 23:10:46.841364399 +0100 @@ -0,0 +1,627 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -12249,9 +12249,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vco +EXPORT_SYMBOL( vcos_verify_bkpts_enabled ); + +EXPORT_SYMBOL( vcos_strdup ); -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 2012-01-26 17:11:46.224192725 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 2012-02-03 23:10:24.426928730 +0100 @@ -0,0 +1,332 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -12585,9 +12585,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vco + +EXPORT_SYMBOL_GPL( vcos_cfg_get_proc_entry ); + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 2012-01-26 17:11:57.926426312 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 2012-02-03 23:10:46.842364419 +0100 @@ -0,0 +1,111 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -12700,9 +12700,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vco + +// END ######################################################################### +// ############################################################################# -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 2012-01-26 17:11:46.225192745 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 2012-02-03 23:10:24.427928749 +0100 @@ -0,0 +1,64 @@ +/***************************************************************************** +* Copyright 2006 - 2008 Broadcom Corporation. All rights reserved. @@ -12768,9 +12768,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vco +MODULE_LICENSE( "GPL" ); +MODULE_VERSION( "1.0" ); + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 2012-01-26 17:11:57.927426332 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 2012-02-03 23:10:46.843364439 +0100 @@ -0,0 +1,507 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -13279,9 +13279,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vco + +#endif /* VCOS_PLATFORM_H */ + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 2012-01-26 17:11:57.928426351 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 2012-02-03 23:10:46.843364439 +0100 @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -13341,9 +13341,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vco +#define PRIx64 "llx" + +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 2012-01-26 17:11:46.228192805 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 2012-02-03 23:10:24.429928787 +0100 @@ -0,0 +1,129 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -13474,9 +13474,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vco + + return *vcos_thread_storage; +} -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 2012-01-26 17:11:46.228192805 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 2012-02-03 23:10:24.430928807 +0100 @@ -0,0 +1,39 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -13517,9 +13517,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/linuxkernel/vco +VCOS_THREAD_T *vcos_kthread_current(void); + +#endif /*VCOS_THREAD_MAP_H */ -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_assert.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 2012-01-26 17:11:57.929426371 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_assert.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 2012-02-03 23:10:46.844364458 +0100 @@ -0,0 +1,280 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -13801,9 +13801,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_assert.h l +#endif + +#endif /* VCOS_ASSERT_H */ -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 2012-01-26 17:11:57.930426391 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 2012-02-03 23:10:46.844364458 +0100 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -13888,9 +13888,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_atomic_fla +#endif + +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 2012-01-26 17:11:57.930426391 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 2012-02-03 23:10:46.845364477 +0100 @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -13915,9 +13915,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_build_info +const char *vcos_get_build_time( void ); +const char *vcos_get_build_date( void ); + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 2012-01-26 17:11:46.232192884 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 2012-02-03 23:10:24.432928847 +0100 @@ -0,0 +1,113 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -14032,9 +14032,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h linu +#endif +#endif + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 2012-01-26 17:11:46.232192884 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 2012-02-03 23:10:24.433928867 +0100 @@ -0,0 +1,98 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -14134,9 +14134,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h linu + +#endif /* VCOS_CMD_H */ + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 2012-01-26 17:11:57.931426411 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 2012-02-03 23:10:46.845364477 +0100 @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -14178,9 +14178,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h li + +#endif + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 2012-01-26 17:11:57.932426430 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 2012-02-03 23:10:46.846364496 +0100 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -14262,9 +14262,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h li +#endif + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 2012-01-26 17:11:57.933426449 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 2012-02-03 23:10:46.847364515 +0100 @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -14375,9 +14375,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_event_flag + +#endif + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_event.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_event.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h 2012-01-26 17:11:57.932426430 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_event.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h 2012-02-03 23:10:46.846364496 +0100 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -14487,9 +14487,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_event.h li +#endif + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos.h 2012-01-26 17:11:57.929426371 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos.h 2012-02-03 23:10:46.843364439 +0100 @@ -0,0 +1,212 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -14703,9 +14703,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3. + +#endif /* VCOS_H */ + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_init.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h 2012-01-26 17:11:57.933426449 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_init.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h 2012-02-03 23:10:46.847364515 +0100 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -14761,9 +14761,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_init.h lin +} +#endif + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_logging.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 2012-01-26 17:11:57.934426469 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_logging.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 2012-02-03 23:10:46.848364535 +0100 @@ -0,0 +1,290 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15055,9 +15055,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_logging.h +#endif /* VCOS_LOGGING_H */ + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 2012-01-26 17:11:57.935426490 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 2012-02-03 23:10:46.848364535 +0100 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15177,9 +15177,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_t +#endif +#endif + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_mem.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 2012-01-26 17:11:57.935426490 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mem.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 2012-02-03 23:10:46.849364555 +0100 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15273,9 +15273,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_mem.h linu +#endif + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 2012-01-26 17:11:57.936426511 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 2012-02-03 23:10:46.849364555 +0100 @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15445,9 +15445,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h +#endif + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 2012-01-26 17:11:57.937426531 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 2012-02-03 23:10:46.850364575 +0100 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15552,9 +15552,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h li +} +#endif +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_once.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_once.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h 2012-01-26 17:11:57.937426531 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_once.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_once.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h 2012-02-03 23:10:46.850364575 +0100 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15609,9 +15609,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_once.h lin +#endif +#endif + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 2012-01-26 17:11:57.938426551 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 2012-02-03 23:10:46.851364594 +0100 @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15739,9 +15739,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_semaphore. +#endif +#endif + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 2012-01-26 17:11:57.938426551 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 2012-02-03 23:10:46.851364594 +0100 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15777,9 +15777,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h +#endif /* __cplusplus */ + +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 2012-01-26 17:11:57.939426571 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 2012-02-03 23:10:46.852364613 +0100 @@ -0,0 +1,203 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15984,9 +15984,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h l +#endif /* VCOS_STDINT_H */ + + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_string.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_string.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h 2012-01-26 17:11:57.940426591 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_string.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_string.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h 2012-02-03 23:10:46.852364613 +0100 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -16072,9 +16072,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_string.h l +} +#endif +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 2012-01-26 17:11:57.941426611 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 2012-02-03 23:10:46.854364651 +0100 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -16163,9 +16163,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_thread_att +} +#endif +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_thread.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 2012-01-26 17:11:57.940426591 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 2012-02-03 23:10:46.853364632 +0100 @@ -0,0 +1,270 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -16437,9 +16437,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_thread.h l +} +#endif +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_timer.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 2012-01-26 17:11:57.957426930 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_timer.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 2012-02-03 23:10:46.854364651 +0100 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -16547,9 +16547,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_timer.h li +} +#endif +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_types.h linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h ---- linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h 2012-01-26 17:11:57.958426949 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_types.h linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h +--- linux-3.1.10/drivers/misc/vc04_services/interface/vcos/vcos_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h 2012-02-03 23:10:46.855364671 +0100 @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -16762,9 +16762,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/interface/vcos/vcos_types.h li +typedef vcos_fourcc_t FOURCC_T; + +#endif -diff -Naur linux-3.2.2/drivers/misc/vc04_services/Kconfig linux-3.2.2.patch/drivers/misc/vc04_services/Kconfig ---- linux-3.2.2/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/Kconfig 2012-01-26 17:11:46.181191866 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/Kconfig linux-3.1.10.patch/drivers/misc/vc04_services/Kconfig +--- linux-3.1.10/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/Kconfig 2012-02-03 23:10:20.937860914 +0100 @@ -0,0 +1,7 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -16773,9 +16773,9 @@ diff -Naur linux-3.2.2/drivers/misc/vc04_services/Kconfig linux-3.2.2.patch/driv + help + Helper for communication for VideoCore. + -diff -Naur linux-3.2.2/drivers/misc/vc04_services/Makefile linux-3.2.2.patch/drivers/misc/vc04_services/Makefile ---- linux-3.2.2/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/misc/vc04_services/Makefile 2012-01-26 17:11:46.182191886 +0100 +diff -Naur linux-3.1.10/drivers/misc/vc04_services/Makefile linux-3.1.10.patch/drivers/misc/vc04_services/Makefile +--- linux-3.1.10/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/misc/vc04_services/Makefile 2012-02-03 23:10:21.836878387 +0100 @@ -0,0 +1,19 @@ +obj-$(CONFIG_BCM2708_VCHIQ) += vchiq.o + diff --git a/packages/linux/patches/linux-3.2.2-603-add_bcm2708_watchdog_driver-0.1.patch b/packages/linux/patches/linux-3.1.10-603-add_bcm2708_watchdog_driver-0.1.patch similarity index 89% rename from packages/linux/patches/linux-3.2.2-603-add_bcm2708_watchdog_driver-0.1.patch rename to packages/linux/patches/linux-3.1.10-603-add_bcm2708_watchdog_driver-0.1.patch index bd13a83ef8..8bdd92305d 100644 --- a/packages/linux/patches/linux-3.2.2-603-add_bcm2708_watchdog_driver-0.1.patch +++ b/packages/linux/patches/linux-3.1.10-603-add_bcm2708_watchdog_driver-0.1.patch @@ -1,50 +1,6 @@ -From ed8c2d720954efc5a440912292ed11da2f50aaea Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 17 Jan 2012 19:20:57 +0000 -Subject: [PATCH] bcm2708 watchdog driver - -Signed-off-by: popcornmix ---- - drivers/watchdog/Kconfig | 6 + - drivers/watchdog/Makefile | 1 + - drivers/watchdog/bcm2708_wdog.c | 385 +++++++++++++++++++++++++++++++++++++++ - 3 files changed, 392 insertions(+), 0 deletions(-) - create mode 100644 drivers/watchdog/bcm2708_wdog.c - -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index 86b0735..7675ebc 100644 ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -348,6 +348,12 @@ config IMX2_WDT - To compile this driver as a module, choose M here: the - module will be called imx2_wdt. - -+config BCM2708_WDT -+ tristate "BCM2708 Watchdog" -+ depends on ARCH_BCM2708 -+ help -+ Enables BCM2708 watchdog support. -+ - # AVR32 Architecture - - config AT32AP700X_WDT -diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile -index 55bd574..803f0bc 100644 ---- a/drivers/watchdog/Makefile -+++ b/drivers/watchdog/Makefile -@@ -54,6 +54,7 @@ obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o - obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o - obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o - obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o -+obj-$(CONFIG_BCM2708_WDT) += bcm2708_wdog.o - - # AVR32 Architecture - obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o -diff --git a/drivers/watchdog/bcm2708_wdog.c b/drivers/watchdog/bcm2708_wdog.c -new file mode 100644 -index 0000000..dd33c35 ---- /dev/null -+++ b/drivers/watchdog/bcm2708_wdog.c +diff -Naur linux-3.1.10/drivers/watchdog/bcm2708_wdog.c linux-3.1.10.patch/drivers/watchdog/bcm2708_wdog.c +--- linux-3.1.10/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/watchdog/bcm2708_wdog.c 2012-02-03 23:09:15.158582362 +0100 @@ -0,0 +1,385 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -431,6 +387,30 @@ index 0000000..dd33c35 +MODULE_ALIAS_MISCDEV(TEMP_MINOR); +MODULE_LICENSE("GPL"); + --- -1.7.5.4 - +diff -Naur linux-3.1.10/drivers/watchdog/Kconfig linux-3.1.10.patch/drivers/watchdog/Kconfig +--- linux-3.1.10/drivers/watchdog/Kconfig 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/watchdog/Kconfig 2012-02-03 23:09:14.775574917 +0100 +@@ -348,6 +348,12 @@ + To compile this driver as a module, choose M here: the + module will be called imx2_wdt. + ++config BCM2708_WDT ++ tristate "BCM2708 Watchdog" ++ depends on ARCH_BCM2708 ++ help ++ Enables BCM2708 watchdog support. ++ + # AVR32 Architecture + + config AT32AP700X_WDT +diff -Naur linux-3.1.10/drivers/watchdog/Makefile linux-3.1.10.patch/drivers/watchdog/Makefile +--- linux-3.1.10/drivers/watchdog/Makefile 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/watchdog/Makefile 2012-02-03 23:09:14.775574917 +0100 +@@ -54,6 +54,7 @@ + obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o + obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o + obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o ++obj-$(CONFIG_BCM2708_WDT) += bcm2708_wdog.o + + # AVR32 Architecture + obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o diff --git a/packages/linux/patches/linux-3.2.2-604-add_bcm2708_framebuffer_driver-0.1.patch b/packages/linux/patches/linux-3.1.10-604-add_bcm2708_framebuffer_driver-0.1.patch similarity index 98% rename from packages/linux/patches/linux-3.2.2-604-add_bcm2708_framebuffer_driver-0.1.patch rename to packages/linux/patches/linux-3.1.10-604-add_bcm2708_framebuffer_driver-0.1.patch index fd881da08b..78346c613d 100644 --- a/packages/linux/patches/linux-3.2.2-604-add_bcm2708_framebuffer_driver-0.1.patch +++ b/packages/linux/patches/linux-3.1.10-604-add_bcm2708_framebuffer_driver-0.1.patch @@ -1,59 +1,6 @@ -From 4593b68d5da44244266737c3c18da81666fa6d15 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 17 Jan 2012 19:21:26 +0000 -Subject: [PATCH] bcm2708 framebuffer driver - -Signed-off-by: popcornmix ---- - drivers/video/Kconfig | 14 + - drivers/video/Makefile | 1 + - drivers/video/bcm2708_fb.c | 440 +++++ - drivers/video/logo/logo_linux_clut224.ppm | 2483 ++++++++++------------------- - 4 files changed, 1336 insertions(+), 1602 deletions(-) - create mode 100644 drivers/video/bcm2708_fb.c - -diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig -index 549b960..f343042 100644 ---- a/drivers/video/Kconfig -+++ b/drivers/video/Kconfig -@@ -303,6 +303,20 @@ config FB_PM2_FIFO_DISCONNECT - help - Support the Permedia2 FIFO disconnect feature. - -+config FB_BCM2708 -+ tristate "BCM2708 framebuffer support" -+ depends on FB && ARM -+ select FB_CFB_FILLRECT -+ select FB_CFB_COPYAREA -+ select FB_CFB_IMAGEBLIT -+ help -+ This framebuffer device driver is for the BCM2708 framebuffer. -+ -+ If you want to compile this as a module (=code which can be -+ inserted into and removed from the running kernel), say M -+ here and read . The module -+ will be called bcm2708_fb. -+ - config FB_ARMCLCD - tristate "ARM PrimeCell PL110 support" - depends on FB && ARM && ARM_AMBA -diff --git a/drivers/video/Makefile b/drivers/video/Makefile -index 8b83129..0c5cee3 100644 ---- a/drivers/video/Makefile -+++ b/drivers/video/Makefile -@@ -95,6 +95,7 @@ obj-$(CONFIG_FB_ATMEL) += atmel_lcdfb.o - obj-$(CONFIG_FB_PVR2) += pvr2fb.o - obj-$(CONFIG_FB_VOODOO1) += sstfb.o - obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o -+obj-$(CONFIG_FB_BCM2708) += bcm2708_fb.o - obj-$(CONFIG_FB_68328) += 68328fb.o - obj-$(CONFIG_FB_GBE) += gbefb.o - obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o -diff --git a/drivers/video/bcm2708_fb.c b/drivers/video/bcm2708_fb.c -new file mode 100644 -index 0000000..6bfdeef ---- /dev/null -+++ b/drivers/video/bcm2708_fb.c +diff -Naur linux-3.1.10/drivers/video/bcm2708_fb.c linux-3.1.10.patch/drivers/video/bcm2708_fb.c +--- linux-3.1.10/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/video/bcm2708_fb.c 2012-02-03 23:07:41.648764812 +0100 @@ -0,0 +1,440 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -495,10 +442,33 @@ index 0000000..6bfdeef + +MODULE_PARM_DESC(FBWIDTH, "Width of ARM Framebuffer"); +MODULE_PARM_DESC(FBHEIGHT, "Height of ARM Framebuffer"); -diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm -index 3c14e43..7626beb 100644 ---- a/drivers/video/logo/logo_linux_clut224.ppm -+++ b/drivers/video/logo/logo_linux_clut224.ppm +diff -Naur linux-3.1.10/drivers/video/Kconfig linux-3.1.10.patch/drivers/video/Kconfig +--- linux-3.1.10/drivers/video/Kconfig 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/video/Kconfig 2012-02-03 23:07:41.646764773 +0100 +@@ -303,6 +303,20 @@ + help + Support the Permedia2 FIFO disconnect feature. + ++config FB_BCM2708 ++ tristate "BCM2708 framebuffer support" ++ depends on FB && ARM ++ select FB_CFB_FILLRECT ++ select FB_CFB_COPYAREA ++ select FB_CFB_IMAGEBLIT ++ help ++ This framebuffer device driver is for the BCM2708 framebuffer. ++ ++ If you want to compile this as a module (=code which can be ++ inserted into and removed from the running kernel), say M ++ here and read . The module ++ will be called bcm2708_fb. ++ + config FB_ARMCLCD + tristate "ARM PrimeCell PL110 support" + depends on FB && ARM && ARM_AMBA +diff -Naur linux-3.1.10/drivers/video/logo/logo_linux_clut224.ppm linux-3.1.10.patch/drivers/video/logo/logo_linux_clut224.ppm +--- linux-3.1.10/drivers/video/logo/logo_linux_clut224.ppm 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/video/logo/logo_linux_clut224.ppm 2012-02-03 23:07:41.654764929 +0100 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -2985,6 +2955,14 @@ index 3c14e43..7626beb 100644 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 --- -1.7.5.4 - +diff -Naur linux-3.1.10/drivers/video/Makefile linux-3.1.10.patch/drivers/video/Makefile +--- linux-3.1.10/drivers/video/Makefile 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/video/Makefile 2012-02-03 23:07:41.647764792 +0100 +@@ -95,6 +95,7 @@ + obj-$(CONFIG_FB_PVR2) += pvr2fb.o + obj-$(CONFIG_FB_VOODOO1) += sstfb.o + obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o ++obj-$(CONFIG_FB_BCM2708) += bcm2708_fb.o + obj-$(CONFIG_FB_68328) += 68328fb.o + obj-$(CONFIG_FB_GBE) += gbefb.o + obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o diff --git a/packages/linux/patches/linux-3.2.2-605-add_dwc_otg_driver-0.1.patch b/packages/linux/patches/linux-3.1.10-605-add_dwc_otg_driver-0.1.patch similarity index 98% rename from packages/linux/patches/linux-3.2.2-605-add_dwc_otg_driver-0.1.patch rename to packages/linux/patches/linux-3.1.10-605-add_dwc_otg_driver-0.1.patch index b64f08a799..ce81984cb9 100644 --- a/packages/linux/patches/linux-3.2.2-605-add_dwc_otg_driver-0.1.patch +++ b/packages/linux/patches/linux-3.1.10-605-add_dwc_otg_driver-0.1.patch @@ -1,6 +1,6 @@ -diff -Naur linux-3.2.2/drivers/usb/core/generic.c linux-3.2.2.patch/drivers/usb/core/generic.c ---- linux-3.2.2/drivers/usb/core/generic.c 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/core/generic.c 2012-01-26 17:02:28.959069245 +0100 +diff -Naur linux-3.1.10/drivers/usb/core/generic.c linux-3.1.10.patch/drivers/usb/core/generic.c +--- linux-3.1.10/drivers/usb/core/generic.c 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/core/generic.c 2012-02-03 23:00:44.155649999 +0100 @@ -149,6 +149,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -9,9 +9,9 @@ diff -Naur linux-3.2.2/drivers/usb/core/generic.c linux-3.2.2.patch/drivers/usb/ } return i; } -diff -Naur linux-3.2.2/drivers/usb/core/hub.c linux-3.2.2.patch/drivers/usb/core/hub.c ---- linux-3.2.2/drivers/usb/core/hub.c 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/core/hub.c 2012-01-26 17:04:03.379953965 +0100 +diff -Naur linux-3.1.10/drivers/usb/core/hub.c linux-3.1.10.patch/drivers/usb/core/hub.c +--- linux-3.1.10/drivers/usb/core/hub.c 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/core/hub.c 2012-02-03 23:00:44.278652391 +0100 @@ -1071,6 +1071,8 @@ INIT_WORK(&hub->tt.clear_work, hub_tt_work); switch (hdev->descriptor.bDeviceProtocol) { @@ -29,7 +29,7 @@ diff -Naur linux-3.2.2/drivers/usb/core/hub.c linux-3.2.2.patch/drivers/usb/core /* USB 3.0 hubs don't have a TT */ break; default: -@@ -1719,6 +1722,12 @@ +@@ -1724,6 +1727,12 @@ #endif #ifdef CONFIG_USB_OTG @@ -42,7 +42,7 @@ diff -Naur linux-3.2.2/drivers/usb/core/hub.c linux-3.2.2.patch/drivers/usb/core #include "otg_whitelist.h" #endif -@@ -1773,9 +1782,15 @@ +@@ -1778,9 +1787,15 @@ dev_info(&udev->dev, "can't set HNP mode: %d\n", err); @@ -59,7 +59,7 @@ diff -Naur linux-3.2.2/drivers/usb/core/hub.c linux-3.2.2.patch/drivers/usb/core } } -@@ -1784,12 +1799,27 @@ +@@ -1789,12 +1804,27 @@ /* Maybe it can talk to us, though we can't talk to it. * (Includes HNP test device.) */ @@ -90,7 +90,18 @@ diff -Naur linux-3.2.2/drivers/usb/core/hub.c linux-3.2.2.patch/drivers/usb/core goto fail; } fail: -@@ -2976,7 +3006,9 @@ +@@ -2377,8 +2407,8 @@ + status = 0; + } else { + /* device has up to 10 msec to fully suspend */ +- dev_dbg(&udev->dev, "usb %ssuspend\n", +- (msg.event & PM_EVENT_AUTO ? "auto-" : "")); ++// dev_dbg(&udev->dev, "usb %ssuspend\n", ++// (msg.event & PM_EVENT_AUTO ? "auto-" : "")); + usb_set_device_state(udev, USB_STATE_SUSPENDED); + msleep(10); + } +@@ -2932,7 +2962,9 @@ buf->bMaxPacketSize0 = 0; r = usb_control_msg(udev, usb_rcvaddr0pipe(), USB_REQ_GET_DESCRIPTOR, USB_DIR_IN, @@ -101,7 +112,7 @@ diff -Naur linux-3.2.2/drivers/usb/core/hub.c linux-3.2.2.patch/drivers/usb/core buf, GET_DESCRIPTOR_BUFSIZE, initial_descriptor_timeout); switch (buf->bMaxPacketSize0) { -@@ -3406,8 +3438,10 @@ +@@ -3353,8 +3385,10 @@ release_devnum(udev); hub_free_dev(udev); usb_put_dev(udev); @@ -114,9 +125,9 @@ diff -Naur linux-3.2.2/drivers/usb/core/hub.c linux-3.2.2.patch/drivers/usb/core } if (hub->hdev->parent || !hcd->driver->port_handed_over || -diff -Naur linux-3.2.2/drivers/usb/core/message.c linux-3.2.2.patch/drivers/usb/core/message.c ---- linux-3.2.2/drivers/usb/core/message.c 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/core/message.c 2012-01-26 17:02:28.996069985 +0100 +diff -Naur linux-3.1.10/drivers/usb/core/message.c linux-3.1.10.patch/drivers/usb/core/message.c +--- linux-3.1.10/drivers/usb/core/message.c 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/core/message.c 2012-02-03 23:00:44.701660613 +0100 @@ -1836,6 +1836,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -203,9 +214,9 @@ diff -Naur linux-3.2.2/drivers/usb/core/message.c linux-3.2.2.patch/drivers/usb/ /* Now that all the interfaces are set up, register them * to trigger binding of drivers to interfaces. probe() -diff -Naur linux-3.2.2/drivers/usb/core/otg_whitelist.h linux-3.2.2.patch/drivers/usb/core/otg_whitelist.h ---- linux-3.2.2/drivers/usb/core/otg_whitelist.h 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/core/otg_whitelist.h 2012-01-26 17:02:28.997070005 +0100 +diff -Naur linux-3.1.10/drivers/usb/core/otg_whitelist.h linux-3.1.10.patch/drivers/usb/core/otg_whitelist.h +--- linux-3.1.10/drivers/usb/core/otg_whitelist.h 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/core/otg_whitelist.h 2012-02-03 23:00:45.271671693 +0100 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -421,10 +432,10 @@ diff -Naur linux-3.2.2/drivers/usb/core/otg_whitelist.h linux-3.2.2.patch/driver #endif } -diff -Naur linux-3.2.2/drivers/usb/gadget/file_storage.c linux-3.2.2.patch/drivers/usb/gadget/file_storage.c ---- linux-3.2.2/drivers/usb/gadget/file_storage.c 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/gadget/file_storage.c 2012-01-26 17:02:29.083071721 +0100 -@@ -573,8 +573,37 @@ +diff -Naur linux-3.1.10/drivers/usb/gadget/file_storage.c linux-3.1.10.patch/drivers/usb/gadget/file_storage.c +--- linux-3.1.10/drivers/usb/gadget/file_storage.c 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/gadget/file_storage.c 2012-02-03 23:00:45.275671769 +0100 +@@ -572,8 +572,37 @@ .iConfiguration = FSG_STRING_CONFIG, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, .bMaxPower = CONFIG_USB_GADGET_VBUS_DRAW / 2, @@ -462,9 +473,9 @@ diff -Naur linux-3.2.2/drivers/usb/gadget/file_storage.c linux-3.2.2.patch/drive static struct usb_qualifier_descriptor dev_qualifier = { -@@ -989,6 +1018,24 @@ - if (gadget_is_superspeed(fsg->gadget)) - value = populate_bos(fsg, req->buf); +@@ -967,6 +996,24 @@ + value = usb_gadget_get_string(&fsg_stringtab, + w_value & 0xff, req->buf); break; +#ifdef CONFIG_USB_DWC_OTG_LPM + case USB_DT_BOS: @@ -485,9 +496,9 @@ diff -Naur linux-3.2.2/drivers/usb/gadget/file_storage.c linux-3.2.2.patch/drive +#endif + } - break; -@@ -2640,6 +2687,9 @@ + +@@ -2630,6 +2677,9 @@ fsg_set_halt(fsg, fsg->bulk_out); halt_bulk_in_endpoint(fsg); } @@ -497,7 +508,7 @@ diff -Naur linux-3.2.2/drivers/usb/gadget/file_storage.c linux-3.2.2.patch/drive return -EINVAL; } -@@ -2991,7 +3041,8 @@ +@@ -2986,7 +3036,8 @@ * bulk endpoint, clear the halt now. (The SuperH UDC * requires this.) */ if (test_and_clear_bit(IGNORE_BULK_OUT, &fsg->atomic_bitflags)) @@ -507,7 +518,7 @@ diff -Naur linux-3.2.2/drivers/usb/gadget/file_storage.c linux-3.2.2.patch/drive if (transport_is_bbb()) { if (fsg->ep0_req_tag == exception_req_tag) -@@ -3065,6 +3116,9 @@ +@@ -3060,6 +3111,9 @@ * that expects a __user pointer and it will work okay. */ set_fs(get_ds()); @@ -517,7 +528,7 @@ diff -Naur linux-3.2.2/drivers/usb/gadget/file_storage.c linux-3.2.2.patch/drive /* The main loop */ while (fsg->state != FSG_STATE_TERMINATED) { if (exception_in_progress(fsg) || signal_pending(current)) { -@@ -3212,6 +3266,13 @@ +@@ -3207,6 +3261,13 @@ gcnum = usb_gadget_controller_number(fsg->gadget); if (gcnum >= 0) mod_data.release = 0x0300 + gcnum; @@ -531,7 +542,7 @@ diff -Naur linux-3.2.2/drivers/usb/gadget/file_storage.c linux-3.2.2.patch/drive else { WARNING(fsg, "controller '%s' not recognized\n", fsg->gadget->name); -@@ -3473,6 +3534,13 @@ +@@ -3450,6 +3511,13 @@ rc = -ENOMEM; @@ -545,10 +556,10 @@ diff -Naur linux-3.2.2/drivers/usb/gadget/file_storage.c linux-3.2.2.patch/drive /* Allocate the request and buffer for endpoint 0 */ fsg->ep0req = req = usb_ep_alloc_request(fsg->ep0, GFP_KERNEL); if (!req) -diff -Naur linux-3.2.2/drivers/usb/gadget/Kconfig linux-3.2.2.patch/drivers/usb/gadget/Kconfig ---- linux-3.2.2/drivers/usb/gadget/Kconfig 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/gadget/Kconfig 2012-01-26 17:02:28.998070024 +0100 -@@ -552,6 +552,34 @@ +diff -Naur linux-3.1.10/drivers/usb/gadget/Kconfig linux-3.1.10.patch/drivers/usb/gadget/Kconfig +--- linux-3.1.10/drivers/usb/gadget/Kconfig 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/gadget/Kconfig 2012-02-03 23:00:45.272671712 +0100 +@@ -525,6 +525,34 @@ depends on USB_GADGET depends on USB_GADGET_DUALSPEED @@ -583,9 +594,9 @@ diff -Naur linux-3.2.2/drivers/usb/gadget/Kconfig linux-3.2.2.patch/drivers/usb/ # # USB Gadget Drivers # -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_cc.c ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-01-26 17:02:29.088071820 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.c +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-02-03 23:00:45.278671829 +0100 @@ -0,0 +1,506 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_cc.c $ @@ -1093,9 +1104,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.2.2.pat + + return retval; +} -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_cc.h ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-01-26 17:02:29.089071840 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.h +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-02-03 23:00:45.279671849 +0100 @@ -0,0 +1,209 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_cc.h $ @@ -1306,9 +1317,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.2.2.pat + +#endif /* _DWC_CC_H_ */ + -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-01-26 17:02:29.092071900 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-02-03 23:00:45.280671868 +0100 @@ -0,0 +1,1247 @@ +#include "dwc_cc.h" +#include "dwc_modpow.h" @@ -2557,9 +2568,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux + DWC_WAITQ_TRIGGER(wq); +} +EXPORT_SYMBOL(DWC_WAITQ_ABORT); -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c 2012-01-26 17:02:29.100072061 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c 2012-02-03 23:00:45.281671887 +0100 @@ -0,0 +1,306 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_crypto.c $ @@ -2867,9 +2878,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.2.2 + data, WUSB_HANDSHAKE_LEN_FOR_MIC, mic); +} + -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h 2012-01-26 17:02:29.101072080 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h 2012-02-03 23:00:45.282671906 +0100 @@ -0,0 +1,103 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_crypto.h $ @@ -2974,9 +2985,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.2.2 + *kck, uint8_t *data, uint8_t *mic); + +#endif /* _DWC_CRYPTO_H_ */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_dh.c ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_dh.c 2012-01-26 17:02:29.101072080 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.c +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.c 2012-02-03 23:00:45.282671906 +0100 @@ -0,0 +1,286 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_dh.c $ @@ -3264,9 +3275,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.2.2.pat +#endif /* DH_TEST_VECTORS */ + +#endif /* CONFIG_IPMATE_MACH */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_dh.h ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_dh.h 2012-01-26 17:02:29.102072100 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.h +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_dh.h 2012-02-03 23:00:45.297672198 +0100 @@ -0,0 +1,98 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_dh.h $ @@ -3366,9 +3377,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.2.2.pat +#endif + +#endif /* _DWC_DH_H_ */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_list.h ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_list.h 2012-01-26 17:02:29.104072138 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_list.h +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_list.h 2012-02-03 23:00:45.298672217 +0100 @@ -0,0 +1,616 @@ +/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */ +/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ @@ -3986,9 +3997,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.2.2.p +} while (0) + +#endif /* !_SYS_QUEUE_H_ */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_mem.c ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-01-26 17:02:29.105072158 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_mem.c +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-02-03 23:00:45.299672236 +0100 @@ -0,0 +1,172 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -4162,9 +4173,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.2.2.pa +} + +#endif /* DEBUG_MEMORY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c 2012-01-26 17:02:29.106072179 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c 2012-02-03 23:00:45.300672256 +0100 @@ -0,0 +1,622 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -4788,9 +4799,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.2.2 +#endif /* UNITTEST */ + +#endif /* CONFIG_MACH_IPMATE */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h 2012-01-26 17:02:29.107072200 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h 2012-02-03 23:00:45.300672256 +0100 @@ -0,0 +1,26 @@ +/* + * dwc_modpow.h @@ -4818,9 +4829,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.2.2 +extern Bignum dwc_modpow(Bignum base_in, Bignum exp, Bignum mod); + +#endif /* _LINUX_BIGNUM_H */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-01-26 17:02:29.108072220 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-02-03 23:00:45.301672276 +0100 @@ -0,0 +1,256 @@ +#include "dwc_notifier.h" +#include "dwc_list.h" @@ -5078,9 +5089,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.2 + } +} + -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-01-26 17:02:29.109072240 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-02-03 23:00:45.301672276 +0100 @@ -0,0 +1,112 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -5194,9 +5205,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.2 +void dwc_notify(dwc_notifier_t *notifier, char *notification, void *notification_data); + +#endif /* __DWC_NOTIFIER_H__ */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_os.h ---- linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/dwc_os.h 2012-01-26 17:02:29.112072299 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_os.h +--- linux-3.1.10/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/dwc_os.h 2012-02-03 23:00:45.304672334 +0100 @@ -0,0 +1,924 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_os.h $ @@ -6122,9 +6133,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.2.2.pat + * threading should be able to be implemented with the defined behavior. + * + */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/Makefile linux-3.2.2.patch/drivers/usb/host/dwc_common_port/Makefile ---- linux-3.2.2/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/Makefile 2012-01-26 17:02:29.086071780 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile +--- linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile 2012-02-03 23:00:45.276671789 +0100 @@ -0,0 +1,44 @@ +# +# Makefile for DWC_common library @@ -6170,9 +6181,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/Makefile linux-3.2.2.pat +clean: + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.2.2.patch/drivers/usb/host/dwc_common_port/Makefile.linux ---- linux-3.2.2/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/Makefile.linux 2012-01-26 17:02:29.087071800 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile.linux +--- linux-3.1.10/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/Makefile.linux 2012-02-03 23:00:45.277671809 +0100 @@ -0,0 +1,36 @@ +# +# Makefile for DWC_common library @@ -6210,9 +6221,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.2 +clean: + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + -diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/usb.h linux-3.2.2.patch/drivers/usb/host/dwc_common_port/usb.h ---- linux-3.2.2/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_common_port/usb.h 2012-01-26 17:02:29.115072359 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_common_port/usb.h linux-3.1.10.patch/drivers/usb/host/dwc_common_port/usb.h +--- linux-3.1.10/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_common_port/usb.h 2012-02-03 23:00:45.305672353 +0100 @@ -0,0 +1,850 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -7064,9 +7075,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_common_port/usb.h linux-3.2.2.patch/ + + +#endif /* _USB_H_ */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dummy_audio.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dummy_audio.c 2012-01-26 17:02:29.127072599 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dummy_audio.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dummy_audio.c 2012-02-03 23:00:45.310672451 +0100 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -8643,9 +8654,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.2.2.patch/ + remove_proc_entry("isoc_test", NULL); +} +module_exit (cleanup); -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-01-26 17:02:29.172073495 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-02-03 23:00:45.311672471 +0100 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -8789,9 +8800,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.2.2.pat +typedef struct cfi_string cfi_string_t; + +#endif -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-01-26 17:02:29.203074117 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-02-03 23:00:45.313672509 +0100 @@ -0,0 +1,1316 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -10109,9 +10120,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.2.2.patch + device_remove_file(&dev->dev, &dev_attr_sleep_status); +#endif +} -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-01-26 17:02:29.245074954 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-02-03 23:00:45.314672528 +0100 @@ -0,0 +1,88 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -10201,9 +10212,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.2.2.patch +#endif + ); +#endif -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-01-26 17:02:29.248075013 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-02-03 23:00:45.316672566 +0100 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -12081,9 +12092,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.2.2.patch/ +} + +#endif //DWC_UTE_CFI -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-01-26 17:02:29.249075032 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-02-03 23:00:45.318672606 +0100 @@ -0,0 +1,319 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -12404,9 +12415,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.2.2.patch/ +int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl); + +#endif /* (__DWC_OTG_CFI_H__) */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-01-26 17:02:29.277075592 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-02-03 23:00:45.326672760 +0100 @@ -0,0 +1,5410 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -17818,9 +17829,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.2.2.patch/ +{ + return dwc_read_reg32(&core_if->core_global_regs->hptxfsiz); +} -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-01-26 17:02:29.280075654 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-02-03 23:00:45.329672820 +0100 @@ -0,0 +1,1143 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -18965,9 +18976,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.2.2.patch/ + void *_p); + +#endif -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-01-26 17:02:29.282075693 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-02-03 23:00:45.330672840 +0100 @@ -0,0 +1,846 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -19815,9 +19826,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.2.2.p + } + return retval; +} -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-01-26 17:02:29.284075732 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-02-03 23:00:45.331672860 +0100 @@ -0,0 +1,641 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -20460,9 +20471,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.2.2.pa +/** @} */ + +#endif /* __DWC_CORE_IF_H__ */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-01-26 17:02:29.285075751 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-02-03 23:00:45.332672879 +0100 @@ -0,0 +1,113 @@ +/* ========================================================================== + * @@ -20577,9 +20588,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.2.2.patch/ + +#endif /*DEBUG*/ +#endif -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-01-26 17:02:29.289075833 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-02-03 23:00:45.334672917 +0100 @@ -0,0 +1,1577 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -22158,9 +22169,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.2.pat + + +*/ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-01-26 17:02:29.290075853 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-02-03 23:00:45.335672936 +0100 @@ -0,0 +1,101 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -22263,9 +22274,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.2.2.pat +#endif + +#endif -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-01-26 17:02:29.295075952 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-02-03 23:00:45.340673034 +0100 @@ -0,0 +1,3330 @@ + +/* ========================================================================== @@ -25597,9 +25608,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.2.2.patch/ +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-01-26 17:02:29.324076531 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-02-03 23:00:45.344673111 +0100 @@ -0,0 +1,1106 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -26707,9 +26718,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.2.2.p +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-01-26 17:02:29.321076471 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-02-03 23:00:45.342673073 +0100 @@ -0,0 +1,804 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -27515,9 +27526,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.2.2.patch/ +#endif +#endif +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-01-26 17:02:29.325076550 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-02-03 23:00:45.345673130 +0100 @@ -0,0 +1,393 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -27912,9 +27923,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.2.2.pat + +#endif /* __DWC_HCD_IF_H__ */ +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-01-26 17:02:29.330076652 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-02-03 23:00:45.348673189 +0100 @@ -0,0 +1,2065 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -29981,9 +29992,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.2.p +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-01-26 17:02:29.337076789 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-02-03 23:00:45.349673209 +0100 @@ -0,0 +1,840 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_linux.c $ @@ -30825,9 +30836,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.2. +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-01-26 17:02:29.339076831 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-02-03 23:00:45.351673248 +0100 @@ -0,0 +1,732 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -31561,9 +31572,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.2.2. +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-01-26 17:02:29.351077069 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-02-03 23:00:45.354673305 +0100 @@ -0,0 +1,2067 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -33632,9 +33643,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.2.2.patch/ +} + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-01-26 17:02:29.352077088 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-02-03 23:00:45.354673305 +0100 @@ -0,0 +1,216 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -33852,9 +33863,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.2.2.patch/ +extern void do_test_mode(void *data); +#endif +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-01-26 17:02:29.353077108 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-02-03 23:00:45.355673324 +0100 @@ -0,0 +1,333 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -34189,9 +34200,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.2.2.pat +#endif /* __DWC_PCD_IF_H__ */ + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-01-26 17:02:29.361077269 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-02-03 23:00:45.361673442 +0100 @@ -0,0 +1,4077 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -38270,9 +38281,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.2.2.p +} + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-01-26 17:02:29.363077308 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-02-03 23:00:45.363673480 +0100 @@ -0,0 +1,1288 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -39562,9 +39573,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.2.2. +EXPORT_SYMBOL(usb_gadget_unregister_driver); + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h ---- linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-01-26 17:02:29.368077409 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h +--- linux-3.1.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-02-03 23:00:45.366673539 +0100 @@ -0,0 +1,2237 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -41803,9 +41814,9 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.2.2.patch +} pcgcctl_data_t; + +#endif -diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/Makefile linux-3.2.2.patch/drivers/usb/host/dwc_otg/Makefile ---- linux-3.2.2/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/dwc_otg/Makefile 2012-01-26 17:02:29.122072498 +0100 +diff -Naur linux-3.1.10/drivers/usb/host/dwc_otg/Makefile linux-3.1.10.patch/drivers/usb/host/dwc_otg/Makefile +--- linux-3.1.10/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/dwc_otg/Makefile 2012-02-03 23:00:45.306672372 +0100 @@ -0,0 +1,78 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -41885,10 +41896,10 @@ diff -Naur linux-3.2.2/drivers/usb/host/dwc_otg/Makefile linux-3.2.2.patch/drive + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions + +endif -diff -Naur linux-3.2.2/drivers/usb/host/Kconfig linux-3.2.2.patch/drivers/usb/host/Kconfig ---- linux-3.2.2/drivers/usb/host/Kconfig 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/Kconfig 2012-01-26 17:02:29.085071761 +0100 -@@ -556,6 +556,19 @@ +diff -Naur linux-3.1.10/drivers/usb/host/Kconfig linux-3.1.10.patch/drivers/usb/host/Kconfig +--- linux-3.1.10/drivers/usb/host/Kconfig 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/Kconfig 2012-02-03 23:00:45.275671769 +0100 +@@ -543,6 +543,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -41906,12 +41917,12 @@ diff -Naur linux-3.2.2/drivers/usb/host/Kconfig linux-3.2.2.patch/drivers/usb/ho + modules built will be called dwc_otg and dwc_common_port. + config USB_IMX21_HCD - tristate "i.MX21 HCD support" - depends on USB && ARM && ARCH_MXC -diff -Naur linux-3.2.2/drivers/usb/host/Makefile linux-3.2.2.patch/drivers/usb/host/Makefile ---- linux-3.2.2/drivers/usb/host/Makefile 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/host/Makefile 2012-01-26 17:02:29.086071780 +0100 -@@ -33,6 +33,8 @@ + tristate "iMX21 HCD support" + depends on USB && ARM && MACH_MX21 +diff -Naur linux-3.1.10/drivers/usb/host/Makefile linux-3.1.10.patch/drivers/usb/host/Makefile +--- linux-3.1.10/drivers/usb/host/Makefile 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/host/Makefile 2012-02-03 23:00:45.276671789 +0100 +@@ -32,6 +32,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o @@ -41920,10 +41931,10 @@ diff -Naur linux-3.2.2/drivers/usb/host/Makefile linux-3.2.2.patch/drivers/usb/h obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o -diff -Naur linux-3.2.2/drivers/usb/Makefile linux-3.2.2.patch/drivers/usb/Makefile ---- linux-3.2.2/drivers/usb/Makefile 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/drivers/usb/Makefile 2012-01-26 17:02:28.958069225 +0100 -@@ -23,6 +23,7 @@ +diff -Naur linux-3.1.10/drivers/usb/Makefile linux-3.1.10.patch/drivers/usb/Makefile +--- linux-3.1.10/drivers/usb/Makefile 2012-01-18 16:33:18.000000000 +0100 ++++ linux-3.1.10.patch/drivers/usb/Makefile 2012-02-03 23:00:44.111649145 +0100 +@@ -21,6 +21,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ obj-$(CONFIG_USB_ISP1760_HCD) += host/ diff --git a/packages/linux/patches/linux-3.1.10-716_mm-zero_swappiness.patch b/packages/linux/patches/linux-3.1.10-716_mm-zero_swappiness.patch new file mode 100644 index 0000000000..fad5b48936 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-716_mm-zero_swappiness.patch @@ -0,0 +1,17 @@ +--- + mm/vmscan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: linux-2.6.37-ck2/mm/vmscan.c +=================================================================== +--- linux-2.6.37-ck2.orig/mm/vmscan.c 2011-01-06 14:04:10.000000000 +1100 ++++ linux-2.6.37-ck2/mm/vmscan.c 2011-02-14 10:11:00.536252000 +1100 +@@ -133,7 +133,7 @@ + /* + * From 0 .. 100. Higher means more swappy. + */ +-int vm_swappiness = 60; ++int vm_swappiness; + long vm_total_pages; /* The total number of pages which the VM controls */ + + static LIST_HEAD(shrinker_list); diff --git a/packages/linux/patches/linux-3.1.10-901_broken_bluetooth.patch b/packages/linux/patches/linux-3.1.10-901_broken_bluetooth.patch new file mode 100644 index 0000000000..f57a395502 --- /dev/null +++ b/packages/linux/patches/linux-3.1.10-901_broken_bluetooth.patch @@ -0,0 +1,13 @@ +diff -Naur linux-3.2-rc7/net/bluetooth/hci_event.c linux-3.2-rc7.patch/net/bluetooth/hci_event.c +--- linux-3.2-rc7/net/bluetooth/hci_event.c 2011-12-24 06:51:06.000000000 +0100 ++++ linux-3.2-rc7.patch/net/bluetooth/hci_event.c 2012-01-01 15:50:48.745287438 +0100 +@@ -695,7 +695,8 @@ + if (rp->status) + return; + +- memcpy(hdev->extfeatures, rp->features, 8); ++ if (rp->page == 1) ++ memcpy(hdev->extfeatures, rp->features, 8); + + hci_req_complete(hdev, HCI_OP_READ_LOCAL_EXT_FEATURES, rp->status); + } diff --git a/packages/linux/patches/linux-3.2.2-903-Remove_BUILD_BUG_ON_from_asm-bug.h.patch b/packages/linux/patches/linux-3.2.2-903-Remove_BUILD_BUG_ON_from_asm-bug.h.patch deleted file mode 100644 index 9d0eb6325f..0000000000 --- a/packages/linux/patches/linux-3.2.2-903-Remove_BUILD_BUG_ON_from_asm-bug.h.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur linux-3.2.2/arch/arm/include/asm/bug.h linux-3.2.2.patch/arch/arm/include/asm/bug.h ---- linux-3.2.2/arch/arm/include/asm/bug.h 2012-01-26 01:39:32.000000000 +0100 -+++ linux-3.2.2.patch/arch/arm/include/asm/bug.h 2012-02-03 02:52:23.960027219 +0100 -@@ -32,7 +32,6 @@ - - #define __BUG(__file, __line, __value) \ - do { \ -- BUILD_BUG_ON(sizeof(struct bug_entry) != 12); \ - asm volatile("1:\t" BUG_INSTR_TYPE #__value "\n" \ - ".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \ - "2:\t.asciz " #__file "\n" \ diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 665ae85dd0..5b788f190a 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.2.2 Kernel Configuration +# Linux/arm 3.1.10 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -21,11 +21,9 @@ CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_GENERIC_BUG=y +# CONFIG_ARM_PATCH_PHYS_VIRT is not set CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_HAVE_IRQ_WORK=y -CONFIG_IRQ_WORK=y # # General setup @@ -65,28 +63,25 @@ CONFIG_GENERIC_IRQ_SHOW=y # # RCU Subsystem # -CONFIG_TINY_PREEMPT_RCU=y -CONFIG_PREEMPT_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +CONFIG_TINY_RCU=y +# CONFIG_TINY_PREEMPT_RCU is not set +# CONFIG_PREEMPT_RCU is not set # CONFIG_RCU_TRACE is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_RCU_BOOST is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set -CONFIG_CGROUP_FREEZER=y +# CONFIG_CGROUP_FREEZER is not set # CONFIG_CGROUP_DEVICE is not set -CONFIG_CPUSETS=y -CONFIG_PROC_PID_CPUSET=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -# CONFIG_CGROUP_MEM_RES_CTLR is not set -# CONFIG_CGROUP_PERF is not set +# CONFIG_CPUSETS is not set +# CONFIG_CGROUP_CPUACCT is not set +# CONFIG_RESOURCE_COUNTERS is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y -# CONFIG_CFS_BANDWIDTH is not set -CONFIG_RT_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set # CONFIG_BLK_CGROUP is not set # CONFIG_NAMESPACES is not set CONFIG_SCHED_AUTOGROUP=y @@ -113,7 +108,7 @@ CONFIG_SYSCTL_SYSCALL=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -CONFIG_ELF_CORE=y +# CONFIG_ELF_CORE is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -129,10 +124,9 @@ CONFIG_PERF_USE_VMALLOC=y # # Kernel Performance Events And Counters # -CONFIG_PERF_EVENTS=y +# CONFIG_PERF_EVENTS is not set # CONFIG_PERF_COUNTERS is not set -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_VM_EVENT_COUNTERS is not set CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set @@ -146,12 +140,10 @@ CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_HW_BREAKPOINT=y # # GCOV-based kernel profiling # -# CONFIG_GCOV_KERNEL is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -164,7 +156,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y CONFIG_LBDAF=y -CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSGLIB is not set # CONFIG_BLK_DEV_INTEGRITY is not set @@ -172,8 +164,9 @@ CONFIG_BLK_DEV_BSG=y # IO Schedulers # CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_DEADLINE is not set +CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" @@ -218,7 +211,6 @@ CONFIG_MMU=y # CONFIG_ARCH_VEXPRESS is not set # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_BCMRING is not set -# CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CNS3XXX is not set # CONFIG_ARCH_GEMINI is not set @@ -244,8 +236,8 @@ CONFIG_MMU=y # CONFIG_ARCH_MMP is not set # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_NUC93X is not set # CONFIG_ARCH_TEGRA is not set -# CONFIG_ARCH_PICOXCELL is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_MSM is not set @@ -257,7 +249,7 @@ CONFIG_MMU=y # CONFIG_ARCH_S5P64X0 is not set # CONFIG_ARCH_S5PC100 is not set # CONFIG_ARCH_S5PV210 is not set -# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_EXYNOS4 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_TCC_926 is not set # CONFIG_ARCH_U300 is not set @@ -341,7 +333,6 @@ CONFIG_OABI_COMPAT=y # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set CONFIG_HAVE_ARCH_PFN_VALID=y # CONFIG_HIGHMEM is not set -CONFIG_HW_PERF_EVENTS=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y @@ -349,8 +340,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y +# CONFIG_COMPACTION is not set # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y @@ -403,10 +393,9 @@ CONFIG_VFP=y # Userspace binary formats # CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_HAVE_AOUT=y # CONFIG_BINFMT_AOUT is not set -CONFIG_BINFMT_MISC=y +# CONFIG_BINFMT_MISC is not set # # Power management options @@ -419,9 +408,7 @@ CONFIG_PM=y # CONFIG_PM_DEBUG is not set # CONFIG_APM_EMULATION is not set CONFIG_PM_CLK=y -CONFIG_CPU_PM=y CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARM_CPU_SUSPEND=y CONFIG_NET=y # @@ -441,103 +428,31 @@ CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_IP_PNP_RARP is not set +# CONFIG_IP_PNP_BOOTP is not set +CONFIG_IP_PNP_RARP=y # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_IP_MROUTE is not set # CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set +CONFIG_SYN_COOKIES=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set -CONFIG_INET_TUNNEL=m +# CONFIG_INET_TUNNEL is not set # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set -CONFIG_INET_LRO=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -# CONFIG_IPV6_SIT_6RD is not set -CONFIG_IPV6_NDISC_NODETYPE=y -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETWORK_PHY_TIMESTAMPING is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -# CONFIG_NETFILTER_ADVANCED is not set - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=y -CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set -CONFIG_NETFILTER_XTABLES=y - -# -# Xtables combined modules -# -# CONFIG_NETFILTER_XT_MARK is not set - -# -# Xtables targets -# -# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set -# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set - -# -# Xtables matches -# -# CONFIG_NETFILTER_XT_MATCH_POLICY is not set -# CONFIG_IP_SET is not set -# CONFIG_IP_VS is not set - -# -# IP: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set -# CONFIG_IP_NF_TARGET_LOG is not set -# CONFIG_IP_NF_TARGET_ULOG is not set -# CONFIG_IP_NF_MANGLE is not set -# CONFIG_IP_NF_RAW is not set - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV6 is not set -CONFIG_IP6_NF_IPTABLES=y -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -CONFIG_IP6_NF_FILTER=y -# CONFIG_IP6_NF_TARGET_REJECT is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_RAW is not set +# CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set @@ -569,63 +484,11 @@ CONFIG_NET_PKTGEN=m # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=y -CONFIG_BT_SCO=y -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -# CONFIG_BT_BNEP is not set -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIBTUSB=m -# CONFIG_BT_HCIBTSDIO is not set -# CONFIG_BT_HCIUART is not set -# CONFIG_BT_HCIBCM203X is not set -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIVHCI is not set -# CONFIG_BT_MRVL is not set -CONFIG_BT_ATH3K=m +# CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -CONFIG_WIRELESS=y -CONFIG_WIRELESS_EXT=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_WEXT_SPY=y -CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_REG_DEBUG is not set -CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_DEBUGFS is not set -# CONFIG_CFG80211_INTERNAL_REGDB is not set -CONFIG_CFG80211_WEXT=y -CONFIG_WIRELESS_EXT_SYSFS=y -CONFIG_LIB80211=y -CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIB80211_CRYPT_CCMP=m -CONFIG_LIB80211_CRYPT_TKIP=m -# CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y -CONFIG_MAC80211_HAS_RC=y -# CONFIG_MAC80211_RC_PID is not set -CONFIG_MAC80211_RC_MINSTREL=y -CONFIG_MAC80211_RC_MINSTREL_HT=y -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -# CONFIG_MAC80211_MESH is not set -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_MENU is not set +# CONFIG_WIRELESS is not set # CONFIG_WIMAX is not set -CONFIG_RFKILL=y -CONFIG_RFKILL_LEDS=y -# CONFIG_RFKILL_INPUT is not set -# CONFIG_RFKILL_GPIO is not set +# CONFIG_RFKILL is not set # CONFIG_NET_9P is not set # CONFIG_CAIF is not set # CONFIG_CEPH_LIB is not set @@ -638,11 +501,11 @@ CONFIG_RFKILL_LEDS=y # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="" +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y -# CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" @@ -661,7 +524,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # # DRBD disabled because PROC_FS, INET or CONNECTOR not selected # -CONFIG_BLK_DEV_NBD=y +# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 @@ -674,7 +537,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_SENSORS_LIS3LV02D is not set CONFIG_MISC_DEVICES=y # CONFIG_AD525X_DPOT is not set -# CONFIG_ATMEL_PWM is not set # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_APDS9802ALS is not set @@ -696,7 +558,7 @@ CONFIG_MISC_DEVICES=y # CONFIG_EEPROM_AT24 is not set # CONFIG_EEPROM_LEGACY is not set # CONFIG_EEPROM_MAX6875 is not set -CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93CX6 is not set # CONFIG_IWMC3200TOP is not set # @@ -704,12 +566,9 @@ CONFIG_EEPROM_93CX6=m # # CONFIG_TI_ST is not set # CONFIG_SENSORS_LIS3_I2C is not set - -# -# Altera FPGA firmware download module -# -# CONFIG_ALTERA_STAPL is not set CONFIG_BCM2708_VCHIQ=y +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set # # SCSI device support @@ -730,12 +589,12 @@ CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -CONFIG_SCSI_SCAN_ASYNC=y +# CONFIG_SCSI_SCAN_ASYNC is not set CONFIG_SCSI_WAIT_SCAN=m # @@ -754,25 +613,60 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_MD is not set # CONFIG_TARGET_CORE is not set CONFIG_NETDEVICES=y -CONFIG_NET_CORE=y -# CONFIG_BONDING is not set # CONFIG_DUMMY is not set -# CONFIG_EQUALIZER is not set -CONFIG_MII=y +# CONFIG_BONDING is not set # CONFIG_MACVLAN is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set -CONFIG_TUN=y +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m # CONFIG_VETH is not set +CONFIG_MII=y +CONFIG_PHYLIB=m # -# CAIF transport drivers +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_MICREL_PHY is not set +CONFIG_MDIO_BITBANG=m +# CONFIG_MDIO_GPIO is not set +CONFIG_NET_ETHERNET=y +CONFIG_AX88796=m +# CONFIG_AX88796_93CX6 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_ETHOC is not set +# CONFIG_SMC911X is not set +# CONFIG_SMSC911X is not set +# CONFIG_DNET is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_B44 is not set +# CONFIG_KS8851_MLL is not set +# CONFIG_FTMAC100 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_WLAN is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers # -# CONFIG_ETHERNET is not set -# CONFIG_PHYLIB is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set # # USB Network Adapters @@ -782,10 +676,10 @@ CONFIG_TUN=y # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set CONFIG_USB_USBNET=y -# CONFIG_USB_NET_AX8817X is not set +CONFIG_USB_NET_AX8817X=m # CONFIG_USB_NET_CDCETHER is not set # CONFIG_USB_NET_CDC_EEM is not set -# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_CDC_NCM=y # CONFIG_USB_NET_DM9601 is not set # CONFIG_USB_NET_SMSC75XX is not set CONFIG_USB_NET_SMSC95XX=y @@ -798,77 +692,19 @@ CONFIG_USB_NET_SMSC95XX=y # CONFIG_USB_NET_ZAURUS is not set # CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_NET_KALMIA is not set -# CONFIG_USB_HSO is not set # CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set # CONFIG_USB_SIERRA_NET is not set -CONFIG_WLAN=y -# CONFIG_LIBERTAS_THINFIRM is not set -# CONFIG_AT76C50X_USB is not set -# CONFIG_USB_ZD1201 is not set -# CONFIG_USB_NET_RNDIS_WLAN is not set -CONFIG_RTL8187=m -CONFIG_RTL8187_LEDS=y -# CONFIG_MAC80211_HWSIM is not set -CONFIG_ATH_COMMON=m -# CONFIG_ATH_DEBUG is not set -CONFIG_ATH9K_HW=m -CONFIG_ATH9K_COMMON=m -CONFIG_ATH9K=m -CONFIG_ATH9K_AHB=y -# CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y -CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set -CONFIG_CARL9170=m -CONFIG_CARL9170_LEDS=y -CONFIG_CARL9170_WPC=y -CONFIG_ATH6KL=m -# CONFIG_ATH6KL_DEBUG is not set -CONFIG_B43=m -CONFIG_B43_SSB=y -# CONFIG_B43_SDIO is not set -CONFIG_B43_PIO=y -CONFIG_B43_PHY_N=y -CONFIG_B43_PHY_LP=y -CONFIG_B43_PHY_HT=y -CONFIG_B43_LEDS=y -# CONFIG_B43_DEBUG is not set -# CONFIG_B43LEGACY is not set -# CONFIG_BRCMFMAC is not set -CONFIG_HOSTAP=m -# CONFIG_HOSTAP_FIRMWARE is not set -# CONFIG_IWM is not set -# CONFIG_LIBERTAS is not set -# CONFIG_P54_COMMON is not set -CONFIG_RT2X00=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RT2800_LIB=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTL8192C_COMMON=m -# CONFIG_WL1251 is not set -# CONFIG_WL12XX_MENU is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -# CONFIG_MWIFIEX is not set +# CONFIG_WAN is not set # -# Enable WiMAX (Networking options) to see the WiMAX drivers +# CAIF transport drivers # -# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_ISDN is not set # CONFIG_PHONE is not set @@ -901,16 +737,16 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set -# CONFIG_INPUT_BMA150 is not set # CONFIG_INPUT_MMA8450 is not set # CONFIG_INPUT_MPU3050 is not set +# CONFIG_INPUT_ATI_REMOTE is not set # CONFIG_INPUT_ATI_REMOTE2 is not set # CONFIG_INPUT_KEYSPAN_REMOTE is not set # CONFIG_INPUT_KXTJ9 is not set # CONFIG_INPUT_POWERMATE is not set # CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_CM109 is not set -CONFIG_INPUT_UINPUT=y +CONFIG_INPUT_UINPUT=m # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_ADXL34X is not set @@ -919,14 +755,16 @@ CONFIG_INPUT_UINPUT=y # # Hardware I/O ports # -CONFIG_SERIO=y -CONFIG_SERIO_SERPORT=y +CONFIG_SERIO=m +CONFIG_SERIO_SERPORT=m # CONFIG_SERIO_AMBAKMI is not set -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=y +# CONFIG_SERIO_LIBPS2 is not set +CONFIG_SERIO_RAW=m # CONFIG_SERIO_ALTERA_PS2 is not set # CONFIG_SERIO_PS2MULT is not set -# CONFIG_GAMEPORT is not set +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m # # Character devices @@ -934,7 +772,6 @@ CONFIG_SERIO_RAW=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y @@ -973,8 +810,8 @@ CONFIG_MAX_RAW_DEVS=256 # CONFIG_RAMOOPS is not set CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y -# CONFIG_I2C_COMPAT is not set -CONFIG_I2C_CHARDEV=y +CONFIG_I2C_COMPAT=y +# CONFIG_I2C_CHARDEV is not set # CONFIG_I2C_MUX is not set CONFIG_I2C_HELPER_AUTO=y @@ -985,7 +822,7 @@ CONFIG_I2C_HELPER_AUTO=y # # I2C system bus drivers (mostly embedded / system-on-chip) # -# CONFIG_I2C_DESIGNWARE_PLATFORM is not set +# CONFIG_I2C_DESIGNWARE is not set # CONFIG_I2C_GPIO is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PCA_PLATFORM is not set @@ -1064,18 +901,7 @@ CONFIG_GPIO_SYSFS=y # MODULbus GPIO expanders: # # CONFIG_W1 is not set -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -# CONFIG_PDA_POWER is not set -# CONFIG_TEST_POWER is not set -# CONFIG_BATTERY_DS2780 is not set -# CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_BQ20Z75 is not set -# CONFIG_BATTERY_BQ27x00 is not set -# CONFIG_BATTERY_MAX17040 is not set -# CONFIG_BATTERY_MAX17042 is not set -# CONFIG_CHARGER_MAX8903 is not set -# CONFIG_CHARGER_GPIO is not set +# CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set # CONFIG_WATCHDOG is not set @@ -1084,55 +910,14 @@ CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -CONFIG_SSB=y -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_SDIOHOST_POSSIBLE=y -# CONFIG_SSB_SDIOHOST is not set -# CONFIG_SSB_SILENT is not set -# CONFIG_SSB_DEBUG is not set +# CONFIG_SSB is not set CONFIG_BCMA_POSSIBLE=y # # Broadcom specific AMBA # # CONFIG_BCMA is not set - -# -# Multifunction device drivers -# -# CONFIG_MFD_CORE is not set -# CONFIG_MFD_88PM860X is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_MFD_ASIC3 is not set -# CONFIG_HTC_EGPIO is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_HTC_I2CPLD is not set -# CONFIG_TPS6105X is not set -# CONFIG_TPS65010 is not set -# CONFIG_TPS6507X is not set -# CONFIG_MFD_TPS6586X is not set -# CONFIG_MFD_TPS65910 is not set -# CONFIG_MFD_TPS65912_I2C is not set -# CONFIG_TWL4030_CORE is not set -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_TC3589X is not set -# CONFIG_MFD_TMIO is not set -# CONFIG_MFD_T7L66XB is not set -# CONFIG_MFD_TC6387XB is not set -# CONFIG_MFD_TC6393XB is not set -# CONFIG_PMIC_DA903X is not set -# CONFIG_PMIC_ADP5520 is not set -# CONFIG_MFD_MAX8925 is not set -# CONFIG_MFD_MAX8997 is not set -# CONFIG_MFD_MAX8998 is not set -# CONFIG_MFD_WM8400 is not set -# CONFIG_MFD_WM831X_I2C is not set -# CONFIG_MFD_WM8350_I2C is not set -# CONFIG_MFD_WM8994 is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_ABX500_CORE is not set -# CONFIG_MFD_WL1273_CORE is not set -# CONFIG_MFD_AAT2870_CORE is not set +# CONFIG_MFD_SUPPORT is not set # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=y @@ -1160,7 +945,6 @@ CONFIG_IR_SONY_DECODER=y CONFIG_IR_RC5_SZ_DECODER=y CONFIG_IR_MCE_KBD_DECODER=y # CONFIG_IR_LIRC_CODEC is not set -CONFIG_RC_ATI_REMOTE=m CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m CONFIG_IR_REDRAT3=m @@ -1250,10 +1034,12 @@ CONFIG_VIDEO_MT9V011=m # CONFIG_VIDEO_VIVI is not set # CONFIG_VIDEO_CPIA2 is not set # CONFIG_VIDEO_AU0828 is not set +# CONFIG_VIDEO_SR030PC30 is not set +# CONFIG_VIDEO_NOON010PC30 is not set # CONFIG_SOC_CAMERA is not set CONFIG_V4L_USB_DRIVERS=y # CONFIG_USB_VIDEO_CLASS is not set -# CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV is not set +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_USB_GSPCA is not set CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y @@ -1264,8 +1050,6 @@ CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_EM28XX_RC=y # CONFIG_VIDEO_CX231XX is not set -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_DVB=m # CONFIG_VIDEO_USBVISION is not set # CONFIG_USB_ET61X251 is not set # CONFIG_USB_SN9C102 is not set @@ -1278,7 +1062,7 @@ CONFIG_VIDEO_TM6000_DVB=m CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set CONFIG_DVB_CAPTURE_DRIVERS=y -CONFIG_TTPCI_EEPROM=m +# CONFIG_TTPCI_EEPROM is not set # # Supported USB Adapters @@ -1305,7 +1089,6 @@ CONFIG_DVB_USB_DTT200U=m # CONFIG_DVB_USB_OPERA1 is not set CONFIG_DVB_USB_AF9005=m CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m CONFIG_DVB_USB_DW2102=m CONFIG_DVB_USB_CINERGY_T2=m CONFIG_DVB_USB_ANYSEE=m @@ -1317,8 +1100,6 @@ CONFIG_DVB_USB_AF9015=m # CONFIG_DVB_USB_AZ6027 is not set # CONFIG_DVB_USB_LME2510 is not set CONFIG_DVB_USB_TECHNISAT_USB2=m -CONFIG_DVB_USB_IT913X=m -# CONFIG_DVB_USB_MXL111SF is not set CONFIG_SMS_SIANO_MDTV=m # @@ -1340,7 +1121,6 @@ CONFIG_SMS_SDIO_DRV=m # # Multistandard (satellite) frontends # -CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m @@ -1366,7 +1146,6 @@ CONFIG_DVB_TDA826X=m CONFIG_DVB_CX24116=m CONFIG_DVB_SI21XX=m CONFIG_DVB_DS3000=m -CONFIG_DVB_TDA10071=m # # DVB-T (terrestrial) frontends @@ -1412,10 +1191,7 @@ CONFIG_DVB_TUNER_DIB0090=m # SEC control devices for DVB-S # CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m -CONFIG_DVB_IT913X_FE=m # # Tools to develop new frontends @@ -1454,7 +1230,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_BCM2708=y # CONFIG_FB_ARMCLCD is not set # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_SMSCUFX is not set # CONFIG_FB_UDL is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set @@ -1476,17 +1251,20 @@ CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -# CONFIG_LOGO is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_SOUND is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y -CONFIG_HIDRAW=y +# CONFIG_HIDRAW is not set # # USB Input Devices # CONFIG_USB_HID=y -# CONFIG_HID_PID is not set +CONFIG_HID_PID=y CONFIG_USB_HIDDEV=y # @@ -1495,14 +1273,14 @@ CONFIG_USB_HIDDEV=y CONFIG_HID_A4TECH=y # CONFIG_HID_ACRUX is not set CONFIG_HID_APPLE=y -# CONFIG_HID_AUREAL is not set +CONFIG_HID_AUREAL=y CONFIG_HID_BELKIN=y CONFIG_HID_CHERRY=y CONFIG_HID_CHICONY=y CONFIG_HID_CYPRESS=y -# CONFIG_HID_DRAGONRISE is not set +CONFIG_HID_DRAGONRISE=y +# CONFIG_DRAGONRISE_FF is not set # CONFIG_HID_EMS_FF is not set -# CONFIG_HID_ELECOM is not set CONFIG_HID_EZKEY=y # CONFIG_HID_HOLTEK is not set # CONFIG_HID_KEYTOUCH is not set @@ -1512,14 +1290,12 @@ CONFIG_HID_KYE=y CONFIG_HID_GYRATION=y CONFIG_HID_TWINHAN=y CONFIG_HID_KENSINGTON=y -CONFIG_HID_LCPOWER=y +# CONFIG_HID_LCPOWER is not set CONFIG_HID_LOGITECH=y -CONFIG_HID_LOGITECH_DJ=y CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGIG940_FF=y -CONFIG_LOGIWHEELS_FF=y -# CONFIG_HID_MAGICMOUSE is not set +CONFIG_LOGIWII_FF=y CONFIG_HID_MICROSOFT=y CONFIG_HID_MONTEREY=y # CONFIG_HID_MULTITOUCH is not set @@ -1527,45 +1303,42 @@ CONFIG_HID_MONTEREY=y CONFIG_HID_ORTEK=y CONFIG_HID_PANTHERLORD=y # CONFIG_PANTHERLORD_FF is not set -# CONFIG_HID_PETALYNX is not set +CONFIG_HID_PETALYNX=y # CONFIG_HID_PICOLCD is not set -# CONFIG_HID_PRIMAX is not set # CONFIG_HID_QUANTA is not set # CONFIG_HID_ROCCAT is not set CONFIG_HID_SAMSUNG=y CONFIG_HID_SONY=y # CONFIG_HID_SPEEDLINK is not set -# CONFIG_HID_SPINELPLUS is not set +CONFIG_HID_SPINELPLUS=y CONFIG_HID_SUNPLUS=y -# CONFIG_HID_GREENASIA is not set -# CONFIG_HID_SMARTJOYPLUS is not set +CONFIG_HID_GREENASIA=y +# CONFIG_GREENASIA_FF is not set +CONFIG_HID_SMARTJOYPLUS=y +# CONFIG_SMARTJOYPLUS_FF is not set CONFIG_HID_TOPSEED=y -# CONFIG_HID_THRUSTMASTER is not set -# CONFIG_HID_WACOM is not set -CONFIG_HID_WIIMOTE=m -# CONFIG_HID_ZEROPLUS is not set -CONFIG_HID_ZYDACRON=y +CONFIG_HID_THRUSTMASTER=y +# CONFIG_THRUSTMASTER_FF is not set +CONFIG_HID_ZEROPLUS=y +# CONFIG_ZEROPLUS_FF is not set +# CONFIG_HID_ZYDACRON is not set CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=y CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_ARCH_HAS_XHCI is not set CONFIG_USB=y # CONFIG_USB_DEBUG is not set -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # # Miscellaneous USB options # # CONFIG_USB_DEVICEFS is not set -# CONFIG_USB_DEVICE_CLASS is not set +CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set -CONFIG_USB_SUSPEND=y -# CONFIG_USB_OTG is not set +# CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_DWC3 is not set CONFIG_USB_MON=m # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set @@ -1586,7 +1359,7 @@ CONFIG_USB_DWCOTG=y # # USB Device Class drivers # -CONFIG_USB_ACM=m +# CONFIG_USB_ACM is not set # CONFIG_USB_PRINTER is not set # CONFIG_USB_WDM is not set # CONFIG_USB_TMC is not set @@ -1625,57 +1398,7 @@ CONFIG_USB_LIBUSUAL=y # # USB port drivers # -CONFIG_USB_SERIAL=m -# CONFIG_USB_EZUSB is not set -# CONFIG_USB_SERIAL_GENERIC is not set -# CONFIG_USB_SERIAL_AIRCABLE is not set -# CONFIG_USB_SERIAL_ARK3116 is not set -# CONFIG_USB_SERIAL_BELKIN is not set -# CONFIG_USB_SERIAL_CH341 is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -CONFIG_USB_SERIAL_CP210X=m -# CONFIG_USB_SERIAL_CYPRESS_M8 is not set -# CONFIG_USB_SERIAL_EMPEG is not set -CONFIG_USB_SERIAL_FTDI_SIO=m -# CONFIG_USB_SERIAL_FUNSOFT is not set -# CONFIG_USB_SERIAL_VISOR is not set -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_GARMIN is not set -# CONFIG_USB_SERIAL_IPW is not set -# CONFIG_USB_SERIAL_IUU is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -# CONFIG_USB_SERIAL_KEYSPAN is not set -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -# CONFIG_USB_SERIAL_MCT_U232 is not set -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -# CONFIG_USB_SERIAL_MOTOROLA is not set -# CONFIG_USB_SERIAL_NAVMAN is not set -# CONFIG_USB_SERIAL_PL2303 is not set -# CONFIG_USB_SERIAL_OTI6858 is not set -# CONFIG_USB_SERIAL_QCAUX is not set -# CONFIG_USB_SERIAL_QUALCOMM is not set -# CONFIG_USB_SERIAL_SPCP8X5 is not set -# CONFIG_USB_SERIAL_HP4X is not set -# CONFIG_USB_SERIAL_SAFE is not set -# CONFIG_USB_SERIAL_SIEMENS_MPI is not set -# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set -# CONFIG_USB_SERIAL_SYMBOL is not set -# CONFIG_USB_SERIAL_TI is not set -# CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_XIRCOM is not set -# CONFIG_USB_SERIAL_OPTION is not set -# CONFIG_USB_SERIAL_OMNINET is not set -# CONFIG_USB_SERIAL_OPTICON is not set -# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set -# CONFIG_USB_SERIAL_ZIO is not set -# CONFIG_USB_SERIAL_SSU100 is not set -# CONFIG_USB_SERIAL_DEBUG is not set +# CONFIG_USB_SERIAL is not set # # USB Miscellaneous drivers @@ -1752,7 +1475,6 @@ CONFIG_LEDS_GPIO=y # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_BD2802 is not set # CONFIG_LEDS_LT3593 is not set -# CONFIG_LEDS_RENESAS_TPU is not set CONFIG_LEDS_TRIGGERS=y # @@ -1778,46 +1500,10 @@ CONFIG_RTC_LIB=y # Virtio drivers # # CONFIG_VIRTIO_BALLOON is not set -# CONFIG_VIRTIO_MMIO is not set -CONFIG_STAGING=y -# CONFIG_USBIP_CORE is not set -# CONFIG_W35UND is not set -# CONFIG_PRISM2_USB is not set -# CONFIG_ECHO is not set -# CONFIG_ASUS_OLED is not set -CONFIG_R8712U=m -CONFIG_R8712_AP=y -# CONFIG_RTS5139 is not set -# CONFIG_TRANZPORT is not set -# CONFIG_POHMELFS is not set -# CONFIG_USB_SERIAL_QUATECH2 is not set -# CONFIG_USB_SERIAL_QUATECH_USB2 is not set -CONFIG_VT6656=m -# CONFIG_IIO is not set -# CONFIG_XVMALLOC is not set -# CONFIG_ZRAM is not set -# CONFIG_FB_SM7XX is not set -# CONFIG_USB_ENESTORAGE is not set -# CONFIG_BCM_WIMAX is not set -# CONFIG_FT1000 is not set - -# -# Speakup console speech -# -# CONFIG_SPEAKUP is not set -# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set -# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set -CONFIG_STAGING_MEDIA=y -CONFIG_DVB_AS102=m -# CONFIG_LIRC_STAGING is not set +# CONFIG_STAGING is not set CONFIG_CLKDEV_LOOKUP=y - -# -# Hardware Spinlock drivers -# # CONFIG_IOMMU_SUPPORT is not set # CONFIG_VIRT_DRIVERS is not set -# CONFIG_PM_DEVFREQ is not set # # File systems @@ -1829,7 +1515,6 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -# CONFIG_JBD2_DEBUG is not set CONFIG_REISERFS_FS=y # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set @@ -1848,7 +1533,7 @@ CONFIG_XFS_FS=y # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y @@ -1859,12 +1544,19 @@ CONFIG_INOTIFY_USER=y # CONFIG_QUOTACTL is not set CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=y -# CONFIG_CUSE is not set +CONFIG_CUSE=m # # Caches # -# CONFIG_FSCACHE is not set +CONFIG_FSCACHE=y +# CONFIG_FSCACHE_STATS is not set +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set +CONFIG_CACHEFILES=y +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set # # CD-ROM/DVD Filesystems @@ -1879,7 +1571,7 @@ CONFIG_UDF_NLS=y # DOS/FAT/NT Filesystems # CONFIG_FAT_FS=y -# CONFIG_MSDOS_FS is not set +CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="ascii" @@ -1911,9 +1603,8 @@ CONFIG_HFSPLUS_FS=m CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_XATTR is not set CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_LZO is not set +CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set @@ -1928,28 +1619,34 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=y CONFIG_ROOT_NFS=y +CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFS_USE_NEW_IDMAPPER is not set # CONFIG_NFSD is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y +CONFIG_SUNRPC_BACKCHANNEL=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=y -CONFIG_CIFS_STATS=y -CONFIG_CIFS_STATS2=y -# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_WEAK_PW_HASH=y # CONFIG_CIFS_UPCALL is not set -# CONFIG_CIFS_XATTR is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set +# CONFIG_CIFS_FSCACHE is not set +# CONFIG_CIFS_ACL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -2023,13 +1720,13 @@ CONFIG_NLS_UTF8=m # CONFIG_PRINTK_TIME=y CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set -CONFIG_DEBUG_FS=y +# CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_DEBUG_KERNEL=y @@ -2044,7 +1741,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_PREEMPT is not set +CONFIG_DEBUG_PREEMPT=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -2057,7 +1754,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_KOBJECT is not set -CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set @@ -2073,10 +1770,9 @@ CONFIG_FRAME_POINTER=y # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -# CONFIG_LKDTM is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_SYSCTL_SYSCALL_CHECK is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y @@ -2085,14 +1781,13 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set -# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set # CONFIG_TEST_KSTRTOX is not set -CONFIG_STRICT_DEVMEM=y +# CONFIG_STRICT_DEVMEM is not set # CONFIG_ARM_UNWIND is not set # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_LL is not set @@ -2102,7 +1797,6 @@ CONFIG_STRICT_DEVMEM=y # Security options # CONFIG_KEYS=y -# CONFIG_ENCRYPTED_KEYS is not set # CONFIG_KEYS_DEBUG_PROC_KEYS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set # CONFIG_SECURITY is not set @@ -2114,26 +1808,25 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -# CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP2=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y -# CONFIG_CRYPTO_USER is not set -# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set -# CONFIG_CRYPTO_AUTHENC is not set +CONFIG_CRYPTO_AUTHENC=m # CONFIG_CRYPTO_TEST is not set # @@ -2141,7 +1834,7 @@ CONFIG_CRYPTO_WORKQUEUE=y # # CONFIG_CRYPTO_CCM is not set # CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set +CONFIG_CRYPTO_SEQIV=m # # Block modes @@ -2158,7 +1851,7 @@ CONFIG_CRYPTO_ECB=y # Hash modes # CONFIG_CRYPTO_HMAC=y -# CONFIG_CRYPTO_XCBC is not set +CONFIG_CRYPTO_XCBC=m # CONFIG_CRYPTO_VMAC is not set # @@ -2173,21 +1866,21 @@ CONFIG_CRYPTO_MICHAEL_MIC=m # CONFIG_CRYPTO_RMD160 is not set # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set -# CONFIG_CRYPTO_SHA1 is not set -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_WP512 is not set +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m # # Ciphers # -CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_AES is not set # CONFIG_CRYPTO_ANUBIS is not set CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_CAST5 is not set +CONFIG_CRYPTO_CAST5=m # CONFIG_CRYPTO_CAST6 is not set CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_FCRYPT is not set @@ -2201,14 +1894,14 @@ CONFIG_CRYPTO_DES=y # # Compression # -# CONFIG_CRYPTO_DEFLATE is not set +CONFIG_CRYPTO_DEFLATE=m # CONFIG_CRYPTO_ZLIB is not set # CONFIG_CRYPTO_LZO is not set # # Random Number Generation # -CONFIG_CRYPTO_ANSI_CPRNG=y +# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_USER_API_HASH is not set # CONFIG_CRYPTO_USER_API_SKCIPHER is not set # CONFIG_CRYPTO_HW is not set @@ -2224,9 +1917,11 @@ CONFIG_CRC16=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=y # CONFIG_CRC8 is not set CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_DECOMPRESS=y CONFIG_XZ_DEC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC_POWERPC=y @@ -2242,5 +1937,5 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_NLATTR=y CONFIG_GENERIC_ATOMIC64=y -CONFIG_AVERAGE=y +# CONFIG_AVERAGE is not set # CONFIG_CORDIC is not set