Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge

1400 files changed, 12509 insertions, 54444 deletions

diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index b638e50cf8f6..9c27e5125dd2 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -50,7 +50,9 @@
 
      <sect1><title>Delaying, scheduling, and timer routines</title>
 !Iinclude/linux/sched.h
-!Ekernel/sched.c
+!Ekernel/sched/core.c
+!Ikernel/sched/cpupri.c
+!Ikernel/sched/fair.c
 !Iinclude/linux/completion.h
 !Ekernel/timer.c
      </sect1>
@@ -100,9 +102,12 @@ X!Iinclude/linux/kobject.h
 !Iinclude/linux/device.h
      </sect1>
      <sect1><title>Device Drivers Base</title>
+!Idrivers/base/init.c
 !Edrivers/base/driver.c
 !Edrivers/base/core.c
+!Edrivers/base/syscore.c
 !Edrivers/base/class.c
+!Idrivers/base/node.c
 !Edrivers/base/firmware_class.c
 !Edrivers/base/transport_class.c
 <!-- Cannot be included, because
@@ -111,7 +116,7 @@ X!Iinclude/linux/kobject.h
      exceed allowed 44 characters maximum
 X!Edrivers/base/attribute_container.c
 -->
-!Edrivers/base/sys.c
+!Edrivers/base/dd.c
 <!--
 X!Edrivers/base/interface.c
 -->
@@ -119,6 +124,11 @@ X!Edrivers/base/interface.c
 !Edrivers/base/platform.c
 !Edrivers/base/bus.c
      </sect1>
+     <sect1><title>Device Drivers DMA Management</title>
+!Edrivers/base/dma-buf.c
+!Edrivers/base/dma-coherent.c
+!Edrivers/base/dma-mapping.c
+     </sect1>
      <sect1><title>Device Drivers Power Management</title>
 !Edrivers/base/power/main.c
      </sect1>
@@ -216,9 +226,8 @@ X!Isound/sound_firmware.c
 
   <chapter id="uart16x50">
      <title>16x50 UART Driver</title>
-!Iinclude/linux/serial_core.h
 !Edrivers/tty/serial/serial_core.c
-!Edrivers/tty/serial/8250.c
+!Edrivers/tty/serial/8250/8250.c
   </chapter>
 
   <chapter id="fbdev">
diff --git a/Documentation/DocBook/deviceiobook.tmpl b/Documentation/DocBook/deviceiobook.tmpl
index c1ed6a49e598..54199a0dcf9a 100644
--- a/Documentation/DocBook/deviceiobook.tmpl
+++ b/Documentation/DocBook/deviceiobook.tmpl
@@ -317,7 +317,7 @@ CPU B:  spin_unlock_irqrestore(&amp;dev_lock, flags)
   <chapter id="pubfunctions">
      <title>Public Functions Provided</title>
 !Iarch/x86/include/asm/io.h
-!Elib/iomap.c
+!Elib/pci_iomap.c
   </chapter>
 
 </book>
diff --git a/Documentation/devicetree/bindings/gpio/led.txt b/Documentation/devicetree/bindings/gpio/led.txt
index 141087cf3107..fd2bd56e7195 100644
--- a/Documentation/devicetree/bindings/gpio/led.txt
+++ b/Documentation/devicetree/bindings/gpio/led.txt
@@ -7,9 +7,9 @@ Each LED is represented as a sub-node of the gpio-leds device.  Each
 node's name represents the name of the corresponding LED.
 
 LED sub-node properties:
-- gpios :  Should specify the LED's GPIO, see "Specifying GPIO information
-  for devices" in Documentation/devicetree/booting-without-of.txt.  Active
-  low LEDs should be indicated using flags in the GPIO specifier.
+- gpios :  Should specify the LED's GPIO, see "gpios property" in
+  Documentation/devicetree/gpio.txt.  Active low LEDs should be
+  indicated using flags in the GPIO specifier.
 - label :  (optional) The label for this LED.  If omitted, the label is
   taken from the node name (excluding the unit address).
 - linux,default-trigger :  (optional) This parameter, if present, is a
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index ecc6a6cd26c1..a20008ab319a 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -30,6 +30,7 @@ national	National Semiconductor
 nintendo        Nintendo
 nvidia  NVIDIA
 nxp     NXP Semiconductors
+picochip        Picochip Ltd
 powervr Imagination Technologies
 qcom    Qualcomm, Inc.
 ramtron Ramtron International
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt
index 10c64c8a13d4..41c0c5d1ba14 100644
--- a/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@ -233,6 +233,10 @@ certainly invest a bit more effort into libata core layer).
   6. List of managed interfaces
   -----------------------------
 
+MEM
+  devm_kzalloc()
+  devm_kfree()
+
 IO region
   devm_request_region()
   devm_request_mem_region()
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 1bea46a54b1c..a0ffac029a0d 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -510,3 +510,17 @@ Why:	The pci_scan_bus_parented() interface creates a new root bus.  The
         convert to using pci_scan_root_bus() so they can supply a list of
         bus resources when the bus is created.
 Who:    Bjorn Helgaas <bhelgaas@google.com>
+
+----------------------------
+
+What:   The CAP9 SoC family will be removed
+When:   3.4
+Files:  arch/arm/mach-at91/at91cap9.c
+        arch/arm/mach-at91/at91cap9_devices.c
+        arch/arm/mach-at91/include/mach/at91cap9.h
+        arch/arm/mach-at91/include/mach/at91cap9_matrix.h
+        arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h
+        arch/arm/mach-at91/board-cap9adk.c
+Why:    The code is not actively maintained and platforms are now hard to find.
+Who:    Nicolas Ferre <nicolas.ferre@atmel.com>
+        Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
diff --git a/Documentation/input/event-codes.txt b/Documentation/input/event-codes.txt
index 23fcb05175be..53305bd08182 100644
--- a/Documentation/input/event-codes.txt
+++ b/Documentation/input/event-codes.txt
@@ -17,11 +17,11 @@ reports supported by a device are also provided by sysfs in
 class/input/event*/device/capabilities/, and the properties of a device are
 provided in class/input/event*/device/properties.
 
-Types:
-==========
-Types are groupings of codes under a logical input construct. Each type has a
-set of applicable codes to be used in generating events. See the Codes section
-for details on valid codes for each type.
+Event types:
+===========
+Event types are groupings of codes under a logical input construct. Each
+type has a set of applicable codes to be used in generating events. See the
+Codes section for details on valid codes for each type.
 
 * EV_SYN:
   - Used as markers to separate events. Events may be separated in time or in
@@ -63,9 +63,9 @@ for details on valid codes for each type.
 * EV_FF_STATUS:
   - Used to receive force feedback device status.
 
-Codes:
-==========
-Codes define the precise type of event.
+Event codes:
+===========
+Event codes define the precise type of event.
 
 EV_SYN:
 ----------
@@ -220,6 +220,56 @@ EV_PWR:
 EV_PWR events are a special type of event used specifically for power
 mangement. Its usage is not well defined. To be addressed later.
 
+Device properties:
+=================
+Normally, userspace sets up an input device based on the data it emits,
+i.e., the event types. In the case of two devices emitting the same event
+types, additional information can be provided in the form of device
+properties.
+
+INPUT_PROP_DIRECT + INPUT_PROP_POINTER:
+--------------------------------------
+The INPUT_PROP_DIRECT property indicates that device coordinates should be
+directly mapped to screen coordinates (not taking into account trivial
+transformations, such as scaling, flipping and rotating). Non-direct input
+devices require non-trivial transformation, such as absolute to relative
+transformation for touchpads. Typical direct input devices: touchscreens,
+drawing tablets; non-direct devices: touchpads, mice.
+
+The INPUT_PROP_POINTER property indicates that the device is not transposed
+on the screen and thus requires use of an on-screen pointer to trace user's
+movements.  Typical pointer devices: touchpads, tablets, mice; non-pointer
+device: touchscreen.
+
+If neither INPUT_PROP_DIRECT or INPUT_PROP_POINTER are set, the property is
+considered undefined and the device type should be deduced in the
+traditional way, using emitted event types.
+
+INPUT_PROP_BUTTONPAD:
+--------------------
+For touchpads where the button is placed beneath the surface, such that
+pressing down on the pad causes a button click, this property should be
+set. Common in clickpad notebooks and macbooks from 2009 and onwards.
+
+Originally, the buttonpad property was coded into the bcm5974 driver
+version field under the name integrated button. For backwards
+compatibility, both methods need to be checked in userspace.
+
+INPUT_PROP_SEMI_MT:
+------------------
+Some touchpads, most common between 2008 and 2011, can detect the presence
+of multiple contacts without resolving the individual positions; only the
+number of contacts and a rectangular shape is known. For such
+touchpads, the semi-mt property should be set.
+
+Depending on the device, the rectangle may enclose all touches, like a
+bounding box, or just some of them, for instance the two most recent
+touches. The diversity makes the rectangle of limited use, but some
+gestures can normally be extracted from it.
+
+If INPUT_PROP_SEMI_MT is not set, the device is assumed to be a true MT
+device.
+
 Guidelines:
 ==========
 The guidelines below ensure proper single-touch and multi-finger functionality.
@@ -240,6 +290,8 @@ used to report when a touch is active on the screen.
 BTN_{MOUSE,LEFT,MIDDLE,RIGHT} must not be reported as the result of touch
 contact. BTN_TOOL_<name> events should be reported where possible.
 
+For new hardware, INPUT_PROP_DIRECT should be set.
+
 Trackpads:
 ----------
 Legacy trackpads that only provide relative position information must report
@@ -250,6 +302,8 @@ location of the touch. BTN_TOUCH should be used to report when a touch is active
 on the trackpad. Where multi-finger support is available, BTN_TOOL_<name> should
 be used to report the number of touches active on the trackpad.
 
+For new hardware, INPUT_PROP_POINTER should be set.
+
 Tablets:
 ----------
 BTN_TOOL_<name> events must be reported when a stylus or other tool is active on
@@ -260,3 +314,5 @@ button may be used for buttons on the tablet except BTN_{MOUSE,LEFT}.
 BTN_{0,1,2,etc} are good generic codes for unlabeled buttons. Do not use
 meaningful buttons, like BTN_FORWARD, unless the button is labeled for that
 purpose on the device.
+
+For new hardware, both INPUT_PROP_DIRECT and INPUT_PROP_POINTER should be set.
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index 6727b92bc2fb..150fd3833d0b 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -857,42 +857,41 @@ case), we define a mapping like this:
 
 ...
 {
-        .name "2bit"
+        .name = "2bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_1_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "4bit"
+        .name = "4bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_1_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "4bit"
+        .name = "4bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_2_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "8bit"
+        .name = "8bit"
         .ctrl_dev_name = "pinctrl-foo",
-        .function = "mmc0",
         .group = "mmc0_1_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "8bit"
+        .name = "8bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_2_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "8bit"
+        .name = "8bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_3_grp",
@@ -995,7 +994,7 @@ This is enabled by simply setting the .hog_on_boot field in the map to true,
 like this:
 
 {
-        .name "POWERMAP"
+        .name = "POWERMAP"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "power_func",
         .hog_on_boot = true,
@@ -1025,7 +1024,7 @@ it, disables and releases it, and muxes it in on the pins defined by group B:
 
 foo_switch()
 {
-        struct pinmux pmx;
+        struct pinmux *pmx;
 
         /* Enable on position A */
         pmx = pinmux_get(&device, "spi0-pos-A");
diff --git a/Documentation/power/basic-pm-debugging.txt b/Documentation/power/basic-pm-debugging.txt
index 40a4c65f380a..262acf56fa79 100644
--- a/Documentation/power/basic-pm-debugging.txt
+++ b/Documentation/power/basic-pm-debugging.txt
@@ -15,7 +15,7 @@ test at least a couple of times in a row for confidence.  [This is necessary,
 because some problems only show up on a second attempt at suspending and
 resuming the system.]  Moreover, hibernating in the "reboot" and "shutdown"
 modes causes the PM core to skip some platform-related callbacks which on ACPI
-systems might be necessary to make hibernation work.  Thus, if you machine fails
+systems might be necessary to make hibernation work.  Thus, if your machine fails
 to hibernate or resume in the "reboot" mode, you should try the "platform" mode:
 
 # echo platform > /sys/power/disk
diff --git a/Documentation/power/freezing-of-tasks.txt b/Documentation/power/freezing-of-tasks.txt
index 6ccb68f68da6..ebd7490ef1df 100644
--- a/Documentation/power/freezing-of-tasks.txt
+++ b/Documentation/power/freezing-of-tasks.txt
@@ -120,10 +120,10 @@ So in practice, the 'at all' may become a 'why freeze kernel threads?' and
 freezing user threads I don't find really objectionable."
 
 Still, there are kernel threads that may want to be freezable.  For example, if
-a kernel that belongs to a device driver accesses the device directly, it in
-principle needs to know when the device is suspended, so that it doesn't try to
-access it at that time.  However, if the kernel thread is freezable, it will be
-frozen before the driver's .suspend() callback is executed and it will be
+a kernel thread that belongs to a device driver accesses the device directly, it
+in principle needs to know when the device is suspended, so that it doesn't try
+to access it at that time.  However, if the kernel thread is freezable, it will
+be frozen before the driver's .suspend() callback is executed and it will be
 thawed after the driver's .resume() callback has run, so it won't be accessing
 the device while it's suspended.
 
diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt
index 21fd05c28e73..f0ab5cf28fca 100644
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
@@ -25,7 +25,8 @@ Procedure for submitting patches to the -stable tree:
 
  - Send the patch, after verifying that it follows the above rules, to
    stable@vger.kernel.org.  You must note the upstream commit ID in the
-   changelog of your submission.
+   changelog of your submission, as well as the kernel version you wish
+   it to be applied to.
  - To have the patch automatically included in the stable tree, add the tag
      Cc: stable@vger.kernel.org
    in the sign-off area. Once the patch is merged it will be applied to
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 8c20fbd8b42d..6d78841fd416 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -601,6 +601,8 @@ can be ORed together:
         instead of using the one provided by the hardware.
  512 - A kernel warning has occurred.
 1024 - A module from drivers/staging was loaded.
+2048 - The system is working around a severe firmware bug.
+4096 - An out-of-tree module has been loaded.
 
 ==============================================================
 
diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
index b61e46f449aa..1733ab947a95 100644
--- a/Documentation/thermal/sysfs-api.txt
+++ b/Documentation/thermal/sysfs-api.txt
@@ -284,7 +284,7 @@ method, the sys I/F structure will be built like this:
 The framework includes a simple notification mechanism, in the form of a
 netlink event. Netlink socket initialization is done during the _init_
 of the framework. Drivers which intend to use the notification mechanism
-just need to call generate_netlink_event() with two arguments viz
+just need to call thermal_generate_netlink_event() with two arguments viz
 (originator, event). Typically the originator will be an integer assigned
 to a thermal_zone_device when it registers itself with the framework. The
 event will be one of:{THERMAL_AUX0, THERMAL_AUX1, THERMAL_CRITICAL,
diff --git a/Documentation/virtual/00-INDEX b/Documentation/virtual/00-INDEX
index 8e601991d91c..924bd462675e 100644
--- a/Documentation/virtual/00-INDEX
+++ b/Documentation/virtual/00-INDEX
@@ -4,8 +4,6 @@ Virtualization support in the Linux kernel.
         - this file.
 kvm/
         - Kernel Virtual Machine.  See also http://linux-kvm.org
-lguest/
-        - Extremely simple hypervisor for experimental/educational use.
 uml/
         - User Mode Linux, builds/runs Linux kernel as a userspace program.
 virtio.txt
diff --git a/MAINTAINERS b/MAINTAINERS
index 89b70df91f4f..75a9a5fc230a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -159,7 +159,7 @@ S:	Maintained
 F:      drivers/net/ethernet/realtek/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-serial@vger.kernel.org
 W:      http://serial.sourceforge.net
 S:      Maintained
@@ -269,7 +269,6 @@ S:	Orphan
 F:      drivers/platform/x86/wmi.c
 
 AD1889 ALSA SOUND DRIVER
-M:      Kyle McMartin <kyle@mcmartin.ca>
 M:      Thibaut Varene <T-Bone@parisc-linux.org>
 W:      http://wiki.parisc-linux.org/AD1889
 L:      linux-parisc@vger.kernel.org
@@ -789,12 +788,6 @@ F:	arch/arm/mach-mx*/
 F:      arch/arm/mach-imx/
 F:      arch/arm/plat-mxc/
 
-ARM/FREESCALE IMX51
-M:      Amit Kucheria <amit.kucheria@canonical.com>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-F:      arch/arm/mach-mx5/
-
 ARM/FREESCALE IMX6
 M:      Shawn Guo <shawn.guo@linaro.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1783,9 +1776,9 @@ X:	net/wireless/wext*
 
 CHAR and MISC DRIVERS
 M:      Arnd Bergmann <arnd@arndb.de>
-M:      Greg Kroah-Hartman <greg@kroah.com>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
-S:      Maintained
+S:      Supported
 F:      drivers/char/*
 F:      drivers/misc/*
 
@@ -2246,6 +2239,17 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git
 S:      Supported
 F:      fs/dlm/
 
+DMA BUFFER SHARING FRAMEWORK
+M:      Sumit Semwal <sumit.semwal@linaro.org>
+S:      Maintained
+L:      linux-media@vger.kernel.org
+L:      dri-devel@lists.freedesktop.org
+L:      linaro-mm-sig@lists.linaro.org
+F:      drivers/base/dma-buf*
+F:      include/linux/dma-buf*
+F:      Documentation/dma-buf-sharing.txt
+T:      git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
+
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 M:      Vinod Koul <vinod.koul@intel.com>
 M:      Dan Williams <dan.j.williams@intel.com>
@@ -2276,7 +2280,7 @@ F:	drivers/acpi/dock.c
 DOCUMENTATION
 M:      Randy Dunlap <rdunlap@xenotime.net>
 L:      linux-doc@vger.kernel.org
-T:      quilt http://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/
+T:      quilt http://xenotime.net/kernel-doc-patches/current/
 S:      Maintained
 F:      Documentation/
 
@@ -2309,7 +2313,7 @@ F:	lib/lru_cache.c
 F:      Documentation/blockdev/drbd/
 
 DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
 S:      Supported
 F:      Documentation/kobject.txt
@@ -2339,6 +2343,9 @@ F:	include/drm/i915*
 
 DRM DRIVERS FOR EXYNOS
 M:      Inki Dae <inki.dae@samsung.com>
+M:      Joonyoung Shim <jy0922.shim@samsung.com>
+M:      Seung-Woo Kim <sw0312.kim@samsung.com>
+M:      Kyungmin Park <kyungmin.park@samsung.com>
 L:      dri-devel@lists.freedesktop.org
 S:      Supported
 F:      drivers/gpu/drm/exynos
@@ -2391,7 +2398,7 @@ F:	net/bridge/netfilter/ebt*.c
 
 ECRYPT FILE SYSTEM
 M:      Tyler Hicks <tyhicks@canonical.com>
-M:      Dustin Kirkland <kirkland@canonical.com>
+M:      Dustin Kirkland <dustin.kirkland@gazzang.com>
 L:      ecryptfs@vger.kernel.org
 W:      https://launchpad.net/ecryptfs
 S:      Supported
@@ -3039,7 +3046,6 @@ F:	drivers/hwspinlock/hwspinlock_*
 F:      include/linux/hwspinlock.h
 
 HARMONY SOUND DRIVER
-M:      Kyle McMartin <kyle@mcmartin.ca>
 L:      linux-parisc@vger.kernel.org
 S:      Maintained
 F:      sound/parisc/harmony.*
@@ -3310,6 +3316,12 @@ S:	Maintained
 F:      net/ieee802154/
 F:      drivers/ieee802154/
 
+IIO SUBSYSTEM AND DRIVERS
+M:      Jonathan Cameron <jic23@cam.ac.uk>
+L:      linux-iio@vger.kernel.org
+S:      Maintained
+F:      drivers/staging/iio/
+
 IKANOS/ADI EAGLE ADSL USB DRIVER
 M:      Matthieu Castet <castet.matthieu@free.fr>
 M:      Stanislaw Gruszka <stf_xl@wp.pl>
@@ -3978,11 +3990,11 @@ M:	Rusty Russell <rusty@rustcorp.com.au>
 L:      lguest@lists.ozlabs.org
 W:      http://lguest.ozlabs.org/
 S:      Odd Fixes
-F:      Documentation/virtual/lguest/
+F:      arch/x86/include/asm/lguest*.h
 F:      arch/x86/lguest/
 F:      drivers/lguest/
 F:      include/linux/lguest*.h
-F:      arch/x86/include/asm/lguest*.h
+F:      tools/lguest/
 
 LINUX FOR IBM pSERIES (RS/6000)
 M:      Paul Mackerras <paulus@au.ibm.com>
@@ -4122,10 +4134,11 @@ L:	linux-ntfs-dev@lists.sourceforge.net
 W:      http://www.linux-ntfs.org/content/view/19/37/
 S:      Maintained
 F:      Documentation/ldm.txt
-F:      fs/partitions/ldm.*
+F:      block/partitions/ldm.*
 
 LogFS
 M:      Joern Engel <joern@logfs.org>
+M:      Prasad Joshi <prasadjoshi.linux@gmail.com>
 L:      logfs@logfs.org
 W:      logfs.org
 S:      Maintained
@@ -4267,13 +4280,6 @@ S:	Orphan
 F:      drivers/video/matrox/matroxfb_*
 F:      include/linux/matroxfb.h
 
-MAX1668 TEMPERATURE SENSOR DRIVER
-M:      "David George" <david.george@ska.ac.za>
-L:      lm-sensors@lm-sensors.org
-S:      Maintained
-F:      Documentation/hwmon/max1668
-F:      drivers/hwmon/max1668.c
-
 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 M:      "Hans J. Koch" <hjk@hansjkoch.de>
 L:      lm-sensors@lm-sensors.org
@@ -4992,9 +4998,8 @@ F:	Documentation/blockdev/paride.txt
 F:      drivers/block/paride/
 
 PARISC ARCHITECTURE
-M:      Kyle McMartin <kyle@mcmartin.ca>
-M:      Helge Deller <deller@gmx.de>
 M:      "James E.J. Bottomley" <jejb@parisc-linux.org>
+M:      Helge Deller <deller@gmx.de>
 L:      linux-parisc@vger.kernel.org
 W:      http://www.parisc-linux.org/
 Q:      http://patchwork.kernel.org/project/linux-parisc/list/
@@ -5625,7 +5630,7 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      arch/s390/
 F:      drivers/s390/
-F:      fs/partitions/ibm.c
+F:      block/partitions/ibm.c
 F:      Documentation/s390/
 F:      Documentation/DocBook/s390*
 
@@ -5853,7 +5858,7 @@ S:	Maintained
 F:      drivers/mmc/host/sdhci-spear.c
 
 SECURITY SUBSYSTEM
-M:      James Morris <jmorris@namei.org>
+M:      James Morris <james.l.morris@oracle.com>
 L:      linux-security-module@vger.kernel.org (suggested Cc:)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
 W:      http://security.wiki.kernel.org/
@@ -5866,7 +5871,7 @@ S:	Supported
 
 SELINUX SECURITY MODULE
 M:      Stephen Smalley <sds@tycho.nsa.gov>
-M:      James Morris <jmorris@namei.org>
+M:      James Morris <james.l.morris@oracle.com>
 M:      Eric Paris <eparis@parisplace.org>
 L:      selinux@tycho.nsa.gov (subscribers-only, general discussion)
 W:      http://selinuxproject.org
@@ -6268,15 +6273,15 @@ S:	Maintained
 F:      arch/alpha/kernel/srm_env.c
 
 STABLE BRANCH
-M:      Greg Kroah-Hartman <greg@kroah.com>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      stable@vger.kernel.org
-S:      Maintained
+S:      Supported
 
 STAGING SUBSYSTEM
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
 L:      devel@driverdev.osuosl.org
-S:      Maintained
+S:      Supported
 F:      drivers/staging/
 
 STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
@@ -6388,11 +6393,6 @@ M:	Omar Ramirez Luna <omar.ramirez@ti.com>
 S:      Odd Fixes
 F:      drivers/staging/tidspbridge/
 
-STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS
-L:      linux-media@vger.kernel.org
-S:      Odd Fixes
-F:      drivers/staging/tm6000/
-
 STAGING - USB ENE SM/MS CARD READER DRIVER
 M:      Al Cho <acho@novell.com>
 S:      Odd Fixes
@@ -6661,10 +6661,10 @@ S:	Maintained
 K:      ^Subject:.*(?i)trivial
 
 TTY LAYER
-M:      Greg Kroah-Hartman <gregkh@suse.de>
-S:      Maintained
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+S:      Supported
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
-F:      drivers/tty/*
+F:      drivers/tty/
 F:      drivers/tty/serial/serial_core.c
 F:      include/linux/serial_core.h
 F:      include/linux/serial.h
@@ -6950,7 +6950,7 @@ S:	Maintained
 F:      drivers/usb/serial/digi_acceleport.c
 
 USB SERIAL DRIVER
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-usb@vger.kernel.org
 S:      Supported
 F:      Documentation/usb/usb-serial.txt
@@ -6965,9 +6965,8 @@ S:	Maintained
 F:      drivers/usb/serial/empeg.c
 
 USB SERIAL KEYSPAN DRIVER
-M:      Greg Kroah-Hartman <greg@kroah.com>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-usb@vger.kernel.org
-W:      http://www.kroah.com/linux/
 S:      Maintained
 F:      drivers/usb/serial/*keyspan*
 
@@ -6995,7 +6994,7 @@ F:	Documentation/video4linux/sn9c102.txt
 F:      drivers/media/video/sn9c102/
 
 USB SUBSYSTEM
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-usb@vger.kernel.org
 W:      http://www.linux-usb.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
@@ -7082,7 +7081,7 @@ F:	fs/hppfs/
 
 USERSPACE I/O (UIO)
 M:      "Hans J. Koch" <hjk@hansjkoch.de>
-M:      Greg Kroah-Hartman <gregkh@suse.de>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 S:      Maintained
 F:      Documentation/DocBook/uio-howto.tmpl
 F:      drivers/uio/
@@ -7357,6 +7356,7 @@ S:	Supported
 F:      Documentation/hwmon/wm83??
 F:      arch/arm/mach-s3c64xx/mach-crag6410*
 F:      drivers/leds/leds-wm83*.c
+F:      drivers/hwmon/wm83??-hwmon.c
 F:      drivers/input/misc/wm831x-on.c
 F:      drivers/input/touchscreen/wm831x-ts.c
 F:      drivers/input/touchscreen/wm97*.c
diff --git a/Makefile b/Makefile
index 71e6ed21dd15..b61a9638b6fc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 3
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc5
 NAME = Saber-toothed Squirrel
 
 # *DOCUMENTATION*
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 24626b0419ee..a48aecc17eac 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -754,7 +754,7 @@ config ARCH_SA1100
         select ARCH_HAS_CPUFREQ
         select CPU_FREQ
         select GENERIC_CLOCKEVENTS
-        select CLKDEV_LOOKUP
+        select HAVE_CLK
         select HAVE_SCHED_CLOCK
         select TICK_ONESHOT
         select ARCH_REQUIRE_GPIOLIB
@@ -825,7 +825,6 @@ config ARCH_S5PC100
         select HAVE_CLK
         select CLKDEV_LOOKUP
         select CPU_V7
-        select ARM_L1_CACHE_SHIFT_6
         select ARCH_USES_GETTIMEOFFSET
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C_RTC if RTC_CLASS
@@ -842,7 +841,6 @@ config ARCH_S5PV210
         select HAVE_CLK
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
-        select ARM_L1_CACHE_SHIFT_6
         select ARCH_HAS_CPUFREQ
         select GENERIC_CLOCKEVENTS
         select HAVE_SCHED_CLOCK
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 40319d91bb7f..1683bfb9166f 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -160,7 +160,6 @@ machine-$(CONFIG_ARCH_MSM)		:= msm
 machine-$(CONFIG_ARCH_MV78XX0)          := mv78xx0
 machine-$(CONFIG_ARCH_IMX_V4_V5)        := imx
 machine-$(CONFIG_ARCH_IMX_V6_V7)        := imx
-machine-$(CONFIG_ARCH_MX5)              := mx5
 machine-$(CONFIG_ARCH_MXS)              := mxs
 machine-$(CONFIG_ARCH_NETX)             := netx
 machine-$(CONFIG_ARCH_NOMADIK)          := nomadik
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 63d7578856c1..a1dd2ee83753 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -29,6 +29,7 @@
                 compatible = "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
                 interrupt-controller;
+                cpu-offset = <0x8000>;
                 reg = <0x10490000 0x1000>, <0x10480000 0x100>;
         };
 
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index 1a1d7023b69b..825d2957da0b 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -46,11 +46,11 @@
         };
 
         serial@70006200 {
-                status = "disable";
+                clock-frequency = <216000000>;
         };
 
         serial@70006300 {
-                clock-frequency = <216000000>;
+                status = "disable";
         };
 
         serial@70006400 {
@@ -60,7 +60,7 @@
         sdhci@c8000000 {
                 cd-gpios = <&gpio 173 0>; /* gpio PV5 */
                 wp-gpios = <&gpio 57 0>;  /* gpio PH1 */
-                power-gpios = <&gpio 155 0>; /* gpio PT3 */
+                power-gpios = <&gpio 169 0>; /* gpio PV1 */
         };
 
         sdhci@c8000200 {
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index b2dc2dd7f1df..c47d6199b784 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -41,6 +41,7 @@
 
 #include <asm/irq.h>
 #include <asm/exception.h>
+#include <asm/smp_plat.h>
 #include <asm/mach/irq.h>
 #include <asm/hardware/gic.h>
 
@@ -352,11 +353,7 @@ static void __init gic_dist_init(struct gic_chip_data *gic)
         unsigned int gic_irqs = gic->gic_irqs;
         struct irq_domain *domain = &gic->domain;
         void __iomem *base = gic_data_dist_base(gic);
-        u32 cpu = 0;
-
-#ifdef CONFIG_SMP
-        cpu = cpu_logical_map(smp_processor_id());
-#endif
+        u32 cpu = cpu_logical_map(smp_processor_id());
 
         cpumask = 1 << cpu;
         cpumask |= cpumask << 8;
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c
index d1bcd7b13ebc..fb1f1cfce60c 100644
--- a/arch/arm/common/it8152.c
+++ b/arch/arm/common/it8152.c
@@ -320,13 +320,6 @@ err0:
         return -EBUSY;
 }
 
-/*
- * If we set up a device for bus mastering, we need to check the latency
- * timer as we don't have even crappy BIOSes to set it properly.
- * The implementation is from arch/i386/pci/i386.c
- */
-unsigned int pcibios_max_latency = 255;
-
 /* ITE bridge requires setting latency timer to avoid early bus access
    termination by PCI bus master devices
 */
diff --git a/arch/arm/common/pl330.c b/arch/arm/common/pl330.c
index d8e44a43047c..ff3ad2244824 100644
--- a/arch/arm/common/pl330.c
+++ b/arch/arm/common/pl330.c
@@ -1502,12 +1502,13 @@ int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op)
         struct pl330_thread *thrd = ch_id;
         struct pl330_dmac *pl330;
         unsigned long flags;
-        int ret = 0, active = thrd->req_running;
+        int ret = 0, active;
 
         if (!thrd || thrd->free || thrd->dmac->state == DYING)
                 return -EINVAL;
 
         pl330 = thrd->dmac;
+        active = thrd->req_running;
 
         spin_lock_irqsave(&pl330->lock, flags);
 
diff --git a/arch/arm/configs/mx5_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index d0d8dfece37e..3a4fb2e5fc68 100644
--- a/arch/arm/configs/mx5_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -3,6 +3,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_KERNEL_LZO=y
 CONFIG_SYSVIPC=y
 CONFIG_LOG_BUF_SHIFT=18
+CONFIG_CGROUPS=y
 CONFIG_RELAY=y
 CONFIG_EXPERT=y
 # CONFIG_SLUB_DEBUG is not set
@@ -14,20 +15,31 @@ CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_LBDAF is not set
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX5=y
-CONFIG_MACH_MX51_BABBAGE=y
+CONFIG_MACH_MX31LILLY=y
+CONFIG_MACH_MX31LITE=y
+CONFIG_MACH_PCM037=y
+CONFIG_MACH_PCM037_EET=y
+CONFIG_MACH_MX31_3DS=y
+CONFIG_MACH_MX31MOBOARD=y
+CONFIG_MACH_QONG=y
+CONFIG_MACH_ARMADILLO5X0=y
+CONFIG_MACH_KZM_ARM11_01=y
+CONFIG_MACH_PCM043=y
+CONFIG_MACH_MX35_3DS=y
+CONFIG_MACH_EUKREA_CPUIMX35=y
+CONFIG_MACH_VPR200=y
+CONFIG_MACH_IMX51_DT=y
 CONFIG_MACH_MX51_3DS=y
 CONFIG_MACH_EUKREA_CPUIMX51=y
 CONFIG_MACH_EUKREA_CPUIMX51SD=y
 CONFIG_MACH_MX51_EFIKAMX=y
 CONFIG_MACH_MX51_EFIKASB=y
-CONFIG_MACH_MX53_EVK=y
-CONFIG_MACH_MX53_SMD=y
-CONFIG_MACH_MX53_LOCO=y
-CONFIG_MACH_MX53_ARD=y
+CONFIG_MACH_IMX53_DT=y
+CONFIG_SOC_IMX6Q=y
 CONFIG_MXC_PWM=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
@@ -49,7 +61,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=y
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
@@ -68,24 +80,20 @@ CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_ATA=y
 CONFIG_PATA_IMX=y
 CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-CONFIG_BROADCOM_PHY=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_NATIONAL_PHY=y
-CONFIG_STE10XP=y
-CONFIG_LSI_ET1011C_PHY=y
-CONFIG_MICREL_PHY=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+CONFIG_FEC=y
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_SMC91X=y
+CONFIG_SMC911X=y
+CONFIG_SMSC911X=y
+# CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
@@ -124,7 +132,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
-CONFIG_MMC_BLOCK=m
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
@@ -133,6 +140,8 @@ CONFIG_LEDS_CLASS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 CONFIG_RTC_MXC=y
+CONFIG_DMADEVICES=y
+CONFIG_IMX_SDMA=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig
deleted file mode 100644
index cb0717fbb03d..000000000000
--- a/arch/arm/configs/mx3_defconfig
+++ /dev/null
@@ -1,144 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSVIPC=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EXPERT=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_MXC=y
-CONFIG_MACH_MX31ADS_WM1133_EV1=y
-CONFIG_MACH_MX31LILLY=y
-CONFIG_MACH_MX31LITE=y
-CONFIG_MACH_PCM037=y
-CONFIG_MACH_PCM037_EET=y
-CONFIG_MACH_MX31_3DS=y
-CONFIG_MACH_MX31MOBOARD=y
-CONFIG_MACH_QONG=y
-CONFIG_MACH_ARMADILLO5X0=y
-CONFIG_MACH_KZM_ARM11_01=y
-CONFIG_MACH_PCM043=y
-CONFIG_MACH_MX35_3DS=y
-CONFIG_MACH_EUKREA_CPUIMX35=y
-CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_MXC_PWM=y
-CONFIG_ARM_ERRATA_411920=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw ip=off"
-CONFIG_VFP=y
-CONFIG_PM_DEBUG=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# 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 is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_FW_LOADER=m
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_UBI=y
-# CONFIG_BLK_DEV is not set
-CONFIG_MISC_DEVICES=y
-CONFIG_EEPROM_AT24=y
-CONFIG_NETDEVICES=y
-CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_SMSC911X=y
-CONFIG_DNET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_IMX=y
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=m
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_W1=y
-CONFIG_W1_MASTER_MXC=y
-CONFIG_W1_SLAVE_THERM=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_IMX2_WDT=y
-CONFIG_MFD_WM8350_I2C=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_WM8350=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_VIDEO_DEV=y
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_SOC_CAMERA=y
-CONFIG_SOC_CAMERA_MT9M001=y
-CONFIG_SOC_CAMERA_MT9M111=y
-CONFIG_SOC_CAMERA_MT9T031=y
-CONFIG_SOC_CAMERA_MT9V022=y
-CONFIG_SOC_CAMERA_TW9910=y
-CONFIG_SOC_CAMERA_OV772X=y
-CONFIG_VIDEO_MX3=y
-# CONFIG_RADIO_ADAPTERS is not set
-CONFIG_FB=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SPI is not set
-CONFIG_SND_SOC=y
-CONFIG_SND_IMX_SOC=y
-CONFIG_SND_MXC_SOC_WM1133_EV1=y
-CONFIG_SND_SOC_PHYCORE_AC97=y
-CONFIG_SND_SOC_EUKREA_TLV320=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_GADGET=m
-CONFIG_USB_FSL_USB2=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_ULPI=y
-CONFIG_MMC=y
-CONFIG_MMC_MXC=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_MXC=y
-CONFIG_DMADEVICES=y
-# CONFIG_DNOTIFY is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index b6e65dedfd71..23371b17b23e 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -137,6 +137,11 @@
         disable_irq
         .endm
 
+        .macro  save_and_disable_irqs_notrace, oldcpsr
+        mrs     \oldcpsr, cpsr
+        disable_irq_notrace
+        .endm
+
 /*
  * Restore interrupt state previously stored in a register.  We don't
  * guarantee that this will preserve the flags.
@@ -237,7 +242,7 @@
  */
 #ifdef CONFIG_THUMB2_KERNEL
 
-        .macro  usraccoff, instr, reg, ptr, inc, off, cond, abort, t=T()
+        .macro  usraccoff, instr, reg, ptr, inc, off, cond, abort, t=TUSER()
 9999:
         .if     \inc == 1
         \instr\cond\()b\()\t\().w \reg, [\ptr, #\off]
@@ -277,7 +282,7 @@
 
 #else   /* !CONFIG_THUMB2_KERNEL */
 
-        .macro  usracc, instr, reg, ptr, inc, cond, rept, abort, t=T()
+        .macro  usracc, instr, reg, ptr, inc, cond, rept, abort, t=TUSER()
         .rept   \rept
 9999:
         .if     \inc == 1
diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
index af18ceaacf5d..b5dc173d336f 100644
--- a/arch/arm/include/asm/domain.h
+++ b/arch/arm/include/asm/domain.h
@@ -83,9 +83,9 @@
  * instructions (inline assembly)
  */
 #ifdef CONFIG_CPU_USE_DOMAINS
-#define T(instr)        #instr "t"
+#define TUSER(instr)    #instr "t"
 #else
-#define T(instr)        #instr
+#define TUSER(instr)    #instr
 #endif
 
 #else /* __ASSEMBLY__ */
@@ -95,9 +95,9 @@
  * instructions
  */
 #ifdef CONFIG_CPU_USE_DOMAINS
-#define T(instr)        instr ## t
+#define TUSER(instr)    instr ## t
 #else
-#define T(instr)        instr
+#define TUSER(instr)    instr
 #endif
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
index 253cc86318bf..7be54690aeec 100644
--- a/arch/arm/include/asm/futex.h
+++ b/arch/arm/include/asm/futex.h
@@ -75,9 +75,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
 
 #define __futex_atomic_op(insn, ret, oldval, tmp, uaddr, oparg) \
         __asm__ __volatile__(                                   \
-        "1:     " T(ldr) "      %1, [%3]\n"                     \
+        "1:     " TUSER(ldr) "  %1, [%3]\n"                     \
         "       " insn "\n"                                     \
-        "2:     " T(str) "      %0, [%3]\n"                     \
+        "2:     " TUSER(str) "  %0, [%3]\n"                     \
         "       mov     %0, #0\n"                               \
         __futex_atomic_ex_table("%5")                           \
         : "=&r" (ret), "=&r" (oldval), "=&r" (tmp)              \
@@ -95,10 +95,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
                 return -EFAULT;
 
         __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
-        "1:     " T(ldr) "      %1, [%4]\n"
+        "1:     " TUSER(ldr) "  %1, [%4]\n"
         "       teq     %1, %2\n"
         "       it      eq      @ explicit IT needed for the 2b label\n"
-        "2:     " T(streq) "    %3, [%4]\n"
+        "2:     " TUSER(streq) "        %3, [%4]\n"
         __futex_atomic_ex_table("%5")
         : "+r" (ret), "=&r" (val)
         : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
diff --git a/arch/arm/include/asm/hardware/pl330.h b/arch/arm/include/asm/hardware/pl330.h
index 575fa8186ca0..c1821385abfa 100644
--- a/arch/arm/include/asm/hardware/pl330.h
+++ b/arch/arm/include/asm/hardware/pl330.h
@@ -41,7 +41,7 @@ enum pl330_dstcachectrl {
         DCCTRL1, /* Bufferable only */
         DCCTRL2, /* Cacheable, but do not allocate */
         DCCTRL3, /* Cacheable and bufferable, but do not allocate */
-        DINVALID1 = 8,
+        DINVALID1,              /* AWCACHE = 0x1000 */
         DINVALID2,
         DCCTRL6, /* Cacheable write-through, allocate on writes only */
         DCCTRL7, /* Cacheable write-back, allocate on writes only */
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h
index ce280b8d613c..cb8d638924fd 100644
--- a/arch/arm/include/asm/processor.h
+++ b/arch/arm/include/asm/processor.h
@@ -22,6 +22,7 @@
 #include <asm/hw_breakpoint.h>
 #include <asm/ptrace.h>
 #include <asm/types.h>
+#include <asm/system.h>
 
 #ifdef __KERNEL__
 #define STACK_TOP       ((current->personality & ADDR_LIMIT_32BIT) ? \
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
index 1e5717afc4ac..ae29293270a3 100644
--- a/arch/arm/include/asm/smp.h
+++ b/arch/arm/include/asm/smp.h
@@ -71,12 +71,6 @@ extern void platform_secondary_init(unsigned int cpu);
 extern void platform_smp_prepare_cpus(unsigned int);
 
 /*
- * Logical CPU mapping.
- */
-extern int __cpu_logical_map[NR_CPUS];
-#define cpu_logical_map(cpu)    __cpu_logical_map[cpu]
-
-/*
  * Initial data for bringing up a secondary CPU.
  */
 struct secondary_data {
diff --git a/arch/arm/include/asm/smp_plat.h b/arch/arm/include/asm/smp_plat.h
index f24c1b9e211d..558d6c80aca9 100644
--- a/arch/arm/include/asm/smp_plat.h
+++ b/arch/arm/include/asm/smp_plat.h
@@ -43,4 +43,10 @@ static inline int cache_ops_need_broadcast(void)
 }
 #endif
 
+/*
+ * Logical CPU mapping.
+ */
+extern int __cpu_logical_map[];
+#define cpu_logical_map(cpu)    __cpu_logical_map[cpu]
+
 #endif
diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h
index 5d3ed7e38561..314d4664eae7 100644
--- a/arch/arm/include/asm/tlb.h
+++ b/arch/arm/include/asm/tlb.h
@@ -198,7 +198,15 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,
         unsigned long addr)
 {
         pgtable_page_dtor(pte);
-        tlb_add_flush(tlb, addr);
+
+        /*
+         * With the classic ARM MMU, a pte page has two corresponding pmd
+         * entries, each covering 1MB.
+         */
+        addr &= PMD_MASK;
+        tlb_add_flush(tlb, addr + SZ_1M - PAGE_SIZE);
+        tlb_add_flush(tlb, addr + SZ_1M);
+
         tlb_remove_page(tlb, pte);
 }
 
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
index b293616a1a1a..2958976d867b 100644
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@ -227,7 +227,7 @@ do {									\
 
 #define __get_user_asm_byte(x,addr,err)                         \
         __asm__ __volatile__(                                   \
-        "1:     " T(ldrb) "     %1,[%2],#0\n"                   \
+        "1:     " TUSER(ldrb) " %1,[%2],#0\n"                   \
         "2:\n"                                                  \
         "       .pushsection .fixup,\"ax\"\n"                   \
         "       .align  2\n"                                    \
@@ -263,7 +263,7 @@ do {									\
 
 #define __get_user_asm_word(x,addr,err)                         \
         __asm__ __volatile__(                                   \
-        "1:     " T(ldr) "      %1,[%2],#0\n"                   \
+        "1:     " TUSER(ldr) "  %1,[%2],#0\n"                   \
         "2:\n"                                                  \
         "       .pushsection .fixup,\"ax\"\n"                   \
         "       .align  2\n"                                    \
@@ -308,7 +308,7 @@ do {									\
 
 #define __put_user_asm_byte(x,__pu_addr,err)                    \
         __asm__ __volatile__(                                   \
-        "1:     " T(strb) "     %1,[%2],#0\n"                   \
+        "1:     " TUSER(strb) " %1,[%2],#0\n"                   \
         "2:\n"                                                  \
         "       .pushsection .fixup,\"ax\"\n"                   \
         "       .align  2\n"                                    \
@@ -341,7 +341,7 @@ do {									\
 
 #define __put_user_asm_word(x,__pu_addr,err)                    \
         __asm__ __volatile__(                                   \
-        "1:     " T(str) "      %1,[%2],#0\n"                   \
+        "1:     " TUSER(str) "  %1,[%2],#0\n"                   \
         "2:\n"                                                  \
         "       .pushsection .fixup,\"ax\"\n"                   \
         "       .align  2\n"                                    \
@@ -366,10 +366,10 @@ do {									\
 
 #define __put_user_asm_dword(x,__pu_addr,err)                   \
         __asm__ __volatile__(                                   \
- ARM(   "1:     " T(str) "      " __reg_oper1 ", [%1], #4\n"    )       \
- ARM(   "2:     " T(str) "      " __reg_oper0 ", [%1]\n"        )       \
- THUMB( "1:     " T(str) "      " __reg_oper1 ", [%1]\n"        )       \
- THUMB( "2:     " T(str) "      " __reg_oper0 ", [%1, #4]\n"    )       \
+ ARM(   "1:     " TUSER(str) "  " __reg_oper1 ", [%1], #4\n"    ) \
+ ARM(   "2:     " TUSER(str) "  " __reg_oper0 ", [%1]\n"        ) \
+ THUMB( "1:     " TUSER(str) "  " __reg_oper1 ", [%1]\n"        ) \
+ THUMB( "2:     " TUSER(str) "  " __reg_oper0 ", [%1, #4]\n"    ) \
         "3:\n"                                                  \
         "       .pushsection .fixup,\"ax\"\n"                   \
         "       .align  2\n"                                    \
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 3a456c6c7005..be16a48007b4 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -790,7 +790,7 @@ __kuser_cmpxchg64:				@ 0xffff0f60
         smp_dmb arm
         rsbs    r0, r3, #0                      @ set returned val and C flag
         ldmfd   sp!, {r4, r5, r6, r7}
-        bx      lr
+        usr_ret lr
 
 #elif !defined(CONFIG_SMP)
 
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 520889cf1b5b..9fd0ba90c1d2 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -149,6 +149,11 @@ ENDPROC(ret_from_fork)
 #endif
 #endif
 
+.macro mcount_adjust_addr rd, rn
+        bic     \rd, \rn, #1            @ clear the Thumb bit if present
+        sub     \rd, \rd, #MCOUNT_INSN_SIZE
+.endm
+
 .macro __mcount suffix
         mcount_enter
         ldr     r0, =ftrace_trace_function
@@ -173,8 +178,7 @@ ENDPROC(ret_from_fork)
         mcount_exit
 
 1:      mcount_get_lr   r1                      @ lr of instrumented func
-        mov     r0, lr                          @ instrumented function
-        sub     r0, r0, #MCOUNT_INSN_SIZE
+        mcount_adjust_addr      r0, lr          @ instrumented function
         adr     lr, BSYM(2f)
         mov     pc, r2
 2:      mcount_exit
@@ -184,8 +188,7 @@ ENDPROC(ret_from_fork)
         mcount_enter
 
         mcount_get_lr   r1                      @ lr of instrumented func
-        mov     r0, lr                          @ instrumented function
-        sub     r0, r0, #MCOUNT_INSN_SIZE
+        mcount_adjust_addr      r0, lr          @ instrumented function
 
         .globl ftrace_call\suffix
 ftrace_call\suffix:
@@ -205,11 +208,11 @@ ftrace_graph_call\suffix:
 #ifdef CONFIG_DYNAMIC_FTRACE
         @ called from __ftrace_caller, saved in mcount_enter
         ldr     r1, [sp, #16]           @ instrumented routine (func)
+        mcount_adjust_addr      r1, r1
 #else
         @ called from __mcount, untouched in lr
-        mov     r1, lr                  @ instrumented routine (func)
+        mcount_adjust_addr      r1, lr  @ instrumented routine (func)
 #endif
-        sub     r1, r1, #MCOUNT_INSN_SIZE
         mov     r2, fp                  @ frame pointer
         bl      prepare_ftrace_return
         mcount_exit
diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c
index 460bbbb6b885..6933244c68f9 100644
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
@@ -469,6 +469,20 @@ static const unsigned armv7_a5_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
                         [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
                 },
         },
+        [C(NODE)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+        },
 };
 
 /*
@@ -579,6 +593,20 @@ static const unsigned armv7_a15_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
                         [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
                 },
         },
+        [C(NODE)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+        },
 };
 
 /*
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index e1d5e1929fbd..ede6443c34d9 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -23,6 +23,7 @@
 #include <linux/perf_event.h>
 #include <linux/hw_breakpoint.h>
 #include <linux/regset.h>
+#include <linux/audit.h>
 
 #include <asm/pgtable.h>
 #include <asm/system.h>
@@ -699,10 +700,13 @@ static int vfp_set(struct task_struct *target,
 {
         int ret;
         struct thread_info *thread = task_thread_info(target);
-        struct vfp_hard_struct new_vfp = thread->vfpstate.hard;
+        struct vfp_hard_struct new_vfp;
         const size_t user_fpregs_offset = offsetof(struct user_vfp, fpregs);
         const size_t user_fpscr_offset = offsetof(struct user_vfp, fpscr);
 
+        vfp_sync_hwstate(thread);
+        new_vfp = thread->vfpstate.hard;
+
         ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
                                   &new_vfp.fpregs,
                                   user_fpregs_offset,
@@ -723,9 +727,8 @@ static int vfp_set(struct task_struct *target,
         if (ret)
                 return ret;
 
-        vfp_sync_hwstate(thread);
-        thread->vfpstate.hard = new_vfp;
         vfp_flush_hwstate(thread);
+        thread->vfpstate.hard = new_vfp;
 
         return 0;
 }
@@ -902,6 +905,12 @@ long arch_ptrace(struct task_struct *child, long request,
         return ret;
 }
 
+#ifdef __ARMEB__
+#define AUDIT_ARCH_NR AUDIT_ARCH_ARMEB
+#else
+#define AUDIT_ARCH_NR AUDIT_ARCH_ARM
+#endif
+
 asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
 {
         unsigned long ip;
@@ -916,7 +925,7 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
         if (!ip)
                 audit_syscall_exit(regs);
         else
-                audit_syscall_entry(AUDIT_ARCH_ARMEB, scno, regs->ARM_r0,
+                audit_syscall_entry(AUDIT_ARCH_NR, scno, regs->ARM_r0,
                                     regs->ARM_r1, regs->ARM_r2, regs->ARM_r3);
 
         if (!test_thread_flag(TIF_SYSCALL_TRACE))
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 129fbd55bde8..a255c39612ca 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -21,7 +21,6 @@
 #include <linux/init.h>
 #include <linux/kexec.h>
 #include <linux/of_fdt.h>
-#include <linux/crash_dump.h>
 #include <linux/root_dev.h>
 #include <linux/cpu.h>
 #include <linux/interrupt.h>
@@ -160,7 +159,7 @@ static struct resource mem_res[] = {
                 .flags = IORESOURCE_MEM
         },
         {
-                .name = "Kernel text",
+                .name = "Kernel code",
                 .start = 0,
                 .end = 0,
                 .flags = IORESOURCE_MEM
@@ -427,6 +426,20 @@ void cpu_init(void)
             : "r14");
 }
 
+int __cpu_logical_map[NR_CPUS];
+
+void __init smp_setup_processor_id(void)
+{
+        int i;
+        u32 cpu = is_smp() ? read_cpuid_mpidr() & 0xff : 0;
+
+        cpu_logical_map(0) = cpu;
+        for (i = 1; i < NR_CPUS; ++i)
+                cpu_logical_map(i) = i == cpu ? 0 : i;
+
+        printk(KERN_INFO "Booting Linux on physical CPU %d\n", cpu);
+}
+
 static void __init setup_processor(void)
 {
         struct proc_info_list *list;
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 0340224cf73c..9e617bd4a146 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -227,6 +227,8 @@ static int restore_vfp_context(struct vfp_sigframe __user *frame)
         if (magic != VFP_MAGIC || size != VFP_STORAGE_SIZE)
                 return -EINVAL;
 
+        vfp_flush_hwstate(thread);
+
         /*
          * Copy the floating point registers. There can be unused
          * registers see asm/hwcap.h for details.
@@ -251,9 +253,6 @@ static int restore_vfp_context(struct vfp_sigframe __user *frame)
         __get_user_error(h->fpinst, &frame->ufp_exc.fpinst, err);
         __get_user_error(h->fpinst2, &frame->ufp_exc.fpinst2, err);
 
-        if (!err)
-                vfp_flush_hwstate(thread);
-
         return err ? -EFAULT : 0;
 }
 
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 57db122a4f62..cdeb727527d3 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -233,20 +233,6 @@ void __ref cpu_die(void)
 }
 #endif /* CONFIG_HOTPLUG_CPU */
 
-int __cpu_logical_map[NR_CPUS];
-
-void __init smp_setup_processor_id(void)
-{
-        int i;
-        u32 cpu = is_smp() ? read_cpuid_mpidr() & 0xff : 0;
-
-        cpu_logical_map(0) = cpu;
-        for (i = 1; i < NR_CPUS; ++i)
-                cpu_logical_map(i) = i == cpu ? 0 : i;
-
-        printk(KERN_INFO "Booting Linux on physical CPU %d\n", cpu);
-}
-
 /*
  * Called by both boot and secondaries to move global data into
  * per-processor storage.
@@ -443,9 +429,7 @@ static DEFINE_PER_CPU(struct clock_event_device, percpu_clockevent);
 static void ipi_timer(void)
 {
         struct clock_event_device *evt = &__get_cpu_var(percpu_clockevent);
-        irq_enter();
         evt->event_handler(evt);
-        irq_exit();
 }
 
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
@@ -548,7 +532,9 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
 
         switch (ipinr) {
         case IPI_TIMER:
+                irq_enter();
                 ipi_timer();
+                irq_exit();
                 break;
 
         case IPI_RESCHEDULE:
@@ -556,15 +542,21 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
                 break;
 
         case IPI_CALL_FUNC:
+                irq_enter();
                 generic_smp_call_function_interrupt();
+                irq_exit();
                 break;
 
         case IPI_CALL_FUNC_SINGLE:
+                irq_enter();
                 generic_smp_call_function_single_interrupt();
+                irq_exit();
                 break;
 
         case IPI_CPU_STOP:
+                irq_enter();
                 ipi_cpu_stop(cpu);
+                irq_exit();
                 break;
 
         default:
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index c8e938553d47..7a79b24597b2 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -129,7 +129,7 @@ static struct notifier_block twd_cpufreq_nb = {
 
 static int twd_cpufreq_init(void)
 {
-        if (!IS_ERR(twd_clk))
+        if (twd_evt && *__this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
                 return cpufreq_register_notifier(&twd_cpufreq_nb,
                         CPUFREQ_TRANSITION_NOTIFIER);
 
@@ -252,6 +252,8 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk)
         else
                 twd_calibrate_rate();
 
+        __raw_writel(0, twd_base + TWD_TIMER_CONTROL);
+
         clk->name = "local_timer";
         clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT |
                         CLOCK_EVT_FEAT_C3STOP;
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 99a572702509..f84dfe67724f 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -266,6 +266,7 @@ void die(const char *str, struct pt_regs *regs, int err)
 {
         struct thread_info *thread = current_thread_info();
         int ret;
+        enum bug_trap_type bug_type = BUG_TRAP_TYPE_NONE;
 
         oops_enter();
 
@@ -273,7 +274,9 @@ void die(const char *str, struct pt_regs *regs, int err)
         console_verbose();
         bust_spinlocks(1);
         if (!user_mode(regs))
-                report_bug(regs->ARM_pc, regs);
+                bug_type = report_bug(regs->ARM_pc, regs);
+        if (bug_type != BUG_TRAP_TYPE_NONE)
+                str = "Oops - BUG";
         ret = __die(str, err, thread, regs);
 
         if (regs && kexec_should_crash(thread->task))
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index f76e75548670..43a31fb06318 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -4,11 +4,13 @@
  */
 
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/cache.h>
 #include <asm/thread_info.h>
 #include <asm/memory.h>
 #include <asm/page.h>
         
 #define PROC_INFO                                                       \
+        . = ALIGN(4);                                                   \
         VMLINUX_SYMBOL(__proc_info_begin) = .;                          \
         *(.proc.info.init)                                              \
         VMLINUX_SYMBOL(__proc_info_end) = .;
@@ -181,7 +183,7 @@ SECTIONS
         }
 #endif
 
-        PERCPU_SECTION(32)
+        PERCPU_SECTION(L1_CACHE_BYTES)
 
 #ifdef CONFIG_XIP_KERNEL
         __data_loc = ALIGN(4);          /* location in binary */
@@ -212,13 +214,13 @@ SECTIONS
 #endif
 
                 NOSAVE_DATA
-                CACHELINE_ALIGNED_DATA(32)
-                READ_MOSTLY_DATA(32)
+                CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
+                READ_MOSTLY_DATA(L1_CACHE_BYTES)
 
                 /*
                  * The exception fixup table (might need resorting at runtime)
                  */
-                . = ALIGN(32);
+                . = ALIGN(4);
                 __start___ex_table = .;
 #ifdef CONFIG_MMU
                 *(__ex_table)
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index 1b049cd7a49a..11093a7c3e32 100644
--- a/arch/arm/lib/getuser.S
+++ b/arch/arm/lib/getuser.S
@@ -31,18 +31,18 @@
 #include <asm/domain.h>
 
 ENTRY(__get_user_1)
-1:      T(ldrb) r2, [r0]
+1: TUSER(ldrb)  r2, [r0]
         mov     r0, #0
         mov     pc, lr
 ENDPROC(__get_user_1)
 
 ENTRY(__get_user_2)
 #ifdef CONFIG_THUMB2_KERNEL
-2:      T(ldrb) r2, [r0]
-3:      T(ldrb) r3, [r0, #1]
+2: TUSER(ldrb)  r2, [r0]
+3: TUSER(ldrb)  r3, [r0, #1]
 #else
-2:      T(ldrb) r2, [r0], #1
-3:      T(ldrb) r3, [r0]
+2: TUSER(ldrb)  r2, [r0], #1
+3: TUSER(ldrb)  r3, [r0]
 #endif
 #ifndef __ARMEB__
         orr     r2, r2, r3, lsl #8
@@ -54,7 +54,7 @@ ENTRY(__get_user_2)
 ENDPROC(__get_user_2)
 
 ENTRY(__get_user_4)
-4:      T(ldr)  r2, [r0]
+4: TUSER(ldr)   r2, [r0]
         mov     r0, #0
         mov     pc, lr
 ENDPROC(__get_user_4)
diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S
index c023fc11e86c..7db25990c589 100644
--- a/arch/arm/lib/putuser.S
+++ b/arch/arm/lib/putuser.S
@@ -31,7 +31,7 @@
 #include <asm/domain.h>
 
 ENTRY(__put_user_1)
-1:      T(strb) r2, [r0]
+1: TUSER(strb)  r2, [r0]
         mov     r0, #0
         mov     pc, lr
 ENDPROC(__put_user_1)
@@ -40,19 +40,19 @@ ENTRY(__put_user_2)
         mov     ip, r2, lsr #8
 #ifdef CONFIG_THUMB2_KERNEL
 #ifndef __ARMEB__
-2:      T(strb) r2, [r0]
-3:      T(strb) ip, [r0, #1]
+2: TUSER(strb)  r2, [r0]
+3: TUSER(strb)  ip, [r0, #1]
 #else
-2:      T(strb) ip, [r0]
-3:      T(strb) r2, [r0, #1]
+2: TUSER(strb)  ip, [r0]
+3: TUSER(strb)  r2, [r0, #1]
 #endif
 #else   /* !CONFIG_THUMB2_KERNEL */
 #ifndef __ARMEB__
-2:      T(strb) r2, [r0], #1
-3:      T(strb) ip, [r0]
+2: TUSER(strb)  r2, [r0], #1
+3: TUSER(strb)  ip, [r0]
 #else
-2:      T(strb) ip, [r0], #1
-3:      T(strb) r2, [r0]
+2: TUSER(strb)  ip, [r0], #1
+3: TUSER(strb)  r2, [r0]
 #endif
 #endif  /* CONFIG_THUMB2_KERNEL */
         mov     r0, #0
@@ -60,18 +60,18 @@ ENTRY(__put_user_2)
 ENDPROC(__put_user_2)
 
 ENTRY(__put_user_4)
-4:      T(str)  r2, [r0]
+4: TUSER(str)   r2, [r0]
         mov     r0, #0
         mov     pc, lr
 ENDPROC(__put_user_4)
 
 ENTRY(__put_user_8)
 #ifdef CONFIG_THUMB2_KERNEL
-5:      T(str)  r2, [r0]
-6:      T(str)  r3, [r0, #4]
+5: TUSER(str)   r2, [r0]
+6: TUSER(str)   r3, [r0, #4]
 #else
-5:      T(str)  r2, [r0], #4
-6:      T(str)  r3, [r0]
+5: TUSER(str)   r2, [r0], #4
+6: TUSER(str)   r3, [r0]
 #endif
         mov     r0, #0
         mov     pc, lr
diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
index d0ece2aeb70d..5c908b1cb8ed 100644
--- a/arch/arm/lib/uaccess.S
+++ b/arch/arm/lib/uaccess.S
@@ -32,11 +32,11 @@
                 rsb     ip, ip, #4
                 cmp     ip, #2
                 ldrb    r3, [r1], #1
-USER(           T(strb) r3, [r0], #1)                   @ May fault
+USER(   TUSER(  strb)   r3, [r0], #1)                   @ May fault
                 ldrgeb  r3, [r1], #1
-USER(           T(strgeb) r3, [r0], #1)                 @ May fault
+USER(   TUSER(  strgeb) r3, [r0], #1)                   @ May fault
                 ldrgtb  r3, [r1], #1
-USER(           T(strgtb) r3, [r0], #1)                 @ May fault
+USER(   TUSER(  strgtb) r3, [r0], #1)                   @ May fault
                 sub     r2, r2, ip
                 b       .Lc2u_dest_aligned
 
@@ -59,7 +59,7 @@ ENTRY(__copy_to_user)
                 addmi   ip, r2, #4
                 bmi     .Lc2u_0nowords
                 ldr     r3, [r1], #4
-USER(           T(str)  r3, [r0], #4)                   @ May fault
+USER(   TUSER(  str)    r3, [r0], #4)                   @ May fault
                 mov     ip, r0, lsl #32 - PAGE_SHIFT    @ On each page, use a ld/st??t instruction
                 rsb     ip, ip, #0
                 movs    ip, ip, lsr #32 - PAGE_SHIFT
@@ -88,18 +88,18 @@ USER(		T(str)	r3, [r0], #4)			@ May fault
                 stmneia r0!, {r3 - r4}                  @ Shouldnt fault
                 tst     ip, #4
                 ldrne   r3, [r1], #4
-                T(strne) r3, [r0], #4                   @ Shouldnt fault
+        TUSER(  strne) r3, [r0], #4                     @ Shouldnt fault
                 ands    ip, ip, #3
                 beq     .Lc2u_0fupi
 .Lc2u_0nowords: teq     ip, #0
                 beq     .Lc2u_finished
 .Lc2u_nowords:  cmp     ip, #2
                 ldrb    r3, [r1], #1
-USER(           T(strb) r3, [r0], #1)                   @ May fault
+USER(   TUSER(  strb)   r3, [r0], #1)                   @ May fault
                 ldrgeb  r3, [r1], #1
-USER(           T(strgeb) r3, [r0], #1)                 @ May fault
+USER(   TUSER(  strgeb) r3, [r0], #1)                   @ May fault
                 ldrgtb  r3, [r1], #1
-USER(           T(strgtb) r3, [r0], #1)                 @ May fault
+USER(   TUSER(  strgtb) r3, [r0], #1)                   @ May fault
                 b       .Lc2u_finished
 
 .Lc2u_not_enough:
@@ -120,7 +120,7 @@ USER(		T(strgtb) r3, [r0], #1)			@ May fault
                 mov     r3, r7, pull #8
                 ldr     r7, [r1], #4
                 orr     r3, r3, r7, push #24
-USER(           T(str)  r3, [r0], #4)                   @ May fault
+USER(   TUSER(  str)    r3, [r0], #4)                   @ May fault
                 mov     ip, r0, lsl #32 - PAGE_SHIFT
                 rsb     ip, ip, #0
                 movs    ip, ip, lsr #32 - PAGE_SHIFT
@@ -155,18 +155,18 @@ USER(		T(str)	r3, [r0], #4)			@ May fault
                 movne   r3, r7, pull #8
                 ldrne   r7, [r1], #4
                 orrne   r3, r3, r7, push #24
-                T(strne) r3, [r0], #4                   @ Shouldnt fault
+        TUSER(  strne) r3, [r0], #4                     @ Shouldnt fault
                 ands    ip, ip, #3
                 beq     .Lc2u_1fupi
 .Lc2u_1nowords: mov     r3, r7, get_byte_1
                 teq     ip, #0
                 beq     .Lc2u_finished
                 cmp     ip, #2
-USER(           T(strb) r3, [r0], #1)                   @ May fault
+USER(   TUSER(  strb)   r3, [r0], #1)                   @ May fault
                 movge   r3, r7, get_byte_2
-USER(           T(strgeb) r3, [r0], #1)                 @ May fault
+USER(   TUSER(  strgeb) r3, [r0], #1)                   @ May fault
                 movgt   r3, r7, get_byte_3
-USER(           T(strgtb) r3, [r0], #1)                 @ May fault
+USER(   TUSER(  strgtb) r3, [r0], #1)                   @ May fault
                 b       .Lc2u_finished
 
 .Lc2u_2fupi:    subs    r2, r2, #4
@@ -175,7 +175,7 @@ USER(		T(strgtb) r3, [r0], #1)			@ May fault
                 mov     r3, r7, pull #16
                 ldr     r7, [r1], #4
                 orr     r3, r3, r7, push #16
-USER(           T(str)  r3, [r0], #4)                   @ May fault
+USER(   TUSER(  str)    r3, [r0], #4)                   @ May fault
                 mov     ip, r0, lsl #32 - PAGE_SHIFT
                 rsb     ip, ip, #0
                 movs    ip, ip, lsr #32 - PAGE_SHIFT
@@ -210,18 +210,18 @@ USER(		T(str)	r3, [r0], #4)			@ May fault
                 movne   r3, r7, pull #16
                 ldrne   r7, [r1], #4
                 orrne   r3, r3, r7, push #16
-                T(strne) r3, [r0], #4                   @ Shouldnt fault
+        TUSER(  strne) r3, [r0], #4                     @ Shouldnt fault
                 ands    ip, ip, #3
                 beq     .Lc2u_2fupi
 .Lc2u_2nowords: mov     r3, r7, get_byte_2
                 teq     ip, #0
                 beq     .Lc2u_finished
                 cmp     ip, #2
-USER(           T(strb) r3, [r0], #1)                   @ May fault
+USER(   TUSER(  strb)   r3, [r0], #1)                   @ May fault
                 movge   r3, r7, get_byte_3
-USER(           T(strgeb) r3, [r0], #1)                 @ May fault
+USER(   TUSER(  strgeb) r3, [r0], #1)                   @ May fault
                 ldrgtb  r3, [r1], #0
-USER(           T(strgtb) r3, [r0], #1)                 @ May fault
+USER(   TUSER(  strgtb) r3, [r0], #1)                   @ May fault
                 b       .Lc2u_finished
 
 .Lc2u_3fupi:    subs    r2, r2, #4
@@ -230,7 +230,7 @@ USER(		T(strgtb) r3, [r0], #1)			@ May fault
                 mov     r3, r7, pull #24
                 ldr     r7, [r1], #4
                 orr     r3, r3, r7, push #8
-USER(           T(str)  r3, [r0], #4)                   @ May fault
+USER(   TUSER(  str)    r3, [r0], #4)                   @ May fault
                 mov     ip, r0, lsl #32 - PAGE_SHIFT
                 rsb     ip, ip, #0
                 movs    ip, ip, lsr #32 - PAGE_SHIFT
@@ -265,18 +265,18 @@ USER(		T(str)	r3, [r0], #4)			@ May fault
                 movne   r3, r7, pull #24
                 ldrne   r7, [r1], #4
                 orrne   r3, r3, r7, push #8
-                T(strne) r3, [r0], #4                   @ Shouldnt fault
+        TUSER(  strne) r3, [r0], #4                     @ Shouldnt fault
                 ands    ip, ip, #3
                 beq     .Lc2u_3fupi
 .Lc2u_3nowords: mov     r3, r7, get_byte_3
                 teq     ip, #0
                 beq     .Lc2u_finished
                 cmp     ip, #2
-USER(           T(strb) r3, [r0], #1)                   @ May fault
+USER(   TUSER(  strb)   r3, [r0], #1)                   @ May fault
                 ldrgeb  r3, [r1], #1
-USER(           T(strgeb) r3, [r0], #1)                 @ May fault
+USER(   TUSER(  strgeb) r3, [r0], #1)                   @ May fault
                 ldrgtb  r3, [r1], #0
-USER(           T(strgtb) r3, [r0], #1)                 @ May fault
+USER(   TUSER(  strgtb) r3, [r0], #1)                   @ May fault
                 b       .Lc2u_finished
 ENDPROC(__copy_to_user)
 
@@ -295,11 +295,11 @@ ENDPROC(__copy_to_user)
 .Lcfu_dest_not_aligned:
                 rsb     ip, ip, #4
                 cmp     ip, #2
-USER(           T(ldrb) r3, [r1], #1)                   @ May fault
+USER(   TUSER(  ldrb)   r3, [r1], #1)                   @ May fault
                 strb    r3, [r0], #1
-USER(           T(ldrgeb) r3, [r1], #1)                 @ May fault
+USER(   TUSER(  ldrgeb) r3, [r1], #1)                   @ May fault
                 strgeb  r3, [r0], #1
-USER(           T(ldrgtb) r3, [r1], #1)                 @ May fault
+USER(   TUSER(  ldrgtb) r3, [r1], #1)                   @ May fault
                 strgtb  r3, [r0], #1
                 sub     r2, r2, ip
                 b       .Lcfu_dest_aligned
@@ -322,7 +322,7 @@ ENTRY(__copy_from_user)
 .Lcfu_0fupi:    subs    r2, r2, #4
                 addmi   ip, r2, #4
                 bmi     .Lcfu_0nowords
-USER(           T(ldr)  r3, [r1], #4)
+USER(   TUSER(  ldr)    r3, [r1], #4)
                 str     r3, [r0], #4
                 mov     ip, r1, lsl #32 - PAGE_SHIFT    @ On each page, use a ld/st??t instruction
                 rsb     ip, ip, #0
@@ -351,18 +351,18 @@ USER(		T(ldr)	r3, [r1], #4)
                 ldmneia r1!, {r3 - r4}                  @ Shouldnt fault
                 stmneia r0!, {r3 - r4}
                 tst     ip, #4
-                T(ldrne) r3, [r1], #4                   @ Shouldnt fault
+        TUSER(  ldrne) r3, [r1], #4                     @ Shouldnt fault
                 strne   r3, [r0], #4
                 ands    ip, ip, #3
                 beq     .Lcfu_0fupi
 .Lcfu_0nowords: teq     ip, #0
                 beq     .Lcfu_finished
 .Lcfu_nowords:  cmp     ip, #2
-USER(           T(ldrb) r3, [r1], #1)                   @ May fault
+USER(   TUSER(  ldrb)   r3, [r1], #1)                   @ May fault
                 strb    r3, [r0], #1
-USER(           T(ldrgeb) r3, [r1], #1)                 @ May fault
+USER(   TUSER(  ldrgeb) r3, [r1], #1)                   @ May fault
                 strgeb  r3, [r0], #1
-USER(           T(ldrgtb) r3, [r1], #1)                 @ May fault
+USER(   TUSER(  ldrgtb) r3, [r1], #1)                   @ May fault
                 strgtb  r3, [r0], #1
                 b       .Lcfu_finished
 
@@ -375,7 +375,7 @@ USER(		T(ldrgtb) r3, [r1], #1)			@ May fault
 
 .Lcfu_src_not_aligned:
                 bic     r1, r1, #3
-USER(           T(ldr)  r7, [r1], #4)                   @ May fault
+USER(   TUSER(  ldr)    r7, [r1], #4)                   @ May fault
                 cmp     ip, #2
                 bgt     .Lcfu_3fupi
                 beq     .Lcfu_2fupi
@@ -383,7 +383,7 @@ USER(		T(ldr)	r7, [r1], #4)			@ May fault
                 addmi   ip, r2, #4
                 bmi     .Lcfu_1nowords
                 mov     r3, r7, pull #8
-USER(           T(ldr)  r7, [r1], #4)                   @ May fault
+USER(   TUSER(  ldr)    r7, [r1], #4)                   @ May fault
                 orr     r3, r3, r7, push #24
                 str     r3, [r0], #4
                 mov     ip, r1, lsl #32 - PAGE_SHIFT
@@ -418,7 +418,7 @@ USER(		T(ldr)	r7, [r1], #4)			@ May fault
                 stmneia r0!, {r3 - r4}
                 tst     ip, #4
                 movne   r3, r7, pull #8
-USER(           T(ldrne) r7, [r1], #4)                  @ May fault
+USER(   TUSER(  ldrne) r7, [r1], #4)                    @ May fault
                 orrne   r3, r3, r7, push #24
                 strne   r3, [r0], #4
                 ands    ip, ip, #3
@@ -438,7 +438,7 @@ USER(		T(ldrne) r7, [r1], #4)			@ May fault
                 addmi   ip, r2, #4
                 bmi     .Lcfu_2nowords
                 mov     r3, r7, pull #16
-USER(           T(ldr)  r7, [r1], #4)                   @ May fault
+USER(   TUSER(  ldr)    r7, [r1], #4)                   @ May fault
                 orr     r3, r3, r7, push #16
                 str     r3, [r0], #4
                 mov     ip, r1, lsl #32 - PAGE_SHIFT
@@ -474,7 +474,7 @@ USER(		T(ldr)	r7, [r1], #4)			@ May fault
                 stmneia r0!, {r3 - r4}
                 tst     ip, #4
                 movne   r3, r7, pull #16
-USER(           T(ldrne) r7, [r1], #4)                  @ May fault
+USER(   TUSER(  ldrne) r7, [r1], #4)                    @ May fault
                 orrne   r3, r3, r7, push #16
                 strne   r3, [r0], #4
                 ands    ip, ip, #3
@@ -486,7 +486,7 @@ USER(		T(ldrne) r7, [r1], #4)			@ May fault
                 strb    r3, [r0], #1
                 movge   r3, r7, get_byte_3
                 strgeb  r3, [r0], #1
-USER(           T(ldrgtb) r3, [r1], #0)                 @ May fault
+USER(   TUSER(  ldrgtb) r3, [r1], #0)                   @ May fault
                 strgtb  r3, [r0], #1
                 b       .Lcfu_finished
 
@@ -494,7 +494,7 @@ USER(		T(ldrgtb) r3, [r1], #0)			@ May fault
                 addmi   ip, r2, #4
                 bmi     .Lcfu_3nowords
                 mov     r3, r7, pull #24
-USER(           T(ldr)  r7, [r1], #4)                   @ May fault
+USER(   TUSER(  ldr)    r7, [r1], #4)                   @ May fault
                 orr     r3, r3, r7, push #8
                 str     r3, [r0], #4
                 mov     ip, r1, lsl #32 - PAGE_SHIFT
@@ -529,7 +529,7 @@ USER(		T(ldr)	r7, [r1], #4)			@ May fault
                 stmneia r0!, {r3 - r4}
                 tst     ip, #4
                 movne   r3, r7, pull #24
-USER(           T(ldrne) r7, [r1], #4)                  @ May fault
+USER(   TUSER(  ldrne) r7, [r1], #4)                    @ May fault
                 orrne   r3, r3, r7, push #8
                 strne   r3, [r0], #4
                 ands    ip, ip, #3
@@ -539,9 +539,9 @@ USER(		T(ldrne) r7, [r1], #4)			@ May fault
                 beq     .Lcfu_finished
                 cmp     ip, #2
                 strb    r3, [r0], #1
-USER(           T(ldrgeb) r3, [r1], #1)                 @ May fault
+USER(   TUSER(  ldrgeb) r3, [r1], #1)                   @ May fault
                 strgeb  r3, [r0], #1
-USER(           T(ldrgtb) r3, [r1], #1)                 @ May fault
+USER(   TUSER(  ldrgtb) r3, [r1], #1)                   @ May fault
                 strgtb  r3, [r0], #1
                 b       .Lcfu_finished
 ENDPROC(__copy_from_user)
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 4f991f295284..71feb00a1e99 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -18,6 +18,12 @@ config HAVE_AT91_USART4
 config HAVE_AT91_USART5
         bool
 
+config AT91_SAM9_ALT_RESET
+        bool
+
+config AT91_SAM9G45_RESET
+        bool
+
 menu "Atmel AT91 System-on-Chip"
 
 choice
@@ -39,6 +45,7 @@ config ARCH_AT91SAM9260
         select HAVE_AT91_USART4
         select HAVE_AT91_USART5
         select HAVE_NET_MACB
+        select AT91_SAM9_ALT_RESET
 
 config ARCH_AT91SAM9261
         bool "AT91SAM9261"
@@ -46,6 +53,7 @@ config ARCH_AT91SAM9261
         select GENERIC_CLOCKEVENTS
         select HAVE_FB_ATMEL
         select HAVE_AT91_DBGU0
+        select AT91_SAM9_ALT_RESET
 
 config ARCH_AT91SAM9G10
         bool "AT91SAM9G10"
@@ -53,6 +61,7 @@ config ARCH_AT91SAM9G10
         select GENERIC_CLOCKEVENTS
         select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
+        select AT91_SAM9_ALT_RESET
 
 config ARCH_AT91SAM9263
         bool "AT91SAM9263"
@@ -61,6 +70,7 @@ config ARCH_AT91SAM9263
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
         select HAVE_AT91_DBGU1
+        select AT91_SAM9_ALT_RESET
 
 config ARCH_AT91SAM9RL
         bool "AT91SAM9RL"
@@ -69,6 +79,7 @@ config ARCH_AT91SAM9RL
         select HAVE_AT91_USART3
         select HAVE_FB_ATMEL
         select HAVE_AT91_DBGU0
+        select AT91_SAM9_ALT_RESET
 
 config ARCH_AT91SAM9G20
         bool "AT91SAM9G20"
@@ -79,6 +90,7 @@ config ARCH_AT91SAM9G20
         select HAVE_AT91_USART4
         select HAVE_AT91_USART5
         select HAVE_NET_MACB
+        select AT91_SAM9_ALT_RESET
 
 config ARCH_AT91SAM9G45
         bool "AT91SAM9G45"
@@ -88,6 +100,7 @@ config ARCH_AT91SAM9G45
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
         select HAVE_AT91_DBGU1
+        select AT91_SAM9G45_RESET
 
 config ARCH_AT91CAP9
         bool "AT91CAP9"
@@ -96,6 +109,7 @@ config ARCH_AT91CAP9
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
         select HAVE_AT91_DBGU1
+        select AT91_SAM9G45_RESET
 
 config ARCH_AT91X40
         bool "AT91x40"
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 242174f9f355..705e1fbded39 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -8,15 +8,17 @@ obj-n		:=
 obj-            :=
 
 obj-$(CONFIG_AT91_PMC_UNIT)     += clock.o
+obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o
+obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o
 
 # CPU-specific support
 obj-$(CONFIG_ARCH_AT91RM9200)   += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o
-obj-$(CONFIG_ARCH_AT91SAM9260)  += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o at91sam9_alt_reset.o
-obj-$(CONFIG_ARCH_AT91SAM9261)  += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o at91sam9_alt_reset.o
-obj-$(CONFIG_ARCH_AT91SAM9G10)  += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o at91sam9_alt_reset.o
-obj-$(CONFIG_ARCH_AT91SAM9263)  += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o at91sam9_alt_reset.o
-obj-$(CONFIG_ARCH_AT91SAM9RL)   += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o at91sam9_alt_reset.o
-obj-$(CONFIG_ARCH_AT91SAM9G20)  += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o at91sam9_alt_reset.o
+obj-$(CONFIG_ARCH_AT91SAM9260)  += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o
+obj-$(CONFIG_ARCH_AT91SAM9261)  += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o
+obj-$(CONFIG_ARCH_AT91SAM9G10)  += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o
+obj-$(CONFIG_ARCH_AT91SAM9263)  += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o
+obj-$(CONFIG_ARCH_AT91SAM9RL)   += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o
+obj-$(CONFIG_ARCH_AT91SAM9G20)  += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o
 obj-$(CONFIG_ARCH_AT91SAM9G45)  += at91sam9g45.o at91sam926x_time.o at91sam9g45_devices.o sam9_smc.o
 obj-$(CONFIG_ARCH_AT91CAP9)     += at91cap9.o at91sam926x_time.o at91cap9_devices.o sam9_smc.o
 obj-$(CONFIG_ARCH_AT91X40)      += at91x40.o at91x40_time.o
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
index edb879ac04c8..a42edc25a87e 100644
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@ -21,7 +21,6 @@
 #include <mach/cpu.h>
 #include <mach/at91cap9.h>
 #include <mach/at91_pmc.h>
-#include <mach/at91_rstc.h>
 
 #include "soc.h"
 #include "generic.h"
@@ -314,11 +313,6 @@ static struct at91_gpio_bank at91cap9_gpio[] __initdata = {
         }
 };
 
-static void at91cap9_restart(char mode, const char *cmd)
-{
-        at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
-}
-
 /* --------------------------------------------------------------------
  *  AT91CAP9 processor initialization
  * -------------------------------------------------------------------- */
@@ -331,13 +325,14 @@ static void __init at91cap9_map_io(void)
 static void __init at91cap9_ioremap_registers(void)
 {
         at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC);
+        at91_ioremap_rstc(AT91CAP9_BASE_RSTC);
         at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT);
         at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC);
 }
 
 static void __init at91cap9_initialize(void)
 {
-        arm_pm_restart = at91cap9_restart;
+        arm_pm_restart = at91sam9g45_restart;
         at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
 
         /* Register GPIO subsystem */
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
index 18bacec2b094..97676bdae998 100644
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -83,7 +83,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
  *  USB Device (Gadget)
  * -------------------------------------------------------------------- */
 
-#ifdef CONFIG_USB_AT91
+#if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)
 static struct at91_udc_data udc_data;
 
 static struct resource udc_resources[] = {
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 5e46e4a96430..d4036ba43612 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -323,6 +323,7 @@ static void __init at91sam9260_map_io(void)
 static void __init at91sam9260_ioremap_registers(void)
 {
         at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);
+        at91_ioremap_rstc(AT91SAM9260_BASE_RSTC);
         at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);
         at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);
 }
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 642ccb6d26b2..5a24f0b4554d 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -84,7 +84,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
  *  USB Device (Gadget)
  * -------------------------------------------------------------------- */
 
-#ifdef CONFIG_USB_AT91
+#if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)
 static struct at91_udc_data udc_data;
 
 static struct resource udc_resources[] = {
@@ -1215,8 +1215,7 @@ void __init at91_add_device_serial(void) {}
  *  CF/IDE
  * -------------------------------------------------------------------- */
 
-#if defined(CONFIG_BLK_DEV_IDE_AT91) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE) || \
-        defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE) || \
+#if defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE) || \
         defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE)
 
 static struct at91_cf_data cf0_data;
@@ -1313,10 +1312,8 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
         if (data->flags & AT91_CF_TRUE_IDE)
 #if defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE)
                 pdev->name = "pata_at91";
-#elif defined(CONFIG_BLK_DEV_IDE_AT91) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE)
-                pdev->name = "at91_ide";
 #else
-#warning "board requires AT91_CF_TRUE_IDE: enable either at91_ide or pata_at91"
+#warning "board requires AT91_CF_TRUE_IDE: enable pata_at91"
 #endif
         else
                 pdev->name = "at91_cf";
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index b85b9ea60170..023c2ff138df 100644
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -281,6 +281,7 @@ static void __init at91sam9261_map_io(void)
 static void __init at91sam9261_ioremap_registers(void)
 {
         at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC);
+        at91_ioremap_rstc(AT91SAM9261_BASE_RSTC);
         at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);
         at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);
 }
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index fc59cbdb0e3c..1e28bed8f425 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -87,7 +87,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
  *  USB Device (Gadget)
  * -------------------------------------------------------------------- */
 
-#ifdef CONFIG_USB_AT91
+#if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)
 static struct at91_udc_data udc_data;
 
 static struct resource udc_resources[] = {
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index 79e3669b1117..75e876c258af 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -301,6 +301,7 @@ static void __init at91sam9263_map_io(void)
 static void __init at91sam9263_ioremap_registers(void)
 {
         at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC);
+        at91_ioremap_rstc(AT91SAM9263_BASE_RSTC);
         at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT);
         at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);
         at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index 7b46b2787022..366a7765635b 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -92,7 +92,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
  *  USB Device (Gadget)
  * -------------------------------------------------------------------- */
 
-#ifdef CONFIG_USB_AT91
+#if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)
 static struct at91_udc_data udc_data;
 
 static struct resource udc_resources[] = {
@@ -355,8 +355,8 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}
  *  Compact Flash (PCMCIA or IDE)
  * -------------------------------------------------------------------- */
 
-#if defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE) || \
-    defined(CONFIG_BLK_DEV_IDE_AT91) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE)
+#if defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE) || \
+        defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE)
 
 static struct at91_cf_data cf0_data;
 
@@ -450,7 +450,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
         at91_set_A_periph(AT91_PIN_PD9, 0);  /* CFCE2 */
         at91_set_A_periph(AT91_PIN_PD14, 0); /* CFNRW */
 
-        pdev->name = (data->flags & AT91_CF_TRUE_IDE) ? "at91_ide" : "at91_cf";
+        pdev->name = (data->flags & AT91_CF_TRUE_IDE) ? "pata_at91" : "at91_cf";
         platform_device_register(pdev);
 }
 #else
diff --git a/arch/arm/mach-at91/at91sam9_alt_reset.S b/arch/arm/mach-at91/at91sam9_alt_reset.S
index d3f931c5942e..518e42377171 100644
--- a/arch/arm/mach-at91/at91sam9_alt_reset.S
+++ b/arch/arm/mach-at91/at91sam9_alt_reset.S
@@ -23,7 +23,8 @@
                         .globl  at91sam9_alt_restart
 
 at91sam9_alt_restart:   ldr     r0, .at91_va_base_sdramc        @ preload constants
-                        ldr     r1, .at91_va_base_rstc_cr
+                        ldr     r1, =at91_rstc_base
+                        ldr     r1, [r1]
 
                         mov     r2, #1
                         mov     r3, #AT91_SDRAMC_LPCB_POWER_DOWN
@@ -33,11 +34,9 @@ at91sam9_alt_restart:	ldr	r0, .at91_va_base_sdramc	@ preload constants
 
                         str     r2, [r0, #AT91_SDRAMC_TR]       @ disable SDRAM access
                         str     r3, [r0, #AT91_SDRAMC_LPR]      @ power down SDRAM
-                        str     r4, [r1]                        @ reset processor
+                        str     r4, [r1, #AT91_RSTC_CR]         @ reset processor
 
                         b       .
 
 .at91_va_base_sdramc:
         .word AT91_VA_BASE_SYS + AT91_SDRAMC0
-.at91_va_base_rstc_cr:
-        .word AT91_VA_BASE_SYS + AT91_RSTC_CR
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 7032dd32cdf0..1cb6a96b1c1e 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -18,7 +18,6 @@
 #include <asm/mach/map.h>
 #include <mach/at91sam9g45.h>
 #include <mach/at91_pmc.h>
-#include <mach/at91_rstc.h>
 #include <mach/cpu.h>
 
 #include "soc.h"
@@ -318,11 +317,6 @@ static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = {
         }
 };
 
-static void at91sam9g45_restart(char mode, const char *cmd)
-{
-        at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
-}
-
 /* --------------------------------------------------------------------
  *  AT91SAM9G45 processor initialization
  * -------------------------------------------------------------------- */
@@ -336,6 +330,7 @@ static void __init at91sam9g45_map_io(void)
 static void __init at91sam9g45_ioremap_registers(void)
 {
         at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC);
+        at91_ioremap_rstc(AT91SAM9G45_BASE_RSTC);
         at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT);
         at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC);
 }
diff --git a/arch/arm/mach-at91/at91sam9g45_reset.S b/arch/arm/mach-at91/at91sam9g45_reset.S
new file mode 100644
index 000000000000..0468be10980b
--- /dev/null
+++ b/arch/arm/mach-at91/at91sam9g45_reset.S
@@ -0,0 +1,40 @@
+/*
+ * reset AT91SAM9G45 as per errata
+ *
+ * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcosoft.com>
+ *
+ * unless the SDRAM is cleanly shutdown before we hit the
+ * reset register it can be left driving the data bus and
+ * killing the chance of a subsequent boot from NAND
+ *
+ * GPLv2 Only
+ */
+
+#include <linux/linkage.h>
+#include <mach/hardware.h>
+#include <mach/at91sam9_ddrsdr.h>
+#include <mach/at91_rstc.h>
+
+                        .arm
+
+                        .globl  at91sam9g45_restart
+
+at91sam9g45_restart:
+                        ldr     r0, .at91_va_base_sdramc0       @ preload constants
+                        ldr     r1, =at91_rstc_base
+                        ldr     r1, [r1]
+
+                        mov     r2, #1
+                        mov     r3, #AT91_DDRSDRC_LPCB_POWER_DOWN
+                        ldr     r4, =AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST
+
+                        .balign 32                              @ align to cache line
+
+                        str     r2, [r0, #AT91_DDRSDRC_RTR]     @ disable DDR0 access
+                        str     r3, [r0, #AT91_DDRSDRC_LPR]     @ power down DDR0
+                        str     r4, [r1, #AT91_RSTC_CR]         @ reset processor
+
+                        b       .
+
+.at91_va_base_sdramc0:
+        .word AT91_VA_BASE_SYS + AT91_DDRSDRC0
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
index d6bcb1da11df..d2c91a841cb8 100644
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@ -286,6 +286,7 @@ static void __init at91sam9rl_map_io(void)
 static void __init at91sam9rl_ioremap_registers(void)
 {
         at91_ioremap_shdwc(AT91SAM9RL_BASE_SHDWC);
+        at91_ioremap_rstc(AT91SAM9RL_BASE_RSTC);
         at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT);
         at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC);
 }
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index 4866b8180d66..594133451c0c 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -58,7 +58,9 @@ extern void at91_irq_suspend(void);
 extern void at91_irq_resume(void);
 
 /* reset */
+extern void at91_ioremap_rstc(u32 base_addr);
 extern void at91sam9_alt_restart(char, const char *);
+extern void at91sam9g45_restart(char, const char *);
 
 /* shutdown */
 extern void at91_ioremap_shdwc(u32 base_addr);
diff --git a/arch/arm/mach-at91/include/mach/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h
index cbd2bf052c1f..875fa336800b 100644
--- a/arch/arm/mach-at91/include/mach/at91_rstc.h
+++ b/arch/arm/mach-at91/include/mach/at91_rstc.h
@@ -16,13 +16,25 @@
 #ifndef AT91_RSTC_H
 #define AT91_RSTC_H
 
-#define AT91_RSTC_CR            (AT91_RSTC + 0x00)      /* Reset Controller Control Register */
+#ifndef __ASSEMBLY__
+extern void __iomem *at91_rstc_base;
+
+#define at91_rstc_read(field) \
+        __raw_readl(at91_rstc_base + field)
+
+#define at91_rstc_write(field, value) \
+        __raw_writel(value, at91_rstc_base + field);
+#else
+.extern at91_rstc_base
+#endif
+
+#define AT91_RSTC_CR            0x00                    /* Reset Controller Control Register */
 #define         AT91_RSTC_PROCRST       (1 << 0)                /* Processor Reset */
 #define         AT91_RSTC_PERRST        (1 << 2)                /* Peripheral Reset */
 #define         AT91_RSTC_EXTRST        (1 << 3)                /* External Reset */
 #define         AT91_RSTC_KEY           (0xa5 << 24)            /* KEY Password */
 
-#define AT91_RSTC_SR            (AT91_RSTC + 0x04)      /* Reset Controller Status Register */
+#define AT91_RSTC_SR            0x04                    /* Reset Controller Status Register */
 #define         AT91_RSTC_URSTS         (1 << 0)                /* User Reset Status */
 #define         AT91_RSTC_RSTTYP        (7 << 8)                /* Reset Type */
 #define                 AT91_RSTC_RSTTYP_GENERAL        (0 << 8)
@@ -33,7 +45,7 @@
 #define         AT91_RSTC_NRSTL         (1 << 16)               /* NRST Pin Level */
 #define         AT91_RSTC_SRCMP         (1 << 17)               /* Software Reset Command in Progress */
 
-#define AT91_RSTC_MR            (AT91_RSTC + 0x08)      /* Reset Controller Mode Register */
+#define AT91_RSTC_MR            0x08                    /* Reset Controller Mode Register */
 #define         AT91_RSTC_URSTEN        (1 << 0)                /* User Reset Enable */
 #define         AT91_RSTC_URSTIEN       (1 << 4)                /* User Reset Interrupt Enable */
 #define         AT91_RSTC_ERSTL         (0xf << 8)              /* External Reset Length */
diff --git a/arch/arm/mach-at91/include/mach/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h
index 4c0e2f6011d7..61d952902f2b 100644
--- a/arch/arm/mach-at91/include/mach/at91cap9.h
+++ b/arch/arm/mach-at91/include/mach/at91cap9.h
@@ -83,7 +83,6 @@
 #define AT91_DDRSDRC0   (0xffffe600 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffea00 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
-#define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
 #define AT91_GPBR       (cpu_is_at91cap9_revB() ?       \
                         (0xfffffd50 - AT91_BASE_SYS) :  \
                         (0xfffffd60 - AT91_BASE_SYS))
@@ -96,6 +95,7 @@
 #define AT91CAP9_BASE_PIOB      0xfffff400
 #define AT91CAP9_BASE_PIOC      0xfffff600
 #define AT91CAP9_BASE_PIOD      0xfffff800
+#define AT91CAP9_BASE_RSTC      0xfffffd00
 #define AT91CAP9_BASE_SHDWC     0xfffffd10
 #define AT91CAP9_BASE_RTT       0xfffffd20
 #define AT91CAP9_BASE_PIT       0xfffffd30
diff --git a/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h b/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h
deleted file mode 100644
index 976f4a6c3353..000000000000
--- a/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h
- *
- *  (C) 2008 Andrew Victor
- *
- * DDR/SDR Controller (DDRSDRC) - System peripherals registers.
- * Based on AT91CAP9 datasheet revision B.
- *
- * 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.
- */
-
-#ifndef AT91CAP9_DDRSDR_H
-#define AT91CAP9_DDRSDR_H
-
-#define AT91_DDRSDRC_MR         0x00    /* Mode Register */
-#define         AT91_DDRSDRC_MODE       (0xf << 0)              /* Command Mode */
-#define                 AT91_DDRSDRC_MODE_NORMAL                0
-#define                 AT91_DDRSDRC_MODE_NOP           1
-#define                 AT91_DDRSDRC_MODE_PRECHARGE     2
-#define                 AT91_DDRSDRC_MODE_LMR           3
-#define                 AT91_DDRSDRC_MODE_REFRESH       4
-#define                 AT91_DDRSDRC_MODE_EXT_LMR       5
-#define                 AT91_DDRSDRC_MODE_DEEP          6
-
-#define AT91_DDRSDRC_RTR        0x04    /* Refresh Timer Register */
-#define         AT91_DDRSDRC_COUNT      (0xfff << 0)            /* Refresh Timer Counter */
-
-#define AT91_DDRSDRC_CR         0x08    /* Configuration Register */
-#define         AT91_DDRSDRC_NC         (3 << 0)                /* Number of Column Bits */
-#define                 AT91_DDRSDRC_NC_SDR8    (0 << 0)
-#define                 AT91_DDRSDRC_NC_SDR9    (1 << 0)
-#define                 AT91_DDRSDRC_NC_SDR10   (2 << 0)
-#define                 AT91_DDRSDRC_NC_SDR11   (3 << 0)
-#define                 AT91_DDRSDRC_NC_DDR9    (0 << 0)
-#define                 AT91_DDRSDRC_NC_DDR10   (1 << 0)
-#define                 AT91_DDRSDRC_NC_DDR11   (2 << 0)
-#define                 AT91_DDRSDRC_NC_DDR12   (3 << 0)
-#define         AT91_DDRSDRC_NR         (3 << 2)                /* Number of Row Bits */
-#define                 AT91_DDRSDRC_NR_11      (0 << 2)
-#define                 AT91_DDRSDRC_NR_12      (1 << 2)
-#define                 AT91_DDRSDRC_NR_13      (2 << 2)
-#define         AT91_DDRSDRC_CAS        (7 << 4)                /* CAS Latency */
-#define                 AT91_DDRSDRC_CAS_2      (2 << 4)
-#define                 AT91_DDRSDRC_CAS_3      (3 << 4)
-#define                 AT91_DDRSDRC_CAS_25     (6 << 4)
-#define         AT91_DDRSDRC_DLL        (1 << 7)                /* Reset DLL */
-#define         AT91_DDRSDRC_DICDS      (1 << 8)                /* Output impedance control */
-
-#define AT91_DDRSDRC_T0PR       0x0C    /* Timing 0 Register */
-#define         AT91_DDRSDRC_TRAS       (0xf <<  0)             /* Active to Precharge delay */
-#define         AT91_DDRSDRC_TRCD       (0xf <<  4)             /* Row to Column delay */
-#define         AT91_DDRSDRC_TWR        (0xf <<  8)             /* Write recovery delay */
-#define         AT91_DDRSDRC_TRC        (0xf << 12)             /* Row cycle delay */
-#define         AT91_DDRSDRC_TRP        (0xf << 16)             /* Row precharge delay */
-#define         AT91_DDRSDRC_TRRD       (0xf << 20)             /* Active BankA to BankB */
-#define         AT91_DDRSDRC_TWTR       (1   << 24)             /* Internal Write to Read delay */
-#define         AT91_DDRSDRC_TMRD       (0xf << 28)             /* Load mode to active/refresh delay */
-
-#define AT91_DDRSDRC_T1PR       0x10    /* Timing 1 Register */
-#define         AT91_DDRSDRC_TRFC       (0x1f << 0)             /* Row Cycle Delay */
-#define         AT91_DDRSDRC_TXSNR      (0xff << 8)             /* Exit self-refresh to non-read */
-#define         AT91_DDRSDRC_TXSRD      (0xff << 16)            /* Exit self-refresh to read */
-#define         AT91_DDRSDRC_TXP        (0xf  << 24)            /* Exit power-down delay */
-
-#define AT91_DDRSDRC_LPR        0x18    /* Low Power Register */
-#define         AT91_DDRSDRC_LPCB               (3 << 0)        /* Low-power Configurations */
-#define                 AT91_DDRSDRC_LPCB_DISABLE               0
-#define                 AT91_DDRSDRC_LPCB_SELF_REFRESH          1
-#define                 AT91_DDRSDRC_LPCB_POWER_DOWN            2
-#define                 AT91_DDRSDRC_LPCB_DEEP_POWER_DOWN       3
-#define         AT91_DDRSDRC_CLKFR              (1 << 2)        /* Clock Frozen */
-#define         AT91_DDRSDRC_PASR               (7 << 4)        /* Partial Array Self Refresh */
-#define         AT91_DDRSDRC_TCSR               (3 << 8)        /* Temperature Compensated Self Refresh */
-#define         AT91_DDRSDRC_DS                 (3 << 10)       /* Drive Strength */
-#define         AT91_DDRSDRC_TIMEOUT            (3 << 12)       /* Time to define when Low Power Mode is enabled */
-#define                 AT91_DDRSDRC_TIMEOUT_0_CLK_CYCLES       (0 << 12)
-#define                 AT91_DDRSDRC_TIMEOUT_64_CLK_CYCLES      (1 << 12)
-#define                 AT91_DDRSDRC_TIMEOUT_128_CLK_CYCLES     (2 << 12)
-
-#define AT91_DDRSDRC_MDR        0x1C    /* Memory Device Register */
-#define         AT91_DDRSDRC_MD         (3 << 0)                /* Memory Device Type */
-#define                 AT91_DDRSDRC_MD_SDR             0
-#define                 AT91_DDRSDRC_MD_LOW_POWER_SDR   1
-#define                 AT91_DDRSDRC_MD_DDR             2
-#define                 AT91_DDRSDRC_MD_LOW_POWER_DDR   3
-
-#define AT91_DDRSDRC_DLLR       0x20    /* DLL Information Register */
-#define         AT91_DDRSDRC_MDINC      (1 << 0)                /* Master Delay increment */
-#define         AT91_DDRSDRC_MDDEC      (1 << 1)                /* Master Delay decrement */
-#define         AT91_DDRSDRC_MDOVF      (1 << 2)                /* Master Delay Overflow */
-#define         AT91_DDRSDRC_SDCOVF     (1 << 3)                /* Slave Delay Correction Overflow */
-#define         AT91_DDRSDRC_SDCUDF     (1 << 4)                /* Slave Delay Correction Underflow */
-#define         AT91_DDRSDRC_SDERF      (1 << 5)                /* Slave Delay Correction error */
-#define         AT91_DDRSDRC_MDVAL      (0xff <<  8)            /* Master Delay value */
-#define         AT91_DDRSDRC_SDVAL      (0xff << 16)            /* Slave Delay value */
-#define         AT91_DDRSDRC_SDCVAL     (0xff << 24)            /* Slave Delay Correction value */
-
-/* Register access macros */
-#define at91_ramc_read(num, reg) \
-        at91_sys_read(AT91_DDRSDRC##num + reg)
-#define at91_ramc_write(num, reg, value) \
-        at91_sys_write(AT91_DDRSDRC##num + reg, value)
-
-
-#endif
diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h
index f937c476bb67..fa5ca278adeb 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9260.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260.h
@@ -83,7 +83,6 @@
 #define AT91_SDRAMC0    (0xffffea00 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffee00 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
-#define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
 #define AT91_GPBR       (0xfffffd50 - AT91_BASE_SYS)
 
 #define AT91SAM9260_BASE_ECC    0xffffe800
@@ -92,6 +91,7 @@
 #define AT91SAM9260_BASE_PIOA   0xfffff400
 #define AT91SAM9260_BASE_PIOB   0xfffff600
 #define AT91SAM9260_BASE_PIOC   0xfffff800
+#define AT91SAM9260_BASE_RSTC   0xfffffd00
 #define AT91SAM9260_BASE_SHDWC  0xfffffd10
 #define AT91SAM9260_BASE_RTT    0xfffffd20
 #define AT91SAM9260_BASE_PIT    0xfffffd30
diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h
index 175604e261be..7cde2d36570e 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9261.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9261.h
@@ -68,7 +68,6 @@
 #define AT91_SDRAMC0    (0xffffea00 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffee00 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
-#define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
 #define AT91_GPBR       (0xfffffd50 - AT91_BASE_SYS)
 
 #define AT91SAM9261_BASE_SMC    0xffffec00
@@ -76,6 +75,7 @@
 #define AT91SAM9261_BASE_PIOA   0xfffff400
 #define AT91SAM9261_BASE_PIOB   0xfffff600
 #define AT91SAM9261_BASE_PIOC   0xfffff800
+#define AT91SAM9261_BASE_RSTC   0xfffffd00
 #define AT91SAM9261_BASE_SHDWC  0xfffffd10
 #define AT91SAM9261_BASE_RTT    0xfffffd20
 #define AT91SAM9261_BASE_PIT    0xfffffd30
diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h
index 80c915002d83..5949abda962b 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9263.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263.h
@@ -78,7 +78,6 @@
 #define AT91_SDRAMC1    (0xffffe800 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffec00 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
-#define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
 #define AT91_GPBR       (0xfffffd60 - AT91_BASE_SYS)
 
 #define AT91SAM9263_BASE_ECC0   0xffffe000
@@ -91,6 +90,7 @@
 #define AT91SAM9263_BASE_PIOC   0xfffff600
 #define AT91SAM9263_BASE_PIOD   0xfffff800
 #define AT91SAM9263_BASE_PIOE   0xfffffa00
+#define AT91SAM9263_BASE_RSTC   0xfffffd00
 #define AT91SAM9263_BASE_SHDWC  0xfffffd10
 #define AT91SAM9263_BASE_RTT0   0xfffffd20
 #define AT91SAM9263_BASE_PIT    0xfffffd30
diff --git a/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h b/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h
index d27b15ba8ebf..e2f8da8ce5bc 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h
@@ -46,10 +46,10 @@
 #define                 AT91_DDRSDRC_CAS_25     (6 << 4)
 #define         AT91_DDRSDRC_RST_DLL    (1 << 7)                /* Reset DLL */
 #define         AT91_DDRSDRC_DICDS      (1 << 8)                /* Output impedance control */
-#define         AT91_DDRSDRC_DIS_DLL    (1 << 9)                /* Disable DLL */
-#define         AT91_DDRSDRC_OCD        (1 << 12)               /* Off-Chip Driver */
-#define         AT91_DDRSDRC_DQMS       (1 << 16)               /* Mask Data is Shared */
-#define         AT91_DDRSDRC_ACTBST     (1 << 18)               /* Active Bank X to Burst Stop Read Access Bank Y */
+#define         AT91_DDRSDRC_DIS_DLL    (1 << 9)                /* Disable DLL [SAM9 Only] */
+#define         AT91_DDRSDRC_OCD        (1 << 12)               /* Off-Chip Driver [SAM9 Only] */
+#define         AT91_DDRSDRC_DQMS       (1 << 16)               /* Mask Data is Shared [SAM9 Only] */
+#define         AT91_DDRSDRC_ACTBST     (1 << 18)               /* Active Bank X to Burst Stop Read Access Bank Y [SAM9 Only] */
 
 #define AT91_DDRSDRC_T0PR       0x0C    /* Timing 0 Register */
 #define         AT91_DDRSDRC_TRAS       (0xf <<  0)             /* Active to Precharge delay */
@@ -59,7 +59,8 @@
 #define         AT91_DDRSDRC_TRP        (0xf << 16)             /* Row precharge delay */
 #define         AT91_DDRSDRC_TRRD       (0xf << 20)             /* Active BankA to BankB */
 #define         AT91_DDRSDRC_TWTR       (0x7 << 24)             /* Internal Write to Read delay */
-#define         AT91_DDRSDRC_RED_WRRD   (0x1 << 27)             /* Reduce Write to Read Delay */
+#define         AT91CAP9_DDRSDRC_TWTR   (1   << 24)             /* Internal Write to Read delay */
+#define         AT91_DDRSDRC_RED_WRRD   (0x1 << 27)             /* Reduce Write to Read Delay [SAM9 Only] */
 #define         AT91_DDRSDRC_TMRD       (0xf << 28)             /* Load mode to active/refresh delay */
 
 #define AT91_DDRSDRC_T1PR       0x10    /* Timing 1 Register */
@@ -68,13 +69,14 @@
 #define         AT91_DDRSDRC_TXSRD      (0xff << 16)            /* Exit self-refresh to read */
 #define         AT91_DDRSDRC_TXP        (0xf  << 24)            /* Exit power-down delay */
 
-#define AT91_DDRSDRC_T2PR       0x14    /* Timing 2 Register */
+#define AT91_DDRSDRC_T2PR       0x14    /* Timing 2 Register [SAM9 Only] */
 #define         AT91_DDRSDRC_TXARD      (0xf  << 0)             /* Exit active power down delay to read command in mode "Fast Exit" */
 #define         AT91_DDRSDRC_TXARDS     (0xf  << 4)             /* Exit active power down delay to read command in mode "Slow Exit" */
 #define         AT91_DDRSDRC_TRPA       (0xf  << 8)             /* Row Precharge All delay */
 #define         AT91_DDRSDRC_TRTP       (0x7  << 12)            /* Read to Precharge delay */
 
 #define AT91_DDRSDRC_LPR        0x1C    /* Low Power Register */
+#define AT91CAP9_DDRSDRC_LPR    0x18    /* Low Power Register */
 #define         AT91_DDRSDRC_LPCB       (3 << 0)                /* Low-power Configurations */
 #define                 AT91_DDRSDRC_LPCB_DISABLE               0
 #define                 AT91_DDRSDRC_LPCB_SELF_REFRESH          1
@@ -92,32 +94,40 @@
 #define         AT91_DDRSDRC_UPD_MR     (3 << 20)        /* Update load mode register and extended mode register */
 
 #define AT91_DDRSDRC_MDR        0x20    /* Memory Device Register */
+#define AT91CAP9_DDRSDRC_MDR    0x1C    /* Memory Device Register */
 #define         AT91_DDRSDRC_MD         (3 << 0)                /* Memory Device Type */
 #define                 AT91_DDRSDRC_MD_SDR             0
 #define                 AT91_DDRSDRC_MD_LOW_POWER_SDR   1
+#define                 AT91CAP9_DDRSDRC_MD_DDR         2
 #define                 AT91_DDRSDRC_MD_LOW_POWER_DDR   3
-#define                 AT91_DDRSDRC_MD_DDR2            6
+#define                 AT91_DDRSDRC_MD_DDR2            6       /* [SAM9 Only] */
 #define         AT91_DDRSDRC_DBW        (1 << 4)                /* Data Bus Width */
 #define                 AT91_DDRSDRC_DBW_32BITS         (0 <<  4)
 #define                 AT91_DDRSDRC_DBW_16BITS         (1 <<  4)
 
 #define AT91_DDRSDRC_DLL        0x24    /* DLL Information Register */
+#define AT91CAP9_DDRSDRC_DLL    0x20    /* DLL Information Register */
 #define         AT91_DDRSDRC_MDINC      (1 << 0)                /* Master Delay increment */
 #define         AT91_DDRSDRC_MDDEC      (1 << 1)                /* Master Delay decrement */
 #define         AT91_DDRSDRC_MDOVF      (1 << 2)                /* Master Delay Overflow */
+#define         AT91CAP9_DDRSDRC_SDCOVF (1 << 3)                /* Slave Delay Correction Overflow */
+#define         AT91CAP9_DDRSDRC_SDCUDF (1 << 4)                /* Slave Delay Correction Underflow */
+#define         AT91CAP9_DDRSDRC_SDERF  (1 << 5)                /* Slave Delay Correction error */
 #define         AT91_DDRSDRC_MDVAL      (0xff <<  8)            /* Master Delay value */
+#define         AT91CAP9_DDRSDRC_SDVAL  (0xff << 16)            /* Slave Delay value */
+#define         AT91CAP9_DDRSDRC_SDCVAL (0xff << 24)            /* Slave Delay Correction value */
 
-#define AT91_DDRSDRC_HS         0x2C    /* High Speed Register */
+#define AT91_DDRSDRC_HS         0x2C    /* High Speed Register [SAM9 Only] */
 #define         AT91_DDRSDRC_DIS_ATCP_RD        (1 << 2)        /* Anticip read access is disabled */
 
 #define AT91_DDRSDRC_DELAY(n)   (0x30 + (0x4 * (n)))    /* Delay I/O Register n */
 
-#define AT91_DDRSDRC_WPMR       0xE4    /* Write Protect Mode Register */
+#define AT91_DDRSDRC_WPMR       0xE4    /* Write Protect Mode Register [SAM9 Only] */
 #define         AT91_DDRSDRC_WP         (1 << 0)                /* Write protect enable */
 #define         AT91_DDRSDRC_WPKEY      (0xffffff << 8)         /* Write protect key */
 #define         AT91_DDRSDRC_KEY        (0x444452 << 8)         /* Write protect key = "DDR" */
 
-#define AT91_DDRSDRC_WPSR       0xE8    /* Write Protect Status Register */
+#define AT91_DDRSDRC_WPSR       0xE8    /* Write Protect Status Register [SAM9 Only] */
 #define         AT91_DDRSDRC_WPVS       (1 << 0)                /* Write protect violation status */
 #define         AT91_DDRSDRC_WPVSRC     (0xffff << 8)           /* Write protect violation source */
 
diff --git a/arch/arm/mach-at91/include/mach/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
index eb18a70fa647..175e1fdd9fe8 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9_smc.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
@@ -18,6 +18,35 @@
 
 #include <mach/cpu.h>
 
+#ifndef __ASSEMBLY__
+struct sam9_smc_config {
+        /* Setup register */
+        u8 ncs_read_setup;
+        u8 nrd_setup;
+        u8 ncs_write_setup;
+        u8 nwe_setup;
+
+        /* Pulse register */
+        u8 ncs_read_pulse;
+        u8 nrd_pulse;
+        u8 ncs_write_pulse;
+        u8 nwe_pulse;
+
+        /* Cycle register */
+        u16 read_cycle;
+        u16 write_cycle;
+
+        /* Mode register */
+        u32 mode;
+        u8 tdf_cycles:4;
+};
+
+extern void sam9_smc_configure(int id, int cs, struct sam9_smc_config *config);
+extern void sam9_smc_read(int id, int cs, struct sam9_smc_config *config);
+extern void sam9_smc_read_mode(int id, int cs, struct sam9_smc_config *config);
+extern void sam9_smc_write_mode(int id, int cs, struct sam9_smc_config *config);
+#endif
+
 #define AT91_SMC_SETUP          0x00                            /* Setup Register for CS n */
 #define         AT91_SMC_NWESETUP       (0x3f << 0)                     /* NWE Setup Length */
 #define                 AT91_SMC_NWESETUP_(x)   ((x) << 0)
diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h
index f0c23c960dec..dd9c95ea0862 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9g45.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h
@@ -90,7 +90,6 @@
 #define AT91_DDRSDRC0   (0xffffe600 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffea00 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
-#define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
 #define AT91_GPBR       (0xfffffd60 - AT91_BASE_SYS)
 
 #define AT91SAM9G45_BASE_ECC    0xffffe200
@@ -102,6 +101,7 @@
 #define AT91SAM9G45_BASE_PIOC   0xfffff600
 #define AT91SAM9G45_BASE_PIOD   0xfffff800
 #define AT91SAM9G45_BASE_PIOE   0xfffffa00
+#define AT91SAM9G45_BASE_RSTC   0xfffffd00
 #define AT91SAM9G45_BASE_SHDWC  0xfffffd10
 #define AT91SAM9G45_BASE_RTT    0xfffffd20
 #define AT91SAM9G45_BASE_PIT    0xfffffd30
diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h
index 2bb359e60b97..d7bead7118da 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9rl.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9rl.h
@@ -72,7 +72,6 @@
 #define AT91_SDRAMC0    (0xffffea00 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffee00 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
-#define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
 #define AT91_SCKCR      (0xfffffd50 - AT91_BASE_SYS)
 #define AT91_GPBR       (0xfffffd60 - AT91_BASE_SYS)
 
@@ -84,6 +83,7 @@
 #define AT91SAM9RL_BASE_PIOB    0xfffff600
 #define AT91SAM9RL_BASE_PIOC    0xfffff800
 #define AT91SAM9RL_BASE_PIOD    0xfffffa00
+#define AT91SAM9RL_BASE_RSTC    0xfffffd00
 #define AT91SAM9RL_BASE_SHDWC   0xfffffd10
 #define AT91SAM9RL_BASE_RTT     0xfffffd20
 #define AT91SAM9RL_BASE_PIT     0xfffffd30
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index d0b377b21bd7..3b33f07b1e11 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -88,7 +88,7 @@ extern void __init at91_add_device_eth(struct macb_platform_data *data);
 struct at91_usbh_data {
         u8              ports;          /* number of ports on root hub */
         int             vbus_pin[2];    /* port power-control pin */
-        u8              vbus_pin_inverted;
+        u8              vbus_pin_active_low[2];
         u8              overcurrent_supported;
         int             overcurrent_pin[2];
         u8              overcurrent_status[2];
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 62ad95556c36..1606379ac284 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -34,7 +34,6 @@
 /*
  * Show the reason for the previous system reset.
  */
-#if defined(AT91_RSTC)
 
 #include <mach/at91_rstc.h>
 #include <mach/at91_shdwc.h>
@@ -58,10 +57,10 @@ static void __init show_reset_status(void)
         char *reason, *r2 = reset;
         u32 reset_type, wake_type;
 
-        if (!at91_shdwc_base)
+        if (!at91_shdwc_base || !at91_rstc_base)
                 return;
 
-        reset_type = at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_RSTTYP;
+        reset_type = at91_rstc_read(AT91_RSTC_SR) & AT91_RSTC_RSTTYP;
         wake_type = at91_shdwc_read(AT91_SHDW_SR);
 
         switch (reset_type) {
@@ -102,10 +101,6 @@ static void __init show_reset_status(void)
         }
         pr_info("AT91: Starting after %s %s\n", reason, r2);
 }
-#else
-static void __init show_reset_status(void) {}
-#endif
-
 
 static int at91_pm_valid_state(suspend_state_t state)
 {
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h
index ce9a20699111..7eb40d24242f 100644
--- a/arch/arm/mach-at91/pm.h
+++ b/arch/arm/mach-at91/pm.h
@@ -25,21 +25,21 @@ static inline u32 sdram_selfrefresh_enable(void)
                                                                 : : "r" (0))
 
 #elif defined(CONFIG_ARCH_AT91CAP9)
-#include <mach/at91cap9_ddrsdr.h>
+#include <mach/at91sam9_ddrsdr.h>
 
 
 static inline u32 sdram_selfrefresh_enable(void)
 {
         u32 saved_lpr, lpr;
 
-        saved_lpr = at91_ramc_read(0, AT91_DDRSDRC_LPR);
+        saved_lpr = at91_ramc_read(0, AT91CAP9_DDRSDRC_LPR);
 
         lpr = saved_lpr & ~AT91_DDRSDRC_LPCB;
-        at91_ramc_write(0, AT91_DDRSDRC_LPR, lpr | AT91_DDRSDRC_LPCB_SELF_REFRESH);
+        at91_ramc_write(0, AT91CAP9_DDRSDRC_LPR, lpr | AT91_DDRSDRC_LPCB_SELF_REFRESH);
         return saved_lpr;
 }
 
-#define sdram_selfrefresh_disable(saved_lpr)    at91_ramc_write(0, AT91_DDRSDRC_LPR, saved_lpr)
+#define sdram_selfrefresh_disable(saved_lpr)    at91_ramc_write(0, AT91CAP9_DDRSDRC_LPR, saved_lpr)
 #define wait_for_interrupt_enable()             cpu_do_idle()
 
 #elif defined(CONFIG_ARCH_AT91SAM9G45)
diff --git a/arch/arm/mach-at91/pm_slowclock.S b/arch/arm/mach-at91/pm_slowclock.S
index f7922a436172..92dfb8461392 100644
--- a/arch/arm/mach-at91/pm_slowclock.S
+++ b/arch/arm/mach-at91/pm_slowclock.S
@@ -18,9 +18,8 @@
 
 #if defined(CONFIG_ARCH_AT91RM9200)
 #include <mach/at91rm9200_mc.h>
-#elif defined(CONFIG_ARCH_AT91CAP9)
-#include <mach/at91cap9_ddrsdr.h>
-#elif defined(CONFIG_ARCH_AT91SAM9G45)
+#elif defined(CONFIG_ARCH_AT91CAP9) \
+        || defined(CONFIG_ARCH_AT91SAM9G45)
 #include <mach/at91sam9_ddrsdr.h>
 #else
 #include <mach/at91sam9_sdramc.h>
diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c
index 8294783b679d..99a0a1d2b7dc 100644
--- a/arch/arm/mach-at91/sam9_smc.c
+++ b/arch/arm/mach-at91/sam9_smc.c
@@ -2,6 +2,7 @@
  * linux/arch/arm/mach-at91/sam9_smc.c
  *
  * Copyright (C) 2008 Andrew Victor
+ * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -22,7 +23,22 @@
 
 static void __iomem *smc_base_addr[2];
 
-static void __init sam9_smc_cs_configure(void __iomem *base, struct sam9_smc_config* config)
+static void sam9_smc_cs_write_mode(void __iomem *base,
+                                        struct sam9_smc_config *config)
+{
+        __raw_writel(config->mode
+                   | AT91_SMC_TDF_(config->tdf_cycles),
+                   base + AT91_SMC_MODE);
+}
+
+void sam9_smc_write_mode(int id, int cs,
+                                        struct sam9_smc_config *config)
+{
+        sam9_smc_cs_write_mode(AT91_SMC_CS(id, cs), config);
+}
+
+static void sam9_smc_cs_configure(void __iomem *base,
+                                        struct sam9_smc_config *config)
 {
 
         /* Setup register */
@@ -45,16 +61,66 @@ static void __init sam9_smc_cs_configure(void __iomem *base, struct sam9_smc_con
                    base + AT91_SMC_CYCLE);
 
         /* Mode register */
-        __raw_writel(config->mode
-                   | AT91_SMC_TDF_(config->tdf_cycles),
-                   base + AT91_SMC_MODE);
+        sam9_smc_cs_write_mode(base, config);
 }
 
-void __init sam9_smc_configure(int id, int cs, struct sam9_smc_config* config)
+void sam9_smc_configure(int id, int cs,
+                                        struct sam9_smc_config *config)
 {
         sam9_smc_cs_configure(AT91_SMC_CS(id, cs), config);
 }
 
+static void sam9_smc_cs_read_mode(void __iomem *base,
+                                        struct sam9_smc_config *config)
+{
+        u32 val = __raw_readl(base + AT91_SMC_MODE);
+
+        config->mode = (val & ~AT91_SMC_NWECYCLE);
+        config->tdf_cycles = (val & AT91_SMC_NWECYCLE) >> 16 ;
+}
+
+void sam9_smc_read_mode(int id, int cs,
+                                        struct sam9_smc_config *config)
+{
+        sam9_smc_cs_read_mode(AT91_SMC_CS(id, cs), config);
+}
+
+static void sam9_smc_cs_read(void __iomem *base,
+                                        struct sam9_smc_config *config)
+{
+        u32 val;
+
+        /* Setup register */
+        val = __raw_readl(base + AT91_SMC_SETUP);
+
+        config->nwe_setup = val & AT91_SMC_NWESETUP;
+        config->ncs_write_setup = (val & AT91_SMC_NCS_WRSETUP) >> 8;
+        config->nrd_setup = (val & AT91_SMC_NRDSETUP) >> 16;
+        config->ncs_read_setup = (val & AT91_SMC_NCS_RDSETUP) >> 24;
+
+        /* Pulse register */
+        val = __raw_readl(base + AT91_SMC_PULSE);
+
+        config->nwe_setup = val & AT91_SMC_NWEPULSE;
+        config->ncs_write_pulse = (val & AT91_SMC_NCS_WRPULSE) >> 8;
+        config->nrd_pulse = (val & AT91_SMC_NRDPULSE) >> 16;
+        config->ncs_read_pulse = (val & AT91_SMC_NCS_RDPULSE) >> 24;
+
+        /* Cycle register */
+        val = __raw_readl(base + AT91_SMC_CYCLE);
+
+        config->write_cycle = val & AT91_SMC_NWECYCLE;
+        config->read_cycle = (val & AT91_SMC_NRDCYCLE) >> 16;
+
+        /* Mode register */
+        sam9_smc_cs_read_mode(base, config);
+}
+
+void sam9_smc_read(int id, int cs, struct sam9_smc_config *config)
+{
+        sam9_smc_cs_read(AT91_SMC_CS(id, cs), config);
+}
+
 void __init at91sam9_ioremap_smc(int id, u32 addr)
 {
         if (id > 1) {
diff --git a/arch/arm/mach-at91/sam9_smc.h b/arch/arm/mach-at91/sam9_smc.h
index 039c5ce17aec..3e52dcd4a59f 100644
--- a/arch/arm/mach-at91/sam9_smc.h
+++ b/arch/arm/mach-at91/sam9_smc.h
@@ -8,27 +8,4 @@
  * published by the Free Software Foundation.
  */
 
-struct sam9_smc_config {
-        /* Setup register */
-        u8 ncs_read_setup;
-        u8 nrd_setup;
-        u8 ncs_write_setup;
-        u8 nwe_setup;
-
-        /* Pulse register */
-        u8 ncs_read_pulse;
-        u8 nrd_pulse;
-        u8 ncs_write_pulse;
-        u8 nwe_pulse;
-
-        /* Cycle register */
-        u16 read_cycle;
-        u16 write_cycle;
-
-        /* Mode register */
-        u32 mode;
-        u8 tdf_cycles:4;
-};
-
-extern void __init sam9_smc_configure(int id, int cs, struct sam9_smc_config* config);
 extern void __init at91sam9_ioremap_smc(int id, u32 addr);
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 8bdcc3cb6012..69d3fc4c46f3 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -29,9 +29,12 @@ EXPORT_SYMBOL(at91_soc_initdata);
 void __init at91rm9200_set_type(int type)
 {
         if (type == ARCH_REVISON_9200_PQFP)
-                at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
-        else
                 at91_soc_initdata.subtype = AT91_SOC_RM9200_PQFP;
+        else
+                at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
+
+        pr_info("AT91: filled in soc subtype: %s\n",
+                at91_get_soc_subtype(&at91_soc_initdata));
 }
 
 void __init at91_init_irq_default(void)
@@ -281,6 +284,15 @@ void __init at91_ioremap_shdwc(u32 base_addr)
         pm_power_off = at91sam9_poweroff;
 }
 
+void __iomem *at91_rstc_base;
+
+void __init at91_ioremap_rstc(u32 base_addr)
+{
+        at91_rstc_base = ioremap(base_addr, 16);
+        if (!at91_rstc_base)
+                panic("Impossible to ioremap at91_rstc_base\n");
+}
+
 void __init at91_initialize(unsigned long main_clock)
 {
         at91_boot_soc.ioremap_registers();
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c
index 9e5e7552498c..45c97b1ee9b1 100644
--- a/arch/arm/mach-bcmring/arch.c
+++ b/arch/arm/mach-bcmring/arch.c
@@ -194,6 +194,6 @@ MACHINE_START(BCMRING, "BCMRING")
         .init_early = bcmring_init_early,
         .init_irq = bcmring_init_irq,
         .timer = &bcmring_timer,
-        .init_machine = bcmring_init_machine
+        .init_machine = bcmring_init_machine,
         .restart = bcmring_restart,
 MACHINE_END
diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c
index 1a1a27dd5654..1024396797e1 100644
--- a/arch/arm/mach-bcmring/dma.c
+++ b/arch/arm/mach-bcmring/dma.c
@@ -33,17 +33,11 @@
 
 #include <mach/timer.h>
 
-#include <linux/mm.h>
 #include <linux/pfn.h>
 #include <linux/atomic.h>
 #include <linux/sched.h>
 #include <mach/dma.h>
 
-/* I don't quite understand why dc4 fails when this is set to 1 and DMA is enabled */
-/* especially since dc4 doesn't use kmalloc'd memory. */
-
-#define ALLOW_MAP_OF_KMALLOC_MEMORY 0
-
 /* ---- Public Variables ------------------------------------------------- */
 
 /* ---- Private Constants and Types -------------------------------------- */
@@ -53,24 +47,12 @@
 #define CONTROLLER_FROM_HANDLE(handle)    (((handle) >> 4) & 0x0f)
 #define CHANNEL_FROM_HANDLE(handle)       ((handle) & 0x0f)
 
-#define DMA_MAP_DEBUG   0
-
-#if DMA_MAP_DEBUG
-#   define  DMA_MAP_PRINT(fmt, args...)   printk("%s: " fmt, __func__,  ## args)
-#else
-#   define  DMA_MAP_PRINT(fmt, args...)
-#endif
 
 /* ---- Private Variables ------------------------------------------------ */
 
 static DMA_Global_t gDMA;
 static struct proc_dir_entry *gDmaDir;
 
-static atomic_t gDmaStatMemTypeKmalloc = ATOMIC_INIT(0);
-static atomic_t gDmaStatMemTypeVmalloc = ATOMIC_INIT(0);
-static atomic_t gDmaStatMemTypeUser = ATOMIC_INIT(0);
-static atomic_t gDmaStatMemTypeCoherent = ATOMIC_INIT(0);
-
 #include "dma_device.c"
 
 /* ---- Private Function Prototypes -------------------------------------- */
@@ -79,34 +61,6 @@ static atomic_t gDmaStatMemTypeCoherent = ATOMIC_INIT(0);
 
 /****************************************************************************/
 /**
-*   Displays information for /proc/dma/mem-type
-*/
-/****************************************************************************/
-
-static int dma_proc_read_mem_type(char *buf, char **start, off_t offset,
-                                  int count, int *eof, void *data)
-{
-        int len = 0;
-
-        len += sprintf(buf + len, "dma_map_mem statistics\n");
-        len +=
-            sprintf(buf + len, "coherent: %d\n",
-                    atomic_read(&gDmaStatMemTypeCoherent));
-        len +=
-            sprintf(buf + len, "kmalloc:  %d\n",
-                    atomic_read(&gDmaStatMemTypeKmalloc));
-        len +=
-            sprintf(buf + len, "vmalloc:  %d\n",
-                    atomic_read(&gDmaStatMemTypeVmalloc));
-        len +=
-            sprintf(buf + len, "user:     %d\n",
-                    atomic_read(&gDmaStatMemTypeUser));
-
-        return len;
-}
-
-/****************************************************************************/
-/**
 *   Displays information for /proc/dma/channels
 */
 /****************************************************************************/
@@ -846,8 +800,6 @@ int dma_init(void)
                                        dma_proc_read_channels, NULL);
                 create_proc_read_entry("devices", 0, gDmaDir,
                                        dma_proc_read_devices, NULL);
-                create_proc_read_entry("mem-type", 0, gDmaDir,
-                                       dma_proc_read_mem_type, NULL);
         }
 
 out:
@@ -1565,767 +1517,3 @@ int dma_set_device_handler(DMA_Device_t dev,	/* Device to set the callback for.
 }
 
 EXPORT_SYMBOL(dma_set_device_handler);
-
-/****************************************************************************/
-/**
-*   Initializes a memory mapping structure
-*/
-/****************************************************************************/
-
-int dma_init_mem_map(DMA_MemMap_t *memMap)
-{
-        memset(memMap, 0, sizeof(*memMap));
-
-        sema_init(&memMap->lock, 1);
-
-        return 0;
-}
-
-EXPORT_SYMBOL(dma_init_mem_map);
-
-/****************************************************************************/
-/**
-*   Releases any memory currently being held by a memory mapping structure.
-*/
-/****************************************************************************/
-
-int dma_term_mem_map(DMA_MemMap_t *memMap)
-{
-        down(&memMap->lock);    /* Just being paranoid */
-
-        /* Free up any allocated memory */
-
-        up(&memMap->lock);
-        memset(memMap, 0, sizeof(*memMap));
-
-        return 0;
-}
-
-EXPORT_SYMBOL(dma_term_mem_map);
-
-/****************************************************************************/
-/**
-*   Looks at a memory address and categorizes it.
-*
-*   @return One of the values from the DMA_MemType_t enumeration.
-*/
-/****************************************************************************/
-
-DMA_MemType_t dma_mem_type(void *addr)
-{
-        unsigned long addrVal = (unsigned long)addr;
-
-        if (addrVal >= CONSISTENT_BASE) {
-                /* NOTE: DMA virtual memory space starts at 0xFFxxxxxx */
-
-                /* dma_alloc_xxx pages are physically and virtually contiguous */
-
-                return DMA_MEM_TYPE_DMA;
-        }
-
-        /* Technically, we could add one more classification. Addresses between VMALLOC_END */
-        /* and the beginning of the DMA virtual address could be considered to be I/O space. */
-        /* Right now, nobody cares about this particular classification, so we ignore it. */
-
-        if (is_vmalloc_addr(addr)) {
-                /* Address comes from the vmalloc'd region. Pages are virtually */
-                /* contiguous but NOT physically contiguous */
-
-                return DMA_MEM_TYPE_VMALLOC;
-        }
-
-        if (addrVal >= PAGE_OFFSET) {
-                /* PAGE_OFFSET is typically 0xC0000000 */
-
-                /* kmalloc'd pages are physically contiguous */
-
-                return DMA_MEM_TYPE_KMALLOC;
-        }
-
-        return DMA_MEM_TYPE_USER;
-}
-
-EXPORT_SYMBOL(dma_mem_type);
-
-/****************************************************************************/
-/**
-*   Looks at a memory address and determines if we support DMA'ing to/from
-*   that type of memory.
-*
-*   @return boolean -
-*               return value != 0 means dma supported
-*               return value == 0 means dma not supported
-*/
-/****************************************************************************/
-
-int dma_mem_supports_dma(void *addr)
-{
-        DMA_MemType_t memType = dma_mem_type(addr);
-
-        return (memType == DMA_MEM_TYPE_DMA)
-#if ALLOW_MAP_OF_KMALLOC_MEMORY
-            || (memType == DMA_MEM_TYPE_KMALLOC)
-#endif
-            || (memType == DMA_MEM_TYPE_USER);
-}
-
-EXPORT_SYMBOL(dma_mem_supports_dma);
-
-/****************************************************************************/
-/**
-*   Maps in a memory region such that it can be used for performing a DMA.
-*
-*   @return
-*/
-/****************************************************************************/
-
-int dma_map_start(DMA_MemMap_t *memMap, /* Stores state information about the map */
-                  enum dma_data_direction dir   /* Direction that the mapping will be going */
-    ) {
-        int rc;
-
-        down(&memMap->lock);
-
-        DMA_MAP_PRINT("memMap: %p\n", memMap);
-
-        if (memMap->inUse) {
-                printk(KERN_ERR "%s: memory map %p is already being used\n",
-                       __func__, memMap);
-                rc = -EBUSY;
-                goto out;
-        }
-
-        memMap->inUse = 1;
-        memMap->dir = dir;
-        memMap->numRegionsUsed = 0;
-
-        rc = 0;
-
-out:
-
-        DMA_MAP_PRINT("returning %d", rc);
-
-        up(&memMap->lock);
-
-        return rc;
-}
-
-EXPORT_SYMBOL(dma_map_start);
-
-/****************************************************************************/
-/**
-*   Adds a segment of memory to a memory map. Each segment is both
-*   physically and virtually contiguous.
-*
-*   @return     0 on success, error code otherwise.
-*/
-/****************************************************************************/
-
-static int dma_map_add_segment(DMA_MemMap_t *memMap,    /* Stores state information about the map */
-                               DMA_Region_t *region,    /* Region that the segment belongs to */
-                               void *virtAddr,  /* Virtual address of the segment being added */
-                               dma_addr_t physAddr,     /* Physical address of the segment being added */
-                               size_t numBytes  /* Number of bytes of the segment being added */
-    ) {
-        DMA_Segment_t *segment;
-
-        DMA_MAP_PRINT("memMap:%p va:%p pa:0x%x #:%d\n", memMap, virtAddr,
-                      physAddr, numBytes);
-
-        /* Sanity check */
-
-        if (((unsigned long)virtAddr < (unsigned long)region->virtAddr)
-            || (((unsigned long)virtAddr + numBytes)) >
-            ((unsigned long)region->virtAddr + region->numBytes)) {
-                printk(KERN_ERR
-                       "%s: virtAddr %p is outside region @ %p len: %d\n",
-                       __func__, virtAddr, region->virtAddr, region->numBytes);
-                return -EINVAL;
-        }
-
-        if (region->numSegmentsUsed > 0) {
-                /* Check to see if this segment is physically contiguous with the previous one */
-
-                segment = &region->segment[region->numSegmentsUsed - 1];
-
-                if ((segment->physAddr + segment->numBytes) == physAddr) {
-                        /* It is - just add on to the end */
-
-                        DMA_MAP_PRINT("appending %d bytes to last segment\n",
-                                      numBytes);
-
-                        segment->numBytes += numBytes;
-
-                        return 0;
-                }
-        }
-
-        /* Reallocate to hold more segments, if required. */
-
-        if (region->numSegmentsUsed >= region->numSegmentsAllocated) {
-                DMA_Segment_t *newSegment;
-                size_t oldSize =
-                    region->numSegmentsAllocated * sizeof(*newSegment);
-                int newAlloc = region->numSegmentsAllocated + 4;
-                size_t newSize = newAlloc * sizeof(*newSegment);
-
-                newSegment = kmalloc(newSize, GFP_KERNEL);
-                if (newSegment == NULL) {
-                        return -ENOMEM;
-                }
-                memcpy(newSegment, region->segment, oldSize);
-                memset(&((uint8_t *) newSegment)[oldSize], 0,
-                       newSize - oldSize);
-                kfree(region->segment);
-
-                region->numSegmentsAllocated = newAlloc;
-                region->segment = newSegment;
-        }
-
-        segment = &region->segment[region->numSegmentsUsed];
-        region->numSegmentsUsed++;
-
-        segment->virtAddr = virtAddr;
-        segment->physAddr = physAddr;
-        segment->numBytes = numBytes;
-
-        DMA_MAP_PRINT("returning success\n");
-
-        return 0;
-}
-
-/****************************************************************************/
-/**
-*   Adds a region of memory to a memory map. Each region is virtually
-*   contiguous, but not necessarily physically contiguous.
-*
-*   @return     0 on success, error code otherwise.
-*/
-/****************************************************************************/
-
-int dma_map_add_region(DMA_MemMap_t *memMap,    /* Stores state information about the map */
-                       void *mem,       /* Virtual address that we want to get a map of */
-                       size_t numBytes  /* Number of bytes being mapped */
-    ) {
-        unsigned long addr = (unsigned long)mem;
-        unsigned int offset;
-        int rc = 0;
-        DMA_Region_t *region;
-        dma_addr_t physAddr;
-
-        down(&memMap->lock);
-
-        DMA_MAP_PRINT("memMap:%p va:%p #:%d\n", memMap, mem, numBytes);
-
-        if (!memMap->inUse) {
-                printk(KERN_ERR "%s: Make sure you call dma_map_start first\n",
-                       __func__);
-                rc = -EINVAL;
-                goto out;
-        }
-
-        /* Reallocate to hold more regions. */
-
-        if (memMap->numRegionsUsed >= memMap->numRegionsAllocated) {
-                DMA_Region_t *newRegion;
-                size_t oldSize =
-                    memMap->numRegionsAllocated * sizeof(*newRegion);
-                int newAlloc = memMap->numRegionsAllocated + 4;
-                size_t newSize = newAlloc * sizeof(*newRegion);
-
-                newRegion = kmalloc(newSize, GFP_KERNEL);
-                if (newRegion == NULL) {
-                        rc = -ENOMEM;
-                        goto out;
-                }
-                memcpy(newRegion, memMap->region, oldSize);
-                memset(&((uint8_t *) newRegion)[oldSize], 0, newSize - oldSize);
-
-                kfree(memMap->region);
-
-                memMap->numRegionsAllocated = newAlloc;
-                memMap->region = newRegion;
-        }
-
-        region = &memMap->region[memMap->numRegionsUsed];
-        memMap->numRegionsUsed++;
-
-        offset = addr & ~PAGE_MASK;
-
-        region->memType = dma_mem_type(mem);
-        region->virtAddr = mem;
-        region->numBytes = numBytes;
-        region->numSegmentsUsed = 0;
-        region->numLockedPages = 0;
-        region->lockedPages = NULL;
-
-        switch (region->memType) {
-        case DMA_MEM_TYPE_VMALLOC:
-                {
-                        atomic_inc(&gDmaStatMemTypeVmalloc);
-
-                        /* printk(KERN_ERR "%s: vmalloc'd pages are not supported\n", __func__); */
-
-                        /* vmalloc'd pages are not physically contiguous */
-
-                        rc = -EINVAL;
-                        break;
-                }
-
-        case DMA_MEM_TYPE_KMALLOC:
-                {
-                        atomic_inc(&gDmaStatMemTypeKmalloc);
-
-                        /* kmalloc'd pages are physically contiguous, so they'll have exactly */
-                        /* one segment */
-
-#if ALLOW_MAP_OF_KMALLOC_MEMORY
-                        physAddr =
-                            dma_map_single(NULL, mem, numBytes, memMap->dir);
-                        rc = dma_map_add_segment(memMap, region, mem, physAddr,
-                                                 numBytes);
-#else
-                        rc = -EINVAL;
-#endif
-                        break;
-                }
-
-        case DMA_MEM_TYPE_DMA:
-                {
-                        /* dma_alloc_xxx pages are physically contiguous */
-
-                        atomic_inc(&gDmaStatMemTypeCoherent);
-
-                        physAddr = (vmalloc_to_pfn(mem) << PAGE_SHIFT) + offset;
-
-                        dma_sync_single_for_cpu(NULL, physAddr, numBytes,
-                                                memMap->dir);
-                        rc = dma_map_add_segment(memMap, region, mem, physAddr,
-                                                 numBytes);
-                        break;
-                }
-
-        case DMA_MEM_TYPE_USER:
-                {
-                        size_t firstPageOffset;
-                        size_t firstPageSize;
-                        struct page **pages;
-                        struct task_struct *userTask;
-
-                        atomic_inc(&gDmaStatMemTypeUser);
-
-#if 1
-                        /* If the pages are user pages, then the dma_mem_map_set_user_task function */
-                        /* must have been previously called. */
-
-                        if (memMap->userTask == NULL) {
-                                printk(KERN_ERR
-                                       "%s: must call dma_mem_map_set_user_task when using user-mode memory\n",
-                                       __func__);
-                                return -EINVAL;
-                        }
-
-                        /* User pages need to be locked. */
-
-                        firstPageOffset =
-                            (unsigned long)region->virtAddr & (PAGE_SIZE - 1);
-                        firstPageSize = PAGE_SIZE - firstPageOffset;
-
-                        region->numLockedPages = (firstPageOffset
-                                                  + region->numBytes +
-                                                  PAGE_SIZE - 1) / PAGE_SIZE;
-                        pages =
-                            kmalloc(region->numLockedPages *
-                                    sizeof(struct page *), GFP_KERNEL);
-
-                        if (pages == NULL) {
-                                region->numLockedPages = 0;
-                                return -ENOMEM;
-                        }
-
-                        userTask = memMap->userTask;
-
-                        down_read(&userTask->mm->mmap_sem);
-                        rc = get_user_pages(userTask,   /* task */
-                                            userTask->mm,       /* mm */
-                                            (unsigned long)region->virtAddr,    /* start */
-                                            region->numLockedPages,     /* len */
-                                            memMap->dir == DMA_FROM_DEVICE,     /* write */
-                                            0,  /* force */
-                                            pages,      /* pages (array of pointers to page) */
-                                            NULL);      /* vmas */
-                        up_read(&userTask->mm->mmap_sem);
-
-                        if (rc != region->numLockedPages) {
-                                kfree(pages);
-                                region->numLockedPages = 0;
-
-                                if (rc >= 0) {
-                                        rc = -EINVAL;
-                                }
-                        } else {
-                                uint8_t *virtAddr = region->virtAddr;
-                                size_t bytesRemaining;
-                                int pageIdx;
-
-                                rc = 0; /* Since get_user_pages returns +ve number */
-
-                                region->lockedPages = pages;
-
-                                /* We've locked the user pages. Now we need to walk them and figure */
-                                /* out the physical addresses. */
-
-                                /* The first page may be partial */
-
-                                dma_map_add_segment(memMap,
-                                                    region,
-                                                    virtAddr,
-                                                    PFN_PHYS(page_to_pfn
-                                                             (pages[0])) +
-                                                    firstPageOffset,
-                                                    firstPageSize);
-
-                                virtAddr += firstPageSize;
-                                bytesRemaining =
-                                    region->numBytes - firstPageSize;
-
-                                for (pageIdx = 1;
-                                     pageIdx < region->numLockedPages;
-                                     pageIdx++) {
-                                        size_t bytesThisPage =
-                                            (bytesRemaining >
-                                             PAGE_SIZE ? PAGE_SIZE :
-                                             bytesRemaining);
-
-                                        DMA_MAP_PRINT
-                                            ("pageIdx:%d pages[pageIdx]=%p pfn=%u phys=%u\n",
-                                             pageIdx, pages[pageIdx],
-                                             page_to_pfn(pages[pageIdx]),
-                                             PFN_PHYS(page_to_pfn
-                                                      (pages[pageIdx])));
-
-                                        dma_map_add_segment(memMap,
-                                                            region,
-                                                            virtAddr,
-                                                            PFN_PHYS(page_to_pfn
-                                                                     (pages
-                                                                      [pageIdx])),
-                                                            bytesThisPage);
-
-                                        virtAddr += bytesThisPage;
-                                        bytesRemaining -= bytesThisPage;
-                                }
-                        }
-#else
-                        printk(KERN_ERR
-                               "%s: User mode pages are not yet supported\n",
-                               __func__);
-
-                        /* user pages are not physically contiguous */
-
-                        rc = -EINVAL;
-#endif
-                        break;
-                }
-
-        default:
-                {
-                        printk(KERN_ERR "%s: Unsupported memory type: %d\n",
-                               __func__, region->memType);
-
-                        rc = -EINVAL;
-                        break;
-                }
-        }
-
-        if (rc != 0) {
-                memMap->numRegionsUsed--;
-        }
-
-out:
-
-        DMA_MAP_PRINT("returning %d\n", rc);
-
-        up(&memMap->lock);
-
-        return rc;
-}
-
-EXPORT_SYMBOL(dma_map_add_segment);
-
-/****************************************************************************/
-/**
-*   Maps in a memory region such that it can be used for performing a DMA.
-*
-*   @return     0 on success, error code otherwise.
-*/
-/****************************************************************************/
-
-int dma_map_mem(DMA_MemMap_t *memMap,   /* Stores state information about the map */
-                void *mem,      /* Virtual address that we want to get a map of */
-                size_t numBytes,        /* Number of bytes being mapped */
-                enum dma_data_direction dir     /* Direction that the mapping will be going */
-    ) {
-        int rc;
-
-        rc = dma_map_start(memMap, dir);
-        if (rc == 0) {
-                rc = dma_map_add_region(memMap, mem, numBytes);
-                if (rc < 0) {
-                        /* Since the add fails, this function will fail, and the caller won't */
-                        /* call unmap, so we need to do it here. */
-
-                        dma_unmap(memMap, 0);
-                }
-        }
-
-        return rc;
-}
-
-EXPORT_SYMBOL(dma_map_mem);
-
-/****************************************************************************/
-/**
-*   Setup a descriptor ring for a given memory map.
-*
-*   It is assumed that the descriptor ring has already been initialized, and
-*   this routine will only reallocate a new descriptor ring if the existing
-*   one is too small.
-*
-*   @return     0 on success, error code otherwise.
-*/
-/****************************************************************************/
-
-int dma_map_create_descriptor_ring(DMA_Device_t dev,    /* DMA device (where the ring is stored) */
-                                   DMA_MemMap_t *memMap,        /* Memory map that will be used */
-                                   dma_addr_t devPhysAddr       /* Physical address of device */
-    ) {
-        int rc;
-        int numDescriptors;
-        DMA_DeviceAttribute_t *devAttr;
-        DMA_Region_t *region;
-        DMA_Segment_t *segment;
-        dma_addr_t srcPhysAddr;
-        dma_addr_t dstPhysAddr;
-        int regionIdx;
-        int segmentIdx;
-
-        devAttr = &DMA_gDeviceAttribute[dev];
-
-        down(&memMap->lock);
-
-        /* Figure out how many descriptors we need */
-
-        numDescriptors = 0;
-        for (regionIdx = 0; regionIdx < memMap->numRegionsUsed; regionIdx++) {
-                region = &memMap->region[regionIdx];
-
-                for (segmentIdx = 0; segmentIdx < region->numSegmentsUsed;
-                     segmentIdx++) {
-                        segment = &region->segment[segmentIdx];
-
-                        if (memMap->dir == DMA_TO_DEVICE) {
-                                srcPhysAddr = segment->physAddr;
-                                dstPhysAddr = devPhysAddr;
-                        } else {
-                                srcPhysAddr = devPhysAddr;
-                                dstPhysAddr = segment->physAddr;
-                        }
-
-                        rc =
-                             dma_calculate_descriptor_count(dev, srcPhysAddr,
-                                                            dstPhysAddr,
-                                                            segment->
-                                                            numBytes);
-                        if (rc < 0) {
-                                printk(KERN_ERR
-                                       "%s: dma_calculate_descriptor_count failed: %d\n",
-                                       __func__, rc);
-                                goto out;
-                        }
-                        numDescriptors += rc;
-                }
-        }
-
-        /* Adjust the size of the ring, if it isn't big enough */
-
-        if (numDescriptors > devAttr->ring.descriptorsAllocated) {
-                dma_free_descriptor_ring(&devAttr->ring);
-                rc =
-                     dma_alloc_descriptor_ring(&devAttr->ring,
-                                               numDescriptors);
-                if (rc < 0) {
-                        printk(KERN_ERR
-                               "%s: dma_alloc_descriptor_ring failed: %d\n",
-                               __func__, rc);
-                        goto out;
-                }
-        } else {
-                rc =
-                     dma_init_descriptor_ring(&devAttr->ring,
-                                              numDescriptors);
-                if (rc < 0) {
-                        printk(KERN_ERR
-                               "%s: dma_init_descriptor_ring failed: %d\n",
-                               __func__, rc);
-                        goto out;
-                }
-        }
-
-        /* Populate the descriptors */
-
-        for (regionIdx = 0; regionIdx < memMap->numRegionsUsed; regionIdx++) {
-                region = &memMap->region[regionIdx];
-
-                for (segmentIdx = 0; segmentIdx < region->numSegmentsUsed;
-                     segmentIdx++) {
-                        segment = &region->segment[segmentIdx];
-
-                        if (memMap->dir == DMA_TO_DEVICE) {
-                                srcPhysAddr = segment->physAddr;
-                                dstPhysAddr = devPhysAddr;
-                        } else {
-                                srcPhysAddr = devPhysAddr;
-                                dstPhysAddr = segment->physAddr;
-                        }
-
-                        rc =
-                             dma_add_descriptors(&devAttr->ring, dev,
-                                                 srcPhysAddr, dstPhysAddr,
-                                                 segment->numBytes);
-                        if (rc < 0) {
-                                printk(KERN_ERR
-                                       "%s: dma_add_descriptors failed: %d\n",
-                                       __func__, rc);
-                                goto out;
-                        }
-                }
-        }
-
-        rc = 0;
-
-out:
-
-        up(&memMap->lock);
-        return rc;
-}
-
-EXPORT_SYMBOL(dma_map_create_descriptor_ring);
-
-/****************************************************************************/
-/**
-*   Maps in a memory region such that it can be used for performing a DMA.
-*
-*   @return
-*/
-/****************************************************************************/
-
-int dma_unmap(DMA_MemMap_t *memMap,     /* Stores state information about the map */
-              int dirtied       /* non-zero if any of the pages were modified */
-    ) {
-
-        int rc = 0;
-        int regionIdx;
-        int segmentIdx;
-        DMA_Region_t *region;
-        DMA_Segment_t *segment;
-
-        down(&memMap->lock);
-
-        for (regionIdx = 0; regionIdx < memMap->numRegionsUsed; regionIdx++) {
-                region = &memMap->region[regionIdx];
-
-                for (segmentIdx = 0; segmentIdx < region->numSegmentsUsed;
-                     segmentIdx++) {
-                        segment = &region->segment[segmentIdx];
-
-                        switch (region->memType) {
-                        case DMA_MEM_TYPE_VMALLOC:
-                                {
-                                        printk(KERN_ERR
-                                               "%s: vmalloc'd pages are not yet supported\n",
-                                               __func__);
-                                        rc = -EINVAL;
-                                        goto out;
-                                }
-
-                        case DMA_MEM_TYPE_KMALLOC:
-                                {
-#if ALLOW_MAP_OF_KMALLOC_MEMORY
-                                        dma_unmap_single(NULL,
-                                                         segment->physAddr,
-                                                         segment->numBytes,
-                                                         memMap->dir);
-#endif
-                                        break;
-                                }
-
-                        case DMA_MEM_TYPE_DMA:
-                                {
-                                        dma_sync_single_for_cpu(NULL,
-                                                                segment->
-                                                                physAddr,
-                                                                segment->
-                                                                numBytes,
-                                                                memMap->dir);
-                                        break;
-                                }
-
-                        case DMA_MEM_TYPE_USER:
-                                {
-                                        /* Nothing to do here. */
-
-                                        break;
-                                }
-
-                        default:
-                                {
-                                        printk(KERN_ERR
-                                               "%s: Unsupported memory type: %d\n",
-                                               __func__, region->memType);
-                                        rc = -EINVAL;
-                                        goto out;
-                                }
-                        }
-
-                        segment->virtAddr = NULL;
-                        segment->physAddr = 0;
-                        segment->numBytes = 0;
-                }
-
-                if (region->numLockedPages > 0) {
-                        int pageIdx;
-
-                        /* Some user pages were locked. We need to go and unlock them now. */
-
-                        for (pageIdx = 0; pageIdx < region->numLockedPages;
-                             pageIdx++) {
-                                struct page *page =
-                                    region->lockedPages[pageIdx];
-
-                                if (memMap->dir == DMA_FROM_DEVICE) {
-                                        SetPageDirty(page);
-                                }
-                                page_cache_release(page);
-                        }
-                        kfree(region->lockedPages);
-                        region->numLockedPages = 0;
-                        region->lockedPages = NULL;
-                }
-
-                region->memType = DMA_MEM_TYPE_NONE;
-                region->virtAddr = NULL;
-                region->numBytes = 0;
-                region->numSegmentsUsed = 0;
-        }
-        memMap->userTask = NULL;
-        memMap->numRegionsUsed = 0;
-        memMap->inUse = 0;
-
-out:
-        up(&memMap->lock);
-
-        return rc;
-}
-
-EXPORT_SYMBOL(dma_unmap);
diff --git a/arch/arm/mach-bcmring/include/mach/dma.h b/arch/arm/mach-bcmring/include/mach/dma.h
index 1f2c5319c056..72543781207b 100644
--- a/arch/arm/mach-bcmring/include/mach/dma.h
+++ b/arch/arm/mach-bcmring/include/mach/dma.h
@@ -26,15 +26,9 @@
 /* ---- Include Files ---------------------------------------------------- */
 
 #include <linux/kernel.h>
-#include <linux/wait.h>
 #include <linux/semaphore.h>
 #include <csp/dmacHw.h>
 #include <mach/timer.h>
-#include <linux/scatterlist.h>
-#include <linux/dma-mapping.h>
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
-#include <linux/pagemap.h>
 
 /* ---- Constants and Types ---------------------------------------------- */
 
@@ -113,78 +107,6 @@ typedef struct {
 
 /****************************************************************************
 *
-*   The DMA_MemType_t and DMA_MemMap_t are helper structures used to setup
-*   DMA chains from a variety of memory sources.
-*
-*****************************************************************************/
-
-#define DMA_MEM_MAP_MIN_SIZE    4096    /* Pages less than this size are better */
-                                        /* off not being DMA'd. */
-
-typedef enum {
-        DMA_MEM_TYPE_NONE,      /* Not a valid setting */
-        DMA_MEM_TYPE_VMALLOC,   /* Memory came from vmalloc call */
-        DMA_MEM_TYPE_KMALLOC,   /* Memory came from kmalloc call */
-        DMA_MEM_TYPE_DMA,       /* Memory came from dma_alloc_xxx call */
-        DMA_MEM_TYPE_USER,      /* Memory came from user space. */
-
-} DMA_MemType_t;
-
-/* A segment represents a physically and virtually contiguous chunk of memory. */
-/* i.e. each segment can be DMA'd */
-/* A user of the DMA code will add memory regions. Each region may need to be */
-/* represented by one or more segments. */
-
-typedef struct {
-        void *virtAddr;         /* Virtual address used for this segment */
-        dma_addr_t physAddr;    /* Physical address this segment maps to */
-        size_t numBytes;        /* Size of the segment, in bytes */
-
-} DMA_Segment_t;
-
-/* A region represents a virtually contiguous chunk of memory, which may be */
-/* made up of multiple segments. */
-
-typedef struct {
-        DMA_MemType_t memType;
-        void *virtAddr;
-        size_t numBytes;
-
-        /* Each region (virtually contiguous) consists of one or more segments. Each */
-        /* segment is virtually and physically contiguous. */
-
-        int numSegmentsUsed;
-        int numSegmentsAllocated;
-        DMA_Segment_t *segment;
-
-        /* When a region corresponds to user memory, we need to lock all of the pages */
-        /* down before we can figure out the physical addresses. The lockedPage array contains */
-        /* the pages that were locked, and which subsequently need to be unlocked once the */
-        /* memory is unmapped. */
-
-        unsigned numLockedPages;
-        struct page **lockedPages;
-
-} DMA_Region_t;
-
-typedef struct {
-        int inUse;              /* Is this mapping currently being used? */
-        struct semaphore lock;  /* Acquired when using this structure */
-        enum dma_data_direction dir;    /* Direction this transfer is intended for */
-
-        /* In the event that we're mapping user memory, we need to know which task */
-        /* the memory is for, so that we can obtain the correct mm locks. */
-
-        struct task_struct *userTask;
-
-        int numRegionsUsed;
-        int numRegionsAllocated;
-        DMA_Region_t *region;
-
-} DMA_MemMap_t;
-
-/****************************************************************************
-*
 *   The DMA_DeviceAttribute_t contains information which describes a
 *   particular DMA device (or peripheral).
 *
@@ -570,124 +492,6 @@ int dma_alloc_double_dst_descriptors(DMA_Handle_t handle,	/* DMA Handle */
 
 /****************************************************************************/
 /**
-*   Initializes a DMA_MemMap_t data structure
-*/
-/****************************************************************************/
-
-int dma_init_mem_map(DMA_MemMap_t *memMap       /* Stores state information about the map */
-    );
-
-/****************************************************************************/
-/**
-*   Releases any memory currently being held by a memory mapping structure.
-*/
-/****************************************************************************/
-
-int dma_term_mem_map(DMA_MemMap_t *memMap       /* Stores state information about the map */
-    );
-
-/****************************************************************************/
-/**
-*   Looks at a memory address and categorizes it.
-*
-*   @return One of the values from the DMA_MemType_t enumeration.
-*/
-/****************************************************************************/
-
-DMA_MemType_t dma_mem_type(void *addr);
-
-/****************************************************************************/
-/**
-*   Sets the process (aka userTask) associated with a mem map. This is
-*   required if user-mode segments will be added to the mapping.
-*/
-/****************************************************************************/
-
-static inline void dma_mem_map_set_user_task(DMA_MemMap_t *memMap,
-                                             struct task_struct *task)
-{
-        memMap->userTask = task;
-}
-
-/****************************************************************************/
-/**
-*   Looks at a memory address and determines if we support DMA'ing to/from
-*   that type of memory.
-*
-*   @return boolean -
-*               return value != 0 means dma supported
-*               return value == 0 means dma not supported
-*/
-/****************************************************************************/
-
-int dma_mem_supports_dma(void *addr);
-
-/****************************************************************************/
-/**
-*   Initializes a memory map for use. Since this function acquires a
-*   sempaphore within the memory map, it is VERY important that dma_unmap
-*   be called when you're finished using the map.
-*/
-/****************************************************************************/
-
-int dma_map_start(DMA_MemMap_t *memMap, /* Stores state information about the map */
-                  enum dma_data_direction dir   /* Direction that the mapping will be going */
-    );
-
-/****************************************************************************/
-/**
-*   Adds a segment of memory to a memory map.
-*
-*   @return     0 on success, error code otherwise.
-*/
-/****************************************************************************/
-
-int dma_map_add_region(DMA_MemMap_t *memMap,    /* Stores state information about the map */
-                       void *mem,       /* Virtual address that we want to get a map of */
-                       size_t numBytes  /* Number of bytes being mapped */
-    );
-
-/****************************************************************************/
-/**
-*   Creates a descriptor ring from a memory mapping.
-*
-*   @return 0 on success, error code otherwise.
-*/
-/****************************************************************************/
-
-int dma_map_create_descriptor_ring(DMA_Device_t dev,    /* DMA device (where the ring is stored) */
-                                   DMA_MemMap_t *memMap,        /* Memory map that will be used */
-                                   dma_addr_t devPhysAddr       /* Physical address of device */
-    );
-
-/****************************************************************************/
-/**
-*   Maps in a memory region such that it can be used for performing a DMA.
-*
-*   @return
-*/
-/****************************************************************************/
-
-int dma_map_mem(DMA_MemMap_t *memMap,   /* Stores state information about the map */
-                void *addr,     /* Virtual address that we want to get a map of */
-                size_t count,   /* Number of bytes being mapped */
-                enum dma_data_direction dir     /* Direction that the mapping will be going */
-    );
-
-/****************************************************************************/
-/**
-*   Maps in a memory region such that it can be used for performing a DMA.
-*
-*   @return
-*/
-/****************************************************************************/
-
-int dma_unmap(DMA_MemMap_t *memMap,     /* Stores state information about the map */
-              int dirtied       /* non-zero if any of the pages were modified */
-    );
-
-/****************************************************************************/
-/**
 *   Initiates a transfer when the descriptors have already been setup.
 *
 *   This is a special case, and normally, the dma_transfer_xxx functions should
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 6b22b543a83f..d5088900af6c 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -44,7 +44,7 @@
 #include <mach/aemif.h>
 #include <mach/spi.h>
 
-#define DA850_EVM_PHY_ID                "0:00"
+#define DA850_EVM_PHY_ID                "davinci_mdio-0:00"
 #define DA850_LCD_PWR_PIN               GPIO_TO_PIN(2, 8)
 #define DA850_LCD_BL_PIN                GPIO_TO_PIN(2, 15)
 
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 346e1de2f5a8..849311d3cb7c 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -54,7 +54,7 @@ static inline int have_tvp7002(void)
         return 0;
 }
 
-#define DM365_EVM_PHY_ID                "0:01"
+#define DM365_EVM_PHY_ID                "davinci_mdio-0:01"
 /*
  * A MAX-II CPLD is used for various board control functions.
  */
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index a64b49cfedca..1247ecdcf752 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -40,7 +40,7 @@
 #include <mach/usb.h>
 #include <mach/aemif.h>
 
-#define DM644X_EVM_PHY_ID               "0:01"
+#define DM644X_EVM_PHY_ID               "davinci_mdio-0:01"
 #define LXT971_PHY_ID   (0x001378e2)
 #define LXT971_PHY_MASK (0xfffffff0)
 
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 64017558860b..872ac69fa049 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -736,7 +736,7 @@ static struct davinci_uart_config uart_config __initdata = {
         .enabled_uarts = (1 << 0),
 };
 
-#define DM646X_EVM_PHY_ID               "0:01"
+#define DM646X_EVM_PHY_ID               "davinci_mdio-0:01"
 /*
  * The following EDMA channels/slots are not being used by drivers (for
  * example: Timer, GPIO, UART events etc) on dm646x, hence they are being
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index 6c4a16415d47..8d34f513d415 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -39,7 +39,7 @@
 #include <mach/mmc.h>
 #include <mach/usb.h>
 
-#define NEUROS_OSD2_PHY_ID              "0:01"
+#define NEUROS_OSD2_PHY_ID              "davinci_mdio-0:01"
 #define LXT971_PHY_ID                   0x001378e2
 #define LXT971_PHY_MASK                 0xfffffff0
 
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index e7c0c7c53493..45e815760a27 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -21,7 +21,7 @@
 #include <mach/da8xx.h>
 #include <mach/mux.h>
 
-#define HAWKBOARD_PHY_ID                "0:07"
+#define HAWKBOARD_PHY_ID                "davinci_mdio-0:07"
 #define DA850_HAWK_MMCSD_CD_PIN         GPIO_TO_PIN(3, 12)
 #define DA850_HAWK_MMCSD_WP_PIN         GPIO_TO_PIN(3, 13)
 
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 0b136a831c59..31da3c5b2ba3 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -42,7 +42,7 @@
 #include <mach/mux.h>
 #include <mach/usb.h>
 
-#define SFFSDR_PHY_ID           "0:01"
+#define SFFSDR_PHY_ID           "davinci_mdio-0:01"
 static struct mtd_partition davinci_sffsdr_nandflash_partition[] = {
         /* U-Boot Environment: Block 0
          * UBL:                Block 1
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 0ed7fdb64efb..992c4c410185 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -153,34 +153,6 @@ static struct clk pll1_sysclk3 = {
         .div_reg        = PLLDIV3,
 };
 
-static struct clk pll1_sysclk4 = {
-        .name           = "pll1_sysclk4",
-        .parent         = &pll1_clk,
-        .flags          = CLK_PLL,
-        .div_reg        = PLLDIV4,
-};
-
-static struct clk pll1_sysclk5 = {
-        .name           = "pll1_sysclk5",
-        .parent         = &pll1_clk,
-        .flags          = CLK_PLL,
-        .div_reg        = PLLDIV5,
-};
-
-static struct clk pll1_sysclk6 = {
-        .name           = "pll0_sysclk6",
-        .parent         = &pll0_clk,
-        .flags          = CLK_PLL,
-        .div_reg        = PLLDIV6,
-};
-
-static struct clk pll1_sysclk7 = {
-        .name           = "pll1_sysclk7",
-        .parent         = &pll1_clk,
-        .flags          = CLK_PLL,
-        .div_reg        = PLLDIV7,
-};
-
 static struct clk i2c0_clk = {
         .name           = "i2c0",
         .parent         = &pll0_aux_clk,
@@ -397,10 +369,6 @@ static struct clk_lookup da850_clks[] = {
         CLK(NULL,               "pll1_aux",     &pll1_aux_clk),
         CLK(NULL,               "pll1_sysclk2", &pll1_sysclk2),
         CLK(NULL,               "pll1_sysclk3", &pll1_sysclk3),
-        CLK(NULL,               "pll1_sysclk4", &pll1_sysclk4),
-        CLK(NULL,               "pll1_sysclk5", &pll1_sysclk5),
-        CLK(NULL,               "pll1_sysclk6", &pll1_sysclk6),
-        CLK(NULL,               "pll1_sysclk7", &pll1_sysclk7),
         CLK("i2c_davinci.1",    NULL,           &i2c0_clk),
         CLK(NULL,               "timer0",       &timerp64_0_clk),
         CLK("watchdog",         NULL,           &timerp64_1_clk),
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index dd1429ae6405..bda7aca04ca0 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -28,6 +28,7 @@
 #include <asm/mach/arch.h>
 #include <linux/irq.h>
 #include <plat/time.h>
+#include <plat/ehci-orion.h>
 #include <plat/common.h>
 #include <plat/addr-map.h>
 #include "common.h"
@@ -71,7 +72,7 @@ void __init dove_map_io(void)
  ****************************************************************************/
 void __init dove_ehci0_init(void)
 {
-        orion_ehci_init(DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0);
+        orion_ehci_init(DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0, EHCI_PHY_NA);
 }
 
 /*****************************************************************************
diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c
index 03dd4012043e..d5fb44f16d31 100644
--- a/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/arch/arm/mach-ep93xx/vision_ep9307.c
@@ -32,6 +32,7 @@
 #include <mach/hardware.h>
 #include <mach/fb.h>
 #include <mach/ep93xx_spi.h>
+#include <mach/gpio-ep93xx.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
@@ -153,7 +154,6 @@ static struct i2c_board_info vision_i2c_info[] __initdata = {
         }, {
                 I2C_BOARD_INFO("pca9539", 0x74),
                 .platform_data  = &pca953x_74_gpio_data,
-                .irq            = gpio_to_irq(EP93XX_GPIO_LINE_F(7)),
         }, {
                 I2C_BOARD_INFO("pca9539", 0x75),
                 .platform_data  = &pca953x_75_gpio_data,
@@ -348,6 +348,8 @@ static void __init vision_init_machine(void)
                                 "pca9539:74"))
                 pr_warn("cannot request interrupt gpio for pca9539:74\n");
 
+        vision_i2c_info[1].irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7));
+
         ep93xx_register_i2c(&vision_i2c_gpio_data, vision_i2c_info,
                                 ARRAY_SIZE(vision_i2c_info));
         ep93xx_register_spi(&vision_spi_master, vision_spi_board_info,
diff --git a/arch/arm/mach-exynos/clock-exynos4210.c b/arch/arm/mach-exynos/clock-exynos4210.c
index a5823a7f249e..13312ccb2d93 100644
--- a/arch/arm/mach-exynos/clock-exynos4210.c
+++ b/arch/arm/mach-exynos/clock-exynos4210.c
@@ -32,6 +32,7 @@
 
 #include "common.h"
 
+#ifdef CONFIG_PM_SLEEP
 static struct sleep_save exynos4210_clock_save[] = {
         SAVE_ITEM(S5P_CLKSRC_IMAGE),
         SAVE_ITEM(S5P_CLKSRC_LCD1),
@@ -42,6 +43,7 @@ static struct sleep_save exynos4210_clock_save[] = {
         SAVE_ITEM(S5P_CLKGATE_IP_LCD1),
         SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4210),
 };
+#endif
 
 static struct clksrc_clk *sysclks[] = {
         /* nothing here yet */
diff --git a/arch/arm/mach-exynos/clock-exynos4212.c b/arch/arm/mach-exynos/clock-exynos4212.c
index 26a668b0d101..48af28566fa1 100644
--- a/arch/arm/mach-exynos/clock-exynos4212.c
+++ b/arch/arm/mach-exynos/clock-exynos4212.c
@@ -32,12 +32,14 @@
 
 #include "common.h"
 
+#ifdef CONFIG_PM_SLEEP
 static struct sleep_save exynos4212_clock_save[] = {
         SAVE_ITEM(S5P_CLKSRC_IMAGE),
         SAVE_ITEM(S5P_CLKDIV_IMAGE),
         SAVE_ITEM(S5P_CLKGATE_IP_IMAGE_4212),
         SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4212),
 };
+#endif
 
 static struct clk *clk_src_mpll_user_list[] = {
         [0] = &clk_fin_mpll,
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 5a8c42e90005..187287aa57ab 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -30,6 +30,7 @@
 
 #include "common.h"
 
+#ifdef CONFIG_PM_SLEEP
 static struct sleep_save exynos4_clock_save[] = {
         SAVE_ITEM(S5P_CLKDIV_LEFTBUS),
         SAVE_ITEM(S5P_CLKGATE_IP_LEFTBUS),
@@ -93,6 +94,7 @@ static struct sleep_save exynos4_clock_save[] = {
         SAVE_ITEM(S5P_CLKGATE_SCLKCPU),
         SAVE_ITEM(S5P_CLKGATE_IP_CPU),
 };
+#endif
 
 struct clk clk_sclk_hdmi27m = {
         .name           = "sclk_hdmi27m",
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c
index da70e7e39937..dd1ad55524c9 100644
--- a/arch/arm/mach-exynos/hotplug.c
+++ b/arch/arm/mach-exynos/hotplug.c
@@ -16,6 +16,7 @@
 #include <linux/io.h>
 
 #include <asm/cacheflush.h>
+#include <asm/smp_plat.h>
 
 #include <mach/regs-pmu.h>
 
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index 85fa02767d67..e6b02fdf1b09 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -15,11 +15,13 @@
 #include <linux/serial_core.h>
 
 #include <asm/mach/arch.h>
+#include <asm/hardware/gic.h>
 #include <mach/map.h>
 
 #include <plat/cpu.h>
 #include <plat/regs-serial.h>
-#include <plat/exynos4.h>
+
+#include "common.h"
 
 /*
  * The following lookup table is used to override device names when devices
@@ -60,7 +62,7 @@ static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = {
 
 static void __init exynos4210_dt_map_io(void)
 {
-        s5p_init_io(NULL, 0, S5P_VA_CHIPID);
+        exynos_init_io(NULL, 0);
         s3c24xx_init_clocks(24000000);
 }
 
@@ -79,7 +81,9 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
         /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */
         .init_irq       = exynos4_init_irq,
         .map_io         = exynos4210_dt_map_io,
+        .handle_irq     = gic_handle_irq,
         .init_machine   = exynos4210_dt_machine_init,
         .timer          = &exynos4_timer,
         .dt_compat      = exynos4210_dt_compat,
+        .restart        = exynos4_restart,
 MACHINE_END
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index b895ec031105..435261f83f46 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -220,14 +220,14 @@ static struct s3c_fb_pd_win nuri_fb_win0 = {
                 .lower_margin   = 1,
                 .hsync_len      = 48,
                 .vsync_len      = 3,
-                .xres           = 1280,
-                .yres           = 800,
+                .xres           = 1024,
+                .yres           = 600,
                 .refresh        = 60,
         },
         .max_bpp        = 24,
         .default_bpp    = 16,
-        .virtual_x      = 1280,
-        .virtual_y      = 800,
+        .virtual_x      = 1024,
+        .virtual_y      = 2 * 600,
 };
 
 static struct s3c_fb_platdata nuri_fb_pdata __initdata = {
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 37ac93e8d6d9..0fc65ffde8ff 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -910,7 +910,7 @@ static struct s5p_fimc_isp_info universal_camera_sensors[] = {
                 .bus_type       = FIMC_MIPI_CSI2,
                 .board_info     = &m5mols_board_info,
                 .i2c_bus_num    = 0,
-                .clk_frequency  = 21600000UL,
+                .clk_frequency  = 24000000UL,
                 .csi_data_align = 32,
         },
 };
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 683aec786b78..0f2035a1eb6e 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -23,6 +23,7 @@
 
 #include <asm/cacheflush.h>
 #include <asm/hardware/gic.h>
+#include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index a4f61a43c7ba..e19013051772 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -206,7 +206,7 @@ static void exynos4_pm_prepare(void)
 
 }
 
-static int exynos4_pm_add(struct device *dev)
+static int exynos4_pm_add(struct device *dev, struct subsys_interface *sif)
 {
         pm_cpu_prep = exynos4_pm_prepare;
         pm_cpu_sleep = exynos4_cpu_suspend;
@@ -384,7 +384,9 @@ static void exynos4_pm_resume(void)
 
         exynos4_restore_pll();
 
+#ifdef CONFIG_SMP
         scu_enable(S5P_VA_SCU);
+#endif
 
 #ifdef CONFIG_CACHE_L2X0
         s3c_pm_do_restore_core(exynos4_l2cc_save, ARRAY_SIZE(exynos4_l2cc_save));
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
index 7afbe1e55beb..8394d512a402 100644
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@ -25,6 +25,7 @@
 #include <linux/smp.h>
 
 #include <asm/cacheflush.h>
+#include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 #include <asm/hardware/arm_timer.h>
 #include <asm/hardware/timer-sp.h>
@@ -72,9 +73,7 @@ static void __init highbank_map_io(void)
 
 void highbank_set_cpu_jump(int cpu, void *jump_addr)
 {
-#ifdef CONFIG_SMP
         cpu = cpu_logical_map(cpu);
-#endif
         writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu));
         __cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);
         outer_clean_range(HB_JUMP_TABLE_PHYS(cpu),
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 0e6de366c648..4defb97bbfc8 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -22,6 +22,18 @@ config ARCH_MX25
 config MACH_MX27
         bool
 
+config ARCH_MX5
+        bool
+
+config ARCH_MX50
+        bool
+
+config ARCH_MX51
+        bool
+
+config ARCH_MX53
+        bool
+
 config SOC_IMX1
         bool
         select ARCH_MX1
@@ -73,6 +85,31 @@ config SOC_IMX35
         select MXC_AVIC
         select SMP_ON_UP if SMP
 
+config SOC_IMX5
+        select CPU_V7
+        select MXC_TZIC
+        select ARCH_MXC_IOMUX_V3
+        select ARCH_MXC_AUDMUX_V2
+        select ARCH_HAS_CPUFREQ
+        select ARCH_MX5
+        bool
+
+config SOC_IMX50
+        bool
+        select SOC_IMX5
+        select ARCH_MX50
+
+config  SOC_IMX51
+        bool
+        select SOC_IMX5
+        select ARCH_MX5
+        select ARCH_MX51
+
+config  SOC_IMX53
+        bool
+        select SOC_IMX5
+        select ARCH_MX5
+        select ARCH_MX53
 
 if ARCH_IMX_V4_V5
 
@@ -592,6 +629,207 @@ config MACH_VPR200
           Include support for VPR200 platform. This includes specific
           configurations for the board and its peripherals.
 
+comment "i.MX5 platforms:"
+
+config MACH_MX50_RDP
+        bool "Support MX50 reference design platform"
+        depends on BROKEN
+        select SOC_IMX50
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        help
+          Include support for MX50 reference design platform (RDP) board. This
+          includes specific configurations for the board and its peripherals.
+
+comment "i.MX51 machines:"
+
+config MACH_IMX51_DT
+        bool "Support i.MX51 platforms from device tree"
+        select SOC_IMX51
+        select USE_OF
+        select MACH_MX51_BABBAGE
+        help
+          Include support for Freescale i.MX51 based platforms
+          using the device tree for discovery
+
+config MACH_MX51_BABBAGE
+        bool "Support MX51 BABBAGE platforms"
+        select SOC_IMX51
+        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        help
+          Include support for MX51 Babbage platform, also known as MX51EVK in
+          u-boot. This includes specific configurations for the board and its
+          peripherals.
+
+config MACH_MX51_3DS
+        bool "Support MX51PDK (3DS)"
+        select SOC_IMX51
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_KEYPAD
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        select MXC_DEBUG_BOARD
+        help
+          Include support for MX51PDK (3DS) platform. This includes specific
+          configurations for the board and its peripherals.
+
+config MACH_EUKREA_CPUIMX51
+        bool "Support Eukrea CPUIMX51 module"
+        select SOC_IMX51
+        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_NAND
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        help
+          Include support for Eukrea CPUIMX51 platform. This includes
+          specific configurations for the module and its peripherals.
+
+choice
+        prompt "Baseboard"
+        depends on MACH_EUKREA_CPUIMX51
+        default MACH_EUKREA_MBIMX51_BASEBOARD
+
+config MACH_EUKREA_MBIMX51_BASEBOARD
+        prompt "Eukrea MBIMX51 development board"
+        bool
+        select IMX_HAVE_PLATFORM_IMX_KEYPAD
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select LEDS_GPIO_REGISTER
+        help
+          This adds board specific devices that can be found on Eukrea's
+          MBIMX51 evaluation board.
+
+endchoice
+
+config MACH_EUKREA_CPUIMX51SD
+        bool "Support Eukrea CPUIMX51SD module"
+        select SOC_IMX51
+        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_NAND
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        help
+          Include support for Eukrea CPUIMX51SD platform. This includes
+          specific configurations for the module and its peripherals.
+
+choice
+        prompt "Baseboard"
+        depends on MACH_EUKREA_CPUIMX51SD
+        default MACH_EUKREA_MBIMXSD51_BASEBOARD
+
+config MACH_EUKREA_MBIMXSD51_BASEBOARD
+        prompt "Eukrea MBIMXSD development board"
+        bool
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select LEDS_GPIO_REGISTER
+        help
+          This adds board specific devices that can be found on Eukrea's
+          MBIMXSD evaluation board.
+
+endchoice
+
+config MX51_EFIKA_COMMON
+        bool
+        select SOC_IMX51
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_PATA_IMX
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        select MXC_ULPI if USB_ULPI
+
+config MACH_MX51_EFIKAMX
+        bool "Support MX51 Genesi Efika MX nettop"
+        select LEDS_GPIO_REGISTER
+        select MX51_EFIKA_COMMON
+        help
+          Include support for Genesi Efika MX nettop. This includes specific
+          configurations for the board and its peripherals.
+
+config MACH_MX51_EFIKASB
+        bool "Support MX51 Genesi Efika Smartbook"
+        select LEDS_GPIO_REGISTER
+        select MX51_EFIKA_COMMON
+        help
+          Include support for Genesi Efika Smartbook. This includes specific
+          configurations for the board and its peripherals.
+
+comment "i.MX53 machines:"
+
+config MACH_IMX53_DT
+        bool "Support i.MX53 platforms from device tree"
+        select SOC_IMX53
+        select USE_OF
+        select MACH_MX53_ARD
+        select MACH_MX53_EVK
+        select MACH_MX53_LOCO
+        select MACH_MX53_SMD
+        help
+          Include support for Freescale i.MX53 based platforms
+          using the device tree for discovery
+
+config MACH_MX53_EVK
+        bool "Support MX53 EVK platforms"
+        select SOC_IMX53
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        select LEDS_GPIO_REGISTER
+        help
+          Include support for MX53 EVK platform. This includes specific
+          configurations for the board and its peripherals.
+
+config MACH_MX53_SMD
+        bool "Support MX53 SMD platforms"
+        select SOC_IMX53
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        help
+          Include support for MX53 SMD platform. This includes specific
+          configurations for the board and its peripherals.
+
+config MACH_MX53_LOCO
+        bool "Support MX53 LOCO platforms"
+        select SOC_IMX53
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select IMX_HAVE_PLATFORM_GPIO_KEYS
+        select LEDS_GPIO_REGISTER
+        help
+          Include support for MX53 LOCO platform. This includes specific
+          configurations for the board and its peripherals.
+
+config MACH_MX53_ARD
+        bool "Support MX53 ARD platforms"
+        select SOC_IMX53
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select IMX_HAVE_PLATFORM_GPIO_KEYS
+        help
+          Include support for MX53 ARD platform. This includes specific
+          configurations for the board and its peripherals.
+
 comment "i.MX6 family:"
 
 config SOC_IMX6Q
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index f5920c24f7d7..55db9c488f2b 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -11,6 +11,8 @@ obj-$(CONFIG_SOC_IMX27) += clock-imx27.o mm-imx27.o ehci-imx27.o
 obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o
 obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clock-imx35.o ehci-imx35.o
 
+obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clock-mx51-mx53.o ehci-imx5.o pm-imx5.o cpu_op-mx51.o
+
 # Support for CMOS sensor interface
 obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
 
@@ -75,3 +77,22 @@ obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o
 ifeq ($(CONFIG_PM),y)
 obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o
 endif
+
+# i.MX5 based machines
+obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
+obj-$(CONFIG_MACH_MX51_3DS) += mach-mx51_3ds.o
+obj-$(CONFIG_MACH_MX53_EVK) += mach-mx53_evk.o
+obj-$(CONFIG_MACH_MX53_SMD) += mach-mx53_smd.o
+obj-$(CONFIG_MACH_MX53_LOCO) += mach-mx53_loco.o
+obj-$(CONFIG_MACH_MX53_ARD) += mach-mx53_ard.o
+obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += mach-cpuimx51.o
+obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
+obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o
+obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd-baseboard.o
+obj-$(CONFIG_MX51_EFIKA_COMMON) += mx51_efika.o
+obj-$(CONFIG_MACH_MX51_EFIKAMX) += mach-mx51_efikamx.o
+obj-$(CONFIG_MACH_MX51_EFIKASB) += mach-mx51_efikasb.o
+obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o
+
+obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o
+obj-$(CONFIG_MACH_IMX53_DT) += imx53-dt.o
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot
index 5f4d06af4912..6dfdbcc83afd 100644
--- a/arch/arm/mach-imx/Makefile.boot
+++ b/arch/arm/mach-imx/Makefile.boot
@@ -22,6 +22,18 @@ zreladdr-$(CONFIG_SOC_IMX35)	+= 0x80008000
 params_phys-$(CONFIG_SOC_IMX35) := 0x80000100
 initrd_phys-$(CONFIG_SOC_IMX35) := 0x80800000
 
+zreladdr-$(CONFIG_SOC_IMX50)    += 0x70008000
+params_phys-$(CONFIG_SOC_IMX50) := 0x70000100
+initrd_phys-$(CONFIG_SOC_IMX50) := 0x70800000
+
+zreladdr-$(CONFIG_SOC_IMX51)    += 0x90008000
+params_phys-$(CONFIG_SOC_IMX51) := 0x90000100
+initrd_phys-$(CONFIG_SOC_IMX51) := 0x90800000
+
+zreladdr-$(CONFIG_SOC_IMX53)    += 0x70008000
+params_phys-$(CONFIG_SOC_IMX53) := 0x70000100
+initrd_phys-$(CONFIG_SOC_IMX53) := 0x70800000
+
 zreladdr-$(CONFIG_SOC_IMX6Q)    += 0x10008000
 params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100
 initrd_phys-$(CONFIG_SOC_IMX6Q) := 0x10800000
diff --git a/arch/arm/mach-imx/clock-imx6q.c b/arch/arm/mach-imx/clock-imx6q.c
index 9273c2a24b54..2d88f8b9a454 100644
--- a/arch/arm/mach-imx/clock-imx6q.c
+++ b/arch/arm/mach-imx/clock-imx6q.c
@@ -814,6 +814,16 @@ DEF_PFD(pll3_pfd_540m, PFD_480, PFD1, &pll3_usb_otg);
 DEF_PFD(pll3_pfd_508m, PFD_480, PFD2, &pll3_usb_otg);
 DEF_PFD(pll3_pfd_454m, PFD_480, PFD3, &pll3_usb_otg);
 
+static unsigned long twd_clk_get_rate(struct clk *clk)
+{
+        return clk_get_rate(clk->parent) / 2;
+}
+
+static struct clk twd_clk = {
+        .parent = &arm_clk,
+        .get_rate = twd_clk_get_rate,
+};
+
 static unsigned long pll2_200m_get_rate(struct clk *clk)
 {
         return clk_get_rate(clk->parent) / 2;
@@ -1894,6 +1904,7 @@ static struct clk_lookup lookups[] = {
         _REGISTER_CLOCK("20ec000.sdma", NULL, sdma_clk),
         _REGISTER_CLOCK("20bc000.wdog", NULL, dummy_clk),
         _REGISTER_CLOCK("20c0000.wdog", NULL, dummy_clk),
+        _REGISTER_CLOCK("smp_twd", NULL, twd_clk),
         _REGISTER_CLOCK(NULL, "ckih", ckih_clk),
         _REGISTER_CLOCK(NULL, "ckil_clk", ckil_clk),
         _REGISTER_CLOCK(NULL, "aips_tz1_clk", aips_tz1_clk),
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-imx/clock-mx51-mx53.c
index 4cb276977190..08470504a088 100644
--- a/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/arch/arm/mach-imx/clock-mx51-mx53.c
@@ -23,7 +23,7 @@
 #include <mach/common.h>
 #include <mach/clock.h>
 
-#include "crm_regs.h"
+#include "crm-regs-imx5.h"
 
 /* External clock values passed-in by the board code */
 static unsigned long external_high_reference, external_low_reference;
diff --git a/arch/arm/mach-mx5/cpu.c b/arch/arm/mach-imx/cpu-imx5.c
index 5e2e7a843860..5e2e7a843860 100644
--- a/arch/arm/mach-mx5/cpu.c
+++ b/arch/arm/mach-imx/cpu-imx5.c
diff --git a/arch/arm/mach-mx5/cpu_op-mx51.c b/arch/arm/mach-imx/cpu_op-mx51.c
index 9d34c3d4c024..9d34c3d4c024 100644
--- a/arch/arm/mach-mx5/cpu_op-mx51.c
+++ b/arch/arm/mach-imx/cpu_op-mx51.c
diff --git a/arch/arm/mach-mx5/cpu_op-mx51.h b/arch/arm/mach-imx/cpu_op-mx51.h
index 97477fecb469..97477fecb469 100644
--- a/arch/arm/mach-mx5/cpu_op-mx51.h
+++ b/arch/arm/mach-imx/cpu_op-mx51.h
diff --git a/arch/arm/mach-mx5/crm_regs.h b/arch/arm/mach-imx/crm-regs-imx5.h
index 5e11ba7daee2..5e11ba7daee2 100644
--- a/arch/arm/mach-mx5/crm_regs.h
+++ b/arch/arm/mach-imx/crm-regs-imx5.h
diff --git a/arch/arm/mach-mx5/devices-imx50.h b/arch/arm/mach-imx/devices-imx50.h
index 7216667eaafc..7216667eaafc 100644
--- a/arch/arm/mach-mx5/devices-imx50.h
+++ b/arch/arm/mach-imx/devices-imx50.h
diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-imx/devices-imx51.h
index af488bc0e225..af488bc0e225 100644
--- a/arch/arm/mach-mx5/devices-imx51.h
+++ b/arch/arm/mach-imx/devices-imx51.h
diff --git a/arch/arm/mach-mx5/devices-imx53.h b/arch/arm/mach-imx/devices-imx53.h
index 6e1e5d1f8c3a..6e1e5d1f8c3a 100644
--- a/arch/arm/mach-mx5/devices-imx53.h
+++ b/arch/arm/mach-imx/devices-imx53.h
diff --git a/arch/arm/mach-mx5/efika.h b/arch/arm/mach-imx/efika.h
index 014aa985faae..014aa985faae 100644
--- a/arch/arm/mach-mx5/efika.h
+++ b/arch/arm/mach-imx/efika.h
diff --git a/arch/arm/mach-mx5/ehci.c b/arch/arm/mach-imx/ehci-imx5.c
index c17fa131728b..c17fa131728b 100644
--- a/arch/arm/mach-mx5/ehci.c
+++ b/arch/arm/mach-imx/ehci-imx5.c
diff --git a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx51-baseboard.c
index a6a3ab8f1b1c..a6a3ab8f1b1c 100644
--- a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimx51-baseboard.c
diff --git a/arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd-baseboard.c
index d817fc80b986..d817fc80b986 100644
--- a/arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimxsd-baseboard.c
diff --git a/arch/arm/mach-mx5/imx51-dt.c b/arch/arm/mach-imx/imx51-dt.c
index e6bad17b908c..e6bad17b908c 100644
--- a/arch/arm/mach-mx5/imx51-dt.c
+++ b/arch/arm/mach-imx/imx51-dt.c
diff --git a/arch/arm/mach-mx5/imx53-dt.c b/arch/arm/mach-imx/imx53-dt.c
index 05ebb3e68679..05ebb3e68679 100644
--- a/arch/arm/mach-mx5/imx53-dt.c
+++ b/arch/arm/mach-imx/imx53-dt.c
diff --git a/arch/arm/mach-mx5/board-cpuimx51.c b/arch/arm/mach-imx/mach-cpuimx51.c
index 944025da8333..944025da8333 100644
--- a/arch/arm/mach-mx5/board-cpuimx51.c
+++ b/arch/arm/mach-imx/mach-cpuimx51.c
diff --git a/arch/arm/mach-mx5/board-cpuimx51sd.c b/arch/arm/mach-imx/mach-cpuimx51sd.c
index 9fbe923c8b08..9fbe923c8b08 100644
--- a/arch/arm/mach-mx5/board-cpuimx51sd.c
+++ b/arch/arm/mach-imx/mach-cpuimx51sd.c
diff --git a/arch/arm/mach-mx5/board-mx50_rdp.c b/arch/arm/mach-imx/mach-mx50_rdp.c
index 42b66e8d9615..42b66e8d9615 100644
--- a/arch/arm/mach-mx5/board-mx50_rdp.c
+++ b/arch/arm/mach-imx/mach-mx50_rdp.c
diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-imx/mach-mx51_3ds.c
index 83eab4176ca4..83eab4176ca4 100644
--- a/arch/arm/mach-mx5/board-mx51_3ds.c
+++ b/arch/arm/mach-imx/mach-mx51_3ds.c
diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-imx/mach-mx51_babbage.c
index e4b822e9f719..e4b822e9f719 100644
--- a/arch/arm/mach-mx5/board-mx51_babbage.c
+++ b/arch/arm/mach-imx/mach-mx51_babbage.c
diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-imx/mach-mx51_efikamx.c
index 3a5ed2dd885a..3a5ed2dd885a 100644
--- a/arch/arm/mach-mx5/board-mx51_efikamx.c
+++ b/arch/arm/mach-imx/mach-mx51_efikamx.c
diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-imx/mach-mx51_efikasb.c
index ea5f65b0381a..ea5f65b0381a 100644
--- a/arch/arm/mach-mx5/board-mx51_efikasb.c
+++ b/arch/arm/mach-imx/mach-mx51_efikasb.c
diff --git a/arch/arm/mach-mx5/board-mx53_ard.c b/arch/arm/mach-imx/mach-mx53_ard.c
index 5f224f1c3eb6..753f4fc9ec04 100644
--- a/arch/arm/mach-mx5/board-mx53_ard.c
+++ b/arch/arm/mach-imx/mach-mx53_ard.c
@@ -32,7 +32,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 
-#include "crm_regs.h"
 #include "devices-imx53.h"
 
 #define ARD_ETHERNET_INT_B      IMX_GPIO_NR(2, 31)
@@ -189,8 +188,10 @@ static int weim_cs_config(void)
                 return -ENOMEM;
 
         iomuxc_base = ioremap(MX53_IOMUXC_BASE_ADDR, SZ_4K);
-        if (!iomuxc_base)
+        if (!iomuxc_base) {
+                iounmap(weim_base);
                 return -ENOMEM;
+        }
 
         /* CS1 timings for LAN9220 */
         writel(0x20001, (weim_base + 0x18));
diff --git a/arch/arm/mach-mx5/board-mx53_evk.c b/arch/arm/mach-imx/mach-mx53_evk.c
index d6ce137896d6..5a72188b9cdb 100644
--- a/arch/arm/mach-mx5/board-mx53_evk.c
+++ b/arch/arm/mach-imx/mach-mx53_evk.c
@@ -37,7 +37,6 @@
 #define EVK_ECSPI1_CS1          IMX_GPIO_NR(3, 19)
 #define MX53EVK_LED             IMX_GPIO_NR(7, 7)
 
-#include "crm_regs.h"
 #include "devices-imx53.h"
 
 static iomux_v3_cfg_t mx53_evk_pads[] = {
diff --git a/arch/arm/mach-mx5/board-mx53_loco.c b/arch/arm/mach-imx/mach-mx53_loco.c
index fd8b524e1c58..37f67cac15a4 100644
--- a/arch/arm/mach-mx5/board-mx53_loco.c
+++ b/arch/arm/mach-imx/mach-mx53_loco.c
@@ -32,7 +32,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 
-#include "crm_regs.h"
 #include "devices-imx53.h"
 
 #define MX53_LOCO_POWER                 IMX_GPIO_NR(1, 8)
diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-imx/mach-mx53_smd.c
index 22c53c9b18aa..8e972c5c3e13 100644
--- a/arch/arm/mach-mx5/board-mx53_smd.c
+++ b/arch/arm/mach-imx/mach-mx53_smd.c
@@ -31,7 +31,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 
-#include "crm_regs.h"
 #include "devices-imx53.h"
 
 #define SMD_FEC_PHY_RST         IMX_GPIO_NR(7, 6)
diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-imx/mm-imx5.c
index bc17dfea3817..bc17dfea3817 100644
--- a/arch/arm/mach-mx5/mm.c
+++ b/arch/arm/mach-imx/mm-imx5.c
diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-imx/mx51_efika.c
index ec6ca91b299b..ec6ca91b299b 100644
--- a/arch/arm/mach-mx5/mx51_efika.c
+++ b/arch/arm/mach-imx/mx51_efika.c
diff --git a/arch/arm/mach-mx5/system.c b/arch/arm/mach-imx/pm-imx5.c
index 5eebfaad1226..6dc093448057 100644
--- a/arch/arm/mach-mx5/system.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -1,8 +1,6 @@
 /*
- * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
- */
-
-/*
+ *  Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * The code contained herein is licensed under the GNU General Public
  * License. You may obtain a copy of the GNU General Public License
  * Version 2 or later at the following locations:
@@ -10,14 +8,22 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  */
-#include <linux/platform_device.h>
+#include <linux/suspend.h>
+#include <linux/clk.h>
 #include <linux/io.h>
-#include <mach/hardware.h>
+#include <linux/err.h>
+#include <asm/cacheflush.h>
+#include <asm/tlbflush.h>
 #include <mach/common.h>
-#include "crm_regs.h"
+#include <mach/hardware.h>
+#include "crm-regs-imx5.h"
+
+static struct clk *gpc_dvfs_clk;
 
-/* set cpu low power mode before WFI instruction. This function is called
-  * mx5 because it can be used for mx50, mx51, and mx53.*/
+/*
+ * set cpu low power mode before WFI instruction. This function is called
+ * mx5 because it can be used for mx50, mx51, and mx53.
+ */
 void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode)
 {
         u32 plat_lpc, arm_srpgcr, ccm_clpcr;
@@ -80,3 +86,68 @@ void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode)
                 __raw_writel(empgc1, MXC_SRPG_EMPGC1_SRPGCR);
         }
 }
+
+static int mx5_suspend_prepare(void)
+{
+        return clk_enable(gpc_dvfs_clk);
+}
+
+static int mx5_suspend_enter(suspend_state_t state)
+{
+        switch (state) {
+        case PM_SUSPEND_MEM:
+                mx5_cpu_lp_set(STOP_POWER_OFF);
+                break;
+        case PM_SUSPEND_STANDBY:
+                mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (state == PM_SUSPEND_MEM) {
+                local_flush_tlb_all();
+                flush_cache_all();
+
+                /*clear the EMPGC0/1 bits */
+                __raw_writel(0, MXC_SRPG_EMPGC0_SRPGCR);
+                __raw_writel(0, MXC_SRPG_EMPGC1_SRPGCR);
+        }
+        cpu_do_idle();
+        return 0;
+}
+
+static void mx5_suspend_finish(void)
+{
+        clk_disable(gpc_dvfs_clk);
+}
+
+static int mx5_pm_valid(suspend_state_t state)
+{
+        return (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX);
+}
+
+static const struct platform_suspend_ops mx5_suspend_ops = {
+        .valid = mx5_pm_valid,
+        .prepare = mx5_suspend_prepare,
+        .enter = mx5_suspend_enter,
+        .finish = mx5_suspend_finish,
+};
+
+static int __init mx5_pm_init(void)
+{
+        if (!cpu_is_mx51() && !cpu_is_mx53())
+                return 0;
+
+        if (gpc_dvfs_clk == NULL)
+                gpc_dvfs_clk = clk_get(NULL, "gpc_dvfs");
+
+        if (!IS_ERR(gpc_dvfs_clk)) {
+                if (cpu_is_mx51())
+                        suspend_set_ops(&mx5_suspend_ops);
+        } else
+                return -EPERM;
+
+        return 0;
+}
+device_initcall(mx5_pm_init);
diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c
index 29bd1243781e..e15f1555c59b 100644
--- a/arch/arm/mach-imx/src.c
+++ b/arch/arm/mach-imx/src.c
@@ -15,6 +15,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/smp.h>
+#include <asm/smp_plat.h>
 
 #define SRC_SCR                         0x000
 #define SRC_GPR1                        0x020
@@ -24,10 +25,6 @@
 
 static void __iomem *src_base;
 
-#ifndef CONFIG_SMP
-#define cpu_logical_map(cpu)            0
-#endif
-
 void imx_enable_cpu(int cpu, bool enable)
 {
         u32 mask, val;
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index cc15426787b1..77d4852e19f2 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -27,6 +27,7 @@
 #include <plat/cache-feroceon-l2.h>
 #include <plat/mvsdio.h>
 #include <plat/orion_nand.h>
+#include <plat/ehci-orion.h>
 #include <plat/common.h>
 #include <plat/time.h>
 #include <plat/addr-map.h>
@@ -73,7 +74,7 @@ unsigned int kirkwood_clk_ctrl = CGC_DUNIT | CGC_RESERVED;
 void __init kirkwood_ehci_init(void)
 {
         kirkwood_clk_ctrl |= CGC_USB0;
-        orion_ehci_init(USB_PHYS_BASE, IRQ_KIRKWOOD_USB);
+        orion_ehci_init(USB_PHYS_BASE, IRQ_KIRKWOOD_USB, EHCI_PHY_NA);
 }
 
 
diff --git a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
index e8fda45c0736..d5a0d1da2e0e 100644
--- a/arch/arm/mach-kirkwood/mpp.h
+++ b/arch/arm/mach-kirkwood/mpp.h
@@ -31,314 +31,314 @@
 #define MPP_F6282_MASK          MPP(  0, 0x0, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP0_GPIO               MPP(  0, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP0_NF_IO2             MPP(  0, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP0_SPI_SCn            MPP(  0, 0x2, 0, 1, 1,   1,   1,   1,   1 )
+#define MPP0_NF_IO2             MPP(  0, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP0_SPI_SCn            MPP(  0, 0x2, 0, 0, 1,   1,   1,   1,   1 )
 
 #define MPP1_GPO                MPP(  1, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP1_NF_IO3             MPP(  1, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP1_SPI_MOSI           MPP(  1, 0x2, 0, 1, 1,   1,   1,   1,   1 )
+#define MPP1_NF_IO3             MPP(  1, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP1_SPI_MOSI           MPP(  1, 0x2, 0, 0, 1,   1,   1,   1,   1 )
 
 #define MPP2_GPO                MPP(  2, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP2_NF_IO4             MPP(  2, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP2_SPI_SCK            MPP(  2, 0x2, 0, 1, 1,   1,   1,   1,   1 )
+#define MPP2_NF_IO4             MPP(  2, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP2_SPI_SCK            MPP(  2, 0x2, 0, 0, 1,   1,   1,   1,   1 )
 
 #define MPP3_GPO                MPP(  3, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP3_NF_IO5             MPP(  3, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP3_SPI_MISO           MPP(  3, 0x2, 1, 0, 1,   1,   1,   1,   1 )
+#define MPP3_NF_IO5             MPP(  3, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP3_SPI_MISO           MPP(  3, 0x2, 0, 0, 1,   1,   1,   1,   1 )
 
 #define MPP4_GPIO               MPP(  4, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP4_NF_IO6             MPP(  4, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP4_UART0_RXD          MPP(  4, 0x2, 1, 0, 1,   1,   1,   1,   1 )
-#define MPP4_SATA1_ACTn         MPP(  4, 0x5, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP4_NF_IO6             MPP(  4, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP4_UART0_RXD          MPP(  4, 0x2, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP4_SATA1_ACTn         MPP(  4, 0x5, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP4_LCD_VGA_HSYNC      MPP(  4, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP4_PTP_CLK            MPP(  4, 0xd, 1, 0, 1,   1,   1,   1,   0 )
+#define MPP4_PTP_CLK            MPP(  4, 0xd, 0, 0, 1,   1,   1,   1,   0 )
 
 #define MPP5_GPO                MPP(  5, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP5_NF_IO7             MPP(  5, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP5_UART0_TXD          MPP(  5, 0x2, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP5_PTP_TRIG_GEN       MPP(  5, 0x4, 0, 1, 1,   1,   1,   1,   0 )
-#define MPP5_SATA0_ACTn         MPP(  5, 0x5, 0, 1, 0,   1,   1,   1,   1 )
+#define MPP5_NF_IO7             MPP(  5, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP5_UART0_TXD          MPP(  5, 0x2, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP5_PTP_TRIG_GEN       MPP(  5, 0x4, 0, 0, 1,   1,   1,   1,   0 )
+#define MPP5_SATA0_ACTn         MPP(  5, 0x5, 0, 0, 0,   1,   1,   1,   1 )
 #define MPP5_LCD_VGA_VSYNC      MPP(  5, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
-#define MPP6_SYSRST_OUTn        MPP(  6, 0x1, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP6_SPI_MOSI           MPP(  6, 0x2, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP6_PTP_TRIG_GEN       MPP(  6, 0x3, 0, 1, 1,   1,   1,   1,   0 )
+#define MPP6_SYSRST_OUTn        MPP(  6, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP6_SPI_MOSI           MPP(  6, 0x2, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP6_PTP_TRIG_GEN       MPP(  6, 0x3, 0, 0, 1,   1,   1,   1,   0 )
 
 #define MPP7_GPO                MPP(  7, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP7_PEX_RST_OUTn       MPP(  7, 0x1, 0, 1, 1,   1,   1,   1,   0 )
-#define MPP7_SPI_SCn            MPP(  7, 0x2, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP7_PTP_TRIG_GEN       MPP(  7, 0x3, 0, 1, 1,   1,   1,   1,   0 )
-#define MPP7_LCD_PWM            MPP(  7, 0xb, 0, 1, 0,   0,   0,   0,   1 )
+#define MPP7_PEX_RST_OUTn       MPP(  7, 0x1, 0, 0, 1,   1,   1,   1,   0 )
+#define MPP7_SPI_SCn            MPP(  7, 0x2, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP7_PTP_TRIG_GEN       MPP(  7, 0x3, 0, 0, 1,   1,   1,   1,   0 )
+#define MPP7_LCD_PWM            MPP(  7, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP8_GPIO               MPP(  8, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP8_TW0_SDA            MPP(  8, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP8_UART0_RTS          MPP(  8, 0x2, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP8_UART1_RTS          MPP(  8, 0x3, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP8_MII0_RXERR         MPP(  8, 0x4, 1, 0, 0,   1,   1,   1,   1 )
-#define MPP8_SATA1_PRESENTn     MPP(  8, 0x5, 0, 1, 0,   0,   1,   1,   1 )
-#define MPP8_PTP_CLK            MPP(  8, 0xc, 1, 0, 1,   1,   1,   1,   0 )
-#define MPP8_MII0_COL           MPP(  8, 0xd, 1, 0, 1,   1,   1,   1,   1 )
+#define MPP8_TW0_SDA            MPP(  8, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP8_UART0_RTS          MPP(  8, 0x2, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP8_UART1_RTS          MPP(  8, 0x3, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP8_MII0_RXERR         MPP(  8, 0x4, 0, 0, 0,   1,   1,   1,   1 )
+#define MPP8_SATA1_PRESENTn     MPP(  8, 0x5, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP8_PTP_CLK            MPP(  8, 0xc, 0, 0, 1,   1,   1,   1,   0 )
+#define MPP8_MII0_COL           MPP(  8, 0xd, 0, 0, 1,   1,   1,   1,   1 )
 
 #define MPP9_GPIO               MPP(  9, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP9_TW0_SCK            MPP(  9, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP9_UART0_CTS          MPP(  9, 0x2, 1, 0, 1,   1,   1,   1,   1 )
-#define MPP9_UART1_CTS          MPP(  9, 0x3, 1, 0, 1,   1,   1,   1,   1 )
-#define MPP9_SATA0_PRESENTn     MPP(  9, 0x5, 0, 1, 0,   1,   1,   1,   1 )
-#define MPP9_PTP_EVENT_REQ      MPP(  9, 0xc, 1, 0, 1,   1,   1,   1,   0 )
-#define MPP9_MII0_CRS           MPP(  9, 0xd, 1, 0, 1,   1,   1,   1,   1 )
+#define MPP9_TW0_SCK            MPP(  9, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP9_UART0_CTS          MPP(  9, 0x2, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP9_UART1_CTS          MPP(  9, 0x3, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP9_SATA0_PRESENTn     MPP(  9, 0x5, 0, 0, 0,   1,   1,   1,   1 )
+#define MPP9_PTP_EVENT_REQ      MPP(  9, 0xc, 0, 0, 1,   1,   1,   1,   0 )
+#define MPP9_MII0_CRS           MPP(  9, 0xd, 0, 0, 1,   1,   1,   1,   1 )
 
 #define MPP10_GPO               MPP( 10, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP10_SPI_SCK           MPP( 10, 0x2, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP10_UART0_TXD         MPP( 10, 0X3, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP10_SATA1_ACTn        MPP( 10, 0x5, 0, 1, 0,   0,   1,   1,   1 )
-#define MPP10_PTP_TRIG_GEN      MPP( 10, 0xc, 0, 1, 1,   1,   1,   1,   0 )
+#define MPP10_SPI_SCK           MPP( 10, 0x2, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP10_UART0_TXD         MPP( 10, 0X3, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP10_SATA1_ACTn        MPP( 10, 0x5, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP10_PTP_TRIG_GEN      MPP( 10, 0xc, 0, 0, 1,   1,   1,   1,   0 )
 
 #define MPP11_GPIO              MPP( 11, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP11_SPI_MISO          MPP( 11, 0x2, 1, 0, 1,   1,   1,   1,   1 )
-#define MPP11_UART0_RXD         MPP( 11, 0x3, 1, 0, 1,   1,   1,   1,   1 )
-#define MPP11_PTP_EVENT_REQ     MPP( 11, 0x4, 1, 0, 1,   1,   1,   1,   0 )
-#define MPP11_PTP_TRIG_GEN      MPP( 11, 0xc, 0, 1, 1,   1,   1,   1,   0 )
-#define MPP11_PTP_CLK           MPP( 11, 0xd, 1, 0, 1,   1,   1,   1,   0 )
-#define MPP11_SATA0_ACTn        MPP( 11, 0x5, 0, 1, 0,   1,   1,   1,   1 )
+#define MPP11_SPI_MISO          MPP( 11, 0x2, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP11_UART0_RXD         MPP( 11, 0x3, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP11_PTP_EVENT_REQ     MPP( 11, 0x4, 0, 0, 1,   1,   1,   1,   0 )
+#define MPP11_PTP_TRIG_GEN      MPP( 11, 0xc, 0, 0, 1,   1,   1,   1,   0 )
+#define MPP11_PTP_CLK           MPP( 11, 0xd, 0, 0, 1,   1,   1,   1,   0 )
+#define MPP11_SATA0_ACTn        MPP( 11, 0x5, 0, 0, 0,   1,   1,   1,   1 )
 
 #define MPP12_GPO               MPP( 12, 0x0, 0, 1, 1,   1,   1,   1,   1 )
 #define MPP12_GPIO              MPP( 12, 0x0, 1, 1, 0,   0,   0,   1,   0 )
-#define MPP12_SD_CLK            MPP( 12, 0x1, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP12_AU_SPDIF0         MPP( 12, 0xa, 0, 1, 0,   0,   0,   0,   1 )
-#define MPP12_SPI_MOSI          MPP( 12, 0xb, 0, 1, 0,   0,   0,   0,   1 )
-#define MPP12_TW1_SDA           MPP( 12, 0xd, 1, 0, 0,   0,   0,   0,   1 )
+#define MPP12_SD_CLK            MPP( 12, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP12_AU_SPDIF0         MPP( 12, 0xa, 0, 0, 0,   0,   0,   0,   1 )
+#define MPP12_SPI_MOSI          MPP( 12, 0xb, 0, 0, 0,   0,   0,   0,   1 )
+#define MPP12_TW1_SDA           MPP( 12, 0xd, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP13_GPIO              MPP( 13, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP13_SD_CMD            MPP( 13, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP13_UART1_TXD         MPP( 13, 0x3, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP13_AU_SPDIFRMCLK     MPP( 13, 0xa, 0, 1, 0,   0,   0,   0,   1 )
-#define MPP13_LCDPWM            MPP( 13, 0xb, 0, 1, 0,   0,   0,   0,   1 )
+#define MPP13_SD_CMD            MPP( 13, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP13_UART1_TXD         MPP( 13, 0x3, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP13_AU_SPDIFRMCLK     MPP( 13, 0xa, 0, 0, 0,   0,   0,   0,   1 )
+#define MPP13_LCDPWM            MPP( 13, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP14_GPIO              MPP( 14, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP14_SD_D0             MPP( 14, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP14_UART1_RXD         MPP( 14, 0x3, 1, 0, 1,   1,   1,   1,   1 )
-#define MPP14_SATA1_PRESENTn    MPP( 14, 0x4, 0, 1, 0,   0,   1,   1,   1 )
-#define MPP14_AU_SPDIFI         MPP( 14, 0xa, 1, 0, 0,   0,   0,   0,   1 )
-#define MPP14_AU_I2SDI          MPP( 14, 0xb, 1, 0, 0,   0,   0,   0,   1 )
-#define MPP14_MII0_COL          MPP( 14, 0xd, 1, 0, 1,   1,   1,   1,   1 )
+#define MPP14_SD_D0             MPP( 14, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP14_UART1_RXD         MPP( 14, 0x3, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP14_SATA1_PRESENTn    MPP( 14, 0x4, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP14_AU_SPDIFI         MPP( 14, 0xa, 0, 0, 0,   0,   0,   0,   1 )
+#define MPP14_AU_I2SDI          MPP( 14, 0xb, 0, 0, 0,   0,   0,   0,   1 )
+#define MPP14_MII0_COL          MPP( 14, 0xd, 0, 0, 1,   1,   1,   1,   1 )
 
 #define MPP15_GPIO              MPP( 15, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP15_SD_D1             MPP( 15, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP15_UART0_RTS         MPP( 15, 0x2, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP15_UART1_TXD         MPP( 15, 0x3, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP15_SATA0_ACTn        MPP( 15, 0x4, 0, 1, 0,   1,   1,   1,   1 )
-#define MPP15_SPI_CSn           MPP( 15, 0xb, 0, 1, 0,   0,   0,   0,   1 )
+#define MPP15_SD_D1             MPP( 15, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP15_UART0_RTS         MPP( 15, 0x2, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP15_UART1_TXD         MPP( 15, 0x3, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP15_SATA0_ACTn        MPP( 15, 0x4, 0, 0, 0,   1,   1,   1,   1 )
+#define MPP15_SPI_CSn           MPP( 15, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP16_GPIO              MPP( 16, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP16_SD_D2             MPP( 16, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP16_UART0_CTS         MPP( 16, 0x2, 1, 0, 1,   1,   1,   1,   1 )
-#define MPP16_UART1_RXD         MPP( 16, 0x3, 1, 0, 1,   1,   1,   1,   1 )
-#define MPP16_SATA1_ACTn        MPP( 16, 0x4, 0, 1, 0,   0,   1,   1,   1 )
-#define MPP16_LCD_EXT_REF_CLK   MPP( 16, 0xb, 1, 0, 0,   0,   0,   0,   1 )
-#define MPP16_MII0_CRS          MPP( 16, 0xd, 1, 0, 1,   1,   1,   1,   1 )
+#define MPP16_SD_D2             MPP( 16, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP16_UART0_CTS         MPP( 16, 0x2, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP16_UART1_RXD         MPP( 16, 0x3, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP16_SATA1_ACTn        MPP( 16, 0x4, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP16_LCD_EXT_REF_CLK   MPP( 16, 0xb, 0, 0, 0,   0,   0,   0,   1 )
+#define MPP16_MII0_CRS          MPP( 16, 0xd, 0, 0, 1,   1,   1,   1,   1 )
 
 #define MPP17_GPIO              MPP( 17, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP17_SD_D3             MPP( 17, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP17_SATA0_PRESENTn    MPP( 17, 0x4, 0, 1, 0,   1,   1,   1,   1 )
-#define MPP17_SATA1_ACTn        MPP( 17, 0xa, 0, 1, 0,   0,   0,   0,   1 )
-#define MPP17_TW1_SCK           MPP( 17, 0xd, 1, 1, 0,   0,   0,   0,   1 )
+#define MPP17_SD_D3             MPP( 17, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP17_SATA0_PRESENTn    MPP( 17, 0x4, 0, 0, 0,   1,   1,   1,   1 )
+#define MPP17_SATA1_ACTn        MPP( 17, 0xa, 0, 0, 0,   0,   0,   0,   1 )
+#define MPP17_TW1_SCK           MPP( 17, 0xd, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP18_GPO               MPP( 18, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP18_NF_IO0            MPP( 18, 0x1, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP18_PEX0_CLKREQ       MPP( 18, 0x2, 0, 1, 0,   0,   0,   0,   1 )
+#define MPP18_NF_IO0            MPP( 18, 0x1, 0, 0, 1,   1,   1,   1,   1 )
+#define MPP18_PEX0_CLKREQ       MPP( 18, 0x2, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP19_GPO               MPP( 19, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP19_NF_IO1            MPP( 19, 0x1, 1, 1, 1,   1,   1,   1,   1 )
+#define MPP19_NF_IO1            MPP( 19, 0x1, 0, 0, 1,   1,   1,   1,   1 )
 
 #define MPP20_GPIO              MPP( 20, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP20_TSMP0             MPP( 20, 0x1, 1, 1, 0,   0,   1,   1,   1 )
-#define MPP20_TDM_CH0_TX_QL     MPP( 20, 0x2, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP20_TSMP0             MPP( 20, 0x1, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP20_TDM_CH0_TX_QL     MPP( 20, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP20_GE1_TXD0          MPP( 20, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP20_AU_SPDIFI         MPP( 20, 0x4, 1, 0, 0,   0,   1,   1,   1 )
-#define MPP20_SATA1_ACTn        MPP( 20, 0x5, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP20_AU_SPDIFI         MPP( 20, 0x4, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP20_SATA1_ACTn        MPP( 20, 0x5, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP20_LCD_D0            MPP( 20, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP21_GPIO              MPP( 21, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP21_TSMP1             MPP( 21, 0x1, 1, 1, 0,   0,   1,   1,   1 )
-#define MPP21_TDM_CH0_RX_QL     MPP( 21, 0x2, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP21_TSMP1             MPP( 21, 0x1, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP21_TDM_CH0_RX_QL     MPP( 21, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP21_GE1_TXD1          MPP( 21, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP21_AU_SPDIFO         MPP( 21, 0x4, 0, 1, 0,   0,   1,   1,   1 )
-#define MPP21_SATA0_ACTn        MPP( 21, 0x5, 0, 1, 0,   1,   1,   1,   1 )
+#define MPP21_AU_SPDIFO         MPP( 21, 0x4, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP21_SATA0_ACTn        MPP( 21, 0x5, 0, 0, 0,   1,   1,   1,   1 )
 #define MPP21_LCD_D1            MPP( 21, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP22_GPIO              MPP( 22, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP22_TSMP2             MPP( 22, 0x1, 1, 1, 0,   0,   1,   1,   1 )
-#define MPP22_TDM_CH2_TX_QL     MPP( 22, 0x2, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP22_TSMP2             MPP( 22, 0x1, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP22_TDM_CH2_TX_QL     MPP( 22, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP22_GE1_TXD2          MPP( 22, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP22_AU_SPDIFRMKCLK    MPP( 22, 0x4, 0, 1, 0,   0,   1,   1,   1 )
-#define MPP22_SATA1_PRESENTn    MPP( 22, 0x5, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP22_AU_SPDIFRMKCLK    MPP( 22, 0x4, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP22_SATA1_PRESENTn    MPP( 22, 0x5, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP22_LCD_D2            MPP( 22, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP23_GPIO              MPP( 23, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP23_TSMP3             MPP( 23, 0x1, 1, 1, 0,   0,   1,   1,   1 )
-#define MPP23_TDM_CH2_RX_QL     MPP( 23, 0x2, 1, 0, 0,   0,   1,   1,   1 )
+#define MPP23_TSMP3             MPP( 23, 0x1, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP23_TDM_CH2_RX_QL     MPP( 23, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP23_GE1_TXD3          MPP( 23, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP23_AU_I2SBCLK        MPP( 23, 0x4, 0, 1, 0,   0,   1,   1,   1 )
-#define MPP23_SATA0_PRESENTn    MPP( 23, 0x5, 0, 1, 0,   1,   1,   1,   1 )
+#define MPP23_AU_I2SBCLK        MPP( 23, 0x4, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP23_SATA0_PRESENTn    MPP( 23, 0x5, 0, 0, 0,   1,   1,   1,   1 )
 #define MPP23_LCD_D3            MPP( 23, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP24_GPIO              MPP( 24, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP24_TSMP4             MPP( 24, 0x1, 1, 1, 0,   0,   1,   1,   1 )
-#define MPP24_TDM_SPI_CS0       MPP( 24, 0x2, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP24_TSMP4             MPP( 24, 0x1, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP24_TDM_SPI_CS0       MPP( 24, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP24_GE1_RXD0          MPP( 24, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP24_AU_I2SDO          MPP( 24, 0x4, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP24_AU_I2SDO          MPP( 24, 0x4, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP24_LCD_D4            MPP( 24, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP25_GPIO              MPP( 25, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP25_TSMP5             MPP( 25, 0x1, 1, 1, 0,   0,   1,   1,   1 )
-#define MPP25_TDM_SPI_SCK       MPP( 25, 0x2, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP25_TSMP5             MPP( 25, 0x1, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP25_TDM_SPI_SCK       MPP( 25, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP25_GE1_RXD1          MPP( 25, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP25_AU_I2SLRCLK       MPP( 25, 0x4, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP25_AU_I2SLRCLK       MPP( 25, 0x4, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP25_LCD_D5            MPP( 25, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP26_GPIO              MPP( 26, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP26_TSMP6             MPP( 26, 0x1, 1, 1, 0,   0,   1,   1,   1 )
-#define MPP26_TDM_SPI_MISO      MPP( 26, 0x2, 1, 0, 0,   0,   1,   1,   1 )
+#define MPP26_TSMP6             MPP( 26, 0x1, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP26_TDM_SPI_MISO      MPP( 26, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP26_GE1_RXD2          MPP( 26, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP26_AU_I2SMCLK        MPP( 26, 0x4, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP26_AU_I2SMCLK        MPP( 26, 0x4, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP26_LCD_D6            MPP( 26, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP27_GPIO              MPP( 27, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP27_TSMP7             MPP( 27, 0x1, 1, 1, 0,   0,   1,   1,   1 )
-#define MPP27_TDM_SPI_MOSI      MPP( 27, 0x2, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP27_TSMP7             MPP( 27, 0x1, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP27_TDM_SPI_MOSI      MPP( 27, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP27_GE1_RXD3          MPP( 27, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP27_AU_I2SDI          MPP( 27, 0x4, 1, 0, 0,   0,   1,   1,   1 )
+#define MPP27_AU_I2SDI          MPP( 27, 0x4, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP27_LCD_D7            MPP( 27, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP28_GPIO              MPP( 28, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP28_TSMP8             MPP( 28, 0x1, 1, 1, 0,   0,   1,   1,   1 )
+#define MPP28_TSMP8             MPP( 28, 0x1, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP28_TDM_CODEC_INTn    MPP( 28, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP28_GE1_COL           MPP( 28, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP28_AU_EXTCLK         MPP( 28, 0x4, 1, 0, 0,   0,   1,   1,   1 )
+#define MPP28_AU_EXTCLK         MPP( 28, 0x4, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP28_LCD_D8            MPP( 28, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP29_GPIO              MPP( 29, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP29_TSMP9             MPP( 29, 0x1, 1, 1, 0,   0,   1,   1,   1 )
+#define MPP29_TSMP9             MPP( 29, 0x1, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP29_TDM_CODEC_RSTn    MPP( 29, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP29_GE1_TCLK          MPP( 29, 0x3, 0, 0, 0,   1,   1,   1,   1 )
 #define MPP29_LCD_D9            MPP( 29, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP30_GPIO              MPP( 30, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP30_TSMP10            MPP( 30, 0x1, 1, 1, 0,   0,   1,   1,   1 )
-#define MPP30_TDM_PCLK          MPP( 30, 0x2, 1, 1, 0,   0,   1,   1,   1 )
+#define MPP30_TSMP10            MPP( 30, 0x1, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP30_TDM_PCLK          MPP( 30, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP30_GE1_RXCTL         MPP( 30, 0x3, 0, 0, 0,   1,   1,   1,   1 )
 #define MPP30_LCD_D10           MPP( 30, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP31_GPIO              MPP( 31, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP31_TSMP11            MPP( 31, 0x1, 1, 1, 0,   0,   1,   1,   1 )
-#define MPP31_TDM_FS            MPP( 31, 0x2, 1, 1, 0,   0,   1,   1,   1 )
+#define MPP31_TSMP11            MPP( 31, 0x1, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP31_TDM_FS            MPP( 31, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP31_GE1_RXCLK         MPP( 31, 0x3, 0, 0, 0,   1,   1,   1,   1 )
 #define MPP31_LCD_D11           MPP( 31, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP32_GPIO              MPP( 32, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP32_TSMP12            MPP( 32, 0x1, 1, 1, 0,   0,   1,   1,   1 )
-#define MPP32_TDM_DRX           MPP( 32, 0x2, 1, 0, 0,   0,   1,   1,   1 )
+#define MPP32_TSMP12            MPP( 32, 0x1, 0, 0, 0,   0,   1,   1,   1 )
+#define MPP32_TDM_DRX           MPP( 32, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP32_GE1_TCLKOUT       MPP( 32, 0x3, 0, 0, 0,   1,   1,   1,   1 )
 #define MPP32_LCD_D12           MPP( 32, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP33_GPO               MPP( 33, 0x0, 0, 1, 0,   1,   1,   1,   1 )
-#define MPP33_TDM_DTX           MPP( 33, 0x2, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP33_TDM_DTX           MPP( 33, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP33_GE1_TXCTL         MPP( 33, 0x3, 0, 0, 0,   1,   1,   1,   1 )
 #define MPP33_LCD_D13           MPP( 33, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP34_GPIO              MPP( 34, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP34_TDM_SPI_CS1       MPP( 34, 0x2, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP34_TDM_SPI_CS1       MPP( 34, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP34_GE1_TXEN          MPP( 34, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP34_SATA1_ACTn        MPP( 34, 0x5, 0, 1, 0,   0,   0,   1,   1 )
+#define MPP34_SATA1_ACTn        MPP( 34, 0x5, 0, 0, 0,   0,   0,   1,   1 )
 #define MPP34_LCD_D14           MPP( 34, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP35_GPIO              MPP( 35, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP35_TDM_CH0_TX_QL     MPP( 35, 0x2, 0, 1, 0,   0,   1,   1,   1 )
+#define MPP35_TDM_CH0_TX_QL     MPP( 35, 0x2, 0, 0, 0,   0,   1,   1,   1 )
 #define MPP35_GE1_RXERR         MPP( 35, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP35_SATA0_ACTn        MPP( 35, 0x5, 0, 1, 0,   1,   1,   1,   1 )
+#define MPP35_SATA0_ACTn        MPP( 35, 0x5, 0, 0, 0,   1,   1,   1,   1 )
 #define MPP35_LCD_D15           MPP( 22, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP35_MII0_RXERR        MPP( 35, 0xc, 1, 0, 1,   1,   1,   1,   1 )
+#define MPP35_MII0_RXERR        MPP( 35, 0xc, 0, 0, 1,   1,   1,   1,   1 )
 
 #define MPP36_GPIO              MPP( 36, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP36_TSMP0             MPP( 36, 0x1, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP36_TDM_SPI_CS1       MPP( 36, 0x2, 0, 1, 0,   0,   0,   1,   1 )
-#define MPP36_AU_SPDIFI         MPP( 36, 0x4, 1, 0, 1,   0,   0,   1,   1 )
-#define MPP36_TW1_SDA           MPP( 36, 0xb, 1, 1, 0,   0,   0,   0,   1 )
+#define MPP36_TSMP0             MPP( 36, 0x1, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP36_TDM_SPI_CS1       MPP( 36, 0x2, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP36_AU_SPDIFI         MPP( 36, 0x4, 0, 0, 1,   0,   0,   1,   1 )
+#define MPP36_TW1_SDA           MPP( 36, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP37_GPIO              MPP( 37, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP37_TSMP1             MPP( 37, 0x1, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP37_TDM_CH2_TX_QL     MPP( 37, 0x2, 0, 1, 0,   0,   0,   1,   1 )
-#define MPP37_AU_SPDIFO         MPP( 37, 0x4, 0, 1, 1,   0,   0,   1,   1 )
-#define MPP37_TW1_SCK           MPP( 37, 0xb, 1, 1, 0,   0,   0,   0,   1 )
+#define MPP37_TSMP1             MPP( 37, 0x1, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP37_TDM_CH2_TX_QL     MPP( 37, 0x2, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP37_AU_SPDIFO         MPP( 37, 0x4, 0, 0, 1,   0,   0,   1,   1 )
+#define MPP37_TW1_SCK           MPP( 37, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP38_GPIO              MPP( 38, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP38_TSMP2             MPP( 38, 0x1, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP38_TDM_CH2_RX_QL     MPP( 38, 0x2, 0, 1, 0,   0,   0,   1,   1 )
-#define MPP38_AU_SPDIFRMLCLK    MPP( 38, 0x4, 0, 1, 1,   0,   0,   1,   1 )
+#define MPP38_TSMP2             MPP( 38, 0x1, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP38_TDM_CH2_RX_QL     MPP( 38, 0x2, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP38_AU_SPDIFRMLCLK    MPP( 38, 0x4, 0, 0, 1,   0,   0,   1,   1 )
 #define MPP38_LCD_D18           MPP( 38, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP39_GPIO              MPP( 39, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP39_TSMP3             MPP( 39, 0x1, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP39_TDM_SPI_CS0       MPP( 39, 0x2, 0, 1, 0,   0,   0,   1,   1 )
-#define MPP39_AU_I2SBCLK        MPP( 39, 0x4, 0, 1, 1,   0,   0,   1,   1 )
+#define MPP39_TSMP3             MPP( 39, 0x1, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP39_TDM_SPI_CS0       MPP( 39, 0x2, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP39_AU_I2SBCLK        MPP( 39, 0x4, 0, 0, 1,   0,   0,   1,   1 )
 #define MPP39_LCD_D19           MPP( 39, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP40_GPIO              MPP( 40, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP40_TSMP4             MPP( 40, 0x1, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP40_TDM_SPI_SCK       MPP( 40, 0x2, 0, 1, 0,   0,   0,   1,   1 )
-#define MPP40_AU_I2SDO          MPP( 40, 0x4, 0, 1, 1,   0,   0,   1,   1 )
+#define MPP40_TSMP4             MPP( 40, 0x1, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP40_TDM_SPI_SCK       MPP( 40, 0x2, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP40_AU_I2SDO          MPP( 40, 0x4, 0, 0, 1,   0,   0,   1,   1 )
 #define MPP40_LCD_D20           MPP( 40, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP41_GPIO              MPP( 41, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP41_TSMP5             MPP( 41, 0x1, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP41_TDM_SPI_MISO      MPP( 41, 0x2, 1, 0, 0,   0,   0,   1,   1 )
-#define MPP41_AU_I2SLRCLK       MPP( 41, 0x4, 0, 1, 1,   0,   0,   1,   1 )
+#define MPP41_TSMP5             MPP( 41, 0x1, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP41_TDM_SPI_MISO      MPP( 41, 0x2, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP41_AU_I2SLRCLK       MPP( 41, 0x4, 0, 0, 1,   0,   0,   1,   1 )
 #define MPP41_LCD_D21           MPP( 41, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP42_GPIO              MPP( 42, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP42_TSMP6             MPP( 42, 0x1, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP42_TDM_SPI_MOSI      MPP( 42, 0x2, 0, 1, 0,   0,   0,   1,   1 )
-#define MPP42_AU_I2SMCLK        MPP( 42, 0x4, 0, 1, 1,   0,   0,   1,   1 )
+#define MPP42_TSMP6             MPP( 42, 0x1, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP42_TDM_SPI_MOSI      MPP( 42, 0x2, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP42_AU_I2SMCLK        MPP( 42, 0x4, 0, 0, 1,   0,   0,   1,   1 )
 #define MPP42_LCD_D22           MPP( 42, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP43_GPIO              MPP( 43, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP43_TSMP7             MPP( 43, 0x1, 1, 1, 0,   0,   0,   1,   1 )
+#define MPP43_TSMP7             MPP( 43, 0x1, 0, 0, 0,   0,   0,   1,   1 )
 #define MPP43_TDM_CODEC_INTn    MPP( 43, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP43_AU_I2SDI          MPP( 43, 0x4, 1, 0, 1,   0,   0,   1,   1 )
+#define MPP43_AU_I2SDI          MPP( 43, 0x4, 0, 0, 1,   0,   0,   1,   1 )
 #define MPP43_LCD_D23           MPP( 22, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP44_GPIO              MPP( 44, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP44_TSMP8             MPP( 44, 0x1, 1, 1, 0,   0,   0,   1,   1 )
+#define MPP44_TSMP8             MPP( 44, 0x1, 0, 0, 0,   0,   0,   1,   1 )
 #define MPP44_TDM_CODEC_RSTn    MPP( 44, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP44_AU_EXTCLK         MPP( 44, 0x4, 1, 0, 1,   0,   0,   1,   1 )
+#define MPP44_AU_EXTCLK         MPP( 44, 0x4, 0, 0, 1,   0,   0,   1,   1 )
 #define MPP44_LCD_CLK           MPP( 44, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP45_GPIO              MPP( 45, 0x0, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP45_TSMP9             MPP( 45, 0x1, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP45_TDM_PCLK          MPP( 45, 0x2, 1, 1, 0,   0,   0,   1,   1 )
+#define MPP45_TSMP9             MPP( 45, 0x1, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP45_TDM_PCLK          MPP( 45, 0x2, 0, 0, 0,   0,   0,   1,   1 )
 #define MPP245_LCD_E            MPP( 45, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP46_GPIO              MPP( 46, 0x0, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP46_TSMP10            MPP( 46, 0x1, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP46_TDM_FS            MPP( 46, 0x2, 1, 1, 0,   0,   0,   1,   1 )
+#define MPP46_TSMP10            MPP( 46, 0x1, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP46_TDM_FS            MPP( 46, 0x2, 0, 0, 0,   0,   0,   1,   1 )
 #define MPP46_LCD_HSYNC         MPP( 46, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP47_GPIO              MPP( 47, 0x0, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP47_TSMP11            MPP( 47, 0x1, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP47_TDM_DRX           MPP( 47, 0x2, 1, 0, 0,   0,   0,   1,   1 )
+#define MPP47_TSMP11            MPP( 47, 0x1, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP47_TDM_DRX           MPP( 47, 0x2, 0, 0, 0,   0,   0,   1,   1 )
 #define MPP47_LCD_VSYNC         MPP( 47, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP48_GPIO              MPP( 48, 0x0, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP48_TSMP12            MPP( 48, 0x1, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP48_TDM_DTX           MPP( 48, 0x2, 0, 1, 0,   0,   0,   1,   1 )
+#define MPP48_TSMP12            MPP( 48, 0x1, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP48_TDM_DTX           MPP( 48, 0x2, 0, 0, 0,   0,   0,   1,   1 )
 #define MPP48_LCD_D16           MPP( 22, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP49_GPIO              MPP( 49, 0x0, 1, 1, 0,   0,   0,   1,   0 )
 #define MPP49_GPO               MPP( 49, 0x0, 0, 1, 0,   0,   0,   0,   1 )
-#define MPP49_TSMP9             MPP( 49, 0x1, 1, 1, 0,   0,   0,   1,   0 )
-#define MPP49_TDM_CH0_RX_QL     MPP( 49, 0x2, 0, 1, 0,   0,   0,   1,   1 )
-#define MPP49_PTP_CLK           MPP( 49, 0x5, 1, 0, 0,   0,   0,   1,   0 )
-#define MPP49_PEX0_CLKREQ       MPP( 49, 0xa, 0, 1, 0,   0,   0,   0,   1 )
+#define MPP49_TSMP9             MPP( 49, 0x1, 0, 0, 0,   0,   0,   1,   0 )
+#define MPP49_TDM_CH0_RX_QL     MPP( 49, 0x2, 0, 0, 0,   0,   0,   1,   1 )
+#define MPP49_PTP_CLK           MPP( 49, 0x5, 0, 0, 0,   0,   0,   1,   0 )
+#define MPP49_PEX0_CLKREQ       MPP( 49, 0xa, 0, 0, 0,   0,   0,   0,   1 )
 #define MPP49_LCD_D17           MPP( 49, 0xb, 0, 0, 0,   0,   0,   0,   1 )
 
 #define MPP_MAX                 49
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c
index 41c252de0215..a446fc14221f 100644
--- a/arch/arm/mach-msm/hotplug.c
+++ b/arch/arm/mach-msm/hotplug.c
@@ -11,6 +11,7 @@
 #include <linux/smp.h>
 
 #include <asm/cacheflush.h>
+#include <asm/smp_plat.h>
 
 extern volatile int pen_release;
 
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 0b3e357c4c8c..db0117ec55f4 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -20,6 +20,7 @@
 #include <asm/cacheflush.h>
 #include <asm/cputype.h>
 #include <asm/mach-types.h>
+#include <asm/smp_plat.h>
 
 #include <mach/msm_iomap.h>
 
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 0cdd41004ad0..a5dcf766a3f9 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -19,6 +19,7 @@
 #include <mach/mv78xx0.h>
 #include <mach/bridge-regs.h>
 #include <plat/cache-feroceon-l2.h>
+#include <plat/ehci-orion.h>
 #include <plat/orion_nand.h>
 #include <plat/time.h>
 #include <plat/common.h>
@@ -169,7 +170,7 @@ void __init mv78xx0_map_io(void)
  ****************************************************************************/
 void __init mv78xx0_ehci0_init(void)
 {
-        orion_ehci_init(USB0_PHYS_BASE, IRQ_MV78XX0_USB_0);
+        orion_ehci_init(USB0_PHYS_BASE, IRQ_MV78XX0_USB_0, EHCI_PHY_NA);
 }
 
 
diff --git a/arch/arm/mach-mv78xx0/mpp.h b/arch/arm/mach-mv78xx0/mpp.h
index b61b50927123..3752302ae2ee 100644
--- a/arch/arm/mach-mv78xx0/mpp.h
+++ b/arch/arm/mach-mv78xx0/mpp.h
@@ -24,296 +24,296 @@
 #define MPP_78100_A0_MASK    MPP(0, 0x0, 0, 0, 1)
 
 #define MPP0_GPIO        MPP(0, 0x0, 1, 1, 1)
-#define MPP0_GE0_COL        MPP(0, 0x1, 1, 0, 1)
-#define MPP0_GE1_TXCLK        MPP(0, 0x2, 0, 1, 1)
+#define MPP0_GE0_COL        MPP(0, 0x1, 0, 0, 1)
+#define MPP0_GE1_TXCLK        MPP(0, 0x2, 0, 0, 1)
 #define MPP0_UNUSED        MPP(0, 0x3, 0, 0, 1)
 
 #define MPP1_GPIO        MPP(1, 0x0, 1, 1, 1)
-#define MPP1_GE0_RXERR        MPP(1, 0x1, 1, 0, 1)
-#define MPP1_GE1_TXCTL        MPP(1, 0x2, 0, 1, 1)
+#define MPP1_GE0_RXERR        MPP(1, 0x1, 0, 0, 1)
+#define MPP1_GE1_TXCTL        MPP(1, 0x2, 0, 0, 1)
 #define MPP1_UNUSED        MPP(1, 0x3, 0, 0, 1)
 
 #define MPP2_GPIO        MPP(2, 0x0, 1, 1, 1)
-#define MPP2_GE0_CRS        MPP(2, 0x1, 1, 0, 1)
-#define MPP2_GE1_RXCTL        MPP(2, 0x2, 1, 0, 1)
+#define MPP2_GE0_CRS        MPP(2, 0x1, 0, 0, 1)
+#define MPP2_GE1_RXCTL        MPP(2, 0x2, 0, 0, 1)
 #define MPP2_UNUSED        MPP(2, 0x3, 0, 0, 1)
 
 #define MPP3_GPIO        MPP(3, 0x0, 1, 1, 1)
-#define MPP3_GE0_TXERR        MPP(3, 0x1, 0, 1, 1)
-#define MPP3_GE1_RXCLK        MPP(3, 0x2, 1, 0, 1)
+#define MPP3_GE0_TXERR        MPP(3, 0x1, 0, 0, 1)
+#define MPP3_GE1_RXCLK        MPP(3, 0x2, 0, 0, 1)
 #define MPP3_UNUSED        MPP(3, 0x3, 0, 0, 1)
 
 #define MPP4_GPIO        MPP(4, 0x0, 1, 1, 1)
-#define MPP4_GE0_TXD4        MPP(4, 0x1, 0, 1, 1)
-#define MPP4_GE1_TXD0        MPP(4, 0x2, 0, 1, 1)
+#define MPP4_GE0_TXD4        MPP(4, 0x1, 0, 0, 1)
+#define MPP4_GE1_TXD0        MPP(4, 0x2, 0, 0, 1)
 #define MPP4_UNUSED        MPP(4, 0x3, 0, 0, 1)
 
 #define MPP5_GPIO        MPP(5, 0x0, 1, 1, 1)
-#define MPP5_GE0_TXD5        MPP(5, 0x1, 0, 1, 1)
-#define MPP5_GE1_TXD1        MPP(5, 0x2, 0, 1, 1)
+#define MPP5_GE0_TXD5        MPP(5, 0x1, 0, 0, 1)
+#define MPP5_GE1_TXD1        MPP(5, 0x2, 0, 0, 1)
 #define MPP5_UNUSED        MPP(5, 0x3, 0, 0, 1)
 
 #define MPP6_GPIO        MPP(6, 0x0, 1, 1, 1)
-#define MPP6_GE0_TXD6        MPP(6, 0x1, 0, 1, 1)
-#define MPP6_GE1_TXD2        MPP(6, 0x2, 0, 1, 1)
+#define MPP6_GE0_TXD6        MPP(6, 0x1, 0, 0, 1)
+#define MPP6_GE1_TXD2        MPP(6, 0x2, 0, 0, 1)
 #define MPP6_UNUSED        MPP(6, 0x3, 0, 0, 1)
 
 #define MPP7_GPIO        MPP(7, 0x0, 1, 1, 1)
-#define MPP7_GE0_TXD7        MPP(7, 0x1, 0, 1, 1)
-#define MPP7_GE1_TXD3        MPP(7, 0x2, 0, 1, 1)
+#define MPP7_GE0_TXD7        MPP(7, 0x1, 0, 0, 1)
+#define MPP7_GE1_TXD3        MPP(7, 0x2, 0, 0, 1)
 #define MPP7_UNUSED        MPP(7, 0x3, 0, 0, 1)
 
 #define MPP8_GPIO        MPP(8, 0x0, 1, 1, 1)
-#define MPP8_GE0_RXD4        MPP(8, 0x1, 1, 0, 1)
-#define MPP8_GE1_RXD0        MPP(8, 0x2, 1, 0, 1)
+#define MPP8_GE0_RXD4        MPP(8, 0x1, 0, 0, 1)
+#define MPP8_GE1_RXD0        MPP(8, 0x2, 0, 0, 1)
 #define MPP8_UNUSED        MPP(8, 0x3, 0, 0, 1)
 
 #define MPP9_GPIO        MPP(9, 0x0, 1, 1, 1)
-#define MPP9_GE0_RXD5        MPP(9, 0x1, 1, 0, 1)
-#define MPP9_GE1_RXD1        MPP(9, 0x2, 1, 0, 1)
+#define MPP9_GE0_RXD5        MPP(9, 0x1, 0, 0, 1)
+#define MPP9_GE1_RXD1        MPP(9, 0x2, 0, 0, 1)
 #define MPP9_UNUSED        MPP(9, 0x3, 0, 0, 1)
 
 #define MPP10_GPIO        MPP(10, 0x0, 1, 1, 1)
-#define MPP10_GE0_RXD6        MPP(10, 0x1, 1, 0, 1)
-#define MPP10_GE1_RXD2        MPP(10, 0x2, 1, 0, 1)
+#define MPP10_GE0_RXD6        MPP(10, 0x1, 0, 0, 1)
+#define MPP10_GE1_RXD2        MPP(10, 0x2, 0, 0, 1)
 #define MPP10_UNUSED        MPP(10, 0x3, 0, 0, 1)
 
 #define MPP11_GPIO        MPP(11, 0x0, 1, 1, 1)
-#define MPP11_GE0_RXD7        MPP(11, 0x1, 1, 0, 1)
-#define MPP11_GE1_RXD3        MPP(11, 0x2, 1, 0, 1)
+#define MPP11_GE0_RXD7        MPP(11, 0x1, 0, 0, 1)
+#define MPP11_GE1_RXD3        MPP(11, 0x2, 0, 0, 1)
 #define MPP11_UNUSED        MPP(11, 0x3, 0, 0, 1)
 
 #define MPP12_GPIO        MPP(12, 0x0, 1, 1, 1)
-#define MPP12_M_BB        MPP(12, 0x3, 1, 0, 1)
-#define MPP12_UA0_CTSn        MPP(12, 0x4, 1, 0, 1)
-#define MPP12_NAND_FLASH_REn0    MPP(12, 0x5, 0, 1, 1)
-#define MPP12_TDM0_SCSn        MPP(12, 0X6, 0, 1, 1)
+#define MPP12_M_BB        MPP(12, 0x3, 0, 0, 1)
+#define MPP12_UA0_CTSn        MPP(12, 0x4, 0, 0, 1)
+#define MPP12_NAND_FLASH_REn0    MPP(12, 0x5, 0, 0, 1)
+#define MPP12_TDM0_SCSn        MPP(12, 0X6, 0, 0, 1)
 #define MPP12_UNUSED        MPP(12, 0x1, 0, 0, 1)
 
 #define MPP13_GPIO        MPP(13, 0x0, 1, 1, 1)
-#define MPP13_SYSRST_OUTn    MPP(13, 0x3, 0, 1, 1)
-#define MPP13_UA0_RTSn        MPP(13, 0x4, 0, 1, 1)
-#define MPP13_NAN_FLASH_WEn0    MPP(13, 0x5, 0, 1, 1)
-#define MPP13_TDM_SCLK        MPP(13, 0x6, 0, 1, 1)
+#define MPP13_SYSRST_OUTn    MPP(13, 0x3, 0, 0, 1)
+#define MPP13_UA0_RTSn        MPP(13, 0x4, 0, 0, 1)
+#define MPP13_NAN_FLASH_WEn0    MPP(13, 0x5, 0, 0, 1)
+#define MPP13_TDM_SCLK        MPP(13, 0x6, 0, 0, 1)
 #define MPP13_UNUSED        MPP(13, 0x1, 0, 0, 1)
 
 #define MPP14_GPIO        MPP(14, 0x0, 1, 1, 1)
-#define MPP14_SATA1_ACTn    MPP(14, 0x3, 0, 1, 1)
-#define MPP14_UA1_CTSn        MPP(14, 0x4, 1, 0, 1)
-#define MPP14_NAND_FLASH_REn1    MPP(14, 0x5, 0, 1, 1)
-#define MPP14_TDM_SMOSI        MPP(14, 0x6, 0, 1, 1)
+#define MPP14_SATA1_ACTn    MPP(14, 0x3, 0, 0, 1)
+#define MPP14_UA1_CTSn        MPP(14, 0x4, 0, 0, 1)
+#define MPP14_NAND_FLASH_REn1    MPP(14, 0x5, 0, 0, 1)
+#define MPP14_TDM_SMOSI        MPP(14, 0x6, 0, 0, 1)
 #define MPP14_UNUSED        MPP(14, 0x1, 0, 0, 1)
 
 #define MPP15_GPIO        MPP(15, 0x0, 1, 1, 1)
-#define MPP15_SATA0_ACTn    MPP(15, 0x3, 0, 1, 1)
-#define MPP15_UA1_RTSn        MPP(15, 0x4, 0, 1, 1)
-#define MPP15_NAND_FLASH_WEn1    MPP(15, 0x5, 0, 1, 1)
-#define MPP15_TDM_SMISO        MPP(15, 0x6, 1, 0, 1)
+#define MPP15_SATA0_ACTn    MPP(15, 0x3, 0, 0, 1)
+#define MPP15_UA1_RTSn        MPP(15, 0x4, 0, 0, 1)
+#define MPP15_NAND_FLASH_WEn1    MPP(15, 0x5, 0, 0, 1)
+#define MPP15_TDM_SMISO        MPP(15, 0x6, 0, 0, 1)
 #define MPP15_UNUSED        MPP(15, 0x1, 0, 0, 1)
 
 #define MPP16_GPIO        MPP(16, 0x0, 1, 1, 1)
-#define MPP16_SATA1_PRESENTn    MPP(16, 0x3, 0, 1, 1)
-#define MPP16_UA2_TXD        MPP(16, 0x4, 0, 1, 1)
-#define MPP16_NAND_FLASH_REn3    MPP(16, 0x5, 0, 1, 1)
-#define MPP16_TDM_INTn        MPP(16, 0x6, 1, 0, 1)
+#define MPP16_SATA1_PRESENTn    MPP(16, 0x3, 0, 0, 1)
+#define MPP16_UA2_TXD        MPP(16, 0x4, 0, 0, 1)
+#define MPP16_NAND_FLASH_REn3    MPP(16, 0x5, 0, 0, 1)
+#define MPP16_TDM_INTn        MPP(16, 0x6, 0, 0, 1)
 #define MPP16_UNUSED        MPP(16, 0x1, 0, 0, 1)
 
 
 #define MPP17_GPIO        MPP(17, 0x0, 1, 1, 1)
-#define MPP17_SATA0_PRESENTn    MPP(17, 0x3, 0, 1, 1)
-#define MPP17_UA2_RXD        MPP(17, 0x4, 1, 0, 1)
-#define MPP17_NAND_FLASH_WEn3    MPP(17, 0x5, 0, 1, 1)
-#define MPP17_TDM_RSTn        MPP(17, 0x6, 0, 1, 1)
+#define MPP17_SATA0_PRESENTn    MPP(17, 0x3, 0, 0, 1)
+#define MPP17_UA2_RXD        MPP(17, 0x4, 0, 0, 1)
+#define MPP17_NAND_FLASH_WEn3    MPP(17, 0x5, 0, 0, 1)
+#define MPP17_TDM_RSTn        MPP(17, 0x6, 0, 0, 1)
 #define MPP17_UNUSED        MPP(17, 0x1, 0, 0, 1)
 
 
 #define MPP18_GPIO        MPP(18, 0x0, 1, 1, 1)
-#define MPP18_UA0_CTSn        MPP(18, 0x4, 1, 0, 1)
-#define MPP18_BOOT_FLASH_REn    MPP(18, 0x5, 0, 1, 1)
+#define MPP18_UA0_CTSn        MPP(18, 0x4, 0, 0, 1)
+#define MPP18_BOOT_FLASH_REn    MPP(18, 0x5, 0, 0, 1)
 #define MPP18_UNUSED        MPP(18, 0x1, 0, 0, 1)
 
 
 
 #define MPP19_GPIO        MPP(19, 0x0, 1, 1, 1)
-#define MPP19_UA0_CTSn        MPP(19, 0x4, 0, 1, 1)
-#define MPP19_BOOT_FLASH_WEn    MPP(19, 0x5, 0, 1, 1)
+#define MPP19_UA0_CTSn        MPP(19, 0x4, 0, 0, 1)
+#define MPP19_BOOT_FLASH_WEn    MPP(19, 0x5, 0, 0, 1)
 #define MPP19_UNUSED        MPP(19, 0x1, 0, 0, 1)
 
 
 #define MPP20_GPIO        MPP(20, 0x0, 1, 1, 1)
-#define MPP20_UA1_CTSs        MPP(20, 0x4, 1, 0, 1)
-#define MPP20_TDM_PCLK        MPP(20, 0x6, 1, 1, 0)
+#define MPP20_UA1_CTSs        MPP(20, 0x4, 0, 0, 1)
+#define MPP20_TDM_PCLK        MPP(20, 0x6, 0, 0, 0)
 #define MPP20_UNUSED        MPP(20, 0x1, 0, 0, 1)
 
 
 
 #define MPP21_GPIO        MPP(21, 0x0, 1, 1, 1)
-#define MPP21_UA1_CTSs        MPP(21, 0x4, 0, 1, 1)
-#define MPP21_TDM_FSYNC        MPP(21, 0x6, 1, 1, 0)
+#define MPP21_UA1_CTSs        MPP(21, 0x4, 0, 0, 1)
+#define MPP21_TDM_FSYNC        MPP(21, 0x6, 0, 0, 0)
 #define MPP21_UNUSED        MPP(21, 0x1, 0, 0, 1)
 
 
 
 #define MPP22_GPIO        MPP(22, 0x0, 1, 1, 1)
-#define MPP22_UA3_TDX        MPP(22, 0x4, 0, 1, 1)
-#define MPP22_NAND_FLASH_REn2    MPP(22, 0x5, 0, 1, 1)
-#define MPP22_TDM_DRX        MPP(22, 0x6, 1, 0, 1)
+#define MPP22_UA3_TDX        MPP(22, 0x4, 0, 0, 1)
+#define MPP22_NAND_FLASH_REn2    MPP(22, 0x5, 0, 0, 1)
+#define MPP22_TDM_DRX        MPP(22, 0x6, 0, 0, 1)
 #define MPP22_UNUSED        MPP(22, 0x1, 0, 0, 1)
 
 
 
 #define MPP23_GPIO        MPP(23, 0x0, 1, 1, 1)
-#define MPP23_UA3_RDX        MPP(23, 0x4, 1, 0, 1)
-#define MPP23_NAND_FLASH_WEn2    MPP(23, 0x5, 0, 1, 1)
-#define MPP23_TDM_DTX        MPP(23, 0x6, 0, 1, 1)
+#define MPP23_UA3_RDX        MPP(23, 0x4, 0, 0, 1)
+#define MPP23_NAND_FLASH_WEn2    MPP(23, 0x5, 0, 0, 1)
+#define MPP23_TDM_DTX        MPP(23, 0x6, 0, 0, 1)
 #define MPP23_UNUSED        MPP(23, 0x1, 0, 0, 1)
 
 
 #define MPP24_GPIO        MPP(24, 0x0, 1, 1, 1)
-#define MPP24_UA2_TXD        MPP(24, 0x4, 0, 1, 1)
-#define MPP24_TDM_INTn        MPP(24, 0x6, 1, 0, 1)
+#define MPP24_UA2_TXD        MPP(24, 0x4, 0, 0, 1)
+#define MPP24_TDM_INTn        MPP(24, 0x6, 0, 0, 1)
 #define MPP24_UNUSED        MPP(24, 0x1, 0, 0, 1)
 
 
 #define MPP25_GPIO        MPP(25, 0x0, 1, 1, 1)
-#define MPP25_UA2_RXD        MPP(25, 0x4, 1, 0, 1)
-#define MPP25_TDM_RSTn        MPP(25, 0x6, 0, 1, 1)
+#define MPP25_UA2_RXD        MPP(25, 0x4, 0, 0, 1)
+#define MPP25_TDM_RSTn        MPP(25, 0x6, 0, 0, 1)
 #define MPP25_UNUSED        MPP(25, 0x1, 0, 0, 1)
 
 
 #define MPP26_GPIO        MPP(26, 0x0, 1, 1, 1)
-#define MPP26_UA2_CTSn        MPP(26, 0x4, 1, 0, 1)
-#define MPP26_TDM_PCLK        MPP(26, 0x6, 1, 1, 1)
+#define MPP26_UA2_CTSn        MPP(26, 0x4, 0, 0, 1)
+#define MPP26_TDM_PCLK        MPP(26, 0x6, 0, 0, 1)
 #define MPP26_UNUSED        MPP(26, 0x1, 0, 0, 1)
 
 
 #define MPP27_GPIO        MPP(27, 0x0, 1, 1, 1)
-#define MPP27_UA2_RTSn        MPP(27, 0x4, 0, 1, 1)
-#define MPP27_TDM_FSYNC        MPP(27, 0x6, 1, 1, 1)
+#define MPP27_UA2_RTSn        MPP(27, 0x4, 0, 0, 1)
+#define MPP27_TDM_FSYNC        MPP(27, 0x6, 0, 0, 1)
 #define MPP27_UNUSED        MPP(27, 0x1, 0, 0, 1)
 
 
 #define MPP28_GPIO        MPP(28, 0x0, 1, 1, 1)
-#define MPP28_UA3_TXD        MPP(28, 0x4, 0, 1, 1)
-#define MPP28_TDM_DRX        MPP(28, 0x6, 1, 0, 1)
+#define MPP28_UA3_TXD        MPP(28, 0x4, 0, 0, 1)
+#define MPP28_TDM_DRX        MPP(28, 0x6, 0, 0, 1)
 #define MPP28_UNUSED        MPP(28, 0x1, 0, 0, 1)
 
 #define MPP29_GPIO        MPP(29, 0x0, 1, 1, 1)
-#define MPP29_UA3_RXD        MPP(29, 0x4, 1, 0, 1)
-#define MPP29_SYSRST_OUTn    MPP(29, 0x5, 0, 1, 1)
-#define MPP29_TDM_DTX        MPP(29, 0x6, 0, 1, 1)
+#define MPP29_UA3_RXD        MPP(29, 0x4, 0, 0, 1)
+#define MPP29_SYSRST_OUTn    MPP(29, 0x5, 0, 0, 1)
+#define MPP29_TDM_DTX        MPP(29, 0x6, 0, 0, 1)
 #define MPP29_UNUSED        MPP(29, 0x1, 0, 0, 1)
 
 #define MPP30_GPIO        MPP(30, 0x0, 1, 1, 1)
-#define MPP30_UA3_CTSn        MPP(30, 0x4, 1, 0, 1)
+#define MPP30_UA3_CTSn        MPP(30, 0x4, 0, 0, 1)
 #define MPP30_UNUSED        MPP(30, 0x1, 0, 0, 1)
 
 #define MPP31_GPIO        MPP(31, 0x0, 1, 1, 1)
-#define MPP31_UA3_RTSn        MPP(31, 0x4, 0, 1, 1)
-#define MPP31_TDM1_SCSn        MPP(31, 0x6, 0, 1, 1)
+#define MPP31_UA3_RTSn        MPP(31, 0x4, 0, 0, 1)
+#define MPP31_TDM1_SCSn        MPP(31, 0x6, 0, 0, 1)
 #define MPP31_UNUSED        MPP(31, 0x1, 0, 0, 1)
 
 
 #define MPP32_GPIO        MPP(32, 0x1, 1, 1, 1)
-#define MPP32_UA3_TDX        MPP(32, 0x4, 0, 1, 1)
-#define MPP32_SYSRST_OUTn    MPP(32, 0x5, 0, 1, 1)
-#define MPP32_TDM0_RXQ        MPP(32, 0x6, 0, 1, 1)
+#define MPP32_UA3_TDX        MPP(32, 0x4, 0, 0, 1)
+#define MPP32_SYSRST_OUTn    MPP(32, 0x5, 0, 0, 1)
+#define MPP32_TDM0_RXQ        MPP(32, 0x6, 0, 0, 1)
 #define MPP32_UNUSED        MPP(32, 0x3, 0, 0, 1)
 
 
 #define MPP33_GPIO        MPP(33, 0x1, 1, 1, 1)
-#define MPP33_UA3_RDX        MPP(33, 0x4, 1, 0, 1)
-#define MPP33_TDM0_TXQ        MPP(33, 0x6, 0, 1, 1)
+#define MPP33_UA3_RDX        MPP(33, 0x4, 0, 0, 1)
+#define MPP33_TDM0_TXQ        MPP(33, 0x6, 0, 0, 1)
 #define MPP33_UNUSED        MPP(33, 0x3, 0, 0, 1)
 
 
 
 #define MPP34_GPIO        MPP(34, 0x1, 1, 1, 1)
-#define MPP34_UA2_TDX        MPP(34, 0x4, 0, 1, 1)
-#define MPP34_TDM1_RXQ        MPP(34, 0x6, 0, 1, 1)
+#define MPP34_UA2_TDX        MPP(34, 0x4, 0, 0, 1)
+#define MPP34_TDM1_RXQ        MPP(34, 0x6, 0, 0, 1)
 #define MPP34_UNUSED        MPP(34, 0x3, 0, 0, 1)
 
 
 
 #define MPP35_GPIO        MPP(35, 0x1, 1, 1, 1)
-#define MPP35_UA2_RDX        MPP(35, 0x4, 1, 0, 1)
-#define MPP35_TDM1_TXQ        MPP(35, 0x6, 0, 1, 1)
+#define MPP35_UA2_RDX        MPP(35, 0x4, 0, 0, 1)
+#define MPP35_TDM1_TXQ        MPP(35, 0x6, 0, 0, 1)
 #define MPP35_UNUSED        MPP(35, 0x3, 0, 0, 1)
 
 #define MPP36_GPIO        MPP(36, 0x1, 1, 1, 1)
-#define MPP36_UA0_CTSn        MPP(36, 0x2, 1, 0, 1)
-#define MPP36_UA2_TDX        MPP(36, 0x4, 0, 1, 1)
-#define MPP36_TDM0_SCSn        MPP(36, 0x6, 0, 1, 1)
+#define MPP36_UA0_CTSn        MPP(36, 0x2, 0, 0, 1)
+#define MPP36_UA2_TDX        MPP(36, 0x4, 0, 0, 1)
+#define MPP36_TDM0_SCSn        MPP(36, 0x6, 0, 0, 1)
 #define MPP36_UNUSED        MPP(36, 0x3, 0, 0, 1)
 
 
 #define MPP37_GPIO        MPP(37, 0x1, 1, 1, 1)
-#define MPP37_UA0_RTSn        MPP(37, 0x2, 0, 1, 1)
-#define MPP37_UA2_RXD        MPP(37, 0x4, 1, 0, 1)
-#define MPP37_SYSRST_OUTn    MPP(37, 0x5, 0, 1, 1)
-#define MPP37_TDM_SCLK        MPP(37, 0x6, 0, 1, 1)
+#define MPP37_UA0_RTSn        MPP(37, 0x2, 0, 0, 1)
+#define MPP37_UA2_RXD        MPP(37, 0x4, 0, 0, 1)
+#define MPP37_SYSRST_OUTn    MPP(37, 0x5, 0, 0, 1)
+#define MPP37_TDM_SCLK        MPP(37, 0x6, 0, 0, 1)
 #define MPP37_UNUSED        MPP(37, 0x3, 0, 0, 1)
 
 
 
 
 #define MPP38_GPIO        MPP(38, 0x1, 1, 1, 1)
-#define MPP38_UA1_CTSn        MPP(38, 0x2, 1, 0, 1)
-#define MPP38_UA3_TXD        MPP(38, 0x4, 0, 1, 1)
-#define MPP38_SYSRST_OUTn    MPP(38, 0x5, 0, 1, 1)
-#define MPP38_TDM_SMOSI        MPP(38, 0x6, 0, 1, 1)
+#define MPP38_UA1_CTSn        MPP(38, 0x2, 0, 0, 1)
+#define MPP38_UA3_TXD        MPP(38, 0x4, 0, 0, 1)
+#define MPP38_SYSRST_OUTn    MPP(38, 0x5, 0, 0, 1)
+#define MPP38_TDM_SMOSI        MPP(38, 0x6, 0, 0, 1)
 #define MPP38_UNUSED        MPP(38, 0x3, 0, 0, 1)
 
 
 
 
 #define MPP39_GPIO        MPP(39, 0x1, 1, 1, 1)
-#define MPP39_UA1_RTSn        MPP(39, 0x2, 0, 1, 1)
-#define MPP39_UA3_RXD        MPP(39, 0x4, 1, 0, 1)
-#define MPP39_SYSRST_OUTn    MPP(39, 0x5, 0, 1, 1)
-#define MPP39_TDM_SMISO        MPP(39, 0x6, 1, 0, 1)
+#define MPP39_UA1_RTSn        MPP(39, 0x2, 0, 0, 1)
+#define MPP39_UA3_RXD        MPP(39, 0x4, 0, 0, 1)
+#define MPP39_SYSRST_OUTn    MPP(39, 0x5, 0, 0, 1)
+#define MPP39_TDM_SMISO        MPP(39, 0x6, 0, 0, 1)
 #define MPP39_UNUSED        MPP(39, 0x3, 0, 0, 1)
 
 
 
 #define MPP40_GPIO        MPP(40, 0x1, 1, 1, 1)
-#define MPP40_TDM_INTn        MPP(40, 0x6, 1, 0, 1)
+#define MPP40_TDM_INTn        MPP(40, 0x6, 0, 0, 1)
 #define MPP40_UNUSED        MPP(40, 0x0, 0, 0, 1)
 
 
 
 #define MPP41_GPIO        MPP(41, 0x1, 1, 1, 1)
-#define MPP41_TDM_RSTn        MPP(41, 0x6, 0, 1, 1)
+#define MPP41_TDM_RSTn        MPP(41, 0x6, 0, 0, 1)
 #define MPP41_UNUSED        MPP(41, 0x0, 0, 0, 1)
 
 
 
 #define MPP42_GPIO        MPP(42, 0x1, 1, 1, 1)
-#define MPP42_TDM_PCLK        MPP(42, 0x6, 1, 1, 1)
+#define MPP42_TDM_PCLK        MPP(42, 0x6, 0, 0, 1)
 #define MPP42_UNUSED        MPP(42, 0x0, 0, 0, 1)
 
 
 
 #define MPP43_GPIO        MPP(43, 0x1, 1, 1, 1)
-#define MPP43_TDM_FSYNC        MPP(43, 0x6, 1, 1, 1)
+#define MPP43_TDM_FSYNC        MPP(43, 0x6, 0, 0, 1)
 #define MPP43_UNUSED        MPP(43, 0x0, 0, 0, 1)
 
 
 
 #define MPP44_GPIO        MPP(44, 0x1, 1, 1, 1)
-#define MPP44_TDM_DRX        MPP(44, 0x6, 1, 0, 1)
+#define MPP44_TDM_DRX        MPP(44, 0x6, 0, 0, 1)
 #define MPP44_UNUSED        MPP(44, 0x0, 0, 0, 1)
 
 
 
 #define MPP45_GPIO        MPP(45, 0x1, 1, 1, 1)
-#define MPP45_SATA0_ACTn    MPP(45, 0x3, 0, 1, 1)
-#define MPP45_TDM_DRX        MPP(45, 0x6, 0, 1, 1)
+#define MPP45_SATA0_ACTn    MPP(45, 0x3, 0, 0, 1)
+#define MPP45_TDM_DRX        MPP(45, 0x6, 0, 0, 1)
 #define MPP45_UNUSED        MPP(45, 0x0, 0, 0, 1)
 
 
 #define MPP46_GPIO        MPP(46, 0x1, 1, 1, 1)
-#define MPP46_TDM_SCSn        MPP(46, 0x6, 0, 1, 1)
+#define MPP46_TDM_SCSn        MPP(46, 0x6, 0, 0, 1)
 #define MPP46_UNUSED        MPP(46, 0x0, 0, 0, 1)
 
 
@@ -323,14 +323,14 @@
 
 
 #define MPP48_GPIO        MPP(48, 0x1, 1, 1, 1)
-#define MPP48_SATA1_ACTn    MPP(48, 0x3, 0, 1, 1)
+#define MPP48_SATA1_ACTn    MPP(48, 0x3, 0, 0, 1)
 #define MPP48_UNUSED        MPP(48, 0x2, 0, 0, 1)
 
 
 
 #define MPP49_GPIO        MPP(49, 0x1, 1, 1, 1)
-#define MPP49_SATA0_ACTn    MPP(49, 0x3, 0, 1, 1)
-#define MPP49_M_BB        MPP(49, 0x4, 1, 0, 1)
+#define MPP49_SATA0_ACTn    MPP(49, 0x3, 0, 0, 1)
+#define MPP49_M_BB        MPP(49, 0x4, 0, 0, 1)
 #define MPP49_UNUSED        MPP(49, 0x2, 0, 0, 1)
 
 
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
deleted file mode 100644
index af0c212e3c7b..000000000000
--- a/arch/arm/mach-mx5/Kconfig
+++ /dev/null
@@ -1,244 +0,0 @@
-if ARCH_MX5
-
-# ARCH_MX5/50/53 are left to mark places where prevent multi-soc in single
-# image. So for most time, SOC_IMX50/51/53 should be used.
-
-config ARCH_MX51
-        bool
-
-config ARCH_MX50
-        bool
-
-config ARCH_MX53
-        bool
-
-config SOC_IMX50
-        bool
-        select CPU_V7
-        select ARM_L1_CACHE_SHIFT_6
-        select MXC_TZIC
-        select ARCH_MXC_IOMUX_V3
-        select ARCH_MXC_AUDMUX_V2
-        select ARCH_HAS_CPUFREQ
-        select ARCH_MX50
-
-config  SOC_IMX51
-        bool
-        select CPU_V7
-        select ARM_L1_CACHE_SHIFT_6
-        select MXC_TZIC
-        select ARCH_MXC_IOMUX_V3
-        select ARCH_MXC_AUDMUX_V2
-        select ARCH_HAS_CPUFREQ
-        select ARCH_MX51
-
-config  SOC_IMX53
-        bool
-        select CPU_V7
-        select ARM_L1_CACHE_SHIFT_6
-        select MXC_TZIC
-        select ARCH_MXC_IOMUX_V3
-        select ARCH_MX53
-
-#comment "i.MX50 machines:"
-
-config MACH_MX50_RDP
-        bool "Support MX50 reference design platform"
-        depends on BROKEN
-        select SOC_IMX50
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        help
-          Include support for MX50 reference design platform (RDP) board. This
-          includes specific configurations for the board and its peripherals.
-
-comment "i.MX51 machines:"
-
-config MACH_IMX51_DT
-        bool "Support i.MX51 platforms from device tree"
-        select SOC_IMX51
-        select USE_OF
-        select MACH_MX51_BABBAGE
-        help
-          Include support for Freescale i.MX51 based platforms
-          using the device tree for discovery
-
-config MACH_MX51_BABBAGE
-        bool "Support MX51 BABBAGE platforms"
-        select SOC_IMX51
-        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        help
-          Include support for MX51 Babbage platform, also known as MX51EVK in
-          u-boot. This includes specific configurations for the board and its
-          peripherals.
-
-config MACH_MX51_3DS
-        bool "Support MX51PDK (3DS)"
-        select SOC_IMX51
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_KEYPAD
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        select MXC_DEBUG_BOARD
-        help
-          Include support for MX51PDK (3DS) platform. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_EUKREA_CPUIMX51
-        bool "Support Eukrea CPUIMX51 module"
-        select SOC_IMX51
-        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_NAND
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        help
-          Include support for Eukrea CPUIMX51 platform. This includes
-          specific configurations for the module and its peripherals.
-
-choice
-        prompt "Baseboard"
-        depends on MACH_EUKREA_CPUIMX51
-        default MACH_EUKREA_MBIMX51_BASEBOARD
-
-config MACH_EUKREA_MBIMX51_BASEBOARD
-        prompt "Eukrea MBIMX51 development board"
-        bool
-        select IMX_HAVE_PLATFORM_IMX_KEYPAD
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select LEDS_GPIO_REGISTER
-        help
-          This adds board specific devices that can be found on Eukrea's
-          MBIMX51 evaluation board.
-
-endchoice
-
-config MACH_EUKREA_CPUIMX51SD
-        bool "Support Eukrea CPUIMX51SD module"
-        select SOC_IMX51
-        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_NAND
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        help
-          Include support for Eukrea CPUIMX51SD platform. This includes
-          specific configurations for the module and its peripherals.
-
-choice
-        prompt "Baseboard"
-        depends on MACH_EUKREA_CPUIMX51SD
-        default MACH_EUKREA_MBIMXSD51_BASEBOARD
-
-config MACH_EUKREA_MBIMXSD51_BASEBOARD
-        prompt "Eukrea MBIMXSD development board"
-        bool
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select LEDS_GPIO_REGISTER
-        help
-          This adds board specific devices that can be found on Eukrea's
-          MBIMXSD evaluation board.
-
-endchoice
-
-config MX51_EFIKA_COMMON
-        bool
-        select SOC_IMX51
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_PATA_IMX
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        select MXC_ULPI if USB_ULPI
-
-config MACH_MX51_EFIKAMX
-        bool "Support MX51 Genesi Efika MX nettop"
-        select LEDS_GPIO_REGISTER
-        select MX51_EFIKA_COMMON
-        help
-          Include support for Genesi Efika MX nettop. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_MX51_EFIKASB
-        bool "Support MX51 Genesi Efika Smartbook"
-        select LEDS_GPIO_REGISTER
-        select MX51_EFIKA_COMMON
-        help
-          Include support for Genesi Efika Smartbook. This includes specific
-          configurations for the board and its peripherals.
-
-comment "i.MX53 machines:"
-
-config MACH_IMX53_DT
-        bool "Support i.MX53 platforms from device tree"
-        select SOC_IMX53
-        select USE_OF
-        select MACH_MX53_ARD
-        select MACH_MX53_EVK
-        select MACH_MX53_LOCO
-        select MACH_MX53_SMD
-        help
-          Include support for Freescale i.MX53 based platforms
-          using the device tree for discovery
-
-config MACH_MX53_EVK
-        bool "Support MX53 EVK platforms"
-        select SOC_IMX53
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        select LEDS_GPIO_REGISTER
-        help
-          Include support for MX53 EVK platform. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_MX53_SMD
-        bool "Support MX53 SMD platforms"
-        select SOC_IMX53
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        help
-          Include support for MX53 SMD platform. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_MX53_LOCO
-        bool "Support MX53 LOCO platforms"
-        select SOC_IMX53
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select IMX_HAVE_PLATFORM_GPIO_KEYS
-        select LEDS_GPIO_REGISTER
-        help
-          Include support for MX53 LOCO platform. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_MX53_ARD
-        bool "Support MX53 ARD platforms"
-        select SOC_IMX53
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select IMX_HAVE_PLATFORM_GPIO_KEYS
-        help
-          Include support for MX53 ARD platform. This includes specific
-          configurations for the board and its peripherals.
-
-endif
diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile
deleted file mode 100644
index 0fc60807fa2b..000000000000
--- a/arch/arm/mach-mx5/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-# Object file lists.
-obj-y   := cpu.o mm.o clock-mx51-mx53.o ehci.o system.o
-
-obj-$(CONFIG_PM) += pm-imx5.o
-obj-$(CONFIG_CPU_FREQ_IMX)    += cpu_op-mx51.o
-obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
-obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
-obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
-obj-$(CONFIG_MACH_MX53_SMD) += board-mx53_smd.o
-obj-$(CONFIG_MACH_MX53_LOCO) += board-mx53_loco.o
-obj-$(CONFIG_MACH_MX53_ARD) += board-mx53_ard.o
-obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
-obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
-obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += board-cpuimx51sd.o
-obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd-baseboard.o
-obj-$(CONFIG_MX51_EFIKA_COMMON) += mx51_efika.o
-obj-$(CONFIG_MACH_MX51_EFIKAMX) += board-mx51_efikamx.o
-obj-$(CONFIG_MACH_MX51_EFIKASB) += board-mx51_efikasb.o
-obj-$(CONFIG_MACH_MX50_RDP) += board-mx50_rdp.o
-
-obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o
-obj-$(CONFIG_MACH_IMX53_DT) += imx53-dt.o
diff --git a/arch/arm/mach-mx5/Makefile.boot b/arch/arm/mach-mx5/Makefile.boot
deleted file mode 100644
index ca207ca305ec..000000000000
--- a/arch/arm/mach-mx5/Makefile.boot
+++ /dev/null
@@ -1,9 +0,0 @@
-   zreladdr-$(CONFIG_ARCH_MX50) += 0x70008000
-params_phys-$(CONFIG_ARCH_MX50) := 0x70000100
-initrd_phys-$(CONFIG_ARCH_MX50) := 0x70800000
-   zreladdr-$(CONFIG_ARCH_MX51) += 0x90008000
-params_phys-$(CONFIG_ARCH_MX51) := 0x90000100
-initrd_phys-$(CONFIG_ARCH_MX51) := 0x90800000
-   zreladdr-$(CONFIG_ARCH_MX53) += 0x70008000
-params_phys-$(CONFIG_ARCH_MX53) := 0x70000100
-initrd_phys-$(CONFIG_ARCH_MX53) := 0x70800000
diff --git a/arch/arm/mach-mx5/pm-imx5.c b/arch/arm/mach-mx5/pm-imx5.c
deleted file mode 100644
index 98052fc852c7..000000000000
--- a/arch/arm/mach-mx5/pm-imx5.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#include <linux/suspend.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/err.h>
-#include <asm/cacheflush.h>
-#include <asm/tlbflush.h>
-#include <mach/common.h>
-#include <mach/hardware.h>
-#include "crm_regs.h"
-
-static struct clk *gpc_dvfs_clk;
-
-static int mx5_suspend_prepare(void)
-{
-        return clk_enable(gpc_dvfs_clk);
-}
-
-static int mx5_suspend_enter(suspend_state_t state)
-{
-        switch (state) {
-        case PM_SUSPEND_MEM:
-                mx5_cpu_lp_set(STOP_POWER_OFF);
-                break;
-        case PM_SUSPEND_STANDBY:
-                mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        if (state == PM_SUSPEND_MEM) {
-                local_flush_tlb_all();
-                flush_cache_all();
-
-                /*clear the EMPGC0/1 bits */
-                __raw_writel(0, MXC_SRPG_EMPGC0_SRPGCR);
-                __raw_writel(0, MXC_SRPG_EMPGC1_SRPGCR);
-        }
-        cpu_do_idle();
-        return 0;
-}
-
-static void mx5_suspend_finish(void)
-{
-        clk_disable(gpc_dvfs_clk);
-}
-
-static int mx5_pm_valid(suspend_state_t state)
-{
-        return (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX);
-}
-
-static const struct platform_suspend_ops mx5_suspend_ops = {
-        .valid = mx5_pm_valid,
-        .prepare = mx5_suspend_prepare,
-        .enter = mx5_suspend_enter,
-        .finish = mx5_suspend_finish,
-};
-
-static int __init mx5_pm_init(void)
-{
-        if (gpc_dvfs_clk == NULL)
-                gpc_dvfs_clk = clk_get(NULL, "gpc_dvfs");
-
-        if (!IS_ERR(gpc_dvfs_clk)) {
-                if (cpu_is_mx51())
-                        suspend_set_ops(&mx5_suspend_ops);
-        } else
-                return -EPERM;
-
-        return 0;
-}
-device_initcall(mx5_pm_init);
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index a8ba7b96dcd1..d965da45160e 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -33,7 +33,6 @@ config ARCH_OMAP3
         default y
         select CPU_V7
         select USB_ARCH_HAS_EHCI
-        select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4
         select ARCH_HAS_OPP
         select PM_OPP if PM
         select ARM_CPU_SUSPEND if PM
@@ -214,13 +213,12 @@ config MACH_OMAP3_PANDORA
         depends on ARCH_OMAP3
         default y
         select OMAP_PACKAGE_CBB
-        select REGULATOR_FIXED_VOLTAGE
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 config MACH_OMAP3_TOUCHBOOK
         bool "OMAP3 Touch Book"
         depends on ARCH_OMAP3
         default y
-        select BACKLIGHT_CLASS_DEVICE
 
 config MACH_OMAP_3430SDP
         bool "OMAP 3430 SDP board"
@@ -266,7 +264,7 @@ config MACH_OMAP_ZOOM2
         select SERIAL_8250
         select SERIAL_CORE_CONSOLE
         select SERIAL_8250_CONSOLE
-        select REGULATOR_FIXED_VOLTAGE
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 config MACH_OMAP_ZOOM3
         bool "OMAP3630 Zoom3 board"
@@ -276,7 +274,7 @@ config MACH_OMAP_ZOOM3
         select SERIAL_8250
         select SERIAL_CORE_CONSOLE
         select SERIAL_8250_CONSOLE
-        select REGULATOR_FIXED_VOLTAGE
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 config MACH_CM_T35
         bool "CompuLab CM-T35/CM-T3730 modules"
@@ -335,7 +333,7 @@ config MACH_OMAP_4430SDP
         depends on ARCH_OMAP4
         select OMAP_PACKAGE_CBL
         select OMAP_PACKAGE_CBS
-        select REGULATOR_FIXED_VOLTAGE
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 config MACH_OMAP4_PANDA
         bool "OMAP4 Panda Board"
@@ -343,7 +341,7 @@ config MACH_OMAP4_PANDA
         depends on ARCH_OMAP4
         select OMAP_PACKAGE_CBL
         select OMAP_PACKAGE_CBS
-        select REGULATOR_FIXED_VOLTAGE
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 config OMAP3_EMU
         bool "OMAP3 debugging peripherals"
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index fc9b238cbc19..bd76394ccaf8 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -11,9 +11,9 @@ hwmod-common				= omap_hwmod.o \
                                           omap_hwmod_common_data.o
 clock-common                            = clock.o clock_common_data.o \
                                           clkt_dpll.o clkt_clksel.o
-secure-common                          = omap-smc.o omap-secure.o
+secure-common                           = omap-smc.o omap-secure.o
 
-obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
+obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
 obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
 obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)
 
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 39fba9df17fb..4e9071589bfb 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -52,8 +52,9 @@
 #define ETH_KS8851_QUART                138
 #define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO        184
 #define OMAP4_SFH7741_ENABLE_GPIO               188
-#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
+#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
 #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
+#define HDMI_GPIO_HPD  63 /* Hotplug detect */
 #define DISPLAY_SEL_GPIO        59      /* LCD2/PicoDLP switch */
 #define DLP_POWER_ON_GPIO       40
 
@@ -603,8 +604,9 @@ static void __init omap_sfh7741prox_init(void)
 }
 
 static struct gpio sdp4430_hdmi_gpios[] = {
-        { HDMI_GPIO_HPD,        GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_hpd"   },
+        { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
         { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_ls_oe" },
+        { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
 };
 
 static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
@@ -621,8 +623,7 @@ static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
 
 static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)
 {
-        gpio_free(HDMI_GPIO_LS_OE);
-        gpio_free(HDMI_GPIO_HPD);
+        gpio_free_array(sdp4430_hdmi_gpios, ARRAY_SIZE(sdp4430_hdmi_gpios));
 }
 
 static struct nokia_dsi_panel_data dsi1_panel = {
@@ -738,6 +739,10 @@ static void sdp4430_lcd_init(void)
                 pr_err("%s: Could not get lcd2_reset_gpio\n", __func__);
 }
 
+static struct omap_dss_hdmi_data sdp4430_hdmi_data = {
+        .hpd_gpio = HDMI_GPIO_HPD,
+};
+
 static struct omap_dss_device sdp4430_hdmi_device = {
         .name = "hdmi",
         .driver_name = "hdmi_panel",
@@ -745,6 +750,7 @@ static struct omap_dss_device sdp4430_hdmi_device = {
         .platform_enable = sdp4430_panel_enable_hdmi,
         .platform_disable = sdp4430_panel_disable_hdmi,
         .channel = OMAP_DSS_CHANNEL_DIGIT,
+        .data = &sdp4430_hdmi_data,
 };
 
 static struct picodlp_panel_data sdp4430_picodlp_pdata = {
@@ -808,7 +814,7 @@ static struct omap_dss_board_info sdp4430_dss_data = {
         .default_device = &sdp4430_lcd_device,
 };
 
-static void omap_4430sdp_display_init(void)
+static void __init omap_4430sdp_display_init(void)
 {
         int r;
 
@@ -829,6 +835,10 @@ static void omap_4430sdp_display_init(void)
                 omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
         else
                 omap_hdmi_init(0);
+
+        omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
+        omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
+        omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
 }
 
 #ifdef CONFIG_OMAP_MUX
@@ -841,7 +851,7 @@ static struct omap_board_mux board_mux[] __initdata = {
 #define board_mux       NULL
  #endif
 
-static void omap4_sdp4430_wifi_mux_init(void)
+static void __init omap4_sdp4430_wifi_mux_init(void)
 {
         omap_mux_init_gpio(GPIO_WIFI_IRQ, OMAP_PIN_INPUT |
                                 OMAP_PIN_OFF_WAKEUPENABLE);
@@ -868,12 +878,17 @@ static struct wl12xx_platform_data omap4_sdp4430_wlan_data __initdata = {
         .board_tcxo_clock = WL12XX_TCXOCLOCK_26,
 };
 
-static void omap4_sdp4430_wifi_init(void)
+static void __init omap4_sdp4430_wifi_init(void)
 {
+        int ret;
+
         omap4_sdp4430_wifi_mux_init();
-        if (wl12xx_set_platform_data(&omap4_sdp4430_wlan_data))
-                pr_err("Error setting wl12xx data\n");
-        platform_device_register(&omap_vwlan_device);
+        ret = wl12xx_set_platform_data(&omap4_sdp4430_wlan_data);
+        if (ret)
+                pr_err("Error setting wl12xx data: %d\n", ret);
+        ret = platform_device_register(&omap_vwlan_device);
+        if (ret)
+                pr_err("Error registering wl12xx device: %d\n", ret);
 }
 
 static void __init omap_4430sdp_init(void)
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index e921e3be24a4..d73316ed4207 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -437,7 +437,7 @@ static struct usbhs_omap_board_data usbhs_bdata __initdata = {
         .reset_gpio_port[2]  = -EINVAL
 };
 
-static void cm_t35_init_usbh(void)
+static void  __init cm_t35_init_usbh(void)
 {
         int err;
 
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index d58756060483..ad497620539b 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -17,6 +17,7 @@
 #include <linux/i2c/twl.h>
 
 #include <mach/hardware.h>
+#include <asm/hardware/gic.h>
 #include <asm/mach/arch.h>
 
 #include <plat/board.h>
@@ -102,6 +103,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
         .map_io         = omap242x_map_io,
         .init_early     = omap2420_init_early,
         .init_irq       = omap2_init_irq,
+        .handle_irq     = omap2_intc_handle_irq,
         .init_machine   = omap_generic_init,
         .timer          = &omap2_timer,
         .dt_compat      = omap242x_boards_compat,
@@ -141,6 +143,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
         .map_io         = omap3_map_io,
         .init_early     = omap3430_init_early,
         .init_irq       = omap3_init_irq,
+        .handle_irq     = omap3_intc_handle_irq,
         .init_machine   = omap3_init,
         .timer          = &omap3_timer,
         .dt_compat      = omap3_boards_compat,
@@ -160,6 +163,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
         .map_io         = omap4_map_io,
         .init_early     = omap4430_init_early,
         .init_irq       = gic_init_irq,
+        .handle_irq     = gic_handle_irq,
         .init_machine   = omap4_init,
         .timer          = &omap4_timer,
         .dt_compat      = omap4_boards_compat,
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 003fe34c9343..c775bead1497 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -617,6 +617,21 @@ static struct gpio omap3_evm_ehci_gpios[] __initdata = {
         { OMAP3_EVM_EHCI_SELECT, GPIOF_OUT_INIT_LOW,   "select EHCI port" },
 };
 
+static void __init omap3_evm_wl12xx_init(void)
+{
+#ifdef CONFIG_WL12XX_PLATFORM_DATA
+        int ret;
+
+        /* WL12xx WLAN Init */
+        ret = wl12xx_set_platform_data(&omap3evm_wlan_data);
+        if (ret)
+                pr_err("error setting wl12xx data: %d\n", ret);
+        ret = platform_device_register(&omap3evm_wlan_regulator);
+        if (ret)
+                pr_err("error registering wl12xx device: %d\n", ret);
+#endif
+}
+
 static void __init omap3_evm_init(void)
 {
         omap3_evm_get_revision();
@@ -665,13 +680,7 @@ static void __init omap3_evm_init(void)
         omap_ads7846_init(1, OMAP3_EVM_TS_GPIO, 310, NULL);
         omap3evm_init_smsc911x();
         omap3_evm_display_init();
-
-#ifdef CONFIG_WL12XX_PLATFORM_DATA
-        /* WL12xx WLAN Init */
-        if (wl12xx_set_platform_data(&omap3evm_wlan_data))
-                pr_err("error setting wl12xx data\n");
-        platform_device_register(&omap3evm_wlan_regulator);
-#endif
+        omap3_evm_wl12xx_init();
 }
 
 MACHINE_START(OMAP3EVM, "OMAP3 EVM")
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 30ad40db2cf3..28fc271f7031 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -51,8 +51,9 @@
 #define GPIO_HUB_NRESET         62
 #define GPIO_WIFI_PMENA         43
 #define GPIO_WIFI_IRQ           53
-#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
+#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
 #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
+#define HDMI_GPIO_HPD  63 /* Hotplug detect */
 
 /* wl127x BT, FM, GPS connectivity chip */
 static int wl1271_gpios[] = {46, -1, -1};
@@ -413,8 +414,9 @@ int __init omap4_panda_dvi_init(void)
 }
 
 static struct gpio panda_hdmi_gpios[] = {
-        { HDMI_GPIO_HPD,        GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd"   },
+        { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
         { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
+        { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
 };
 
 static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
@@ -431,10 +433,13 @@ static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
 
 static void omap4_panda_panel_disable_hdmi(struct omap_dss_device *dssdev)
 {
-        gpio_free(HDMI_GPIO_LS_OE);
-        gpio_free(HDMI_GPIO_HPD);
+        gpio_free_array(panda_hdmi_gpios, ARRAY_SIZE(panda_hdmi_gpios));
 }
 
+static struct omap_dss_hdmi_data omap4_panda_hdmi_data = {
+        .hpd_gpio = HDMI_GPIO_HPD,
+};
+
 static struct omap_dss_device  omap4_panda_hdmi_device = {
         .name = "hdmi",
         .driver_name = "hdmi_panel",
@@ -442,6 +447,7 @@ static struct omap_dss_device  omap4_panda_hdmi_device = {
         .platform_enable = omap4_panda_panel_enable_hdmi,
         .platform_disable = omap4_panda_panel_disable_hdmi,
         .channel = OMAP_DSS_CHANNEL_DIGIT,
+        .data = &omap4_panda_hdmi_data,
 };
 
 static struct omap_dss_device *omap4_panda_dss_devices[] = {
@@ -473,18 +479,24 @@ void omap4_panda_display_init(void)
                 omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
         else
                 omap_hdmi_init(0);
+
+        omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
+        omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
+        omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
 }
 
 static void __init omap4_panda_init(void)
 {
         int package = OMAP_PACKAGE_CBS;
+        int ret;
 
         if (omap_rev() == OMAP4430_REV_ES1_0)
                 package = OMAP_PACKAGE_CBL;
         omap4_mux_init(board_mux, NULL, package);
 
-        if (wl12xx_set_platform_data(&omap_panda_wlan_data))
-                pr_err("error setting wl12xx data\n");
+        ret = wl12xx_set_platform_data(&omap_panda_wlan_data);
+        if (ret)
+                pr_err("error setting wl12xx data: %d\n", ret);
 
         omap4_panda_i2c_init();
         platform_add_devices(panda_devices, ARRAY_SIZE(panda_devices));
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 8d7ce11cfeaf..c126461836ac 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -296,8 +296,10 @@ static void enable_board_wakeup_source(void)
 
 void __init zoom_peripherals_init(void)
 {
-        if (wl12xx_set_platform_data(&omap_zoom_wlan_data))
-                pr_err("error setting wl12xx data\n");
+        int ret = wl12xx_set_platform_data(&omap_zoom_wlan_data);
+
+        if (ret)
+                pr_err("error setting wl12xx data: %d\n", ret);
 
         omap_i2c_init();
         platform_device_register(&omap_vwlan_device);
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 0b510ad01a00..283d11eae693 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -405,6 +405,7 @@ static int omap_mcspi_init(struct omap_hwmod *oh, void *unused)
                         break;
         default:
                         pr_err("Invalid McSPI Revision value\n");
+                        kfree(pdata);
                         return -EINVAL;
         }
 
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 3c446d1a1781..3677b1f58b85 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -103,12 +103,8 @@ static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)
         u32 reg;
         u16 control_i2c_1;
 
-        /* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
-        omap_mux_init_signal("hdmi_hpd",
-                        OMAP_PIN_INPUT_PULLUP);
         omap_mux_init_signal("hdmi_cec",
                         OMAP_PIN_INPUT_PULLUP);
-        /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
         omap_mux_init_signal("hdmi_ddc_scl",
                         OMAP_PIN_INPUT_PULLUP);
         omap_mux_init_signal("hdmi_ddc_sda",
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 130034bf01d5..dfffbbf4c009 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -528,7 +528,13 @@ int gpmc_cs_configure(int cs, int cmd, int wval)
 
         case GPMC_CONFIG_DEV_SIZE:
                 regval  = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
+
+                /* clear 2 target bits */
+                regval &= ~GPMC_CONFIG1_DEVICESIZE(3);
+
+                /* set the proper value */
                 regval |= GPMC_CONFIG1_DEVICESIZE(wval);
+
                 gpmc_cs_write_reg(cs, GPMC_CS_CONFIG1, regval);
                 break;
 
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index bd844af13af5..b40c28895298 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -175,14 +175,15 @@ static void hsmmc2_select_input_clk_src(struct omap_mmc_platform_data *mmc)
 {
         u32 reg;
 
-        if (mmc->slots[0].internal_clock) {
-                reg = omap_ctrl_readl(control_devconf1_offset);
+        reg = omap_ctrl_readl(control_devconf1_offset);
+        if (mmc->slots[0].internal_clock)
                 reg |= OMAP2_MMCSDIO2ADPCLKISEL;
-                omap_ctrl_writel(reg, control_devconf1_offset);
-        }
+        else
+                reg &= ~OMAP2_MMCSDIO2ADPCLKISEL;
+        omap_ctrl_writel(reg, control_devconf1_offset);
 }
 
-static void hsmmc23_before_set_reg(struct device *dev, int slot,
+static void hsmmc2_before_set_reg(struct device *dev, int slot,
                                    int power_on, int vdd)
 {
         struct omap_mmc_platform_data *mmc = dev->platform_data;
@@ -292,8 +293,8 @@ static inline void omap_hsmmc_mux(struct omap_mmc_platform_data *mmc_controller,
         }
 }
 
-static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
-                                        struct omap_mmc_platform_data *mmc)
+static int omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
+                                 struct omap_mmc_platform_data *mmc)
 {
         char *hc_name;
 
@@ -407,14 +408,13 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
                         c->caps &= ~MMC_CAP_8_BIT_DATA;
                         c->caps |= MMC_CAP_4_BIT_DATA;
                 }
-                /* FALLTHROUGH */
-        case 3:
                 if (mmc->slots[0].features & HSMMC_HAS_PBIAS) {
                         /* off-chip level shifting, or none */
-                        mmc->slots[0].before_set_reg = hsmmc23_before_set_reg;
+                        mmc->slots[0].before_set_reg = hsmmc2_before_set_reg;
                         mmc->slots[0].after_set_reg = NULL;
                 }
                 break;
+        case 3:
         case 4:
         case 5:
                 mmc->slots[0].before_set_reg = NULL;
@@ -430,7 +430,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
 
 #define MAX_OMAP_MMC_HWMOD_NAME_LEN             16
 
-void __init omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr)
+void omap_init_hsmmc(struct omap2_hsmmc_info *hsmmcinfo, int ctrl_nr)
 {
         struct omap_hwmod *oh;
         struct platform_device *pdev;
@@ -487,7 +487,7 @@ done:
         kfree(mmc_data);
 }
 
-void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
+void omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
 {
         u32 reg;
 
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 3f174d51f67f..eb50c29fb644 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -388,7 +388,7 @@ static void __init omap_hwmod_init_postsetup(void)
         omap_pm_if_early_init();
 }
 
-#ifdef CONFIG_ARCH_OMAP2
+#ifdef CONFIG_SOC_OMAP2420
 void __init omap2420_init_early(void)
 {
         omap2_set_globals_242x();
@@ -400,7 +400,9 @@ void __init omap2420_init_early(void)
         omap_hwmod_init_postsetup();
         omap2420_clk_init();
 }
+#endif
 
+#ifdef CONFIG_SOC_OMAP2430
 void __init omap2430_init_early(void)
 {
         omap2_set_globals_243x();
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index e1cc75d1a57a..fb8bc9fa43b1 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -100,8 +100,8 @@ void omap_mux_write_array(struct omap_mux_partition *partition,
 
 static char *omap_mux_options;
 
-static int __init _omap_mux_init_gpio(struct omap_mux_partition *partition,
-                                      int gpio, int val)
+static int _omap_mux_init_gpio(struct omap_mux_partition *partition,
+                               int gpio, int val)
 {
         struct omap_mux_entry *e;
         struct omap_mux *gpio_mux = NULL;
@@ -145,7 +145,7 @@ static int __init _omap_mux_init_gpio(struct omap_mux_partition *partition,
         return 0;
 }
 
-int __init omap_mux_init_gpio(int gpio, int val)
+int omap_mux_init_gpio(int gpio, int val)
 {
         struct omap_mux_partition *partition;
         int ret;
@@ -159,9 +159,9 @@ int __init omap_mux_init_gpio(int gpio, int val)
         return -ENODEV;
 }
 
-static int __init _omap_mux_get_by_name(struct omap_mux_partition *partition,
-                                        const char *muxname,
-                                        struct omap_mux **found_mux)
+static int _omap_mux_get_by_name(struct omap_mux_partition *partition,
+                                 const char *muxname,
+                                 struct omap_mux **found_mux)
 {
         struct omap_mux *mux = NULL;
         struct omap_mux_entry *e;
@@ -240,7 +240,7 @@ omap_mux_get_by_name(const char *muxname,
         return -ENODEV;
 }
 
-int __init omap_mux_init_signal(const char *muxname, int val)
+int omap_mux_init_signal(const char *muxname, int val)
 {
         struct omap_mux_partition *partition = NULL;
         struct omap_mux *mux = NULL;
@@ -1094,8 +1094,8 @@ static void omap_mux_init_package(struct omap_mux *superset,
                 omap_mux_package_init_balls(package_balls, superset);
 }
 
-static void omap_mux_init_signals(struct omap_mux_partition *partition,
-                                  struct omap_board_mux *board_mux)
+static void __init omap_mux_init_signals(struct omap_mux_partition *partition,
+                                         struct omap_board_mux *board_mux)
 {
         omap_mux_set_cmdline_signals();
         omap_mux_write_array(partition, board_mux);
@@ -1109,8 +1109,8 @@ static void omap_mux_init_package(struct omap_mux *superset,
 {
 }
 
-static void omap_mux_init_signals(struct omap_mux_partition *partition,
-                                  struct omap_board_mux *board_mux)
+static void __init omap_mux_init_signals(struct omap_mux_partition *partition,
+                                         struct omap_board_mux *board_mux)
 {
 }
 
diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S
index b13ef7ef5ef4..503ac777a2ba 100644
--- a/arch/arm/mach-omap2/omap-headsmp.S
+++ b/arch/arm/mach-omap2/omap-headsmp.S
@@ -18,6 +18,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 
+        __CPUINIT
 /*
  * OMAP4 specific entry point for secondary CPU to jump from ROM
  * code.  This routine also provides a holding flag into which
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 5192cabb40ed..eba6cd3816f5 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1517,8 +1517,8 @@ static int _enable(struct omap_hwmod *oh)
         if (oh->_state != _HWMOD_STATE_INITIALIZED &&
             oh->_state != _HWMOD_STATE_IDLE &&
             oh->_state != _HWMOD_STATE_DISABLED) {
-                WARN(1, "omap_hwmod: %s: enabled state can only be entered "
-                     "from initialized, idle, or disabled state\n", oh->name);
+                WARN(1, "omap_hwmod: %s: enabled state can only be entered from initialized, idle, or disabled state\n",
+                        oh->name);
                 return -EINVAL;
         }
 
@@ -1600,8 +1600,8 @@ static int _idle(struct omap_hwmod *oh)
         pr_debug("omap_hwmod: %s: idling\n", oh->name);
 
         if (oh->_state != _HWMOD_STATE_ENABLED) {
-                WARN(1, "omap_hwmod: %s: idle state can only be entered from "
-                     "enabled state\n", oh->name);
+                WARN(1, "omap_hwmod: %s: idle state can only be entered from enabled state\n",
+                        oh->name);
                 return -EINVAL;
         }
 
@@ -1682,8 +1682,8 @@ static int _shutdown(struct omap_hwmod *oh)
 
         if (oh->_state != _HWMOD_STATE_IDLE &&
             oh->_state != _HWMOD_STATE_ENABLED) {
-                WARN(1, "omap_hwmod: %s: disabled state can only be entered "
-                     "from idle, or enabled state\n", oh->name);
+                WARN(1, "omap_hwmod: %s: disabled state can only be entered from idle, or enabled state\n",
+                        oh->name);
                 return -EINVAL;
         }
 
@@ -2240,8 +2240,8 @@ void omap_hwmod_ocp_barrier(struct omap_hwmod *oh)
         BUG_ON(!oh);
 
         if (!oh->class->sysc || !oh->class->sysc->sysc_flags) {
-                WARN(1, "omap_device: %s: OCP barrier impossible due to "
-                      "device configuration\n", oh->name);
+                WARN(1, "omap_device: %s: OCP barrier impossible due to device configuration\n",
+                        oh->name);
                 return;
         }
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
index c11273da5dcc..f08e442af397 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
@@ -56,27 +56,6 @@ struct omap_hwmod_class omap2_dss_hwmod_class = {
 };
 
 /*
- * 'dispc' class
- * display controller
- */
-
-static struct omap_hwmod_class_sysconfig omap2_dispc_sysc = {
-        .rev_offs       = 0x0000,
-        .sysc_offs      = 0x0010,
-        .syss_offs      = 0x0014,
-        .sysc_flags     = (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE |
-                           SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE),
-        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
-                           MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
-        .sysc_fields    = &omap_hwmod_sysc_type1,
-};
-
-struct omap_hwmod_class omap2_dispc_hwmod_class = {
-        .name   = "dispc",
-        .sysc   = &omap2_dispc_sysc,
-};
-
-/*
  * 'rfbi' class
  * remote frame buffer interface
  */
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
index 177dee20faef..2a6729741b06 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@ -28,6 +28,28 @@ struct omap_hwmod_dma_info omap2xxx_dss_sdma_chs[] = {
         { .name = "dispc", .dma_req = 5 },
         { .dma_req = -1 }
 };
+
+/*
+ * 'dispc' class
+ * display controller
+ */
+
+static struct omap_hwmod_class_sysconfig omap2_dispc_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE |
+                           SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+struct omap_hwmod_class omap2_dispc_hwmod_class = {
+        .name   = "dispc",
+        .sysc   = &omap2_dispc_sysc,
+};
+
 /* OMAP2xxx Timer Common */
 static struct omap_hwmod_class_sysconfig omap2xxx_timer_sysc = {
         .rev_offs       = 0x0000,
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 5324e8d93bc0..3c8dd928628e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -1480,6 +1480,28 @@ static struct omap_hwmod omap3xxx_dss_core_hwmod = {
         .masters_cnt    = ARRAY_SIZE(omap3xxx_dss_masters),
 };
 
+/*
+ * 'dispc' class
+ * display controller
+ */
+
+static struct omap_hwmod_class_sysconfig omap3_dispc_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE |
+                           SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE |
+                           SYSC_HAS_ENAWAKEUP),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class omap3_dispc_hwmod_class = {
+        .name   = "dispc",
+        .sysc   = &omap3_dispc_sysc,
+};
+
 /* l4_core -> dss_dispc */
 static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_dispc = {
         .master         = &omap3xxx_l4_core_hwmod,
@@ -1503,7 +1525,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_dss_dispc_slaves[] = {
 
 static struct omap_hwmod omap3xxx_dss_dispc_hwmod = {
         .name           = "dss_dispc",
-        .class          = &omap2_dispc_hwmod_class,
+        .class          = &omap3_dispc_hwmod_class,
         .mpu_irqs       = omap2_dispc_irqs,
         .main_clk       = "dss1_alwon_fck",
         .prcm           = {
@@ -3523,12 +3545,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
         &omap3xxx_uart2_hwmod,
         &omap3xxx_uart3_hwmod,
 
-        /* dss class */
-        &omap3xxx_dss_dispc_hwmod,
-        &omap3xxx_dss_dsi1_hwmod,
-        &omap3xxx_dss_rfbi_hwmod,
-        &omap3xxx_dss_venc_hwmod,
-
         /* i2c class */
         &omap3xxx_i2c1_hwmod,
         &omap3xxx_i2c2_hwmod,
@@ -3635,6 +3651,15 @@ static __initdata struct omap_hwmod *am35xx_hwmods[] = {
         NULL
 };
 
+static __initdata struct omap_hwmod *omap3xxx_dss_hwmods[] = {
+        /* dss class */
+        &omap3xxx_dss_dispc_hwmod,
+        &omap3xxx_dss_dsi1_hwmod,
+        &omap3xxx_dss_rfbi_hwmod,
+        &omap3xxx_dss_venc_hwmod,
+        NULL
+};
+
 int __init omap3xxx_hwmod_init(void)
 {
         int r;
@@ -3708,6 +3733,21 @@ int __init omap3xxx_hwmod_init(void)
 
         if (h)
                 r = omap_hwmod_register(h);
+        if (r < 0)
+                return r;
+
+        /*
+         * DSS code presumes that dss_core hwmod is handled first,
+         * _before_ any other DSS related hwmods so register common
+         * DSS hwmods last to ensure that dss_core is already registered.
+         * Otherwise some change things may happen, for ex. if dispc
+         * is handled before dss_core and DSS is enabled in bootloader
+         * DIPSC will be reset with outputs enabled which sometimes leads
+         * to unrecoverable L3 error.
+         * XXX The long-term fix to this is to ensure modules are set up
+         * in dependency order in the hwmod core code.
+         */
+        r = omap_hwmod_register(omap3xxx_dss_hwmods);
 
         return r;
 }
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index f9f151081760..ef0524c10a84 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -1031,6 +1031,7 @@ static struct omap_hwmod_dma_info omap44xx_dmic_sdma_reqs[] = {
 
 static struct omap_hwmod_addr_space omap44xx_dmic_addrs[] = {
         {
+                .name           = "mpu",
                 .pa_start       = 0x4012e000,
                 .pa_end         = 0x4012e07f,
                 .flags          = ADDR_TYPE_RT
@@ -1049,6 +1050,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__dmic = {
 
 static struct omap_hwmod_addr_space omap44xx_dmic_dma_addrs[] = {
         {
+                .name           = "dma",
                 .pa_start       = 0x4902e000,
                 .pa_end         = 0x4902e07f,
                 .flags          = ADDR_TYPE_RT
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index b8822f8b2891..23de98d03841 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -82,13 +82,7 @@ static int omap2_fclks_active(void)
         f1 = omap2_cm_read_mod_reg(CORE_MOD, CM_FCLKEN1);
         f2 = omap2_cm_read_mod_reg(CORE_MOD, OMAP24XX_CM_FCLKEN2);
 
-        /* Ignore UART clocks.  These are handled by UART core (serial.c) */
-        f1 &= ~(OMAP24XX_EN_UART1_MASK | OMAP24XX_EN_UART2_MASK);
-        f2 &= ~OMAP24XX_EN_UART3_MASK;
-
-        if (f1 | f2)
-                return 1;
-        return 0;
+        return (f1 | f2) ? 1 : 0;
 }
 
 static void omap2_enter_full_retention(void)
diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.c b/arch/arm/mach-omap2/prm2xxx_3xxx.c
index c1c4d86a79a8..9ce765407ad5 100644
--- a/arch/arm/mach-omap2/prm2xxx_3xxx.c
+++ b/arch/arm/mach-omap2/prm2xxx_3xxx.c
@@ -19,6 +19,7 @@
 #include "common.h"
 #include <plat/cpu.h>
 #include <plat/prcm.h>
+#include <plat/irqs.h>
 
 #include "vp.h"
 
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index 33dd655e6aab..a1d6154dc120 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include <plat/cpu.h>
+#include <plat/irqs.h>
 #include <plat/prcm.h>
 
 #include "vp.h"
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 247d89478f24..f590afc1f673 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -107,18 +107,18 @@ static void omap_uart_set_noidle(struct platform_device *pdev)
         omap_hwmod_set_slave_idlemode(od->hwmods[0], HWMOD_IDLEMODE_NO);
 }
 
-static void omap_uart_set_forceidle(struct platform_device *pdev)
+static void omap_uart_set_smartidle(struct platform_device *pdev)
 {
         struct omap_device *od = to_omap_device(pdev);
 
-        omap_hwmod_set_slave_idlemode(od->hwmods[0], HWMOD_IDLEMODE_FORCE);
+        omap_hwmod_set_slave_idlemode(od->hwmods[0], HWMOD_IDLEMODE_SMART);
 }
 
 #else
 static void omap_uart_enable_wakeup(struct platform_device *pdev, bool enable)
 {}
 static void omap_uart_set_noidle(struct platform_device *pdev) {}
-static void omap_uart_set_forceidle(struct platform_device *pdev) {}
+static void omap_uart_set_smartidle(struct platform_device *pdev) {}
 #endif /* CONFIG_PM */
 
 #ifdef CONFIG_OMAP_MUX
@@ -349,7 +349,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
         omap_up.uartclk = OMAP24XX_BASE_BAUD * 16;
         omap_up.flags = UPF_BOOT_AUTOCONF;
         omap_up.get_context_loss_count = omap_pm_get_dev_context_loss_count;
-        omap_up.set_forceidle = omap_uart_set_forceidle;
+        omap_up.set_forceidle = omap_uart_set_smartidle;
         omap_up.set_noidle = omap_uart_set_noidle;
         omap_up.enable_wakeup = omap_uart_enable_wakeup;
         omap_up.dma_rx_buf_size = info->dma_rx_buf_size;
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index 9dd93453e563..7e755bb0ffc4 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -897,7 +897,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
                 ret = sr_late_init(sr_info);
                 if (ret) {
                         pr_warning("%s: Error in SR late init\n", __func__);
-                        return ret;
+                        goto err_iounmap;
                 }
         }
 
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 6eeff0e0ae01..5c9acea95761 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -270,7 +270,7 @@ static struct clocksource clocksource_gpt = {
 static u32 notrace dmtimer_read_sched_clock(void)
 {
         if (clksrc.reserved)
-                return __omap_dm_timer_read_counter(clksrc.io_base, 1);
+                return __omap_dm_timer_read_counter(&clksrc, 1);
 
         return 0;
 }
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 031d116fbf10..175b7d86d86a 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -247,7 +247,7 @@ static void __init omap4_vc_init_channel(struct voltagedomain *voltdm)
  * omap_vc_i2c_init - initialize I2C interface to PMIC
  * @voltdm: voltage domain containing VC data
  *
- * Use PMIC supplied seetings for I2C high-speed mode and
+ * Use PMIC supplied settings for I2C high-speed mode and
  * master code (if set) and program the VC I2C configuration
  * register.
  *
@@ -265,8 +265,8 @@ static void __init omap_vc_i2c_init(struct voltagedomain *voltdm)
 
         if (initialized) {
                 if (voltdm->pmic->i2c_high_speed != i2c_high_speed)
-                        pr_warn("%s: I2C config for all channels must match.",
-                                __func__);
+                        pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).",
+                                __func__, voltdm->name, i2c_high_speed);
                 return;
         }
 
@@ -292,9 +292,7 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm)
         u32 val;
 
         if (!voltdm->pmic || !voltdm->pmic->uv_to_vsel) {
-                pr_err("%s: PMIC info requried to configure vc for"
-                        "vdd_%s not populated.Hence cannot initialize vc\n",
-                        __func__, voltdm->name);
+                pr_err("%s: No PMIC info for vdd_%s\n", __func__, voltdm->name);
                 return;
         }
 
diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
index c005e2f5e383..57db2038b23c 100644
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
@@ -108,6 +108,7 @@ void __init omap3xxx_voltagedomains_init(void)
          * XXX Will depend on the process, validation, and binning
          * for the currently-running IC
          */
+#ifdef CONFIG_PM_OPP
         if (cpu_is_omap3630()) {
                 omap3_voltdm_mpu.volt_data = omap36xx_vddmpu_volt_data;
                 omap3_voltdm_core.volt_data = omap36xx_vddcore_volt_data;
@@ -115,6 +116,7 @@ void __init omap3xxx_voltagedomains_init(void)
                 omap3_voltdm_mpu.volt_data = omap34xx_vddmpu_volt_data;
                 omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;
         }
+#endif
 
         if (cpu_is_omap3517() || cpu_is_omap3505())
                 voltdms = voltagedomains_am35xx;
diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c
index 4e11d022595d..c3115f6853d4 100644
--- a/arch/arm/mach-omap2/voltagedomains44xx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c
@@ -100,9 +100,11 @@ void __init omap44xx_voltagedomains_init(void)
          * XXX Will depend on the process, validation, and binning
          * for the currently-running IC
          */
+#ifdef CONFIG_PM_OPP
         omap4_voltdm_mpu.volt_data = omap44xx_vdd_mpu_volt_data;
         omap4_voltdm_iva.volt_data = omap44xx_vdd_iva_volt_data;
         omap4_voltdm_core.volt_data = omap44xx_vdd_core_volt_data;
+#endif
 
         for (i = 0; voltdm = voltagedomains_omap4[i], voltdm; i++)
                 voltdm->sys_clk.name = sys_clk_name;
diff --git a/arch/arm/mach-omap2/vp.c b/arch/arm/mach-omap2/vp.c
index 807391d84a9d..0df88820978d 100644
--- a/arch/arm/mach-omap2/vp.c
+++ b/arch/arm/mach-omap2/vp.c
@@ -41,6 +41,11 @@ void __init omap_vp_init(struct voltagedomain *voltdm)
         u32 val, sys_clk_rate, timeout, waittime;
         u32 vddmin, vddmax, vstepmin, vstepmax;
 
+        if (!voltdm->pmic || !voltdm->pmic->uv_to_vsel) {
+                pr_err("%s: No PMIC info for vdd_%s\n", __func__, voltdm->name);
+                return;
+        }
+
         if (!voltdm->read || !voltdm->write) {
                 pr_err("%s: No read/write API for accessing vdd_%s regs\n",
                         __func__, voltdm->name);
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 0e28bae20bd4..5dad38ec00ea 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -29,6 +29,7 @@
 #include <mach/hardware.h>
 #include <mach/orion5x.h>
 #include <plat/orion_nand.h>
+#include <plat/ehci-orion.h>
 #include <plat/time.h>
 #include <plat/common.h>
 #include <plat/addr-map.h>
@@ -72,7 +73,8 @@ void __init orion5x_map_io(void)
  ****************************************************************************/
 void __init orion5x_ehci0_init(void)
 {
-        orion_ehci_init(ORION5X_USB0_PHYS_BASE, IRQ_ORION5X_USB0_CTRL);
+        orion_ehci_init(ORION5X_USB0_PHYS_BASE, IRQ_ORION5X_USB0_CTRL,
+                        EHCI_PHY_ORION);
 }
 
 
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 18fd177073f4..5bc13121eac5 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -415,29 +415,9 @@ static struct resource pxa_rtc_resources[] = {
         },
 };
 
-static struct resource sa1100_rtc_resources[] = {
-        [0] = {
-                .start  = 0x40900000,
-                .end    = 0x409000ff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = IRQ_RTC1Hz,
-                .end    = IRQ_RTC1Hz,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = IRQ_RTCAlrm,
-                .end    = IRQ_RTCAlrm,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
 struct platform_device sa1100_device_rtc = {
         .name           = "sa1100-rtc",
         .id             = -1,
-        .num_resources  = ARRAY_SIZE(sa1100_rtc_resources),
-        .resource       = sa1100_rtc_resources,
 };
 
 struct platform_device pxa_device_rtc = {
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index adf058fa97ee..91e4f6c03766 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -209,8 +209,6 @@ static struct clk_lookup pxa25x_clkregs[] = {
         INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"),
         INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),
         INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),
-        INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
-        INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static struct clk_lookup pxa25x_hwuart_clkreg =
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 180bd8675d4b..aed6cbcf3866 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -230,8 +230,6 @@ static struct clk_lookup pxa27x_clkregs[] = {
         INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"),
         INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),
         INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),
-        INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
-        INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 #ifdef CONFIG_PM
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c
index 0388eda7878a..40bb16501d86 100644
--- a/arch/arm/mach-pxa/pxa300.c
+++ b/arch/arm/mach-pxa/pxa300.c
@@ -89,7 +89,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0);
 static struct clk_lookup common_clkregs[] = {
         INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL),
         INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
-        INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0);
diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c
index d487e1ff4c9a..8d614ecd8e99 100644
--- a/arch/arm/mach-pxa/pxa320.c
+++ b/arch/arm/mach-pxa/pxa320.c
@@ -83,7 +83,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA320_GCU, 0, 0);
 static struct clk_lookup pxa320_clkregs[] = {
         INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL),
         INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL),
-        INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static int __init pxa320_init(void)
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index f107c71c7589..4f402afa6609 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -67,7 +67,6 @@ static struct clk_lookup pxa3xx_clkregs[] = {
         INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"),
         /* Power I2C clock is always on */
         INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),
-        INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
         INIT_CLKREG(&clk_pxa3xx_lcd, "pxa2xx-fb", NULL),
         INIT_CLKREG(&clk_pxa3xx_camera, NULL, "CAMCLK"),
         INIT_CLKREG(&clk_pxa3xx_ac97, NULL, "AC97CLK"),
diff --git a/arch/arm/mach-pxa/pxa95x.c b/arch/arm/mach-pxa/pxa95x.c
index fccc644702e6..d082a583df78 100644
--- a/arch/arm/mach-pxa/pxa95x.c
+++ b/arch/arm/mach-pxa/pxa95x.c
@@ -217,7 +217,6 @@ static struct clk_lookup pxa95x_clkregs[] = {
         INIT_CLKREG(&clk_pxa95x_pout, NULL, "CLK_POUT"),
         /* Power I2C clock is always on */
         INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL),
-        INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
         INIT_CLKREG(&clk_pxa95x_lcd, "pxa2xx-fb", NULL),
         INIT_CLKREG(&clk_pxa95x_ffuart, "pxa2xx-uart.0", NULL),
         INIT_CLKREG(&clk_pxa95x_btuart, "pxa2xx-uart.1", NULL),
diff --git a/arch/arm/mach-realview/hotplug.c b/arch/arm/mach-realview/hotplug.c
index ac1aed2a8da4..eb55f05bef3a 100644
--- a/arch/arm/mach-realview/hotplug.c
+++ b/arch/arm/mach-realview/hotplug.c
@@ -13,6 +13,7 @@
 #include <linux/smp.h>
 
 #include <asm/cacheflush.h>
+#include <asm/smp_plat.h>
 
 extern volatile int pen_release;
 
diff --git a/arch/arm/mach-realview/include/mach/board-eb.h b/arch/arm/mach-realview/include/mach/board-eb.h
index 794a8d91a6a6..124bce6b4d7b 100644
--- a/arch/arm/mach-realview/include/mach/board-eb.h
+++ b/arch/arm/mach-realview/include/mach/board-eb.h
@@ -47,21 +47,23 @@
 #define REALVIEW_EB_USB_BASE            0x4F000000      /* USB */
 
 #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB
-#define REALVIEW_EB11MP_SCU_BASE        0x10100000      /* SCU registers */
-#define REALVIEW_EB11MP_GIC_CPU_BASE    0x10100100      /* Generic interrupt controller CPU interface */
-#define REALVIEW_EB11MP_TWD_BASE        0x10100600
-#define REALVIEW_EB11MP_GIC_DIST_BASE   0x10101000      /* Generic interrupt controller distributor */
+#define REALVIEW_EB11MP_PRIV_MEM_BASE   0x1F000000
 #define REALVIEW_EB11MP_L220_BASE       0x10102000      /* L220 registers */
 #define REALVIEW_EB11MP_SYS_PLD_CTRL1   0xD8            /* Register offset for MPCore sysctl */
 #else
-#define REALVIEW_EB11MP_SCU_BASE        0x1F000000      /* SCU registers */
-#define REALVIEW_EB11MP_GIC_CPU_BASE    0x1F000100      /* Generic interrupt controller CPU interface */
-#define REALVIEW_EB11MP_TWD_BASE        0x1F000600
-#define REALVIEW_EB11MP_GIC_DIST_BASE   0x1F001000      /* Generic interrupt controller distributor */
+#define REALVIEW_EB11MP_PRIV_MEM_BASE   0x1F000000
 #define REALVIEW_EB11MP_L220_BASE       0x1F002000      /* L220 registers */
 #define REALVIEW_EB11MP_SYS_PLD_CTRL1   0x74            /* Register offset for MPCore sysctl */
 #endif
 
+#define REALVIEW_EB11MP_PRIV_MEM_SIZE   SZ_8K
+#define REALVIEW_EB11MP_PRIV_MEM_OFF(x) (REALVIEW_EB11MP_PRIV_MEM_BASE + (x))
+
+#define REALVIEW_EB11MP_SCU_BASE        REALVIEW_EB11MP_PRIV_MEM_OFF(0)         /* SCU registers */
+#define REALVIEW_EB11MP_GIC_CPU_BASE    REALVIEW_EB11MP_PRIV_MEM_OFF(0x0100)    /* Generic interrupt controller CPU interface */
+#define REALVIEW_EB11MP_TWD_BASE        REALVIEW_EB11MP_PRIV_MEM_OFF(0x0600)
+#define REALVIEW_EB11MP_GIC_DIST_BASE   REALVIEW_EB11MP_PRIV_MEM_OFF(0x1000)    /* Generic interrupt controller distributor */
+
 /*
  * Core tile identification (REALVIEW_SYS_PROCID)
  */
diff --git a/arch/arm/mach-realview/include/mach/board-pb11mp.h b/arch/arm/mach-realview/include/mach/board-pb11mp.h
index 7abf918b77e9..aa2d4e02ea2c 100644
--- a/arch/arm/mach-realview/include/mach/board-pb11mp.h
+++ b/arch/arm/mach-realview/include/mach/board-pb11mp.h
@@ -75,6 +75,8 @@
 /*
  * Testchip peripheral and fpga gic regions
  */
+#define REALVIEW_TC11MP_PRIV_MEM_BASE           0x1F000000
+#define REALVIEW_TC11MP_PRIV_MEM_SIZE           SZ_8K
 #define REALVIEW_TC11MP_SCU_BASE                0x1F000000      /* IRQ, Test chip */
 #define REALVIEW_TC11MP_GIC_CPU_BASE            0x1F000100      /* Test chip interrupt controller CPU interface */
 #define REALVIEW_TC11MP_TWD_BASE                0x1F000600
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index e62962117763..9578145f2df0 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -91,14 +91,9 @@ static struct map_desc realview_eb_io_desc[] __initdata = {
 
 static struct map_desc realview_eb11mp_io_desc[] __initdata = {
         {
-                .virtual        = IO_ADDRESS(REALVIEW_EB11MP_SCU_BASE),
-                .pfn            = __phys_to_pfn(REALVIEW_EB11MP_SCU_BASE),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = IO_ADDRESS(REALVIEW_EB11MP_GIC_DIST_BASE),
-                .pfn            = __phys_to_pfn(REALVIEW_EB11MP_GIC_DIST_BASE),
-                .length         = SZ_4K,
+                .virtual        = IO_ADDRESS(REALVIEW_EB11MP_PRIV_MEM_BASE),
+                .pfn            = __phys_to_pfn(REALVIEW_EB11MP_PRIV_MEM_BASE),
+                .length         = REALVIEW_EB11MP_PRIV_MEM_SIZE,
                 .type           = MT_DEVICE,
         }, {
                 .virtual        = IO_ADDRESS(REALVIEW_EB11MP_L220_BASE),
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index 127a3fd42ab1..2147335f66f5 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -64,15 +64,10 @@ static struct map_desc realview_pb11mp_io_desc[] __initdata = {
                 .pfn            = __phys_to_pfn(REALVIEW_PB11MP_GIC_DIST_BASE),
                 .length         = SZ_4K,
                 .type           = MT_DEVICE,
-        }, {
-                .virtual        = IO_ADDRESS(REALVIEW_TC11MP_GIC_CPU_BASE),
-                .pfn            = __phys_to_pfn(REALVIEW_TC11MP_GIC_CPU_BASE),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = IO_ADDRESS(REALVIEW_TC11MP_GIC_DIST_BASE),
-                .pfn            = __phys_to_pfn(REALVIEW_TC11MP_GIC_DIST_BASE),
-                .length         = SZ_4K,
+        }, {    /* Maps the SCU, GIC CPU interface, TWD, GIC DIST */
+                .virtual        = IO_ADDRESS(REALVIEW_TC11MP_PRIV_MEM_BASE),
+                .pfn            = __phys_to_pfn(REALVIEW_TC11MP_PRIV_MEM_BASE),
+                .length         = REALVIEW_TC11MP_PRIV_MEM_SIZE,
                 .type           = MT_DEVICE,
         }, {
                 .virtual        = IO_ADDRESS(REALVIEW_SCTL_BASE),
diff --git a/arch/arm/mach-s3c2410/cpu-freq.c b/arch/arm/mach-s3c2410/cpu-freq.c
index 7dc6c46b5e2b..5404535da1a5 100644
--- a/arch/arm/mach-s3c2410/cpu-freq.c
+++ b/arch/arm/mach-s3c2410/cpu-freq.c
@@ -115,7 +115,8 @@ static struct s3c_cpufreq_info s3c2410_cpufreq_info = {
         .debug_io_show  = s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs),
 };
 
-static int s3c2410_cpufreq_add(struct device *dev)
+static int s3c2410_cpufreq_add(struct device *dev,
+                               struct subsys_interface *sif)
 {
         return s3c_cpufreq_register(&s3c2410_cpufreq_info);
 }
@@ -133,7 +134,8 @@ static int __init s3c2410_cpufreq_init(void)
 
 arch_initcall(s3c2410_cpufreq_init);
 
-static int s3c2410a_cpufreq_add(struct device *dev)
+static int s3c2410a_cpufreq_add(struct device *dev,
+                                struct subsys_interface *sif)
 {
         /* alter the maximum freq settings for S3C2410A. If a board knows
          * it only has a maximum of 200, then it should register its own
@@ -144,7 +146,7 @@ static int s3c2410a_cpufreq_add(struct device *dev)
         s3c2410_cpufreq_info.max.pclk =  66500000;
         s3c2410_cpufreq_info.name = "s3c2410a";
 
-        return s3c2410_cpufreq_add(dev);
+        return s3c2410_cpufreq_add(dev, sif);
 }
 
 static struct subsys_interface s3c2410a_cpufreq_interface = {
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c
index 2afd00014a77..4803338cf56e 100644
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
@@ -132,7 +132,8 @@ static struct s3c24xx_dma_order __initdata s3c2410_dma_order = {
         },
 };
 
-static int __init s3c2410_dma_add(struct device *dev)
+static int __init s3c2410_dma_add(struct device *dev,
+                                  struct subsys_interface *sif)
 {
         s3c2410_dma_init();
         s3c24xx_dma_order_set(&s3c2410_dma_order);
@@ -148,7 +149,7 @@ static struct subsys_interface s3c2410_dma_interface = {
 
 static int __init s3c2410_dma_drvinit(void)
 {
-        return subsys_interface_register(&s3c2410_interface);
+        return subsys_interface_register(&s3c2410_dma_interface);
 }
 
 arch_initcall(s3c2410_dma_drvinit);
diff --git a/arch/arm/mach-s3c2410/pll.c b/arch/arm/mach-s3c2410/pll.c
index c07438bfc99f..e0b3b347da82 100644
--- a/arch/arm/mach-s3c2410/pll.c
+++ b/arch/arm/mach-s3c2410/pll.c
@@ -66,7 +66,7 @@ static struct cpufreq_frequency_table pll_vals_12MHz[] = {
     { .frequency = 270000000, .index = PLLVAL(127, 1, 1),  },
 };
 
-static int s3c2410_plls_add(struct device *dev)
+static int s3c2410_plls_add(struct device *dev, struct subsys_interface *sif)
 {
         return s3c_plltab_register(pll_vals_12MHz, ARRAY_SIZE(pll_vals_12MHz));
 }
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c
index fda5385deff6..03f706dd6009 100644
--- a/arch/arm/mach-s3c2410/pm.c
+++ b/arch/arm/mach-s3c2410/pm.c
@@ -111,7 +111,7 @@ struct syscore_ops s3c2410_pm_syscore_ops = {
         .resume         = s3c2410_pm_resume,
 };
 
-static int s3c2410_pm_add(struct device *dev)
+static int s3c2410_pm_add(struct device *dev, struct subsys_interface *sif)
 {
         pm_cpu_prep = s3c2410_pm_prepare;
         pm_cpu_sleep = s3c2410_cpu_suspend;
diff --git a/arch/arm/mach-s3c2412/cpu-freq.c b/arch/arm/mach-s3c2412/cpu-freq.c
index d8664b7652ce..125be7d5fa60 100644
--- a/arch/arm/mach-s3c2412/cpu-freq.c
+++ b/arch/arm/mach-s3c2412/cpu-freq.c
@@ -194,7 +194,8 @@ static struct s3c_cpufreq_info s3c2412_cpufreq_info = {
         .debug_io_show  = s3c_cpufreq_debugfs_call(s3c2412_iotiming_debugfs),
 };
 
-static int s3c2412_cpufreq_add(struct device *dev)
+static int s3c2412_cpufreq_add(struct device *dev,
+                               struct subsys_interface *sif)
 {
         unsigned long fclk_rate;
 
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c
index 142acd3b5e15..38472ac920ff 100644
--- a/arch/arm/mach-s3c2412/dma.c
+++ b/arch/arm/mach-s3c2412/dma.c
@@ -159,7 +159,8 @@ static struct s3c24xx_dma_selection __initdata s3c2412_dma_sel = {
         .map_size       = ARRAY_SIZE(s3c2412_dma_mappings),
 };
 
-static int __init s3c2412_dma_add(struct device *dev)
+static int __init s3c2412_dma_add(struct device *dev,
+                                  struct subsys_interface *sif)
 {
         s3c2410_dma_init();
         return s3c24xx_dma_init_map(&s3c2412_dma_sel);
diff --git a/arch/arm/mach-s3c2412/irq.c b/arch/arm/mach-s3c2412/irq.c
index a8a46c1644f4..e65619ddbccc 100644
--- a/arch/arm/mach-s3c2412/irq.c
+++ b/arch/arm/mach-s3c2412/irq.c
@@ -170,7 +170,7 @@ static int s3c2412_irq_rtc_wake(struct irq_data *data, unsigned int state)
 
 static struct irq_chip s3c2412_irq_rtc_chip;
 
-static int s3c2412_irq_add(struct device *dev)
+static int s3c2412_irq_add(struct device *dev, struct subsys_interface *sif)
 {
         unsigned int irqno;
 
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c
index d1adfa65f66d..d04588506ec4 100644
--- a/arch/arm/mach-s3c2412/pm.c
+++ b/arch/arm/mach-s3c2412/pm.c
@@ -56,7 +56,7 @@ static void s3c2412_pm_prepare(void)
 {
 }
 
-static int s3c2412_pm_add(struct device *dev)
+static int s3c2412_pm_add(struct device *dev, struct subsys_interface *sif)
 {
         pm_cpu_prep = s3c2412_pm_prepare;
         pm_cpu_sleep = s3c2412_cpu_suspend;
diff --git a/arch/arm/mach-s3c2416/irq.c b/arch/arm/mach-s3c2416/irq.c
index 36df761061de..fd49f35e448e 100644
--- a/arch/arm/mach-s3c2416/irq.c
+++ b/arch/arm/mach-s3c2416/irq.c
@@ -213,7 +213,8 @@ static int __init s3c2416_add_sub(unsigned int base,
         return 0;
 }
 
-static int __init s3c2416_irq_add(struct device *dev)
+static int __init s3c2416_irq_add(struct device *dev,
+                                  struct subsys_interface *sif)
 {
         printk(KERN_INFO "S3C2416: IRQ Support\n");
 
diff --git a/arch/arm/mach-s3c2416/pm.c b/arch/arm/mach-s3c2416/pm.c
index 3bdb15a0d419..1bd4817b8eb8 100644
--- a/arch/arm/mach-s3c2416/pm.c
+++ b/arch/arm/mach-s3c2416/pm.c
@@ -48,7 +48,7 @@ static void s3c2416_pm_prepare(void)
         __raw_writel(virt_to_phys(s3c_cpu_resume), S3C2412_INFORM1);
 }
 
-static int s3c2416_pm_add(struct device *dev)
+static int s3c2416_pm_add(struct device *dev, struct subsys_interface *sif)
 {
         pm_cpu_prep = s3c2416_pm_prepare;
         pm_cpu_sleep = s3c2416_cpu_suspend;
diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c
index bedbc87a3426..414364eb426c 100644
--- a/arch/arm/mach-s3c2440/clock.c
+++ b/arch/arm/mach-s3c2440/clock.c
@@ -149,7 +149,7 @@ static struct clk_lookup s3c2440_clk_lookup[] = {
         CLKDEV_INIT(NULL, "clk_uart_baud3", &s3c2440_clk_fclk_n),
 };
 
-static int s3c2440_clk_add(struct device *dev)
+static int s3c2440_clk_add(struct device *dev, struct subsys_interface *sif)
 {
         struct clk *clock_upll;
         struct clk *clock_h;
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c
index 15b1ddf8f626..5f0a0c8ef84f 100644
--- a/arch/arm/mach-s3c2440/dma.c
+++ b/arch/arm/mach-s3c2440/dma.c
@@ -174,7 +174,8 @@ static struct s3c24xx_dma_order __initdata s3c2440_dma_order = {
         },
 };
 
-static int __init s3c2440_dma_add(struct device *dev)
+static int __init s3c2440_dma_add(struct device *dev,
+                                  struct subsys_interface *sif)
 {
         s3c2410_dma_init();
         s3c24xx_dma_order_set(&s3c2440_dma_order);
diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c
index 4fee9bc6bcb5..4a18cde439cc 100644
--- a/arch/arm/mach-s3c2440/irq.c
+++ b/arch/arm/mach-s3c2440/irq.c
@@ -92,7 +92,7 @@ static struct irq_chip s3c_irq_wdtac97 = {
         .irq_ack        = s3c_irq_wdtac97_ack,
 };
 
-static int s3c2440_irq_add(struct device *dev)
+static int s3c2440_irq_add(struct device *dev, struct subsys_interface *sif)
 {
         unsigned int irqno;
 
diff --git a/arch/arm/mach-s3c2440/s3c2440-cpufreq.c b/arch/arm/mach-s3c2440/s3c2440-cpufreq.c
index cf7596694efe..61776764d9f4 100644
--- a/arch/arm/mach-s3c2440/s3c2440-cpufreq.c
+++ b/arch/arm/mach-s3c2440/s3c2440-cpufreq.c
@@ -270,7 +270,8 @@ struct s3c_cpufreq_info s3c2440_cpufreq_info = {
         .debug_io_show  = s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs),
 };
 
-static int s3c2440_cpufreq_add(struct device *dev)
+static int s3c2440_cpufreq_add(struct device *dev,
+                               struct subsys_interface *sif)
 {
         xtal = s3c_cpufreq_clk_get(NULL, "xtal");
         hclk = s3c_cpufreq_clk_get(NULL, "hclk");
diff --git a/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c b/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c
index b5368ae8d7fe..551fb433be87 100644
--- a/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c
+++ b/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c
@@ -51,7 +51,7 @@ static struct cpufreq_frequency_table s3c2440_plls_12[] __initdata = {
         { .frequency = 400000000,       .index = PLLVAL(0x5c, 1, 1),  },        /* FVco 800.000000 */
 };
 
-static int s3c2440_plls12_add(struct device *dev)
+static int s3c2440_plls12_add(struct device *dev, struct subsys_interface *sif)
 {
         struct clk *xtal_clk;
         unsigned long xtal;
diff --git a/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c b/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c
index 42f2b5cd2399..3f15bcf64290 100644
--- a/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c
+++ b/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c
@@ -79,7 +79,8 @@ static struct cpufreq_frequency_table s3c2440_plls_169344[] __initdata = {
         { .frequency = 402192000,       .index = PLLVAL(87, 2, 1),      },      /* FVco 804.384000 */
 };
 
-static int s3c2440_plls169344_add(struct device *dev)
+static int s3c2440_plls169344_add(struct device *dev,
+                                  struct subsys_interface *sif)
 {
         struct clk *xtal_clk;
         unsigned long xtal;
diff --git a/arch/arm/mach-s3c2440/s3c2442.c b/arch/arm/mach-s3c2440/s3c2442.c
index 8004e0497bf4..22cb7c94a8c8 100644
--- a/arch/arm/mach-s3c2440/s3c2442.c
+++ b/arch/arm/mach-s3c2440/s3c2442.c
@@ -122,7 +122,7 @@ static struct clk s3c2442_clk_cam_upll = {
         },
 };
 
-static int s3c2442_clk_add(struct device *dev)
+static int s3c2442_clk_add(struct device *dev, struct subsys_interface *sif)
 {
         struct clk *clock_upll;
         struct clk *clock_h;
diff --git a/arch/arm/mach-s3c2440/s3c244x-clock.c b/arch/arm/mach-s3c2440/s3c244x-clock.c
index b3fdbdda3d5f..6d9b688c442b 100644
--- a/arch/arm/mach-s3c2440/s3c244x-clock.c
+++ b/arch/arm/mach-s3c2440/s3c244x-clock.c
@@ -72,7 +72,7 @@ static struct clk clk_arm = {
         },
 };
 
-static int s3c244x_clk_add(struct device *dev)
+static int s3c244x_clk_add(struct device *dev, struct subsys_interface *sif)
 {
         unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN);
         unsigned long clkdivn;
diff --git a/arch/arm/mach-s3c2440/s3c244x-irq.c b/arch/arm/mach-s3c2440/s3c244x-irq.c
index 74d3dcf46a48..5fe8e58d3afd 100644
--- a/arch/arm/mach-s3c2440/s3c244x-irq.c
+++ b/arch/arm/mach-s3c2440/s3c244x-irq.c
@@ -91,7 +91,7 @@ static struct irq_chip s3c_irq_cam = {
         .irq_ack        = s3c_irq_cam_ack,
 };
 
-static int s3c244x_irq_add(struct device *dev)
+static int s3c244x_irq_add(struct device *dev, struct subsys_interface *sif)
 {
         unsigned int irqno;
 
diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c
index de6b4a23c9ed..14224517e621 100644
--- a/arch/arm/mach-s3c2443/dma.c
+++ b/arch/arm/mach-s3c2443/dma.c
@@ -135,7 +135,8 @@ static struct s3c24xx_dma_selection __initdata s3c2443_dma_sel = {
         .map_size       = ARRAY_SIZE(s3c2443_dma_mappings),
 };
 
-static int __init s3c2443_dma_add(struct device *dev)
+static int __init s3c2443_dma_add(struct device *dev,
+                                  struct subsys_interface *sif)
 {
         s3c24xx_dma_init(6, IRQ_S3C2443_DMA0, 0x100);
         return s3c24xx_dma_init_map(&s3c2443_dma_sel);
diff --git a/arch/arm/mach-s3c2443/irq.c b/arch/arm/mach-s3c2443/irq.c
index 35e4ff24fb43..ac2829f56d12 100644
--- a/arch/arm/mach-s3c2443/irq.c
+++ b/arch/arm/mach-s3c2443/irq.c
@@ -241,7 +241,8 @@ static int __init s3c2443_add_sub(unsigned int base,
         return 0;
 }
 
-static int __init s3c2443_irq_add(struct device *dev)
+static int __init s3c2443_irq_add(struct device *dev,
+                                  struct subsys_interface *sif)
 {
         printk("S3C2443: IRQ Support\n");
 
diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index 31bb27dc4aeb..aebbcc291b4e 100644
--- a/arch/arm/mach-s3c64xx/clock.c
+++ b/arch/arm/mach-s3c64xx/clock.c
@@ -138,6 +138,11 @@ static struct clk init_clocks_off[] = {
                 .ctrlbit        = S3C_CLKCON_PCLK_TSADC,
         }, {
                 .name           = "i2c",
+#ifdef CONFIG_S3C_DEV_I2C1
+                .devname        = "s3c2440-i2c.0",
+#else
+                .devname        = "s3c2440-i2c",
+#endif
                 .parent         = &clk_p,
                 .enable         = s3c64xx_pclk_ctrl,
                 .ctrlbit        = S3C_CLKCON_PCLK_IIC,
diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c
index 4a7394d4bd9e..bee7dcd4df7c 100644
--- a/arch/arm/mach-s3c64xx/common.c
+++ b/arch/arm/mach-s3c64xx/common.c
@@ -49,7 +49,7 @@
 
 /* uart registration process */
 
-void __init s3c64xx_init_uarts(struct s3c2410_uartcfg *cfg, int no)
+static void __init s3c64xx_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 {
         s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);
 }
diff --git a/arch/arm/mach-s5p64x0/pm.c b/arch/arm/mach-s5p64x0/pm.c
index 23f9b22439c9..9cba18bfe47b 100644
--- a/arch/arm/mach-s5p64x0/pm.c
+++ b/arch/arm/mach-s5p64x0/pm.c
@@ -160,7 +160,7 @@ static void s5p64x0_pm_prepare(void)
 
 }
 
-static int s5p64x0_pm_add(struct device *dev)
+static int s5p64x0_pm_add(struct device *dev, struct subsys_interface *sif)
 {
         pm_cpu_prep = s5p64x0_pm_prepare;
         pm_cpu_sleep = s5p64x0_cpu_suspend;
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index c78dfddd77fd..b9ec0c35379f 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -175,7 +175,7 @@ static int s5pv210_clk_mask1_ctrl(struct clk *clk, int enable)
         return s5p_gatectrl(S5P_CLK_SRC_MASK1, clk, enable);
 }
 
-static int exynos4_clk_hdmiphy_ctrl(struct clk *clk, int enable)
+static int s5pv210_clk_hdmiphy_ctrl(struct clk *clk, int enable)
 {
         return s5p_gatectrl(S5P_HDMI_PHY_CONTROL, clk, enable);
 }
@@ -372,7 +372,7 @@ static struct clk init_clocks_off[] = {
         }, {
                 .name           = "hdmiphy",
                 .devname        = "s5pv210-hdmi",
-                .enable         = exynos4_clk_hdmiphy_ctrl,
+                .enable         = s5pv210_clk_hdmiphy_ctrl,
                 .ctrlbit        = (1 << 0),
         }, {
                 .name           = "dacphy",
diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c
index 677c71c41e50..736bfb103cbc 100644
--- a/arch/arm/mach-s5pv210/pm.c
+++ b/arch/arm/mach-s5pv210/pm.c
@@ -133,7 +133,7 @@ static void s5pv210_pm_prepare(void)
         s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
 }
 
-static int s5pv210_pm_add(struct device *dev)
+static int s5pv210_pm_add(struct device *dev, struct subsys_interface *sif)
 {
         pm_cpu_prep = s5pv210_pm_prepare;
         pm_cpu_sleep = s5pv210_cpu_suspend;
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index ebafe8aa8956..0c4b76ab4d8e 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -202,7 +202,6 @@ static struct irda_platform_data assabet_irda_data = {
 static struct mcp_plat_data assabet_mcp_data = {
         .mccr0          = MCCR0_ADM,
         .sclk_rate      = 11981000,
-        .codec          = "ucb1x00",
 };
 
 static void __init assabet_init(void)
@@ -253,17 +252,6 @@ static void __init assabet_init(void)
         sa11x0_register_mtd(&assabet_flash_data, assabet_flash_resources,
                             ARRAY_SIZE(assabet_flash_resources));
         sa11x0_register_irda(&assabet_irda_data);
-
-        /*
-         * Setup the PPC unit correctly.
-         */
-        PPDR &= ~PPC_RXD4;
-        PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;
-        PSDR |= PPC_RXD4;
-        PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-        PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-
-        ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);
         sa11x0_register_mcp(&assabet_mcp_data);
 }
 
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index d12d0f48b1dc..11bb6d0b9be3 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -124,23 +124,12 @@ static void __init cerf_map_io(void)
 static struct mcp_plat_data cerf_mcp_data = {
         .mccr0          = MCCR0_ADM,
         .sclk_rate      = 11981000,
-        .codec          = "ucb1x00",
 };
 
 static void __init cerf_init(void)
 {
         platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices));
         sa11x0_register_mtd(&cerf_flash_data, &cerf_flash_resource, 1);
-
-        /*
-         * Setup the PPC unit correctly.
-         */
-        PPDR &= ~PPC_RXD4;
-        PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;
-        PSDR |= PPC_RXD4;
-        PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-        PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-
         sa11x0_register_mcp(&cerf_mcp_data);
 }
 
diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c
index d6df9f6c9f7e..dab3c6347a8f 100644
--- a/arch/arm/mach-sa1100/clock.c
+++ b/arch/arm/mach-sa1100/clock.c
@@ -11,39 +11,17 @@
 #include <linux/clk.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
-#include <linux/io.h>
-#include <linux/clkdev.h>
 
 #include <mach/hardware.h>
 
-struct clkops {
-        void                    (*enable)(struct clk *);
-        void                    (*disable)(struct clk *);
-        unsigned long           (*getrate)(struct clk *);
-};
-
+/*
+ * Very simple clock implementation - we only have one clock to deal with.
+ */
 struct clk {
-        const struct clkops     *ops;
-        unsigned long           rate;
         unsigned int            enabled;
 };
 
-#define INIT_CLKREG(_clk, _devname, _conname)           \
-        {                                               \
-                .clk            = _clk,                 \
-                .dev_id         = _devname,             \
-                .con_id         = _conname,             \
-        }
-
-#define DEFINE_CLK(_name, _ops, _rate)                  \
-struct clk clk_##_name = {                              \
-                .ops    = _ops,                         \
-                .rate   = _rate,                        \
-        }
-
-static DEFINE_SPINLOCK(clocks_lock);
-
-static void clk_gpio27_enable(struct clk *clk)
+static void clk_gpio27_enable(void)
 {
         /*
          * First, set up the 3.6864MHz clock on GPIO 27 for the SA-1111:
@@ -54,22 +32,38 @@ static void clk_gpio27_enable(struct clk *clk)
         TUCR = TUCR_3_6864MHz;
 }
 
-static void clk_gpio27_disable(struct clk *clk)
+static void clk_gpio27_disable(void)
 {
         TUCR = 0;
         GPDR &= ~GPIO_32_768kHz;
         GAFR &= ~GPIO_32_768kHz;
 }
 
+static struct clk clk_gpio27;
+
+static DEFINE_SPINLOCK(clocks_lock);
+
+struct clk *clk_get(struct device *dev, const char *id)
+{
+        const char *devname = dev_name(dev);
+
+        return strcmp(devname, "sa1111.0") ? ERR_PTR(-ENOENT) : &clk_gpio27;
+}
+EXPORT_SYMBOL(clk_get);
+
+void clk_put(struct clk *clk)
+{
+}
+EXPORT_SYMBOL(clk_put);
+
 int clk_enable(struct clk *clk)
 {
         unsigned long flags;
 
         spin_lock_irqsave(&clocks_lock, flags);
         if (clk->enabled++ == 0)
-                clk->ops->enable(clk);
+                clk_gpio27_enable();
         spin_unlock_irqrestore(&clocks_lock, flags);
-
         return 0;
 }
 EXPORT_SYMBOL(clk_enable);
@@ -82,48 +76,13 @@ void clk_disable(struct clk *clk)
 
         spin_lock_irqsave(&clocks_lock, flags);
         if (--clk->enabled == 0)
-                clk->ops->disable(clk);
+                clk_gpio27_disable();
         spin_unlock_irqrestore(&clocks_lock, flags);
 }
 EXPORT_SYMBOL(clk_disable);
 
 unsigned long clk_get_rate(struct clk *clk)
 {
-        unsigned long rate;
-
-        rate = clk->rate;
-        if (clk->ops->getrate)
-                rate = clk->ops->getrate(clk);
-
-        return rate;
+        return 3686400;
 }
 EXPORT_SYMBOL(clk_get_rate);
-
-const struct clkops clk_gpio27_ops = {
-        .enable         = clk_gpio27_enable,
-        .disable        = clk_gpio27_disable,
-};
-
-static void clk_dummy_enable(struct clk *clk) { }
-static void clk_dummy_disable(struct clk *clk) { }
-
-const struct clkops clk_dummy_ops = {
-        .enable         = clk_dummy_enable,
-        .disable        = clk_dummy_disable,
-};
-
-static DEFINE_CLK(gpio27, &clk_gpio27_ops, 3686400);
-static DEFINE_CLK(dummy, &clk_dummy_ops, 0);
-
-static struct clk_lookup sa11xx_clkregs[] = {
-        INIT_CLKREG(&clk_gpio27, "sa1111.0", NULL),
-        INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
-};
-
-static int __init sa11xx_clk_init(void)
-{
-        clkdev_add_table(sa11xx_clkregs, ARRAY_SIZE(sa11xx_clkregs));
-        return 0;
-}
-
-postcore_initcall(sa11xx_clk_init);
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index c483912d08af..fd5652118ed1 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -27,7 +27,6 @@
 #include <linux/timer.h>
 #include <linux/gpio.h>
 #include <linux/pda_power.h>
-#include <linux/mfd/ucb1x00.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -86,15 +85,10 @@ static struct scoop_pcmcia_config collie_pcmcia_config = {
         .num_devs       = 1,
 };
 
-static struct ucb1x00_plat_data collie_ucb1x00_data = {
-        .gpio_base      = COLLIE_TC35143_GPIO_BASE,
-};
-
 static struct mcp_plat_data collie_mcp_data = {
         .mccr0          = MCCR0_ADM | MCCR0_ExtClk,
         .sclk_rate      = 9216000,
-        .codec          = "ucb1x00",
-        .codec_pdata    = &collie_ucb1x00_data,
+        .gpio_base      = COLLIE_TC35143_GPIO_BASE,
 };
 
 /*
@@ -144,8 +138,6 @@ static struct pda_power_pdata collie_power_data = {
 static struct resource collie_power_resource[] = {
         {
                 .name           = "ac",
-                .start          = gpio_to_irq(COLLIE_GPIO_AC_IN),
-                .end            = gpio_to_irq(COLLIE_GPIO_AC_IN),
                 .flags          = IORESOURCE_IRQ |
                                   IORESOURCE_IRQ_HIGHEDGE |
                                   IORESOURCE_IRQ_LOWEDGE,
@@ -347,7 +339,8 @@ static void __init collie_init(void)
 
         GPSR |= _COLLIE_GPIO_UCB1x00_RESET;
 
-
+        collie_power_resource[0].start = gpio_to_irq(COLLIE_GPIO_AC_IN);
+        collie_power_resource[0].end = gpio_to_irq(COLLIE_GPIO_AC_IN);
         platform_scoop_config = &collie_pcmcia_config;
 
         ret = platform_add_devices(devices, ARRAY_SIZE(devices));
@@ -357,16 +350,6 @@ static void __init collie_init(void)
 
         sa11x0_register_mtd(&collie_flash_data, collie_flash_resources,
                             ARRAY_SIZE(collie_flash_resources));
-
-        /*
-         * Setup the PPC unit correctly.
-         */
-        PPDR &= ~PPC_RXD4;
-        PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;
-        PSDR |= PPC_RXD4;
-        PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-        PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-
         sa11x0_register_mcp(&collie_mcp_data);
 
         sharpsl_save_param();
diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c
index aaa8acf76b7b..19b2053f5af4 100644
--- a/arch/arm/mach-sa1100/cpu-sa1100.c
+++ b/arch/arm/mach-sa1100/cpu-sa1100.c
@@ -228,7 +228,7 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy)
         return 0;
 }
 
-static struct cpufreq_driver sa1100_driver = {
+static struct cpufreq_driver sa1100_driver __refdata = {
         .flags          = CPUFREQ_STICKY,
         .verify         = sa11x0_verify_speed,
         .target         = sa1100_target,
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index e3a28ca2a7b7..bb10ee2cb89f 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -217,15 +217,10 @@ static struct platform_device sa11x0uart3_device = {
 static struct resource sa11x0mcp_resources[] = {
         [0] = {
                 .start  = __PREG(Ser4MCCR0),
-                .end    = __PREG(Ser4MCCR0) + 0x1C - 1,
+                .end    = __PREG(Ser4MCCR0) + 0xffff,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = __PREG(Ser4MCCR1),
-                .end    = __PREG(Ser4MCCR1) + 0x4 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [2] = {
                 .start  = IRQ_Ser4MCP,
                 .end    = IRQ_Ser4MCP,
                 .flags  = IORESOURCE_IRQ,
@@ -350,29 +345,9 @@ void sa11x0_register_irda(struct irda_platform_data *irda)
         sa11x0_register_device(&sa11x0ir_device, irda);
 }
 
-static struct resource sa11x0rtc_resources[] = {
-        [0] = {
-                .start  = 0x90010000,
-                .end    = 0x900100ff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = IRQ_RTC1Hz,
-                .end    = IRQ_RTC1Hz,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = IRQ_RTCAlrm,
-                .end    = IRQ_RTCAlrm,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
 static struct platform_device sa11x0rtc_device = {
         .name           = "sa1100-rtc",
         .id             = -1,
-        .resource       = sa11x0rtc_resources,
-        .num_resources  = ARRAY_SIZE(sa11x0rtc_resources),
 };
 
 static struct platform_device *sa11x0_devices[] __initdata = {
diff --git a/arch/arm/mach-sa1100/include/mach/mcp.h b/arch/arm/mach-sa1100/include/mach/mcp.h
index 586cec898b35..ed1a331508a7 100644
--- a/arch/arm/mach-sa1100/include/mach/mcp.h
+++ b/arch/arm/mach-sa1100/include/mach/mcp.h
@@ -17,8 +17,6 @@ struct mcp_plat_data {
         u32 mccr1;
         unsigned int sclk_rate;
         int gpio_base;
-        const char *codec;
-        void *codec_pdata;
 };
 
 #endif
diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c
index f50b00bd18a0..b412fc09c80c 100644
--- a/arch/arm/mach-sa1100/jornada720_ssp.c
+++ b/arch/arm/mach-sa1100/jornada720_ssp.c
@@ -198,3 +198,5 @@ static int __init jornada_ssp_init(void)
 {
         return platform_driver_register(&jornadassp_driver);
 }
+
+module_init(jornada_ssp_init);
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c
index d117ceab6215..af4e2761f3db 100644
--- a/arch/arm/mach-sa1100/lart.c
+++ b/arch/arm/mach-sa1100/lart.c
@@ -24,20 +24,10 @@
 static struct mcp_plat_data lart_mcp_data = {
         .mccr0          = MCCR0_ADM,
         .sclk_rate      = 11981000,
-        .codec          = "ucb1x00",
 };
 
 static void __init lart_init(void)
 {
-        /*
-         * Setup the PPC unit correctly.
-         */
-        PPDR &= ~PPC_RXD4;
-        PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;
-        PSDR |= PPC_RXD4;
-        PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-        PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-
         sa11x0_register_mcp(&lart_mcp_data);
 }
 
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index 748d34435b3f..318b2b766a0b 100644
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -55,22 +55,11 @@ static struct resource shannon_flash_resource = {
 static struct mcp_plat_data shannon_mcp_data = {
         .mccr0          = MCCR0_ADM,
         .sclk_rate      = 11981000,
-        .codec          = "ucb1x00",
 };
 
 static void __init shannon_init(void)
 {
         sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1);
-
-        /*
-         * Setup the PPC unit correctly.
-         */
-        PPDR &= ~PPC_RXD4;
-        PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;
-        PSDR |= PPC_RXD4;
-        PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-        PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-
         sa11x0_register_mcp(&shannon_mcp_data);
 }
 
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index 458ececefa58..e17c04d6e324 100644
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -14,7 +14,6 @@
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
-#include <linux/mfd/ucb1x00.h>
 
 #include <asm/irq.h>
 #include <mach/hardware.h>
@@ -188,15 +187,10 @@ static struct resource simpad_flash_resources [] = {
         }
 };
 
-static struct ucb1x00_plat_data simpad_ucb1x00_data = {
-        .gpio_base      = SIMPAD_UCB1X00_GPIO_BASE,
-};
-
 static struct mcp_plat_data simpad_mcp_data = {
         .mccr0          = MCCR0_ADM,
         .sclk_rate      = 11981000,
-        .codec          = "ucb1300",
-        .codec_pdata    = &simpad_ucb1x00_data,
+        .gpio_base      = SIMPAD_UCB1X00_GPIO_BASE,
 };
 
 
@@ -384,16 +378,6 @@ static int __init simpad_init(void)
 
         sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources,
                               ARRAY_SIZE(simpad_flash_resources));
-
-        /*
-         * Setup the PPC unit correctly.
-         */
-        PPDR &= ~PPC_RXD4;
-        PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;
-        PSDR |= PPC_RXD4;
-        PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-        PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-
         sa11x0_register_mcp(&simpad_mcp_data);
 
         ret = platform_add_devices(devices, ARRAY_SIZE(devices));
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index eff8a96c75ee..068b754bc348 100644
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -30,6 +30,7 @@
 #include <linux/serial_sci.h>
 #include <linux/smsc911x.h>
 #include <linux/gpio.h>
+#include <linux/videodev2.h>
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/mmc/host.h>
@@ -37,7 +38,6 @@
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mfd/tmio.h>
 #include <linux/sh_clk.h>
-#include <linux/dma-mapping.h>
 #include <video/sh_mobile_lcdc.h>
 #include <video/sh_mipi_dsi.h>
 #include <sound/sh_fsi.h>
@@ -159,19 +159,12 @@ static struct resource sh_mmcif_resources[] = {
         },
 };
 
-static struct sh_mmcif_dma sh_mmcif_dma = {
-        .chan_priv_rx   = {
-                .slave_id       = SHDMA_SLAVE_MMCIF_RX,
-        },
-        .chan_priv_tx   = {
-                .slave_id       = SHDMA_SLAVE_MMCIF_TX,
-        },
-};
 static struct sh_mmcif_plat_data sh_mmcif_platdata = {
         .sup_pclk       = 0,
         .ocr            = MMC_VDD_165_195,
         .caps           = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
-        .dma            = &sh_mmcif_dma,
+        .slave_id_tx    = SHDMA_SLAVE_MMCIF_TX,
+        .slave_id_rx    = SHDMA_SLAVE_MMCIF_RX,
 };
 
 static struct platform_device mmc_device = {
@@ -321,12 +314,11 @@ static struct resource mipidsi0_resources[] = {
         },
 };
 
-#define DSI0PHYCR       0xe615006c
 static int sh_mipi_set_dot_clock(struct platform_device *pdev,
                                  void __iomem *base,
                                  int enable)
 {
-        struct clk *pck;
+        struct clk *pck, *phy;
         int ret;
 
         pck = clk_get(&pdev->dev, "dsip_clk");
@@ -335,18 +327,27 @@ static int sh_mipi_set_dot_clock(struct platform_device *pdev,
                 goto sh_mipi_set_dot_clock_pck_err;
         }
 
+        phy = clk_get(&pdev->dev, "dsiphy_clk");
+        if (IS_ERR(phy)) {
+                ret = PTR_ERR(phy);
+                goto sh_mipi_set_dot_clock_phy_err;
+        }
+
         if (enable) {
                 clk_set_rate(pck, clk_round_rate(pck,  24000000));
-                __raw_writel(0x2a809010, DSI0PHYCR);
+                clk_set_rate(phy, clk_round_rate(pck, 510000000));
                 clk_enable(pck);
+                clk_enable(phy);
         } else {
                 clk_disable(pck);
+                clk_disable(phy);
         }
 
         ret = 0;
 
+        clk_put(phy);
+sh_mipi_set_dot_clock_phy_err:
         clk_put(pck);
-
 sh_mipi_set_dot_clock_pck_err:
         return ret;
 }
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index aab0a349f759..eeb4d9664584 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -295,15 +295,6 @@ static struct resource sh_mmcif_resources[] = {
         },
 };
 
-static struct sh_mmcif_dma sh_mmcif_dma = {
-        .chan_priv_rx   = {
-                .slave_id       = SHDMA_SLAVE_MMCIF_RX,
-        },
-        .chan_priv_tx   = {
-                .slave_id       = SHDMA_SLAVE_MMCIF_TX,
-        },
-};
-
 static struct sh_mmcif_plat_data sh_mmcif_plat = {
         .sup_pclk       = 0,
         .ocr            = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
@@ -311,7 +302,8 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
                           MMC_CAP_8_BIT_DATA |
                           MMC_CAP_NEEDS_POLL,
         .get_cd         = slot_cn7_get_cd,
-        .dma            = &sh_mmcif_dma,
+        .slave_id_tx    = SHDMA_SLAVE_MMCIF_TX,
+        .slave_id_rx    = SHDMA_SLAVE_MMCIF_RX,
 };
 
 static struct platform_device sh_mmcif_device = {
diff --git a/arch/arm/mach-shmobile/board-kota2.c b/arch/arm/mach-shmobile/board-kota2.c
index 857ceeec1bb0..c8e7ca23fc06 100644
--- a/arch/arm/mach-shmobile/board-kota2.c
+++ b/arch/arm/mach-shmobile/board-kota2.c
@@ -143,11 +143,10 @@ static struct gpio_keys_button gpio_buttons[] = {
 static struct gpio_keys_platform_data gpio_key_info = {
         .buttons        = gpio_buttons,
         .nbuttons       = ARRAY_SIZE(gpio_buttons),
-        .poll_interval  = 250, /* polled for now */
 };
 
 static struct platform_device gpio_keys_device = {
-        .name   = "gpio-keys-polled", /* polled for now */
+        .name   = "gpio-keys",
         .id     = -1,
         .dev    = {
                 .platform_data  = &gpio_key_info,
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 9b42fbd10f8e..a2813247b455 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -43,7 +43,6 @@
 #include <linux/smsc911x.h>
 #include <linux/sh_intc.h>
 #include <linux/tca6416_keypad.h>
-#include <linux/usb/r8a66597.h>
 #include <linux/usb/renesas_usbhs.h>
 #include <linux/dma-mapping.h>
 
@@ -145,11 +144,6 @@
  * 1-2 short | VBUS 5V       | Host
  * open      | external VBUS | Function
  *
- * *1
- * CN31 is used as
- * CONFIG_USB_R8A66597_HCD      Host
- * CONFIG_USB_RENESAS_USBHS     Function
- *
  * CAUTION
  *
  * renesas_usbhs driver can use external interrupt mode
@@ -161,15 +155,6 @@
  * mackerel can not use external interrupt (IRQ7-PORT167) mode on "USB0",
  * because Touchscreen is using IRQ7-PORT40.
  * It is impossible to use IRQ7 demux on this board.
- *
- * We can use external interrupt mode USB-Function on "USB1".
- * USB1 can become Host by r8a66597, and become Function by renesas_usbhs.
- * But don't select both drivers in same time.
- * These uses same IRQ number for request_irq(), and aren't supporting
- * IRQF_SHARED / IORESOURCE_IRQ_SHAREABLE.
- *
- * Actually these are old/new version of USB driver.
- * This mean its register will be broken if it supports shared IRQ,
  */
 
 /*
@@ -208,6 +193,16 @@
  */
 
 /*
+ * FSI - AK4642
+ *
+ * it needs amixer settings for playing
+ *
+ * amixer set "Headphone" on
+ * amixer set "HPOUTL Mixer DACH" on
+ * amixer set "HPOUTR Mixer DACH" on
+ */
+
+/*
  * FIXME !!
  *
  * gpio_no_direction
@@ -676,51 +671,16 @@ static struct platform_device usbhs0_device = {
  * Use J30 to select between Host and Function. This setting
  * can however not be detected by software. Hotplug of USBHS1
  * is provided via IRQ8.
+ *
+ * Current USB1 works as "USB Host".
+ *  - set J30 "short"
+ *
+ * If you want to use it as "USB gadget",
+ *  - J30 "open"
+ *  - modify usbhs1_get_id() USBHS_HOST -> USBHS_GADGET
+ *  - add .get_vbus = usbhs_get_vbus in usbhs1_private
  */
 #define IRQ8 evt2irq(0x0300)
-
-/* USBHS1 USB Host support via r8a66597_hcd */
-static void usb1_host_port_power(int port, int power)
-{
-        if (!power) /* only power-on is supported for now */
-                return;
-
-        /* set VBOUT/PWEN and EXTLP1 in DVSTCTR */
-        __raw_writew(__raw_readw(0xE68B0008) | 0x600, 0xE68B0008);
-}
-
-static struct r8a66597_platdata usb1_host_data = {
-        .on_chip        = 1,
-        .port_power     = usb1_host_port_power,
-};
-
-static struct resource usb1_host_resources[] = {
-        [0] = {
-                .name   = "USBHS1",
-                .start  = 0xe68b0000,
-                .end    = 0xe68b00e6 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = evt2irq(0x1ce0) /* USB1_USB1I0 */,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device usb1_host_device = {
-        .name   = "r8a66597_hcd",
-        .id     = 1,
-        .dev = {
-                .dma_mask               = NULL,         /*  not use dma */
-                .coherent_dma_mask      = 0xffffffff,
-                .platform_data          = &usb1_host_data,
-        },
-        .num_resources  = ARRAY_SIZE(usb1_host_resources),
-        .resource       = usb1_host_resources,
-};
-
-/* USBHS1 USB Function support via renesas_usbhs */
-
 #define USB_PHY_MODE            (1 << 4)
 #define USB_PHY_INT_EN          ((1 << 3) | (1 << 2))
 #define USB_PHY_ON              (1 << 1)
@@ -776,7 +736,7 @@ static void usbhs1_hardware_exit(struct platform_device *pdev)
 
 static int usbhs1_get_id(struct platform_device *pdev)
 {
-        return USBHS_GADGET;
+        return USBHS_HOST;
 }
 
 static u32 usbhs1_pipe_cfg[] = {
@@ -807,7 +767,6 @@ static struct usbhs_private usbhs1_private = {
                         .hardware_exit  = usbhs1_hardware_exit,
                         .get_id         = usbhs1_get_id,
                         .phy_reset      = usbhs_phy_reset,
-                        .get_vbus       = usbhs_get_vbus,
                 },
                 .driver_param = {
                         .buswait_bwait  = 4,
@@ -1184,15 +1143,6 @@ static struct resource sh_mmcif_resources[] = {
         },
 };
 
-static struct sh_mmcif_dma sh_mmcif_dma = {
-        .chan_priv_rx   = {
-                .slave_id       = SHDMA_SLAVE_MMCIF_RX,
-        },
-        .chan_priv_tx   = {
-                .slave_id       = SHDMA_SLAVE_MMCIF_TX,
-        },
-};
-
 static struct sh_mmcif_plat_data sh_mmcif_plat = {
         .sup_pclk       = 0,
         .ocr            = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
@@ -1200,7 +1150,8 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
                           MMC_CAP_8_BIT_DATA |
                           MMC_CAP_NEEDS_POLL,
         .get_cd         = slot_cn7_get_cd,
-        .dma            = &sh_mmcif_dma,
+        .slave_id_tx    = SHDMA_SLAVE_MMCIF_TX,
+        .slave_id_rx    = SHDMA_SLAVE_MMCIF_RX,
 };
 
 static struct platform_device sh_mmcif_device = {
@@ -1311,7 +1262,6 @@ static struct platform_device *mackerel_devices[] __initdata = {
         &nor_flash_device,
         &smc911x_device,
         &lcdc_device,
-        &usb1_host_device,
         &usbhs1_device,
         &usbhs0_device,
         &leds_device,
@@ -1473,9 +1423,6 @@ static void __init mackerel_init(void)
         gpio_pull_down(GPIO_PORT167CR); /* VBUS0_1 pull down */
         gpio_request(GPIO_FN_IDIN_1_113, NULL);
 
-        /* USB phy tweak to make the r8a66597_hcd host driver work */
-        __raw_writew(0x8a0a, 0xe6058130);       /* USBCR4 */
-
         /* enable FSI2 port A (ak4643) */
         gpio_request(GPIO_FN_FSIAIBT,   NULL);
         gpio_request(GPIO_FN_FSIAILR,   NULL);
diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
index afbead6a6e17..7727cca6136c 100644
--- a/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@ -365,6 +365,114 @@ static struct clk div6_clks[DIV6_NR] = {
                         dsi_parent, ARRAY_SIZE(dsi_parent), 12, 3),
 };
 
+/* DSI DIV */
+static unsigned long dsiphy_recalc(struct clk *clk)
+{
+        u32 value;
+
+        value = __raw_readl(clk->mapping->base);
+
+        /* FIXME */
+        if (!(value & 0x000B8000))
+                return clk->parent->rate;
+
+        value &= 0x3f;
+        value += 1;
+
+        if ((value < 12) ||
+            (value > 33)) {
+                pr_err("DSIPHY has wrong value (%d)", value);
+                return 0;
+        }
+
+        return clk->parent->rate / value;
+}
+
+static long dsiphy_round_rate(struct clk *clk, unsigned long rate)
+{
+        return clk_rate_mult_range_round(clk, 12, 33, rate);
+}
+
+static void dsiphy_disable(struct clk *clk)
+{
+        u32 value;
+
+        value = __raw_readl(clk->mapping->base);
+        value &= ~0x000B8000;
+
+        __raw_writel(value , clk->mapping->base);
+}
+
+static int dsiphy_enable(struct clk *clk)
+{
+        u32 value;
+        int multi;
+
+        value = __raw_readl(clk->mapping->base);
+        multi = (value & 0x3f) + 1;
+
+        if ((multi < 12) || (multi > 33))
+                return -EIO;
+
+        __raw_writel(value | 0x000B8000, clk->mapping->base);
+
+        return 0;
+}
+
+static int dsiphy_set_rate(struct clk *clk, unsigned long rate)
+{
+        u32 value;
+        int idx;
+
+        idx = rate / clk->parent->rate;
+        if ((idx < 12) || (idx > 33))
+                return -EINVAL;
+
+        idx += -1;
+
+        value = __raw_readl(clk->mapping->base);
+        value = (value & ~0x3f) + idx;
+
+        __raw_writel(value, clk->mapping->base);
+
+        return 0;
+}
+
+static struct clk_ops dsiphy_clk_ops = {
+        .recalc         = dsiphy_recalc,
+        .round_rate     = dsiphy_round_rate,
+        .set_rate       = dsiphy_set_rate,
+        .enable         = dsiphy_enable,
+        .disable        = dsiphy_disable,
+};
+
+static struct clk_mapping dsi0phy_clk_mapping = {
+        .phys   = DSI0PHYCR,
+        .len    = 4,
+};
+
+static struct clk_mapping dsi1phy_clk_mapping = {
+        .phys   = DSI1PHYCR,
+        .len    = 4,
+};
+
+static struct clk dsi0phy_clk = {
+        .ops            = &dsiphy_clk_ops,
+        .parent         = &div6_clks[DIV6_DSI0P], /* late install */
+        .mapping        = &dsi0phy_clk_mapping,
+};
+
+static struct clk dsi1phy_clk = {
+        .ops            = &dsiphy_clk_ops,
+        .parent         = &div6_clks[DIV6_DSI1P], /* late install */
+        .mapping        = &dsi1phy_clk_mapping,
+};
+
+static struct clk *late_main_clks[] = {
+        &dsi0phy_clk,
+        &dsi1phy_clk,
+};
+
 enum { MSTP001,
         MSTP129, MSTP128, MSTP127, MSTP126, MSTP125, MSTP118, MSTP116, MSTP100,
         MSTP219,
@@ -429,6 +537,8 @@ static struct clk_lookup lookups[] = {
         CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),
         CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),
         CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),
+        CLKDEV_ICK_ID("dsiphy_clk", "sh-mipi-dsi.0", &dsi0phy_clk),
+        CLKDEV_ICK_ID("dsiphy_clk", "sh-mipi-dsi.1", &dsi1phy_clk),
 
         /* MSTP32 clocks */
         CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* I2C2 */
@@ -504,6 +614,9 @@ void __init sh73a0_clock_init(void)
         if (!ret)
                 ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
 
+        for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)
+                ret = clk_register(late_main_clks[k]);
+
         clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
         if (!ret)
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h
index 881d515a9686..cad57578ceed 100644
--- a/arch/arm/mach-shmobile/include/mach/sh73a0.h
+++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h
@@ -515,8 +515,8 @@ enum {
         SHDMA_SLAVE_MMCIF_RX,
 };
 
-/* PINT interrupts are located at Linux IRQ 768 and up */
-#define SH73A0_PINT0_IRQ(irq) ((irq) + 768)
-#define SH73A0_PINT1_IRQ(irq) ((irq) + 800)
+/* PINT interrupts are located at Linux IRQ 800 and up */
+#define SH73A0_PINT0_IRQ(irq) ((irq) + 800)
+#define SH73A0_PINT1_IRQ(irq) ((irq) + 832)
 
 #endif /* __ASM_SH73A0_H__ */
diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c
index 1eda6b0b69e3..9857595eaa79 100644
--- a/arch/arm/mach-shmobile/intc-sh73a0.c
+++ b/arch/arm/mach-shmobile/intc-sh73a0.c
@@ -19,6 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/sh_intc.h>
@@ -445,6 +446,7 @@ void __init sh73a0_init_irq(void)
                 setup_irq(gic_spi(1 + k), &sh73a0_irq_pin_cascade[k]);
 
                 n = intcs_evt2irq(to_intc_vect(gic_spi(1 + k)));
+                WARN_ON(irq_alloc_desc_at(n, numa_node_id()) != n);
                 irq_set_chip_and_handler_name(n, &intca_gic_irq_chip,
                                               handle_level_irq, "level");
                 set_irq_flags(n, IRQF_VALID); /* yuck */
diff --git a/arch/arm/mach-shmobile/pfc-r8a7779.c b/arch/arm/mach-shmobile/pfc-r8a7779.c
index 963532f2b2c4..d14c9b048077 100644
--- a/arch/arm/mach-shmobile/pfc-r8a7779.c
+++ b/arch/arm/mach-shmobile/pfc-r8a7779.c
@@ -2120,7 +2120,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = {
             FN_AUDATA3, 0, 0, 0 }
         },
         { PINMUX_CFG_REG_VAR("IPSR4", 0xfffc0030, 32,
-                             3, 1, 1, 1, 1, 1, 1, 3, 3, 1,
+                             3, 1, 1, 1, 1, 1, 1, 3, 3,
                              1, 1, 1, 1, 1, 1, 3, 3, 3, 2) {
             /* IP4_31_29 [3] */
             FN_DU1_DB0, FN_VI2_DATA4_VI2_B4, FN_SCL2_B, FN_SD3_DAT0,
diff --git a/arch/arm/mach-shmobile/pfc-sh7372.c b/arch/arm/mach-shmobile/pfc-sh7372.c
index 1bd6585a6acf..336093f9210a 100644
--- a/arch/arm/mach-shmobile/pfc-sh7372.c
+++ b/arch/arm/mach-shmobile/pfc-sh7372.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <mach/irqs.h>
 #include <mach/sh7372.h>
 
 #define CPU_ALL_PORT(fn, pfx, sfx) \
@@ -1594,6 +1595,43 @@ static struct pinmux_data_reg pinmux_data_regs[] = {
         { },
 };
 
+#define EXT_IRQ16L(n) evt2irq(0x200 + ((n) << 5))
+#define EXT_IRQ16H(n) evt2irq(0x3200 + (((n) - 16) << 5))
+static struct pinmux_irq pinmux_irqs[] = {
+        PINMUX_IRQ(EXT_IRQ16L(0), PORT6_FN0, PORT162_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(1), PORT12_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(2), PORT4_FN0, PORT5_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(3), PORT8_FN0, PORT16_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(4), PORT17_FN0, PORT163_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(5), PORT18_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(6), PORT39_FN0, PORT164_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(7), PORT40_FN0, PORT167_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(8), PORT41_FN0, PORT168_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(9), PORT42_FN0, PORT169_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(10), PORT65_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(11), PORT67_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(12), PORT80_FN0, PORT137_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(13), PORT81_FN0, PORT145_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(14), PORT82_FN0, PORT146_FN0),
+        PINMUX_IRQ(EXT_IRQ16L(15), PORT83_FN0, PORT147_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(16), PORT84_FN0, PORT170_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(17), PORT85_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(18), PORT86_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(19), PORT87_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(20), PORT92_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(21), PORT93_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(22), PORT94_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(23), PORT95_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(24), PORT112_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(25), PORT119_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(26), PORT121_FN0, PORT172_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(27), PORT122_FN0, PORT180_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(28), PORT123_FN0, PORT181_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(29), PORT129_FN0, PORT182_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(30), PORT130_FN0, PORT183_FN0),
+        PINMUX_IRQ(EXT_IRQ16H(31), PORT138_FN0, PORT184_FN0),
+};
+
 static struct pinmux_info sh7372_pinmux_info = {
         .name = "sh7372_pfc",
         .reserved_id = PINMUX_RESERVED,
@@ -1614,6 +1652,9 @@ static struct pinmux_info sh7372_pinmux_info = {
 
         .gpio_data = pinmux_data,
         .gpio_data_size = ARRAY_SIZE(pinmux_data),
+
+        .gpio_irq = pinmux_irqs,
+        .gpio_irq_size = ARRAY_SIZE(pinmux_irqs),
 };
 
 void sh7372_pinmux_init(void)
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 6fcf304d3cdf..a83cf51fc099 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -662,6 +662,7 @@ static struct sh_dmae_pdata usb_dma0_platform_data = {
         .dmaor_is_32bit = 1,
         .needs_tend_set = 1,
         .no_dmars       = 1,
+        .slave_only     = 1,
 };
 
 static struct resource sh7372_usb_dmae0_resources[] = {
@@ -723,6 +724,7 @@ static struct sh_dmae_pdata usb_dma1_platform_data = {
         .dmaor_is_32bit = 1,
         .needs_tend_set = 1,
         .no_dmars       = 1,
+        .slave_only     = 1,
 };
 
 static struct resource sh7372_usb_dmae1_resources[] = {
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index cc97ef892d1b..4fe2e9eaf501 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <mach/common.h>
 #include <mach/r8a7779.h>
+#include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 #include <asm/smp_twd.h>
 #include <asm/hardware/gic.h>
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index be1ade76ccc8..2d0d4212be41 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -23,6 +23,7 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <mach/common.h>
+#include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 #include <asm/smp_twd.h>
 #include <asm/hardware/gic.h>
@@ -79,7 +80,7 @@ int __cpuinit sh73a0_boot_secondary(unsigned int cpu)
         /* enable cache coherency */
         modify_scu_cpu_psr(0, 3 << (cpu * 8));
 
-        if (((__raw_readw(__io(PSTR)) >> (4 * cpu)) & 3) == 3)
+        if (((__raw_readl(__io(PSTR)) >> (4 * cpu)) & 3) == 3)
                 __raw_writel(1 << cpu, __io(WUPCR));    /* wake up */
         else
                 __raw_writel(1 << cpu, __io(SRESCR));   /* reset */
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index fcf4f377b1dc..330afdfa2475 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -60,9 +60,9 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
                 .uartclk        = 216000000,
         }, {
                 /* serial port on mini-pcie */
-                .membase        = IO_ADDRESS(TEGRA_UARTD_BASE),
-                .mapbase        = TEGRA_UARTD_BASE,
-                .irq            = INT_UARTD,
+                .membase        = IO_ADDRESS(TEGRA_UARTC_BASE),
+                .mapbase        = TEGRA_UARTC_BASE,
+                .irq            = INT_UARTC,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
                 .type           = PORT_TEGRA,
                 .iotype         = UPIO_MEM,
@@ -174,7 +174,7 @@ static void __init tegra_paz00_fixup(struct tag *tags, char **cmdline,
 static __initdata struct tegra_clk_init_table paz00_clk_init_table[] = {
         /* name         parent          rate            enabled */
         { "uarta",      "pll_p",        216000000,      true },
-        { "uartd",      "pll_p",        216000000,      true },
+        { "uartc",      "pll_p",        216000000,      true },
 
         { "pll_p_out4", "pll_p",        24000000,       true },
         { "usbd",       "clk_m",        12000000,       false },
diff --git a/arch/arm/mach-tegra/board-paz00.h b/arch/arm/mach-tegra/board-paz00.h
index ffa83f580db6..3c9f8da37ea3 100644
--- a/arch/arm/mach-tegra/board-paz00.h
+++ b/arch/arm/mach-tegra/board-paz00.h
@@ -22,7 +22,7 @@
 /* SDCARD */
 #define TEGRA_GPIO_SD1_CD               TEGRA_GPIO_PV5
 #define TEGRA_GPIO_SD1_WP               TEGRA_GPIO_PH1
-#define TEGRA_GPIO_SD1_POWER            TEGRA_GPIO_PT3
+#define TEGRA_GPIO_SD1_POWER            TEGRA_GPIO_PV1
 
 /* ULPI */
 #define TEGRA_ULPI_RST                  TEGRA_GPIO_PV0
diff --git a/arch/arm/mach-tegra/include/mach/dma.h b/arch/arm/mach-tegra/include/mach/dma.h
index d0132e8031a1..3c9339058bec 100644
--- a/arch/arm/mach-tegra/include/mach/dma.h
+++ b/arch/arm/mach-tegra/include/mach/dma.h
@@ -23,11 +23,6 @@
 
 #include <linux/list.h>
 
-#if defined(CONFIG_TEGRA_SYSTEM_DMA)
-
-struct tegra_dma_req;
-struct tegra_dma_channel;
-
 #define TEGRA_DMA_REQ_SEL_CNTR                  0
 #define TEGRA_DMA_REQ_SEL_I2S_2                 1
 #define TEGRA_DMA_REQ_SEL_I2S_1                 2
@@ -56,6 +51,11 @@ struct tegra_dma_channel;
 #define TEGRA_DMA_REQ_SEL_OWR                   25
 #define TEGRA_DMA_REQ_SEL_INVALID               31
 
+#if defined(CONFIG_TEGRA_SYSTEM_DMA)
+
+struct tegra_dma_req;
+struct tegra_dma_channel;
+
 enum tegra_dma_mode {
         TEGRA_DMA_SHARED = 1,
         TEGRA_DMA_MODE_CONTINOUS = 2,
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index a3e0c8692f0d..52af00446a63 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -7,6 +7,7 @@ config UX500_SOC_COMMON
         select HAS_MTU
         select ARM_ERRATA_753970
         select ARM_ERRATA_754322
+        select ARM_ERRATA_764369
 
 menu "Ux500 SoC"
 
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index 23be34b3bb6e..5dde4d4ebe88 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -261,6 +261,8 @@ void __init mop500_sdi_init(void)
 
 void __init snowball_sdi_init(void)
 {
+        /* On Snowball MMC_CAP_SD_HIGHSPEED isn't supported (Hardware issue?) */
+        mop500_sdi0_data.capabilities &= ~MMC_CAP_SD_HIGHSPEED;
         /* On-board eMMC */
         db8500_add_sdi4(&mop500_sdi4_data, U8500_SDI_V2_PERIPHID);
         /* External Micro SD slot */
diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c
index 122ddde00ba7..da5569d83d58 100644
--- a/arch/arm/mach-ux500/cache-l2x0.c
+++ b/arch/arm/mach-ux500/cache-l2x0.c
@@ -12,44 +12,6 @@
 
 static void __iomem *l2x0_base;
 
-static inline void ux500_cache_wait(void __iomem *reg, unsigned long mask)
-{
-        /* wait for the operation to complete */
-        while (readl_relaxed(reg) & mask)
-                cpu_relax();
-}
-
-static inline void ux500_cache_sync(void)
-{
-        writel_relaxed(0, l2x0_base + L2X0_CACHE_SYNC);
-        ux500_cache_wait(l2x0_base + L2X0_CACHE_SYNC, 1);
-}
-
-/*
- * The L2 cache cannot be turned off in the non-secure world.
- * Dummy until a secure service is in place.
- */
-static void ux500_l2x0_disable(void)
-{
-}
-
-/*
- * This is only called when doing a kexec, just after turning off the L2
- * and L1 cache, and it is surrounded by a spinlock in the generic version.
- * However, we're not really turning off the L2 cache right now and the
- * PL310 does not support exclusive accesses (used to implement the spinlock).
- * So, the invalidation needs to be done without the spinlock.
- */
-static void ux500_l2x0_inv_all(void)
-{
-        uint32_t l2x0_way_mask = (1<<16) - 1;   /* Bitmask of active ways */
-
-        /* invalidate all ways */
-        writel_relaxed(l2x0_way_mask, l2x0_base + L2X0_INV_WAY);
-        ux500_cache_wait(l2x0_base + L2X0_INV_WAY, l2x0_way_mask);
-        ux500_cache_sync();
-}
-
 static int __init ux500_l2x0_unlock(void)
 {
         int i;
@@ -85,9 +47,13 @@ static int __init ux500_l2x0_init(void)
         /* 64KB way size, 8 way associativity, force WA */
         l2x0_init(l2x0_base, 0x3e060000, 0xc0000fff);
 
-        /* Override invalidate function */
-        outer_cache.disable = ux500_l2x0_disable;
-        outer_cache.inv_all = ux500_l2x0_inv_all;
+        /*
+         * We can't disable l2 as we are in non secure mode, currently
+         * this seems be called only during kexec path. So let's
+         * override outer.disable with nasty assignment until we have
+         * some SMI service available.
+         */
+        outer_cache.disable = NULL;
 
         return 0;
 }
diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c
index 572015e57cd9..c76f0f456f04 100644
--- a/arch/arm/mach-ux500/hotplug.c
+++ b/arch/arm/mach-ux500/hotplug.c
@@ -13,6 +13,7 @@
 #include <linux/smp.h>
 
 #include <asm/cacheflush.h>
+#include <asm/smp_plat.h>
 
 extern volatile int pen_release;
 
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index a19e398dade3..d2058ef8345f 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -19,6 +19,7 @@
 
 #include <asm/cacheflush.h>
 #include <asm/hardware/gic.h>
+#include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 #include <mach/hardware.h>
 #include <mach/setup.h>
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c
index 0a01cbdfe063..9f9e1c203061 100644
--- a/arch/arm/mach-ux500/usb.c
+++ b/arch/arm/mach-ux500/usb.c
@@ -95,13 +95,7 @@ static struct musb_hdrc_config musb_hdrc_config = {
 };
 
 static struct musb_hdrc_platform_data musb_platform_data = {
-#if defined(CONFIG_USB_MUSB_OTG)
         .mode = MUSB_OTG,
-#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
-        .mode = MUSB_PERIPHERAL,
-#else /* defined(CONFIG_USB_MUSB_HOST) */
-        .mode = MUSB_HOST,
-#endif
         .config = &musb_hdrc_config,
         .board_data = &musb_board_data,
 };
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index 2b1e836a76ed..b1e87c184e54 100644
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -217,7 +217,7 @@ static void __init ct_ca9x4_init(void)
 }
 
 #ifdef CONFIG_SMP
-static void ct_ca9x4_init_cpu_map(void)
+static void __init ct_ca9x4_init_cpu_map(void)
 {
         int i, ncores = scu_get_core_count(MMIO_P2V(A9_MPCORE_SCU));
 
@@ -233,7 +233,7 @@ static void ct_ca9x4_init_cpu_map(void)
         set_smp_cross_call(gic_raise_softirq);
 }
 
-static void ct_ca9x4_smp_enable(unsigned int max_cpus)
+static void __init ct_ca9x4_smp_enable(unsigned int max_cpus)
 {
         scu_enable(MMIO_P2V(A9_MPCORE_SCU));
 }
diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c
index 813ee08f96e6..3034a4dab4a1 100644
--- a/arch/arm/mach-vexpress/hotplug.c
+++ b/arch/arm/mach-vexpress/hotplug.c
@@ -13,6 +13,7 @@
 #include <linux/smp.h>
 
 #include <asm/cacheflush.h>
+#include <asm/smp_plat.h>
 #include <asm/system.h>
 
 extern volatile int pen_release;
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 4cefb57d9ed2..7edef9121632 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -631,7 +631,8 @@ comment "Processor Features"
 
 config ARM_LPAE
         bool "Support for the Large Physical Address Extension"
-        depends on MMU && CPU_V7
+        depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \
+                !CPU_32v4 && !CPU_32v3
         help
           Say Y if you have an ARMv7 processor supporting the LPAE page
           table format and you would like to access memory beyond the
@@ -882,6 +883,7 @@ config CACHE_XSC3L2
 
 config ARM_L1_CACHE_SHIFT_6
         bool
+        default y if CPU_V7
         help
           Setting ARM L1 cache line size to 64 Bytes.
 
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
index 07c4bc8ea0a4..a655d3da386d 100644
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
@@ -54,9 +54,15 @@ loop1:
         and     r1, r1, #7                      @ mask of the bits for current cache only
         cmp     r1, #2                          @ see what cache we have at this level
         blt     skip                            @ skip if no cache, or just i-cache
+#ifdef CONFIG_PREEMPT
+        save_and_disable_irqs_notrace r9        @ make cssr&csidr read atomic
+#endif
         mcr     p15, 2, r10, c0, c0, 0          @ select current cache level in cssr
         isb                                     @ isb to sych the new cssr&csidr
         mrc     p15, 1, r1, c0, c0, 0           @ read the new csidr
+#ifdef CONFIG_PREEMPT
+        restore_irqs_notrace r9
+#endif
         and     r2, r1, #7                      @ extract the length of the cache lines
         add     r2, r2, #4                      @ add 4 (line length offset)
         ldr     r4, =0x3ff
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 6ec1226fc62d..5dc7d127a40f 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -310,7 +310,7 @@ static void arm_memory_present(void)
 
 static bool arm_memblock_steal_permitted = true;
 
-phys_addr_t arm_memblock_steal(phys_addr_t size, phys_addr_t align)
+phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
 {
         phys_addr_t phys;
 
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 7e9b5bf910c1..0404ccbb8aa3 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -148,10 +148,6 @@ ENDPROC(cpu_v7_do_resume)
  *      Initialise TLB, Caches, and MMU state ready to switch the MMU
  *      on.  Return in r0 the new CP15 C1 control register setting.
  *
- *      We automatically detect if we have a Harvard cache, and use the
- *      Harvard cache control instructions insead of the unified cache
- *      control instructions.
- *
  *      This should be able to cover all ARMv7 cores.
  *
  *      It is assumed that:
@@ -251,9 +247,7 @@ __v7_setup:
 #endif
 
 3:      mov     r10, #0
-#ifdef HARVARD_CACHE
         mcr     p15, 0, r10, c7, c5, 0          @ I+BTB cache invalidate
-#endif
         dsb
 #ifdef CONFIG_MMU
         mcr     p15, 0, r10, c8, c7, 0          @ invalidate I + D TLBs
@@ -330,16 +324,6 @@ __v7_ca5mp_proc_info:
         .size   __v7_ca5mp_proc_info, . - __v7_ca5mp_proc_info
 
         /*
-         * ARM Ltd. Cortex A7 processor.
-         */
-        .type   __v7_ca7mp_proc_info, #object
-__v7_ca7mp_proc_info:
-        .long   0x410fc070
-        .long   0xff0ffff0
-        __v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV
-        .size   __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info
-
-        /*
          * ARM Ltd. Cortex A9 processor.
          */
         .type   __v7_ca9mp_proc_info, #object
@@ -351,6 +335,16 @@ __v7_ca9mp_proc_info:
 #endif  /* CONFIG_ARM_LPAE */
 
         /*
+         * ARM Ltd. Cortex A7 processor.
+         */
+        .type   __v7_ca7mp_proc_info, #object
+__v7_ca7mp_proc_info:
+        .long   0x410fc070
+        .long   0xff0ffff0
+        __v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV
+        .size   __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info
+
+        /*
          * ARM Ltd. Cortex A15 processor.
          */
         .type   __v7_ca15mp_proc_info, #object
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index b30708e28c1d..dcebb1230f7f 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -17,26 +17,17 @@ config ARCH_IMX_V4_V5
           and ARMv5 SoCs
 
 config ARCH_IMX_V6_V7
-        bool "i.MX3, i.MX6"
+        bool "i.MX3, i.MX5, i.MX6"
         select AUTO_ZRELADDR if !ZBOOT_ROM
         select ARM_PATCH_PHYS_VIRT
         select MIGHT_HAVE_CACHE_L2X0
         help
-          This enables support for systems based on the Freescale i.MX3 and i.MX6
-          family.
-
-config ARCH_MX5
-        bool "i.MX50, i.MX51, i.MX53"
-        select AUTO_ZRELADDR if !ZBOOT_ROM
-        select ARM_PATCH_PHYS_VIRT
-        help
-          This enables support for machines using Freescale's i.MX50 and i.MX53
-          processors.
+          This enables support for systems based on the Freescale i.MX3, i.MX5
+          and i.MX6 family.
 
 endchoice
 
 source "arch/arm/mach-imx/Kconfig"
-source "arch/arm/mach-mx5/Kconfig"
 
 endmenu
 
diff --git a/arch/arm/plat-mxc/include/mach/iomux-v1.h b/arch/arm/plat-mxc/include/mach/iomux-v1.h
index 6fa8a707b9a0..f7d18046c04f 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-v1.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-v1.h
@@ -96,6 +96,6 @@ extern int mxc_gpio_mode(int gpio_mode);
 extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count,
                 const char *label);
 
-extern int __init imx_iomuxv1_init(void __iomem *base, int numports);
+extern int imx_iomuxv1_init(void __iomem *base, int numports);
 
 #endif /* __MACH_IOMUX_V1_H__ */
diff --git a/arch/arm/plat-omap/include/plat/omap-secure.h b/arch/arm/plat-omap/include/plat/omap-secure.h
index 64f9d1c7f1bb..3047ff923a63 100644
--- a/arch/arm/plat-omap/include/plat/omap-secure.h
+++ b/arch/arm/plat-omap/include/plat/omap-secure.h
@@ -3,7 +3,7 @@
 
 #include <linux/types.h>
 
-#ifdef CONFIG_ARCH_OMAP2PLUS
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
 extern int omap_secure_ram_reserve_memblock(void);
 #else
 static inline void omap_secure_ram_reserve_memblock(void)
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index e5a2fde29b19..089899a7db72 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -789,10 +789,7 @@ void __init orion_xor1_init(unsigned long mapbase_low,
 /*****************************************************************************
  * EHCI
  ****************************************************************************/
-static struct orion_ehci_data orion_ehci_data = {
-        .phy_version    = EHCI_PHY_NA,
-};
-
+static struct orion_ehci_data orion_ehci_data;
 static u64 ehci_dmamask = DMA_BIT_MASK(32);
 
 
@@ -812,8 +809,10 @@ static struct platform_device orion_ehci = {
 };
 
 void __init orion_ehci_init(unsigned long mapbase,
-                            unsigned long irq)
+                            unsigned long irq,
+                            enum orion_ehci_phy_ver phy_version)
 {
+        orion_ehci_data.phy_version = phy_version;
         fill_resources(&orion_ehci, orion_ehci_resources, mapbase, SZ_4K - 1,
                        irq);
 
diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h
index 0fe08d77e835..a7fa005a5a0e 100644
--- a/arch/arm/plat-orion/include/plat/common.h
+++ b/arch/arm/plat-orion/include/plat/common.h
@@ -89,7 +89,8 @@ void __init orion_xor1_init(unsigned long mapbase_low,
                             unsigned long irq_1);
 
 void __init orion_ehci_init(unsigned long mapbase,
-                            unsigned long irq);
+                            unsigned long irq,
+                            enum orion_ehci_phy_ver phy_version);
 
 void __init orion_ehci_1_init(unsigned long mapbase,
                               unsigned long irq);
diff --git a/arch/arm/plat-orion/mpp.c b/arch/arm/plat-orion/mpp.c
index 91553432711d..3b1e17bd3d17 100644
--- a/arch/arm/plat-orion/mpp.c
+++ b/arch/arm/plat-orion/mpp.c
@@ -64,8 +64,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
                         gpio_mode |= GPIO_INPUT_OK;
                 if (*mpp_list & MPP_OUTPUT_MASK)
                         gpio_mode |= GPIO_OUTPUT_OK;
-                if (sel != 0)
-                        gpio_mode = 0;
+
                 orion_gpio_set_valid(num, gpio_mode);
         }
 
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 32a6e394db24..f10768e988d4 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -468,8 +468,10 @@ void __init s3c_i2c0_set_platdata(struct s3c2410_platform_i2c *pd)
 {
         struct s3c2410_platform_i2c *npd;
 
-        if (!pd)
+        if (!pd) {
                 pd = &default_i2c_data;
+                pd->bus_num = 0;
+        }
 
         npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
                                &s3c_device_i2c0);
diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c
index 92f18d372b69..49c7db48c7f1 100644
--- a/arch/arm/plat-versatile/platsmp.c
+++ b/arch/arm/plat-versatile/platsmp.c
@@ -16,6 +16,7 @@
 #include <linux/smp.h>
 
 #include <asm/cacheflush.h>
+#include <asm/smp_plat.h>
 #include <asm/hardware/gic.h>
 
 /*
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 197e96f70405..3dea7231f637 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -8,6 +8,7 @@ config AVR32
         select HAVE_KPROBES
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_PROBE
+        select GENERIC_ATOMIC64
         select HARDIRQS_SW_RESEND
         select GENERIC_IRQ_SHOW
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
diff --git a/arch/c6x/boot/Makefile b/arch/c6x/boot/Makefile
index ecca820e6041..6891257d514c 100644
--- a/arch/c6x/boot/Makefile
+++ b/arch/c6x/boot/Makefile
@@ -13,7 +13,7 @@ obj-y += linked_dtb.o
 endif
 
 $(obj)/%.dtb: $(src)/dts/%.dts FORCE
-        $(call cmd,dtc)
+        $(call if_changed_dep,dtc)
 
 quiet_cmd_cp = CP      $< $@$2
         cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 4203d101363c..c4ac15c4f065 100644
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -414,9 +414,9 @@ void __init config_atari(void)
                                          * FDC val = 4 -> Supervisor only */
                 asm volatile ("\n"
                         "       .chip   68030\n"
-                        "       pmove   %0@,%/tt1\n"
+                        "       pmove   %0,%/tt1\n"
                         "       .chip   68k"
-                        : : "a" (&tt1_val));
+                        : : "m" (tt1_val));
         } else {
                 asm volatile ("\n"
                         "       .chip   68040\n"
@@ -569,10 +569,10 @@ static void atari_reset(void)
                         : "d0");
         } else
                 asm volatile ("\n"
-                        "       pmove   %0@,%%tc\n"
+                        "       pmove   %0,%%tc\n"
                         "       jmp     %1@"
                         : /* no outputs */
-                        : "a" (&tc_val), "a" (reset_addr));
+                        : "m" (tc_val), "a" (reset_addr));
 }
 
 
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
index 0e89fa05de0e..c1155f0e22cc 100644
--- a/arch/m68k/include/asm/irq.h
+++ b/arch/m68k/include/asm/irq.h
@@ -50,19 +50,6 @@
 
 #define IRQ_USER        8
 
-/*
- * various flags for request_irq() - the Amiga now uses the standard
- * mechanism like all other architectures - IRQF_DISABLED and
- * IRQF_SHARED are your friends.
- */
-#ifndef MACH_AMIGA_ONLY
-#define IRQ_FLG_LOCK    (0x0001)        /* handler is not replaceable   */
-#define IRQ_FLG_REPLACE (0x0002)        /* replace existing handler     */
-#define IRQ_FLG_FAST    (0x0004)
-#define IRQ_FLG_SLOW    (0x0008)
-#define IRQ_FLG_STD     (0x8000)        /* internally used              */
-#endif
-
 struct irq_data;
 struct irq_chip;
 struct irq_desc;
diff --git a/arch/m68k/include/asm/mcf_pgtable.h b/arch/m68k/include/asm/mcf_pgtable.h
index 756bde4fb4f8..3c793682e5d9 100644
--- a/arch/m68k/include/asm/mcf_pgtable.h
+++ b/arch/m68k/include/asm/mcf_pgtable.h
@@ -78,7 +78,8 @@
                                  | CF_PAGE_READABLE \
                                  | CF_PAGE_WRITABLE \
                                  | CF_PAGE_EXEC \
-                                 | CF_PAGE_SYSTEM)
+                                 | CF_PAGE_SYSTEM \
+                                 | CF_PAGE_SHARED)
 
 #define PAGE_COPY       __pgprot(CF_PAGE_VALID \
                                  | CF_PAGE_ACCESSED \
diff --git a/arch/m68k/kernel/process_mm.c b/arch/m68k/kernel/process_mm.c
index 125f34e00bf0..099283ee1a8f 100644
--- a/arch/m68k/kernel/process_mm.c
+++ b/arch/m68k/kernel/process_mm.c
@@ -172,7 +172,7 @@ void flush_thread(void)
 
         current->thread.fs = __USER_DS;
         if (!FPU_IS_EMU)
-                asm volatile ("frestore %0@" : : "a" (&zero) : "memory");
+                asm volatile("frestore %0": :"m" (zero));
 }
 
 /*
diff --git a/arch/m68k/kernel/process_no.c b/arch/m68k/kernel/process_no.c
index 69c1803fcf1b..5e1078cabe0e 100644
--- a/arch/m68k/kernel/process_no.c
+++ b/arch/m68k/kernel/process_no.c
@@ -163,8 +163,8 @@ void flush_thread(void)
 #ifdef CONFIG_FPU
         if (!FPU_IS_EMU)
                 asm volatile (".chip 68k/68881\n\t"
-                              "frestore %0@\n\t"
-                              ".chip 68k" : : "a" (&zero));
+                              "frestore %0\n\t"
+                              ".chip 68k" : : "m" (zero));
 #endif
 }
 
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index a76452ca964e..daaa9187654c 100644
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
@@ -552,13 +552,13 @@ static inline void bus_error030 (struct frame *fp)
 
 #ifdef DEBUG
                 asm volatile ("ptestr %3,%2@,#7,%0\n\t"
-                              "pmove %%psr,%1@"
-                              : "=a&" (desc)
-                              : "a" (&temp), "a" (addr), "d" (ssw));
+                              "pmove %%psr,%1"
+                              : "=a&" (desc), "=m" (temp)
+                              : "a" (addr), "d" (ssw));
 #else
                 asm volatile ("ptestr %2,%1@,#7\n\t"
-                              "pmove %%psr,%0@"
-                              : : "a" (&temp), "a" (addr), "d" (ssw));
+                              "pmove %%psr,%0"
+                              : "=m" (temp) : "a" (addr), "d" (ssw));
 #endif
                 mmusr = temp;
 
@@ -605,20 +605,18 @@ static inline void bus_error030 (struct frame *fp)
                                !(ssw & RW) ? "write" : "read", addr,
                                fp->ptregs.pc, ssw);
                         asm volatile ("ptestr #1,%1@,#0\n\t"
-                                      "pmove %%psr,%0@"
-                                      : /* no outputs */
-                                      : "a" (&temp), "a" (addr));
+                                      "pmove %%psr,%0"
+                                      : "=m" (temp)
+                                      : "a" (addr));
                         mmusr = temp;
 
                         printk ("level 0 mmusr is %#x\n", mmusr);
 #if 0
-                        asm volatile ("pmove %%tt0,%0@"
-                                      : /* no outputs */
-                                      : "a" (&tlong));
+                        asm volatile ("pmove %%tt0,%0"
+                                      : "=m" (tlong));
                         printk("tt0 is %#lx, ", tlong);
-                        asm volatile ("pmove %%tt1,%0@"
-                                      : /* no outputs */
-                                      : "a" (&tlong));
+                        asm volatile ("pmove %%tt1,%0"
+                                      : "=m" (tlong));
                         printk("tt1 is %#lx\n", tlong);
 #endif
 #ifdef DEBUG
@@ -668,13 +666,13 @@ static inline void bus_error030 (struct frame *fp)
 
 #ifdef DEBUG
         asm volatile ("ptestr #1,%2@,#7,%0\n\t"
-                      "pmove %%psr,%1@"
-                      : "=a&" (desc)
-                      : "a" (&temp), "a" (addr));
+                      "pmove %%psr,%1"
+                      : "=a&" (desc), "=m" (temp)
+                      : "a" (addr));
 #else
         asm volatile ("ptestr #1,%1@,#7\n\t"
-                      "pmove %%psr,%0@"
-                      : : "a" (&temp), "a" (addr));
+                      "pmove %%psr,%0"
+                      : "=m" (temp) : "a" (addr));
 #endif
         mmusr = temp;
 
diff --git a/arch/m68k/mm/cache.c b/arch/m68k/mm/cache.c
index 95d0bf66e2e2..3d84c1f2ffb2 100644
--- a/arch/m68k/mm/cache.c
+++ b/arch/m68k/mm/cache.c
@@ -52,9 +52,9 @@ static unsigned long virt_to_phys_slow(unsigned long vaddr)
                 unsigned long *descaddr;
 
                 asm volatile ("ptestr %3,%2@,#7,%0\n\t"
-                              "pmove %%psr,%1@"
-                              : "=a&" (descaddr)
-                              : "a" (&mmusr), "a" (vaddr), "d" (get_fs().seg));
+                              "pmove %%psr,%1"
+                              : "=a&" (descaddr), "=m" (mmusr)
+                              : "a" (vaddr), "d" (get_fs().seg));
                 if (mmusr & (MMU_I|MMU_B|MMU_L))
                         return 0;
                 descaddr = phys_to_virt((unsigned long)descaddr);
diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c
index babd5a97cdcb..875b800ef0dd 100644
--- a/arch/m68k/mm/mcfmmu.c
+++ b/arch/m68k/mm/mcfmmu.c
@@ -87,7 +87,7 @@ void __init paging_init(void)
 
 int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word)
 {
-        unsigned long flags, mmuar;
+        unsigned long flags, mmuar, mmutr;
         struct mm_struct *mm;
         pgd_t *pgd;
         pmd_t *pmd;
@@ -137,9 +137,10 @@ int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word)
         if (!pte_dirty(*pte) && !KMAPAREA(mmuar))
                 set_pte(pte, pte_wrprotect(*pte));
 
-        mmu_write(MMUTR, (mmuar & PAGE_MASK) | (asid << MMUTR_IDN) |
-                (((int)(pte->pte) & (int)CF_PAGE_MMUTR_MASK)
-                >> CF_PAGE_MMUTR_SHIFT) | MMUTR_V);
+        mmutr = (mmuar & PAGE_MASK) | (asid << MMUTR_IDN) | MMUTR_V;
+        if ((mmuar < TASK_UNMAPPED_BASE) || (mmuar >= TASK_SIZE))
+                mmutr |= (pte->pte & CF_PAGE_MMUTR_MASK) >> CF_PAGE_MMUTR_SHIFT;
+        mmu_write(MMUTR, mmutr);
 
         mmu_write(MMUDR, (pte_val(*pte) & PAGE_MASK) |
                 ((pte->pte) & CF_PAGE_MMUDR_MASK) | MMUDR_SZ_8KB | MMUDR_X);
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S
index 863889fc31c9..281e38c2b6c7 100644
--- a/arch/m68k/platform/coldfire/entry.S
+++ b/arch/m68k/platform/coldfire/entry.S
@@ -136,7 +136,7 @@ Luser_return:
         movel   %sp,%d1                 /* get thread_info pointer */
         andl    #-THREAD_SIZE,%d1       /* at base of kernel stack */
         movel   %d1,%a0
-        movel   %a0@(TINFO_FLAGS),%d1   /* get thread_info->flags */
+        moveb   %a0@(TINFO_FLAGS+3),%d1 /* thread_info->flags (low 8 bits) */
         jne     Lwork_to_do             /* still work to do */
 
 Lreturn:
@@ -148,8 +148,6 @@ Lwork_to_do:
         btst    #TIF_NEED_RESCHED,%d1
         jne     reschedule
 
-        /* GERG: do we need something here for TRACEing?? */
-
 Lsignal_return:
         subql   #4,%sp                  /* dummy return address */
         SAVE_SWITCH_STACK
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 74f23a460ba2..c8d6efb99dbf 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -19,6 +19,7 @@ config MICROBLAZE
         select GENERIC_IRQ_SHOW
         select GENERIC_PCI_IOMAP
         select GENERIC_CPU_DEVICES
+        select GENERIC_ATOMIC64
 
 config SWAP
         def_bool n
diff --git a/arch/microblaze/include/asm/atomic.h b/arch/microblaze/include/asm/atomic.h
index 6d2e1d418be7..615f53992c65 100644
--- a/arch/microblaze/include/asm/atomic.h
+++ b/arch/microblaze/include/asm/atomic.h
@@ -2,6 +2,7 @@
 #define _ASM_MICROBLAZE_ATOMIC_H
 
 #include <asm-generic/atomic.h>
+#include <asm-generic/atomic64.h>
 
 /*
  * Atomically test *v and decrement if it is greater than 0.
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index d4fc1a971779..604cd9dd1333 100644
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -26,7 +26,6 @@
 #include <linux/cache.h>
 #include <linux/of_platform.h>
 #include <linux/dma-mapping.h>
-#include <linux/cpu.h>
 #include <asm/cacheflush.h>
 #include <asm/entry.h>
 #include <asm/cpuinfo.h>
@@ -227,23 +226,5 @@ static int __init setup_bus_notifier(void)
 
         return 0;
 }
-arch_initcall(setup_bus_notifier);
-
-static DEFINE_PER_CPU(struct cpu, cpu_devices);
-
-static int __init topology_init(void)
-{
-        int i, ret;
-
-        for_each_present_cpu(i) {
-                struct cpu *c = &per_cpu(cpu_devices, i);
 
-                ret = register_cpu(c, i);
-                if (ret)
-                        printk(KERN_WARNING "topology_init: register_cpu %d "
-                                                "failed (%d)\n", i, ret);
-        }
-
-        return 0;
-}
-subsys_initcall(topology_init);
+arch_initcall(setup_bus_notifier);
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index c4c1312473fb..5ab6e89603c5 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2356,6 +2356,7 @@ config PCI
         depends on HW_HAS_PCI
         select PCI_DOMAINS
         select GENERIC_PCI_IOMAP
+        select NO_GENERIC_PCI_IOPORT_MAP
         help
           Find out whether you have a PCI motherboard. PCI is the name of a
           bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/mips/lib/iomap-pci.c b/arch/mips/lib/iomap-pci.c
index 2635b1a96333..fd35daa45314 100644
--- a/arch/mips/lib/iomap-pci.c
+++ b/arch/mips/lib/iomap-pci.c
@@ -10,8 +10,8 @@
 #include <linux/module.h>
 #include <asm/io.h>
 
-static void __iomem *ioport_map_pci(struct pci_dev *dev,
-                                     unsigned long port, unsigned int nr)
+void __iomem *__pci_ioport_map(struct pci_dev *dev,
+                               unsigned long port, unsigned int nr)
 {
         struct pci_controller *ctrl = dev->bus->sysdata;
         unsigned long base = ctrl->io_map_base;
diff --git a/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi
index 89af62637707..b37da56018b6 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi
@@ -236,6 +236,10 @@
         };
 
 /include/ "pq3-esdhc-0.dtsi"
+        sdhc@2e000 {
+                compatible = "fsl,mpc8536-esdhc", "fsl,esdhc";
+        };
+
 /include/ "pq3-sec3.0-0.dtsi"
 /include/ "pq3-mpic.dtsi"
 /include/ "pq3-mpic-timer-B.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
index bd9e163c764b..a97d1263372c 100644
--- a/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
@@ -158,7 +158,8 @@
 /include/ "pq3-usb2-dr-0.dtsi"
 /include/ "pq3-esdhc-0.dtsi"
         sdhc@2e000 {
-                fsl,sdhci-auto-cmd12;
+                compatible = "fsl,p1010-esdhc", "fsl,esdhc";
+                sdhci,auto-cmd12;
         };
 
 /include/ "pq3-sec4.4-0.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi
index fc924c5ffebe..5de5fc351314 100644
--- a/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1020si-post.dtsi
@@ -145,6 +145,10 @@
 /include/ "pq3-usb2-dr-1.dtsi"
 
 /include/ "pq3-esdhc-0.dtsi"
+        sdhc@2e000 {
+                compatible = "fsl,p1020-esdhc", "fsl,esdhc";
+                sdhci,auto-cmd12;
+        };
 /include/ "pq3-sec3.3-0.dtsi"
 
 /include/ "pq3-mpic.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
index 16239b199d0a..ff9ed1d87929 100644
--- a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
@@ -203,7 +203,8 @@
 
 /include/ "pq3-esdhc-0.dtsi"
         sdhc@2e000 {
-                fsl,sdhci-auto-cmd12;
+                compatible = "fsl,p1022-esdhc", "fsl,esdhc";
+                sdhci,auto-cmd12;
         };
 
 /include/ "pq3-sec3.3-0.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi
index c041050561a7..332e9e75e6c2 100644
--- a/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi
@@ -182,6 +182,10 @@
 /include/ "pq3-etsec1-1.dtsi"
 /include/ "pq3-etsec1-2.dtsi"
 /include/ "pq3-esdhc-0.dtsi"
+        sdhc@2e000 {
+                compatible = "fsl,p2020-esdhc", "fsl,esdhc";
+        };
+
 /include/ "pq3-sec3.1-0.dtsi"
 /include/ "pq3-mpic.dtsi"
 /include/ "pq3-mpic-timer-B.dtsi"
diff --git a/arch/powerpc/boot/dts/p1020rdb.dtsi b/arch/powerpc/boot/dts/p1020rdb.dtsi
index b5bd86f4baf2..1fb7e0e0940f 100644
--- a/arch/powerpc/boot/dts/p1020rdb.dtsi
+++ b/arch/powerpc/boot/dts/p1020rdb.dtsi
@@ -1,7 +1,7 @@
 /*
  * P1020 RDB Device Tree Source stub (no addresses or top-level ranges)
  *
- * Copyright 2011 Freescale Semiconductor Inc.
+ * Copyright 2011-2012 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -190,17 +190,16 @@
 
         usb@22000 {
                 phy_type = "ulpi";
+                dr_mode = "host";
         };
 
-        /* USB2 is shared with localbus, so it must be disabled
-           by default. We can't put 'status = "disabled";' here
-           since U-Boot doesn't clear the status property when
-           it enables USB2. OTOH, U-Boot does create a new node
-           when there isn't any. So, just comment it out.
+        /* USB2 is shared with localbus. It is used
+           only in case of SPI and SD boot after
+           appropriate device-tree fixup done by uboot */
         usb@23000 {
                 phy_type = "ulpi";
+                dr_mode = "host";
         };
-        */
 
         mdio@24000 {
                 phy0: ethernet-phy@0 {
diff --git a/arch/powerpc/boot/dts/p1021mds.dts b/arch/powerpc/boot/dts/p1021mds.dts
index d9540791e434..97116f198a37 100644
--- a/arch/powerpc/boot/dts/p1021mds.dts
+++ b/arch/powerpc/boot/dts/p1021mds.dts
@@ -1,7 +1,7 @@
 /*
  * P1021 MDS Device Tree Source
  *
- * Copyright 2010 Freescale Semiconductor Inc.
+ * Copyright 2010,2012 Freescale Semiconductor Inc.
  *
  * 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
@@ -151,6 +151,7 @@
 
                 usb@22000 {
                         phy_type = "ulpi";
+                        dr_mode = "host";
                 };
 
                 mdio@24000 {
diff --git a/arch/powerpc/boot/dts/p2020ds.dtsi b/arch/powerpc/boot/dts/p2020ds.dtsi
index c1cf6cef4dd6..d3b939c573b0 100644
--- a/arch/powerpc/boot/dts/p2020ds.dtsi
+++ b/arch/powerpc/boot/dts/p2020ds.dtsi
@@ -1,7 +1,7 @@
 /*
  * P2020DS Device Tree Source stub (no addresses or top-level ranges)
  *
- * Copyright 2011 Freescale Semiconductor Inc.
+ * Copyright 2011-2012 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -134,6 +134,7 @@
 &board_soc {
         usb@22000 {
                 phy_type = "ulpi";
+                dr_mode = "host";
         };
 
         mdio@24520 {
diff --git a/arch/powerpc/boot/dts/p2020rdb.dts b/arch/powerpc/boot/dts/p2020rdb.dts
index 26759a591712..eb8a6aa2bda5 100644
--- a/arch/powerpc/boot/dts/p2020rdb.dts
+++ b/arch/powerpc/boot/dts/p2020rdb.dts
@@ -1,7 +1,7 @@
 /*
  * P2020 RDB Device Tree Source
  *
- * Copyright 2009-2011 Freescale Semiconductor Inc.
+ * Copyright 2009-2012 Freescale Semiconductor Inc.
  *
  * 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
@@ -197,6 +197,7 @@
 
                 usb@22000 {
                         phy_type = "ulpi";
+                        dr_mode = "host";
                 };
 
                 mdio@24520 {
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 2156e077859b..1acf65026773 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -24,10 +24,6 @@ CONFIG_PPC_SPLPAR=y
 CONFIG_SCANLOG=m
 CONFIG_PPC_SMLPAR=y
 CONFIG_DTL=y
-CONFIG_PPC_ISERIES=y
-CONFIG_VIODASD=y
-CONFIG_VIOCD=m
-CONFIG_VIOTAPE=m
 CONFIG_PPC_MAPLE=y
 CONFIG_PPC_PASEMI=y
 CONFIG_PPC_PASEMI_IOMMU=y
@@ -259,7 +255,6 @@ CONFIG_PASEMI_MAC=y
 CONFIG_MLX4_EN=m
 CONFIG_QLGE=m
 CONFIG_BE2NET=m
-CONFIG_ISERIES_VETH=m
 CONFIG_PPP=m
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
diff --git a/arch/powerpc/include/asm/ppc-pci.h b/arch/powerpc/include/asm/ppc-pci.h
index 43268f15004e..6d422979ebaf 100644
--- a/arch/powerpc/include/asm/ppc-pci.h
+++ b/arch/powerpc/include/asm/ppc-pci.h
@@ -142,6 +142,11 @@ static inline const char *eeh_pci_name(struct pci_dev *pdev)
         return pdev ? pci_name(pdev) : "<null>";
 } 
 
+static inline const char *eeh_driver_name(struct pci_dev *pdev)
+{
+        return (pdev && pdev->driver) ? pdev->driver->name : "<null>";
+}
+
 #endif /* CONFIG_EEH */
 
 #else /* CONFIG_PCI */
diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 78a205162fd7..84cc7840cd18 100644
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -83,8 +83,18 @@ struct pt_regs {
 
 #ifndef __ASSEMBLY__
 
-#define instruction_pointer(regs) ((regs)->nip)
-#define user_stack_pointer(regs) ((regs)->gpr[1])
+#define GET_IP(regs)            ((regs)->nip)
+#define GET_USP(regs)           ((regs)->gpr[1])
+#define GET_FP(regs)            (0)
+#define SET_FP(regs, val)
+
+#ifdef CONFIG_SMP
+extern unsigned long profile_pc(struct pt_regs *regs);
+#define profile_pc profile_pc
+#endif
+
+#include <asm-generic/ptrace.h>
+
 #define kernel_stack_pointer(regs) ((regs)->gpr[1])
 static inline int is_syscall_success(struct pt_regs *regs)
 {
@@ -99,12 +109,6 @@ static inline long regs_return_value(struct pt_regs *regs)
                 return -regs->gpr[3];
 }
 
-#ifdef CONFIG_SMP
-extern unsigned long profile_pc(struct pt_regs *regs);
-#else
-#define profile_pc(regs) instruction_pointer(regs)
-#endif
-
 #ifdef __powerpc64__
 #define user_mode(regs) ((((regs)->msr) >> MSR_PR_LG) & 0x1)
 #else
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 28be3452e67a..abef75176c07 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -46,7 +46,6 @@
 
 /* This keeps a track of which one is the crashing cpu. */
 int crashing_cpu = -1;
-static atomic_t cpus_in_crash;
 static int time_to_dump;
 
 #define CRASH_HANDLER_MAX 3
@@ -66,6 +65,7 @@ static int handle_fault(struct pt_regs *regs)
 
 #ifdef CONFIG_SMP
 
+static atomic_t cpus_in_crash;
 void crash_ipi_callback(struct pt_regs *regs)
 {
         static cpumask_t cpus_state_saved = CPU_MASK_NONE;
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 4f80cf1ce77b..3e57a00b8cba 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -1213,7 +1213,7 @@ do_user_signal:			/* r10 contains MSR_KERNEL here */
         stw     r3,_TRAP(r1)
 2:      addi    r3,r1,STACK_FRAME_OVERHEAD
         mr      r4,r9
-        bl      do_signal
+        bl      do_notify_resume
         REST_NVGPRS(r1)
         b       recheck
 
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index d834425186ae..866462cbe2d8 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -751,12 +751,16 @@ user_work:
 
         andi.   r0,r4,_TIF_NEED_RESCHED
         beq     1f
+        li      r5,1
+        TRACE_AND_RESTORE_IRQ(r5);
         bl      .schedule
         b       .ret_from_except_lite
 
 1:      bl      .save_nvgprs
+        li      r5,1
+        TRACE_AND_RESTORE_IRQ(r5);
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .do_signal
+        bl      .do_notify_resume
         b       .ret_from_except
 
 unrecov_restore:
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index d4be7bb3dbdf..15c5a4f6de01 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -774,8 +774,8 @@ alignment_common:
 program_check_common:
         EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN)
         bl      .save_nvgprs
+        DISABLE_INTS
         addi    r3,r1,STACK_FRAME_OVERHEAD
-        ENABLE_INTS
         bl      .program_check_exception
         b       .ret_from_except
 
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 701d4aceb4f4..01e2877e8e04 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -118,10 +118,14 @@ static inline notrace void set_soft_enabled(unsigned long enable)
 static inline notrace void decrementer_check_overflow(void)
 {
         u64 now = get_tb_or_rtc();
-        u64 *next_tb = &__get_cpu_var(decrementers_next_tb);
+        u64 *next_tb;
+
+        preempt_disable();
+        next_tb = &__get_cpu_var(decrementers_next_tb);
 
         if (now >= *next_tb)
                 set_dec(1);
+        preempt_enable();
 }
 
 notrace void arch_local_irq_restore(unsigned long en)
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 3fea3689527e..bedd12e1cfbc 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -442,8 +442,10 @@ static void __init fixup_port_irq(int index,
 
         port->irq = virq;
 
+#ifdef CONFIG_SERIAL_8250_FSL
         if (of_device_is_compatible(np, "fsl,ns16550"))
                 port->handle_irq = fsl8250_handle_irq;
+#endif
 }
 
 static void __init fixup_port_pio(int index,
diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c
index 10a140f82cb8..64483fde95c6 100644
--- a/arch/powerpc/kernel/perf_event.c
+++ b/arch/powerpc/kernel/perf_event.c
@@ -865,6 +865,7 @@ static void power_pmu_start(struct perf_event *event, int ef_flags)
 {
         unsigned long flags;
         s64 left;
+        unsigned long val;
 
         if (!event->hw.idx || !event->hw.sample_period)
                 return;
@@ -880,7 +881,12 @@ static void power_pmu_start(struct perf_event *event, int ef_flags)
 
         event->hw.state = 0;
         left = local64_read(&event->hw.period_left);
-        write_pmc(event->hw.idx, left);
+
+        val = 0;
+        if (left < 0x80000000L)
+                val = 0x80000000L - left;
+
+        write_pmc(event->hw.idx, val);
 
         perf_event_update_userpage(event);
         perf_pmu_enable(event->pmu);
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index ebe5766781aa..d817ab018486 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -566,12 +566,12 @@ static void show_instructions(struct pt_regs *regs)
                  */
                 if (!__kernel_text_address(pc) ||
                      __get_user(instr, (unsigned int __user *)pc)) {
-                        printk("XXXXXXXX ");
+                        printk(KERN_CONT "XXXXXXXX ");
                 } else {
                         if (regs->nip == pc)
-                                printk("<%08x> ", instr);
+                                printk(KERN_CONT "<%08x> ", instr);
                         else
-                                printk("%08x ", instr);
+                                printk(KERN_CONT "%08x ", instr);
                 }
 
                 pc += sizeof(int);
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 517b1d8f455b..9f843cdfee9e 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -716,7 +716,6 @@ static int __rtas_suspend_last_cpu(struct rtas_suspend_me_data *data, int wake_w
         int cpu;
 
         slb_set_size(SLB_MIN_SIZE);
-        stop_topology_update();
         printk(KERN_DEBUG "calling ibm,suspend-me on cpu %i\n", smp_processor_id());
 
         while (rc == H_MULTI_THREADS_ACTIVE && !atomic_read(&data->done) &&
@@ -732,7 +731,6 @@ static int __rtas_suspend_last_cpu(struct rtas_suspend_me_data *data, int wake_w
                 rc = atomic_read(&data->error);
 
         atomic_set(&data->error, rc);
-        start_topology_update();
         pSeries_coalesce_init();
 
         if (wake_when_done) {
@@ -846,6 +844,7 @@ int rtas_ibm_suspend_me(struct rtas_args *args)
         atomic_set(&data.error, 0);
         data.token = rtas_token("ibm,suspend-me");
         data.complete = &done;
+        stop_topology_update();
 
         /* Call function on all CPUs.  One of us will make the
          * rtas call
@@ -858,6 +857,8 @@ int rtas_ibm_suspend_me(struct rtas_args *args)
         if (atomic_read(&data.error) != 0)
                 printk(KERN_ERR "Error doing global join\n");
 
+        start_topology_update();
+
         return atomic_read(&data.error);
 }
 #else /* CONFIG_PPC_PSERIES */
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 2300426e531a..ac6e437b1021 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -11,6 +11,7 @@
 
 #include <linux/tracehook.h>
 #include <linux/signal.h>
+#include <linux/key.h>
 #include <asm/hw_breakpoint.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -113,8 +114,9 @@ static void check_syscall_restart(struct pt_regs *regs, struct k_sigaction *ka,
         }
 }
 
-static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs)
+static int do_signal(struct pt_regs *regs)
 {
+        sigset_t *oldset;
         siginfo_t info;
         int signr;
         struct k_sigaction ka;
@@ -123,7 +125,7 @@ static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs)
 
         if (current_thread_info()->local_flags & _TLF_RESTORE_SIGMASK)
                 oldset = &current->saved_sigmask;
-        else if (!oldset)
+        else
                 oldset = &current->blocked;
 
         signr = get_signal_to_deliver(&info, &ka, regs, NULL);
@@ -191,14 +193,16 @@ static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs)
         return ret;
 }
 
-void do_signal(struct pt_regs *regs, unsigned long thread_info_flags)
+void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
 {
         if (thread_info_flags & _TIF_SIGPENDING)
-                do_signal_pending(NULL, regs);
+                do_signal(regs);
 
         if (thread_info_flags & _TIF_NOTIFY_RESUME) {
                 clear_thread_flag(TIF_NOTIFY_RESUME);
                 tracehook_notify_resume(regs);
+                if (current->replacement_session_keyring)
+                        key_replace_session_keyring();
         }
 }
 
diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h
index 6c0ddfc0603e..8dde973aaaf5 100644
--- a/arch/powerpc/kernel/signal.h
+++ b/arch/powerpc/kernel/signal.h
@@ -12,7 +12,7 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
-extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags);
+extern void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags);
 
 extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
                                   size_t frame_size, int is_32);
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index bb3d84f4046f..b0984ada3f83 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -25,6 +25,7 @@
 
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
+#include <asm/udbg.h>
 #include <asm/fsl_guts.h>
 #include "smp.h"
 
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index f31162cfdaa9..5e155dfc4320 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -204,11 +204,10 @@ static void __devinit pnv_ioda_offset_bus(struct pci_bus *bus,
         pr_devel("  -> OBR %s [%x] +%016llx\n",
                  bus->self ? pci_name(bus->self) : "root", flags, offset);
 
-        for (i = 0; i < 2; i++) {
-                r = bus->resource[i];
+        pci_bus_for_each_resource(bus, r, i) {
                 if (r && (r->flags & flags)) {
-                        bus->resource[i]->start += offset;
-                        bus->resource[i]->end += offset;
+                        r->start += offset;
+                        r->end += offset;
                 }
         }
         list_for_each_entry(dev, &bus->devices, bus_list)
@@ -288,12 +287,17 @@ static void __devinit pnv_ioda_calc_bus(struct pci_bus *bus, unsigned int flags,
          * assignment algorithm is going to be uber-trivial for now, we
          * can try to be smarter later at filling out holes.
          */
-        start = bus->self ? 0 : bus->resource[bres]->start;
-
-        /* Don't hand out IO 0 */
-        if ((flags & IORESOURCE_IO) && !bus->self)
-                start += 0x1000;
-
+        if (bus->self) {
+                /* No offset for downstream bridges */
+                start = 0;
+        } else {
+                /* Offset from the root */
+                if (flags & IORESOURCE_IO)
+                        /* Don't hand out IO 0 */
+                        start = hose->io_resource.start + 0x1000;
+                else
+                        start = hose->mem_resources[0].start;
+        }
         while(!list_empty(&head)) {
                 w = list_first_entry(&head, struct resource_wrap, link);
                 list_del(&w->link);
@@ -321,13 +325,20 @@ static void __devinit pnv_ioda_calc_bus(struct pci_bus *bus, unsigned int flags,
  empty:
         /* Only setup P2P's, not the PHB itself */
         if (bus->self) {
-                WARN_ON(bus->resource[bres] == NULL);
-                bus->resource[bres]->start = 0;
-                bus->resource[bres]->flags = (*size) ? flags : 0;
-                bus->resource[bres]->end = (*size) ? (*size - 1) : 0;
+                struct resource *res = bus->resource[bres];
+
+                if (WARN_ON(res == NULL))
+                        return;
 
-                /* Clear prefetch bus resources for now */
-                bus->resource[2]->flags = 0;
+                /*
+                 * FIXME: We should probably export and call
+                 * pci_bridge_check_ranges() to properly re-initialize
+                 * the PCI portion of the flags here, and to detect
+                 * what the bridge actually supports.
+                 */
+                res->start = 0;
+                res->flags = (*size) ? flags : 0;
+                res->end = (*size) ? (*size - 1) : 0;
         }
 
         pr_devel("<- CBR %s [%x] *size=%016llx *align=%016llx\n",
diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
index a70bc1e385eb..f92b9ef7340e 100644
--- a/arch/powerpc/platforms/powernv/pci.c
+++ b/arch/powerpc/platforms/powernv/pci.c
@@ -52,32 +52,38 @@ static int pnv_msi_check_device(struct pci_dev* pdev, int nvec, int type)
 
 static unsigned int pnv_get_one_msi(struct pnv_phb *phb)
 {
-        unsigned int id;
+        unsigned long flags;
+        unsigned int id, rc;
+
+        spin_lock_irqsave(&phb->lock, flags);
 
-        spin_lock(&phb->lock);
         id = find_next_zero_bit(phb->msi_map, phb->msi_count, phb->msi_next);
         if (id >= phb->msi_count && phb->msi_next)
                 id = find_next_zero_bit(phb->msi_map, phb->msi_count, 0);
         if (id >= phb->msi_count) {
-                spin_unlock(&phb->lock);
-                return 0;
+                rc = 0;
+                goto out;
         }
         __set_bit(id, phb->msi_map);
-        spin_unlock(&phb->lock);
-        return id + phb->msi_base;
+        rc = id + phb->msi_base;
+out:
+        spin_unlock_irqrestore(&phb->lock, flags);
+        return rc;
 }
 
 static void pnv_put_msi(struct pnv_phb *phb, unsigned int hwirq)
 {
+        unsigned long flags;
         unsigned int id;
 
         if (WARN_ON(hwirq < phb->msi_base ||
                     hwirq >= (phb->msi_base + phb->msi_count)))
                 return;
         id = hwirq - phb->msi_base;
-        spin_lock(&phb->lock);
+
+        spin_lock_irqsave(&phb->lock, flags);
         __clear_bit(id, phb->msi_map);
-        spin_unlock(&phb->lock);
+        spin_unlock_irqrestore(&phb->lock, flags);
 }
 
 static int pnv_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index ae7b6d41fed3..31f22c1f657d 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -122,7 +122,7 @@ config DTL
           Say N if you are unsure.
 
 config PSERIES_IDLE
-        tristate "Cpuidle driver for pSeries platforms"
+        bool "Cpuidle driver for pSeries platforms"
         depends on CPU_IDLE
         depends on PPC_PSERIES
         default y
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 565869022e3d..c0b40af4ce4f 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -551,9 +551,9 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
                         printk (KERN_ERR "EEH: %d reads ignored for recovering device at "
                                 "location=%s driver=%s pci addr=%s\n",
                                 pdn->eeh_check_count, location,
-                                dev->driver->name, eeh_pci_name(dev));
+                                eeh_driver_name(dev), eeh_pci_name(dev));
                         printk (KERN_ERR "EEH: Might be infinite loop in %s driver\n",
-                                dev->driver->name);
+                                eeh_driver_name(dev));
                         dump_stack();
                 }
                 goto dn_unlock;
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
index b84a8b2238dd..47226e04126d 100644
--- a/arch/powerpc/platforms/pseries/suspend.c
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -24,6 +24,7 @@
 #include <asm/machdep.h>
 #include <asm/mmu.h>
 #include <asm/rtas.h>
+#include <asm/topology.h>
 
 static u64 stream_id;
 static struct device suspend_dev;
@@ -138,8 +139,11 @@ static ssize_t store_hibernate(struct device *dev,
                         ssleep(1);
         } while (rc == -EAGAIN);
 
-        if (!rc)
+        if (!rc) {
+                stop_topology_update();
                 rc = pm_suspend(PM_SUSPEND_MEM);
+                start_topology_update();
+        }
 
         stream_id = 0;
 
diff --git a/arch/powerpc/platforms/wsp/ics.c b/arch/powerpc/platforms/wsp/ics.c
index 576874392543..97fe82ee8633 100644
--- a/arch/powerpc/platforms/wsp/ics.c
+++ b/arch/powerpc/platforms/wsp/ics.c
@@ -346,7 +346,7 @@ static int wsp_chip_set_affinity(struct irq_data *d,
          * For the moment only implement delivery to all cpus or one cpu.
          * Get current irq_server for the given irq
          */
-        ret = cache_hwirq_map(ics, d->irq, cpumask);
+        ret = cache_hwirq_map(ics, hw_irq, cpumask);
         if (ret == -1) {
                 char cpulist[128];
                 cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
diff --git a/arch/powerpc/platforms/wsp/smp.c b/arch/powerpc/platforms/wsp/smp.c
index 71bd105f3863..0ba103ae83a5 100644
--- a/arch/powerpc/platforms/wsp/smp.c
+++ b/arch/powerpc/platforms/wsp/smp.c
@@ -71,7 +71,7 @@ int __devinit smp_a2_kick_cpu(int nr)
 
 static int __init smp_a2_probe(void)
 {
-        return cpus_weight(cpu_possible_map);
+        return num_possible_cpus();
 }
 
 static struct smp_ops_t a2_smp_ops = {
diff --git a/arch/powerpc/platforms/wsp/wsp_pci.c b/arch/powerpc/platforms/wsp/wsp_pci.c
index e0262cd0e2d3..d24b3acf858e 100644
--- a/arch/powerpc/platforms/wsp/wsp_pci.c
+++ b/arch/powerpc/platforms/wsp/wsp_pci.c
@@ -468,15 +468,15 @@ static void __init wsp_pcie_configure_hw(struct pci_controller *hose)
 #define DUMP_REG(x) \
         pr_debug("%-30s : 0x%016llx\n", #x, in_be64(hose->cfg_data + x))
 
-#ifdef CONFIG_WSP_DD1_WORKAROUND_BAD_PCIE_CLASS
-        /* WSP DD1 has a bogus class code by default in the PCI-E
-         * root complex's built-in P2P bridge */
+        /*
+         * Some WSP variants  has a bogus class code by default in the PCI-E
+         * root complex's built-in P2P bridge
+         */
         val = in_be64(hose->cfg_data + PCIE_REG_SYS_CFG1);
         pr_debug("PCI-E SYS_CFG1 : 0x%llx\n", val);
         out_be64(hose->cfg_data + PCIE_REG_SYS_CFG1,
                  (val & ~PCIE_REG_SYS_CFG1_CLASS_CODE) | (PCI_CLASS_BRIDGE_PCI << 8));
         pr_debug("PCI-E SYS_CFG1 : 0x%llx\n", in_be64(hose->cfg_data + PCIE_REG_SYS_CFG1));
-#endif /* CONFIG_WSP_DD1_WORKAROUND_BAD_PCIE_CLASS */
 
 #ifdef CONFIG_WSP_DD1_WORKAROUND_DD1_TCE_BUGS
         /* XXX Disable TCE caching, it doesn't work on DD1 */
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 3b61e8cf3421..6073288fed29 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -205,12 +205,12 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
 
         if (paddr_hi == paddr_lo) {
                 pr_err("%s: No outbound window space\n", name);
-                return ;
+                goto out;
         }
 
         if (paddr_lo == 0) {
                 pr_err("%s: No space for inbound window\n", name);
-                return ;
+                goto out;
         }
 
         /* setup PCSRBAR/PEXCSRBAR */
@@ -357,6 +357,7 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
                         (u64)hose->dma_window_size);
         }
 
+out:
         iounmap(pci);
 }
 
@@ -384,26 +385,36 @@ static void __init setup_pci_cmd(struct pci_controller *hose)
 void fsl_pcibios_fixup_bus(struct pci_bus *bus)
 {
         struct pci_controller *hose = pci_bus_to_host(bus);
-        int i;
-
-        if ((bus->parent == hose->bus) &&
-            ((fsl_pcie_bus_fixup &&
-              early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) ||
-             (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK)))
-        {
-                for (i = 0; i < 4; ++i) {
+        int i, is_pcie = 0, no_link;
+
+        /* The root complex bridge comes up with bogus resources,
+         * we copy the PHB ones in.
+         *
+         * With the current generic PCI code, the PHB bus no longer
+         * has bus->resource[0..4] set, so things are a bit more
+         * tricky.
+         */
+
+        if (fsl_pcie_bus_fixup)
+                is_pcie = early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP);
+        no_link = !!(hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK);
+
+        if (bus->parent == hose->bus && (is_pcie || no_link)) {
+                for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; ++i) {
                         struct resource *res = bus->resource[i];
-                        struct resource *par = bus->parent->resource[i];
-                        if (res) {
-                                res->start = 0;
-                                res->end   = 0;
-                                res->flags = 0;
-                        }
-                        if (res && par) {
-                                res->start = par->start;
-                                res->end   = par->end;
-                                res->flags = par->flags;
-                        }
+                        struct resource *par;
+
+                        if (!res)
+                                continue;
+                        if (i == 0)
+                                par = &hose->io_resource;
+                        else if (i < 4)
+                                par = &hose->mem_resources[i-1];
+                        else par = NULL;
+
+                        res->start = par ? par->start : 0;
+                        res->end   = par ? par->end   : 0;
+                        res->flags = par ? par->flags : 0;
                 }
         }
 }
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index e9f353341693..0ad2f1e1ce9e 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -88,7 +88,6 @@ KBUILD_CFLAGS	+= -pipe -fno-strength-reduce -Wno-sign-compare
 KBUILD_AFLAGS   += $(aflags-y)
 
 OBJCOPYFLAGS    := -O binary
-LDFLAGS_vmlinux := -e start
 
 head-y          := arch/s390/kernel/head.o
 head-y          += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o)
diff --git a/arch/s390/include/asm/kexec.h b/arch/s390/include/asm/kexec.h
index cf4e47b0948c..3f30dac804ea 100644
--- a/arch/s390/include/asm/kexec.h
+++ b/arch/s390/include/asm/kexec.h
@@ -42,6 +42,24 @@
 /* The native architecture */
 #define KEXEC_ARCH KEXEC_ARCH_S390
 
+/*
+ * Size for s390x ELF notes per CPU
+ *
+ * Seven notes plus zero note at the end: prstatus, fpregset, timer,
+ * tod_cmp, tod_reg, control regs, and prefix
+ */
+#define KEXEC_NOTE_BYTES \
+        (ALIGN(sizeof(struct elf_note), 4) * 8 + \
+         ALIGN(sizeof("CORE"), 4) * 7 + \
+         ALIGN(sizeof(struct elf_prstatus), 4) + \
+         ALIGN(sizeof(elf_fpregset_t), 4) + \
+         ALIGN(sizeof(u64), 4) + \
+         ALIGN(sizeof(u64), 4) + \
+         ALIGN(sizeof(u32), 4) + \
+         ALIGN(sizeof(u64) * 16, 4) + \
+         ALIGN(sizeof(u32), 4) \
+        )
+
 /* Provide a dummy definition to avoid build failures. */
 static inline void crash_setup_regs(struct pt_regs *newregs,
                                         struct pt_regs *oldregs) { }
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 18c51df9fe06..ff605a39cf43 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -662,7 +662,7 @@ ENTRY(sys32_getresuid16_wrapper)
 ENTRY(sys32_poll_wrapper)
         llgtr   %r2,%r2                 # struct pollfd *
         llgfr   %r3,%r3                 # unsigned int
-        lgfr    %r4,%r4                 # long
+        lgfr    %r4,%r4                 # int
         jg      sys_poll                # branch to system call
 
 ENTRY(sys32_setresgid16_wrapper)
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 3201ae447990..4261aa799774 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -76,7 +76,6 @@ static void default_idle(void)
         if (test_thread_flag(TIF_MCCK_PENDING)) {
                 local_mcck_enable();
                 local_irq_enable();
-                s390_handle_mcck();
                 return;
         }
         trace_hardirqs_on();
@@ -93,10 +92,12 @@ void cpu_idle(void)
         for (;;) {
                 tick_nohz_idle_enter();
                 rcu_idle_enter();
-                while (!need_resched())
+                while (!need_resched() && !test_thread_flag(TIF_MCCK_PENDING))
                         default_idle();
                 rcu_idle_exit();
                 tick_nohz_idle_exit();
+                if (test_thread_flag(TIF_MCCK_PENDING))
+                        s390_handle_mcck();
                 preempt_enable_no_resched();
                 schedule();
                 preempt_disable();
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index fa02f443f5f6..14da278febbf 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -113,11 +113,14 @@ static void fixup_clock_comparator(unsigned long long delta)
 static int s390_next_ktime(ktime_t expires,
                            struct clock_event_device *evt)
 {
+        struct timespec ts;
         u64 nsecs;
 
-        nsecs = ktime_to_ns(ktime_sub(expires, ktime_get_monotonic_offset()));
+        ts.tv_sec = ts.tv_nsec = 0;
+        monotonic_to_bootbased(&ts);
+        nsecs = ktime_to_ns(ktime_add(timespec_to_ktime(ts), expires));
         do_div(nsecs, 125);
-        S390_lowcore.clock_comparator = TOD_UNIX_EPOCH + (nsecs << 9);
+        S390_lowcore.clock_comparator = sched_clock_base_cc + (nsecs << 9);
         set_clock_comparator(S390_lowcore.clock_comparator);
         return 0;
 }
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index e4c79ebb40e6..21109c63eb12 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -9,12 +9,12 @@
 #ifndef CONFIG_64BIT
 OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390")
 OUTPUT_ARCH(s390)
-ENTRY(_start)
+ENTRY(startup)
 jiffies = jiffies_64 + 4;
 #else
 OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390")
 OUTPUT_ARCH(s390:64-bit)
-ENTRY(_start)
+ENTRY(startup)
 jiffies = jiffies_64;
 #endif
 
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 9a4d02f64f16..51b0738e13d1 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -574,7 +574,7 @@ static inline void page_table_free_pgste(unsigned long *table)
         page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
         mp = (struct gmap_pgtable *) page->index;
         BUG_ON(!list_empty(&mp->mapper));
-        pgtable_page_ctor(page);
+        pgtable_page_dtor(page);
         atomic_set(&page->_mapcount, -1);
         kfree(mp);
         __free_page(page);
diff --git a/arch/score/kernel/entry.S b/arch/score/kernel/entry.S
index 577abba3fac6..83bb96079c43 100644
--- a/arch/score/kernel/entry.S
+++ b/arch/score/kernel/entry.S
@@ -408,7 +408,7 @@ ENTRY(handle_sys)
         sw      r9, [r0, PT_EPC]
 
         cmpi.c  r27, __NR_syscalls      # check syscall number
-        bgtu    illegal_syscall
+        bgeu    illegal_syscall
 
         slli    r8, r27, 2              # get syscall routine
         la      r11, sys_call_table
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 3c8db65c89e5..713fb58ca507 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -859,6 +859,7 @@ config PCI
         depends on SYS_SUPPORTS_PCI
         select PCI_DOMAINS
         select GENERIC_PCI_IOMAP
+        select NO_GENERIC_PCI_IOPORT_MAP
         help
           Find out whether you have a PCI motherboard. PCI is the name of a
           bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c
index 0838154dd216..24b1ee410daa 100644
--- a/arch/sh/boards/board-sh7757lcr.c
+++ b/arch/sh/boards/board-sh7757lcr.c
@@ -169,6 +169,11 @@ static struct resource sh_eth_giga1_resources[] = {
                 .end    = 0xfee00fff,
                 .flags  = IORESOURCE_MEM,
         }, {
+                /* TSU */
+                .start  = 0xfee01800,
+                .end    = 0xfee01fff,
+                .flags  = IORESOURCE_MEM,
+        }, {
                 .start  = 316,
                 .end    = 316,
                 .flags  = IORESOURCE_IRQ,
@@ -210,20 +215,13 @@ static struct resource sh_mmcif_resources[] = {
         },
 };
 
-static struct sh_mmcif_dma sh7757lcr_mmcif_dma = {
-        .chan_priv_tx   = {
-                .slave_id = SHDMA_SLAVE_MMCIF_TX,
-        },
-        .chan_priv_rx   = {
-                .slave_id = SHDMA_SLAVE_MMCIF_RX,
-        }
-};
-
 static struct sh_mmcif_plat_data sh_mmcif_plat = {
-        .dma            = &sh7757lcr_mmcif_dma,
         .sup_pclk       = 0x0f,
-        .caps           = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
+        .caps           = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA |
+                          MMC_CAP_NONREMOVABLE,
         .ocr            = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .slave_id_tx    = SHDMA_SLAVE_MMCIF_TX,
+        .slave_id_rx    = SHDMA_SLAVE_MMCIF_RX,
 };
 
 static struct platform_device sh_mmcif_device = {
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 6418e95c2b6b..ebd0f818a25f 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -22,6 +22,7 @@
 #include <linux/i2c.h>
 #include <linux/smsc911x.h>
 #include <linux/gpio.h>
+#include <linux/videodev2.h>
 #include <media/ov772x.h>
 #include <media/soc_camera.h>
 #include <media/soc_camera_platform.h>
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 033ef2ba621f..cde7c0085ced 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -29,9 +29,11 @@
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/sh_eth.h>
+#include <linux/videodev2.h>
 #include <video/sh_mobile_lcdc.h>
 #include <sound/sh_fsi.h>
 #include <media/sh_mobile_ceu.h>
+#include <media/soc_camera.h>
 #include <media/tw9910.h>
 #include <media/mt9t112.h>
 #include <asm/heartbeat.h>
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 2a18b06abdaf..5b382e1afaea 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -22,6 +22,7 @@
 #include <linux/input/sh_keysc.h>
 #include <linux/i2c.h>
 #include <linux/usb/r8a66597.h>
+#include <linux/videodev2.h>
 #include <media/rj54n1cb0c.h>
 #include <media/soc_camera.h>
 #include <media/sh_mobile_ceu.h>
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 68c3d6f42896..d37ba2720527 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -21,9 +21,11 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/gpio.h>
+#include <linux/videodev2.h>
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
 #include <media/ov772x.h>
+#include <media/soc_camera.h>
 #include <media/tw9910.h>
 #include <asm/clock.h>
 #include <asm/machvec.h>
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 036fe1adaef1..2b07fc016950 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -24,6 +24,7 @@
 #include <linux/input/sh_keysc.h>
 #include <linux/usb/r8a66597.h>
 #include <linux/sh_eth.h>
+#include <linux/videodev2.h>
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
 #include <sound/sh_fsi.h>
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index fa7b978cc727..fb8f14990743 100644
--- a/arch/sh/drivers/pci/pci-sh7780.c
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -74,7 +74,7 @@ struct pci_errors {
         { SH4_PCIINT_MLCK,      "master lock error" },
         { SH4_PCIINT_TABT,      "target-target abort" },
         { SH4_PCIINT_TRET,      "target retry time out" },
-        { SH4_PCIINT_MFDE,      "master function disable erorr" },
+        { SH4_PCIINT_MFDE,      "master function disable error" },
         { SH4_PCIINT_PRTY,      "address parity error" },
         { SH4_PCIINT_SERR,      "SERR" },
         { SH4_PCIINT_TWDP,      "data parity error for target write" },
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 8f18dd090a66..1e7b0e2e764d 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -356,8 +356,8 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 
 #ifndef CONFIG_GENERIC_IOMAP
 
-static void __iomem *ioport_map_pci(struct pci_dev *dev,
-                                    unsigned long port, unsigned int nr)
+void __iomem *__pci_ioport_map(struct pci_dev *dev,
+                               unsigned long port, unsigned int nr)
 {
         struct pci_channel *chan = dev->sysdata;
 
diff --git a/arch/sh/include/asm/device.h b/arch/sh/include/asm/device.h
index a1c9c0daec10..071bcb4d4bfd 100644
--- a/arch/sh/include/asm/device.h
+++ b/arch/sh/include/asm/device.h
@@ -3,9 +3,10 @@
  *
  * This file is released under the GPLv2
  */
+#ifndef __ASM_SH_DEVICE_H
+#define __ASM_SH_DEVICE_H
 
-struct dev_archdata {
-};
+#include <asm-generic/device.h>
 
 struct platform_device;
 /* allocate contiguous memory chunk and fill in struct resource */
@@ -14,5 +15,4 @@ int platform_resource_setup_memory(struct platform_device *pdev,
 
 void plat_early_device_setup(void);
 
-struct pdev_archdata {
-};
+#endif /* __ASM_SH_DEVICE_H */
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
index b3c039a5064a..70bd96646f42 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
@@ -343,7 +343,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("sh_mobile_ceu.1", &mstp_clks[HWBLK_CEU1]),
         CLKDEV_CON_ID("beu1", &mstp_clks[HWBLK_BEU1]),
         CLKDEV_CON_ID("2ddmac0", &mstp_clks[HWBLK_2DDMAC]),
-        CLKDEV_CON_ID("spu0", &mstp_clks[HWBLK_SPU]),
+        CLKDEV_DEV_ID("sh_fsi.0", &mstp_clks[HWBLK_SPU]),
         CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]),
         CLKDEV_DEV_ID("sh-vou.0", &mstp_clks[HWBLK_VOU]),
         CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU0]),
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index a7b2da6b3a1a..2875e8be4f72 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -133,7 +133,7 @@ static struct resource spi0_resources[] = {
         [0] = {
                 .start  = 0xfe002000,
                 .end    = 0xfe0020ff,
-                .flags  = IORESOURCE_MEM,
+                .flags  = IORESOURCE_MEM | IORESOURCE_MEM_32BIT,
         },
         [1] = {
                 .start  = 86,
@@ -661,6 +661,25 @@ static struct platform_device spi0_device = {
         .resource       = spi0_resources,
 };
 
+static struct resource spi1_resources[] = {
+        {
+                .start  = 0xffd8ee70,
+                .end    = 0xffd8eeff,
+                .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8BIT,
+        },
+        {
+                .start  = 54,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device spi1_device = {
+        .name   = "sh_spi",
+        .id     = 1,
+        .num_resources  = ARRAY_SIZE(spi1_resources),
+        .resource       = spi1_resources,
+};
+
 static struct resource usb_ehci_resources[] = {
         [0] = {
                 .start  = 0xfe4f1000,
@@ -720,6 +739,7 @@ static struct platform_device *sh7757_devices[] __initdata = {
         &dma2_device,
         &dma3_device,
         &spi0_device,
+        &spi1_device,
         &usb_ehci_device,
         &usb_ohci_device,
 };
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 3147a9a6fb8b..f624174bf239 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -63,7 +63,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         mp_ops->prepare_cpus(max_cpus);
 
 #ifndef CONFIG_HOTPLUG_CPU
-        init_cpu_present(&cpu_possible_map);
+        init_cpu_present(cpu_possible_mask);
 #endif
 }
 
diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c
index 4649a6ff0cfe..772caffba22f 100644
--- a/arch/sh/kernel/topology.c
+++ b/arch/sh/kernel/topology.c
@@ -27,7 +27,7 @@ static cpumask_t cpu_coregroup_map(unsigned int cpu)
          * Presently all SH-X3 SMP cores are multi-cores, so just keep it
          * simple until we have a method for determining topology..
          */
-        return cpu_possible_map;
+        return *cpu_possible_mask;
 }
 
 const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
diff --git a/arch/sh/mm/cache-sh2a.c b/arch/sh/mm/cache-sh2a.c
index ae08cbbfa569..949e2d3138a0 100644
--- a/arch/sh/mm/cache-sh2a.c
+++ b/arch/sh/mm/cache-sh2a.c
@@ -23,6 +23,7 @@
 #define MAX_OCACHE_PAGES        32
 #define MAX_ICACHE_PAGES        32
 
+#ifdef CONFIG_CACHE_WRITEBACK
 static void sh2a_flush_oc_line(unsigned long v, int way)
 {
         unsigned long addr = (v & 0x000007f0) | (way << 11);
@@ -34,6 +35,7 @@ static void sh2a_flush_oc_line(unsigned long v, int way)
                 __raw_writel(data, CACHE_OC_ADDRESS_ARRAY | addr);
         }
 }
+#endif
 
 static void sh2a_invalidate_line(unsigned long cache_addr, unsigned long v)
 {
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 96657992a72e..ca5580e4d813 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -33,6 +33,7 @@ config SPARC
 config SPARC32
         def_bool !64BIT
         select GENERIC_ATOMIC64
+        select CLZ_TAB
 
 config SPARC64
         def_bool 64BIT
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c
index 422c16dad1f6..e61165161dd3 100644
--- a/arch/sparc/kernel/sun4m_irq.c
+++ b/arch/sparc/kernel/sun4m_irq.c
@@ -399,6 +399,9 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn)
         timers_global = (void __iomem *)
                 (unsigned long) addr[num_cpu_timers];
 
+        /* Every per-cpu timer works in timer mode */
+        sbus_writel(0x00000000, &timers_global->timer_config);
+
         sbus_writel((((1000000/HZ) + 1) << 10), &timers_global->l10_limit);
 
         master_l10_counter = &timers_global->l10_count;
diff --git a/arch/sparc/lib/divdi3.S b/arch/sparc/lib/divdi3.S
index 681b3683da9e..d74bc0925f2d 100644
--- a/arch/sparc/lib/divdi3.S
+++ b/arch/sparc/lib/divdi3.S
@@ -17,23 +17,9 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-        .data
-        .align 8
-        .globl  __clz_tab
-__clz_tab:
-        .byte   0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-        .byte   6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6
-        .byte   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
-        .byte   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
-        .byte   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
-        .byte   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
-        .byte   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
-        .byte   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
-        .size    __clz_tab,256
-        .global .udiv
-
         .text
         .align 4
+        .global .udiv
         .globl __divdi3
 __divdi3:
         save %sp,-104,%sp
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 864cc6e6ac8e..5bed94e189fa 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -360,7 +360,6 @@ config X86_NUMACHIP
         depends on NUMA
         depends on SMP
         depends on X86_X2APIC
-        depends on !EDAC_AMD64
         ---help---
           Adds support for Numascale NumaChip large-SMP systems. Needed to
           enable more than ~168 cores.
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 3a19d04cebeb..7116dcba0c9e 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -321,6 +321,8 @@ static void parse_elf(void *output)
                 default: /* Ignore other PT_* */ break;
                 }
         }
+
+        free(phdrs);
 }
 
 asmlinkage void decompress_kernel(void *rmode, memptr heap,
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
index 0c9fa2745f13..b3b733262909 100644
--- a/arch/x86/include/asm/cmpxchg.h
+++ b/arch/x86/include/asm/cmpxchg.h
@@ -145,13 +145,13 @@ extern void __add_wrong_size(void)
 
 #ifdef __HAVE_ARCH_CMPXCHG
 #define cmpxchg(ptr, old, new)                                          \
-        __cmpxchg((ptr), (old), (new), sizeof(*ptr))
+        __cmpxchg(ptr, old, new, sizeof(*(ptr)))
 
 #define sync_cmpxchg(ptr, old, new)                                     \
-        __sync_cmpxchg((ptr), (old), (new), sizeof(*ptr))
+        __sync_cmpxchg(ptr, old, new, sizeof(*(ptr)))
 
 #define cmpxchg_local(ptr, old, new)                                    \
-        __cmpxchg_local((ptr), (old), (new), sizeof(*ptr))
+        __cmpxchg_local(ptr, old, new, sizeof(*(ptr)))
 #endif
 
 /*
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 17c5d4bdee5e..8d67d428b0f9 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -159,6 +159,7 @@
 #define X86_FEATURE_WDT         (6*32+13) /* Watchdog timer */
 #define X86_FEATURE_LWP         (6*32+15) /* Light Weight Profiling */
 #define X86_FEATURE_FMA4        (6*32+16) /* 4 operands MAC instructions */
+#define X86_FEATURE_TCE         (6*32+17) /* translation cache extension */
 #define X86_FEATURE_NODEID_MSR  (6*32+19) /* NodeId MSR */
 #define X86_FEATURE_TBM         (6*32+21) /* trailing bit manipulations */
 #define X86_FEATURE_TOPOEXT     (6*32+22) /* topology extensions CPUID leafs */
diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
index 6919e936345b..247904945d3f 100644
--- a/arch/x86/include/asm/i387.h
+++ b/arch/x86/include/asm/i387.h
@@ -29,10 +29,11 @@ extern unsigned int sig_xstate_size;
 extern void fpu_init(void);
 extern void mxcsr_feature_mask_init(void);
 extern int init_fpu(struct task_struct *child);
-extern asmlinkage void math_state_restore(void);
-extern void __math_state_restore(void);
+extern void math_state_restore(void);
 extern int dump_fpu(struct pt_regs *, struct user_i387_struct *);
 
+DECLARE_PER_CPU(struct task_struct *, fpu_owner_task);
+
 extern user_regset_active_fn fpregs_active, xfpregs_active;
 extern user_regset_get_fn fpregs_get, xfpregs_get, fpregs_soft_get,
                                 xstateregs_get;
@@ -212,19 +213,11 @@ static inline void fpu_fxsave(struct fpu *fpu)
 
 #endif  /* CONFIG_X86_64 */
 
-/* We need a safe address that is cheap to find and that is already
-   in L1 during context switch. The best choices are unfortunately
-   different for UP and SMP */
-#ifdef CONFIG_SMP
-#define safe_address (__per_cpu_offset[0])
-#else
-#define safe_address (__get_cpu_var(kernel_cpustat).cpustat[CPUTIME_USER])
-#endif
-
 /*
- * These must be called with preempt disabled
+ * These must be called with preempt disabled. Returns
+ * 'true' if the FPU state is still intact.
  */
-static inline void fpu_save_init(struct fpu *fpu)
+static inline int fpu_save_init(struct fpu *fpu)
 {
         if (use_xsave()) {
                 fpu_xsave(fpu);
@@ -233,33 +226,33 @@ static inline void fpu_save_init(struct fpu *fpu)
                  * xsave header may indicate the init state of the FP.
                  */
                 if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
-                        return;
+                        return 1;
         } else if (use_fxsr()) {
                 fpu_fxsave(fpu);
         } else {
                 asm volatile("fnsave %[fx]; fwait"
                              : [fx] "=m" (fpu->state->fsave));
-                return;
+                return 0;
         }
 
-        if (unlikely(fpu->state->fxsave.swd & X87_FSW_ES))
+        /*
+         * If exceptions are pending, we need to clear them so
+         * that we don't randomly get exceptions later.
+         *
+         * FIXME! Is this perhaps only true for the old-style
+         * irq13 case? Maybe we could leave the x87 state
+         * intact otherwise?
+         */
+        if (unlikely(fpu->state->fxsave.swd & X87_FSW_ES)) {
                 asm volatile("fnclex");
-
-        /* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
-           is pending.  Clear the x87 state here by setting it to fixed
-           values. safe_address is a random variable that should be in L1 */
-        alternative_input(
-                ASM_NOP8 ASM_NOP2,
-                "emms\n\t"              /* clear stack tags */
-                "fildl %P[addr]",       /* set F?P to defined value */
-                X86_FEATURE_FXSAVE_LEAK,
-                [addr] "m" (safe_address));
+                return 0;
+        }
+        return 1;
 }
 
-static inline void __save_init_fpu(struct task_struct *tsk)
+static inline int __save_init_fpu(struct task_struct *tsk)
 {
-        fpu_save_init(&tsk->thread.fpu);
-        task_thread_info(tsk)->status &= ~TS_USEDFPU;
+        return fpu_save_init(&tsk->thread.fpu);
 }
 
 static inline int fpu_fxrstor_checking(struct fpu *fpu)
@@ -277,44 +270,212 @@ static inline int fpu_restore_checking(struct fpu *fpu)
 
 static inline int restore_fpu_checking(struct task_struct *tsk)
 {
+        /* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
+           is pending.  Clear the x87 state here by setting it to fixed
+           values. "m" is a random variable that should be in L1 */
+        alternative_input(
+                ASM_NOP8 ASM_NOP2,
+                "emms\n\t"              /* clear stack tags */
+                "fildl %P[addr]",       /* set F?P to defined value */
+                X86_FEATURE_FXSAVE_LEAK,
+                [addr] "m" (tsk->thread.fpu.has_fpu));
+
         return fpu_restore_checking(&tsk->thread.fpu);
 }
 
 /*
- * Signal frame handlers...
+ * Software FPU state helpers. Careful: these need to
+ * be preemption protection *and* they need to be
+ * properly paired with the CR0.TS changes!
  */
-extern int save_i387_xstate(void __user *buf);
-extern int restore_i387_xstate(void __user *buf);
+static inline int __thread_has_fpu(struct task_struct *tsk)
+{
+        return tsk->thread.fpu.has_fpu;
+}
 
-static inline void __unlazy_fpu(struct task_struct *tsk)
+/* Must be paired with an 'stts' after! */
+static inline void __thread_clear_has_fpu(struct task_struct *tsk)
 {
-        if (task_thread_info(tsk)->status & TS_USEDFPU) {
-                __save_init_fpu(tsk);
-                stts();
-        } else
-                tsk->fpu_counter = 0;
+        tsk->thread.fpu.has_fpu = 0;
+        percpu_write(fpu_owner_task, NULL);
+}
+
+/* Must be paired with a 'clts' before! */
+static inline void __thread_set_has_fpu(struct task_struct *tsk)
+{
+        tsk->thread.fpu.has_fpu = 1;
+        percpu_write(fpu_owner_task, tsk);
+}
+
+/*
+ * Encapsulate the CR0.TS handling together with the
+ * software flag.
+ *
+ * These generally need preemption protection to work,
+ * do try to avoid using these on their own.
+ */
+static inline void __thread_fpu_end(struct task_struct *tsk)
+{
+        __thread_clear_has_fpu(tsk);
+        stts();
+}
+
+static inline void __thread_fpu_begin(struct task_struct *tsk)
+{
+        clts();
+        __thread_set_has_fpu(tsk);
+}
+
+/*
+ * FPU state switching for scheduling.
+ *
+ * This is a two-stage process:
+ *
+ *  - switch_fpu_prepare() saves the old state and
+ *    sets the new state of the CR0.TS bit. This is
+ *    done within the context of the old process.
+ *
+ *  - switch_fpu_finish() restores the new state as
+ *    necessary.
+ */
+typedef struct { int preload; } fpu_switch_t;
+
+/*
+ * FIXME! We could do a totally lazy restore, but we need to
+ * add a per-cpu "this was the task that last touched the FPU
+ * on this CPU" variable, and the task needs to have a "I last
+ * touched the FPU on this CPU" and check them.
+ *
+ * We don't do that yet, so "fpu_lazy_restore()" always returns
+ * false, but some day..
+ */
+static inline int fpu_lazy_restore(struct task_struct *new, unsigned int cpu)
+{
+        return new == percpu_read_stable(fpu_owner_task) &&
+                cpu == new->thread.fpu.last_cpu;
+}
+
+static inline fpu_switch_t switch_fpu_prepare(struct task_struct *old, struct task_struct *new, int cpu)
+{
+        fpu_switch_t fpu;
+
+        fpu.preload = tsk_used_math(new) && new->fpu_counter > 5;
+        if (__thread_has_fpu(old)) {
+                if (!__save_init_fpu(old))
+                        cpu = ~0;
+                old->thread.fpu.last_cpu = cpu;
+                old->thread.fpu.has_fpu = 0;    /* But leave fpu_owner_task! */
+
+                /* Don't change CR0.TS if we just switch! */
+                if (fpu.preload) {
+                        new->fpu_counter++;
+                        __thread_set_has_fpu(new);
+                        prefetch(new->thread.fpu.state);
+                } else
+                        stts();
+        } else {
+                old->fpu_counter = 0;
+                old->thread.fpu.last_cpu = ~0;
+                if (fpu.preload) {
+                        new->fpu_counter++;
+                        if (fpu_lazy_restore(new, cpu))
+                                fpu.preload = 0;
+                        else
+                                prefetch(new->thread.fpu.state);
+                        __thread_fpu_begin(new);
+                }
+        }
+        return fpu;
+}
+
+/*
+ * By the time this gets called, we've already cleared CR0.TS and
+ * given the process the FPU if we are going to preload the FPU
+ * state - all we need to do is to conditionally restore the register
+ * state itself.
+ */
+static inline void switch_fpu_finish(struct task_struct *new, fpu_switch_t fpu)
+{
+        if (fpu.preload) {
+                if (unlikely(restore_fpu_checking(new)))
+                        __thread_fpu_end(new);
+        }
 }
 
+/*
+ * Signal frame handlers...
+ */
+extern int save_i387_xstate(void __user *buf);
+extern int restore_i387_xstate(void __user *buf);
+
 static inline void __clear_fpu(struct task_struct *tsk)
 {
-        if (task_thread_info(tsk)->status & TS_USEDFPU) {
+        if (__thread_has_fpu(tsk)) {
                 /* Ignore delayed exceptions from user space */
                 asm volatile("1: fwait\n"
                              "2:\n"
                              _ASM_EXTABLE(1b, 2b));
-                task_thread_info(tsk)->status &= ~TS_USEDFPU;
-                stts();
+                __thread_fpu_end(tsk);
         }
 }
 
+/*
+ * Were we in an interrupt that interrupted kernel mode?
+ *
+ * We can do a kernel_fpu_begin/end() pair *ONLY* if that
+ * pair does nothing at all: the thread must not have fpu (so
+ * that we don't try to save the FPU state), and TS must
+ * be set (so that the clts/stts pair does nothing that is
+ * visible in the interrupted kernel thread).
+ */
+static inline bool interrupted_kernel_fpu_idle(void)
+{
+        return !__thread_has_fpu(current) &&
+                (read_cr0() & X86_CR0_TS);
+}
+
+/*
+ * Were we in user mode (or vm86 mode) when we were
+ * interrupted?
+ *
+ * Doing kernel_fpu_begin/end() is ok if we are running
+ * in an interrupt context from user mode - we'll just
+ * save the FPU state as required.
+ */
+static inline bool interrupted_user_mode(void)
+{
+        struct pt_regs *regs = get_irq_regs();
+        return regs && user_mode_vm(regs);
+}
+
+/*
+ * Can we use the FPU in kernel mode with the
+ * whole "kernel_fpu_begin/end()" sequence?
+ *
+ * It's always ok in process context (ie "not interrupt")
+ * but it is sometimes ok even from an irq.
+ */
+static inline bool irq_fpu_usable(void)
+{
+        return !in_interrupt() ||
+                interrupted_user_mode() ||
+                interrupted_kernel_fpu_idle();
+}
+
 static inline void kernel_fpu_begin(void)
 {
-        struct thread_info *me = current_thread_info();
+        struct task_struct *me = current;
+
+        WARN_ON_ONCE(!irq_fpu_usable());
         preempt_disable();
-        if (me->status & TS_USEDFPU)
-                __save_init_fpu(me->task);
-        else
+        if (__thread_has_fpu(me)) {
+                __save_init_fpu(me);
+                __thread_clear_has_fpu(me);
+                /* We do 'stts()' in kernel_fpu_end() */
+        } else {
+                percpu_write(fpu_owner_task, NULL);
                 clts();
+        }
 }
 
 static inline void kernel_fpu_end(void)
@@ -323,14 +484,6 @@ static inline void kernel_fpu_end(void)
         preempt_enable();
 }
 
-static inline bool irq_fpu_usable(void)
-{
-        struct pt_regs *regs;
-
-        return !in_interrupt() || !(regs = get_irq_regs()) || \
-                user_mode(regs) || (read_cr0() & X86_CR0_TS);
-}
-
 /*
  * Some instructions like VIA's padlock instructions generate a spurious
  * DNA fault but don't modify SSE registers. And these instructions
@@ -363,20 +516,64 @@ static inline void irq_ts_restore(int TS_state)
 }
 
 /*
+ * The question "does this thread have fpu access?"
+ * is slightly racy, since preemption could come in
+ * and revoke it immediately after the test.
+ *
+ * However, even in that very unlikely scenario,
+ * we can just assume we have FPU access - typically
+ * to save the FP state - we'll just take a #NM
+ * fault and get the FPU access back.
+ *
+ * The actual user_fpu_begin/end() functions
+ * need to be preemption-safe, though.
+ *
+ * NOTE! user_fpu_end() must be used only after you
+ * have saved the FP state, and user_fpu_begin() must
+ * be used only immediately before restoring it.
+ * These functions do not do any save/restore on
+ * their own.
+ */
+static inline int user_has_fpu(void)
+{
+        return __thread_has_fpu(current);
+}
+
+static inline void user_fpu_end(void)
+{
+        preempt_disable();
+        __thread_fpu_end(current);
+        preempt_enable();
+}
+
+static inline void user_fpu_begin(void)
+{
+        preempt_disable();
+        if (!user_has_fpu())
+                __thread_fpu_begin(current);
+        preempt_enable();
+}
+
+/*
  * These disable preemption on their own and are safe
  */
 static inline void save_init_fpu(struct task_struct *tsk)
 {
+        WARN_ON_ONCE(!__thread_has_fpu(tsk));
         preempt_disable();
         __save_init_fpu(tsk);
-        stts();
+        __thread_fpu_end(tsk);
         preempt_enable();
 }
 
 static inline void unlazy_fpu(struct task_struct *tsk)
 {
         preempt_disable();
-        __unlazy_fpu(tsk);
+        if (__thread_has_fpu(tsk)) {
+                __save_init_fpu(tsk);
+                __thread_fpu_end(tsk);
+        } else
+                tsk->fpu_counter = 0;
         preempt_enable();
 }
 
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index ab4092e3214e..7b9cfc4878af 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -190,6 +190,9 @@ struct x86_emulate_ops {
         int (*intercept)(struct x86_emulate_ctxt *ctxt,
                          struct x86_instruction_info *info,
                          enum x86_intercept_stage stage);
+
+        bool (*get_cpuid)(struct x86_emulate_ctxt *ctxt,
+                         u32 *eax, u32 *ebx, u32 *ecx, u32 *edx);
 };
 
 typedef u32 __attribute__((vector_size(16))) sse128_t;
@@ -298,6 +301,19 @@ struct x86_emulate_ctxt {
 #define X86EMUL_MODE_PROT     (X86EMUL_MODE_PROT16|X86EMUL_MODE_PROT32| \
                                X86EMUL_MODE_PROT64)
 
+/* CPUID vendors */
+#define X86EMUL_CPUID_VENDOR_AuthenticAMD_ebx 0x68747541
+#define X86EMUL_CPUID_VENDOR_AuthenticAMD_ecx 0x444d4163
+#define X86EMUL_CPUID_VENDOR_AuthenticAMD_edx 0x69746e65
+
+#define X86EMUL_CPUID_VENDOR_AMDisbetterI_ebx 0x69444d41
+#define X86EMUL_CPUID_VENDOR_AMDisbetterI_ecx 0x21726574
+#define X86EMUL_CPUID_VENDOR_AMDisbetterI_edx 0x74656273
+
+#define X86EMUL_CPUID_VENDOR_GenuineIntel_ebx 0x756e6547
+#define X86EMUL_CPUID_VENDOR_GenuineIntel_ecx 0x6c65746e
+#define X86EMUL_CPUID_VENDOR_GenuineIntel_edx 0x49656e69
+
 enum x86_intercept_stage {
         X86_ICTP_NONE = 0,   /* Allow zero-init to not match anything */
         X86_ICPT_PRE_EXCEPT,
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index aa9088c26931..58545c97d071 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -374,6 +374,8 @@ union thread_xstate {
 };
 
 struct fpu {
+        unsigned int last_cpu;
+        unsigned int has_fpu;
         union thread_xstate *state;
 };
 
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index bc817cd8b443..cfd8144d5527 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -247,8 +247,6 @@ static inline struct thread_info *current_thread_info(void)
  * ever touches our thread-synchronous status, so we don't
  * have to worry about atomic accesses.
  */
-#define TS_USEDFPU              0x0001  /* FPU was used by this task
-                                           this quantum (SMP) */
 #define TS_COMPAT               0x0002  /* 32bit syscall active (64BIT)*/
 #define TS_POLLING              0x0004  /* idle task polling need_resched,
                                            skip sending interrupt */
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index 54a13aaebc40..21f7385badb8 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -318,13 +318,13 @@ uv_gpa_in_mmr_space(unsigned long gpa)
 /* UV global physical address --> socket phys RAM */
 static inline unsigned long uv_gpa_to_soc_phys_ram(unsigned long gpa)
 {
-        unsigned long paddr = gpa & uv_hub_info->gpa_mask;
+        unsigned long paddr;
         unsigned long remap_base = uv_hub_info->lowmem_remap_base;
         unsigned long remap_top =  uv_hub_info->lowmem_remap_top;
 
         gpa = ((gpa << uv_hub_info->m_shift) >> uv_hub_info->m_shift) |
                 ((gpa >> uv_hub_info->n_lshift) << uv_hub_info->m_val);
-        gpa = gpa & uv_hub_info->gpa_mask;
+        paddr = gpa & uv_hub_info->gpa_mask;
         if (paddr >= remap_base && paddr < remap_base + remap_top)
                 paddr -= remap_base;
         return paddr;
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index d43cad74f166..c0f7d68d318f 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1044,6 +1044,9 @@ DEFINE_PER_CPU(char *, irq_stack_ptr) =
 
 DEFINE_PER_CPU(unsigned int, irq_count) = -1;
 
+DEFINE_PER_CPU(struct task_struct *, fpu_owner_task);
+EXPORT_PER_CPU_SYMBOL(fpu_owner_task);
+
 /*
  * Special IST stacks which the CPU switches to when it calls
  * an IST-marked descriptor entry. Up to 7 stacks (hardware
@@ -1111,6 +1114,8 @@ void debug_stack_reset(void)
 
 DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task;
 EXPORT_PER_CPU_SYMBOL(current_task);
+DEFINE_PER_CPU(struct task_struct *, fpu_owner_task);
+EXPORT_PER_CPU_SYMBOL(fpu_owner_task);
 
 #ifdef CONFIG_CC_STACKPROTECTOR
 DEFINE_PER_CPU_ALIGNED(struct stack_canary, stack_canary);
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c
index 73da6b64f5b7..d6bd49faa40c 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -439,7 +439,6 @@ void intel_pmu_pebs_enable(struct perf_event *event)
         hwc->config &= ~ARCH_PERFMON_EVENTSEL_INT;
 
         cpuc->pebs_enabled |= 1ULL << hwc->idx;
-        WARN_ON_ONCE(cpuc->enabled);
 
         if (x86_pmu.intel_cap.pebs_trap && event->attr.precise_ip > 1)
                 intel_pmu_lbr_enable(event);
diff --git a/arch/x86/kernel/cpu/perf_event_intel_lbr.c b/arch/x86/kernel/cpu/perf_event_intel_lbr.c
index 3fab3de3ce96..47a7e63bfe54 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_lbr.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_lbr.c
@@ -72,8 +72,6 @@ void intel_pmu_lbr_enable(struct perf_event *event)
         if (!x86_pmu.lbr_nr)
                 return;
 
-        WARN_ON_ONCE(cpuc->enabled);
-
         /*
          * Reset the LBR stack if we changed task context to
          * avoid data leaks.
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 1aae78f775fc..4025fe4f928f 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -252,7 +252,8 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
         unsigned short ss;
         unsigned long sp;
 #endif
-        printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
+        printk(KERN_DEFAULT
+               "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
         printk("PREEMPT ");
 #endif
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index 6d728d9284bd..17107bd6e1f0 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -129,7 +129,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
         if (!stack) {
                 if (regs)
                         stack = (unsigned long *)regs->sp;
-                else if (task && task != current)
+                else if (task != current)
                         stack = (unsigned long *)task->thread.sp;
                 else
                         stack = &dummy;
@@ -269,11 +269,11 @@ void show_registers(struct pt_regs *regs)
                 unsigned char c;
                 u8 *ip;
 
-                printk(KERN_EMERG "Stack:\n");
+                printk(KERN_DEFAULT "Stack:\n");
                 show_stack_log_lvl(NULL, regs, (unsigned long *)sp,
-                                   0, KERN_EMERG);
+                                   0, KERN_DEFAULT);
 
-                printk(KERN_EMERG "Code: ");
+                printk(KERN_DEFAULT "Code: ");
 
                 ip = (u8 *)regs->ip - code_prologue;
                 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index fe86493f3ed1..ac0417be9131 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -311,13 +311,33 @@ out:
         return state;
 }
 
+/*
+ * AMD microcode firmware naming convention, up to family 15h they are in
+ * the legacy file:
+ *
+ *    amd-ucode/microcode_amd.bin
+ *
+ * This legacy file is always smaller than 2K in size.
+ *
+ * Starting at family 15h they are in family specific firmware files:
+ *
+ *    amd-ucode/microcode_amd_fam15h.bin
+ *    amd-ucode/microcode_amd_fam16h.bin
+ *    ...
+ *
+ * These might be larger than 2K.
+ */
 static enum ucode_state request_microcode_amd(int cpu, struct device *device)
 {
-        const char *fw_name = "amd-ucode/microcode_amd.bin";
+        char fw_name[36] = "amd-ucode/microcode_amd.bin";
         const struct firmware *fw;
         enum ucode_state ret = UCODE_NFOUND;
+        struct cpuinfo_x86 *c = &cpu_data(cpu);
+
+        if (c->x86 >= 0x15)
+                snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);
 
-        if (request_firmware(&fw, fw_name, device)) {
+        if (request_firmware(&fw, (const char *)fw_name, device)) {
                 pr_err("failed to load file %s\n", fw_name);
                 goto out;
         }
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 485204f58cda..c08d1ff12b7c 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -214,6 +214,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
 
         task_user_gs(p) = get_user_gs(regs);
 
+        p->fpu_counter = 0;
         p->thread.io_bitmap_ptr = NULL;
         tsk = current;
         err = -ENOMEM;
@@ -299,22 +300,11 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
                                  *next = &next_p->thread;
         int cpu = smp_processor_id();
         struct tss_struct *tss = &per_cpu(init_tss, cpu);
-        bool preload_fpu;
+        fpu_switch_t fpu;
 
         /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
 
-        /*
-         * If the task has used fpu the last 5 timeslices, just do a full
-         * restore of the math state immediately to avoid the trap; the
-         * chances of needing FPU soon are obviously high now
-         */
-        preload_fpu = tsk_used_math(next_p) && next_p->fpu_counter > 5;
-
-        __unlazy_fpu(prev_p);
-
-        /* we're going to use this soon, after a few expensive things */
-        if (preload_fpu)
-                prefetch(next->fpu.state);
+        fpu = switch_fpu_prepare(prev_p, next_p, cpu);
 
         /*
          * Reload esp0.
@@ -354,11 +344,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
                      task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT))
                 __switch_to_xtra(prev_p, next_p, tss);
 
-        /* If we're going to preload the fpu context, make sure clts
-           is run while we're batching the cpu state updates. */
-        if (preload_fpu)
-                clts();
-
         /*
          * Leave lazy mode, flushing any hypercalls made here.
          * This must be done before restoring TLS segments so
@@ -368,15 +353,14 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
          */
         arch_end_context_switch(next_p);
 
-        if (preload_fpu)
-                __math_state_restore();
-
         /*
          * Restore %gs if needed (which is common)
          */
         if (prev->gs | next->gs)
                 lazy_load_gs(next->gs);
 
+        switch_fpu_finish(next_p, fpu);
+
         percpu_write(current_task, next_p);
 
         return prev_p;
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 9b9fe4a85c87..cfa5c90c01db 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -286,6 +286,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
 
         set_tsk_thread_flag(p, TIF_FORK);
 
+        p->fpu_counter = 0;
         p->thread.io_bitmap_ptr = NULL;
 
         savesegment(gs, p->thread.gsindex);
@@ -386,18 +387,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
         int cpu = smp_processor_id();
         struct tss_struct *tss = &per_cpu(init_tss, cpu);
         unsigned fsindex, gsindex;
-        bool preload_fpu;
+        fpu_switch_t fpu;
 
-        /*
-         * If the task has used fpu the last 5 timeslices, just do a full
-         * restore of the math state immediately to avoid the trap; the
-         * chances of needing FPU soon are obviously high now
-         */
-        preload_fpu = tsk_used_math(next_p) && next_p->fpu_counter > 5;
-
-        /* we're going to use this soon, after a few expensive things */
-        if (preload_fpu)
-                prefetch(next->fpu.state);
+        fpu = switch_fpu_prepare(prev_p, next_p, cpu);
 
         /*
          * Reload esp0, LDT and the page table pointer:
@@ -427,13 +419,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
 
         load_TLS(next, cpu);
 
-        /* Must be after DS reload */
-        __unlazy_fpu(prev_p);
-
-        /* Make sure cpu is ready for new context */
-        if (preload_fpu)
-                clts();
-
         /*
          * Leave lazy mode, flushing any hypercalls made here.
          * This must be done before restoring TLS segments so
@@ -474,6 +459,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
                 wrmsrl(MSR_KERNEL_GS_BASE, next->gs);
         prev->gsindex = gsindex;
 
+        switch_fpu_finish(next_p, fpu);
+
         /*
          * Switch the PDA and FPU contexts.
          */
@@ -492,13 +479,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
                      task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV))
                 __switch_to_xtra(prev_p, next_p, tss);
 
-        /*
-         * Preload the FPU context, now that we've determined that the
-         * task is likely to be using it. 
-         */
-        if (preload_fpu)
-                __math_state_restore();
-
         return prev_p;
 }
 
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 37a458b521a6..d840e69a853c 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -39,6 +39,14 @@ static int reboot_mode;
 enum reboot_type reboot_type = BOOT_ACPI;
 int reboot_force;
 
+/* This variable is used privately to keep track of whether or not
+ * reboot_type is still set to its default value (i.e., reboot= hasn't
+ * been set on the command line).  This is needed so that we can
+ * suppress DMI scanning for reboot quirks.  Without it, it's
+ * impossible to override a faulty reboot quirk without recompiling.
+ */
+static int reboot_default = 1;
+
 #if defined(CONFIG_X86_32) && defined(CONFIG_SMP)
 static int reboot_cpu = -1;
 #endif
@@ -67,6 +75,12 @@ bool port_cf9_safe = false;
 static int __init reboot_setup(char *str)
 {
         for (;;) {
+                /* Having anything passed on the command line via
+                 * reboot= will cause us to disable DMI checking
+                 * below.
+                 */
+                reboot_default = 0;
+
                 switch (*str) {
                 case 'w':
                         reboot_mode = 0x1234;
@@ -295,14 +309,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
                         DMI_MATCH(DMI_BOARD_NAME, "P4S800"),
                 },
         },
-        {       /* Handle problems with rebooting on VersaLogic Menlow boards */
-                .callback = set_bios_reboot,
-                .ident = "VersaLogic Menlow based board",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "VersaLogic Corporation"),
-                        DMI_MATCH(DMI_BOARD_NAME, "VersaLogic Menlow board"),
-                },
-        },
         { /* Handle reboot issue on Acer Aspire one */
                 .callback = set_kbd_reboot,
                 .ident = "Acer Aspire One A110",
@@ -316,7 +322,12 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
 
 static int __init reboot_init(void)
 {
-        dmi_check_system(reboot_dmi_table);
+        /* Only do the DMI check if reboot_type hasn't been overridden
+         * on the command line
+         */
+        if (reboot_default) {
+                dmi_check_system(reboot_dmi_table);
+        }
         return 0;
 }
 core_initcall(reboot_init);
@@ -465,7 +476,12 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
 
 static int __init pci_reboot_init(void)
 {
-        dmi_check_system(pci_reboot_dmi_table);
+        /* Only do the DMI check if reboot_type hasn't been overridden
+         * on the command line
+         */
+        if (reboot_default) {
+                dmi_check_system(pci_reboot_dmi_table);
+        }
         return 0;
 }
 core_initcall(pci_reboot_init);
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 482ec3af2067..4bbe04d96744 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -571,41 +571,18 @@ asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void)
 }
 
 /*
- * __math_state_restore assumes that cr0.TS is already clear and the
- * fpu state is all ready for use.  Used during context switch.
- */
-void __math_state_restore(void)
-{
-        struct thread_info *thread = current_thread_info();
-        struct task_struct *tsk = thread->task;
-
-        /*
-         * Paranoid restore. send a SIGSEGV if we fail to restore the state.
-         */
-        if (unlikely(restore_fpu_checking(tsk))) {
-                stts();
-                force_sig(SIGSEGV, tsk);
-                return;
-        }
-
-        thread->status |= TS_USEDFPU;   /* So we fnsave on switch_to() */
-        tsk->fpu_counter++;
-}
-
-/*
  * 'math_state_restore()' saves the current math information in the
  * old math state array, and gets the new ones from the current task
  *
  * Careful.. There are problems with IBM-designed IRQ13 behaviour.
  * Don't touch unless you *really* know how it works.
  *
- * Must be called with kernel preemption disabled (in this case,
- * local interrupts are disabled at the call-site in entry.S).
+ * Must be called with kernel preemption disabled (eg with local
+ * local interrupts as in the case of do_device_not_available).
  */
-asmlinkage void math_state_restore(void)
+void math_state_restore(void)
 {
-        struct thread_info *thread = current_thread_info();
-        struct task_struct *tsk = thread->task;
+        struct task_struct *tsk = current;
 
         if (!tsk_used_math(tsk)) {
                 local_irq_enable();
@@ -622,9 +599,17 @@ asmlinkage void math_state_restore(void)
                 local_irq_disable();
         }
 
-        clts();                         /* Allow maths ops (or we recurse) */
+        __thread_fpu_begin(tsk);
+        /*
+         * Paranoid restore. send a SIGSEGV if we fail to restore the state.
+         */
+        if (unlikely(restore_fpu_checking(tsk))) {
+                __thread_fpu_end(tsk);
+                force_sig(SIGSEGV, tsk);
+                return;
+        }
 
-        __math_state_restore();
+        tsk->fpu_counter++;
 }
 EXPORT_SYMBOL_GPL(math_state_restore);
 
diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
index a3911343976b..711091114119 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
@@ -47,7 +47,7 @@ void __sanitize_i387_state(struct task_struct *tsk)
         if (!fx)
                 return;
 
-        BUG_ON(task_thread_info(tsk)->status & TS_USEDFPU);
+        BUG_ON(__thread_has_fpu(tsk));
 
         xstate_bv = tsk->thread.fpu.state->xsave.xsave_hdr.xstate_bv;
 
@@ -168,7 +168,7 @@ int save_i387_xstate(void __user *buf)
         if (!used_math())
                 return 0;
 
-        if (task_thread_info(tsk)->status & TS_USEDFPU) {
+        if (user_has_fpu()) {
                 if (use_xsave())
                         err = xsave_user(buf);
                 else
@@ -176,8 +176,7 @@ int save_i387_xstate(void __user *buf)
 
                 if (err)
                         return err;
-                task_thread_info(tsk)->status &= ~TS_USEDFPU;
-                stts();
+                user_fpu_end();
         } else {
                 sanitize_i387_state(tsk);
                 if (__copy_to_user(buf, &tsk->thread.fpu.state->fxsave,
@@ -292,10 +291,7 @@ int restore_i387_xstate(void __user *buf)
                         return err;
         }
 
-        if (!(task_thread_info(current)->status & TS_USEDFPU)) {
-                clts();
-                task_thread_info(current)->status |= TS_USEDFPU;
-        }
+        user_fpu_begin();
         if (use_xsave())
                 err = restore_user_xstate(buf);
         else
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 05a562b85025..0982507b962a 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -1891,6 +1891,51 @@ setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,
         ss->p = 1;
 }
 
+static bool em_syscall_is_enabled(struct x86_emulate_ctxt *ctxt)
+{
+        struct x86_emulate_ops *ops = ctxt->ops;
+        u32 eax, ebx, ecx, edx;
+
+        /*
+         * syscall should always be enabled in longmode - so only become
+         * vendor specific (cpuid) if other modes are active...
+         */
+        if (ctxt->mode == X86EMUL_MODE_PROT64)
+                return true;
+
+        eax = 0x00000000;
+        ecx = 0x00000000;
+        if (ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx)) {
+                /*
+                 * Intel ("GenuineIntel")
+                 * remark: Intel CPUs only support "syscall" in 64bit
+                 * longmode. Also an 64bit guest with a
+                 * 32bit compat-app running will #UD !! While this
+                 * behaviour can be fixed (by emulating) into AMD
+                 * response - CPUs of AMD can't behave like Intel.
+                 */
+                if (ebx == X86EMUL_CPUID_VENDOR_GenuineIntel_ebx &&
+                    ecx == X86EMUL_CPUID_VENDOR_GenuineIntel_ecx &&
+                    edx == X86EMUL_CPUID_VENDOR_GenuineIntel_edx)
+                        return false;
+
+                /* AMD ("AuthenticAMD") */
+                if (ebx == X86EMUL_CPUID_VENDOR_AuthenticAMD_ebx &&
+                    ecx == X86EMUL_CPUID_VENDOR_AuthenticAMD_ecx &&
+                    edx == X86EMUL_CPUID_VENDOR_AuthenticAMD_edx)
+                        return true;
+
+                /* AMD ("AMDisbetter!") */
+                if (ebx == X86EMUL_CPUID_VENDOR_AMDisbetterI_ebx &&
+                    ecx == X86EMUL_CPUID_VENDOR_AMDisbetterI_ecx &&
+                    edx == X86EMUL_CPUID_VENDOR_AMDisbetterI_edx)
+                        return true;
+        }
+
+        /* default: (not Intel, not AMD), apply Intel's stricter rules... */
+        return false;
+}
+
 static int em_syscall(struct x86_emulate_ctxt *ctxt)
 {
         struct x86_emulate_ops *ops = ctxt->ops;
@@ -1904,9 +1949,15 @@ static int em_syscall(struct x86_emulate_ctxt *ctxt)
             ctxt->mode == X86EMUL_MODE_VM86)
                 return emulate_ud(ctxt);
 
+        if (!(em_syscall_is_enabled(ctxt)))
+                return emulate_ud(ctxt);
+
         ops->get_msr(ctxt, MSR_EFER, &efer);
         setup_syscalls_segments(ctxt, &cs, &ss);
 
+        if (!(efer & EFER_SCE))
+                return emulate_ud(ctxt);
+
         ops->get_msr(ctxt, MSR_STAR, &msr_data);
         msr_data >>= 32;
         cs_sel = (u16)(msr_data & 0xfffc);
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index d29216c462b3..3b4c8d8ad906 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1457,7 +1457,7 @@ static void __vmx_load_host_state(struct vcpu_vmx *vmx)
 #ifdef CONFIG_X86_64
         wrmsrl(MSR_KERNEL_GS_BASE, vmx->msr_host_kernel_gs_base);
 #endif
-        if (current_thread_info()->status & TS_USEDFPU)
+        if (__thread_has_fpu(current))
                 clts();
         load_gdt(&__get_cpu_var(host_gdt));
 }
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 14d6cadc4ba6..9cbfc0698118 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1495,6 +1495,8 @@ static void record_steal_time(struct kvm_vcpu *vcpu)
 
 int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 {
+        bool pr = false;
+
         switch (msr) {
         case MSR_EFER:
                 return set_efer(vcpu, data);
@@ -1635,6 +1637,18 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)
                 pr_unimpl(vcpu, "unimplemented perfctr wrmsr: "
                         "0x%x data 0x%llx\n", msr, data);
                 break;
+        case MSR_P6_PERFCTR0:
+        case MSR_P6_PERFCTR1:
+                pr = true;
+        case MSR_P6_EVNTSEL0:
+        case MSR_P6_EVNTSEL1:
+                if (kvm_pmu_msr(vcpu, msr))
+                        return kvm_pmu_set_msr(vcpu, msr, data);
+
+                if (pr || data != 0)
+                        pr_unimpl(vcpu, "disabled perfctr wrmsr: "
+                                "0x%x data 0x%llx\n", msr, data);
+                break;
         case MSR_K7_CLK_CTL:
                 /*
                  * Ignore all writes to this no longer documented MSR.
@@ -1835,6 +1849,14 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
         case MSR_FAM10H_MMIO_CONF_BASE:
                 data = 0;
                 break;
+        case MSR_P6_PERFCTR0:
+        case MSR_P6_PERFCTR1:
+        case MSR_P6_EVNTSEL0:
+        case MSR_P6_EVNTSEL1:
+                if (kvm_pmu_msr(vcpu, msr))
+                        return kvm_pmu_get_msr(vcpu, msr, pdata);
+                data = 0;
+                break;
         case MSR_IA32_UCODE_REV:
                 data = 0x100000000ULL;
                 break;
@@ -4180,6 +4202,28 @@ static int emulator_intercept(struct x86_emulate_ctxt *ctxt,
         return kvm_x86_ops->check_intercept(emul_to_vcpu(ctxt), info, stage);
 }
 
+static bool emulator_get_cpuid(struct x86_emulate_ctxt *ctxt,
+                               u32 *eax, u32 *ebx, u32 *ecx, u32 *edx)
+{
+        struct kvm_cpuid_entry2 *cpuid = NULL;
+
+        if (eax && ecx)
+                cpuid = kvm_find_cpuid_entry(emul_to_vcpu(ctxt),
+                                            *eax, *ecx);
+
+        if (cpuid) {
+                *eax = cpuid->eax;
+                *ecx = cpuid->ecx;
+                if (ebx)
+                        *ebx = cpuid->ebx;
+                if (edx)
+                        *edx = cpuid->edx;
+                return true;
+        }
+
+        return false;
+}
+
 static struct x86_emulate_ops emulate_ops = {
         .read_std            = kvm_read_guest_virt_system,
         .write_std           = kvm_write_guest_virt_system,
@@ -4211,6 +4255,7 @@ static struct x86_emulate_ops emulate_ops = {
         .get_fpu             = emulator_get_fpu,
         .put_fpu             = emulator_put_fpu,
         .intercept           = emulator_intercept,
+        .get_cpuid           = emulator_get_cpuid,
 };
 
 static void cache_all_regs(struct kvm_vcpu *vcpu)
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 9d74824a708d..f0b4caf85c1a 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -673,7 +673,7 @@ no_context(struct pt_regs *regs, unsigned long error_code,
 
         stackend = end_of_stack(tsk);
         if (tsk != &init_task && *stackend != STACK_END_MAGIC)
-                printk(KERN_ALERT "Thread overran stack, or stack corrupted\n");
+                printk(KERN_EMERG "Thread overran stack, or stack corrupted\n");
 
         tsk->thread.cr2         = address;
         tsk->thread.trap_no     = 14;
@@ -684,7 +684,7 @@ no_context(struct pt_regs *regs, unsigned long error_code,
                 sig = 0;
 
         /* Executive summary in case the body of the oops scrolled away */
-        printk(KERN_EMERG "CR2: %016lx\n", address);
+        printk(KERN_DEFAULT "CR2: %016lx\n", address);
 
         oops_end(flags, regs, sig);
 }
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 7b65f752c5f8..7c1b765ecc59 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -151,17 +151,18 @@ void bpf_jit_compile(struct sk_filter *fp)
         cleanup_addr = proglen; /* epilogue address */
 
         for (pass = 0; pass < 10; pass++) {
+                u8 seen_or_pass0 = (pass == 0) ? (SEEN_XREG | SEEN_DATAREF | SEEN_MEM) : seen;
                 /* no prologue/epilogue for trivial filters (RET something) */
                 proglen = 0;
                 prog = temp;
 
-                if (seen) {
+                if (seen_or_pass0) {
                         EMIT4(0x55, 0x48, 0x89, 0xe5); /* push %rbp; mov %rsp,%rbp */
                         EMIT4(0x48, 0x83, 0xec, 96);    /* subq  $96,%rsp       */
                         /* note : must save %rbx in case bpf_error is hit */
-                        if (seen & (SEEN_XREG | SEEN_DATAREF))
+                        if (seen_or_pass0 & (SEEN_XREG | SEEN_DATAREF))
                                 EMIT4(0x48, 0x89, 0x5d, 0xf8); /* mov %rbx, -8(%rbp) */
-                        if (seen & SEEN_XREG)
+                        if (seen_or_pass0 & SEEN_XREG)
                                 CLEAR_X(); /* make sure we dont leek kernel memory */
 
                         /*
@@ -170,7 +171,7 @@ void bpf_jit_compile(struct sk_filter *fp)
                          *  r9 = skb->len - skb->data_len
                          *  r8 = skb->data
                          */
-                        if (seen & SEEN_DATAREF) {
+                        if (seen_or_pass0 & SEEN_DATAREF) {
                                 if (offsetof(struct sk_buff, len) <= 127)
                                         /* mov    off8(%rdi),%r9d */
                                         EMIT4(0x44, 0x8b, 0x4f, offsetof(struct sk_buff, len));
@@ -260,9 +261,14 @@ void bpf_jit_compile(struct sk_filter *fp)
                         case BPF_S_ALU_DIV_X: /* A /= X; */
                                 seen |= SEEN_XREG;
                                 EMIT2(0x85, 0xdb);      /* test %ebx,%ebx */
-                                if (pc_ret0 != -1)
-                                        EMIT_COND_JMP(X86_JE, addrs[pc_ret0] - (addrs[i] - 4));
-                                else {
+                                if (pc_ret0 > 0) {
+                                        /* addrs[pc_ret0 - 1] is start address of target
+                                         * (addrs[i] - 4) is the address following this jmp
+                                         * ("xor %edx,%edx; div %ebx" being 4 bytes long)
+                                         */
+                                        EMIT_COND_JMP(X86_JE, addrs[pc_ret0 - 1] -
+                                                                (addrs[i] - 4));
+                                } else {
                                         EMIT_COND_JMP(X86_JNE, 2 + 5);
                                         CLEAR_A();
                                         EMIT1_off32(0xe9, cleanup_addr - (addrs[i] - 4)); /* jmp .+off32 */
@@ -335,12 +341,12 @@ void bpf_jit_compile(struct sk_filter *fp)
                                 }
                                 /* fallinto */
                         case BPF_S_RET_A:
-                                if (seen) {
+                                if (seen_or_pass0) {
                                         if (i != flen - 1) {
                                                 EMIT_JMP(cleanup_addr - addrs[i]);
                                                 break;
                                         }
-                                        if (seen & SEEN_XREG)
+                                        if (seen_or_pass0 & SEEN_XREG)
                                                 EMIT4(0x48, 0x8b, 0x5d, 0xf8);  /* mov  -8(%rbp),%rbx */
                                         EMIT1(0xc9);            /* leaveq */
                                 }
@@ -483,8 +489,9 @@ common_load:			seen |= SEEN_DATAREF;
                                 goto common_load;
                         case BPF_S_LDX_B_MSH:
                                 if ((int)K < 0) {
-                                        if (pc_ret0 != -1) {
-                                                EMIT_JMP(addrs[pc_ret0] - addrs[i]);
+                                        if (pc_ret0 > 0) {
+                                                /* addrs[pc_ret0 - 1] is the start address */
+                                                EMIT_JMP(addrs[pc_ret0 - 1] - addrs[i]);
                                                 break;
                                         }
                                         CLEAR_A();
@@ -599,13 +606,14 @@ cond_branch:			f_offset = addrs[i + filter[i].jf] - addrs[i];
                  * use it to give the cleanup instruction(s) addr
                  */
                 cleanup_addr = proglen - 1; /* ret */
-                if (seen)
+                if (seen_or_pass0)
                         cleanup_addr -= 1; /* leaveq */
-                if (seen & SEEN_XREG)
+                if (seen_or_pass0 & SEEN_XREG)
                         cleanup_addr -= 4; /* mov  -8(%rbp),%rbx */
 
                 if (image) {
-                        WARN_ON(proglen != oldproglen);
+                        if (proglen != oldproglen)
+                                pr_err("bpb_jit_compile proglen=%u != oldproglen=%u\n", proglen, oldproglen);
                         break;
                 }
                 if (proglen == oldproglen) {
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 492ade8c978e..d99346ea8fdb 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -374,7 +374,7 @@ int __init pci_xen_init(void)
 
 int __init pci_xen_hvm_init(void)
 {
-        if (!xen_feature(XENFEAT_hvm_pirqs))
+        if (!xen_have_vector_callback || !xen_feature(XENFEAT_hvm_pirqs))
                 return 0;
 
 #ifdef CONFIG_ACPI
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index 9be4cff00a2d..3ae0e61abd23 100644
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -1851,6 +1851,8 @@ static void __init init_per_cpu_tunables(void)
                 bcp->cong_reps                  = congested_reps;
                 bcp->cong_period                = congested_period;
                 bcp->clocks_per_100_usec =      usec_2_cycles(100);
+                spin_lock_init(&bcp->queue_lock);
+                spin_lock_init(&bcp->uvhub_lock);
         }
 }
 
diff --git a/arch/x86/platform/uv/uv_irq.c b/arch/x86/platform/uv/uv_irq.c
index 374a05d8ad22..f25c2765a5c9 100644
--- a/arch/x86/platform/uv/uv_irq.c
+++ b/arch/x86/platform/uv/uv_irq.c
@@ -25,7 +25,7 @@ struct uv_irq_2_mmr_pnode{
         int                     irq;
 };
 
-static spinlock_t               uv_irq_lock;
+static DEFINE_SPINLOCK(uv_irq_lock);
 static struct rb_root           uv_irq_root;
 
 static int uv_set_irq_affinity(struct irq_data *, const struct cpumask *, bool);
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 041d4fe9dfe4..501d4e0244ba 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -409,6 +409,13 @@ static void __cpuinit xen_play_dead(void) /* used only with HOTPLUG_CPU */
         play_dead_common();
         HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);
         cpu_bringup();
+        /*
+         * Balance out the preempt calls - as we are running in cpu_idle
+         * loop which has been called at bootup from cpu_bringup_and_idle.
+         * The cpucpu_bringup_and_idle called cpu_bringup which made a
+         * preempt_disable() So this preempt_enable will balance it out.
+         */
+        preempt_enable();
 }
 
 #else /* !CONFIG_HOTPLUG_CPU */
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index cc9b1e182fcf..d69cc6c3f808 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -116,9 +116,26 @@ static inline void spin_time_accum_blocked(u64 start)
 }
 #endif  /* CONFIG_XEN_DEBUG_FS */
 
+/*
+ * Size struct xen_spinlock so it's the same as arch_spinlock_t.
+ */
+#if NR_CPUS < 256
+typedef u8 xen_spinners_t;
+# define inc_spinners(xl) \
+        asm(LOCK_PREFIX " incb %0" : "+m" ((xl)->spinners) : : "memory");
+# define dec_spinners(xl) \
+        asm(LOCK_PREFIX " decb %0" : "+m" ((xl)->spinners) : : "memory");
+#else
+typedef u16 xen_spinners_t;
+# define inc_spinners(xl) \
+        asm(LOCK_PREFIX " incw %0" : "+m" ((xl)->spinners) : : "memory");
+# define dec_spinners(xl) \
+        asm(LOCK_PREFIX " decw %0" : "+m" ((xl)->spinners) : : "memory");
+#endif
+
 struct xen_spinlock {
         unsigned char lock;             /* 0 -> free; 1 -> locked */
-        unsigned short spinners;        /* count of waiting cpus */
+        xen_spinners_t spinners;        /* count of waiting cpus */
 };
 
 static int xen_spin_is_locked(struct arch_spinlock *lock)
@@ -164,8 +181,7 @@ static inline struct xen_spinlock *spinning_lock(struct xen_spinlock *xl)
 
         wmb();                  /* set lock of interest before count */
 
-        asm(LOCK_PREFIX " incw %0"
-            : "+m" (xl->spinners) : : "memory");
+        inc_spinners(xl);
 
         return prev;
 }
@@ -176,8 +192,7 @@ static inline struct xen_spinlock *spinning_lock(struct xen_spinlock *xl)
  */
 static inline void unspinning_lock(struct xen_spinlock *xl, struct xen_spinlock *prev)
 {
-        asm(LOCK_PREFIX " decw %0"
-            : "+m" (xl->spinners) : : "memory");
+        dec_spinners(xl);
         wmb();                  /* decrement count before restoring lock */
         __this_cpu_write(lock_spinners, prev);
 }
@@ -373,6 +388,8 @@ void xen_uninit_lock_cpu(int cpu)
 
 void __init xen_init_spinlocks(void)
 {
+        BUILD_BUG_ON(sizeof(struct xen_spinlock) > sizeof(arch_spinlock_t));
+
         pv_lock_ops.spin_is_locked = xen_spin_is_locked;
         pv_lock_ops.spin_is_contended = xen_spin_is_contended;
         pv_lock_ops.spin_lock = xen_spin_lock;
diff --git a/arch/xtensa/include/asm/string.h b/arch/xtensa/include/asm/string.h
index 5fb8c27cbef5..405a8c49ff2c 100644
--- a/arch/xtensa/include/asm/string.h
+++ b/arch/xtensa/include/asm/string.h
@@ -118,7 +118,4 @@ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
 /* Don't build bcopy at all ...  */
 #define __HAVE_ARCH_BCOPY
 
-#define __HAVE_ARCH_MEMSCAN
-#define memscan memchr
-
 #endif  /* _XTENSA_STRING_H */
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index fa8f26309444..75642a352a8f 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1659,7 +1659,7 @@ static void blkiocg_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
                 ioc = get_task_io_context(task, GFP_ATOMIC, NUMA_NO_NODE);
                 if (ioc) {
                         ioc_cgroup_changed(ioc);
-                        put_io_context(ioc, NULL);
+                        put_io_context(ioc);
                 }
         }
 }
diff --git a/block/blk-core.c b/block/blk-core.c
index e6c05a97ee2b..3a78b00edd71 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -642,7 +642,7 @@ static inline void blk_free_request(struct request_queue *q, struct request *rq)
         if (rq->cmd_flags & REQ_ELVPRIV) {
                 elv_put_request(q, rq);
                 if (rq->elv.icq)
-                        put_io_context(rq->elv.icq->ioc, q);
+                        put_io_context(rq->elv.icq->ioc);
         }
 
         mempool_free(rq, q->rq.rq_pool);
@@ -872,13 +872,15 @@ retry:
         spin_unlock_irq(q->queue_lock);
 
         /* create icq if missing */
-        if (unlikely(et->icq_cache && !icq))
+        if ((rw_flags & REQ_ELVPRIV) && unlikely(et->icq_cache && !icq)) {
                 icq = ioc_create_icq(q, gfp_mask);
+                if (!icq)
+                        goto fail_icq;
+        }
 
-        /* rqs are guaranteed to have icq on elv_set_request() if requested */
-        if (likely(!et->icq_cache || icq))
-                rq = blk_alloc_request(q, icq, rw_flags, gfp_mask);
+        rq = blk_alloc_request(q, icq, rw_flags, gfp_mask);
 
+fail_icq:
         if (unlikely(!rq)) {
                 /*
                  * Allocation failed presumably due to memory. Undo anything
@@ -1210,7 +1212,6 @@ static bool bio_attempt_back_merge(struct request_queue *q, struct request *req,
         req->ioprio = ioprio_best(req->ioprio, bio_prio(bio));
 
         drive_stat_acct(req, 0);
-        elv_bio_merged(q, req, bio);
         return true;
 }
 
@@ -1241,7 +1242,6 @@ static bool bio_attempt_front_merge(struct request_queue *q,
         req->ioprio = ioprio_best(req->ioprio, bio_prio(bio));
 
         drive_stat_acct(req, 0);
-        elv_bio_merged(q, req, bio);
         return true;
 }
 
@@ -1255,13 +1255,12 @@ static bool bio_attempt_front_merge(struct request_queue *q,
  * on %current's plugged list.  Returns %true if merge was successful,
  * otherwise %false.
  *
- * This function is called without @q->queue_lock; however, elevator is
- * accessed iff there already are requests on the plugged list which in
- * turn guarantees validity of the elevator.
- *
- * Note that, on successful merge, elevator operation
- * elevator_bio_merged_fn() will be called without queue lock.  Elevator
- * must be ready for this.
+ * Plugging coalesces IOs from the same issuer for the same purpose without
+ * going through @q->queue_lock.  As such it's more of an issuing mechanism
+ * than scheduling, and the request, while may have elvpriv data, is not
+ * added on the elevator at this point.  In addition, we don't have
+ * reliable access to the elevator outside queue lock.  Only check basic
+ * merging parameters without querying the elevator.
  */
 static bool attempt_plug_merge(struct request_queue *q, struct bio *bio,
                                unsigned int *request_count)
@@ -1280,10 +1279,10 @@ static bool attempt_plug_merge(struct request_queue *q, struct bio *bio,
 
                 (*request_count)++;
 
-                if (rq->q != q)
+                if (rq->q != q || !blk_rq_merge_ok(rq, bio))
                         continue;
 
-                el_ret = elv_try_merge(rq, bio);
+                el_ret = blk_try_merge(rq, bio);
                 if (el_ret == ELEVATOR_BACK_MERGE) {
                         ret = bio_attempt_back_merge(q, rq, bio);
                         if (ret)
@@ -1345,12 +1344,14 @@ void blk_queue_bio(struct request_queue *q, struct bio *bio)
         el_ret = elv_merge(q, &req, bio);
         if (el_ret == ELEVATOR_BACK_MERGE) {
                 if (bio_attempt_back_merge(q, req, bio)) {
+                        elv_bio_merged(q, req, bio);
                         if (!attempt_back_merge(q, req))
                                 elv_merged_request(q, req, el_ret);
                         goto out_unlock;
                 }
         } else if (el_ret == ELEVATOR_FRONT_MERGE) {
                 if (bio_attempt_front_merge(q, req, bio)) {
+                        elv_bio_merged(q, req, bio);
                         if (!attempt_front_merge(q, req))
                                 elv_merged_request(q, req, el_ret);
                         goto out_unlock;
diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index 27a06e00eaec..8b782a63c297 100644
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -29,21 +29,6 @@ void get_io_context(struct io_context *ioc)
 }
 EXPORT_SYMBOL(get_io_context);
 
-/*
- * Releasing ioc may nest into another put_io_context() leading to nested
- * fast path release.  As the ioc's can't be the same, this is okay but
- * makes lockdep whine.  Keep track of nesting and use it as subclass.
- */
-#ifdef CONFIG_LOCKDEP
-#define ioc_release_depth(q)            ((q) ? (q)->ioc_release_depth : 0)
-#define ioc_release_depth_inc(q)        (q)->ioc_release_depth++
-#define ioc_release_depth_dec(q)        (q)->ioc_release_depth--
-#else
-#define ioc_release_depth(q)            0
-#define ioc_release_depth_inc(q)        do { } while (0)
-#define ioc_release_depth_dec(q)        do { } while (0)
-#endif
-
 static void icq_free_icq_rcu(struct rcu_head *head)
 {
         struct io_cq *icq = container_of(head, struct io_cq, __rcu_head);
@@ -75,11 +60,8 @@ static void ioc_exit_icq(struct io_cq *icq)
         if (rcu_dereference_raw(ioc->icq_hint) == icq)
                 rcu_assign_pointer(ioc->icq_hint, NULL);
 
-        if (et->ops.elevator_exit_icq_fn) {
-                ioc_release_depth_inc(q);
+        if (et->ops.elevator_exit_icq_fn)
                 et->ops.elevator_exit_icq_fn(icq);
-                ioc_release_depth_dec(q);
-        }
 
         /*
          * @icq->q might have gone away by the time RCU callback runs
@@ -98,8 +80,15 @@ static void ioc_release_fn(struct work_struct *work)
         struct io_context *ioc = container_of(work, struct io_context,
                                               release_work);
         struct request_queue *last_q = NULL;
+        unsigned long flags;
 
-        spin_lock_irq(&ioc->lock);
+        /*
+         * Exiting icq may call into put_io_context() through elevator
+         * which will trigger lockdep warning.  The ioc's are guaranteed to
+         * be different, use a different locking subclass here.  Use
+         * irqsave variant as there's no spin_lock_irq_nested().
+         */
+        spin_lock_irqsave_nested(&ioc->lock, flags, 1);
 
         while (!hlist_empty(&ioc->icq_list)) {
                 struct io_cq *icq = hlist_entry(ioc->icq_list.first,
@@ -121,15 +110,15 @@ static void ioc_release_fn(struct work_struct *work)
                          */
                         if (last_q) {
                                 spin_unlock(last_q->queue_lock);
-                                spin_unlock_irq(&ioc->lock);
+                                spin_unlock_irqrestore(&ioc->lock, flags);
                                 blk_put_queue(last_q);
                         } else {
-                                spin_unlock_irq(&ioc->lock);
+                                spin_unlock_irqrestore(&ioc->lock, flags);
                         }
 
                         last_q = this_q;
-                        spin_lock_irq(this_q->queue_lock);
-                        spin_lock(&ioc->lock);
+                        spin_lock_irqsave(this_q->queue_lock, flags);
+                        spin_lock_nested(&ioc->lock, 1);
                         continue;
                 }
                 ioc_exit_icq(icq);
@@ -137,10 +126,10 @@ static void ioc_release_fn(struct work_struct *work)
 
         if (last_q) {
                 spin_unlock(last_q->queue_lock);
-                spin_unlock_irq(&ioc->lock);
+                spin_unlock_irqrestore(&ioc->lock, flags);
                 blk_put_queue(last_q);
         } else {
-                spin_unlock_irq(&ioc->lock);
+                spin_unlock_irqrestore(&ioc->lock, flags);
         }
 
         kmem_cache_free(iocontext_cachep, ioc);
@@ -149,79 +138,29 @@ static void ioc_release_fn(struct work_struct *work)
 /**
  * put_io_context - put a reference of io_context
  * @ioc: io_context to put
- * @locked_q: request_queue the caller is holding queue_lock of (hint)
  *
  * Decrement reference count of @ioc and release it if the count reaches
- * zero.  If the caller is holding queue_lock of a queue, it can indicate
- * that with @locked_q.  This is an optimization hint and the caller is
- * allowed to pass in %NULL even when it's holding a queue_lock.
+ * zero.
  */
-void put_io_context(struct io_context *ioc, struct request_queue *locked_q)
+void put_io_context(struct io_context *ioc)
 {
-        struct request_queue *last_q = locked_q;
         unsigned long flags;
 
         if (ioc == NULL)
                 return;
 
         BUG_ON(atomic_long_read(&ioc->refcount) <= 0);
-        if (locked_q)
-                lockdep_assert_held(locked_q->queue_lock);
-
-        if (!atomic_long_dec_and_test(&ioc->refcount))
-                return;
 
         /*
-         * Destroy @ioc.  This is a bit messy because icq's are chained
-         * from both ioc and queue, and ioc->lock nests inside queue_lock.
-         * The inner ioc->lock should be held to walk our icq_list and then
-         * for each icq the outer matching queue_lock should be grabbed.
-         * ie. We need to do reverse-order double lock dancing.
-         *
-         * Another twist is that we are often called with one of the
-         * matching queue_locks held as indicated by @locked_q, which
-         * prevents performing double-lock dance for other queues.
-         *
-         * So, we do it in two stages.  The fast path uses the queue_lock
-         * the caller is holding and, if other queues need to be accessed,
-         * uses trylock to avoid introducing locking dependency.  This can
-         * handle most cases, especially if @ioc was performing IO on only
-         * single device.
-         *
-         * If trylock doesn't cut it, we defer to @ioc->release_work which
-         * can do all the double-locking dancing.
+         * Releasing ioc requires reverse order double locking and we may
+         * already be holding a queue_lock.  Do it asynchronously from wq.
          */
-        spin_lock_irqsave_nested(&ioc->lock, flags,
-                                 ioc_release_depth(locked_q));
-
-        while (!hlist_empty(&ioc->icq_list)) {
-                struct io_cq *icq = hlist_entry(ioc->icq_list.first,
-                                                struct io_cq, ioc_node);
-                struct request_queue *this_q = icq->q;
-
-                if (this_q != last_q) {
-                        if (last_q && last_q != locked_q)
-                                spin_unlock(last_q->queue_lock);
-                        last_q = NULL;
-
-                        if (!spin_trylock(this_q->queue_lock))
-                                break;
-                        last_q = this_q;
-                        continue;
-                }
-                ioc_exit_icq(icq);
+        if (atomic_long_dec_and_test(&ioc->refcount)) {
+                spin_lock_irqsave(&ioc->lock, flags);
+                if (!hlist_empty(&ioc->icq_list))
+                        schedule_work(&ioc->release_work);
+                spin_unlock_irqrestore(&ioc->lock, flags);
         }
-
-        if (last_q && last_q != locked_q)
-                spin_unlock(last_q->queue_lock);
-
-        spin_unlock_irqrestore(&ioc->lock, flags);
-
-        /* if no icq is left, we're done; otherwise, kick release_work */
-        if (hlist_empty(&ioc->icq_list))
-                kmem_cache_free(iocontext_cachep, ioc);
-        else
-                schedule_work(&ioc->release_work);
 }
 EXPORT_SYMBOL(put_io_context);
 
@@ -236,7 +175,7 @@ void exit_io_context(struct task_struct *task)
         task_unlock(task);
 
         atomic_dec(&ioc->nr_tasks);
-        put_io_context(ioc, NULL);
+        put_io_context(ioc);
 }
 
 /**
diff --git a/block/blk-merge.c b/block/blk-merge.c
index cfcc37cb222b..160035f54882 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -471,3 +471,40 @@ int blk_attempt_req_merge(struct request_queue *q, struct request *rq,
 {
         return attempt_merge(q, rq, next);
 }
+
+bool blk_rq_merge_ok(struct request *rq, struct bio *bio)
+{
+        if (!rq_mergeable(rq))
+                return false;
+
+        /* don't merge file system requests and discard requests */
+        if ((bio->bi_rw & REQ_DISCARD) != (rq->bio->bi_rw & REQ_DISCARD))
+                return false;
+
+        /* don't merge discard requests and secure discard requests */
+        if ((bio->bi_rw & REQ_SECURE) != (rq->bio->bi_rw & REQ_SECURE))
+                return false;
+
+        /* different data direction or already started, don't merge */
+        if (bio_data_dir(bio) != rq_data_dir(rq))
+                return false;
+
+        /* must be same device and not a special request */
+        if (rq->rq_disk != bio->bi_bdev->bd_disk || rq->special)
+                return false;
+
+        /* only merge integrity protected bio into ditto rq */
+        if (bio_integrity(bio) != blk_integrity_rq(rq))
+                return false;
+
+        return true;
+}
+
+int blk_try_merge(struct request *rq, struct bio *bio)
+{
+        if (blk_rq_pos(rq) + blk_rq_sectors(rq) == bio->bi_sector)
+                return ELEVATOR_BACK_MERGE;
+        else if (blk_rq_pos(rq) - bio_sectors(bio) == bio->bi_sector)
+                return ELEVATOR_FRONT_MERGE;
+        return ELEVATOR_NO_MERGE;
+}
diff --git a/block/blk.h b/block/blk.h
index 7efd772336de..9c12f80882b0 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -137,6 +137,8 @@ int blk_attempt_req_merge(struct request_queue *q, struct request *rq,
                                 struct request *next);
 void blk_recalc_rq_segments(struct request *rq);
 void blk_rq_set_mixed_merge(struct request *rq);
+bool blk_rq_merge_ok(struct request *rq, struct bio *bio);
+int blk_try_merge(struct request *rq, struct bio *bio);
 
 void blk_queue_congestion_threshold(struct request_queue *q);
 
diff --git a/block/bsg.c b/block/bsg.c
index 4cf703fd98bb..ff64ae3bacee 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -983,7 +983,8 @@ void bsg_unregister_queue(struct request_queue *q)
 
         mutex_lock(&bsg_mutex);
         idr_remove(&bsg_minor_idr, bcd->minor);
-        sysfs_remove_link(&q->kobj, "bsg");
+        if (q->kobj.sd)
+                sysfs_remove_link(&q->kobj, "bsg");
         device_unregister(bcd->class_dev);
         bcd->class_dev = NULL;
         kref_put(&bcd->ref, bsg_kref_release_function);
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index ee55019066a1..d0ba50533668 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1699,18 +1699,11 @@ static int cfq_allow_merge(struct request_queue *q, struct request *rq,
 
         /*
          * Lookup the cfqq that this bio will be queued with and allow
-         * merge only if rq is queued there.  This function can be called
-         * from plug merge without queue_lock.  In such cases, ioc of @rq
-         * and %current are guaranteed to be equal.  Avoid lookup which
-         * requires queue_lock by using @rq's cic.
+         * merge only if rq is queued there.
          */
-        if (current->io_context == RQ_CIC(rq)->icq.ioc) {
-                cic = RQ_CIC(rq);
-        } else {
-                cic = cfq_cic_lookup(cfqd, current->io_context);
-                if (!cic)
-                        return false;
-        }
+        cic = cfq_cic_lookup(cfqd, current->io_context);
+        if (!cic)
+                return false;
 
         cfqq = cic_to_cfqq(cic, cfq_bio_sync(bio));
         return cfqq == RQ_CFQQ(rq);
@@ -1794,7 +1787,7 @@ __cfq_slice_expired(struct cfq_data *cfqd, struct cfq_queue *cfqq,
                 cfqd->active_queue = NULL;
 
         if (cfqd->active_cic) {
-                put_io_context(cfqd->active_cic->icq.ioc, cfqd->queue);
+                put_io_context(cfqd->active_cic->icq.ioc);
                 cfqd->active_cic = NULL;
         }
 }
@@ -3117,17 +3110,18 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,
  */
 static void cfq_preempt_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq)
 {
+        enum wl_type_t old_type = cfqq_type(cfqd->active_queue);
+
         cfq_log_cfqq(cfqd, cfqq, "preempt");
+        cfq_slice_expired(cfqd, 1);
 
         /*
          * workload type is changed, don't save slice, otherwise preempt
          * doesn't happen
          */
-        if (cfqq_type(cfqd->active_queue) != cfqq_type(cfqq))
+        if (old_type != cfqq_type(cfqq))
                 cfqq->cfqg->saved_workload_slice = 0;
 
-        cfq_slice_expired(cfqd, 1);
-
         /*
          * Put the new queue at the front of the of the current list,
          * so we know that it will be selected next.
diff --git a/block/elevator.c b/block/elevator.c
index 91e18f8af9be..f016855a46b0 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -70,39 +70,9 @@ static int elv_iosched_allow_merge(struct request *rq, struct bio *bio)
 /*
  * can we safely merge with this request?
  */
-int elv_rq_merge_ok(struct request *rq, struct bio *bio)
+bool elv_rq_merge_ok(struct request *rq, struct bio *bio)
 {
-        if (!rq_mergeable(rq))
-                return 0;
-
-        /*
-         * Don't merge file system requests and discard requests
-         */
-        if ((bio->bi_rw & REQ_DISCARD) != (rq->bio->bi_rw & REQ_DISCARD))
-                return 0;
-
-        /*
-         * Don't merge discard requests and secure discard requests
-         */
-        if ((bio->bi_rw & REQ_SECURE) != (rq->bio->bi_rw & REQ_SECURE))
-                return 0;
-
-        /*
-         * different data direction or already started, don't merge
-         */
-        if (bio_data_dir(bio) != rq_data_dir(rq))
-                return 0;
-
-        /*
-         * must be same device and not a special request
-         */
-        if (rq->rq_disk != bio->bi_bdev->bd_disk || rq->special)
-                return 0;
-
-        /*
-         * only merge integrity protected bio into ditto rq
-         */
-        if (bio_integrity(bio) != blk_integrity_rq(rq))
+        if (!blk_rq_merge_ok(rq, bio))
                 return 0;
 
         if (!elv_iosched_allow_merge(rq, bio))
@@ -112,23 +82,6 @@ int elv_rq_merge_ok(struct request *rq, struct bio *bio)
 }
 EXPORT_SYMBOL(elv_rq_merge_ok);
 
-int elv_try_merge(struct request *__rq, struct bio *bio)
-{
-        int ret = ELEVATOR_NO_MERGE;
-
-        /*
-         * we can merge and sequence is ok, check if it's possible
-         */
-        if (elv_rq_merge_ok(__rq, bio)) {
-                if (blk_rq_pos(__rq) + blk_rq_sectors(__rq) == bio->bi_sector)
-                        ret = ELEVATOR_BACK_MERGE;
-                else if (blk_rq_pos(__rq) - bio_sectors(bio) == bio->bi_sector)
-                        ret = ELEVATOR_FRONT_MERGE;
-        }
-
-        return ret;
-}
-
 static struct elevator_type *elevator_find(const char *name)
 {
         struct elevator_type *e;
@@ -478,8 +431,8 @@ int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)
         /*
          * First try one-hit cache.
          */
-        if (q->last_merge) {
-                ret = elv_try_merge(q->last_merge, bio);
+        if (q->last_merge && elv_rq_merge_ok(q->last_merge, bio)) {
+                ret = blk_try_merge(q->last_merge, bio);
                 if (ret != ELEVATOR_NO_MERGE) {
                         *req = q->last_merge;
                         return ret;
diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c
index 9ed9f60316e5..107f6f7be5e1 100644
--- a/crypto/sha512_generic.c
+++ b/crypto/sha512_generic.c
@@ -21,8 +21,6 @@
 #include <linux/percpu.h>
 #include <asm/byteorder.h>
 
-static DEFINE_PER_CPU(u64[80], msg_schedule);
-
 static inline u64 Ch(u64 x, u64 y, u64 z)
 {
         return z ^ (x & (y ^ z));
@@ -33,11 +31,6 @@ static inline u64 Maj(u64 x, u64 y, u64 z)
         return (x & y) | (z & (x | y));
 }
 
-static inline u64 RORu64(u64 x, u64 y)
-{
-        return (x >> y) | (x << (64 - y));
-}
-
 static const u64 sha512_K[80] = {
         0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL,
         0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
@@ -68,10 +61,10 @@ static const u64 sha512_K[80] = {
         0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL,
 };
 
-#define e0(x)       (RORu64(x,28) ^ RORu64(x,34) ^ RORu64(x,39))
-#define e1(x)       (RORu64(x,14) ^ RORu64(x,18) ^ RORu64(x,41))
-#define s0(x)       (RORu64(x, 1) ^ RORu64(x, 8) ^ (x >> 7))
-#define s1(x)       (RORu64(x,19) ^ RORu64(x,61) ^ (x >> 6))
+#define e0(x)       (ror64(x,28) ^ ror64(x,34) ^ ror64(x,39))
+#define e1(x)       (ror64(x,14) ^ ror64(x,18) ^ ror64(x,41))
+#define s0(x)       (ror64(x, 1) ^ ror64(x, 8) ^ (x >> 7))
+#define s1(x)       (ror64(x,19) ^ ror64(x,61) ^ (x >> 6))
 
 static inline void LOAD_OP(int I, u64 *W, const u8 *input)
 {
@@ -80,7 +73,7 @@ static inline void LOAD_OP(int I, u64 *W, const u8 *input)
 
 static inline void BLEND_OP(int I, u64 *W)
 {
-        W[I] = s1(W[I-2]) + W[I-7] + s0(W[I-15]) + W[I-16];
+        W[I & 15] += s1(W[(I-2) & 15]) + W[(I-7) & 15] + s0(W[(I-15) & 15]);
 }
 
 static void
@@ -89,15 +82,7 @@ sha512_transform(u64 *state, const u8 *input)
         u64 a, b, c, d, e, f, g, h, t1, t2;
 
         int i;
-        u64 *W = get_cpu_var(msg_schedule);
-
-        /* load the input */
-        for (i = 0; i < 16; i++)
-                LOAD_OP(i, W, input);
-
-        for (i = 16; i < 80; i++) {
-                BLEND_OP(i, W);
-        }
+        u64 W[16];
 
         /* load the state into our registers */
         a=state[0];   b=state[1];   c=state[2];   d=state[3];
@@ -105,21 +90,35 @@ sha512_transform(u64 *state, const u8 *input)
 
         /* now iterate */
         for (i=0; i<80; i+=8) {
-                t1 = h + e1(e) + Ch(e,f,g) + sha512_K[i  ] + W[i  ];
+                if (!(i & 8)) {
+                        int j;
+
+                        if (i < 16) {
+                                /* load the input */
+                                for (j = 0; j < 16; j++)
+                                        LOAD_OP(i + j, W, input);
+                        } else {
+                                for (j = 0; j < 16; j++) {
+                                        BLEND_OP(i + j, W);
+                                }
+                        }
+                }
+
+                t1 = h + e1(e) + Ch(e,f,g) + sha512_K[i  ] + W[(i & 15)];
                 t2 = e0(a) + Maj(a,b,c);    d+=t1;    h=t1+t2;
-                t1 = g + e1(d) + Ch(d,e,f) + sha512_K[i+1] + W[i+1];
+                t1 = g + e1(d) + Ch(d,e,f) + sha512_K[i+1] + W[(i & 15) + 1];
                 t2 = e0(h) + Maj(h,a,b);    c+=t1;    g=t1+t2;
-                t1 = f + e1(c) + Ch(c,d,e) + sha512_K[i+2] + W[i+2];
+                t1 = f + e1(c) + Ch(c,d,e) + sha512_K[i+2] + W[(i & 15) + 2];
                 t2 = e0(g) + Maj(g,h,a);    b+=t1;    f=t1+t2;
-                t1 = e + e1(b) + Ch(b,c,d) + sha512_K[i+3] + W[i+3];
+                t1 = e + e1(b) + Ch(b,c,d) + sha512_K[i+3] + W[(i & 15) + 3];
                 t2 = e0(f) + Maj(f,g,h);    a+=t1;    e=t1+t2;
-                t1 = d + e1(a) + Ch(a,b,c) + sha512_K[i+4] + W[i+4];
+                t1 = d + e1(a) + Ch(a,b,c) + sha512_K[i+4] + W[(i & 15) + 4];
                 t2 = e0(e) + Maj(e,f,g);    h+=t1;    d=t1+t2;
-                t1 = c + e1(h) + Ch(h,a,b) + sha512_K[i+5] + W[i+5];
+                t1 = c + e1(h) + Ch(h,a,b) + sha512_K[i+5] + W[(i & 15) + 5];
                 t2 = e0(d) + Maj(d,e,f);    g+=t1;    c=t1+t2;
-                t1 = b + e1(g) + Ch(g,h,a) + sha512_K[i+6] + W[i+6];
+                t1 = b + e1(g) + Ch(g,h,a) + sha512_K[i+6] + W[(i & 15) + 6];
                 t2 = e0(c) + Maj(c,d,e);    f+=t1;    b=t1+t2;
-                t1 = a + e1(f) + Ch(f,g,h) + sha512_K[i+7] + W[i+7];
+                t1 = a + e1(f) + Ch(f,g,h) + sha512_K[i+7] + W[(i & 15) + 7];
                 t2 = e0(b) + Maj(b,c,d);    e+=t1;    a=t1+t2;
         }
 
@@ -128,8 +127,6 @@ sha512_transform(u64 *state, const u8 *input)
 
         /* erase our data */
         a = b = c = d = e = f = g = h = t1 = t2 = 0;
-        memset(W, 0, sizeof(__get_cpu_var(msg_schedule)));
-        put_cpu_var(msg_schedule);
 }
 
 static int
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index c07f44f05f9d..1567028d2038 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -19,7 +19,6 @@ obj-y				+= acpi.o \
 
 # All the builtin files are in the "acpi." module_param namespace.
 acpi-y                          += osl.o utils.o reboot.o
-acpi-y                          += atomicio.o
 acpi-y                          += nvs.o
 
 # sleep related files
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index e45350cb6ac8..e5d53b7ddc7e 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -596,33 +596,19 @@ int apei_read(u64 *val, struct acpi_generic_address *reg)
 {
         int rc;
         u64 address;
-        u32 tmp, width = reg->bit_width;
         acpi_status status;
 
         rc = apei_check_gar(reg, &address);
         if (rc)
                 return rc;
 
-        if (width == 64)
-                width = 32;     /* Break into two 32-bit transfers */
-
         *val = 0;
         switch(reg->space_id) {
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                status = acpi_os_read_memory((acpi_physical_address)
-                                             address, &tmp, width);
+                status = acpi_os_read_memory64((acpi_physical_address)
+                                             address, val, reg->bit_width);
                 if (ACPI_FAILURE(status))
                         return -EIO;
-                *val = tmp;
-
-                if (reg->bit_width == 64) {
-                        /* Read the top 32 bits */
-                        status = acpi_os_read_memory((acpi_physical_address)
-                                                     (address + 4), &tmp, 32);
-                        if (ACPI_FAILURE(status))
-                                return -EIO;
-                        *val |= ((u64)tmp << 32);
-                }
                 break;
         case ACPI_ADR_SPACE_SYSTEM_IO:
                 status = acpi_os_read_port(address, (u32 *)val, reg->bit_width);
@@ -642,31 +628,18 @@ int apei_write(u64 val, struct acpi_generic_address *reg)
 {
         int rc;
         u64 address;
-        u32 width = reg->bit_width;
         acpi_status status;
 
         rc = apei_check_gar(reg, &address);
         if (rc)
                 return rc;
 
-        if (width == 64)
-                width = 32;     /* Break into two 32-bit transfers */
-
         switch (reg->space_id) {
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                status = acpi_os_write_memory((acpi_physical_address)
-                                              address, ACPI_LODWORD(val),
-                                              width);
+                status = acpi_os_write_memory64((acpi_physical_address)
+                                              address, val, reg->bit_width);
                 if (ACPI_FAILURE(status))
                         return -EIO;
-
-                if (reg->bit_width == 64) {
-                        status = acpi_os_write_memory((acpi_physical_address)
-                                                      (address + 4),
-                                                      ACPI_HIDWORD(val), 32);
-                        if (ACPI_FAILURE(status))
-                                return -EIO;
-                }
                 break;
         case ACPI_ADR_SPACE_SYSTEM_IO:
                 status = acpi_os_write_port(address, val, reg->bit_width);
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 5b898d4dda99..4ca087dd5f4f 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -141,21 +141,6 @@ static DEFINE_MUTEX(einj_mutex);
 
 static void *einj_param;
 
-#ifndef readq
-static inline __u64 readq(volatile void __iomem *addr)
-{
-        return ((__u64)readl(addr+4) << 32) + readl(addr);
-}
-#endif
-
-#ifndef writeq
-static inline void writeq(__u64 val, volatile void __iomem *addr)
-{
-        writel(val, addr);
-        writel(val >> 32, addr+4);
-}
-#endif
-
 static void einj_exec_ctx_init(struct apei_exec_context *ctx)
 {
         apei_exec_ctx_init(ctx, einj_ins_type, ARRAY_SIZE(einj_ins_type),
@@ -204,22 +189,21 @@ static int einj_timedout(u64 *t)
 static void check_vendor_extension(u64 paddr,
                                    struct set_error_type_with_address *v5param)
 {
-        int     offset = readl(&v5param->vendor_extension);
+        int     offset = v5param->vendor_extension;
         struct  vendor_error_type_extension *v;
         u32     sbdf;
 
         if (!offset)
                 return;
-        v = ioremap(paddr + offset, sizeof(*v));
+        v = acpi_os_map_memory(paddr + offset, sizeof(*v));
         if (!v)
                 return;
-        sbdf = readl(&v->pcie_sbdf);
+        sbdf = v->pcie_sbdf;
         sprintf(vendor_dev, "%x:%x:%x.%x vendor_id=%x device_id=%x rev_id=%x\n",
                 sbdf >> 24, (sbdf >> 16) & 0xff,
                 (sbdf >> 11) & 0x1f, (sbdf >> 8) & 0x7,
-                 readw(&v->vendor_id), readw(&v->device_id),
-                readb(&v->rev_id));
-        iounmap(v);
+                 v->vendor_id, v->device_id, v->rev_id);
+        acpi_os_unmap_memory(v, sizeof(*v));
 }
 
 static void *einj_get_parameter_address(void)
@@ -247,7 +231,7 @@ static void *einj_get_parameter_address(void)
         if (paddrv5) {
                 struct set_error_type_with_address *v5param;
 
-                v5param = ioremap(paddrv5, sizeof(*v5param));
+                v5param = acpi_os_map_memory(paddrv5, sizeof(*v5param));
                 if (v5param) {
                         acpi5 = 1;
                         check_vendor_extension(paddrv5, v5param);
@@ -257,17 +241,17 @@ static void *einj_get_parameter_address(void)
         if (paddrv4) {
                 struct einj_parameter *v4param;
 
-                v4param = ioremap(paddrv4, sizeof(*v4param));
+                v4param = acpi_os_map_memory(paddrv4, sizeof(*v4param));
                 if (!v4param)
-                        return 0;
-                if (readq(&v4param->reserved1) || readq(&v4param->reserved2)) {
-                        iounmap(v4param);
-                        return 0;
+                        return NULL;
+                if (v4param->reserved1 || v4param->reserved2) {
+                        acpi_os_unmap_memory(v4param, sizeof(*v4param));
+                        return NULL;
                 }
                 return v4param;
         }
 
-        return 0;
+        return NULL;
 }
 
 /* do sanity check to trigger table */
@@ -276,7 +260,7 @@ static int einj_check_trigger_header(struct acpi_einj_trigger *trigger_tab)
         if (trigger_tab->header_size != sizeof(struct acpi_einj_trigger))
                 return -EINVAL;
         if (trigger_tab->table_size > PAGE_SIZE ||
-            trigger_tab->table_size <= trigger_tab->header_size)
+            trigger_tab->table_size < trigger_tab->header_size)
                 return -EINVAL;
         if (trigger_tab->entry_count !=
             (trigger_tab->table_size - trigger_tab->header_size) /
@@ -340,6 +324,11 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
                            "The trigger error action table is invalid\n");
                 goto out_rel_header;
         }
+
+        /* No action structures in the TRIGGER_ERROR table, nothing to do */
+        if (!trigger_tab->entry_count)
+                goto out_rel_header;
+
         rc = -EIO;
         table_size = trigger_tab->table_size;
         r = request_mem_region(trigger_paddr + sizeof(*trigger_tab),
@@ -435,41 +424,41 @@ static int __einj_error_inject(u32 type, u64 param1, u64 param2)
         if (acpi5) {
                 struct set_error_type_with_address *v5param = einj_param;
 
-                writel(type, &v5param->type);
+                v5param->type = type;
                 if (type & 0x80000000) {
                         switch (vendor_flags) {
                         case SETWA_FLAGS_APICID:
-                                writel(param1, &v5param->apicid);
+                                v5param->apicid = param1;
                                 break;
                         case SETWA_FLAGS_MEM:
-                                writeq(param1, &v5param->memory_address);
-                                writeq(param2, &v5param->memory_address_range);
+                                v5param->memory_address = param1;
+                                v5param->memory_address_range = param2;
                                 break;
                         case SETWA_FLAGS_PCIE_SBDF:
-                                writel(param1, &v5param->pcie_sbdf);
+                                v5param->pcie_sbdf = param1;
                                 break;
                         }
-                        writel(vendor_flags, &v5param->flags);
+                        v5param->flags = vendor_flags;
                 } else {
                         switch (type) {
                         case ACPI_EINJ_PROCESSOR_CORRECTABLE:
                         case ACPI_EINJ_PROCESSOR_UNCORRECTABLE:
                         case ACPI_EINJ_PROCESSOR_FATAL:
-                                writel(param1, &v5param->apicid);
-                                writel(SETWA_FLAGS_APICID, &v5param->flags);
+                                v5param->apicid = param1;
+                                v5param->flags = SETWA_FLAGS_APICID;
                                 break;
                         case ACPI_EINJ_MEMORY_CORRECTABLE:
                         case ACPI_EINJ_MEMORY_UNCORRECTABLE:
                         case ACPI_EINJ_MEMORY_FATAL:
-                                writeq(param1, &v5param->memory_address);
-                                writeq(param2, &v5param->memory_address_range);
-                                writel(SETWA_FLAGS_MEM, &v5param->flags);
+                                v5param->memory_address = param1;
+                                v5param->memory_address_range = param2;
+                                v5param->flags = SETWA_FLAGS_MEM;
                                 break;
                         case ACPI_EINJ_PCIX_CORRECTABLE:
                         case ACPI_EINJ_PCIX_UNCORRECTABLE:
                         case ACPI_EINJ_PCIX_FATAL:
-                                writel(param1, &v5param->pcie_sbdf);
-                                writel(SETWA_FLAGS_PCIE_SBDF, &v5param->flags);
+                                v5param->pcie_sbdf = param1;
+                                v5param->flags = SETWA_FLAGS_PCIE_SBDF;
                                 break;
                         }
                 }
@@ -479,8 +468,8 @@ static int __einj_error_inject(u32 type, u64 param1, u64 param2)
                         return rc;
                 if (einj_param) {
                         struct einj_parameter *v4param = einj_param;
-                        writeq(param1, &v4param->param1);
-                        writeq(param2, &v4param->param2);
+                        v4param->param1 = param1;
+                        v4param->param2 = param2;
                 }
         }
         rc = apei_exec_run(&ctx, ACPI_EINJ_EXECUTE_OPERATION);
@@ -731,8 +720,13 @@ static int __init einj_init(void)
         return 0;
 
 err_unmap:
-        if (einj_param)
-                iounmap(einj_param);
+        if (einj_param) {
+                acpi_size size = (acpi5) ?
+                        sizeof(struct set_error_type_with_address) :
+                        sizeof(struct einj_parameter);
+
+                acpi_os_unmap_memory(einj_param, size);
+        }
         apei_exec_post_unmap_gars(&ctx);
 err_release:
         apei_resources_release(&einj_resources);
@@ -748,8 +742,13 @@ static void __exit einj_exit(void)
 {
         struct apei_exec_context ctx;
 
-        if (einj_param)
-                iounmap(einj_param);
+        if (einj_param) {
+                acpi_size size = (acpi5) ?
+                        sizeof(struct set_error_type_with_address) :
+                        sizeof(struct einj_parameter);
+
+                acpi_os_unmap_memory(einj_param, size);
+        }
         einj_exec_ctx_init(&ctx);
         apei_exec_post_unmap_gars(&ctx);
         apei_resources_release(&einj_resources);
diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c
deleted file mode 100644
index d4a5b3d3657b..000000000000
--- a/drivers/acpi/atomicio.c
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * atomicio.c - ACPI IO memory pre-mapping/post-unmapping, then
- * accessing in atomic context.
- *
- * This is used for NMI handler to access IO memory area, because
- * ioremap/iounmap can not be used in NMI handler. The IO memory area
- * is pre-mapped in process context and accessed in NMI handler.
- *
- * Copyright (C) 2009-2010, Intel Corp.
- *      Author: Huang Ying <ying.huang@intel.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version
- * 2 as published by the Free Software Foundation.
- *
- * 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
- */
-
-#include <linux/kernel.h>
-#include <linux/export.h>
-#include <linux/init.h>
-#include <linux/acpi.h>
-#include <linux/io.h>
-#include <linux/kref.h>
-#include <linux/rculist.h>
-#include <linux/interrupt.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-#include <linux/highmem.h>
-#include <acpi/atomicio.h>
-
-#define ACPI_PFX "ACPI: "
-
-static LIST_HEAD(acpi_iomaps);
-/*
- * Used for mutual exclusion between writers of acpi_iomaps list, for
- * synchronization between readers and writer, RCU is used.
- */
-static DEFINE_SPINLOCK(acpi_iomaps_lock);
-
-struct acpi_iomap {
-        struct list_head list;
-        void __iomem *vaddr;
-        unsigned long size;
-        phys_addr_t paddr;
-        struct kref ref;
-};
-
-/* acpi_iomaps_lock or RCU read lock must be held before calling */
-static struct acpi_iomap *__acpi_find_iomap(phys_addr_t paddr,
-                                            unsigned long size)
-{
-        struct acpi_iomap *map;
-
-        list_for_each_entry_rcu(map, &acpi_iomaps, list) {
-                if (map->paddr + map->size >= paddr + size &&
-                    map->paddr <= paddr)
-                        return map;
-        }
-        return NULL;
-}
-
-/*
- * Atomic "ioremap" used by NMI handler, if the specified IO memory
- * area is not pre-mapped, NULL will be returned.
- *
- * acpi_iomaps_lock or RCU read lock must be held before calling
- */
-static void __iomem *__acpi_ioremap_fast(phys_addr_t paddr,
-                                         unsigned long size)
-{
-        struct acpi_iomap *map;
-
-        map = __acpi_find_iomap(paddr, size/8);
-        if (map)
-                return map->vaddr + (paddr - map->paddr);
-        else
-                return NULL;
-}
-
-/* acpi_iomaps_lock must be held before calling */
-static void __iomem *__acpi_try_ioremap(phys_addr_t paddr,
-                                        unsigned long size)
-{
-        struct acpi_iomap *map;
-
-        map = __acpi_find_iomap(paddr, size);
-        if (map) {
-                kref_get(&map->ref);
-                return map->vaddr + (paddr - map->paddr);
-        } else
-                return NULL;
-}
-
-#ifndef CONFIG_IA64
-#define should_use_kmap(pfn)    page_is_ram(pfn)
-#else
-/* ioremap will take care of cache attributes */
-#define should_use_kmap(pfn)    0
-#endif
-
-static void __iomem *acpi_map(phys_addr_t pg_off, unsigned long pg_sz)
-{
-        unsigned long pfn;
-
-        pfn = pg_off >> PAGE_SHIFT;
-        if (should_use_kmap(pfn)) {
-                if (pg_sz > PAGE_SIZE)
-                        return NULL;
-                return (void __iomem __force *)kmap(pfn_to_page(pfn));
-        } else
-                return ioremap(pg_off, pg_sz);
-}
-
-static void acpi_unmap(phys_addr_t pg_off, void __iomem *vaddr)
-{
-        unsigned long pfn;
-
-        pfn = pg_off >> PAGE_SHIFT;
-        if (page_is_ram(pfn))
-                kunmap(pfn_to_page(pfn));
-        else
-                iounmap(vaddr);
-}
-
-/*
- * Used to pre-map the specified IO memory area. First try to find
- * whether the area is already pre-mapped, if it is, increase the
- * reference count (in __acpi_try_ioremap) and return; otherwise, do
- * the real ioremap, and add the mapping into acpi_iomaps list.
- */
-static void __iomem *acpi_pre_map(phys_addr_t paddr,
-                                  unsigned long size)
-{
-        void __iomem *vaddr;
-        struct acpi_iomap *map;
-        unsigned long pg_sz, flags;
-        phys_addr_t pg_off;
-
-        spin_lock_irqsave(&acpi_iomaps_lock, flags);
-        vaddr = __acpi_try_ioremap(paddr, size);
-        spin_unlock_irqrestore(&acpi_iomaps_lock, flags);
-        if (vaddr)
-                return vaddr;
-
-        pg_off = paddr & PAGE_MASK;
-        pg_sz = ((paddr + size + PAGE_SIZE - 1) & PAGE_MASK) - pg_off;
-        vaddr = acpi_map(pg_off, pg_sz);
-        if (!vaddr)
-                return NULL;
-        map = kmalloc(sizeof(*map), GFP_KERNEL);
-        if (!map)
-                goto err_unmap;
-        INIT_LIST_HEAD(&map->list);
-        map->paddr = pg_off;
-        map->size = pg_sz;
-        map->vaddr = vaddr;
-        kref_init(&map->ref);
-
-        spin_lock_irqsave(&acpi_iomaps_lock, flags);
-        vaddr = __acpi_try_ioremap(paddr, size);
-        if (vaddr) {
-                spin_unlock_irqrestore(&acpi_iomaps_lock, flags);
-                acpi_unmap(pg_off, map->vaddr);
-                kfree(map);
-                return vaddr;
-        }
-        list_add_tail_rcu(&map->list, &acpi_iomaps);
-        spin_unlock_irqrestore(&acpi_iomaps_lock, flags);
-
-        return map->vaddr + (paddr - map->paddr);
-err_unmap:
-        acpi_unmap(pg_off, vaddr);
-        return NULL;
-}
-
-/* acpi_iomaps_lock must be held before calling */
-static void __acpi_kref_del_iomap(struct kref *ref)
-{
-        struct acpi_iomap *map;
-
-        map = container_of(ref, struct acpi_iomap, ref);
-        list_del_rcu(&map->list);
-}
-
-/*
- * Used to post-unmap the specified IO memory area. The iounmap is
- * done only if the reference count goes zero.
- */
-static void acpi_post_unmap(phys_addr_t paddr, unsigned long size)
-{
-        struct acpi_iomap *map;
-        unsigned long flags;
-        int del;
-
-        spin_lock_irqsave(&acpi_iomaps_lock, flags);
-        map = __acpi_find_iomap(paddr, size);
-        BUG_ON(!map);
-        del = kref_put(&map->ref, __acpi_kref_del_iomap);
-        spin_unlock_irqrestore(&acpi_iomaps_lock, flags);
-
-        if (!del)
-                return;
-
-        synchronize_rcu();
-        acpi_unmap(map->paddr, map->vaddr);
-        kfree(map);
-}
-
-/* In NMI handler, should set silent = 1 */
-static int acpi_check_gar(struct acpi_generic_address *reg,
-                          u64 *paddr, int silent)
-{
-        u32 width, space_id;
-
-        width = reg->bit_width;
-        space_id = reg->space_id;
-        /* Handle possible alignment issues */
-        memcpy(paddr, &reg->address, sizeof(*paddr));
-        if (!*paddr) {
-                if (!silent)
-                        pr_warning(FW_BUG ACPI_PFX
-                        "Invalid physical address in GAR [0x%llx/%u/%u]\n",
-                                   *paddr, width, space_id);
-                return -EINVAL;
-        }
-
-        if ((width != 8) && (width != 16) && (width != 32) && (width != 64)) {
-                if (!silent)
-                        pr_warning(FW_BUG ACPI_PFX
-                                   "Invalid bit width in GAR [0x%llx/%u/%u]\n",
-                                   *paddr, width, space_id);
-                return -EINVAL;
-        }
-
-        if (space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY &&
-            space_id != ACPI_ADR_SPACE_SYSTEM_IO) {
-                if (!silent)
-                        pr_warning(FW_BUG ACPI_PFX
-                        "Invalid address space type in GAR [0x%llx/%u/%u]\n",
-                                   *paddr, width, space_id);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-/* Pre-map, working on GAR */
-int acpi_pre_map_gar(struct acpi_generic_address *reg)
-{
-        u64 paddr;
-        void __iomem *vaddr;
-        int rc;
-
-        if (reg->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
-                return 0;
-
-        rc = acpi_check_gar(reg, &paddr, 0);
-        if (rc)
-                return rc;
-
-        vaddr = acpi_pre_map(paddr, reg->bit_width / 8);
-        if (!vaddr)
-                return -EIO;
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(acpi_pre_map_gar);
-
-/* Post-unmap, working on GAR */
-int acpi_post_unmap_gar(struct acpi_generic_address *reg)
-{
-        u64 paddr;
-        int rc;
-
-        if (reg->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
-                return 0;
-
-        rc = acpi_check_gar(reg, &paddr, 0);
-        if (rc)
-                return rc;
-
-        acpi_post_unmap(paddr, reg->bit_width / 8);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(acpi_post_unmap_gar);
-
-#ifdef readq
-static inline u64 read64(const volatile void __iomem *addr)
-{
-        return readq(addr);
-}
-#else
-static inline u64 read64(const volatile void __iomem *addr)
-{
-        u64 l, h;
-        l = readl(addr);
-        h = readl(addr+4);
-        return l | (h << 32);
-}
-#endif
-
-/*
- * Can be used in atomic (including NMI) or process context. RCU read
- * lock can only be released after the IO memory area accessing.
- */
-static int acpi_atomic_read_mem(u64 paddr, u64 *val, u32 width)
-{
-        void __iomem *addr;
-
-        rcu_read_lock();
-        addr = __acpi_ioremap_fast(paddr, width);
-        switch (width) {
-        case 8:
-                *val = readb(addr);
-                break;
-        case 16:
-                *val = readw(addr);
-                break;
-        case 32:
-                *val = readl(addr);
-                break;
-        case 64:
-                *val = read64(addr);
-                break;
-        default:
-                return -EINVAL;
-        }
-        rcu_read_unlock();
-
-        return 0;
-}
-
-#ifdef writeq
-static inline void write64(u64 val, volatile void __iomem *addr)
-{
-        writeq(val, addr);
-}
-#else
-static inline void write64(u64 val, volatile void __iomem *addr)
-{
-        writel(val, addr);
-        writel(val>>32, addr+4);
-}
-#endif
-
-static int acpi_atomic_write_mem(u64 paddr, u64 val, u32 width)
-{
-        void __iomem *addr;
-
-        rcu_read_lock();
-        addr = __acpi_ioremap_fast(paddr, width);
-        switch (width) {
-        case 8:
-                writeb(val, addr);
-                break;
-        case 16:
-                writew(val, addr);
-                break;
-        case 32:
-                writel(val, addr);
-                break;
-        case 64:
-                write64(val, addr);
-                break;
-        default:
-                return -EINVAL;
-        }
-        rcu_read_unlock();
-
-        return 0;
-}
-
-/* GAR accessing in atomic (including NMI) or process context */
-int acpi_atomic_read(u64 *val, struct acpi_generic_address *reg)
-{
-        u64 paddr;
-        int rc;
-
-        rc = acpi_check_gar(reg, &paddr, 1);
-        if (rc)
-                return rc;
-
-        *val = 0;
-        switch (reg->space_id) {
-        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                return acpi_atomic_read_mem(paddr, val, reg->bit_width);
-        case ACPI_ADR_SPACE_SYSTEM_IO:
-                return acpi_os_read_port(paddr, (u32 *)val, reg->bit_width);
-        default:
-                return -EINVAL;
-        }
-}
-EXPORT_SYMBOL_GPL(acpi_atomic_read);
-
-int acpi_atomic_write(u64 val, struct acpi_generic_address *reg)
-{
-        u64 paddr;
-        int rc;
-
-        rc = acpi_check_gar(reg, &paddr, 1);
-        if (rc)
-                return rc;
-
-        switch (reg->space_id) {
-        case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                return acpi_atomic_write_mem(paddr, val, reg->bit_width);
-        case ACPI_ADR_SPACE_SYSTEM_IO:
-                return acpi_os_write_port(paddr, val, reg->bit_width);
-        default:
-                return -EINVAL;
-        }
-}
-EXPORT_SYMBOL_GPL(acpi_atomic_write);
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index fcc12d842bcc..412a1e04a922 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -31,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
+#include <linux/highmem.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/kmod.h>
@@ -321,6 +322,37 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size)
         return NULL;
 }
 
+#ifndef CONFIG_IA64
+#define should_use_kmap(pfn)   page_is_ram(pfn)
+#else
+/* ioremap will take care of cache attributes */
+#define should_use_kmap(pfn)   0
+#endif
+
+static void __iomem *acpi_map(acpi_physical_address pg_off, unsigned long pg_sz)
+{
+        unsigned long pfn;
+
+        pfn = pg_off >> PAGE_SHIFT;
+        if (should_use_kmap(pfn)) {
+                if (pg_sz > PAGE_SIZE)
+                        return NULL;
+                return (void __iomem __force *)kmap(pfn_to_page(pfn));
+        } else
+                return acpi_os_ioremap(pg_off, pg_sz);
+}
+
+static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr)
+{
+        unsigned long pfn;
+
+        pfn = pg_off >> PAGE_SHIFT;
+        if (page_is_ram(pfn))
+                kunmap(pfn_to_page(pfn));
+        else
+                iounmap(vaddr);
+}
+
 void __iomem *__init_refok
 acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
 {
@@ -353,7 +385,7 @@ acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
 
         pg_off = round_down(phys, PAGE_SIZE);
         pg_sz = round_up(phys + size, PAGE_SIZE) - pg_off;
-        virt = acpi_os_ioremap(pg_off, pg_sz);
+        virt = acpi_map(pg_off, pg_sz);
         if (!virt) {
                 mutex_unlock(&acpi_ioremap_lock);
                 kfree(map);
@@ -384,7 +416,7 @@ static void acpi_os_map_cleanup(struct acpi_ioremap *map)
 {
         if (!map->refcount) {
                 synchronize_rcu();
-                iounmap(map->virt);
+                acpi_unmap(map->phys, map->virt);
                 kfree(map);
         }
 }
@@ -710,6 +742,67 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
         return AE_OK;
 }
 
+#ifdef readq
+static inline u64 read64(const volatile void __iomem *addr)
+{
+        return readq(addr);
+}
+#else
+static inline u64 read64(const volatile void __iomem *addr)
+{
+        u64 l, h;
+        l = readl(addr);
+        h = readl(addr+4);
+        return l | (h << 32);
+}
+#endif
+
+acpi_status
+acpi_os_read_memory64(acpi_physical_address phys_addr, u64 *value, u32 width)
+{
+        void __iomem *virt_addr;
+        unsigned int size = width / 8;
+        bool unmap = false;
+        u64 dummy;
+
+        rcu_read_lock();
+        virt_addr = acpi_map_vaddr_lookup(phys_addr, size);
+        if (!virt_addr) {
+                rcu_read_unlock();
+                virt_addr = acpi_os_ioremap(phys_addr, size);
+                if (!virt_addr)
+                        return AE_BAD_ADDRESS;
+                unmap = true;
+        }
+
+        if (!value)
+                value = &dummy;
+
+        switch (width) {
+        case 8:
+                *(u8 *) value = readb(virt_addr);
+                break;
+        case 16:
+                *(u16 *) value = readw(virt_addr);
+                break;
+        case 32:
+                *(u32 *) value = readl(virt_addr);
+                break;
+        case 64:
+                *(u64 *) value = read64(virt_addr);
+                break;
+        default:
+                BUG();
+        }
+
+        if (unmap)
+                iounmap(virt_addr);
+        else
+                rcu_read_unlock();
+
+        return AE_OK;
+}
+
 acpi_status
 acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
 {
@@ -749,6 +842,61 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
         return AE_OK;
 }
 
+#ifdef writeq
+static inline void write64(u64 val, volatile void __iomem *addr)
+{
+        writeq(val, addr);
+}
+#else
+static inline void write64(u64 val, volatile void __iomem *addr)
+{
+        writel(val, addr);
+        writel(val>>32, addr+4);
+}
+#endif
+
+acpi_status
+acpi_os_write_memory64(acpi_physical_address phys_addr, u64 value, u32 width)
+{
+        void __iomem *virt_addr;
+        unsigned int size = width / 8;
+        bool unmap = false;
+
+        rcu_read_lock();
+        virt_addr = acpi_map_vaddr_lookup(phys_addr, size);
+        if (!virt_addr) {
+                rcu_read_unlock();
+                virt_addr = acpi_os_ioremap(phys_addr, size);
+                if (!virt_addr)
+                        return AE_BAD_ADDRESS;
+                unmap = true;
+        }
+
+        switch (width) {
+        case 8:
+                writeb(value, virt_addr);
+                break;
+        case 16:
+                writew(value, virt_addr);
+                break;
+        case 32:
+                writel(value, virt_addr);
+                break;
+        case 64:
+                write64(value, virt_addr);
+                break;
+        default:
+                BUG();
+        }
+
+        if (unmap)
+                iounmap(virt_addr);
+        else
+                rcu_read_unlock();
+
+        return AE_OK;
+}
+
 acpi_status
 acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
                                u64 *value, u32 width)
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 0034ede38710..8ae05ce18500 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -84,7 +84,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type);
 static void acpi_processor_notify(struct acpi_device *device, u32 event);
 static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr);
 static int acpi_processor_handle_eject(struct acpi_processor *pr);
-
+static int acpi_processor_start(struct acpi_processor *pr);
 
 static const struct acpi_device_id processor_device_ids[] = {
         {ACPI_PROCESSOR_OBJECT_HID, 0},
@@ -423,10 +423,29 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
         struct acpi_processor *pr = per_cpu(processors, cpu);
 
         if (action == CPU_ONLINE && pr) {
-                acpi_processor_ppc_has_changed(pr, 0);
-                acpi_processor_hotplug(pr);
-                acpi_processor_reevaluate_tstate(pr, action);
-                acpi_processor_tstate_has_changed(pr);
+                /* CPU got physically hotplugged and onlined the first time:
+                 * Initialize missing things
+                 */
+                if (pr->flags.need_hotplug_init) {
+                        struct cpuidle_driver *idle_driver =
+                                cpuidle_get_driver();
+
+                        printk(KERN_INFO "Will online and init hotplugged "
+                               "CPU: %d\n", pr->id);
+                        WARN(acpi_processor_start(pr), "Failed to start CPU:"
+                                " %d\n", pr->id);
+                        pr->flags.need_hotplug_init = 0;
+                        if (idle_driver && !strcmp(idle_driver->name,
+                                                   "intel_idle")) {
+                                intel_idle_cpu_init(pr->id);
+                        }
+                /* Normal CPU soft online event */
+                } else {
+                        acpi_processor_ppc_has_changed(pr, 0);
+                        acpi_processor_cst_has_changed(pr);
+                        acpi_processor_reevaluate_tstate(pr, action);
+                        acpi_processor_tstate_has_changed(pr);
+                }
         }
         if (action == CPU_DEAD && pr) {
                 /* invalidate the flag.throttling after one CPU is offline */
@@ -440,6 +459,71 @@ static struct notifier_block acpi_cpu_notifier =
             .notifier_call = acpi_cpu_soft_notify,
 };
 
+/*
+ * acpi_processor_start() is called by the cpu_hotplug_notifier func:
+ * acpi_cpu_soft_notify(). Getting it __cpuinit{data} is difficult, the
+ * root cause seem to be that acpi_processor_uninstall_hotplug_notify()
+ * is in the module_exit (__exit) func. Allowing acpi_processor_start()
+ * to not be in __cpuinit section, but being called from __cpuinit funcs
+ * via __ref looks like the right thing to do here.
+ */
+static __ref int acpi_processor_start(struct acpi_processor *pr)
+{
+        struct acpi_device *device = per_cpu(processor_device_array, pr->id);
+        int result = 0;
+
+#ifdef CONFIG_CPU_FREQ
+        acpi_processor_ppc_has_changed(pr, 0);
+#endif
+        acpi_processor_get_throttling_info(pr);
+        acpi_processor_get_limit_info(pr);
+
+        if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
+                acpi_processor_power_init(pr, device);
+
+        pr->cdev = thermal_cooling_device_register("Processor", device,
+                                                   &processor_cooling_ops);
+        if (IS_ERR(pr->cdev)) {
+                result = PTR_ERR(pr->cdev);
+                goto err_power_exit;
+        }
+
+        dev_dbg(&device->dev, "registered as cooling_device%d\n",
+                pr->cdev->id);
+
+        result = sysfs_create_link(&device->dev.kobj,
+                                   &pr->cdev->device.kobj,
+                                   "thermal_cooling");
+        if (result) {
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
+                goto err_thermal_unregister;
+        }
+        result = sysfs_create_link(&pr->cdev->device.kobj,
+                                   &device->dev.kobj,
+                                   "device");
+        if (result) {
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
+                goto err_remove_sysfs_thermal;
+        }
+
+        return 0;
+
+err_remove_sysfs_thermal:
+        sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
+err_thermal_unregister:
+        thermal_cooling_device_unregister(pr->cdev);
+err_power_exit:
+        acpi_processor_power_exit(pr, device);
+
+        return result;
+}
+
+/*
+ * Do not put anything in here which needs the core to be online.
+ * For example MSR access or setting up things which check for cpuinfo_x86
+ * (cpu_data(cpu)) values, like CPU feature flags, family, model, etc.
+ * Such things have to be put in and set up above in acpi_processor_start()
+ */
 static int __cpuinit acpi_processor_add(struct acpi_device *device)
 {
         struct acpi_processor *pr = NULL;
@@ -495,48 +579,20 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
                 goto err_free_cpumask;
         }
 
-#ifdef CONFIG_CPU_FREQ
-        acpi_processor_ppc_has_changed(pr, 0);
-#endif
-        acpi_processor_get_throttling_info(pr);
-        acpi_processor_get_limit_info(pr);
-
-        if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
-                acpi_processor_power_init(pr, device);
-
-        pr->cdev = thermal_cooling_device_register("Processor", device,
-                                                &processor_cooling_ops);
-        if (IS_ERR(pr->cdev)) {
-                result = PTR_ERR(pr->cdev);
-                goto err_power_exit;
-        }
-
-        dev_dbg(&device->dev, "registered as cooling_device%d\n",
-                 pr->cdev->id);
+        /*
+         * Do not start hotplugged CPUs now, but when they
+         * are onlined the first time
+         */
+        if (pr->flags.need_hotplug_init)
+                return 0;
 
-        result = sysfs_create_link(&device->dev.kobj,
-                                   &pr->cdev->device.kobj,
-                                   "thermal_cooling");
-        if (result) {
-                printk(KERN_ERR PREFIX "Create sysfs link\n");
-                goto err_thermal_unregister;
-        }
-        result = sysfs_create_link(&pr->cdev->device.kobj,
-                                   &device->dev.kobj,
-                                   "device");
-        if (result) {
-                printk(KERN_ERR PREFIX "Create sysfs link\n");
+        result = acpi_processor_start(pr);
+        if (result)
                 goto err_remove_sysfs;
-        }
 
         return 0;
 
 err_remove_sysfs:
-        sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
-err_thermal_unregister:
-        thermal_cooling_device_unregister(pr->cdev);
-err_power_exit:
-        acpi_processor_power_exit(pr, device);
         sysfs_remove_link(&device->dev.kobj, "sysdev");
 err_free_cpumask:
         free_cpumask_var(pr->throttling.shared_cpu_map);
@@ -735,6 +791,17 @@ static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)
                 return AE_ERROR;
         }
 
+        /* CPU got hot-plugged, but cpu_data is not initialized yet
+         * Set flag to delay cpu_idle/throttling initialization
+         * in:
+         * acpi_processor_add()
+         *   acpi_processor_get_info()
+         * and do it when the CPU gets online the first time
+         * TBD: Cleanup above functions and try to do this more elegant.
+         */
+        printk(KERN_INFO "CPU %d got hotplugged\n", pr->id);
+        pr->flags.need_hotplug_init = 1;
+
         return AE_OK;
 }
 
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 0a7ed69546ba..ca191ff97844 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -438,6 +438,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
         },
         {
         .callback = init_nvs_nosave,
+        .ident = "Sony Vaio VPCCW29FX",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                DMI_MATCH(DMI_PRODUCT_NAME, "VPCCW29FX"),
+                },
+        },
+        {
+        .callback = init_nvs_nosave,
         .ident = "Averatec AV1020-ED2",
         .matches = {
                 DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"),
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index a7d91a72ee35..53d3770a0b1b 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@ -207,11 +207,11 @@ static void set_smc_timing(struct device *dev, struct ata_device *adev,
 {
         int ret = 0;
         int use_iordy;
+        struct sam9_smc_config smc;
         unsigned int t6z;         /* data tristate time in ns */
         unsigned int cycle;       /* SMC Cycle width in MCK ticks */
         unsigned int setup;       /* SMC Setup width in MCK ticks */
         unsigned int pulse;       /* CFIOR and CFIOW pulse width in MCK ticks */
-        unsigned int cs_setup = 0;/* CS4 or CS5 setup width in MCK ticks */
         unsigned int cs_pulse;    /* CS4 or CS5 pulse width in MCK ticks*/
         unsigned int tdf_cycles;  /* SMC TDF MCK ticks */
         unsigned long mck_hz;     /* MCK frequency in Hz */
@@ -244,26 +244,20 @@ static void set_smc_timing(struct device *dev, struct ata_device *adev,
         }
 
         dev_dbg(dev, "Use IORDY=%u, TDF Cycles=%u\n", use_iordy, tdf_cycles);
-        info->mode |= AT91_SMC_TDF_(tdf_cycles);
-
-        /* write SMC Setup Register */
-        at91_sys_write(AT91_SMC_SETUP(info->cs),
-                        AT91_SMC_NWESETUP_(setup) |
-                        AT91_SMC_NRDSETUP_(setup) |
-                        AT91_SMC_NCS_WRSETUP_(cs_setup) |
-                        AT91_SMC_NCS_RDSETUP_(cs_setup));
-        /* write SMC Pulse Register */
-        at91_sys_write(AT91_SMC_PULSE(info->cs),
-                        AT91_SMC_NWEPULSE_(pulse) |
-                        AT91_SMC_NRDPULSE_(pulse) |
-                        AT91_SMC_NCS_WRPULSE_(cs_pulse) |
-                        AT91_SMC_NCS_RDPULSE_(cs_pulse));
-        /* write SMC Cycle Register */
-        at91_sys_write(AT91_SMC_CYCLE(info->cs),
-                        AT91_SMC_NWECYCLE_(cycle) |
-                        AT91_SMC_NRDCYCLE_(cycle));
-        /* write SMC Mode Register*/
-        at91_sys_write(AT91_SMC_MODE(info->cs), info->mode);
+
+        /* SMC Setup Register */
+        smc.nwe_setup = smc.nrd_setup = setup;
+        smc.ncs_write_setup = smc.ncs_read_setup = 0;
+        /* SMC Pulse Register */
+        smc.nwe_pulse = smc.nrd_pulse = pulse;
+        smc.ncs_write_pulse = smc.ncs_read_pulse = cs_pulse;
+        /* SMC Cycle Register */
+        smc.write_cycle = smc.read_cycle = cycle;
+        /* SMC Mode Register*/
+        smc.tdf_cycles = tdf_cycles;
+        smc.mode = info->mode;
+
+        sam9_smc_configure(0, info->cs, &smc);
 }
 
 static void pata_at91_set_piomode(struct ata_port *ap, struct ata_device *adev)
@@ -288,20 +282,20 @@ static unsigned int pata_at91_data_xfer_noirq(struct ata_device *dev,
         struct at91_ide_info *info = dev->link->ap->host->private_data;
         unsigned int consumed;
         unsigned long flags;
-        unsigned int mode;
+        struct sam9_smc_config smc;
 
         local_irq_save(flags);
-        mode = at91_sys_read(AT91_SMC_MODE(info->cs));
+        sam9_smc_read_mode(0, info->cs, &smc);
 
         /* set 16bit mode before writing data */
-        at91_sys_write(AT91_SMC_MODE(info->cs),
-                        (mode & ~AT91_SMC_DBW) | AT91_SMC_DBW_16);
+        smc.mode = (smc.mode & ~AT91_SMC_DBW) | AT91_SMC_DBW_16;
+        sam9_smc_write_mode(0, info->cs, &smc);
 
         consumed = ata_sff_data_xfer(dev, buf, buflen, rw);
 
         /* restore 8bit mode after data is written */
-        at91_sys_write(AT91_SMC_MODE(info->cs),
-                        (mode & ~AT91_SMC_DBW) | AT91_SMC_DBW_8);
+        smc.mode = (smc.mode & ~AT91_SMC_DBW) | AT91_SMC_DBW_8;
+        sam9_smc_write_mode(0, info->cs, &smc);
 
         local_irq_restore(flags);
         return consumed;
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 2c8272dd93c4..610f9997a403 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -1,6 +1,6 @@
 # Makefile for the Linux device tree
 
-obj-y                   := core.o sys.o bus.o dd.o syscore.o \
+obj-y                   := core.o bus.o dd.o syscore.o \
                            driver.o class.o platform.o \
                            cpu.o firmware.o init.o map.o devres.o \
                            attribute_container.o transport_class.o \
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 99dc5921e1dd..40fb12288ce2 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -915,9 +915,10 @@ static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store);
 
 /**
  * __bus_register - register a driver-core subsystem
- * @bus: bus.
+ * @bus: bus to register
+ * @key: lockdep class key
  *
- * Once we have that, we registered the bus with the kobject
+ * Once we have that, we register the bus with the kobject
  * infrastructure, then register the children subsystems it has:
  * the devices and drivers that belong to the subsystem.
  */
@@ -1220,8 +1221,8 @@ static void system_root_device_release(struct device *dev)
 }
 /**
  * subsys_system_register - register a subsystem at /sys/devices/system/
- * @subsys - system subsystem
- * @groups - default attributes for the root device
+ * @subsys: system subsystem
+ * @groups: default attributes for the root device
  *
  * All 'system' subsystems have a /sys/devices/system/<name> root device
  * with the name of the subsystem. The root device can carry subsystem-
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 4a67cc0c8b37..74dda4f697f9 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -632,6 +632,11 @@ static void klist_children_put(struct klist_node *n)
  * may be used for reference counting of @dev after calling this
  * function.
  *
+ * All fields in @dev must be initialized by the caller to 0, except
+ * for those explicitly set to some other value.  The simplest
+ * approach is to use kzalloc() to allocate the structure containing
+ * @dev.
+ *
  * NOTE: Use put_device() to give up your reference instead of freeing
  * @dev directly once you have called this function.
  */
@@ -930,6 +935,13 @@ int device_private_init(struct device *dev)
  * to the global and sibling lists for the device, then
  * adds it to the other relevant subsystems of the driver model.
  *
+ * Do not call this routine or device_register() more than once for
+ * any device structure.  The driver model core is not designed to work
+ * with devices that get unregistered and then spring back to life.
+ * (Among other things, it's very hard to guarantee that all references
+ * to the previous incarnation of @dev have been dropped.)  Allocate
+ * and register a fresh new struct device instead.
+ *
  * NOTE: _Never_ directly free @dev after calling this function, even
  * if it returned an error! Always use put_device() to give up your
  * reference instead.
@@ -1022,7 +1034,7 @@ int device_add(struct device *dev)
         device_pm_add(dev);
 
         /* Notify clients of device addition.  This call must come
-         * after dpm_sysf_add() and before kobject_uevent().
+         * after dpm_sysfs_add() and before kobject_uevent().
          */
         if (dev->bus)
                 blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
@@ -1090,6 +1102,9 @@ name_error:
  * have a clearly defined need to use and refcount the device
  * before it is added to the hierarchy.
  *
+ * For more information, see the kerneldoc for device_initialize()
+ * and device_add().
+ *
  * NOTE: _Never_ directly free @dev after calling this function, even
  * if it returned an error! Always use put_device() to give up the
  * reference initialized in this function instead.
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index db87e78d7459..4dabf5077c48 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -208,6 +208,25 @@ static ssize_t print_cpus_offline(struct device *dev,
 }
 static DEVICE_ATTR(offline, 0444, print_cpus_offline, NULL);
 
+static void cpu_device_release(struct device *dev)
+{
+        /*
+         * This is an empty function to prevent the driver core from spitting a
+         * warning at us.  Yes, I know this is directly opposite of what the
+         * documentation for the driver core and kobjects say, and the author
+         * of this code has already been publically ridiculed for doing
+         * something as foolish as this.  However, at this point in time, it is
+         * the only way to handle the issue of statically allocated cpu
+         * devices.  The different architectures will have their cpu device
+         * code reworked to properly handle this in the near future, so this
+         * function will then be changed to correctly free up the memory held
+         * by the cpu device.
+         *
+         * Never copy this way of doing things, or you too will be made fun of
+         * on the linux-kerenl list, you have been warned.
+         */
+}
+
 /*
  * register_cpu - Setup a sysfs device for a CPU.
  * @cpu - cpu->hotpluggable field set to 1 will generate a control file in
@@ -221,8 +240,10 @@ int __cpuinit register_cpu(struct cpu *cpu, int num)
         int error;
 
         cpu->node_id = cpu_to_node(num);
+        memset(&cpu->dev, 0x00, sizeof(struct device));
         cpu->dev.id = num;
         cpu->dev.bus = &cpu_subsys;
+        cpu->dev.release = cpu_device_release;
         error = device_register(&cpu->dev);
         if (!error && cpu->hotpluggable)
                 register_cpu_control(cpu);
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 26ab358dac62..6c9387d646ec 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -525,8 +525,7 @@ static int _request_firmware(const struct firmware **firmware_p,
         if (!firmware) {
                 dev_err(device, "%s: kmalloc(struct firmware) failed\n",
                         __func__);
-                retval = -ENOMEM;
-                goto out;
+                return -ENOMEM;
         }
 
         if (fw_get_builtin_firmware(firmware, name)) {
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index ed5de58c340f..9e60dbe9fd94 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -572,19 +572,36 @@ static int init_memory_block(struct memory_block **memory,
 }
 
 static int add_memory_section(int nid, struct mem_section *section,
+                        struct memory_block **mem_p,
                         unsigned long state, enum mem_add_context context)
 {
-        struct memory_block *mem;
+        struct memory_block *mem = NULL;
+        int scn_nr = __section_nr(section);
         int ret = 0;
 
         mutex_lock(&mem_sysfs_mutex);
 
-        mem = find_memory_block(section);
+        if (context == BOOT) {
+                /* same memory block ? */
+                if (mem_p && *mem_p)
+                        if (scn_nr >= (*mem_p)->start_section_nr &&
+                            scn_nr <= (*mem_p)->end_section_nr) {
+                                mem = *mem_p;
+                                kobject_get(&mem->dev.kobj);
+                        }
+        } else
+                mem = find_memory_block(section);
+
         if (mem) {
                 mem->section_count++;
                 kobject_put(&mem->dev.kobj);
-        } else
+        } else {
                 ret = init_memory_block(&mem, section, state);
+                /* store memory_block pointer for next loop */
+                if (!ret && context == BOOT)
+                        if (mem_p)
+                                *mem_p = mem;
+        }
 
         if (!ret) {
                 if (context == HOTPLUG &&
@@ -627,7 +644,7 @@ int remove_memory_block(unsigned long node_id, struct mem_section *section,
  */
 int register_new_memory(int nid, struct mem_section *section)
 {
-        return add_memory_section(nid, section, MEM_OFFLINE, HOTPLUG);
+        return add_memory_section(nid, section, NULL, MEM_OFFLINE, HOTPLUG);
 }
 
 int unregister_memory_section(struct mem_section *section)
@@ -647,6 +664,7 @@ int __init memory_dev_init(void)
         int ret;
         int err;
         unsigned long block_sz;
+        struct memory_block *mem = NULL;
 
         ret = subsys_system_register(&memory_subsys, NULL);
         if (ret)
@@ -662,7 +680,10 @@ int __init memory_dev_init(void)
         for (i = 0; i < NR_MEM_SECTIONS; i++) {
                 if (!present_section_nr(i))
                         continue;
-                err = add_memory_section(0, __nr_to_section(i), MEM_ONLINE,
+                /* don't need to reuse memory_block if only one per block */
+                err = add_memory_section(0, __nr_to_section(i),
+                                 (sections_per_block == 1) ? NULL : &mem,
+                                         MEM_ONLINE,
                                          BOOT);
                 if (!ret)
                         ret = err;
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 44f427a66117..90aa2a11a933 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -456,7 +456,15 @@ static int link_mem_sections(int nid)
                 if (!present_section_nr(section_nr))
                         continue;
                 mem_sect = __nr_to_section(section_nr);
+
+                /* same memblock ? */
+                if (mem_blk)
+                        if ((section_nr >= mem_blk->start_section_nr) &&
+                            (section_nr <= mem_blk->end_section_nr))
+                                continue;
+
                 mem_blk = find_memory_block_hinted(mem_sect, mem_blk);
+
                 ret = register_mem_sect_under_node(mem_blk, nid);
                 if (!err)
                         err = ret;
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 1ead66186b7c..d1daa5e9fadf 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -53,7 +53,7 @@ static int regcache_hw_init(struct regmap *map)
         for (count = 0, i = 0; i < map->num_reg_defaults_raw; i++) {
                 val = regcache_get_val(map->reg_defaults_raw,
                                        i, map->cache_word_size);
-                if (!val)
+                if (regmap_volatile(map, i))
                         continue;
                 count++;
         }
@@ -70,7 +70,7 @@ static int regcache_hw_init(struct regmap *map)
         for (i = 0, j = 0; i < map->num_reg_defaults_raw; i++) {
                 val = regcache_get_val(map->reg_defaults_raw,
                                        i, map->cache_word_size);
-                if (!val)
+                if (regmap_volatile(map, i))
                         continue;
                 map->reg_defaults[j].reg = i;
                 map->reg_defaults[j].def = val;
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index be10a4ff6609..65558034318f 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -284,6 +284,9 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
         map->precious_reg = config->precious_reg;
         map->cache_type = config->cache_type;
 
+        map->cache_bypass = false;
+        map->cache_only = false;
+
         ret = regcache_init(map, config);
 
         mutex_unlock(&map->lock);
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
deleted file mode 100644
index 409f5ce78829..000000000000
--- a/drivers/base/sys.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * sys.c - pseudo-bus for system 'devices' (cpus, PICs, timers, etc)
- *
- * Copyright (c) 2002-3 Patrick Mochel
- *               2002-3 Open Source Development Lab
- *
- * This file is released under the GPLv2
- *
- * This exports a 'system' bus type.
- * By default, a 'sys' bus gets added to the root of the system. There will
- * always be core system devices. Devices can use sysdev_register() to
- * add themselves as children of the system bus.
- */
-
-#include <linux/sysdev.h>
-#include <linux/err.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/pm.h>
-#include <linux/device.h>
-#include <linux/mutex.h>
-#include <linux/interrupt.h>
-
-#include "base.h"
-
-#define to_sysdev(k) container_of(k, struct sys_device, kobj)
-#define to_sysdev_attr(a) container_of(a, struct sysdev_attribute, attr)
-
-
-static ssize_t
-sysdev_show(struct kobject *kobj, struct attribute *attr, char *buffer)
-{
-        struct sys_device *sysdev = to_sysdev(kobj);
-        struct sysdev_attribute *sysdev_attr = to_sysdev_attr(attr);
-
-        if (sysdev_attr->show)
-                return sysdev_attr->show(sysdev, sysdev_attr, buffer);
-        return -EIO;
-}
-
-
-static ssize_t
-sysdev_store(struct kobject *kobj, struct attribute *attr,
-             const char *buffer, size_t count)
-{
-        struct sys_device *sysdev = to_sysdev(kobj);
-        struct sysdev_attribute *sysdev_attr = to_sysdev_attr(attr);
-
-        if (sysdev_attr->store)
-                return sysdev_attr->store(sysdev, sysdev_attr, buffer, count);
-        return -EIO;
-}
-
-static const struct sysfs_ops sysfs_ops = {
-        .show   = sysdev_show,
-        .store  = sysdev_store,
-};
-
-static struct kobj_type ktype_sysdev = {
-        .sysfs_ops      = &sysfs_ops,
-};
-
-
-int sysdev_create_file(struct sys_device *s, struct sysdev_attribute *a)
-{
-        return sysfs_create_file(&s->kobj, &a->attr);
-}
-
-
-void sysdev_remove_file(struct sys_device *s, struct sysdev_attribute *a)
-{
-        sysfs_remove_file(&s->kobj, &a->attr);
-}
-
-EXPORT_SYMBOL_GPL(sysdev_create_file);
-EXPORT_SYMBOL_GPL(sysdev_remove_file);
-
-#define to_sysdev_class(k) container_of(k, struct sysdev_class, kset.kobj)
-#define to_sysdev_class_attr(a) container_of(a, \
-        struct sysdev_class_attribute, attr)
-
-static ssize_t sysdev_class_show(struct kobject *kobj, struct attribute *attr,
-                                 char *buffer)
-{
-        struct sysdev_class *class = to_sysdev_class(kobj);
-        struct sysdev_class_attribute *class_attr = to_sysdev_class_attr(attr);
-
-        if (class_attr->show)
-                return class_attr->show(class, class_attr, buffer);
-        return -EIO;
-}
-
-static ssize_t sysdev_class_store(struct kobject *kobj, struct attribute *attr,
-                                  const char *buffer, size_t count)
-{
-        struct sysdev_class *class = to_sysdev_class(kobj);
-        struct sysdev_class_attribute *class_attr = to_sysdev_class_attr(attr);
-
-        if (class_attr->store)
-                return class_attr->store(class, class_attr, buffer, count);
-        return -EIO;
-}
-
-static const struct sysfs_ops sysfs_class_ops = {
-        .show   = sysdev_class_show,
-        .store  = sysdev_class_store,
-};
-
-static struct kobj_type ktype_sysdev_class = {
-        .sysfs_ops      = &sysfs_class_ops,
-};
-
-int sysdev_class_create_file(struct sysdev_class *c,
-                             struct sysdev_class_attribute *a)
-{
-        return sysfs_create_file(&c->kset.kobj, &a->attr);
-}
-EXPORT_SYMBOL_GPL(sysdev_class_create_file);
-
-void sysdev_class_remove_file(struct sysdev_class *c,
-                              struct sysdev_class_attribute *a)
-{
-        sysfs_remove_file(&c->kset.kobj, &a->attr);
-}
-EXPORT_SYMBOL_GPL(sysdev_class_remove_file);
-
-extern struct kset *system_kset;
-
-int sysdev_class_register(struct sysdev_class *cls)
-{
-        int retval;
-
-        pr_debug("Registering sysdev class '%s'\n", cls->name);
-
-        INIT_LIST_HEAD(&cls->drivers);
-        memset(&cls->kset.kobj, 0x00, sizeof(struct kobject));
-        cls->kset.kobj.parent = &system_kset->kobj;
-        cls->kset.kobj.ktype = &ktype_sysdev_class;
-        cls->kset.kobj.kset = system_kset;
-
-        retval = kobject_set_name(&cls->kset.kobj, "%s", cls->name);
-        if (retval)
-                return retval;
-
-        retval = kset_register(&cls->kset);
-        if (!retval && cls->attrs)
-                retval = sysfs_create_files(&cls->kset.kobj,
-                                            (const struct attribute **)cls->attrs);
-        return retval;
-}
-
-void sysdev_class_unregister(struct sysdev_class *cls)
-{
-        pr_debug("Unregistering sysdev class '%s'\n",
-                 kobject_name(&cls->kset.kobj));
-        if (cls->attrs)
-                sysfs_remove_files(&cls->kset.kobj,
-                                   (const struct attribute **)cls->attrs);
-        kset_unregister(&cls->kset);
-}
-
-EXPORT_SYMBOL_GPL(sysdev_class_register);
-EXPORT_SYMBOL_GPL(sysdev_class_unregister);
-
-static DEFINE_MUTEX(sysdev_drivers_lock);
-
-/*
- * @dev != NULL means that we're unwinding because some drv->add()
- * failed for some reason. You need to grab sysdev_drivers_lock before
- * calling this.
- */
-static void __sysdev_driver_remove(struct sysdev_class *cls,
-                                   struct sysdev_driver *drv,
-                                   struct sys_device *from_dev)
-{
-        struct sys_device *dev = from_dev;
-
-        list_del_init(&drv->entry);
-        if (!cls)
-                return;
-
-        if (!drv->remove)
-                goto kset_put;
-
-        if (dev)
-                list_for_each_entry_continue_reverse(dev, &cls->kset.list,
-                                                     kobj.entry)
-                        drv->remove(dev);
-        else
-                list_for_each_entry(dev, &cls->kset.list, kobj.entry)
-                        drv->remove(dev);
-
-kset_put:
-        kset_put(&cls->kset);
-}
-
-/**
- *      sysdev_driver_register - Register auxiliary driver
- *      @cls:   Device class driver belongs to.
- *      @drv:   Driver.
- *
- *      @drv is inserted into @cls->drivers to be
- *      called on each operation on devices of that class. The refcount
- *      of @cls is incremented.
- */
-int sysdev_driver_register(struct sysdev_class *cls, struct sysdev_driver *drv)
-{
-        struct sys_device *dev = NULL;
-        int err = 0;
-
-        if (!cls) {
-                WARN(1, KERN_WARNING "sysdev: invalid class passed to %s!\n",
-                        __func__);
-                return -EINVAL;
-        }
-
-        /* Check whether this driver has already been added to a class. */
-        if (drv->entry.next && !list_empty(&drv->entry))
-                WARN(1, KERN_WARNING "sysdev: class %s: driver (%p) has already"
-                        " been registered to a class, something is wrong, but "
-                        "will forge on!\n", cls->name, drv);
-
-        mutex_lock(&sysdev_drivers_lock);
-        if (cls && kset_get(&cls->kset)) {
-                list_add_tail(&drv->entry, &cls->drivers);
-
-                /* If devices of this class already exist, tell the driver */
-                if (drv->add) {
-                        list_for_each_entry(dev, &cls->kset.list, kobj.entry) {
-                                err = drv->add(dev);
-                                if (err)
-                                        goto unwind;
-                        }
-                }
-        } else {
-                err = -EINVAL;
-                WARN(1, KERN_ERR "%s: invalid device class\n", __func__);
-        }
-
-        goto unlock;
-
-unwind:
-        __sysdev_driver_remove(cls, drv, dev);
-
-unlock:
-        mutex_unlock(&sysdev_drivers_lock);
-        return err;
-}
-
-/**
- *      sysdev_driver_unregister - Remove an auxiliary driver.
- *      @cls:   Class driver belongs to.
- *      @drv:   Driver.
- */
-void sysdev_driver_unregister(struct sysdev_class *cls,
-                              struct sysdev_driver *drv)
-{
-        mutex_lock(&sysdev_drivers_lock);
-        __sysdev_driver_remove(cls, drv, NULL);
-        mutex_unlock(&sysdev_drivers_lock);
-}
-EXPORT_SYMBOL_GPL(sysdev_driver_register);
-EXPORT_SYMBOL_GPL(sysdev_driver_unregister);
-
-/**
- *      sysdev_register - add a system device to the tree
- *      @sysdev:        device in question
- *
- */
-int sysdev_register(struct sys_device *sysdev)
-{
-        int error;
-        struct sysdev_class *cls = sysdev->cls;
-
-        if (!cls)
-                return -EINVAL;
-
-        pr_debug("Registering sys device of class '%s'\n",
-                 kobject_name(&cls->kset.kobj));
-
-        /* initialize the kobject to 0, in case it had previously been used */
-        memset(&sysdev->kobj, 0x00, sizeof(struct kobject));
-
-        /* Make sure the kset is set */
-        sysdev->kobj.kset = &cls->kset;
-
-        /* Register the object */
-        error = kobject_init_and_add(&sysdev->kobj, &ktype_sysdev, NULL,
-                                     "%s%d", kobject_name(&cls->kset.kobj),
-                                     sysdev->id);
-
-        if (!error) {
-                struct sysdev_driver *drv;
-
-                pr_debug("Registering sys device '%s'\n",
-                         kobject_name(&sysdev->kobj));
-
-                mutex_lock(&sysdev_drivers_lock);
-                /* Generic notification is implicit, because it's that
-                 * code that should have called us.
-                 */
-
-                /* Notify class auxiliary drivers */
-                list_for_each_entry(drv, &cls->drivers, entry) {
-                        if (drv->add)
-                                drv->add(sysdev);
-                }
-                mutex_unlock(&sysdev_drivers_lock);
-                kobject_uevent(&sysdev->kobj, KOBJ_ADD);
-        }
-
-        return error;
-}
-
-void sysdev_unregister(struct sys_device *sysdev)
-{
-        struct sysdev_driver *drv;
-
-        mutex_lock(&sysdev_drivers_lock);
-        list_for_each_entry(drv, &sysdev->cls->drivers, entry) {
-                if (drv->remove)
-                        drv->remove(sysdev);
-        }
-        mutex_unlock(&sysdev_drivers_lock);
-
-        kobject_put(&sysdev->kobj);
-}
-
-EXPORT_SYMBOL_GPL(sysdev_register);
-EXPORT_SYMBOL_GPL(sysdev_unregister);
-
-#define to_ext_attr(x) container_of(x, struct sysdev_ext_attribute, attr)
-
-ssize_t sysdev_store_ulong(struct sys_device *sysdev,
-                           struct sysdev_attribute *attr,
-                           const char *buf, size_t size)
-{
-        struct sysdev_ext_attribute *ea = to_ext_attr(attr);
-        char *end;
-        unsigned long new = simple_strtoul(buf, &end, 0);
-        if (end == buf)
-                return -EINVAL;
-        *(unsigned long *)(ea->var) = new;
-        /* Always return full write size even if we didn't consume all */
-        return size;
-}
-EXPORT_SYMBOL_GPL(sysdev_store_ulong);
-
-ssize_t sysdev_show_ulong(struct sys_device *sysdev,
-                          struct sysdev_attribute *attr,
-                          char *buf)
-{
-        struct sysdev_ext_attribute *ea = to_ext_attr(attr);
-        return snprintf(buf, PAGE_SIZE, "%lx\n", *(unsigned long *)(ea->var));
-}
-EXPORT_SYMBOL_GPL(sysdev_show_ulong);
-
-ssize_t sysdev_store_int(struct sys_device *sysdev,
-                           struct sysdev_attribute *attr,
-                           const char *buf, size_t size)
-{
-        struct sysdev_ext_attribute *ea = to_ext_attr(attr);
-        char *end;
-        long new = simple_strtol(buf, &end, 0);
-        if (end == buf || new > INT_MAX || new < INT_MIN)
-                return -EINVAL;
-        *(int *)(ea->var) = new;
-        /* Always return full write size even if we didn't consume all */
-        return size;
-}
-EXPORT_SYMBOL_GPL(sysdev_store_int);
-
-ssize_t sysdev_show_int(struct sys_device *sysdev,
-                          struct sysdev_attribute *attr,
-                          char *buf)
-{
-        struct sysdev_ext_attribute *ea = to_ext_attr(attr);
-        return snprintf(buf, PAGE_SIZE, "%d\n", *(int *)(ea->var));
-}
-EXPORT_SYMBOL_GPL(sysdev_show_int);
-
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index febbc0a1222a..ec31f7dd5549 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -169,10 +169,8 @@ int bcma_bus_register(struct bcma_bus *bus)
         err = bcma_sprom_get(bus);
         if (err == -ENOENT) {
                 pr_err("No SPROM available\n");
-        } else if (err) {
+        } else if (err)
                 pr_err("Failed to get SPROM: %d\n", err);
-                return -ENOENT;
-        }
 
         /* Register found cores */
         bcma_register_cores(bus);
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index cad994857683..3a2f672db9ad 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -399,15 +399,18 @@ int bcma_bus_scan(struct bcma_bus *bus)
                 core->bus = bus;
 
                 err = bcma_get_next_core(bus, &eromptr, NULL, core_num, core);
-                if (err == -ENODEV) {
-                        core_num++;
-                        continue;
-                } else if (err == -ENXIO)
-                        continue;
-                else if (err == -ESPIPE)
-                        break;
-                else if (err < 0)
+                if (err < 0) {
+                        kfree(core);
+                        if (err == -ENODEV) {
+                                core_num++;
+                                continue;
+                        } else if (err == -ENXIO) {
+                                continue;
+                        } else if (err == -ESPIPE) {
+                                break;
+                        }
                         return err;
+                }
 
                 core->core_index = core_num++;
                 bus->nr_cores++;
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 510fb10ec45a..9baf11e86362 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4368,8 +4368,14 @@ out_unreg_blkdev:
 out_put_disk:
         while (dr--) {
                 del_timer_sync(&motor_off_timer[dr]);
-                if (disks[dr]->queue)
+                if (disks[dr]->queue) {
                         blk_cleanup_queue(disks[dr]->queue);
+                        /*
+                         * put_disk() is not paired with add_disk() and
+                         * will put queue reference one extra time. fix it.
+                         */
+                        disks[dr]->queue = NULL;
+                }
                 put_disk(disks[dr]);
         }
         return err;
@@ -4579,6 +4585,15 @@ static void __exit floppy_module_exit(void)
                         platform_device_unregister(&floppy_device[drive]);
                 }
                 blk_cleanup_queue(disks[drive]->queue);
+
+                /*
+                 * These disks have not called add_disk().  Don't put down
+                 * queue reference in put_disk().
+                 */
+                if (!(allowed_drive_mask & (1 << drive)) ||
+                    fdc_state[FDC(drive)].version == FDC_NONE)
+                        disks[drive]->queue = NULL;
+
                 put_disk(disks[drive]);
         }
 
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index f00257782fcc..cd504353b278 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -356,14 +356,14 @@ lo_direct_splice_actor(struct pipe_inode_info *pipe, struct splice_desc *sd)
         return __splice_from_pipe(pipe, sd, lo_splice_actor);
 }
 
-static int
+static ssize_t
 do_lo_receive(struct loop_device *lo,
               struct bio_vec *bvec, int bsize, loff_t pos)
 {
         struct lo_read_data cookie;
         struct splice_desc sd;
         struct file *file;
-        long retval;
+        ssize_t retval;
 
         cookie.lo = lo;
         cookie.page = bvec->bv_page;
@@ -379,26 +379,28 @@ do_lo_receive(struct loop_device *lo,
         file = lo->lo_backing_file;
         retval = splice_direct_to_actor(file, &sd, lo_direct_splice_actor);
 
-        if (retval < 0)
-                return retval;
-        if (retval != bvec->bv_len)
-                return -EIO;
-        return 0;
+        return retval;
 }
 
 static int
 lo_receive(struct loop_device *lo, struct bio *bio, int bsize, loff_t pos)
 {
         struct bio_vec *bvec;
-        int i, ret = 0;
+        ssize_t s;
+        int i;
 
         bio_for_each_segment(bvec, bio, i) {
-                ret = do_lo_receive(lo, bvec, bsize, pos);
-                if (ret < 0)
+                s = do_lo_receive(lo, bvec, bsize, pos);
+                if (s < 0)
+                        return s;
+
+                if (s != bvec->bv_len) {
+                        zero_fill_bio(bio);
                         break;
+                }
                 pos += bvec->bv_len;
         }
-        return ret;
+        return 0;
 }
 
 static int do_bio_filebacked(struct loop_device *lo, struct bio *bio)
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index b74eab70c3d0..8eb81c96608f 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -2068,8 +2068,6 @@ static int mtip_hw_ioctl(struct driver_data *dd, unsigned int cmd,
  *           when the read completes.
  * @data     Callback data passed to the callback function
  *           when the read completes.
- * @barrier  If non-zero, this command must be completed before
- *           issuing any other commands.
  * @dir      Direction (read or write)
  *
  * return value
@@ -2077,7 +2075,7 @@ static int mtip_hw_ioctl(struct driver_data *dd, unsigned int cmd,
  */
 static void mtip_hw_submit_io(struct driver_data *dd, sector_t start,
                               int nsect, int nents, int tag, void *callback,
-                              void *data, int barrier, int dir)
+                              void *data, int dir)
 {
         struct host_to_dev_fis  *fis;
         struct mtip_port *port = dd->port;
@@ -2108,8 +2106,6 @@ static void mtip_hw_submit_io(struct driver_data *dd, sector_t start,
         *((unsigned int *) &fis->lba_low) = (start & 0xFFFFFF);
         *((unsigned int *) &fis->lba_low_ex) = ((start >> 24) & 0xFFFFFF);
         fis->device      = 1 << 6;
-        if (barrier)
-                fis->device |= FUA_BIT;
         fis->features    = nsect & 0xFF;
         fis->features_ex = (nsect >> 8) & 0xFF;
         fis->sect_count  = ((tag << 3) | (tag >> 5));
@@ -3087,7 +3083,6 @@ static void mtip_make_request(struct request_queue *queue, struct bio *bio)
                                 tag,
                                 bio_endio,
                                 bio,
-                                bio->bi_rw & REQ_FUA,
                                 bio_data_dir(bio));
         } else
                 bio_io_error(bio);
@@ -3187,6 +3182,10 @@ skip_create_disk:
         blk_queue_max_segments(dd->queue, MTIP_MAX_SG);
         blk_queue_physical_block_size(dd->queue, 4096);
         blk_queue_io_min(dd->queue, 4096);
+        /*
+         * write back cache is not supported in the device. FUA depends on
+         * write back cache support, hence setting flush support to zero.
+         */
         blk_queue_flush(dd->queue, 0);
 
         /* Set the capacity of the device in 512 byte sectors. */
diff --git a/drivers/block/mtip32xx/mtip32xx.h b/drivers/block/mtip32xx/mtip32xx.h
index 723d7c4946dc..e0554a8f2233 100644
--- a/drivers/block/mtip32xx/mtip32xx.h
+++ b/drivers/block/mtip32xx/mtip32xx.h
@@ -104,9 +104,6 @@
 /* BAR number used to access the HBA registers. */
 #define MTIP_ABAR               5
 
-/* Forced Unit Access Bit */
-#define FUA_BIT                 0x80
-
 #ifdef DEBUG
  #define dbg_printk(format, arg...)     \
         printk(pr_fmt(format), ##arg);
@@ -415,8 +412,6 @@ struct driver_data {
 
         atomic_t resumeflag; /* Atomic variable to track suspend/resume */
 
-        atomic_t eh_active; /* Flag for error handling tracking */
-
         struct task_struct *mtip_svc_handler; /* task_struct of svc thd */
 };
 
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index c1dc4d86c221..1f3c1a7d132a 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -41,6 +41,8 @@
 #include <linux/types.h>
 #include <linux/version.h>
 
+#include <asm-generic/io-64-nonatomic-lo-hi.h>
+
 #define NVME_Q_DEPTH 1024
 #define SQ_SIZE(depth)          (depth * sizeof(struct nvme_command))
 #define CQ_SIZE(depth)          (depth * sizeof(struct nvme_completion))
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 3fd31dec8c9c..a6278e7e61a0 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -380,6 +380,7 @@ static int rbd_get_client(struct rbd_device *rbd_dev, const char *mon_addr,
         rbdc = __rbd_client_find(opt);
         if (rbdc) {
                 ceph_destroy_options(opt);
+                kfree(rbd_opts);
 
                 /* using an existing client */
                 kref_get(&rbdc->kref);
@@ -406,15 +407,15 @@ done_err:
 
 /*
  * Destroy ceph client
+ *
+ * Caller must hold node_lock.
  */
 static void rbd_client_release(struct kref *kref)
 {
         struct rbd_client *rbdc = container_of(kref, struct rbd_client, kref);
 
         dout("rbd_release_client %p\n", rbdc);
-        spin_lock(&node_lock);
         list_del(&rbdc->node);
-        spin_unlock(&node_lock);
 
         ceph_destroy_client(rbdc->client);
         kfree(rbdc->rbd_opts);
@@ -427,7 +428,9 @@ static void rbd_client_release(struct kref *kref)
  */
 static void rbd_put_client(struct rbd_device *rbd_dev)
 {
+        spin_lock(&node_lock);
         kref_put(&rbd_dev->rbd_client->kref, rbd_client_release);
+        spin_unlock(&node_lock);
         rbd_dev->rbd_client = NULL;
         rbd_dev->client = NULL;
 }
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 55eaf474d32c..d620b4495745 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -286,8 +286,6 @@
 
 /* used to tell the module to turn on full debugging messages */
 static bool debug;
-/* used to keep tray locked at all times */
-static int keeplocked;
 /* default compatibility mode */
 static bool autoclose=1;
 static bool autoeject;
@@ -1204,7 +1202,7 @@ void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode)
                 cdinfo(CD_CLOSE, "Use count for \"/dev/%s\" now zero\n", cdi->name);
                 cdrom_dvd_rw_close_write(cdi);
 
-                if ((cdo->capability & CDC_LOCK) && !keeplocked) {
+                if ((cdo->capability & CDC_LOCK) && !cdi->keeplocked) {
                         cdinfo(CD_CLOSE, "Unlocking door!\n");
                         cdo->lock_door(cdi, 0);
                 }
@@ -1371,7 +1369,7 @@ static int cdrom_select_disc(struct cdrom_device_info *cdi, int slot)
         curslot = info->hdr.curslot;
         kfree(info);
 
-        if (cdi->use_count > 1 || keeplocked) {
+        if (cdi->use_count > 1 || cdi->keeplocked) {
                 if (slot == CDSL_CURRENT) {
                         return curslot;
                 } else {
@@ -2119,11 +2117,6 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
         if (!nr)
                 return -ENOMEM;
 
-        if (!access_ok(VERIFY_WRITE, ubuf, nframes * CD_FRAMESIZE_RAW)) {
-                ret = -EFAULT;
-                goto out;
-        }
-
         cgc.data_direction = CGC_DATA_READ;
         while (nframes > 0) {
                 if (nr > nframes)
@@ -2132,7 +2125,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
                 ret = cdrom_read_block(cdi, &cgc, lba, nr, 1, CD_FRAMESIZE_RAW);
                 if (ret)
                         break;
-                if (__copy_to_user(ubuf, cgc.buffer, CD_FRAMESIZE_RAW * nr)) {
+                if (copy_to_user(ubuf, cgc.buffer, CD_FRAMESIZE_RAW * nr)) {
                         ret = -EFAULT;
                         break;
                 }
@@ -2140,7 +2133,6 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
                 nframes -= nr;
                 lba += nr;
         }
-out:
         kfree(cgc.buffer);
         return ret;
 }
@@ -2295,7 +2287,7 @@ static int cdrom_ioctl_eject(struct cdrom_device_info *cdi)
 
         if (!CDROM_CAN(CDC_OPEN_TRAY))
                 return -ENOSYS;
-        if (cdi->use_count != 1 || keeplocked)
+        if (cdi->use_count != 1 || cdi->keeplocked)
                 return -EBUSY;
         if (CDROM_CAN(CDC_LOCK)) {
                 int ret = cdi->ops->lock_door(cdi, 0);
@@ -2322,7 +2314,7 @@ static int cdrom_ioctl_eject_sw(struct cdrom_device_info *cdi,
 
         if (!CDROM_CAN(CDC_OPEN_TRAY))
                 return -ENOSYS;
-        if (keeplocked)
+        if (cdi->keeplocked)
                 return -EBUSY;
 
         cdi->options &= ~(CDO_AUTO_CLOSE | CDO_AUTO_EJECT);
@@ -2453,7 +2445,7 @@ static int cdrom_ioctl_lock_door(struct cdrom_device_info *cdi,
         if (!CDROM_CAN(CDC_LOCK))
                 return -EDRIVE_CANT_DO_THIS;
 
-        keeplocked = arg ? 1 : 0;
+        cdi->keeplocked = arg ? 1 : 0;
 
         /*
          * Don't unlock the door on multiple opens by default, but allow
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index 4b71647782d0..317c28ce8328 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -194,10 +194,10 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
 
 err_out:
         if (bridge->driver->needs_scratch_page) {
-                void *va = page_address(bridge->scratch_page_page);
+                struct page *page = bridge->scratch_page_page;
 
-                bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);
-                bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);
+                bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_UNMAP);
+                bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_FREE);
         }
         if (got_gatt)
                 bridge->driver->free_gatt_table(bridge);
@@ -221,10 +221,10 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
 
         if (bridge->driver->agp_destroy_page &&
             bridge->driver->needs_scratch_page) {
-                void *va = page_address(bridge->scratch_page_page);
+                struct page *page = bridge->scratch_page_page;
 
-                bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);
-                bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);
+                bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_UNMAP);
+                bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_FREE);
         }
 }
 
diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index 7dbc4a83c45c..78a666d1e5f5 100644
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -1,7 +1,7 @@
 
 config CPU_IDLE
         bool "CPU idle PM support"
-        default ACPI
+        default y if ACPI || PPC_PSERIES
         help
           CPU idle is a generic framework for supporting software-controlled
           idle processor power management.  It includes modular cross-platform
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 97f87b29b9f3..f4aed5fc2cb6 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -1343,7 +1343,7 @@ static int __init at_dma_probe(struct platform_device *pdev)
 
                 tasklet_init(&atchan->tasklet, atc_tasklet,
                                 (unsigned long)atchan);
-                atc_enable_irq(atchan);
+                atc_enable_chan_irq(atdma, i);
         }
 
         /* set base routines */
@@ -1410,7 +1410,7 @@ static int __exit at_dma_remove(struct platform_device *pdev)
                 struct at_dma_chan      *atchan = to_at_dma_chan(chan);
 
                 /* Disable interrupts */
-                atc_disable_irq(atchan);
+                atc_disable_chan_irq(atdma, chan->chan_id);
                 tasklet_disable(&atchan->tasklet);
 
                 tasklet_kill(&atchan->tasklet);
diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h
index dcaedfc181cf..a8d3277d60b5 100644
--- a/drivers/dma/at_hdmac_regs.h
+++ b/drivers/dma/at_hdmac_regs.h
@@ -327,28 +327,27 @@ static void atc_dump_lli(struct at_dma_chan *atchan, struct at_lli *lli)
 }
 
 
-static void atc_setup_irq(struct at_dma_chan *atchan, int on)
+static void atc_setup_irq(struct at_dma *atdma, int chan_id, int on)
 {
-        struct at_dma   *atdma = to_at_dma(atchan->chan_common.device);
-        u32             ebci;
+        u32 ebci;
 
         /* enable interrupts on buffer transfer completion & error */
-        ebci =    AT_DMA_BTC(atchan->chan_common.chan_id)
-                | AT_DMA_ERR(atchan->chan_common.chan_id);
+        ebci =    AT_DMA_BTC(chan_id)
+                | AT_DMA_ERR(chan_id);
         if (on)
                 dma_writel(atdma, EBCIER, ebci);
         else
                 dma_writel(atdma, EBCIDR, ebci);
 }
 
-static inline void atc_enable_irq(struct at_dma_chan *atchan)
+static void atc_enable_chan_irq(struct at_dma *atdma, int chan_id)
 {
-        atc_setup_irq(atchan, 1);
+        atc_setup_irq(atdma, chan_id, 1);
 }
 
-static inline void atc_disable_irq(struct at_dma_chan *atchan)
+static void atc_disable_chan_irq(struct at_dma *atdma, int chan_id)
 {
-        atc_setup_irq(atchan, 0);
+        atc_setup_irq(atdma, chan_id, 0);
 }
 
 
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index 2b8661b54eaf..24225f0fdcd8 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -599,7 +599,7 @@ static int dmatest_add_channel(struct dma_chan *chan)
         }
         if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {
                 cnt = dmatest_add_threads(dtc, DMA_PQ);
-                thread_count += cnt > 0 ?: 0;
+                thread_count += cnt > 0 ? cnt : 0;
         }
 
         pr_info("dmatest: Started %u threads using %s\n",
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index a8af379680c1..8bc5acf36ee5 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1102,11 +1102,13 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
         case DMA_SLAVE_CONFIG:
                 if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) {
                         sdmac->per_address = dmaengine_cfg->src_addr;
-                        sdmac->watermark_level = dmaengine_cfg->src_maxburst;
+                        sdmac->watermark_level = dmaengine_cfg->src_maxburst *
+                                                dmaengine_cfg->src_addr_width;
                         sdmac->word_size = dmaengine_cfg->src_addr_width;
                 } else {
                         sdmac->per_address = dmaengine_cfg->dst_addr;
-                        sdmac->watermark_level = dmaengine_cfg->dst_maxburst;
+                        sdmac->watermark_level = dmaengine_cfg->dst_maxburst *
+                                                dmaengine_cfg->dst_addr_width;
                         sdmac->word_size = dmaengine_cfg->dst_addr_width;
                 }
                 sdmac->direction = dmaengine_cfg->direction;
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 54043cd831c8..812fd76e9c18 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -1262,7 +1262,8 @@ static int __init sh_dmae_probe(struct platform_device *pdev)
 
         INIT_LIST_HEAD(&shdev->common.channels);
 
-        dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
+        if (!pdata->slave_only)
+                dma_cap_set(DMA_MEMCPY, shdev->common.cap_mask);
         if (pdata->slave && pdata->slave_num)
                 dma_cap_set(DMA_SLAVE, shdev->common.cap_mask);
 
diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
index aa08497a075a..73f55e2008c2 100644
--- a/drivers/edac/i3200_edac.c
+++ b/drivers/edac/i3200_edac.c
@@ -15,6 +15,8 @@
 #include <linux/io.h>
 #include "edac_core.h"
 
+#include <asm-generic/io-64-nonatomic-lo-hi.h>
+
 #define I3200_REVISION        "1.1"
 
 #define EDAC_MOD_STR        "i3200_edac"
@@ -101,19 +103,6 @@ struct i3200_priv {
 
 static int nr_channels;
 
-#ifndef readq
-static inline __u64 readq(const volatile void __iomem *addr)
-{
-        const volatile u32 __iomem *p = addr;
-        u32 low, high;
-
-        low = readl(p);
-        high = readl(p + 1);
-
-        return low + ((u64)high << 32);
-}
-#endif
-
 static int how_many_channels(struct pci_dev *pdev)
 {
         unsigned char capid0_8b; /* 8th byte of CAPID0 */
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 6628feaa7622..7f5f0da726da 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -263,6 +263,7 @@ static inline struct fw_ohci *fw_ohci(struct fw_card *card)
 static char ohci_driver_name[] = KBUILD_MODNAME;
 
 #define PCI_DEVICE_ID_AGERE_FW643       0x5901
+#define PCI_DEVICE_ID_CREATIVE_SB1394   0x4001
 #define PCI_DEVICE_ID_JMICRON_JMB38X_FW 0x2380
 #define PCI_DEVICE_ID_TI_TSB12LV22      0x8009
 #define PCI_DEVICE_ID_TI_TSB12LV26      0x8020
@@ -289,6 +290,9 @@ static const struct {
         {PCI_VENDOR_ID_ATT, PCI_DEVICE_ID_AGERE_FW643, 6,
                 QUIRK_NO_MSI},
 
+        {PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_SB1394, PCI_ANY_ID,
+                QUIRK_RESET_PACKET},
+
         {PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, PCI_ANY_ID,
                 QUIRK_NO_MSI},
 
@@ -299,7 +303,7 @@ static const struct {
                 QUIRK_NO_MSI},
 
         {PCI_VENDOR_ID_RICOH, PCI_ANY_ID, PCI_ANY_ID,
-                QUIRK_CYCLE_TIMER},
+                QUIRK_CYCLE_TIMER | QUIRK_NO_MSI},
 
         {PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_TSB12LV22, PCI_ANY_ID,
                 QUIRK_CYCLE_TIMER | QUIRK_RESET_PACKET | QUIRK_NO_1394A},
diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index 5b6948081f8f..ddfacc5ce56d 100644
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@@ -96,7 +96,7 @@ static const char *gpio_p2_names[LPC32XX_GPIO_P2_MAX] = {
 };
 
 static const char *gpio_p3_names[LPC32XX_GPIO_P3_MAX] = {
-        "gpi000", "gpio01", "gpio02", "gpio03",
+        "gpio00", "gpio01", "gpio02", "gpio03",
         "gpio04", "gpio05"
 };
 
diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c
index 03d6dd5dcb77..f0febe5b8221 100644
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@ -448,6 +448,7 @@ static int __devinit ioh_gpio_probe(struct pci_dev *pdev,
                 chip->reg = chip->base;
                 chip->ch = i;
                 mutex_init(&chip->lock);
+                spin_lock_init(&chip->spinlock);
                 ioh_gpio_setup(chip, num_ports[i]);
                 ret = gpiochip_add(&chip->gpio);
                 if (ret) {
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index 68fa55e86eb1..e8729cc2ba2b 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -392,6 +392,7 @@ static int __devinit pch_gpio_probe(struct pci_dev *pdev,
         chip->reg = chip->base;
         pci_set_drvdata(pdev, chip);
         mutex_init(&chip->lock);
+        spin_lock_init(&chip->spinlock);
         pch_gpio_setup(chip);
         ret = gpiochip_add(&chip->gpio);
         if (ret) {
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index a7661773c052..0a79a1167a25 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -2387,27 +2387,30 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = {
 };
 
 #if defined(CONFIG_ARCH_EXYNOS4) && defined(CONFIG_OF)
-static int exynos4_gpio_xlate(struct gpio_chip *gc, struct device_node *np,
-                              const void *gpio_spec, u32 *flags)
+static int exynos4_gpio_xlate(struct gpio_chip *gc,
+                        const struct of_phandle_args *gpiospec, u32 *flags)
 {
-        const __be32 *gpio = gpio_spec;
-        const u32 n = be32_to_cpup(gpio);
-        unsigned int pin = gc->base + be32_to_cpu(gpio[0]);
+        unsigned int pin;
 
         if (WARN_ON(gc->of_gpio_n_cells < 4))
                 return -EINVAL;
 
-        if (n > gc->ngpio)
+        if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells))
                 return -EINVAL;
 
-        if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(be32_to_cpu(gpio[1]))))
+        if (gpiospec->args[0] > gc->ngpio)
+                return -EINVAL;
+
+        pin = gc->base + gpiospec->args[0];
+
+        if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(gpiospec->args[1])))
                 pr_warn("gpio_xlate: failed to set pin function\n");
-        if (s3c_gpio_setpull(pin, be32_to_cpu(gpio[2])))
+        if (s3c_gpio_setpull(pin, gpiospec->args[2]))
                 pr_warn("gpio_xlate: failed to set pin pull up/down\n");
-        if (s5p_gpio_set_drvstr(pin, be32_to_cpu(gpio[3])))
+        if (s5p_gpio_set_drvstr(pin, gpiospec->args[3]))
                 pr_warn("gpio_xlate: failed to set pin drive strength\n");
 
-        return n;
+        return gpiospec->args[0];
 }
 
 static const struct of_device_id exynos4_gpio_dt_match[] __initdata = {
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index 3f46772f0cb2..ba23790450e9 100644
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -101,7 +101,7 @@ static int drm_add_magic(struct drm_master *master, struct drm_file *priv,
  * Searches and unlinks the entry in drm_device::magiclist with the magic
  * number hash key, while holding the drm_device::struct_mutex lock.
  */
-static int drm_remove_magic(struct drm_master *master, drm_magic_t magic)
+int drm_remove_magic(struct drm_master *master, drm_magic_t magic)
 {
         struct drm_magic_entry *pt;
         struct drm_hash_item *hash;
@@ -136,6 +136,8 @@ static int drm_remove_magic(struct drm_master *master, drm_magic_t magic)
  * If there is a magic number in drm_file::magic then use it, otherwise
  * searches an unique non-zero magic number and add it associating it with \p
  * file_priv.
+ * This ioctl needs protection by the drm_global_mutex, which protects
+ * struct drm_file::magic and struct drm_magic_entry::priv.
  */
 int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
@@ -173,6 +175,8 @@ int drm_getmagic(struct drm_device *dev, void *data, struct drm_file *file_priv)
  * \return zero if authentication successed, or a negative number otherwise.
  *
  * Checks if \p file_priv is associated with the magic number passed in \arg.
+ * This ioctl needs protection by the drm_global_mutex, which protects
+ * struct drm_file::magic and struct drm_magic_entry::priv.
  */
 int drm_authmagic(struct drm_device *dev, void *data,
                   struct drm_file *file_priv)
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index c00cf154cc0b..6263b0147598 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -487,6 +487,11 @@ int drm_release(struct inode *inode, struct file *filp)
                   (long)old_encode_dev(file_priv->minor->device),
                   dev->open_count);
 
+        /* Release any auth tokens that might point to this file_priv,
+           (do that under the drm_global_mutex) */
+        if (file_priv->magic)
+                (void) drm_remove_magic(file_priv->master, file_priv->magic);
+
         /* if the master has gone away we can't do anything with the lock */
         if (file_priv->minor->master)
                 drm_master_release(dev, filp);
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 396e60ce8114..f8625e290728 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -140,7 +140,7 @@ int drm_gem_object_init(struct drm_device *dev,
         obj->dev = dev;
         obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
         if (IS_ERR(obj->filp))
-                return -ENOMEM;
+                return PTR_ERR(obj->filp);
 
         kref_init(&obj->refcount);
         atomic_set(&obj->handle_count, 0);
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index ddd70db45f76..637fcc3766c7 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -315,7 +315,8 @@ static int compat_drm_getclient(struct file *file, unsigned int cmd,
         if (err)
                 return err;
 
-        if (__get_user(c32.auth, &client->auth)
+        if (__get_user(c32.idx, &client->idx)
+            || __get_user(c32.auth, &client->auth)
             || __get_user(c32.pid, &client->pid)
             || __get_user(c32.uid, &client->uid)
             || __get_user(c32.magic, &client->magic)
diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
index f9aaa56eae07..b9e5266c341b 100644
--- a/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@ -13,7 +13,7 @@ config DRM_EXYNOS
 
 config DRM_EXYNOS_FIMD
         tristate "Exynos DRM FIMD"
-        depends on DRM_EXYNOS
+        depends on DRM_EXYNOS && !FB_S3C
         default n
         help
           Choose this option if you want to use Exynos FIMD for DRM.
@@ -21,7 +21,7 @@ config DRM_EXYNOS_FIMD
 
 config DRM_EXYNOS_HDMI
         tristate "Exynos DRM HDMI"
-        depends on DRM_EXYNOS
+        depends on DRM_EXYNOS && !VIDEO_SAMSUNG_S5P_TV
         help
           Choose this option if you want to use Exynos HDMI for DRM.
           If M is selected, the module will be called exynos_drm_hdmi
diff --git a/drivers/gpu/drm/exynos/exynos_drm_core.c b/drivers/gpu/drm/exynos/exynos_drm_core.c
index 661a03571d0c..d08a55896d50 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_core.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_core.c
@@ -193,6 +193,9 @@ int exynos_drm_subdrv_register(struct exynos_drm_subdrv *subdrv)
                         return err;
                 }
 
+                /* setup possible_clones. */
+                exynos_drm_encoder_setup(drm_dev);
+
                 /*
                  * if any specific driver such as fimd or hdmi driver called
                  * exynos_drm_subdrv_register() later than drm_load(),
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index e3861ac49295..de818831a511 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -307,9 +307,6 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
                  */
                 event->pipe = exynos_crtc->pipe;
 
-                list_add_tail(&event->base.link,
-                                &dev_priv->pageflip_event_list);
-
                 ret = drm_vblank_get(dev, exynos_crtc->pipe);
                 if (ret) {
                         DRM_DEBUG("failed to acquire vblank counter\n");
@@ -318,6 +315,9 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
                         goto out;
                 }
 
+                list_add_tail(&event->base.link,
+                                &dev_priv->pageflip_event_list);
+
                 crtc->fb = fb;
                 ret = exynos_drm_crtc_update(crtc);
                 if (ret) {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 35889ca255e9..58820ebd3558 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -33,6 +33,7 @@
 
 #include "exynos_drm_drv.h"
 #include "exynos_drm_crtc.h"
+#include "exynos_drm_encoder.h"
 #include "exynos_drm_fbdev.h"
 #include "exynos_drm_fb.h"
 #include "exynos_drm_gem.h"
@@ -99,6 +100,9 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
         if (ret)
                 goto err_vblank;
 
+        /* setup possible_clones. */
+        exynos_drm_encoder_setup(dev);
+
         /*
          * create and configure fb helper and also exynos specific
          * fbdev object.
@@ -141,16 +145,21 @@ static int exynos_drm_unload(struct drm_device *dev)
 }
 
 static void exynos_drm_preclose(struct drm_device *dev,
-                                        struct drm_file *file_priv)
+                                        struct drm_file *file)
 {
-        struct exynos_drm_private *dev_priv = dev->dev_private;
+        DRM_DEBUG_DRIVER("%s\n", __FILE__);
 
-        /*
-         * drm framework frees all events at release time,
-         * so private event list should be cleared.
-         */
-        if (!list_empty(&dev_priv->pageflip_event_list))
-                INIT_LIST_HEAD(&dev_priv->pageflip_event_list);
+}
+
+static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)
+{
+        DRM_DEBUG_DRIVER("%s\n", __FILE__);
+
+        if (!file->driver_priv)
+                return;
+
+        kfree(file->driver_priv);
+        file->driver_priv = NULL;
 }
 
 static void exynos_drm_lastclose(struct drm_device *dev)
@@ -195,6 +204,7 @@ static struct drm_driver exynos_drm_driver = {
         .unload                 = exynos_drm_unload,
         .preclose               = exynos_drm_preclose,
         .lastclose              = exynos_drm_lastclose,
+        .postclose              = exynos_drm_postclose,
         .get_vblank_counter     = drm_vblank_count,
         .enable_vblank          = exynos_drm_crtc_enable_vblank,
         .disable_vblank         = exynos_drm_crtc_disable_vblank,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
index 86b93dde219a..ef4754f1519b 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
@@ -195,6 +195,40 @@ static struct drm_encoder_funcs exynos_encoder_funcs = {
         .destroy = exynos_drm_encoder_destroy,
 };
 
+static unsigned int exynos_drm_encoder_clones(struct drm_encoder *encoder)
+{
+        struct drm_encoder *clone;
+        struct drm_device *dev = encoder->dev;
+        struct exynos_drm_encoder *exynos_encoder = to_exynos_encoder(encoder);
+        struct exynos_drm_display_ops *display_ops =
+                                exynos_encoder->manager->display_ops;
+        unsigned int clone_mask = 0;
+        int cnt = 0;
+
+        list_for_each_entry(clone, &dev->mode_config.encoder_list, head) {
+                switch (display_ops->type) {
+                case EXYNOS_DISPLAY_TYPE_LCD:
+                case EXYNOS_DISPLAY_TYPE_HDMI:
+                        clone_mask |= (1 << (cnt++));
+                        break;
+                default:
+                        continue;
+                }
+        }
+
+        return clone_mask;
+}
+
+void exynos_drm_encoder_setup(struct drm_device *dev)
+{
+        struct drm_encoder *encoder;
+
+        DRM_DEBUG_KMS("%s\n", __FILE__);
+
+        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)
+                encoder->possible_clones = exynos_drm_encoder_clones(encoder);
+}
+
 struct drm_encoder *
 exynos_drm_encoder_create(struct drm_device *dev,
                            struct exynos_drm_manager *manager,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.h b/drivers/gpu/drm/exynos/exynos_drm_encoder.h
index 97b087a51cb6..eb7d2316847e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_encoder.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.h
@@ -30,6 +30,7 @@
 
 struct exynos_drm_manager;
 
+void exynos_drm_encoder_setup(struct drm_device *dev);
 struct drm_encoder *exynos_drm_encoder_create(struct drm_device *dev,
                                                struct exynos_drm_manager *mgr,
                                                unsigned int possible_crtcs);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
index d7ae29d2f3d6..3508700e529b 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
@@ -195,66 +195,6 @@ out:
         return ret;
 }
 
-static bool
-exynos_drm_fbdev_is_samefb(struct drm_framebuffer *fb,
-                            struct drm_fb_helper_surface_size *sizes)
-{
-        if (fb->width != sizes->surface_width)
-                return false;
-        if (fb->height != sizes->surface_height)
-                return false;
-        if (fb->bits_per_pixel != sizes->surface_bpp)
-                return false;
-        if (fb->depth != sizes->surface_depth)
-                return false;
-
-        return true;
-}
-
-static int exynos_drm_fbdev_recreate(struct drm_fb_helper *helper,
-                                      struct drm_fb_helper_surface_size *sizes)
-{
-        struct drm_device *dev = helper->dev;
-        struct exynos_drm_fbdev *exynos_fbdev = to_exynos_fbdev(helper);
-        struct exynos_drm_gem_obj *exynos_gem_obj;
-        struct drm_framebuffer *fb = helper->fb;
-        struct drm_mode_fb_cmd2 mode_cmd = { 0 };
-        unsigned long size;
-
-        DRM_DEBUG_KMS("%s\n", __FILE__);
-
-        if (exynos_drm_fbdev_is_samefb(fb, sizes))
-                return 0;
-
-        mode_cmd.width = sizes->surface_width;
-        mode_cmd.height = sizes->surface_height;
-        mode_cmd.pitches[0] = sizes->surface_width * (sizes->surface_bpp >> 3);
-        mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
-                                                          sizes->surface_depth);
-
-        if (exynos_fbdev->exynos_gem_obj)
-                exynos_drm_gem_destroy(exynos_fbdev->exynos_gem_obj);
-
-        if (fb->funcs->destroy)
-                fb->funcs->destroy(fb);
-
-        size = mode_cmd.pitches[0] * mode_cmd.height;
-        exynos_gem_obj = exynos_drm_gem_create(dev, size);
-        if (IS_ERR(exynos_gem_obj))
-                return PTR_ERR(exynos_gem_obj);
-
-        exynos_fbdev->exynos_gem_obj = exynos_gem_obj;
-
-        helper->fb = exynos_drm_framebuffer_init(dev, &mode_cmd,
-                        &exynos_gem_obj->base);
-        if (IS_ERR_OR_NULL(helper->fb)) {
-                DRM_ERROR("failed to create drm framebuffer.\n");
-                return PTR_ERR(helper->fb);
-        }
-
-        return exynos_drm_fbdev_update(helper, helper->fb);
-}
-
 static int exynos_drm_fbdev_probe(struct drm_fb_helper *helper,
                                    struct drm_fb_helper_surface_size *sizes)
 {
@@ -262,6 +202,10 @@ static int exynos_drm_fbdev_probe(struct drm_fb_helper *helper,
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
+        /*
+         * with !helper->fb, it means that this funcion is called first time
+         * and after that, the helper->fb would be used as clone mode.
+         */
         if (!helper->fb) {
                 ret = exynos_drm_fbdev_create(helper, sizes);
                 if (ret < 0) {
@@ -274,12 +218,6 @@ static int exynos_drm_fbdev_probe(struct drm_fb_helper *helper,
                  * because register_framebuffer() should be called.
                  */
                 ret = 1;
-        } else {
-                ret = exynos_drm_fbdev_recreate(helper, sizes);
-                if (ret < 0) {
-                        DRM_ERROR("failed to reconfigure fbdev\n");
-                        return ret;
-                }
         }
 
         return ret;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index ca83139cd309..0dbb32bb18a3 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -158,7 +158,8 @@ static void fimd_dpms(struct device *subdrv_dev, int mode)
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
-                pm_runtime_put_sync(subdrv_dev);
+                if (!ctx->suspended)
+                        pm_runtime_put_sync(subdrv_dev);
                 break;
         default:
                 DRM_DEBUG_KMS("unspecified mode %d\n", mode);
@@ -603,7 +604,12 @@ static void fimd_finish_pageflip(struct drm_device *drm_dev, int crtc)
         }
 
         if (is_checked) {
-                drm_vblank_put(drm_dev, crtc);
+                /*
+                 * call drm_vblank_put only in case that drm_vblank_get was
+                 * called.
+                 */
+                if (atomic_read(&drm_dev->vblank_refcount[crtc]) > 0)
+                        drm_vblank_put(drm_dev, crtc);
 
                 /*
                  * don't off vblank if vblank_disable_allowed is 1,
@@ -734,6 +740,46 @@ static void fimd_clear_win(struct fimd_context *ctx, int win)
         writel(val, ctx->regs + SHADOWCON);
 }
 
+static int fimd_power_on(struct fimd_context *ctx, bool enable)
+{
+        struct exynos_drm_subdrv *subdrv = &ctx->subdrv;
+        struct device *dev = subdrv->manager.dev;
+
+        DRM_DEBUG_KMS("%s\n", __FILE__);
+
+        if (enable != false && enable != true)
+                return -EINVAL;
+
+        if (enable) {
+                int ret;
+
+                ret = clk_enable(ctx->bus_clk);
+                if (ret < 0)
+                        return ret;
+
+                ret = clk_enable(ctx->lcd_clk);
+                if  (ret < 0) {
+                        clk_disable(ctx->bus_clk);
+                        return ret;
+                }
+
+                ctx->suspended = false;
+
+                /* if vblank was enabled status, enable it again. */
+                if (test_and_clear_bit(0, &ctx->irq_flags))
+                        fimd_enable_vblank(dev);
+
+                fimd_apply(dev);
+        } else {
+                clk_disable(ctx->lcd_clk);
+                clk_disable(ctx->bus_clk);
+
+                ctx->suspended = true;
+        }
+
+        return 0;
+}
+
 static int __devinit fimd_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
@@ -911,39 +957,30 @@ out:
 #ifdef CONFIG_PM_SLEEP
 static int fimd_suspend(struct device *dev)
 {
-        int ret;
+        struct fimd_context *ctx = get_fimd_context(dev);
 
         if (pm_runtime_suspended(dev))
                 return 0;
 
-        ret = pm_runtime_suspend(dev);
-        if (ret < 0)
-                return ret;
-
-        return 0;
+        /*
+         * do not use pm_runtime_suspend(). if pm_runtime_suspend() is
+         * called here, an error would be returned by that interface
+         * because the usage_count of pm runtime is more than 1.
+         */
+        return fimd_power_on(ctx, false);
 }
 
 static int fimd_resume(struct device *dev)
 {
-        int ret;
-
-        ret = pm_runtime_resume(dev);
-        if (ret < 0) {
-                DRM_ERROR("failed to resume runtime pm.\n");
-                return ret;
-        }
-
-        pm_runtime_disable(dev);
-
-        ret = pm_runtime_set_active(dev);
-        if (ret < 0) {
-                DRM_ERROR("failed to active runtime pm.\n");
-                pm_runtime_enable(dev);
-                pm_runtime_suspend(dev);
-                return ret;
-        }
+        struct fimd_context *ctx = get_fimd_context(dev);
 
-        pm_runtime_enable(dev);
+        /*
+         * if entered to sleep when lcd panel was on, the usage_count
+         * of pm runtime would still be 1 so in this case, fimd driver
+         * should be on directly not drawing on pm runtime interface.
+         */
+        if (!pm_runtime_suspended(dev))
+                return fimd_power_on(ctx, true);
 
         return 0;
 }
@@ -956,39 +993,16 @@ static int fimd_runtime_suspend(struct device *dev)
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        clk_disable(ctx->lcd_clk);
-        clk_disable(ctx->bus_clk);
-
-        ctx->suspended = true;
-        return 0;
+        return fimd_power_on(ctx, false);
 }
 
 static int fimd_runtime_resume(struct device *dev)
 {
         struct fimd_context *ctx = get_fimd_context(dev);
-        int ret;
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        ret = clk_enable(ctx->bus_clk);
-        if (ret < 0)
-                return ret;
-
-        ret = clk_enable(ctx->lcd_clk);
-        if  (ret < 0) {
-                clk_disable(ctx->bus_clk);
-                return ret;
-        }
-
-        ctx->suspended = false;
-
-        /* if vblank was enabled status, enable it again. */
-        if (test_and_clear_bit(0, &ctx->irq_flags))
-                fimd_enable_vblank(dev);
-
-        fimd_apply(dev);
-
-        return 0;
+        return fimd_power_on(ctx, true);
 }
 #endif
 
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index f48f7ce92f5f..3429d3fd93f3 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1116,8 +1116,8 @@ err_ddc:
 err_iomap:
         iounmap(hdata->regs);
 err_req_region:
-        release_resource(hdata->regs_res);
-        kfree(hdata->regs_res);
+        release_mem_region(hdata->regs_res->start,
+                        resource_size(hdata->regs_res));
 err_resource:
         hdmi_resources_cleanup(hdata);
 err_data:
@@ -1145,8 +1145,8 @@ static int __devexit hdmi_remove(struct platform_device *pdev)
 
         iounmap(hdata->regs);
 
-        release_resource(hdata->regs_res);
-        kfree(hdata->regs_res);
+        release_mem_region(hdata->regs_res->start,
+                        resource_size(hdata->regs_res));
 
         /* hdmiphy i2c driver */
         i2c_del_driver(&hdmiphy_driver);
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index ac24cff39775..93846e810e38 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -712,7 +712,12 @@ static void mixer_finish_pageflip(struct drm_device *drm_dev, int crtc)
         }
 
         if (is_checked)
-                drm_vblank_put(drm_dev, crtc);
+                /*
+                 * call drm_vblank_put only in case that drm_vblank_get was
+                 * called.
+                 */
+                if (atomic_read(&drm_dev->vblank_refcount[crtc]) > 0)
+                        drm_vblank_put(drm_dev, crtc);
 
         spin_unlock_irqrestore(&drm_dev->event_lock, flags);
 }
@@ -779,15 +784,15 @@ static void mixer_win_reset(struct mixer_context *ctx)
         mixer_reg_writemask(res, MXR_STATUS, MXR_STATUS_16_BURST,
                 MXR_STATUS_BURST_MASK);
 
-        /* setting default layer priority: layer1 > video > layer0
+        /* setting default layer priority: layer1 > layer0 > video
          * because typical usage scenario would be
+         * layer1 - OSD
          * layer0 - framebuffer
          * video - video overlay
-         * layer1 - OSD
          */
-        val  = MXR_LAYER_CFG_GRP0_VAL(1);
-        val |= MXR_LAYER_CFG_VP_VAL(2);
-        val |= MXR_LAYER_CFG_GRP1_VAL(3);
+        val = MXR_LAYER_CFG_GRP1_VAL(3);
+        val |= MXR_LAYER_CFG_GRP0_VAL(2);
+        val |= MXR_LAYER_CFG_VP_VAL(1);
         mixer_reg_write(res, MXR_LAYER_CFG, val);
 
         /* setting background color */
@@ -1044,7 +1049,7 @@ static int mixer_remove(struct platform_device *pdev)
                                         platform_get_drvdata(pdev);
         struct mixer_context *ctx = (struct mixer_context *)drm_hdmi_ctx->ctx;
 
-        dev_info(dev, "remove sucessful\n");
+        dev_info(dev, "remove successful\n");
 
         mixer_resource_poweroff(ctx);
         mixer_resources_cleanup(ctx);
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 791c0ef1a65b..830dfdd6bf15 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -113,12 +113,12 @@ static int psbfb_pan(struct fb_var_screeninfo *var, struct fb_info *info)
 
 void psbfb_suspend(struct drm_device *dev)
 {
-        struct drm_framebuffer *fb = 0;
-        struct psb_framebuffer *psbfb = to_psb_fb(fb);
+        struct drm_framebuffer *fb;
 
         console_lock();
         mutex_lock(&dev->mode_config.mutex);
         list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+                struct psb_framebuffer *psbfb = to_psb_fb(fb);
                 struct fb_info *info = psbfb->fbdev;
                 fb_set_suspend(info, 1);
                 drm_fb_helper_blank(FB_BLANK_POWERDOWN, info);
@@ -129,12 +129,12 @@ void psbfb_suspend(struct drm_device *dev)
 
 void psbfb_resume(struct drm_device *dev)
 {
-        struct drm_framebuffer *fb = 0;
-        struct psb_framebuffer *psbfb = to_psb_fb(fb);
+        struct drm_framebuffer *fb;
 
         console_lock();
         mutex_lock(&dev->mode_config.mutex);
         list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+                struct psb_framebuffer *psbfb = to_psb_fb(fb);
                 struct fb_info *info = psbfb->fbdev;
                 fb_set_suspend(info, 0);
                 drm_fb_helper_blank(FB_BLANK_UNBLANK, info);
diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c
index e770bd190a5c..5d5330f667f1 100644
--- a/drivers/gpu/drm/gma500/gtt.c
+++ b/drivers/gpu/drm/gma500/gtt.c
@@ -20,6 +20,7 @@
  */
 
 #include <drm/drmP.h>
+#include <linux/shmem_fs.h>
 #include "psb_drv.h"
 
 
@@ -203,9 +204,7 @@ static int psb_gtt_attach_pages(struct gtt_range *gt)
         gt->npage = pages;
 
         for (i = 0; i < pages; i++) {
-                /* FIXME: needs updating as per mail from Hugh Dickins */
-                p = read_cache_page_gfp(mapping, i,
-                                        __GFP_COLD | GFP_KERNEL);
+                p = shmem_read_mapping_page(mapping, i);
                 if (IS_ERR(p))
                         goto err;
                 gt->pages[i] = p;
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index f7c17b239833..7f4b4e10246e 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -886,7 +886,7 @@ static int i810_flush_queue(struct drm_device *dev)
 }
 
 /* Must be called with the lock held */
-void i810_driver_reclaim_buffers(struct drm_device *dev,
+static void i810_reclaim_buffers(struct drm_device *dev,
                                  struct drm_file *file_priv)
 {
         struct drm_device_dma *dma = dev->dma;
@@ -1223,17 +1223,12 @@ void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv)
                 if (dev_priv->page_flipping)
                         i810_do_cleanup_pageflip(dev);
         }
+}
 
-        if (file_priv->master && file_priv->master->lock.hw_lock) {
-                drm_idlelock_take(&file_priv->master->lock);
-                i810_driver_reclaim_buffers(dev, file_priv);
-                drm_idlelock_release(&file_priv->master->lock);
-        } else {
-                /* master disappeared, clean up stuff anyway and hope nothing
-                 * goes wrong */
-                i810_driver_reclaim_buffers(dev, file_priv);
-        }
-
+void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                        struct drm_file *file_priv)
+{
+        i810_reclaim_buffers(dev, file_priv);
 }
 
 int i810_driver_dma_quiescent(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index 053f1ee58393..ec12f7dc717a 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -63,6 +63,7 @@ static struct drm_driver driver = {
         .lastclose = i810_driver_lastclose,
         .preclose = i810_driver_preclose,
         .device_is_agp = i810_driver_device_is_agp,
+        .reclaim_buffers_locked = i810_driver_reclaim_buffers_locked,
         .dma_quiescent = i810_driver_dma_quiescent,
         .ioctls = i810_ioctls,
         .fops = &i810_driver_fops,
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
index 6e0acad9e0f5..c9339f481795 100644
--- a/drivers/gpu/drm/i810/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
@@ -116,12 +116,14 @@ typedef struct drm_i810_private {
 
                                 /* i810_dma.c */
 extern int i810_driver_dma_quiescent(struct drm_device *dev);
-void i810_driver_reclaim_buffers(struct drm_device *dev,
-                                 struct drm_file *file_priv);
+extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                               struct drm_file *file_priv);
 extern int i810_driver_load(struct drm_device *, unsigned long flags);
 extern void i810_driver_lastclose(struct drm_device *dev);
 extern void i810_driver_preclose(struct drm_device *dev,
                                  struct drm_file *file_priv);
+extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                               struct drm_file *file_priv);
 extern int i810_driver_device_is_agp(struct drm_device *dev);
 
 extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 11807989f918..deaa657292b4 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -121,11 +121,11 @@ static const char *cache_level_str(int type)
 static void
 describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
 {
-        seq_printf(m, "%p: %s%s %8zd %04x %04x %d %d%s%s%s",
+        seq_printf(m, "%p: %s%s %8zdKiB %04x %04x %d %d%s%s%s",
                    &obj->base,
                    get_pin_flag(obj),
                    get_tiling_flag(obj),
-                   obj->base.size,
+                   obj->base.size / 1024,
                    obj->base.read_domains,
                    obj->base.write_domain,
                    obj->last_rendering_seqno,
@@ -653,7 +653,7 @@ static int i915_ringbuffer_info(struct seq_file *m, void *data)
         seq_printf(m, "  Size :    %08x\n", ring->size);
         seq_printf(m, "  Active :  %08x\n", intel_ring_get_active_head(ring));
         seq_printf(m, "  NOPID :   %08x\n", I915_READ_NOPID(ring));
-        if (IS_GEN6(dev)) {
+        if (IS_GEN6(dev) || IS_GEN7(dev)) {
                 seq_printf(m, "  Sync 0 :   %08x\n", I915_READ_SYNC_0(ring));
                 seq_printf(m, "  Sync 1 :   %08x\n", I915_READ_SYNC_1(ring));
         }
@@ -1075,6 +1075,7 @@ static int gen6_drpc_info(struct seq_file *m)
         struct drm_device *dev = node->minor->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         u32 rpmodectl1, gt_core_status, rcctl1;
+        unsigned forcewake_count;
         int count=0, ret;
 
 
@@ -1082,9 +1083,13 @@ static int gen6_drpc_info(struct seq_file *m)
         if (ret)
                 return ret;
 
-        if (atomic_read(&dev_priv->forcewake_count)) {
-                seq_printf(m, "RC information inaccurate because userspace "
-                              "holds a reference \n");
+        spin_lock_irq(&dev_priv->gt_lock);
+        forcewake_count = dev_priv->forcewake_count;
+        spin_unlock_irq(&dev_priv->gt_lock);
+
+        if (forcewake_count) {
+                seq_printf(m, "RC information inaccurate because somebody "
+                              "holds a forcewake reference \n");
         } else {
                 /* NB: we cannot use forcewake, else we read the wrong values */
                 while (count++ < 50 && (I915_READ_NOTRACE(FORCEWAKE_ACK) & 1))
@@ -1106,7 +1111,7 @@ static int gen6_drpc_info(struct seq_file *m)
         seq_printf(m, "SW control enabled: %s\n",
                    yesno((rpmodectl1 & GEN6_RP_MEDIA_MODE_MASK) ==
                           GEN6_RP_MEDIA_SW_MODE));
-        seq_printf(m, "RC6 Enabled: %s\n",
+        seq_printf(m, "RC1e Enabled: %s\n",
                    yesno(rcctl1 & GEN6_RC_CTL_RC1e_ENABLE));
         seq_printf(m, "RC6 Enabled: %s\n",
                    yesno(rcctl1 & GEN6_RC_CTL_RC6_ENABLE));
@@ -1398,9 +1403,13 @@ static int i915_gen6_forcewake_count_info(struct seq_file *m, void *data)
         struct drm_info_node *node = (struct drm_info_node *) m->private;
         struct drm_device *dev = node->minor->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
+        unsigned forcewake_count;
+
+        spin_lock_irq(&dev_priv->gt_lock);
+        forcewake_count = dev_priv->forcewake_count;
+        spin_unlock_irq(&dev_priv->gt_lock);
 
-        seq_printf(m, "forcewake count = %d\n",
-                   atomic_read(&dev_priv->forcewake_count));
+        seq_printf(m, "forcewake count = %u\n", forcewake_count);
 
         return 0;
 }
@@ -1665,7 +1674,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)
         struct drm_i915_private *dev_priv = dev->dev_private;
         int ret;
 
-        if (!IS_GEN6(dev))
+        if (INTEL_INFO(dev)->gen < 6)
                 return 0;
 
         ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -1682,7 +1691,7 @@ int i915_forcewake_release(struct inode *inode, struct file *file)
         struct drm_device *dev = inode->i_private;
         struct drm_i915_private *dev_priv = dev->dev_private;
 
-        if (!IS_GEN6(dev))
+        if (INTEL_INFO(dev)->gen < 6)
                 return 0;
 
         /*
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 5f4d5893e983..ddfe3d902b2a 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -2045,6 +2045,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
         if (!IS_I945G(dev) && !IS_I945GM(dev))
                 pci_enable_msi(dev->pdev);
 
+        spin_lock_init(&dev_priv->gt_lock);
         spin_lock_init(&dev_priv->irq_lock);
         spin_lock_init(&dev_priv->error_lock);
         spin_lock_init(&dev_priv->rps_lock);
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8f7187915b0d..308f81913562 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -368,11 +368,12 @@ void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv)
  */
 void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv)
 {
-        WARN_ON(!mutex_is_locked(&dev_priv->dev->struct_mutex));
+        unsigned long irqflags;
 
-        /* Forcewake is atomic in case we get in here without the lock */
-        if (atomic_add_return(1, &dev_priv->forcewake_count) == 1)
+        spin_lock_irqsave(&dev_priv->gt_lock, irqflags);
+        if (dev_priv->forcewake_count++ == 0)
                 dev_priv->display.force_wake_get(dev_priv);
+        spin_unlock_irqrestore(&dev_priv->gt_lock, irqflags);
 }
 
 void __gen6_gt_force_wake_put(struct drm_i915_private *dev_priv)
@@ -392,10 +393,12 @@ void __gen6_gt_force_wake_mt_put(struct drm_i915_private *dev_priv)
  */
 void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv)
 {
-        WARN_ON(!mutex_is_locked(&dev_priv->dev->struct_mutex));
+        unsigned long irqflags;
 
-        if (atomic_dec_and_test(&dev_priv->forcewake_count))
+        spin_lock_irqsave(&dev_priv->gt_lock, irqflags);
+        if (--dev_priv->forcewake_count == 0)
                 dev_priv->display.force_wake_put(dev_priv);
+        spin_unlock_irqrestore(&dev_priv->gt_lock, irqflags);
 }
 
 void __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv)
@@ -597,9 +600,36 @@ static int ironlake_do_reset(struct drm_device *dev, u8 flags)
 static int gen6_do_reset(struct drm_device *dev, u8 flags)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
+        int     ret;
+        unsigned long irqflags;
 
-        I915_WRITE(GEN6_GDRST, GEN6_GRDOM_FULL);
-        return wait_for((I915_READ(GEN6_GDRST) & GEN6_GRDOM_FULL) == 0, 500);
+        /* Hold gt_lock across reset to prevent any register access
+         * with forcewake not set correctly
+         */
+        spin_lock_irqsave(&dev_priv->gt_lock, irqflags);
+
+        /* Reset the chip */
+
+        /* GEN6_GDRST is not in the gt power well, no need to check
+         * for fifo space for the write or forcewake the chip for
+         * the read
+         */
+        I915_WRITE_NOTRACE(GEN6_GDRST, GEN6_GRDOM_FULL);
+
+        /* Spin waiting for the device to ack the reset request */
+        ret = wait_for((I915_READ_NOTRACE(GEN6_GDRST) & GEN6_GRDOM_FULL) == 0, 500);
+
+        /* If reset with a user forcewake, try to restore, otherwise turn it off */
+        if (dev_priv->forcewake_count)
+                dev_priv->display.force_wake_get(dev_priv);
+        else
+                dev_priv->display.force_wake_put(dev_priv);
+
+        /* Restore fifo count */
+        dev_priv->gt_fifo_count = I915_READ_NOTRACE(GT_FIFO_FREE_ENTRIES);
+
+        spin_unlock_irqrestore(&dev_priv->gt_lock, irqflags);
+        return ret;
 }
 
 /**
@@ -643,9 +673,6 @@ int i915_reset(struct drm_device *dev, u8 flags)
         case 7:
         case 6:
                 ret = gen6_do_reset(dev, flags);
-                /* If reset with a user forcewake, try to restore */
-                if (atomic_read(&dev_priv->forcewake_count))
-                        __gen6_gt_force_wake_get(dev_priv);
                 break;
         case 5:
                 ret = ironlake_do_reset(dev, flags);
@@ -927,9 +954,14 @@ MODULE_LICENSE("GPL and additional rights");
 u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \
         u##x val = 0; \
         if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \
-                gen6_gt_force_wake_get(dev_priv); \
+                unsigned long irqflags; \
+                spin_lock_irqsave(&dev_priv->gt_lock, irqflags); \
+                if (dev_priv->forcewake_count == 0) \
+                        dev_priv->display.force_wake_get(dev_priv); \
                 val = read##y(dev_priv->regs + reg); \
-                gen6_gt_force_wake_put(dev_priv); \
+                if (dev_priv->forcewake_count == 0) \
+                        dev_priv->display.force_wake_put(dev_priv); \
+                spin_unlock_irqrestore(&dev_priv->gt_lock, irqflags); \
         } else { \
                 val = read##y(dev_priv->regs + reg); \
         } \
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 602bc80baabb..9689ca38b2b3 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -288,7 +288,13 @@ typedef struct drm_i915_private {
         int relative_constants_mode;
 
         void __iomem *regs;
-        u32 gt_fifo_count;
+        /** gt_fifo_count and the subsequent register write are synchronized
+         * with dev->struct_mutex. */
+        unsigned gt_fifo_count;
+        /** forcewake_count is protected by gt_lock */
+        unsigned forcewake_count;
+        /** gt_lock is also taken in irq contexts. */
+        struct spinlock gt_lock;
 
         struct intel_gmbus {
                 struct i2c_adapter adapter;
@@ -741,8 +747,6 @@ typedef struct drm_i915_private {
 
         struct drm_property *broadcast_rgb_property;
         struct drm_property *force_audio_property;
-
-        atomic_t forcewake_count;
 } drm_i915_private_t;
 
 enum i915_cache_level {
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 5d433fc11ace..5bd4361ea84d 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1751,7 +1751,8 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
                 INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work);
 
         I915_WRITE(HWSTAM, 0xeffe);
-        if (IS_GEN6(dev) || IS_GEN7(dev)) {
+
+        if (IS_GEN6(dev)) {
                 /* Workaround stalls observed on Sandy Bridge GPUs by
                  * making the blitter command streamer generate a
                  * write to the Hardware Status Page for
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index c3afb783cb9d..03c53fcf8653 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -3028,6 +3028,20 @@
 #define  DISP_TILE_SURFACE_SWIZZLING    (1<<13)
 #define  DISP_FBC_WM_DIS                (1<<15)
 
+/* GEN7 chicken */
+#define GEN7_COMMON_SLICE_CHICKEN1              0x7010
+# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC      ((1<<10) | (1<<26))
+
+#define GEN7_L3CNTLREG1                         0xB01C
+#define  GEN7_WA_FOR_GEN7_L3_CONTROL                    0x3C4FFF8C
+
+#define GEN7_L3_CHICKEN_MODE_REGISTER           0xB030
+#define  GEN7_WA_L3_CHICKEN_MODE                                0x20000000
+
+/* WaCatErrorRejectionIssue */
+#define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG          0x9030
+#define  GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB       (1<<11)
+
 /* PCH */
 
 /* south display engine interrupt */
@@ -3618,6 +3632,7 @@
 #define    GT_FIFO_NUM_RESERVED_ENTRIES         20
 
 #define GEN6_UCGCTL2                            0x9404
+# define GEN6_RCZUNIT_CLOCK_GATE_DISABLE                (1 << 13)
 # define GEN6_RCPBUNIT_CLOCK_GATE_DISABLE               (1 << 12)
 # define GEN6_RCCUNIT_CLOCK_GATE_DISABLE                (1 << 11)
 
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 7886e4fb60e3..2b5eb229ff2c 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -28,14 +28,19 @@
 #include "drm.h"
 #include "i915_drm.h"
 #include "intel_drv.h"
+#include "i915_reg.h"
 
 static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         u32     dpll_reg;
 
+        /* On IVB, 3rd pipe shares PLL with another one */
+        if (pipe > 1)
+                return false;
+
         if (HAS_PCH_SPLIT(dev))
-                dpll_reg = (pipe == PIPE_A) ? _PCH_DPLL_A : _PCH_DPLL_B;
+                dpll_reg = PCH_DPLL(pipe);
         else
                 dpll_reg = (pipe == PIPE_A) ? _DPLL_A : _DPLL_B;
 
@@ -822,7 +827,7 @@ int i915_save_state(struct drm_device *dev)
 
         if (IS_IRONLAKE_M(dev))
                 ironlake_disable_drps(dev);
-        if (IS_GEN6(dev))
+        if (INTEL_INFO(dev)->gen >= 6)
                 gen6_disable_rps(dev);
 
         /* Cache mode state */
@@ -881,7 +886,7 @@ int i915_restore_state(struct drm_device *dev)
                 intel_init_emon(dev);
         }
 
-        if (IS_GEN6(dev)) {
+        if (INTEL_INFO(dev)->gen >= 6) {
                 gen6_enable_rps(dev_priv);
                 gen6_update_ring_freq(dev_priv);
         }
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h
index 8af3735e27c6..dbda6e3bdf07 100644
--- a/drivers/gpu/drm/i915/intel_bios.h
+++ b/drivers/gpu/drm/i915/intel_bios.h
@@ -467,8 +467,12 @@ struct edp_link_params {
 struct bdb_edp {
         struct edp_power_seq power_seqs[16];
         u32 color_depth;
-        u32 sdrrs_msa_timing_delay;
         struct edp_link_params link_params[16];
+        u32 sdrrs_msa_timing_delay;
+
+        /* ith bit indicates enabled/disabled for (i+1)th panel */
+        u16 edp_s3d_feature;
+        u16 edp_t3_optimization;
 } __attribute__ ((packed));
 
 void intel_setup_bios(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index fee0ad02c6d0..dd729d46a61f 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -24,6 +24,7 @@
  *      Eric Anholt <eric@anholt.net>
  */
 
+#include <linux/dmi.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include "drmP.h"
@@ -540,6 +541,24 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = {
         .destroy = intel_encoder_destroy,
 };
 
+static int __init intel_no_crt_dmi_callback(const struct dmi_system_id *id)
+{
+        DRM_DEBUG_KMS("Skipping CRT initialization for %s\n", id->ident);
+        return 1;
+}
+
+static const struct dmi_system_id intel_no_crt[] = {
+        {
+                .callback = intel_no_crt_dmi_callback,
+                .ident = "ACER ZGB",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "ACER"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "ZGB"),
+                },
+        },
+        { }
+};
+
 void intel_crt_init(struct drm_device *dev)
 {
         struct drm_connector *connector;
@@ -547,6 +566,10 @@ void intel_crt_init(struct drm_device *dev)
         struct intel_connector *intel_connector;
         struct drm_i915_private *dev_priv = dev->dev_private;
 
+        /* Skip machines without VGA that falsely report hotplug events */
+        if (dmi_check_system(intel_no_crt))
+                return;
+
         crt = kzalloc(sizeof(struct intel_crt), GFP_KERNEL);
         if (!crt)
                 return;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2a3f707caab8..f425b23e3803 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1872,7 +1872,7 @@ static void intel_update_fbc(struct drm_device *dev)
         if (enable_fbc < 0) {
                 DRM_DEBUG_KMS("fbc set to per-chip default\n");
                 enable_fbc = 1;
-                if (INTEL_INFO(dev)->gen <= 5)
+                if (INTEL_INFO(dev)->gen <= 6)
                         enable_fbc = 0;
         }
         if (!enable_fbc) {
@@ -5307,6 +5307,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
                 }
         }
 
+        pipeconf &= ~PIPECONF_INTERLACE_MASK;
         if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) {
                 pipeconf |= PIPECONF_INTERLACE_W_FIELD_INDICATION;
                 /* the chip adds 2 halflines automatically */
@@ -5317,7 +5318,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc,
                 adjusted_mode->crtc_vsync_end -= 1;
                 adjusted_mode->crtc_vsync_start -= 1;
         } else
-                pipeconf &= ~PIPECONF_INTERLACE_MASK; /* progressive */
+                pipeconf |= PIPECONF_PROGRESSIVE;
 
         I915_WRITE(HTOTAL(pipe),
                    (adjusted_mode->crtc_hdisplay - 1) |
@@ -5808,12 +5809,15 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
         if (is_lvds) {
                 temp = I915_READ(PCH_LVDS);
                 temp |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP;
-                if (HAS_PCH_CPT(dev))
+                if (HAS_PCH_CPT(dev)) {
+                        temp &= ~PORT_TRANS_SEL_MASK;
                         temp |= PORT_TRANS_SEL_CPT(pipe);
-                else if (pipe == 1)
-                        temp |= LVDS_PIPEB_SELECT;
-                else
-                        temp &= ~LVDS_PIPEB_SELECT;
+                } else {
+                        if (pipe == 1)
+                                temp |= LVDS_PIPEB_SELECT;
+                        else
+                                temp &= ~LVDS_PIPEB_SELECT;
+                }
 
                 /* set the corresponsding LVDS_BORDER bit */
                 temp |= dev_priv->lvds_border_bits;
@@ -5899,6 +5903,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
                 }
         }
 
+        pipeconf &= ~PIPECONF_INTERLACE_MASK;
         if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) {
                 pipeconf |= PIPECONF_INTERLACE_W_FIELD_INDICATION;
                 /* the chip adds 2 halflines automatically */
@@ -5909,7 +5914,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
                 adjusted_mode->crtc_vsync_end -= 1;
                 adjusted_mode->crtc_vsync_start -= 1;
         } else
-                pipeconf &= ~PIPECONF_INTERLACE_W_FIELD_INDICATION; /* progressive */
+                pipeconf |= PIPECONF_PROGRESSIVE;
 
         I915_WRITE(HTOTAL(pipe),
                    (adjusted_mode->crtc_hdisplay - 1) |
@@ -8179,8 +8184,8 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv)
         I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */
 
         if (intel_enable_rc6(dev_priv->dev))
-                rc6_mask = GEN6_RC_CTL_RC6p_ENABLE |
-                        GEN6_RC_CTL_RC6_ENABLE;
+                rc6_mask = GEN6_RC_CTL_RC6_ENABLE |
+                        (IS_GEN7(dev_priv->dev)) ? GEN6_RC_CTL_RC6p_ENABLE : 0;
 
         I915_WRITE(GEN6_RC_CONTROL,
                    rc6_mask |
@@ -8458,12 +8463,32 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)
         I915_WRITE(WM2_LP_ILK, 0);
         I915_WRITE(WM1_LP_ILK, 0);
 
+        /* According to the spec, bit 13 (RCZUNIT) must be set on IVB.
+         * This implements the WaDisableRCZUnitClockGating workaround.
+         */
+        I915_WRITE(GEN6_UCGCTL2, GEN6_RCZUNIT_CLOCK_GATE_DISABLE);
+
         I915_WRITE(ILK_DSPCLK_GATE, IVB_VRHUNIT_CLK_GATE);
 
         I915_WRITE(IVB_CHICKEN3,
                    CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE |
                    CHICKEN3_DGMG_DONE_FIX_DISABLE);
 
+        /* Apply the WaDisableRHWOOptimizationForRenderHang workaround. */
+        I915_WRITE(GEN7_COMMON_SLICE_CHICKEN1,
+                   GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC);
+
+        /* WaApplyL3ControlAndL3ChickenMode requires those two on Ivy Bridge */
+        I915_WRITE(GEN7_L3CNTLREG1,
+                        GEN7_WA_FOR_GEN7_L3_CONTROL);
+        I915_WRITE(GEN7_L3_CHICKEN_MODE_REGISTER,
+                        GEN7_WA_L3_CHICKEN_MODE);
+
+        /* This is required by WaCatErrorRejectionIssue */
+        I915_WRITE(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG,
+                        I915_READ(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG) |
+                        GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB);
+
         for_each_pipe(pipe) {
                 I915_WRITE(DSPCNTR(pipe),
                            I915_READ(DSPCNTR(pipe)) |
@@ -9025,12 +9050,9 @@ void intel_modeset_init(struct drm_device *dev)
 
         for (i = 0; i < dev_priv->num_pipe; i++) {
                 intel_crtc_init(dev, i);
-                if (HAS_PCH_SPLIT(dev)) {
-                        ret = intel_plane_init(dev, i);
-                        if (ret)
-                                DRM_ERROR("plane %d init failed: %d\n",
-                                          i, ret);
-                }
+                ret = intel_plane_init(dev, i);
+                if (ret)
+                        DRM_DEBUG_KMS("plane %d init failed: %d\n", i, ret);
         }
 
         /* Just disable it once at startup */
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index db3b461ad412..94f860cce3f7 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -208,17 +208,8 @@ intel_dp_link_clock(uint8_t link_bw)
  */
 
 static int
-intel_dp_link_required(struct intel_dp *intel_dp, int pixel_clock, int check_bpp)
+intel_dp_link_required(int pixel_clock, int bpp)
 {
-        struct drm_crtc *crtc = intel_dp->base.base.crtc;
-        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-        int bpp = 24;
-
-        if (check_bpp)
-                bpp = check_bpp;
-        else if (intel_crtc)
-                bpp = intel_crtc->bpp;
-
         return (pixel_clock * bpp + 9) / 10;
 }
 
@@ -245,12 +236,11 @@ intel_dp_mode_valid(struct drm_connector *connector,
                         return MODE_PANEL;
         }
 
-        mode_rate = intel_dp_link_required(intel_dp, mode->clock, 0);
+        mode_rate = intel_dp_link_required(mode->clock, 24);
         max_rate = intel_dp_max_data_rate(max_link_clock, max_lanes);
 
         if (mode_rate > max_rate) {
-                        mode_rate = intel_dp_link_required(intel_dp,
-                                                           mode->clock, 18);
+                        mode_rate = intel_dp_link_required(mode->clock, 18);
                         if (mode_rate > max_rate)
                                 return MODE_CLOCK_HIGH;
                         else
@@ -683,7 +673,7 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
         int lane_count, clock;
         int max_lane_count = intel_dp_max_lane_count(intel_dp);
         int max_clock = intel_dp_max_link_bw(intel_dp) == DP_LINK_BW_2_7 ? 1 : 0;
-        int bpp = mode->private_flags & INTEL_MODE_DP_FORCE_6BPC ? 18 : 0;
+        int bpp = mode->private_flags & INTEL_MODE_DP_FORCE_6BPC ? 18 : 24;
         static int bws[2] = { DP_LINK_BW_1_62, DP_LINK_BW_2_7 };
 
         if (is_edp(intel_dp) && intel_dp->panel_fixed_mode) {
@@ -701,7 +691,7 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
                 for (clock = 0; clock <= max_clock; clock++) {
                         int link_avail = intel_dp_max_data_rate(intel_dp_link_clock(bws[clock]), lane_count);
 
-                        if (intel_dp_link_required(intel_dp, mode->clock, bpp)
+                        if (intel_dp_link_required(mode->clock, bpp)
                                         <= link_avail) {
                                 intel_dp->link_bw = bws[clock];
                                 intel_dp->lane_count = lane_count;
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index e44191132ac4..aa84832b0e1a 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -694,6 +694,14 @@ static const struct dmi_system_id intel_no_lvds[] = {
         },
         {
                 .callback = intel_no_lvds_dmi_callback,
+                .ident = "AOpen i45GMx-I",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "AOpen"),
+                        DMI_MATCH(DMI_BOARD_NAME, "i45GMx-I"),
+                },
+        },
+        {
+                .callback = intel_no_lvds_dmi_callback,
                 .ident = "Aopen i945GTt-VFA",
                 .matches = {
                         DMI_MATCH(DMI_PRODUCT_VERSION, "AO00001JW"),
@@ -708,6 +716,14 @@ static const struct dmi_system_id intel_no_lvds[] = {
                 },
         },
         {
+                .callback = intel_no_lvds_dmi_callback,
+                .ident = "Clientron E830",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Clientron"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "E830"),
+                },
+        },
+        {
                 .callback = intel_no_lvds_dmi_callback,
                 .ident = "Asus EeeBox PC EB1007",
                 .matches = {
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 77e729d4e4f0..1ab842c6032e 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -636,6 +636,19 @@ render_ring_add_request(struct intel_ring_buffer *ring,
 }
 
 static u32
+gen6_ring_get_seqno(struct intel_ring_buffer *ring)
+{
+        struct drm_device *dev = ring->dev;
+
+        /* Workaround to force correct ordering between irq and seqno writes on
+         * ivb (and maybe also on snb) by reading from a CS register (like
+         * ACTHD) before reading the status page. */
+        if (IS_GEN7(dev))
+                intel_ring_get_active_head(ring);
+        return intel_read_status_page(ring, I915_GEM_HWS_INDEX);
+}
+
+static u32
 ring_get_seqno(struct intel_ring_buffer *ring)
 {
         return intel_read_status_page(ring, I915_GEM_HWS_INDEX);
@@ -792,17 +805,6 @@ ring_add_request(struct intel_ring_buffer *ring,
 }
 
 static bool
-gen7_blt_ring_get_irq(struct intel_ring_buffer *ring)
-{
-        /* The BLT ring on IVB appears to have broken synchronization
-         * between the seqno write and the interrupt, so that the
-         * interrupt appears first.  Returning false here makes
-         * i915_wait_request() do a polling loop, instead.
-         */
-        return false;
-}
-
-static bool
 gen6_ring_get_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag)
 {
         struct drm_device *dev = ring->dev;
@@ -811,6 +813,12 @@ gen6_ring_get_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag)
         if (!dev->irq_enabled)
                return false;
 
+        /* It looks like we need to prevent the gt from suspending while waiting
+         * for an notifiy irq, otherwise irqs seem to get lost on at least the
+         * blt/bsd rings on ivb. */
+        if (IS_GEN7(dev))
+                gen6_gt_force_wake_get(dev_priv);
+
         spin_lock(&ring->irq_lock);
         if (ring->irq_refcount++ == 0) {
                 ring->irq_mask &= ~rflag;
@@ -835,6 +843,9 @@ gen6_ring_put_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag)
                 ironlake_disable_irq(dev_priv, gflag);
         }
         spin_unlock(&ring->irq_lock);
+
+        if (IS_GEN7(dev))
+                gen6_gt_force_wake_put(dev_priv);
 }
 
 static bool
@@ -1341,7 +1352,7 @@ static const struct intel_ring_buffer gen6_bsd_ring = {
         .write_tail             = gen6_bsd_ring_write_tail,
         .flush                  = gen6_ring_flush,
         .add_request            = gen6_add_request,
-        .get_seqno              = ring_get_seqno,
+        .get_seqno              = gen6_ring_get_seqno,
         .irq_get                = gen6_bsd_ring_get_irq,
         .irq_put                = gen6_bsd_ring_put_irq,
         .dispatch_execbuffer    = gen6_ring_dispatch_execbuffer,
@@ -1476,7 +1487,7 @@ static const struct intel_ring_buffer gen6_blt_ring = {
         .write_tail             = ring_write_tail,
         .flush                  = blt_ring_flush,
         .add_request            = gen6_add_request,
-        .get_seqno              = ring_get_seqno,
+        .get_seqno              = gen6_ring_get_seqno,
         .irq_get                = blt_ring_get_irq,
         .irq_put                = blt_ring_put_irq,
         .dispatch_execbuffer    = gen6_ring_dispatch_execbuffer,
@@ -1499,6 +1510,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
                 ring->flush = gen6_render_ring_flush;
                 ring->irq_get = gen6_render_ring_get_irq;
                 ring->irq_put = gen6_render_ring_put_irq;
+                ring->get_seqno = gen6_ring_get_seqno;
         } else if (IS_GEN5(dev)) {
                 ring->add_request = pc_render_add_request;
                 ring->get_seqno = pc_render_get_seqno;
@@ -1577,8 +1589,5 @@ int intel_init_blt_ring_buffer(struct drm_device *dev)
 
         *ring = gen6_blt_ring;
 
-        if (IS_GEN7(dev))
-                ring->irq_get = gen7_blt_ring_get_irq;
-
         return intel_init_ring_buffer(dev, ring);
 }
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index f7b9268df266..e334ec33a47d 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1066,15 +1066,13 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
 
         /* Set the SDVO control regs. */
         if (INTEL_INFO(dev)->gen >= 4) {
-                sdvox = 0;
+                /* The real mode polarity is set by the SDVO commands, using
+                 * struct intel_sdvo_dtd. */
+                sdvox = SDVO_VSYNC_ACTIVE_HIGH | SDVO_HSYNC_ACTIVE_HIGH;
                 if (intel_sdvo->is_hdmi)
                         sdvox |= intel_sdvo->color_range;
                 if (INTEL_INFO(dev)->gen < 5)
                         sdvox |= SDVO_BORDER_ENABLE;
-                if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
-                        sdvox |= SDVO_VSYNC_ACTIVE_HIGH;
-                if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
-                        sdvox |= SDVO_HSYNC_ACTIVE_HIGH;
         } else {
                 sdvox = I915_READ(intel_sdvo->sdvo_reg);
                 switch (intel_sdvo->sdvo_reg) {
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index d13989fda501..2288abf88cce 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -466,10 +466,8 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
         mutex_lock(&dev->struct_mutex);
 
         ret = intel_pin_and_fence_fb_obj(dev, obj, NULL);
-        if (ret) {
-                DRM_ERROR("failed to pin object\n");
+        if (ret)
                 goto out_unlock;
-        }
 
         intel_plane->obj = obj;
 
@@ -632,10 +630,8 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe)
         unsigned long possible_crtcs;
         int ret;
 
-        if (!(IS_GEN6(dev) || IS_GEN7(dev))) {
-                DRM_ERROR("new plane code only for SNB+\n");
+        if (!(IS_GEN6(dev) || IS_GEN7(dev)))
                 return -ENODEV;
-        }
 
         intel_plane = kzalloc(sizeof(struct intel_plane), GFP_KERNEL);
         if (!intel_plane)
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index f3c6a9a8b081..1571be37ce3e 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -417,7 +417,7 @@ static const struct tv_mode tv_modes[] = {
         {
                 .name           = "NTSC-M",
                 .clock          = 108000,
-                .refresh        = 29970,
+                .refresh        = 59940,
                 .oversample     = TV_OVERSAMPLE_8X,
                 .component_only = 0,
                 /* 525 Lines, 60 Fields, 15.734KHz line, Sub-Carrier 3.580MHz */
@@ -460,7 +460,7 @@ static const struct tv_mode tv_modes[] = {
         {
                 .name           = "NTSC-443",
                 .clock          = 108000,
-                .refresh        = 29970,
+                .refresh        = 59940,
                 .oversample     = TV_OVERSAMPLE_8X,
                 .component_only = 0,
                 /* 525 Lines, 60 Fields, 15.734KHz line, Sub-Carrier 4.43MHz */
@@ -502,7 +502,7 @@ static const struct tv_mode tv_modes[] = {
         {
                 .name           = "NTSC-J",
                 .clock          = 108000,
-                .refresh        = 29970,
+                .refresh        = 59940,
                 .oversample     = TV_OVERSAMPLE_8X,
                 .component_only = 0,
 
@@ -545,7 +545,7 @@ static const struct tv_mode tv_modes[] = {
         {
                 .name           = "PAL-M",
                 .clock          = 108000,
-                .refresh        = 29970,
+                .refresh        = 59940,
                 .oversample     = TV_OVERSAMPLE_8X,
                 .component_only = 0,
 
@@ -589,7 +589,7 @@ static const struct tv_mode tv_modes[] = {
                 /* 625 Lines, 50 Fields, 15.625KHz line, Sub-Carrier 4.434MHz */
                 .name       = "PAL-N",
                 .clock          = 108000,
-                .refresh        = 25000,
+                .refresh        = 50000,
                 .oversample     = TV_OVERSAMPLE_8X,
                 .component_only = 0,
 
@@ -634,7 +634,7 @@ static const struct tv_mode tv_modes[] = {
                 /* 625 Lines, 50 Fields, 15.625KHz line, Sub-Carrier 4.434MHz */
                 .name       = "PAL",
                 .clock          = 108000,
-                .refresh        = 25000,
+                .refresh        = 50000,
                 .oversample     = TV_OVERSAMPLE_8X,
                 .component_only = 0,
 
@@ -674,78 +674,6 @@ static const struct tv_mode tv_modes[] = {
                 .filter_table = filter_table,
         },
         {
-                .name       = "480p@59.94Hz",
-                .clock          = 107520,
-                .refresh        = 59940,
-                .oversample     = TV_OVERSAMPLE_4X,
-                .component_only = 1,
-
-                .hsync_end      = 64,               .hblank_end         = 122,
-                .hblank_start   = 842,              .htotal             = 857,
-
-                .progressive    = true,             .trilevel_sync = false,
-
-                .vsync_start_f1 = 12,               .vsync_start_f2     = 12,
-                .vsync_len      = 12,
-
-                .veq_ena        = false,
-
-                .vi_end_f1      = 44,               .vi_end_f2          = 44,
-                .nbr_end        = 479,
-
-                .burst_ena      = false,
-
-                .filter_table = filter_table,
-        },
-        {
-                .name       = "480p@60Hz",
-                .clock          = 107520,
-                .refresh        = 60000,
-                .oversample     = TV_OVERSAMPLE_4X,
-                .component_only = 1,
-
-                .hsync_end      = 64,               .hblank_end         = 122,
-                .hblank_start   = 842,              .htotal             = 856,
-
-                .progressive    = true,             .trilevel_sync = false,
-
-                .vsync_start_f1 = 12,               .vsync_start_f2     = 12,
-                .vsync_len      = 12,
-
-                .veq_ena        = false,
-
-                .vi_end_f1      = 44,               .vi_end_f2          = 44,
-                .nbr_end        = 479,
-
-                .burst_ena      = false,
-
-                .filter_table = filter_table,
-        },
-        {
-                .name       = "576p",
-                .clock          = 107520,
-                .refresh        = 50000,
-                .oversample     = TV_OVERSAMPLE_4X,
-                .component_only = 1,
-
-                .hsync_end      = 64,               .hblank_end         = 139,
-                .hblank_start   = 859,              .htotal             = 863,
-
-                .progressive    = true,         .trilevel_sync = false,
-
-                .vsync_start_f1 = 10,               .vsync_start_f2     = 10,
-                .vsync_len      = 10,
-
-                .veq_ena        = false,
-
-                .vi_end_f1      = 48,               .vi_end_f2          = 48,
-                .nbr_end        = 575,
-
-                .burst_ena      = false,
-
-                .filter_table = filter_table,
-        },
-        {
                 .name       = "720p@60Hz",
                 .clock          = 148800,
                 .refresh        = 60000,
@@ -770,30 +698,6 @@ static const struct tv_mode tv_modes[] = {
                 .filter_table = filter_table,
         },
         {
-                .name       = "720p@59.94Hz",
-                .clock          = 148800,
-                .refresh        = 59940,
-                .oversample     = TV_OVERSAMPLE_2X,
-                .component_only = 1,
-
-                .hsync_end      = 80,               .hblank_end         = 300,
-                .hblank_start   = 1580,             .htotal             = 1651,
-
-                .progressive    = true,             .trilevel_sync = true,
-
-                .vsync_start_f1 = 10,               .vsync_start_f2     = 10,
-                .vsync_len      = 10,
-
-                .veq_ena        = false,
-
-                .vi_end_f1      = 29,               .vi_end_f2          = 29,
-                .nbr_end        = 719,
-
-                .burst_ena      = false,
-
-                .filter_table = filter_table,
-        },
-        {
                 .name       = "720p@50Hz",
                 .clock          = 148800,
                 .refresh        = 50000,
@@ -821,7 +725,7 @@ static const struct tv_mode tv_modes[] = {
         {
                 .name       = "1080i@50Hz",
                 .clock          = 148800,
-                .refresh        = 25000,
+                .refresh        = 50000,
                 .oversample     = TV_OVERSAMPLE_2X,
                 .component_only = 1,
 
@@ -847,7 +751,7 @@ static const struct tv_mode tv_modes[] = {
         {
                 .name       = "1080i@60Hz",
                 .clock          = 148800,
-                .refresh        = 30000,
+                .refresh        = 60000,
                 .oversample     = TV_OVERSAMPLE_2X,
                 .component_only = 1,
 
@@ -870,32 +774,6 @@ static const struct tv_mode tv_modes[] = {
 
                 .filter_table = filter_table,
         },
-        {
-                .name       = "1080i@59.94Hz",
-                .clock          = 148800,
-                .refresh        = 29970,
-                .oversample     = TV_OVERSAMPLE_2X,
-                .component_only = 1,
-
-                .hsync_end      = 88,               .hblank_end         = 235,
-                .hblank_start   = 2155,             .htotal             = 2201,
-
-                .progressive    = false,            .trilevel_sync = true,
-
-                .vsync_start_f1 = 4,            .vsync_start_f2    = 5,
-                .vsync_len      = 10,
-
-                .veq_ena        = true,             .veq_start_f1       = 4,
-                .veq_start_f2   = 4,            .veq_len          = 10,
-
-
-                .vi_end_f1      = 21,           .vi_end_f2        = 22,
-                .nbr_end        = 539,
-
-                .burst_ena      = false,
-
-                .filter_table = filter_table,
-        },
 };
 
 static struct intel_tv *enc_to_intel_tv(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
index 1e382ad5a2b8..a37c31e358aa 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
@@ -54,9 +54,10 @@ struct bit_entry {
 int bit_table(struct drm_device *, u8 id, struct bit_entry *);
 
 enum dcb_gpio_tag {
-        DCB_GPIO_TVDAC0 = 0xc,
+        DCB_GPIO_PANEL_POWER = 0x01,
+        DCB_GPIO_TVDAC0 = 0x0c,
         DCB_GPIO_TVDAC1 = 0x2d,
-        DCB_GPIO_PWM_FAN = 0x9,
+        DCB_GPIO_PWM_FAN = 0x09,
         DCB_GPIO_FAN_SENSE = 0x3d,
         DCB_GPIO_UNUSED = 0xff
 };
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 724b41a2b9e9..ec54364ac828 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -812,6 +812,10 @@ nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem)
         struct nouveau_bo *nvbo = nouveau_bo(bo);
         struct nouveau_vma *vma;
 
+        /* ttm can now (stupidly) pass the driver bos it didn't create... */
+        if (bo->destroy != nouveau_bo_del_ttm)
+                return;
+
         list_for_each_entry(vma, &nvbo->vma_list, head) {
                 if (new_mem && new_mem->mem_type == TTM_PL_VRAM) {
                         nouveau_vm_map(vma, new_mem->mm_node);
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 3cb52bc52b21..795a9e3c990a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -219,6 +219,16 @@ nouveau_display_init(struct drm_device *dev)
         if (ret)
                 return ret;
 
+        /* power on internal panel if it's not already.  the init tables of
+         * some vbios default this to off for some reason, causing the
+         * panel to not work after resume
+         */
+        if (nouveau_gpio_func_get(dev, DCB_GPIO_PANEL_POWER) == 0) {
+                nouveau_gpio_func_set(dev, DCB_GPIO_PANEL_POWER, true);
+                msleep(300);
+        }
+
+        /* enable polling for external displays */
         drm_kms_helper_poll_enable(dev);
 
         /* enable hotplug interrupts */
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index e4a7cfe7898d..81d7962e7252 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -124,7 +124,7 @@ MODULE_PARM_DESC(ctxfw, "Use external HUB/GPC ucode (fermi)\n");
 int nouveau_ctxfw;
 module_param_named(ctxfw, nouveau_ctxfw, int, 0400);
 
-MODULE_PARM_DESC(ctxfw, "Santise DCB table according to MXM-SIS\n");
+MODULE_PARM_DESC(mxmdcb, "Santise DCB table according to MXM-SIS\n");
 int nouveau_mxmdcb = 1;
 module_param_named(mxmdcb, nouveau_mxmdcb, int, 0400);
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 5f0bc57fdaab..7ce3fde40743 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -380,6 +380,25 @@ retry:
 }
 
 static int
+validate_sync(struct nouveau_channel *chan, struct nouveau_bo *nvbo)
+{
+        struct nouveau_fence *fence = NULL;
+        int ret = 0;
+
+        spin_lock(&nvbo->bo.bdev->fence_lock);
+        if (nvbo->bo.sync_obj)
+                fence = nouveau_fence_ref(nvbo->bo.sync_obj);
+        spin_unlock(&nvbo->bo.bdev->fence_lock);
+
+        if (fence) {
+                ret = nouveau_fence_sync(fence, chan);
+                nouveau_fence_unref(&fence);
+        }
+
+        return ret;
+}
+
+static int
 validate_list(struct nouveau_channel *chan, struct list_head *list,
               struct drm_nouveau_gem_pushbuf_bo *pbbo, uint64_t user_pbbo_ptr)
 {
@@ -393,7 +412,7 @@ validate_list(struct nouveau_channel *chan, struct list_head *list,
         list_for_each_entry(nvbo, list, entry) {
                 struct drm_nouveau_gem_pushbuf_bo *b = &pbbo[nvbo->pbbo_index];
 
-                ret = nouveau_fence_sync(nvbo->bo.sync_obj, chan);
+                ret = validate_sync(chan, nvbo);
                 if (unlikely(ret)) {
                         NV_ERROR(dev, "fail pre-validate sync\n");
                         return ret;
@@ -416,7 +435,7 @@ validate_list(struct nouveau_channel *chan, struct list_head *list,
                         return ret;
                 }
 
-                ret = nouveau_fence_sync(nvbo->bo.sync_obj, chan);
+                ret = validate_sync(chan, nvbo);
                 if (unlikely(ret)) {
                         NV_ERROR(dev, "fail post-validate sync\n");
                         return ret;
diff --git a/drivers/gpu/drm/nouveau/nouveau_mxm.c b/drivers/gpu/drm/nouveau/nouveau_mxm.c
index 8bccddf4eff0..e5a64f0f4cb7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mxm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mxm.c
@@ -656,7 +656,16 @@ nouveau_mxm_init(struct drm_device *dev)
 
         if (mxm_shadow(dev, mxm[0])) {
                 MXM_MSG(dev, "failed to locate valid SIS\n");
+#if 0
+                /* we should, perhaps, fall back to some kind of limited
+                 * mode here if the x86 vbios hasn't already done the
+                 * work for us (so we prevent loading with completely
+                 * whacked vbios tables).
+                 */
                 return -EINVAL;
+#else
+                return 0;
+#endif
         }
 
         MXM_MSG(dev, "MXMS Version %d.%d\n",
diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c
index 03937212e9d8..ec5481dfcd82 100644
--- a/drivers/gpu/drm/nouveau/nv50_pm.c
+++ b/drivers/gpu/drm/nouveau/nv50_pm.c
@@ -495,9 +495,9 @@ nv50_pm_clocks_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl)
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nv50_pm_state *info;
         struct pll_lims pll;
-        int ret = -EINVAL;
+        int clk, ret = -EINVAL;
         int N, M, P1, P2;
-        u32 clk, out;
+        u32 out;
 
         if (dev_priv->chipset == 0xaa ||
             dev_priv->chipset == 0xac)
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index 0fda830ef806..742f17f009a9 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -355,15 +355,12 @@ static void atombios_crtc_set_timing(struct drm_crtc *crtc,
         atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
 }
 
-static void atombios_disable_ss(struct drm_crtc *crtc)
+static void atombios_disable_ss(struct radeon_device *rdev, int pll_id)
 {
-        struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
-        struct drm_device *dev = crtc->dev;
-        struct radeon_device *rdev = dev->dev_private;
         u32 ss_cntl;
 
         if (ASIC_IS_DCE4(rdev)) {
-                switch (radeon_crtc->pll_id) {
+                switch (pll_id) {
                 case ATOM_PPLL1:
                         ss_cntl = RREG32(EVERGREEN_P1PLL_SS_CNTL);
                         ss_cntl &= ~EVERGREEN_PxPLL_SS_EN;
@@ -379,7 +376,7 @@ static void atombios_disable_ss(struct drm_crtc *crtc)
                         return;
                 }
         } else if (ASIC_IS_AVIVO(rdev)) {
-                switch (radeon_crtc->pll_id) {
+                switch (pll_id) {
                 case ATOM_PPLL1:
                         ss_cntl = RREG32(AVIVO_P1PLL_INT_SS_CNTL);
                         ss_cntl &= ~1;
@@ -406,13 +403,11 @@ union atom_enable_ss {
         ENABLE_SPREAD_SPECTRUM_ON_PPLL_V3 v3;
 };
 
-static void atombios_crtc_program_ss(struct drm_crtc *crtc,
+static void atombios_crtc_program_ss(struct radeon_device *rdev,
                                      int enable,
                                      int pll_id,
                                      struct radeon_atom_ss *ss)
 {
-        struct drm_device *dev = crtc->dev;
-        struct radeon_device *rdev = dev->dev_private;
         int index = GetIndexIntoMasterTable(COMMAND, EnableSpreadSpectrumOnPPLL);
         union atom_enable_ss args;
 
@@ -479,7 +474,7 @@ static void atombios_crtc_program_ss(struct drm_crtc *crtc,
         } else if (ASIC_IS_AVIVO(rdev)) {
                 if ((enable == ATOM_DISABLE) || (ss->percentage == 0) ||
                     (ss->type & ATOM_EXTERNAL_SS_MASK)) {
-                        atombios_disable_ss(crtc);
+                        atombios_disable_ss(rdev, pll_id);
                         return;
                 }
                 args.lvds_ss_2.usSpreadSpectrumPercentage = cpu_to_le16(ss->percentage);
@@ -491,7 +486,7 @@ static void atombios_crtc_program_ss(struct drm_crtc *crtc,
         } else {
                 if ((enable == ATOM_DISABLE) || (ss->percentage == 0) ||
                     (ss->type & ATOM_EXTERNAL_SS_MASK)) {
-                        atombios_disable_ss(crtc);
+                        atombios_disable_ss(rdev, pll_id);
                         return;
                 }
                 args.lvds_ss.usSpreadSpectrumPercentage = cpu_to_le16(ss->percentage);
@@ -523,6 +518,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
         int encoder_mode = 0;
         u32 dp_clock = mode->clock;
         int bpc = 8;
+        bool is_duallink = false;
 
         /* reset the pll flags */
         pll->flags = 0;
@@ -557,6 +553,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                         if (connector && connector->display_info.bpc)
                                 bpc = connector->display_info.bpc;
                         encoder_mode = atombios_get_encoder_mode(encoder);
+                        is_duallink = radeon_dig_monitor_is_duallink(encoder, mode->clock);
                         if ((radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) ||
                             (radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE)) {
                                 if (connector) {
@@ -652,7 +649,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
                                         if (dig->coherent_mode)
                                                 args.v3.sInput.ucDispPllConfig |=
                                                         DISPPLL_CONFIG_COHERENT_MODE;
-                                        if (mode->clock > 165000)
+                                        if (is_duallink)
                                                 args.v3.sInput.ucDispPllConfig |=
                                                         DISPPLL_CONFIG_DUAL_LINK;
                                 }
@@ -702,11 +699,9 @@ union set_pixel_clock {
 /* on DCE5, make sure the voltage is high enough to support the
  * required disp clk.
  */
-static void atombios_crtc_set_dcpll(struct drm_crtc *crtc,
+static void atombios_crtc_set_dcpll(struct radeon_device *rdev,
                                     u32 dispclk)
 {
-        struct drm_device *dev = crtc->dev;
-        struct radeon_device *rdev = dev->dev_private;
         u8 frev, crev;
         int index;
         union set_pixel_clock args;
@@ -996,7 +991,7 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode
                 radeon_compute_pll_legacy(pll, adjusted_clock, &pll_clock, &fb_div, &frac_fb_div,
                                           &ref_div, &post_div);
 
-        atombios_crtc_program_ss(crtc, ATOM_DISABLE, radeon_crtc->pll_id, &ss);
+        atombios_crtc_program_ss(rdev, ATOM_DISABLE, radeon_crtc->pll_id, &ss);
 
         atombios_crtc_program_pll(crtc, radeon_crtc->crtc_id, radeon_crtc->pll_id,
                                   encoder_mode, radeon_encoder->encoder_id, mode->clock,
@@ -1019,7 +1014,7 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode
                         ss.step = step_size;
                 }
 
-                atombios_crtc_program_ss(crtc, ATOM_ENABLE, radeon_crtc->pll_id, &ss);
+                atombios_crtc_program_ss(rdev, ATOM_ENABLE, radeon_crtc->pll_id, &ss);
         }
 }
 
@@ -1189,7 +1184,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
         WREG32(EVERGREEN_GRPH_ENABLE + radeon_crtc->crtc_offset, 1);
 
         WREG32(EVERGREEN_DESKTOP_HEIGHT + radeon_crtc->crtc_offset,
-               crtc->mode.vdisplay);
+               target_fb->height);
         x &= ~3;
         y &= ~1;
         WREG32(EVERGREEN_VIEWPORT_START + radeon_crtc->crtc_offset,
@@ -1358,7 +1353,7 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc,
         WREG32(AVIVO_D1GRPH_ENABLE + radeon_crtc->crtc_offset, 1);
 
         WREG32(AVIVO_D1MODE_DESKTOP_HEIGHT + radeon_crtc->crtc_offset,
-               crtc->mode.vdisplay);
+               target_fb->height);
         x &= ~3;
         y &= ~1;
         WREG32(AVIVO_D1MODE_VIEWPORT_START + radeon_crtc->crtc_offset,
@@ -1494,6 +1489,24 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc)
 
 }
 
+void radeon_atom_dcpll_init(struct radeon_device *rdev)
+{
+        /* always set DCPLL */
+        if (ASIC_IS_DCE4(rdev)) {
+                struct radeon_atom_ss ss;
+                bool ss_enabled = radeon_atombios_get_asic_ss_info(rdev, &ss,
+                                                                   ASIC_INTERNAL_SS_ON_DCPLL,
+                                                                   rdev->clock.default_dispclk);
+                if (ss_enabled)
+                        atombios_crtc_program_ss(rdev, ATOM_DISABLE, ATOM_DCPLL, &ss);
+                /* XXX: DCE5, make sure voltage, dispclk is high enough */
+                atombios_crtc_set_dcpll(rdev, rdev->clock.default_dispclk);
+                if (ss_enabled)
+                        atombios_crtc_program_ss(rdev, ATOM_ENABLE, ATOM_DCPLL, &ss);
+        }
+
+}
+
 int atombios_crtc_mode_set(struct drm_crtc *crtc,
                            struct drm_display_mode *mode,
                            struct drm_display_mode *adjusted_mode,
@@ -1515,19 +1528,6 @@ int atombios_crtc_mode_set(struct drm_crtc *crtc,
                 }
         }
 
-        /* always set DCPLL */
-        if (ASIC_IS_DCE4(rdev)) {
-                struct radeon_atom_ss ss;
-                bool ss_enabled = radeon_atombios_get_asic_ss_info(rdev, &ss,
-                                                                   ASIC_INTERNAL_SS_ON_DCPLL,
-                                                                   rdev->clock.default_dispclk);
-                if (ss_enabled)
-                        atombios_crtc_program_ss(crtc, ATOM_DISABLE, ATOM_DCPLL, &ss);
-                /* XXX: DCE5, make sure voltage, dispclk is high enough */
-                atombios_crtc_set_dcpll(crtc, rdev->clock.default_dispclk);
-                if (ss_enabled)
-                        atombios_crtc_program_ss(crtc, ATOM_ENABLE, ATOM_DCPLL, &ss);
-        }
         atombios_crtc_set_pll(crtc, adjusted_mode);
 
         if (ASIC_IS_DCE4(rdev))
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index 6fb335a4fdda..552b436451fd 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -549,8 +549,8 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector)
         return false;
 }
 
-static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,
-                                     struct drm_connector *connector)
+int radeon_dp_get_panel_mode(struct drm_encoder *encoder,
+                             struct drm_connector *connector)
 {
         struct drm_device *dev = encoder->dev;
         struct radeon_device *rdev = dev->dev_private;
@@ -558,28 +558,33 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,
         int panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;
 
         if (!ASIC_IS_DCE4(rdev))
-                return;
+                return panel_mode;
 
         if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) ==
             ENCODER_OBJECT_ID_NUTMEG)
                 panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE;
         else if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) ==
-                 ENCODER_OBJECT_ID_TRAVIS)
-                panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;
-        else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
+                 ENCODER_OBJECT_ID_TRAVIS) {
+                u8 id[6];
+                int i;
+                for (i = 0; i < 6; i++)
+                        id[i] = radeon_read_dpcd_reg(radeon_connector, 0x503 + i);
+                if (id[0] == 0x73 &&
+                    id[1] == 0x69 &&
+                    id[2] == 0x76 &&
+                    id[3] == 0x61 &&
+                    id[4] == 0x72 &&
+                    id[5] == 0x54)
+                        panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE;
+                else
+                        panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;
+        } else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
                 u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP);
                 if (tmp & 1)
                         panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;
         }
 
-        atombios_dig_encoder_setup(encoder,
-                                   ATOM_ENCODER_CMD_SETUP_PANEL_MODE,
-                                   panel_mode);
-
-        if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&
-            (panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {
-                radeon_write_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_SET, 1);
-        }
+        return panel_mode;
 }
 
 void radeon_dp_set_link_config(struct drm_connector *connector,
@@ -717,6 +722,8 @@ static void radeon_dp_set_tp(struct radeon_dp_link_train_info *dp_info, int tp)
 
 static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info)
 {
+        struct radeon_encoder *radeon_encoder = to_radeon_encoder(dp_info->encoder);
+        struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
         u8 tmp;
 
         /* power up the sink */
@@ -732,7 +739,10 @@ static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info)
                 radeon_write_dpcd_reg(dp_info->radeon_connector,
                                       DP_DOWNSPREAD_CTRL, 0);
 
-        radeon_dp_set_panel_mode(dp_info->encoder, dp_info->connector);
+        if ((dp_info->connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&
+            (dig->panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {
+                radeon_write_dpcd_reg(dp_info->radeon_connector, DP_EDP_CONFIGURATION_SET, 1);
+        }
 
         /* set the lane count on the sink */
         tmp = dp_info->dp_lane_count;
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index f1f06ca9f1f5..b88c4608731b 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -57,22 +57,6 @@ static inline bool radeon_encoder_is_digital(struct drm_encoder *encoder)
         }
 }
 
-static struct drm_connector *
-radeon_get_connector_for_encoder_init(struct drm_encoder *encoder)
-{
-        struct drm_device *dev = encoder->dev;
-        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-        struct drm_connector *connector;
-        struct radeon_connector *radeon_connector;
-
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-                radeon_connector = to_radeon_connector(connector);
-                if (radeon_encoder->devices & radeon_connector->devices)
-                        return connector;
-        }
-        return NULL;
-}
-
 static bool radeon_atom_mode_fixup(struct drm_encoder *encoder,
                                    struct drm_display_mode *mode,
                                    struct drm_display_mode *adjusted_mode)
@@ -253,7 +237,7 @@ atombios_dvo_setup(struct drm_encoder *encoder, int action)
                         /* R4xx, R5xx */
                         args.ext_tmds.sXTmdsEncoder.ucEnable = action;
 
-                        if (radeon_encoder->pixel_clock > 165000)
+                        if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                 args.ext_tmds.sXTmdsEncoder.ucMisc |= PANEL_ENCODER_MISC_DUAL;
 
                         args.ext_tmds.sXTmdsEncoder.ucMisc |= ATOM_PANEL_MISC_888RGB;
@@ -265,7 +249,7 @@ atombios_dvo_setup(struct drm_encoder *encoder, int action)
                         /* DFP1, CRT1, TV1 depending on the type of port */
                         args.dvo.sDVOEncoder.ucDeviceType = ATOM_DEVICE_DFP1_INDEX;
 
-                        if (radeon_encoder->pixel_clock > 165000)
+                        if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                 args.dvo.sDVOEncoder.usDevAttr.sDigAttrib.ucAttribute |= PANEL_ENCODER_MISC_DUAL;
                         break;
                 case 3:
@@ -349,7 +333,7 @@ atombios_digital_setup(struct drm_encoder *encoder, int action)
                         } else {
                                 if (dig->linkb)
                                         args.v1.ucMisc |= PANEL_ENCODER_MISC_TMDS_LINKB;
-                                if (radeon_encoder->pixel_clock > 165000)
+                                if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                         args.v1.ucMisc |= PANEL_ENCODER_MISC_DUAL;
                                 /*if (pScrn->rgbBits == 8) */
                                 args.v1.ucMisc |= ATOM_PANEL_MISC_888RGB;
@@ -388,7 +372,7 @@ atombios_digital_setup(struct drm_encoder *encoder, int action)
                         } else {
                                 if (dig->linkb)
                                         args.v2.ucMisc |= PANEL_ENCODER_MISC_TMDS_LINKB;
-                                if (radeon_encoder->pixel_clock > 165000)
+                                if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                         args.v2.ucMisc |= PANEL_ENCODER_MISC_DUAL;
                         }
                         break;
@@ -432,7 +416,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
         switch (connector->connector_type) {
         case DRM_MODE_CONNECTOR_DVII:
         case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */
-                if (drm_detect_monitor_audio(radeon_connector->edid) &&
+                if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
                     radeon_audio)
                         return ATOM_ENCODER_MODE_HDMI;
                 else if (radeon_connector->use_digital)
@@ -443,7 +427,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
         case DRM_MODE_CONNECTOR_DVID:
         case DRM_MODE_CONNECTOR_HDMIA:
         default:
-                if (drm_detect_monitor_audio(radeon_connector->edid) &&
+                if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
                     radeon_audio)
                         return ATOM_ENCODER_MODE_HDMI;
                 else
@@ -457,7 +441,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
                 if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
                     (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
                         return ATOM_ENCODER_MODE_DP;
-                else if (drm_detect_monitor_audio(radeon_connector->edid) &&
+                else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
                          radeon_audio)
                         return ATOM_ENCODER_MODE_HDMI;
                 else
@@ -587,7 +571,7 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mo
 
                         if (ENCODER_MODE_IS_DP(args.v1.ucEncoderMode))
                                 args.v1.ucLaneNum = dp_lane_count;
-                        else if (radeon_encoder->pixel_clock > 165000)
+                        else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                 args.v1.ucLaneNum = 8;
                         else
                                 args.v1.ucLaneNum = 4;
@@ -622,7 +606,7 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mo
 
                         if (ENCODER_MODE_IS_DP(args.v1.ucEncoderMode))
                                 args.v3.ucLaneNum = dp_lane_count;
-                        else if (radeon_encoder->pixel_clock > 165000)
+                        else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                 args.v3.ucLaneNum = 8;
                         else
                                 args.v3.ucLaneNum = 4;
@@ -662,7 +646,7 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mo
 
                         if (ENCODER_MODE_IS_DP(args.v1.ucEncoderMode))
                                 args.v4.ucLaneNum = dp_lane_count;
-                        else if (radeon_encoder->pixel_clock > 165000)
+                        else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                 args.v4.ucLaneNum = 8;
                         else
                                 args.v4.ucLaneNum = 4;
@@ -806,7 +790,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
                                 if (is_dp)
                                         args.v1.usPixelClock =
                                                 cpu_to_le16(dp_clock / 10);
-                                else if (radeon_encoder->pixel_clock > 165000)
+                                else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                         args.v1.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock / 2) / 10);
                                 else
                                         args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
@@ -821,7 +805,8 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
 
                         if ((rdev->flags & RADEON_IS_IGP) &&
                             (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_UNIPHY)) {
-                                if (is_dp || (radeon_encoder->pixel_clock <= 165000)) {
+                                if (is_dp ||
+                                    !radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock)) {
                                         if (igp_lane_info & 0x1)
                                                 args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_3;
                                         else if (igp_lane_info & 0x2)
@@ -848,7 +833,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
                         else if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) {
                                 if (dig->coherent_mode)
                                         args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_COHERENT;
-                                if (radeon_encoder->pixel_clock > 165000)
+                                if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                         args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_8LANE_LINK;
                         }
                         break;
@@ -863,7 +848,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
                                 if (is_dp)
                                         args.v2.usPixelClock =
                                                 cpu_to_le16(dp_clock / 10);
-                                else if (radeon_encoder->pixel_clock > 165000)
+                                else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                         args.v2.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock / 2) / 10);
                                 else
                                         args.v2.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
@@ -891,7 +876,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
                         } else if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) {
                                 if (dig->coherent_mode)
                                         args.v2.acConfig.fCoherentMode = 1;
-                                if (radeon_encoder->pixel_clock > 165000)
+                                if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                         args.v2.acConfig.fDualLinkConnector = 1;
                         }
                         break;
@@ -906,7 +891,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
                                 if (is_dp)
                                         args.v3.usPixelClock =
                                                 cpu_to_le16(dp_clock / 10);
-                                else if (radeon_encoder->pixel_clock > 165000)
+                                else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                         args.v3.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock / 2) / 10);
                                 else
                                         args.v3.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
@@ -914,7 +899,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
 
                         if (is_dp)
                                 args.v3.ucLaneNum = dp_lane_count;
-                        else if (radeon_encoder->pixel_clock > 165000)
+                        else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                 args.v3.ucLaneNum = 8;
                         else
                                 args.v3.ucLaneNum = 4;
@@ -951,7 +936,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
                         else if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) {
                                 if (dig->coherent_mode)
                                         args.v3.acConfig.fCoherentMode = 1;
-                                if (radeon_encoder->pixel_clock > 165000)
+                                if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                         args.v3.acConfig.fDualLinkConnector = 1;
                         }
                         break;
@@ -966,7 +951,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
                                 if (is_dp)
                                         args.v4.usPixelClock =
                                                 cpu_to_le16(dp_clock / 10);
-                                else if (radeon_encoder->pixel_clock > 165000)
+                                else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                         args.v4.usPixelClock = cpu_to_le16((radeon_encoder->pixel_clock / 2) / 10);
                                 else
                                         args.v4.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10);
@@ -974,7 +959,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
 
                         if (is_dp)
                                 args.v4.ucLaneNum = dp_lane_count;
-                        else if (radeon_encoder->pixel_clock > 165000)
+                        else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                 args.v4.ucLaneNum = 8;
                         else
                                 args.v4.ucLaneNum = 4;
@@ -1014,7 +999,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
                         else if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) {
                                 if (dig->coherent_mode)
                                         args.v4.acConfig.fCoherentMode = 1;
-                                if (radeon_encoder->pixel_clock > 165000)
+                                if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                         args.v4.acConfig.fDualLinkConnector = 1;
                         }
                         break;
@@ -1137,7 +1122,7 @@ atombios_external_encoder_setup(struct drm_encoder *encoder,
                                 if (dp_clock == 270000)
                                         args.v1.sDigEncoder.ucConfig |= ATOM_ENCODER_CONFIG_DPLINKRATE_2_70GHZ;
                                 args.v1.sDigEncoder.ucLaneNum = dp_lane_count;
-                        } else if (radeon_encoder->pixel_clock > 165000)
+                        } else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                 args.v1.sDigEncoder.ucLaneNum = 8;
                         else
                                 args.v1.sDigEncoder.ucLaneNum = 4;
@@ -1156,7 +1141,7 @@ atombios_external_encoder_setup(struct drm_encoder *encoder,
                                 else if (dp_clock == 540000)
                                         args.v3.sExtEncoder.ucConfig |= EXTERNAL_ENCODER_CONFIG_V3_DPLINKRATE_5_40GHZ;
                                 args.v3.sExtEncoder.ucLaneNum = dp_lane_count;
-                        } else if (radeon_encoder->pixel_clock > 165000)
+                        } else if (radeon_dig_monitor_is_duallink(encoder, radeon_encoder->pixel_clock))
                                 args.v3.sExtEncoder.ucLaneNum = 8;
                         else
                                 args.v3.sExtEncoder.ucLaneNum = 4;
@@ -1341,7 +1326,8 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode)
         switch (mode) {
         case DRM_MODE_DPMS_ON:
                 /* some early dce3.2 boards have a bug in their transmitter control table */
-                if ((rdev->family == CHIP_RV710) || (rdev->family == CHIP_RV730))
+                if ((rdev->family == CHIP_RV710) || (rdev->family == CHIP_RV730) ||
+                    ASIC_IS_DCE41(rdev) || ASIC_IS_DCE5(rdev))
                         atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
                 else
                         atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);
@@ -1351,8 +1337,6 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode)
                                                              ATOM_TRANSMITTER_ACTION_POWER_ON);
                                 radeon_dig_connector->edp_on = true;
                         }
-                        if (ASIC_IS_DCE4(rdev))
-                                atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_VIDEO_OFF, 0);
                         radeon_dp_link_train(encoder, connector);
                         if (ASIC_IS_DCE4(rdev))
                                 atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_VIDEO_ON, 0);
@@ -1363,7 +1347,10 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode)
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
-                atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0);
+                if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE5(rdev))
+                        atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);
+                else
+                        atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0);
                 if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && connector) {
                         if (ASIC_IS_DCE4(rdev))
                                 atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_VIDEO_OFF, 0);
@@ -1810,7 +1797,21 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
         case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
         case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
-                if (ASIC_IS_DCE4(rdev)) {
+                if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE5(rdev)) {
+                        struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
+                        struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
+
+                        if (!connector)
+                                dig->panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;
+                        else
+                                dig->panel_mode = radeon_dp_get_panel_mode(encoder, connector);
+
+                        /* setup and enable the encoder */
+                        atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_SETUP, 0);
+                        atombios_dig_encoder_setup(encoder,
+                                                   ATOM_ENCODER_CMD_SETUP_PANEL_MODE,
+                                                   dig->panel_mode);
+                } else if (ASIC_IS_DCE4(rdev)) {
                         /* disable the transmitter */
                         atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);
                         /* setup and enable the encoder */
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 636660fca8c2..f58254a3fb01 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -1455,6 +1455,7 @@ int evergreen_cp_resume(struct radeon_device *rdev)
 #endif
         WREG32(CP_RB_CNTL, tmp);
         WREG32(CP_SEM_WAIT_TIMER, 0x0);
+        WREG32(CP_SEM_INCOMPLETE_TIMER_CNTL, 0x0);
 
         /* Set the write pointer delay */
         WREG32(CP_RB_WPTR_DELAY, 0);
@@ -3190,6 +3191,7 @@ static int evergreen_startup(struct radeon_device *rdev)
         if (r) {
                 DRM_ERROR("radeon: failed testing IB (%d).\n", r);
                 rdev->accel_working = false;
+                return r;
         }
 
         r = r600_audio_init(rdev);
@@ -3221,6 +3223,7 @@ int evergreen_resume(struct radeon_device *rdev)
         r = evergreen_startup(rdev);
         if (r) {
                 DRM_ERROR("evergreen startup failed on resume\n");
+                rdev->accel_working = false;
                 return r;
         }
 
diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h
index b502216d42af..74713d42df29 100644
--- a/drivers/gpu/drm/radeon/evergreend.h
+++ b/drivers/gpu/drm/radeon/evergreend.h
@@ -108,6 +108,7 @@
 #define CP_RB_WPTR_ADDR_HI                              0xC11C
 #define CP_RB_WPTR_DELAY                                0x8704
 #define CP_SEM_WAIT_TIMER                               0x85BC
+#define CP_SEM_INCOMPLETE_TIMER_CNTL                    0x85C8
 #define CP_DEBUG                                        0xC1FC
 
 
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 321137295400..2509c505acb8 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1219,6 +1219,7 @@ int cayman_cp_resume(struct radeon_device *rdev)
         RREG32(GRBM_SOFT_RESET);
 
         WREG32(CP_SEM_WAIT_TIMER, 0x0);
+        WREG32(CP_SEM_INCOMPLETE_TIMER_CNTL, 0x0);
 
         /* Set the write pointer delay */
         WREG32(CP_RB_WPTR_DELAY, 0);
@@ -1546,6 +1547,7 @@ int cayman_resume(struct radeon_device *rdev)
         r = cayman_startup(rdev);
         if (r) {
                 DRM_ERROR("cayman startup failed on resume\n");
+                rdev->accel_working = false;
                 return r;
         }
         return r;
diff --git a/drivers/gpu/drm/radeon/nid.h b/drivers/gpu/drm/radeon/nid.h
index f9df2a645e79..9a7f3b6e02de 100644
--- a/drivers/gpu/drm/radeon/nid.h
+++ b/drivers/gpu/drm/radeon/nid.h
@@ -222,6 +222,7 @@
 #define SCRATCH_UMSK                                    0x8540
 #define SCRATCH_ADDR                                    0x8544
 #define CP_SEM_WAIT_TIMER                               0x85BC
+#define CP_SEM_INCOMPLETE_TIMER_CNTL                    0x85C8
 #define CP_COHER_CNTL2                                  0x85E8
 #define CP_ME_CNTL                                      0x86D8
 #define         CP_ME_HALT                                      (1 << 28)
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index bfd36ab643a6..333cde9d4e7b 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -789,9 +789,7 @@ int r100_irq_process(struct radeon_device *rdev)
                         WREG32(RADEON_AIC_CNTL, msi_rearm | RS400_MSI_REARM);
                         break;
                 default:
-                        msi_rearm = RREG32(RADEON_MSI_REARM_EN) & ~RV370_MSI_REARM_EN;
-                        WREG32(RADEON_MSI_REARM_EN, msi_rearm);
-                        WREG32(RADEON_MSI_REARM_EN, msi_rearm | RV370_MSI_REARM_EN);
+                        WREG32(RADEON_MSI_REARM_EN, RV370_MSI_REARM_EN);
                         break;
                 }
         }
@@ -3930,6 +3928,8 @@ static int r100_startup(struct radeon_device *rdev)
 
 int r100_resume(struct radeon_device *rdev)
 {
+        int r;
+
         /* Make sur GART are not working */
         if (rdev->flags & RADEON_IS_PCI)
                 r100_pci_gart_disable(rdev);
@@ -3949,7 +3949,11 @@ int r100_resume(struct radeon_device *rdev)
         radeon_surface_init(rdev);
 
         rdev->accel_working = true;
-        return r100_startup(rdev);
+        r = r100_startup(rdev);
+        if (r) {
+                rdev->accel_working = false;
+        }
+        return r;
 }
 
 int r100_suspend(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 3fc0d29a5f39..6829638cca40 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -1431,6 +1431,8 @@ static int r300_startup(struct radeon_device *rdev)
 
 int r300_resume(struct radeon_device *rdev)
 {
+        int r;
+
         /* Make sur GART are not working */
         if (rdev->flags & RADEON_IS_PCIE)
                 rv370_pcie_gart_disable(rdev);
@@ -1452,7 +1454,11 @@ int r300_resume(struct radeon_device *rdev)
         radeon_surface_init(rdev);
 
         rdev->accel_working = true;
-        return r300_startup(rdev);
+        r = r300_startup(rdev);
+        if (r) {
+                rdev->accel_working = false;
+        }
+        return r;
 }
 
 int r300_suspend(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index 666e28fe509c..b14323053bad 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -291,6 +291,8 @@ static int r420_startup(struct radeon_device *rdev)
 
 int r420_resume(struct radeon_device *rdev)
 {
+        int r;
+
         /* Make sur GART are not working */
         if (rdev->flags & RADEON_IS_PCIE)
                 rv370_pcie_gart_disable(rdev);
@@ -316,7 +318,11 @@ int r420_resume(struct radeon_device *rdev)
         radeon_surface_init(rdev);
 
         rdev->accel_working = true;
-        return r420_startup(rdev);
+        r = r420_startup(rdev);
+        if (r) {
+                rdev->accel_working = false;
+        }
+        return r;
 }
 
 int r420_suspend(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
index 4ae1615e752f..25084e824dbc 100644
--- a/drivers/gpu/drm/radeon/r520.c
+++ b/drivers/gpu/drm/radeon/r520.c
@@ -218,6 +218,8 @@ static int r520_startup(struct radeon_device *rdev)
 
 int r520_resume(struct radeon_device *rdev)
 {
+        int r;
+
         /* Make sur GART are not working */
         if (rdev->flags & RADEON_IS_PCIE)
                 rv370_pcie_gart_disable(rdev);
@@ -237,7 +239,11 @@ int r520_resume(struct radeon_device *rdev)
         radeon_surface_init(rdev);
 
         rdev->accel_working = true;
-        return r520_startup(rdev);
+        r = r520_startup(rdev);
+        if (r) {
+                rdev->accel_working = false;
+        }
+        return r;
 }
 
 int r520_init(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 4f08e5e6ee9d..fbcd84803b60 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2529,6 +2529,7 @@ int r600_resume(struct radeon_device *rdev)
         r = r600_startup(rdev);
         if (r) {
                 DRM_ERROR("r600 startup failed on resume\n");
+                rdev->accel_working = false;
                 return r;
         }
 
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c
index d996f4381130..accc032c103f 100644
--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
@@ -468,27 +468,42 @@ set_default_state(struct radeon_device *rdev)
         radeon_ring_write(ring, sq_stack_resource_mgmt_2);
 }
 
+#define I2F_MAX_BITS 15
+#define I2F_MAX_INPUT  ((1 << I2F_MAX_BITS) - 1)
+#define I2F_SHIFT (24 - I2F_MAX_BITS)
+
+/*
+ * Converts unsigned integer into 32-bit IEEE floating point representation.
+ * Conversion is not universal and only works for the range from 0
+ * to 2^I2F_MAX_BITS-1. Currently we only use it with inputs between
+ * 0 and 16384 (inclusive), so I2F_MAX_BITS=15 is enough. If necessary,
+ * I2F_MAX_BITS can be increased, but that will add to the loop iterations
+ * and slow us down. Conversion is done by shifting the input and counting
+ * down until the first 1 reaches bit position 23. The resulting counter
+ * and the shifted input are, respectively, the exponent and the fraction.
+ * The sign is always zero.
+ */
 static uint32_t i2f(uint32_t input)
 {
         u32 result, i, exponent, fraction;
 
-        if ((input & 0x3fff) == 0)
-                result = 0; /* 0 is a special case */
+        WARN_ON_ONCE(input > I2F_MAX_INPUT);
+
+        if ((input & I2F_MAX_INPUT) == 0)
+                result = 0;
         else {
-                exponent = 140; /* exponent biased by 127; */
-                fraction = (input & 0x3fff) << 10; /* cheat and only
-                                                      handle numbers below 2^^15 */
-                for (i = 0; i < 14; i++) {
+                exponent = 126 + I2F_MAX_BITS;
+                fraction = (input & I2F_MAX_INPUT) << I2F_SHIFT;
+
+                for (i = 0; i < I2F_MAX_BITS; i++) {
                         if (fraction & 0x800000)
                                 break;
                         else {
-                                fraction = fraction << 1; /* keep
-                                                             shifting left until top bit = 1 */
+                                fraction = fraction << 1;
                                 exponent = exponent - 1;
                         }
                 }
-                result = exponent << 23 | (fraction & 0x7fffff); /* mask
-                                                                    off top bit; assumed 1 */
+                result = exponent << 23 | (fraction & 0x7fffff);
         }
         return result;
 }
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 73e05cb85eca..1668ec1ee770 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -157,6 +157,47 @@ bool radeon_get_bios(struct radeon_device *rdev);
 
 
 /*
+ * Mutex which allows recursive locking from the same process.
+ */
+struct radeon_mutex {
+        struct mutex            mutex;
+        struct task_struct      *owner;
+        int                     level;
+};
+
+static inline void radeon_mutex_init(struct radeon_mutex *mutex)
+{
+        mutex_init(&mutex->mutex);
+        mutex->owner = NULL;
+        mutex->level = 0;
+}
+
+static inline void radeon_mutex_lock(struct radeon_mutex *mutex)
+{
+        if (mutex_trylock(&mutex->mutex)) {
+                /* The mutex was unlocked before, so it's ours now */
+                mutex->owner = current;
+        } else if (mutex->owner != current) {
+                /* Another process locked the mutex, take it */
+                mutex_lock(&mutex->mutex);
+                mutex->owner = current;
+        }
+        /* Otherwise the mutex was already locked by this process */
+
+        mutex->level++;
+}
+
+static inline void radeon_mutex_unlock(struct radeon_mutex *mutex)
+{
+        if (--mutex->level > 0)
+                return;
+
+        mutex->owner = NULL;
+        mutex_unlock(&mutex->mutex);
+}
+
+
+/*
  * Dummy page
  */
 struct radeon_dummy_page {
@@ -598,7 +639,7 @@ struct radeon_ib {
  * mutex protects scheduled_ibs, ready, alloc_bm
  */
 struct radeon_ib_pool {
-        struct mutex                    mutex;
+        struct radeon_mutex             mutex;
         struct radeon_sa_manager        sa_manager;
         struct radeon_ib                ibs[RADEON_IB_POOL_SIZE];
         bool                            ready;
@@ -1355,47 +1396,6 @@ struct r600_vram_scratch {
 
 
 /*
- * Mutex which allows recursive locking from the same process.
- */
-struct radeon_mutex {
-        struct mutex            mutex;
-        struct task_struct      *owner;
-        int                     level;
-};
-
-static inline void radeon_mutex_init(struct radeon_mutex *mutex)
-{
-        mutex_init(&mutex->mutex);
-        mutex->owner = NULL;
-        mutex->level = 0;
-}
-
-static inline void radeon_mutex_lock(struct radeon_mutex *mutex)
-{
-        if (mutex_trylock(&mutex->mutex)) {
-                /* The mutex was unlocked before, so it's ours now */
-                mutex->owner = current;
-        } else if (mutex->owner != current) {
-                /* Another process locked the mutex, take it */
-                mutex_lock(&mutex->mutex);
-                mutex->owner = current;
-        }
-        /* Otherwise the mutex was already locked by this process */
-
-        mutex->level++;
-}
-
-static inline void radeon_mutex_unlock(struct radeon_mutex *mutex)
-{
-        if (--mutex->level > 0)
-                return;
-
-        mutex->owner = NULL;
-        mutex_unlock(&mutex->mutex);
-}
-
-
-/*
  * Core structure, functions and helpers.
  */
 typedef uint32_t (*radeon_rreg_t)(struct radeon_device*, uint32_t);
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 5082d17d14dc..1f53ae74ada1 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -2931,6 +2931,20 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
                         bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP5;
                 }
         }
+        if ((radeon_encoder->devices & ATOM_DEVICE_DFP6_SUPPORT) &&
+            (radeon_connector->devices & ATOM_DEVICE_DFP6_SUPPORT)) {
+                if (connected) {
+                        DRM_DEBUG_KMS("DFP6 connected\n");
+                        bios_0_scratch |= ATOM_S0_DFP6;
+                        bios_3_scratch |= ATOM_S3_DFP6_ACTIVE;
+                        bios_6_scratch |= ATOM_S6_ACC_REQ_DFP6;
+                } else {
+                        DRM_DEBUG_KMS("DFP6 disconnected\n");
+                        bios_0_scratch &= ~ATOM_S0_DFP6;
+                        bios_3_scratch &= ~ATOM_S3_DFP6_ACTIVE;
+                        bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP6;
+                }
+        }
 
         if (rdev->family >= CHIP_R600) {
                 WREG32(R600_BIOS_0_SCRATCH, bios_0_scratch);
@@ -2951,6 +2965,9 @@ radeon_atombios_encoder_crtc_scratch_regs(struct drm_encoder *encoder, int crtc)
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
         uint32_t bios_3_scratch;
 
+        if (ASIC_IS_DCE4(rdev))
+                return;
+
         if (rdev->family >= CHIP_R600)
                 bios_3_scratch = RREG32(R600_BIOS_3_SCRATCH);
         else
@@ -3003,6 +3020,9 @@ radeon_atombios_encoder_dpms_scratch_regs(struct drm_encoder *encoder, bool on)
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
         uint32_t bios_2_scratch;
 
+        if (ASIC_IS_DCE4(rdev))
+                return;
+
         if (rdev->family >= CHIP_R600)
                 bios_2_scratch = RREG32(R600_BIOS_2_SCRATCH);
         else
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index 9d95792bea3e..98724fcb0088 100644
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -58,7 +58,8 @@ static int radeon_atrm_call(acpi_handle atrm_handle, uint8_t *bios,
         }
 
         obj = (union acpi_object *)buffer.pointer;
-        memcpy(bios+offset, obj->buffer.pointer, len);
+        memcpy(bios+offset, obj->buffer.pointer, obj->buffer.length);
+        len = obj->buffer.length;
         kfree(buffer.pointer);
         return len;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index 229a20f10e2b..501f4881e5aa 100644
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -120,7 +120,7 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev)
                 ret = radeon_atrm_get_bios_chunk(rdev->bios,
                                                  (i * ATRM_BIOS_PAGE),
                                                  ATRM_BIOS_PAGE);
-                if (ret <= 0)
+                if (ret < ATRM_BIOS_PAGE)
                         break;
         }
 
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 435a3d970ab8..e64bec488ed8 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -453,6 +453,10 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
         int r;
 
         radeon_mutex_lock(&rdev->cs_mutex);
+        if (!rdev->accel_working) {
+                radeon_mutex_unlock(&rdev->cs_mutex);
+                return -EBUSY;
+        }
         /* initialize parser */
         memset(&parser, 0, sizeof(struct radeon_cs_parser));
         parser.filp = filp;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 0afb13bd8dca..49f7cb7e226b 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -720,7 +720,7 @@ int radeon_device_init(struct radeon_device *rdev,
         /* mutex initialization are all done here so we
          * can recall function without having locking issues */
         radeon_mutex_init(&rdev->cs_mutex);
-        mutex_init(&rdev->ib_pool.mutex);
+        radeon_mutex_init(&rdev->ib_pool.mutex);
         for (i = 0; i < RADEON_NUM_RINGS; ++i)
                 mutex_init(&rdev->ring[i].mutex);
         mutex_init(&rdev->dc_hw_i2c_mutex);
@@ -883,6 +883,8 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state)
         if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
                 return 0;
 
+        drm_kms_helper_poll_disable(dev);
+
         /* turn off display hw */
         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                 drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
@@ -959,9 +961,11 @@ int radeon_resume_kms(struct drm_device *dev)
         radeon_fbdev_set_suspend(rdev, 0);
         console_unlock();
 
-        /* init dig PHYs */
-        if (rdev->is_atom_bios)
+        /* init dig PHYs, disp eng pll */
+        if (rdev->is_atom_bios) {
                 radeon_atom_encoder_init(rdev);
+                radeon_atom_dcpll_init(rdev);
+        }
         /* reset hpd state */
         radeon_hpd_init(rdev);
         /* blat the mode back in */
@@ -970,6 +974,8 @@ int radeon_resume_kms(struct drm_device *dev)
         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                 drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
         }
+
+        drm_kms_helper_poll_enable(dev);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index d3ffc18774a6..8c49fef1ce78 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -1305,9 +1305,11 @@ int radeon_modeset_init(struct radeon_device *rdev)
                 return ret;
         }
 
-        /* init dig PHYs */
-        if (rdev->is_atom_bios)
+        /* init dig PHYs, disp eng pll */
+        if (rdev->is_atom_bios) {
                 radeon_atom_encoder_init(rdev);
+                radeon_atom_dcpll_init(rdev);
+        }
 
         /* initialize hpd */
         radeon_hpd_init(rdev);
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index 4b27efa4405b..9419c51bcf50 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -202,6 +202,22 @@ radeon_get_connector_for_encoder(struct drm_encoder *encoder)
         return NULL;
 }
 
+struct drm_connector *
+radeon_get_connector_for_encoder_init(struct drm_encoder *encoder)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+        struct drm_connector *connector;
+        struct radeon_connector *radeon_connector;
+
+        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+                radeon_connector = to_radeon_connector(connector);
+                if (radeon_encoder->devices & radeon_connector->devices)
+                        return connector;
+        }
+        return NULL;
+}
+
 struct drm_encoder *radeon_get_external_encoder(struct drm_encoder *encoder)
 {
         struct drm_device *dev = encoder->dev;
@@ -288,3 +304,64 @@ void radeon_panel_mode_fixup(struct drm_encoder *encoder,
 
 }
 
+bool radeon_dig_monitor_is_duallink(struct drm_encoder *encoder,
+                                    u32 pixel_clock)
+{
+        struct drm_device *dev = encoder->dev;
+        struct radeon_device *rdev = dev->dev_private;
+        struct drm_connector *connector;
+        struct radeon_connector *radeon_connector;
+        struct radeon_connector_atom_dig *dig_connector;
+
+        connector = radeon_get_connector_for_encoder(encoder);
+        /* if we don't have an active device yet, just use one of
+         * the connectors tied to the encoder.
+         */
+        if (!connector)
+                connector = radeon_get_connector_for_encoder_init(encoder);
+        radeon_connector = to_radeon_connector(connector);
+
+        switch (connector->connector_type) {
+        case DRM_MODE_CONNECTOR_DVII:
+        case DRM_MODE_CONNECTOR_HDMIB:
+                if (radeon_connector->use_digital) {
+                        /* HDMI 1.3 supports up to 340 Mhz over single link */
+                        if (ASIC_IS_DCE3(rdev) && drm_detect_hdmi_monitor(radeon_connector->edid)) {
+                                if (pixel_clock > 340000)
+                                        return true;
+                                else
+                                        return false;
+                        } else {
+                                if (pixel_clock > 165000)
+                                        return true;
+                                else
+                                        return false;
+                        }
+                } else
+                        return false;
+        case DRM_MODE_CONNECTOR_DVID:
+        case DRM_MODE_CONNECTOR_HDMIA:
+        case DRM_MODE_CONNECTOR_DisplayPort:
+                dig_connector = radeon_connector->con_priv;
+                if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
+                    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
+                        return false;
+                else {
+                        /* HDMI 1.3 supports up to 340 Mhz over single link */
+                        if (ASIC_IS_DCE3(rdev) && drm_detect_hdmi_monitor(radeon_connector->edid)) {
+                                if (pixel_clock > 340000)
+                                        return true;
+                                else
+                                        return false;
+                        } else {
+                                if (pixel_clock > 165000)
+                                        return true;
+                                else
+                                        return false;
+                        }
+                }
+        default:
+                return false;
+        }
+}
+
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 64ea3dd9e6ff..4bd36a354fbe 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -364,8 +364,10 @@ int radeon_fence_count_emitted(struct radeon_device *rdev, int ring)
         int not_processed = 0;
 
         read_lock_irqsave(&rdev->fence_lock, irq_flags);
-        if (!rdev->fence_drv[ring].initialized)
+        if (!rdev->fence_drv[ring].initialized) {
+                read_unlock_irqrestore(&rdev->fence_lock, irq_flags);
                 return 0;
+        }
 
         if (!list_empty(&rdev->fence_drv[ring].emitted)) {
                 struct list_head *ptr;
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
index 7bb1b079f480..98a8ad680109 100644
--- a/drivers/gpu/drm/radeon/radeon_i2c.c
+++ b/drivers/gpu/drm/radeon/radeon_i2c.c
@@ -897,6 +897,7 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
         i2c->rec = *rec;
         i2c->adapter.owner = THIS_MODULE;
         i2c->adapter.class = I2C_CLASS_DDC;
+        i2c->adapter.dev.parent = &dev->pdev->dev;
         i2c->dev = dev;
         i2c_set_adapdata(&i2c->adapter, i2c);
         if (rec->mm_i2c ||
@@ -957,6 +958,7 @@ struct radeon_i2c_chan *radeon_i2c_create_dp(struct drm_device *dev,
         i2c->rec = *rec;
         i2c->adapter.owner = THIS_MODULE;
         i2c->adapter.class = I2C_CLASS_DDC;
+        i2c->adapter.dev.parent = &dev->pdev->dev;
         i2c->dev = dev;
         snprintf(i2c->adapter.name, sizeof(i2c->adapter.name),
                  "Radeon aux bus %s", name);
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index be38921bf761..66d5fe1c8174 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -138,6 +138,12 @@ static bool radeon_msi_ok(struct radeon_device *rdev)
         /* Dell RS690 only seems to work with MSIs. */
         if ((rdev->pdev->device == 0x791f) &&
             (rdev->pdev->subsystem_vendor == 0x1028) &&
+            (rdev->pdev->subsystem_device == 0x01fc))
+                return true;
+
+        /* Dell RS690 only seems to work with MSIs. */
+        if ((rdev->pdev->device == 0x791f) &&
+            (rdev->pdev->subsystem_vendor == 0x1028) &&
             (rdev->pdev->subsystem_device == 0x01fd))
                 return true;
 
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index 08ff857c8fd6..4330e3253573 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -362,6 +362,7 @@ struct radeon_encoder_atom_dig {
         struct backlight_device *bl_dev;
         int dpms_mode;
         uint8_t backlight_level;
+        int panel_mode;
 };
 
 struct radeon_encoder_atom_dac {
@@ -466,6 +467,10 @@ radeon_atombios_get_tv_info(struct radeon_device *rdev);
 
 extern struct drm_connector *
 radeon_get_connector_for_encoder(struct drm_encoder *encoder);
+extern struct drm_connector *
+radeon_get_connector_for_encoder_init(struct drm_encoder *encoder);
+extern bool radeon_dig_monitor_is_duallink(struct drm_encoder *encoder,
+                                    u32 pixel_clock);
 
 extern u16 radeon_encoder_get_dp_bridge_encoder_id(struct drm_encoder *encoder);
 extern u16 radeon_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *connector);
@@ -482,8 +487,11 @@ extern void radeon_dp_link_train(struct drm_encoder *encoder,
 extern bool radeon_dp_needs_link_train(struct radeon_connector *radeon_connector);
 extern u8 radeon_dp_getsinktype(struct radeon_connector *radeon_connector);
 extern bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector);
+extern int radeon_dp_get_panel_mode(struct drm_encoder *encoder,
+                                    struct drm_connector *connector);
 extern void atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mode);
 extern void radeon_atom_encoder_init(struct radeon_device *rdev);
+extern void radeon_atom_dcpll_init(struct radeon_device *rdev);
 extern void atombios_dig_transmitter_setup(struct drm_encoder *encoder,
                                            int action, uint8_t lane_num,
                                            uint8_t lane_set);
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index e8bc70933d1b..92c9ea4751fb 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -109,12 +109,12 @@ int radeon_ib_get(struct radeon_device *rdev, int ring,
                 return r;
         }
 
-        mutex_lock(&rdev->ib_pool.mutex);
+        radeon_mutex_lock(&rdev->ib_pool.mutex);
         idx = rdev->ib_pool.head_id;
 retry:
         if (cretry > 5) {
                 dev_err(rdev->dev, "failed to get an ib after 5 retry\n");
-                mutex_unlock(&rdev->ib_pool.mutex);
+                radeon_mutex_unlock(&rdev->ib_pool.mutex);
                 radeon_fence_unref(&fence);
                 return -ENOMEM;
         }
@@ -139,7 +139,7 @@ retry:
                                  */
                                 rdev->ib_pool.head_id = (1 + idx);
                                 rdev->ib_pool.head_id &= (RADEON_IB_POOL_SIZE - 1);
-                                mutex_unlock(&rdev->ib_pool.mutex);
+                                radeon_mutex_unlock(&rdev->ib_pool.mutex);
                                 return 0;
                         }
                 }
@@ -158,7 +158,7 @@ retry:
                 }
                 idx = (idx + 1) & (RADEON_IB_POOL_SIZE - 1);
         }
-        mutex_unlock(&rdev->ib_pool.mutex);
+        radeon_mutex_unlock(&rdev->ib_pool.mutex);
         radeon_fence_unref(&fence);
         return r;
 }
@@ -171,12 +171,12 @@ void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib **ib)
         if (tmp == NULL) {
                 return;
         }
-        mutex_lock(&rdev->ib_pool.mutex);
+        radeon_mutex_lock(&rdev->ib_pool.mutex);
         if (tmp->fence && !tmp->fence->emitted) {
                 radeon_sa_bo_free(rdev, &tmp->sa_bo);
                 radeon_fence_unref(&tmp->fence);
         }
-        mutex_unlock(&rdev->ib_pool.mutex);
+        radeon_mutex_unlock(&rdev->ib_pool.mutex);
 }
 
 int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib)
@@ -204,22 +204,25 @@ int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib)
 
 int radeon_ib_pool_init(struct radeon_device *rdev)
 {
+        struct radeon_sa_manager tmp;
         int i, r;
 
-        mutex_lock(&rdev->ib_pool.mutex);
-        if (rdev->ib_pool.ready) {
-                mutex_unlock(&rdev->ib_pool.mutex);
-                return 0;
-        }
-
-        r = radeon_sa_bo_manager_init(rdev, &rdev->ib_pool.sa_manager,
+        r = radeon_sa_bo_manager_init(rdev, &tmp,
                                       RADEON_IB_POOL_SIZE*64*1024,
                                       RADEON_GEM_DOMAIN_GTT);
         if (r) {
-                mutex_unlock(&rdev->ib_pool.mutex);
                 return r;
         }
 
+        radeon_mutex_lock(&rdev->ib_pool.mutex);
+        if (rdev->ib_pool.ready) {
+                radeon_mutex_unlock(&rdev->ib_pool.mutex);
+                radeon_sa_bo_manager_fini(rdev, &tmp);
+                return 0;
+        }
+
+        rdev->ib_pool.sa_manager = tmp;
+        INIT_LIST_HEAD(&rdev->ib_pool.sa_manager.sa_bo);
         for (i = 0; i < RADEON_IB_POOL_SIZE; i++) {
                 rdev->ib_pool.ibs[i].fence = NULL;
                 rdev->ib_pool.ibs[i].idx = i;
@@ -236,7 +239,7 @@ int radeon_ib_pool_init(struct radeon_device *rdev)
         if (radeon_debugfs_ring_init(rdev)) {
                 DRM_ERROR("Failed to register debugfs file for rings !\n");
         }
-        mutex_unlock(&rdev->ib_pool.mutex);
+        radeon_mutex_unlock(&rdev->ib_pool.mutex);
         return 0;
 }
 
@@ -244,7 +247,7 @@ void radeon_ib_pool_fini(struct radeon_device *rdev)
 {
         unsigned i;
 
-        mutex_lock(&rdev->ib_pool.mutex);
+        radeon_mutex_lock(&rdev->ib_pool.mutex);
         if (rdev->ib_pool.ready) {
                 for (i = 0; i < RADEON_IB_POOL_SIZE; i++) {
                         radeon_sa_bo_free(rdev, &rdev->ib_pool.ibs[i].sa_bo);
@@ -253,7 +256,7 @@ void radeon_ib_pool_fini(struct radeon_device *rdev)
                 radeon_sa_bo_manager_fini(rdev, &rdev->ib_pool.sa_manager);
                 rdev->ib_pool.ready = false;
         }
-        mutex_unlock(&rdev->ib_pool.mutex);
+        radeon_mutex_unlock(&rdev->ib_pool.mutex);
 }
 
 int radeon_ib_pool_start(struct radeon_device *rdev)
@@ -497,8 +500,11 @@ static char radeon_debugfs_ib_names[RADEON_IB_POOL_SIZE][32];
 int radeon_debugfs_ring_init(struct radeon_device *rdev)
 {
 #if defined(CONFIG_DEBUG_FS)
-        return radeon_debugfs_add_files(rdev, radeon_debugfs_ring_info_list,
-                                        ARRAY_SIZE(radeon_debugfs_ring_info_list));
+        if (rdev->family >= CHIP_CAYMAN)
+                return radeon_debugfs_add_files(rdev, radeon_debugfs_ring_info_list,
+                                                ARRAY_SIZE(radeon_debugfs_ring_info_list));
+        else
+                return radeon_debugfs_add_files(rdev, radeon_debugfs_ring_info_list, 1);
 #else
         return 0;
 #endif
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index b0ce84a20a68..866a05be75f2 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -442,6 +442,8 @@ static int rs400_startup(struct radeon_device *rdev)
 
 int rs400_resume(struct radeon_device *rdev)
 {
+        int r;
+
         /* Make sur GART are not working */
         rs400_gart_disable(rdev);
         /* Resume clock before doing reset */
@@ -462,7 +464,11 @@ int rs400_resume(struct radeon_device *rdev)
         radeon_surface_init(rdev);
 
         rdev->accel_working = true;
-        return rs400_startup(rdev);
+        r = rs400_startup(rdev);
+        if (r) {
+                rdev->accel_working = false;
+        }
+        return r;
 }
 
 int rs400_suspend(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index ec46eb45e34c..4fc700684dcd 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -684,9 +684,7 @@ int rs600_irq_process(struct radeon_device *rdev)
                         WREG32(RADEON_BUS_CNTL, msi_rearm | RS600_MSI_REARM);
                         break;
                 default:
-                        msi_rearm = RREG32(RADEON_MSI_REARM_EN) & ~RV370_MSI_REARM_EN;
-                        WREG32(RADEON_MSI_REARM_EN, msi_rearm);
-                        WREG32(RADEON_MSI_REARM_EN, msi_rearm | RV370_MSI_REARM_EN);
+                        WREG32(RADEON_MSI_REARM_EN, RV370_MSI_REARM_EN);
                         break;
                 }
         }
@@ -878,6 +876,8 @@ static int rs600_startup(struct radeon_device *rdev)
 
 int rs600_resume(struct radeon_device *rdev)
 {
+        int r;
+
         /* Make sur GART are not working */
         rs600_gart_disable(rdev);
         /* Resume clock before doing reset */
@@ -896,7 +896,11 @@ int rs600_resume(struct radeon_device *rdev)
         radeon_surface_init(rdev);
 
         rdev->accel_working = true;
-        return rs600_startup(rdev);
+        r = rs600_startup(rdev);
+        if (r) {
+                rdev->accel_working = false;
+        }
+        return r;
 }
 
 int rs600_suspend(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 4f24a0fa8c82..f68dff2fadcb 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -659,6 +659,8 @@ static int rs690_startup(struct radeon_device *rdev)
 
 int rs690_resume(struct radeon_device *rdev)
 {
+        int r;
+
         /* Make sur GART are not working */
         rs400_gart_disable(rdev);
         /* Resume clock before doing reset */
@@ -677,7 +679,11 @@ int rs690_resume(struct radeon_device *rdev)
         radeon_surface_init(rdev);
 
         rdev->accel_working = true;
-        return rs690_startup(rdev);
+        r = rs690_startup(rdev);
+        if (r) {
+                rdev->accel_working = false;
+        }
+        return r;
 }
 
 int rs690_suspend(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 880637fd1946..959bf4483bea 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -424,6 +424,8 @@ static int rv515_startup(struct radeon_device *rdev)
 
 int rv515_resume(struct radeon_device *rdev)
 {
+        int r;
+
         /* Make sur GART are not working */
         if (rdev->flags & RADEON_IS_PCIE)
                 rv370_pcie_gart_disable(rdev);
@@ -443,7 +445,11 @@ int rv515_resume(struct radeon_device *rdev)
         radeon_surface_init(rdev);
 
         rdev->accel_working = true;
-        return rv515_startup(rdev);
+        r =  rv515_startup(rdev);
+        if (r) {
+                rdev->accel_working = false;
+        }
+        return r;
 }
 
 int rv515_suspend(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index a1668b659ddd..c049c0c51841 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -1139,6 +1139,7 @@ int rv770_resume(struct radeon_device *rdev)
         r = rv770_startup(rdev);
         if (r) {
                 DRM_ERROR("r600 startup failed on resume\n");
+                rdev->accel_working = false;
                 return r;
         }
 
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 06da063ece2e..573220cc5269 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -40,7 +40,6 @@ static struct pci_device_id pciidlist[] = {
 static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
 {
         drm_sis_private_t *dev_priv;
-        int ret;
 
         dev_priv = kzalloc(sizeof(drm_sis_private_t), GFP_KERNEL);
         if (dev_priv == NULL)
@@ -50,7 +49,7 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
         dev_priv->chipset = chipset;
         idr_init(&dev->object_name_idr);
 
-        return ret;
+        return 0;
 }
 
 static int sis_driver_unload(struct drm_device *dev)
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 2f0eab66ece6..7c3a57de8187 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -404,6 +404,9 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
                 }
         }
 
+        if (bdev->driver->move_notify)
+                bdev->driver->move_notify(bo, mem);
+
         if (!(old_man->flags & TTM_MEMTYPE_FLAG_FIXED) &&
             !(new_man->flags & TTM_MEMTYPE_FLAG_FIXED))
                 ret = ttm_bo_move_ttm(bo, evict, no_wait_reserve, no_wait_gpu, mem);
@@ -413,11 +416,17 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
         else
                 ret = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, mem);
 
-        if (ret)
-                goto out_err;
+        if (ret) {
+                if (bdev->driver->move_notify) {
+                        struct ttm_mem_reg tmp_mem = *mem;
+                        *mem = bo->mem;
+                        bo->mem = tmp_mem;
+                        bdev->driver->move_notify(bo, mem);
+                        bo->mem = *mem;
+                }
 
-        if (bdev->driver->move_notify)
-                bdev->driver->move_notify(bo, mem);
+                goto out_err;
+        }
 
 moved:
         if (bo->evicted) {
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 0af6ebdf205d..b66ef0e3cde1 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -378,7 +378,7 @@ int vmw_framebuffer_create_handle(struct drm_framebuffer *fb,
                                   unsigned int *handle)
 {
         if (handle)
-                handle = 0;
+                *handle = 0;
 
         return 0;
 }
diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
index 0c33ae9cf0f0..406632472c1b 100644
--- a/drivers/hid/hid-hyperv.c
+++ b/drivers/hid/hid-hyperv.c
@@ -548,6 +548,7 @@ static int mousevsc_remove(struct hv_device *dev)
         struct mousevsc_dev *input_dev = hv_get_drvdata(dev);
 
         vmbus_close(dev->channel);
+        hid_hw_stop(input_dev->hid_device);
         hid_destroy_device(input_dev->hid_device);
         mousevsc_free_device(input_dev);
 
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index b47e58b52d9f..acab74cde727 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -531,7 +531,6 @@ static int wacom_probe(struct hid_device *hdev,
         wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
         wdata->battery.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
 
         ret = power_supply_register(&hdev->dev, &wdata->battery);
         if (ret) {
@@ -540,6 +539,8 @@ static int wacom_probe(struct hid_device *hdev,
                 goto err_battery;
         }
 
+        power_supply_powers(&wdata->battery, &hdev->dev);
+
         wdata->ac.properties = wacom_ac_props;
         wdata->ac.num_properties = ARRAY_SIZE(wacom_ac_props);
         wdata->ac.get_property = wacom_ac_get_property;
@@ -547,14 +548,14 @@ static int wacom_probe(struct hid_device *hdev,
         wdata->ac.type = POWER_SUPPLY_TYPE_MAINS;
         wdata->ac.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
-
         ret = power_supply_register(&hdev->dev, &wdata->ac);
         if (ret) {
                 hid_warn(hdev,
                          "can't create ac battery attribute, err: %d\n", ret);
                 goto err_ac;
         }
+
+        power_supply_powers(&wdata->ac, &hdev->dev);
 #endif
         return 0;
 
diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c
index fc253b472f9d..cac3589b1ed5 100644
--- a/drivers/hid/hid-wiimote-core.c
+++ b/drivers/hid/hid-wiimote-core.c
@@ -1226,14 +1226,14 @@ static int wiimote_hid_probe(struct hid_device *hdev,
         wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
         wdata->battery.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
-
         ret = power_supply_register(&wdata->hdev->dev, &wdata->battery);
         if (ret) {
                 hid_err(hdev, "Cannot register battery device\n");
                 goto err_battery;
         }
 
+        power_supply_powers(&wdata->battery, &hdev->dev);
+
         ret = wiimote_leds_create(wdata);
         if (ret)
                 goto err_free;
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 7c297d305d5d..b1ec0e2aeb57 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -922,11 +922,11 @@ void hiddev_disconnect(struct hid_device *hid)
         struct hiddev *hiddev = hid->hiddev;
         struct usbhid_device *usbhid = hid->driver_data;
 
+        usb_deregister_dev(usbhid->intf, &hiddev_class);
+
         mutex_lock(&hiddev->existancelock);
         hiddev->exist = 0;
 
-        usb_deregister_dev(usbhid->intf, &hiddev_class);
-
         if (hiddev->open) {
                 mutex_unlock(&hiddev->existancelock);
                 usbhid_close(hiddev->hid);
diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c
index eedca3cf9968..dd87ae96c262 100644
--- a/drivers/hwmon/ads1015.c
+++ b/drivers/hwmon/ads1015.c
@@ -271,7 +271,7 @@ static int ads1015_probe(struct i2c_client *client,
                         continue;
                 err = device_create_file(&client->dev, &ads1015_in[k].dev_attr);
                 if (err)
-                        goto exit_free;
+                        goto exit_remove;
         }
 
         data->hwmon_dev = hwmon_device_register(&client->dev);
@@ -285,7 +285,6 @@ static int ads1015_probe(struct i2c_client *client,
 exit_remove:
         for (k = 0; k < ADS1015_CHANNELS; ++k)
                 device_remove_file(&client->dev, &ads1015_in[k].dev_attr);
-exit_free:
         kfree(data);
 exit:
         return err;
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 92f949767ece..6dbfd3e516e4 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -283,11 +283,11 @@ static inline long temp_from_reg(u8 reg)
 
 static inline u8 temp_to_reg(long val)
 {
-        if (val < 0)
-                val = 0;
-        else if (val > 1000 * 0xff)
-                val = 0xff;
-        return ((val + 500) / 1000);
+        if (val <= 0)
+                return 0;
+        if (val >= 1000 * 0xff)
+                return 0xff;
+        return (val + 500) / 1000;
 }
 
 /*
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index eedf574ab539..6bab2001ef3b 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -172,7 +172,7 @@ static inline void f75375_write8(struct i2c_client *client, u8 reg,
 static inline void f75375_write16(struct i2c_client *client, u8 reg,
                 u16 value)
 {
-        int err = i2c_smbus_write_byte_data(client, reg, (value << 8));
+        int err = i2c_smbus_write_byte_data(client, reg, (value >> 8));
         if (err)
                 return;
         i2c_smbus_write_byte_data(client, reg + 1, (value & 0xFF));
@@ -200,9 +200,6 @@ static struct f75375_data *f75375_update_device(struct device *dev)
                                 f75375_read16(client, F75375_REG_FAN_MIN(nr));
                         data->fan_target[nr] =
                                 f75375_read16(client, F75375_REG_FAN_EXP(nr));
-                        data->pwm[nr] = f75375_read8(client,
-                                F75375_REG_FAN_PWM_DUTY(nr));
-
                 }
                 for (nr = 0; nr < 4; nr++) {
                         data->in_max[nr] =
@@ -218,6 +215,8 @@ static struct f75375_data *f75375_update_device(struct device *dev)
         if (time_after(jiffies, data->last_updated + 2 * HZ)
                 || !data->valid) {
                 for (nr = 0; nr < 2; nr++) {
+                        data->pwm[nr] = f75375_read8(client,
+                                F75375_REG_FAN_PWM_DUTY(nr));
                         /* assign MSB, therefore shift it by 8 bits */
                         data->temp11[nr] =
                                 f75375_read8(client, F75375_REG_TEMP(nr)) << 8;
@@ -341,8 +340,6 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val)
                         fanmode |= (1 << F75387_FAN_MANU_MODE(nr));
                         fanmode |= (1 << F75387_FAN_DUTY_MODE(nr));
                         data->pwm[nr] = 255;
-                        f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr),
-                                        data->pwm[nr]);
                         break;
                 case 1: /* PWM */
                         fanmode  |= (1 << F75387_FAN_MANU_MODE(nr));
@@ -362,14 +359,12 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val)
                 case 0: /* full speed */
                         fanmode  |= (3 << FAN_CTRL_MODE(nr));
                         data->pwm[nr] = 255;
-                        f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr),
-                                        data->pwm[nr]);
                         break;
                 case 1: /* PWM */
                         fanmode  |= (3 << FAN_CTRL_MODE(nr));
                         break;
                 case 2: /* AUTOMATIC*/
-                        fanmode  |= (2 << FAN_CTRL_MODE(nr));
+                        fanmode  |= (1 << FAN_CTRL_MODE(nr));
                         break;
                 case 3: /* fan speed */
                         break;
@@ -378,6 +373,9 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val)
 
         f75375_write8(client, F75375_REG_FAN_TIMER, fanmode);
         data->pwm_enable[nr] = val;
+        if (val == 0)
+                f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr),
+                                data->pwm[nr]);
         return 0;
 }
 
@@ -723,7 +721,7 @@ static void f75375_init(struct i2c_client *client, struct f75375_data *data,
                         if (data->kind == f75387) {
                                 bool manu, duty;
 
-                                if (!(conf & (1 << F75387_FAN_CTRL_LINEAR(nr))))
+                                if (!(mode & (1 << F75387_FAN_CTRL_LINEAR(nr))))
                                         data->pwm_mode[nr] = 1;
 
                                 manu = ((mode >> F75387_FAN_MANU_MODE(nr)) & 1);
diff --git a/drivers/hwmon/max6639.c b/drivers/hwmon/max6639.c
index e10a092c603c..a6760bacd915 100644
--- a/drivers/hwmon/max6639.c
+++ b/drivers/hwmon/max6639.c
@@ -72,8 +72,8 @@ static unsigned short normal_i2c[] = { 0x2c, 0x2e, 0x2f, I2C_CLIENT_END };
 
 static const int rpm_ranges[] = { 2000, 4000, 8000, 16000 };
 
-#define FAN_FROM_REG(val, div, rpm_range)       ((val) == 0 ? -1 : \
-        (val) == 255 ? 0 : (rpm_ranges[rpm_range] * 30) / ((div + 1) * (val)))
+#define FAN_FROM_REG(val, rpm_range)    ((val) == 0 || (val) == 255 ? \
+                                0 : (rpm_ranges[rpm_range] * 30) / (val))
 #define TEMP_LIMIT_TO_REG(val)  SENSORS_LIMIT((val) / 1000, 0, 255)
 
 /*
@@ -333,7 +333,7 @@ static ssize_t show_fan_input(struct device *dev,
                 return PTR_ERR(data);
 
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[attr->index],
-                       data->ppr, data->rpm_range));
+                       data->rpm_range));
 }
 
 static ssize_t show_alarm(struct device *dev,
@@ -429,9 +429,9 @@ static int max6639_init_client(struct i2c_client *client)
         struct max6639_data *data = i2c_get_clientdata(client);
         struct max6639_platform_data *max6639_info =
                 client->dev.platform_data;
-        int i = 0;
+        int i;
         int rpm_range = 1; /* default: 4000 RPM */
-        int err = 0;
+        int err;
 
         /* Reset chip to default values, see below for GCONFIG setup */
         err = i2c_smbus_write_byte_data(client, MAX6639_REG_GCONFIG,
@@ -446,11 +446,6 @@ static int max6639_init_client(struct i2c_client *client)
         else
                 data->ppr = 2;
         data->ppr -= 1;
-        err = i2c_smbus_write_byte_data(client,
-                        MAX6639_REG_FAN_PPR(i),
-                        data->ppr << 5);
-        if (err)
-                goto exit;
 
         if (max6639_info)
                 rpm_range = rpm_range_to_reg(max6639_info->rpm_range);
@@ -458,6 +453,13 @@ static int max6639_init_client(struct i2c_client *client)
 
         for (i = 0; i < 2; i++) {
 
+                /* Set Fan pulse per revolution */
+                err = i2c_smbus_write_byte_data(client,
+                                MAX6639_REG_FAN_PPR(i),
+                                data->ppr << 6);
+                if (err)
+                        goto exit;
+
                 /* Fans config PWM, RPM */
                 err = i2c_smbus_write_byte_data(client,
                         MAX6639_REG_FAN_CONFIG1(i),
diff --git a/drivers/hwmon/pmbus/max34440.c b/drivers/hwmon/pmbus/max34440.c
index beaf5a8d9c45..9b97a5b3cf3d 100644
--- a/drivers/hwmon/pmbus/max34440.c
+++ b/drivers/hwmon/pmbus/max34440.c
@@ -82,7 +82,7 @@ static int max34440_write_word_data(struct i2c_client *client, int page,
         case PMBUS_VIRT_RESET_TEMP_HISTORY:
                 ret = pmbus_write_word_data(client, page,
                                             MAX34440_MFR_TEMPERATURE_PEAK,
-                                            0xffff);
+                                            0x8000);
                 break;
         default:
                 ret = -ENODATA;
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index 6ddeae049058..91fdd1fe18b0 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -883,7 +883,7 @@ static int sht15_invalidate_voltage(struct notifier_block *nb,
 
 static int __devinit sht15_probe(struct platform_device *pdev)
 {
-        int ret = 0;
+        int ret;
         struct sht15_data *data = kzalloc(sizeof(*data), GFP_KERNEL);
         u8 status = 0;
 
@@ -901,6 +901,7 @@ static int __devinit sht15_probe(struct platform_device *pdev)
         init_waitqueue_head(&data->wait_queue);
 
         if (pdev->dev.platform_data == NULL) {
+                ret = -EINVAL;
                 dev_err(&pdev->dev, "no platform data supplied\n");
                 goto err_free_data;
         }
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 0e0af0445222..5276d1933dbc 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1319,6 +1319,7 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
 {
         struct w83627ehf_data *data = dev_get_drvdata(dev);
         struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        struct w83627ehf_sio_data *sio_data = dev->platform_data;
         int nr = sensor_attr->index;
         unsigned long val;
         int err;
@@ -1330,6 +1331,11 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
 
         if (val > 1)
                 return -EINVAL;
+
+        /* On NCT67766F, DC mode is only supported for pwm1 */
+        if (sio_data->kind == nct6776 && nr && val != 1)
+                return -EINVAL;
+
         mutex_lock(&data->update_lock);
         reg = w83627ehf_read_value(data, W83627EHF_REG_PWM_ENABLE[nr]);
         data->pwm_mode[nr] = val;
@@ -1914,9 +1920,26 @@ w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data,
                 fan4min = 0;
                 fan5pin = 0;
         } else if (sio_data->kind == nct6776) {
-                fan3pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x40);
-                fan4pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x01);
-                fan5pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x02);
+                bool gpok = superio_inb(sio_data->sioreg, 0x27) & 0x80;
+
+                superio_select(sio_data->sioreg, W83627EHF_LD_HWM);
+                regval = superio_inb(sio_data->sioreg, SIO_REG_ENABLE);
+
+                if (regval & 0x80)
+                        fan3pin = gpok;
+                else
+                        fan3pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x40);
+
+                if (regval & 0x40)
+                        fan4pin = gpok;
+                else
+                        fan4pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x01);
+
+                if (regval & 0x20)
+                        fan5pin = gpok;
+                else
+                        fan5pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x02);
+
                 fan4min = fan4pin;
         } else if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {
                 fan3pin = 1;
@@ -2331,11 +2354,6 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
         for (i = 0; i < data->pwm_num; i++)
                 data->pwm_enable_orig[i] = data->pwm_enable[i];
 
-        /* Read pwm data to save original values */
-        w83627ehf_update_pwm_common(dev, data);
-        for (i = 0; i < data->pwm_num; i++)
-                data->pwm_enable_orig[i] = data->pwm_enable[i];
-
         /* Register sysfs hooks */
         for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++) {
                 err = device_create_file(dev, &sda_sf3_arrays[i].dev_attr);
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index f713eac55047..801df6000e9b 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1018,7 +1018,7 @@ omap_i2c_probe(struct platform_device *pdev)
                 goto err_release_region;
         }
 
-        match = of_match_device(omap_i2c_of_match, &pdev->dev);
+        match = of_match_device(of_match_ptr(omap_i2c_of_match), &pdev->dev);
         if (match) {
                 u32 freq = 100000; /* default to 100000 Hz */
 
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 6381604696d3..0ab4a9548745 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -755,7 +755,7 @@ MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);
 
 static struct platform_driver tegra_i2c_driver = {
         .probe   = tegra_i2c_probe,
-        .remove  = tegra_i2c_remove,
+        .remove  = __devexit_p(tegra_i2c_remove),
 #ifdef CONFIG_PM
         .suspend = tegra_i2c_suspend,
         .resume  = tegra_i2c_resume,
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 7f879b2397b0..af8d016c37ea 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -116,4 +116,3 @@ obj-$(CONFIG_BLK_DEV_IDE_AU1XXX)	+= au1xxx-ide.o
 
 obj-$(CONFIG_BLK_DEV_IDE_TX4938)        += tx4938ide.o
 obj-$(CONFIG_BLK_DEV_IDE_TX4939)        += tx4939ide.o
-obj-$(CONFIG_BLK_DEV_IDE_AT91)          += at91_ide.o
diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c
deleted file mode 100644
index 41d415529479..000000000000
--- a/drivers/ide/at91_ide.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * IDE host driver for AT91 (SAM9, CAP9, AT572D940HF) Static Memory Controller
- * with Compact Flash True IDE logic
- *
- * Copyright (c) 2008, 2009 Kelvatek Ltd.
- *
- *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/ide.h>
-#include <linux/platform_device.h>
-
-#include <mach/board.h>
-#include <asm/gpio.h>
-#include <mach/at91sam9_smc.h>
-
-#define DRV_NAME "at91_ide"
-
-#define perr(fmt, args...) pr_err(DRV_NAME ": " fmt, ##args)
-#define pdbg(fmt, args...) pr_debug("%s " fmt, __func__, ##args)
-
-/*
- * Access to IDE device is possible through EBI Static Memory Controller
- * with Compact Flash logic. For details see EBI and SMC datasheet sections
- * of any microcontroller from AT91SAM9 family.
- *
- * Within SMC chip select address space, lines A[23:21] distinguish Compact
- * Flash modes (I/O, common memory, attribute memory, True IDE). IDE modes are:
- *   0x00c0000 - True IDE
- *   0x00e0000 - Alternate True IDE (Alt Status Register)
- *
- * On True IDE mode Task File and Data Register are mapped at the same address.
- * To distinguish access between these two different bus data width is used:
- * 8Bit for Task File, 16Bit for Data I/O.
- *
- * After initialization we do 8/16 bit flipping (changes in SMC MODE register)
- * only inside IDE callback routines which are serialized by IDE layer,
- * so no additional locking needed.
- */
-
-#define TASK_FILE       0x00c00000
-#define ALT_MODE        0x00e00000
-#define REGS_SIZE       8
-
-#define enter_16bit(cs, mode) do {                                      \
-        mode = at91_sys_read(AT91_SMC_MODE(cs));                        \
-        at91_sys_write(AT91_SMC_MODE(cs), mode | AT91_SMC_DBW_16);      \
-} while (0)
-
-#define leave_16bit(cs, mode) at91_sys_write(AT91_SMC_MODE(cs), mode);
-
-static void set_smc_timings(const u8 chipselect, const u16 cycle,
-                            const u16 setup, const u16 pulse,
-                            const u16 data_float, int use_iordy)
-{
-        unsigned long mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
-                             AT91_SMC_BAT_SELECT;
-
-        /* disable or enable waiting for IORDY signal */
-        if (use_iordy)
-                mode |= AT91_SMC_EXNWMODE_READY;
-
-        /* add data float cycles if needed */
-        if (data_float)
-                mode |= AT91_SMC_TDF_(data_float);
-
-        at91_sys_write(AT91_SMC_MODE(chipselect), mode);
-
-        /* setup timings in SMC */
-        at91_sys_write(AT91_SMC_SETUP(chipselect), AT91_SMC_NWESETUP_(setup) |
-                                                   AT91_SMC_NCS_WRSETUP_(0) |
-                                                   AT91_SMC_NRDSETUP_(setup) |
-                                                   AT91_SMC_NCS_RDSETUP_(0));
-        at91_sys_write(AT91_SMC_PULSE(chipselect), AT91_SMC_NWEPULSE_(pulse) |
-                                                   AT91_SMC_NCS_WRPULSE_(cycle) |
-                                                   AT91_SMC_NRDPULSE_(pulse) |
-                                                   AT91_SMC_NCS_RDPULSE_(cycle));
-        at91_sys_write(AT91_SMC_CYCLE(chipselect), AT91_SMC_NWECYCLE_(cycle) |
-                                                   AT91_SMC_NRDCYCLE_(cycle));
-}
-
-static unsigned int calc_mck_cycles(unsigned int ns, unsigned int mck_hz)
-{
-        u64 tmp = ns;
-
-        tmp *= mck_hz;
-        tmp += 1000*1000*1000 - 1; /* round up */
-        do_div(tmp, 1000*1000*1000);
-        return (unsigned int) tmp;
-}
-
-static void apply_timings(const u8 chipselect, const u8 pio,
-                          const struct ide_timing *timing, int use_iordy)
-{
-        unsigned int t0, t1, t2, t6z;
-        unsigned int cycle, setup, pulse, data_float;
-        unsigned int mck_hz;
-        struct clk *mck;
-
-        /* see table 22 of Compact Flash standard 4.1 for the meaning,
-         * we do not stretch active (t2) time, so setup (t1) + hold time (th)
-         * assure at least minimal recovery (t2i) time */
-        t0 = timing->cyc8b;
-        t1 = timing->setup;
-        t2 = timing->act8b;
-        t6z = (pio < 5) ? 30 : 20;
-
-        pdbg("t0=%u t1=%u t2=%u t6z=%u\n", t0, t1, t2, t6z);
-
-        mck = clk_get(NULL, "mck");
-        BUG_ON(IS_ERR(mck));
-        mck_hz = clk_get_rate(mck);
-        pdbg("mck_hz=%u\n", mck_hz);
-
-        cycle = calc_mck_cycles(t0, mck_hz);
-        setup = calc_mck_cycles(t1, mck_hz);
-        pulse = calc_mck_cycles(t2, mck_hz);
-        data_float = calc_mck_cycles(t6z, mck_hz);
-
-        pdbg("cycle=%u setup=%u pulse=%u data_float=%u\n",
-             cycle, setup, pulse, data_float);
-
-        set_smc_timings(chipselect, cycle, setup, pulse, data_float, use_iordy);
-}
-
-static void at91_ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd,
-                                void *buf, unsigned int len)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        struct ide_io_ports *io_ports = &hwif->io_ports;
-        u8 chipselect = hwif->select_data;
-        unsigned long mode;
-
-        pdbg("cs %u buf %p len %d\n", chipselect, buf, len);
-
-        len++;
-
-        enter_16bit(chipselect, mode);
-        readsw((void __iomem *)io_ports->data_addr, buf, len / 2);
-        leave_16bit(chipselect, mode);
-}
-
-static void at91_ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd,
-                                 void *buf, unsigned int len)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        struct ide_io_ports *io_ports = &hwif->io_ports;
-        u8 chipselect = hwif->select_data;
-        unsigned long mode;
-
-        pdbg("cs %u buf %p len %d\n", chipselect,  buf, len);
-
-        enter_16bit(chipselect, mode);
-        writesw((void __iomem *)io_ports->data_addr, buf, len / 2);
-        leave_16bit(chipselect, mode);
-}
-
-static void at91_ide_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
-{
-        struct ide_timing *timing;
-        u8 chipselect = hwif->select_data;
-        int use_iordy = 0;
-        const u8 pio = drive->pio_mode - XFER_PIO_0;
-
-        pdbg("chipselect %u pio %u\n", chipselect, pio);
-
-        timing = ide_timing_find_mode(XFER_PIO_0 + pio);
-        BUG_ON(!timing);
-
-        if (ide_pio_need_iordy(drive, pio))
-                use_iordy = 1;
-
-        apply_timings(chipselect, pio, timing, use_iordy);
-}
-
-static const struct ide_tp_ops at91_ide_tp_ops = {
-        .exec_command   = ide_exec_command,
-        .read_status    = ide_read_status,
-        .read_altstatus = ide_read_altstatus,
-        .write_devctl   = ide_write_devctl,
-
-        .dev_select     = ide_dev_select,
-        .tf_load        = ide_tf_load,
-        .tf_read        = ide_tf_read,
-
-        .input_data     = at91_ide_input_data,
-        .output_data    = at91_ide_output_data,
-};
-
-static const struct ide_port_ops at91_ide_port_ops = {
-        .set_pio_mode   = at91_ide_set_pio_mode,
-};
-
-static const struct ide_port_info at91_ide_port_info __initdata = {
-        .port_ops       = &at91_ide_port_ops,
-        .tp_ops         = &at91_ide_tp_ops,
-        .host_flags     = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA | IDE_HFLAG_SINGLE |
-                          IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_UNMASK_IRQS,
-        .pio_mask       = ATA_PIO6,
-        .chipset        = ide_generic,
-};
-
-/*
- * If interrupt is delivered through GPIO, IRQ are triggered on falling
- * and rising edge of signal. Whereas IDE device request interrupt on high
- * level (rising edge in our case). This mean we have fake interrupts, so
- * we need to check interrupt pin and exit instantly from ISR when line
- * is on low level.
- */
-
-irqreturn_t at91_irq_handler(int irq, void *dev_id)
-{
-        int ntries = 8;
-        int pin_val1, pin_val2;
-
-        /* additional deglitch, line can be noisy in badly designed PCB */
-        do {
-                pin_val1 = at91_get_gpio_value(irq);
-                pin_val2 = at91_get_gpio_value(irq);
-        } while (pin_val1 != pin_val2 && --ntries > 0);
-
-        if (pin_val1 == 0 || ntries <= 0)
-                return IRQ_HANDLED;
-
-        return ide_intr(irq, dev_id);
-}
-
-static int __init at91_ide_probe(struct platform_device *pdev)
-{
-        int ret;
-        struct ide_hw hw, *hws[] = { &hw };
-        struct ide_host *host;
-        struct resource *res;
-        unsigned long tf_base = 0, ctl_base = 0;
-        struct at91_cf_data *board = pdev->dev.platform_data;
-
-        if (!board)
-                return -ENODEV;
-
-        if (board->det_pin && at91_get_gpio_value(board->det_pin) != 0) {
-                perr("no device detected\n");
-                return -ENODEV;
-        }
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                perr("can't get memory resource\n");
-                return -ENODEV;
-        }
-
-        if (!devm_request_mem_region(&pdev->dev, res->start + TASK_FILE,
-                                     REGS_SIZE, "ide") ||
-            !devm_request_mem_region(&pdev->dev, res->start + ALT_MODE,
-                                     REGS_SIZE, "alt")) {
-                perr("memory resources in use\n");
-                return -EBUSY;
-        }
-
-        pdbg("chipselect %u irq %u res %08lx\n", board->chipselect,
-             board->irq_pin, (unsigned long) res->start);
-
-        tf_base = (unsigned long) devm_ioremap(&pdev->dev, res->start + TASK_FILE,
-                                               REGS_SIZE);
-        ctl_base = (unsigned long) devm_ioremap(&pdev->dev, res->start + ALT_MODE,
-                                                REGS_SIZE);
-        if (!tf_base || !ctl_base) {
-                perr("can't map memory regions\n");
-                return -EBUSY;
-        }
-
-        memset(&hw, 0, sizeof(hw));
-
-        if (board->flags & AT91_IDE_SWAP_A0_A2) {
-                /* workaround for stupid hardware bug */
-                hw.io_ports.data_addr   = tf_base + 0;
-                hw.io_ports.error_addr  = tf_base + 4;
-                hw.io_ports.nsect_addr  = tf_base + 2;
-                hw.io_ports.lbal_addr   = tf_base + 6;
-                hw.io_ports.lbam_addr   = tf_base + 1;
-                hw.io_ports.lbah_addr   = tf_base + 5;
-                hw.io_ports.device_addr = tf_base + 3;
-                hw.io_ports.command_addr = tf_base + 7;
-                hw.io_ports.ctl_addr    = ctl_base + 3;
-        } else
-                ide_std_init_ports(&hw, tf_base, ctl_base + 6);
-
-        hw.irq = board->irq_pin;
-        hw.dev = &pdev->dev;
-
-        host = ide_host_alloc(&at91_ide_port_info, hws, 1);
-        if (!host) {
-                perr("failed to allocate ide host\n");
-                return -ENOMEM;
-        }
-
-        /* setup Static Memory Controller - PIO 0 as default */
-        apply_timings(board->chipselect, 0, ide_timing_find_mode(XFER_PIO_0), 0);
-
-        /* with GPIO interrupt we have to do quirks in handler */
-        if (gpio_is_valid(board->irq_pin))
-                host->irq_handler = at91_irq_handler;
-
-        host->ports[0]->select_data = board->chipselect;
-
-        ret = ide_host_register(host, &at91_ide_port_info, hws);
-        if (ret) {
-                perr("failed to register ide host\n");
-                goto err_free_host;
-        }
-        platform_set_drvdata(pdev, host);
-        return 0;
-
-err_free_host:
-        ide_host_free(host);
-        return ret;
-}
-
-static int __exit at91_ide_remove(struct platform_device *pdev)
-{
-        struct ide_host *host = platform_get_drvdata(pdev);
-
-        ide_host_remove(host);
-        return 0;
-}
-
-static struct platform_driver at91_ide_driver = {
-        .driver = {
-                .name = DRV_NAME,
-                .owner = THIS_MODULE,
-        },
-        .remove = __exit_p(at91_ide_remove),
-};
-
-static int __init at91_ide_init(void)
-{
-        return platform_driver_probe(&at91_ide_driver, at91_ide_probe);
-}
-
-static void __exit at91_ide_exit(void)
-{
-        platform_driver_unregister(&at91_ide_driver);
-}
-
-module_init(at91_ide_init);
-module_exit(at91_ide_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Stanislaw Gruszka <stf_xl@wp.pl>");
-
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 20bce51c2e82..54ab97bae042 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -527,7 +527,7 @@ int intel_idle_cpu_init(int cpu)
 
         return 0;
 }
-
+EXPORT_SYMBOL_GPL(intel_idle_cpu_init);
 
 static int __init intel_idle_init(void)
 {
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index b37b0c02a7b9..5034a87cc72d 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -808,9 +808,12 @@ static ssize_t ucma_accept(struct ucma_file *file, const char __user *inbuf,
                 return PTR_ERR(ctx);
 
         if (cmd.conn_param.valid) {
-                ctx->uid = cmd.uid;
                 ucma_copy_conn_param(&conn_param, &cmd.conn_param);
+                mutex_lock(&file->mut);
                 ret = rdma_accept(ctx->cm_id, &conn_param);
+                if (!ret)
+                        ctx->uid = cmd.uid;
+                mutex_unlock(&file->mut);
         } else
                 ret = rdma_accept(ctx->cm_id, NULL);
 
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index b930da4c0c63..4d27e4c3fe34 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1485,6 +1485,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file,
                 qp->event_handler = attr.event_handler;
                 qp->qp_context    = attr.qp_context;
                 qp->qp_type       = attr.qp_type;
+                atomic_set(&qp->usecnt, 0);
                 atomic_inc(&pd->usecnt);
                 atomic_inc(&attr.send_cq->usecnt);
                 if (attr.recv_cq)
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 602b1bd723a9..575b78045aaf 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -421,6 +421,7 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd,
                 qp->uobject    = NULL;
                 qp->qp_type    = qp_init_attr->qp_type;
 
+                atomic_set(&qp->usecnt, 0);
                 if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) {
                         qp->event_handler = __ib_shared_qp_event_handler;
                         qp->qp_context = qp;
@@ -430,7 +431,6 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd,
                         qp->xrcd = qp_init_attr->xrcd;
                         atomic_inc(&qp_init_attr->xrcd->usecnt);
                         INIT_LIST_HEAD(&qp->open_list);
-                        atomic_set(&qp->usecnt, 0);
 
                         real_qp = qp;
                         qp = __ib_open_qp(real_qp, qp_init_attr->event_handler,
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index b7d4216db3c3..a4de9d58e9b4 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -89,7 +89,7 @@ static int create_file(const char *name, umode_t mode,
                 error = ipathfs_mknod(parent->d_inode, *dentry,
                                       mode, fops, data);
         else
-                error = PTR_ERR(dentry);
+                error = PTR_ERR(*dentry);
         mutex_unlock(&parent->d_inode->i_mutex);
 
         return error;
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 95c94d8f0254..259b0670b51c 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -257,12 +257,9 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
                         return IB_MAD_RESULT_SUCCESS;
 
                 /*
-                 * Don't process SMInfo queries or vendor-specific
-                 * MADs -- the SMA can't handle them.
+                 * Don't process SMInfo queries -- the SMA can't handle them.
                  */
-                if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO ||
-                    ((in_mad->mad_hdr.attr_id & IB_SMP_ATTR_VENDOR_MASK) ==
-                     IB_SMP_ATTR_VENDOR_MASK))
+                if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO)
                         return IB_MAD_RESULT_SUCCESS;
         } else if (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_PERF_MGMT ||
                    in_mad->mad_hdr.mgmt_class == MLX4_IB_VENDOR_CLASS1   ||
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index 7013da5e9eda..7140199f562e 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
index 568b4f11380a..c438e4691b3c 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 425065b36b8c..a4972abedef1 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -233,6 +233,7 @@ static int send_mpa_reject(struct nes_cm_node *cm_node)
         u8 *start_ptr = &start_addr;
         u8 **start_buff = &start_ptr;
         u16 buff_len = 0;
+        struct ietf_mpa_v1 *mpa_frame;
 
         skb = dev_alloc_skb(MAX_CM_BUFFER);
         if (!skb) {
@@ -242,6 +243,8 @@ static int send_mpa_reject(struct nes_cm_node *cm_node)
 
         /* send an MPA reject frame */
         cm_build_mpa_frame(cm_node, start_buff, &buff_len, NULL, MPA_KEY_REPLY);
+        mpa_frame = (struct ietf_mpa_v1 *)*start_buff;
+        mpa_frame->flags |= IETF_MPA_FLAGS_REJECT;
         form_cm_frame(skb, cm_node, NULL, 0, *start_buff, buff_len, SET_ACK | SET_FIN);
 
         cm_node->state = NES_CM_STATE_FIN_WAIT1;
@@ -1360,8 +1363,7 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
                                 if (!memcmp(nesadapter->arp_table[arpindex].mac_addr,
                                             neigh->ha, ETH_ALEN)) {
                                         /* Mac address same as in nes_arp_table */
-                                        ip_rt_put(rt);
-                                        return rc;
+                                        goto out;
                                 }
 
                                 nes_manage_arp_cache(nesvnic->netdev,
@@ -1377,6 +1379,8 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
                         neigh_event_send(neigh, NULL);
                 }
         }
+
+out:
         rcu_read_unlock();
         ip_rt_put(rt);
         return rc;
diff --git a/drivers/infiniband/hw/nes/nes_cm.h b/drivers/infiniband/hw/nes/nes_cm.h
index bdfa1fbb35fc..4646e6666087 100644
--- a/drivers/infiniband/hw/nes/nes_cm.h
+++ b/drivers/infiniband/hw/nes/nes_cm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_context.h b/drivers/infiniband/hw/nes/nes_context.h
index b4393a16099d..a69eef16d72d 100644
--- a/drivers/infiniband/hw/nes/nes_context.h
+++ b/drivers/infiniband/hw/nes/nes_context.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 055f4b545df0..d42c9f435b1b 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h
index 0b590e152c6a..d748e4b31b8d 100644
--- a/drivers/infiniband/hw/nes/nes_hw.h
+++ b/drivers/infiniband/hw/nes/nes_hw.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+* Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
 *
 * This software is available to you under a choice of one of two
 * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
index b3b2a240c6e9..3ba7be369452 100644
--- a/drivers/infiniband/hw/nes/nes_mgt.c
+++ b/drivers/infiniband/hw/nes/nes_mgt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel-NE, Inc.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_mgt.h b/drivers/infiniband/hw/nes/nes_mgt.h
index 8c8af254555a..4f7f701c4a81 100644
--- a/drivers/infiniband/hw/nes/nes_mgt.h
+++ b/drivers/infiniband/hw/nes/nes_mgt.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2010 Intel-NE, Inc.  All rights reserved.
+* Copyright (c) 2006 - 2011 Intel-NE, Inc.  All rights reserved.
 *
 * This software is available to you under a choice of one of two
 * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 4b3fa711a247..f3a3ecf8d09e 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_user.h b/drivers/infiniband/hw/nes/nes_user.h
index 71e133ab209b..4926de744488 100644
--- a/drivers/infiniband/hw/nes/nes_user.h
+++ b/drivers/infiniband/hw/nes/nes_user.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Cisco Systems.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c
index 8b4c2ff54888..e98f4fc0b768 100644
--- a/drivers/infiniband/hw/nes/nes_utils.c
+++ b/drivers/infiniband/hw/nes/nes_utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 5095bc41c6cc..0927b5cc65d3 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -3428,6 +3428,8 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                                             NES_IWARP_SQ_FMR_WQE_LENGTH_LOW_IDX,
                                             ib_wr->wr.fast_reg.length);
                         set_wqe_32bit_value(wqe->wqe_words,
+                                            NES_IWARP_SQ_FMR_WQE_LENGTH_HIGH_IDX, 0);
+                        set_wqe_32bit_value(wqe->wqe_words,
                                             NES_IWARP_SQ_FMR_WQE_MR_STAG_IDX,
                                             ib_wr->wr.fast_reg.rkey);
                         /* Set page size: */
@@ -3724,7 +3726,7 @@ static int nes_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *entry)
                                                 entry->opcode = IB_WC_SEND;
                                                 break;
                                         case NES_IWARP_SQ_OP_LOCINV:
-                                                entry->opcode = IB_WR_LOCAL_INV;
+                                                entry->opcode = IB_WC_LOCAL_INV;
                                                 break;
                                         case NES_IWARP_SQ_OP_FAST_REG:
                                                 entry->opcode = IB_WC_FAST_REG_MR;
diff --git a/drivers/infiniband/hw/nes/nes_verbs.h b/drivers/infiniband/hw/nes/nes_verbs.h
index fe6b6e92fa90..0eff7c44d76b 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.h
+++ b/drivers/infiniband/hw/nes/nes_verbs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c
index 4f18e2d332df..d0c64d514813 100644
--- a/drivers/infiniband/hw/qib/qib_iba6120.c
+++ b/drivers/infiniband/hw/qib/qib_iba6120.c
@@ -2105,7 +2105,7 @@ static void alloc_dummy_hdrq(struct qib_devdata *dd)
         dd->cspec->dummy_hdrq = dma_alloc_coherent(&dd->pcidev->dev,
                                         dd->rcd[0]->rcvhdrq_size,
                                         &dd->cspec->dummy_hdrq_phys,
-                                        GFP_KERNEL | __GFP_COMP);
+                                        GFP_ATOMIC | __GFP_COMP);
         if (!dd->cspec->dummy_hdrq) {
                 qib_devinfo(dd->pcidev, "Couldn't allocate dummy hdrq\n");
                 /* fallback to just 0'ing */
diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
index f695061d688e..0fde788e1100 100644
--- a/drivers/infiniband/hw/qib/qib_pcie.c
+++ b/drivers/infiniband/hw/qib/qib_pcie.c
@@ -560,7 +560,7 @@ static int qib_tune_pcie_coalesce(struct qib_devdata *dd)
  * BIOS may not set PCIe bus-utilization parameters for best performance.
  * Check and optionally adjust them to maximize our throughput.
  */
-static int qib_pcie_caps = 0x51;
+static int qib_pcie_caps;
 module_param_named(pcie_caps, qib_pcie_caps, int, S_IRUGO);
 MODULE_PARM_DESC(pcie_caps, "Max PCIe tuning: Payload (0..3), ReadReq (4..7)");
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index b3cc1e062b17..86df632ea612 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -44,6 +44,7 @@
 #include <linux/mutex.h>
 
 #include <net/neighbour.h>
+#include <net/sch_generic.h>
 
 #include <linux/atomic.h>
 
@@ -117,8 +118,9 @@ struct ipoib_header {
         u16     reserved;
 };
 
-struct ipoib_pseudoheader {
-        u8  hwaddr[INFINIBAND_ALEN];
+struct ipoib_cb {
+        struct qdisc_skb_cb     qdisc_cb;
+        u8                      hwaddr[INFINIBAND_ALEN];
 };
 
 /* Used for all multicast joins (broadcast, IPv4 mcast and IPv6 mcast) */
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 3514ca05deea..3974c290b667 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -653,7 +653,7 @@ static void ipoib_path_lookup(struct sk_buff *skb, struct neighbour *n, struct n
 }
 
 static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
-                             struct ipoib_pseudoheader *phdr)
+                             struct ipoib_cb *cb)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_path *path;
@@ -661,17 +661,15 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
 
         spin_lock_irqsave(&priv->lock, flags);
 
-        path = __path_find(dev, phdr->hwaddr + 4);
+        path = __path_find(dev, cb->hwaddr + 4);
         if (!path || !path->valid) {
                 int new_path = 0;
 
                 if (!path) {
-                        path = path_rec_create(dev, phdr->hwaddr + 4);
+                        path = path_rec_create(dev, cb->hwaddr + 4);
                         new_path = 1;
                 }
                 if (path) {
-                        /* put pseudoheader back on for next time */
-                        skb_push(skb, sizeof *phdr);
                         __skb_queue_tail(&path->queue, skb);
 
                         if (!path->query && path_rec_start(dev, path)) {
@@ -695,12 +693,10 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
                           be16_to_cpu(path->pathrec.dlid));
 
                 spin_unlock_irqrestore(&priv->lock, flags);
-                ipoib_send(dev, skb, path->ah, IPOIB_QPN(phdr->hwaddr));
+                ipoib_send(dev, skb, path->ah, IPOIB_QPN(cb->hwaddr));
                 return;
         } else if ((path->query || !path_rec_start(dev, path)) &&
                    skb_queue_len(&path->queue) < IPOIB_MAX_PATH_REC_QUEUE) {
-                /* put pseudoheader back on for next time */
-                skb_push(skb, sizeof *phdr);
                 __skb_queue_tail(&path->queue, skb);
         } else {
                 ++dev->stats.tx_dropped;
@@ -774,16 +770,14 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         dev_kfree_skb_any(skb);
                 }
         } else {
-                struct ipoib_pseudoheader *phdr =
-                        (struct ipoib_pseudoheader *) skb->data;
-                skb_pull(skb, sizeof *phdr);
+                struct ipoib_cb *cb = (struct ipoib_cb *) skb->cb;
 
-                if (phdr->hwaddr[4] == 0xff) {
+                if (cb->hwaddr[4] == 0xff) {
                         /* Add in the P_Key for multicast*/
-                        phdr->hwaddr[8] = (priv->pkey >> 8) & 0xff;
-                        phdr->hwaddr[9] = priv->pkey & 0xff;
+                        cb->hwaddr[8] = (priv->pkey >> 8) & 0xff;
+                        cb->hwaddr[9] = priv->pkey & 0xff;
 
-                        ipoib_mcast_send(dev, phdr->hwaddr + 4, skb);
+                        ipoib_mcast_send(dev, cb->hwaddr + 4, skb);
                 } else {
                         /* unicast GID -- should be ARP or RARP reply */
 
@@ -792,14 +786,14 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                 ipoib_warn(priv, "Unicast, no %s: type %04x, QPN %06x %pI6\n",
                                            skb_dst(skb) ? "neigh" : "dst",
                                            be16_to_cpup((__be16 *) skb->data),
-                                           IPOIB_QPN(phdr->hwaddr),
-                                           phdr->hwaddr + 4);
+                                           IPOIB_QPN(cb->hwaddr),
+                                           cb->hwaddr + 4);
                                 dev_kfree_skb_any(skb);
                                 ++dev->stats.tx_dropped;
                                 goto unlock;
                         }
 
-                        unicast_arp_send(skb, dev, phdr);
+                        unicast_arp_send(skb, dev, cb);
                 }
         }
 unlock:
@@ -825,8 +819,6 @@ static int ipoib_hard_header(struct sk_buff *skb,
                              const void *daddr, const void *saddr, unsigned len)
 {
         struct ipoib_header *header;
-        struct dst_entry *dst;
-        struct neighbour *n;
 
         header = (struct ipoib_header *) skb_push(skb, sizeof *header);
 
@@ -834,18 +826,13 @@ static int ipoib_hard_header(struct sk_buff *skb,
         header->reserved = 0;
 
         /*
-         * If we don't have a neighbour structure, stuff the
-         * destination address onto the front of the skb so we can
-         * figure out where to send the packet later.
+         * If we don't have a dst_entry structure, stuff the
+         * destination address into skb->cb so we can figure out where
+         * to send the packet later.
          */
-        dst = skb_dst(skb);
-        n = NULL;
-        if (dst)
-                n = dst_get_neighbour_noref_raw(dst);
-        if ((!dst || !n) && daddr) {
-                struct ipoib_pseudoheader *phdr =
-                        (struct ipoib_pseudoheader *) skb_push(skb, sizeof *phdr);
-                memcpy(phdr->hwaddr, daddr, INFINIBAND_ALEN);
+        if (!skb_dst(skb)) {
+                struct ipoib_cb *cb = (struct ipoib_cb *) skb->cb;
+                memcpy(cb->hwaddr, daddr, INFINIBAND_ALEN);
         }
 
         return 0;
@@ -1021,11 +1008,7 @@ static void ipoib_setup(struct net_device *dev)
 
         dev->flags              |= IFF_BROADCAST | IFF_MULTICAST;
 
-        /*
-         * We add in INFINIBAND_ALEN to allow for the destination
-         * address "pseudoheader" for skbs without neighbour struct.
-         */
-        dev->hard_header_len     = IPOIB_ENCAP_LEN + INFINIBAND_ALEN;
+        dev->hard_header_len     = IPOIB_ENCAP_LEN;
         dev->addr_len            = INFINIBAND_ALEN;
         dev->type                = ARPHRD_INFINIBAND;
         dev->tx_queue_len        = ipoib_sendq_size * 2;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index f7ff9dd66cda..20ebc6fd1bb9 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -262,21 +262,13 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
         netif_tx_lock_bh(dev);
         while (!skb_queue_empty(&mcast->pkt_queue)) {
                 struct sk_buff *skb = skb_dequeue(&mcast->pkt_queue);
-                struct dst_entry *dst = skb_dst(skb);
-                struct neighbour *n = NULL;
 
                 netif_tx_unlock_bh(dev);
 
                 skb->dev = dev;
-                if (dst)
-                        n = dst_get_neighbour_noref_raw(dst);
-                if (!dst || !n) {
-                        /* put pseudoheader back on for next time */
-                        skb_push(skb, sizeof (struct ipoib_pseudoheader));
-                }
-
                 if (dev_queue_xmit(skb))
                         ipoib_warn(priv, "dev_queue_xmit failed to requeue packet\n");
+
                 netif_tx_lock_bh(dev);
         }
         netif_tx_unlock_bh(dev);
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index cd5d05e22a77..2b73d43cd691 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -69,8 +69,8 @@ MODULE_LICENSE("Dual BSD/GPL");
  */
 
 static u64 srpt_service_guid;
-static spinlock_t srpt_dev_lock;       /* Protects srpt_dev_list. */
-static struct list_head srpt_dev_list; /* List of srpt_device structures. */
+static DEFINE_SPINLOCK(srpt_dev_lock);  /* Protects srpt_dev_list. */
+static LIST_HEAD(srpt_dev_list);        /* List of srpt_device structures. */
 
 static unsigned srp_max_req_size = DEFAULT_MAX_REQ_SIZE;
 module_param(srp_max_req_size, int, 0444);
@@ -687,6 +687,7 @@ err:
         while (--i >= 0)
                 srpt_free_ioctx(sdev, ring[i], dma_size, dir);
         kfree(ring);
+        ring = NULL;
 out:
         return ring;
 }
@@ -2595,7 +2596,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
         }
 
         ch->sess = transport_init_session();
-        if (!ch->sess) {
+        if (IS_ERR(ch->sess)) {
                 rej->reason = __constant_cpu_to_be32(
                                 SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
                 pr_debug("Failed to create session\n");
@@ -3264,8 +3265,7 @@ static void srpt_add_one(struct ib_device *device)
         for (i = 0; i < sdev->srq_size; ++i)
                 srpt_post_recv(sdev, sdev->ioctx_ring[i]);
 
-        WARN_ON(sdev->device->phys_port_cnt
-                > sizeof(sdev->port)/sizeof(sdev->port[0]));
+        WARN_ON(sdev->device->phys_port_cnt > ARRAY_SIZE(sdev->port));
 
         for (i = 1; i <= sdev->device->phys_port_cnt; i++) {
                 sport = &sdev->port[i - 1];
@@ -4010,13 +4010,10 @@ static int __init srpt_init_module(void)
                 goto out;
         }
 
-        spin_lock_init(&srpt_dev_lock);
-        INIT_LIST_HEAD(&srpt_dev_list);
-
-        ret = -ENODEV;
         srpt_target = target_fabric_configfs_init(THIS_MODULE, "srpt");
-        if (!srpt_target) {
+        if (IS_ERR(srpt_target)) {
                 printk(KERN_ERR "couldn't register\n");
+                ret = PTR_ERR(srpt_target);
                 goto out;
         }
 
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.h b/drivers/infiniband/ulp/srpt/ib_srpt.h
index b4b4bbcd7f16..61e52b830816 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.h
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.h
@@ -35,7 +35,6 @@
 #ifndef IB_SRPT_H
 #define IB_SRPT_H
 
-#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/wait.h>
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 76457d50bc34..afc166fcc3d9 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -386,7 +386,7 @@ static ssize_t evdev_read(struct file *file, char __user *buffer,
         struct evdev_client *client = file->private_data;
         struct evdev *evdev = client->evdev;
         struct input_event event;
-        int retval;
+        int retval = 0;
 
         if (count < input_event_size())
                 return -EINVAL;
diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
index a588578037eb..67bec14e8b96 100644
--- a/drivers/input/keyboard/twl4030_keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -34,7 +34,6 @@
 #include <linux/i2c/twl.h>
 #include <linux/slab.h>
 
-
 /*
  * The TWL4030 family chips include a keypad controller that supports
  * up to an 8x8 switch matrix.  The controller can issue system wakeup
@@ -302,7 +301,7 @@ static int __devinit twl4030_kp_program(struct twl4030_keypad *kp)
         if (twl4030_kpwrite_u8(kp, i, KEYP_DEB) < 0)
                 return -EIO;
 
-        /* Set timeout period to 100 ms */
+        /* Set timeout period to 200 ms */
         i = KEYP_PERIOD_US(200000, PTV_PRESCALER);
         if (twl4030_kpwrite_u8(kp, (i & 0xFF), KEYP_TIMEOUT_L) < 0)
                 return -EIO;
@@ -466,4 +465,3 @@ MODULE_AUTHOR("Texas Instruments");
 MODULE_DESCRIPTION("TWL4030 Keypad Driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:twl4030_keypad");
-
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index b4cfc6c8be89..5ec774d6c82b 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -512,6 +512,13 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"),
                 },
         },
+        {
+                /* Lenovo Ideapad U455 */
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "20046"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 8250299fd64f..4494233d331a 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -164,7 +164,8 @@ static ssize_t serio_raw_read(struct file *file, char __user *buffer,
         struct serio_raw_client *client = file->private_data;
         struct serio_raw *serio_raw = client->serio_raw;
         char uninitialized_var(c);
-        ssize_t retval = 0;
+        ssize_t read = 0;
+        int retval;
 
         if (serio_raw->dead)
                 return -ENODEV;
@@ -180,13 +181,15 @@ static ssize_t serio_raw_read(struct file *file, char __user *buffer,
         if (serio_raw->dead)
                 return -ENODEV;
 
-        while (retval < count && serio_raw_fetch_byte(serio_raw, &c)) {
-                if (put_user(c, buffer++))
-                        return -EFAULT;
-                retval++;
+        while (read < count && serio_raw_fetch_byte(serio_raw, &c)) {
+                if (put_user(c, buffer++)) {
+                        retval = -EFAULT;
+                        break;
+                }
+                read++;
         }
 
-        return retval;
+        return read ?: retval;
 }
 
 static ssize_t serio_raw_write(struct file *file, const char __user *buffer,
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index cce1f03b8895..f75e0608be5b 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2863,6 +2863,9 @@ static unsigned device_dma_ops_init(void)
 
         for_each_pci_dev(pdev) {
                 if (!check_device(&pdev->dev)) {
+
+                        iommu_ignore_device(&pdev->dev);
+
                         unhandled += 1;
                         continue;
                 }
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 08a90b88e40d..cee307e86606 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -482,23 +482,19 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
 
         priv = domain->priv;
 
-        if (!priv) {
-                ret = -ENODEV;
+        if (!priv)
                 goto fail;
-        }
 
         fl_table = priv->pgtable;
 
         if (len != SZ_16M && len != SZ_1M &&
             len != SZ_64K && len != SZ_4K) {
                 pr_debug("Bad length: %d\n", len);
-                ret = -EINVAL;
                 goto fail;
         }
 
         if (!fl_table) {
                 pr_debug("Null page table\n");
-                ret = -EINVAL;
                 goto fail;
         }
 
@@ -507,7 +503,6 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
 
         if (*fl_pte == 0) {
                 pr_debug("First level PTE is 0\n");
-                ret = -ENODEV;
                 goto fail;
         }
 
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 2339d7396b9e..802ab87a78b6 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -1901,7 +1901,7 @@ static int isdn_net_header(struct sk_buff *skb, struct net_device *dev,
 {
         isdn_net_local *lp = netdev_priv(dev);
         unsigned char *p;
-        ushort len = 0;
+        int len = 0;
 
         switch (lp->p_encap) {
                 case ISDN_NET_ENCAP_ETHER:
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index c957c344233f..9ca28fced2b9 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -403,6 +403,13 @@ config LEDS_MAX8997
           This option enables support for on-chip LED drivers on
           MAXIM MAX8997 PMIC.
 
+config LEDS_OT200
+        tristate "LED support for the Bachmann OT200"
+        depends on LEDS_CLASS && HAS_IOMEM
+        help
+          This option enables support for the LEDs on the Bachmann OT200.
+          Say Y to enable LEDs on the Bachmann OT200.
+
 config LEDS_TRIGGERS
         bool "LED Trigger support"
         depends on LEDS_CLASS
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index b8a9723477f0..1fc6875a8b20 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_LEDS_LP5523)		+= leds-lp5523.o
 obj-$(CONFIG_LEDS_TCA6507)              += leds-tca6507.o
 obj-$(CONFIG_LEDS_CLEVO_MAIL)           += leds-clevo-mail.o
 obj-$(CONFIG_LEDS_HP6XX)                += leds-hp6xx.o
+obj-$(CONFIG_LEDS_OT200)                += leds-ot200.o
 obj-$(CONFIG_LEDS_FSG)                  += leds-fsg.o
 obj-$(CONFIG_LEDS_PCA955X)              += leds-pca955x.o
 obj-$(CONFIG_LEDS_DA903X)               += leds-da903x.o
diff --git a/drivers/leds/leds-lm3530.c b/drivers/leds/leds-lm3530.c
index 45e6878d7374..e59c166a0ce2 100644
--- a/drivers/leds/leds-lm3530.c
+++ b/drivers/leds/leds-lm3530.c
@@ -164,8 +164,8 @@ static int lm3530_init_registers(struct lm3530_data *drvdata)
 
         if (drvdata->mode == LM3530_BL_MODE_ALS) {
                 if (pltfm->als_vmax == 0) {
-                        pltfm->als_vmin = als_vmin = 0;
-                        pltfm->als_vmin = als_vmax = LM3530_ALS_WINDOW_mV;
+                        pltfm->als_vmin = 0;
+                        pltfm->als_vmax = LM3530_ALS_WINDOW_mV;
                 }
 
                 als_vmin = pltfm->als_vmin;
diff --git a/drivers/leds/leds-ot200.c b/drivers/leds/leds-ot200.c
new file mode 100644
index 000000000000..c4646825a620
--- /dev/null
+++ b/drivers/leds/leds-ot200.c
@@ -0,0 +1,171 @@
+/*
+ * Bachmann ot200 leds driver.
+ *
+ * Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ *         Christian Gmeiner <christian.gmeiner@gmail.com>
+ *
+ * License: GPL as published by the FSF.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/leds.h>
+#include <linux/io.h>
+#include <linux/module.h>
+
+
+struct ot200_led {
+        struct led_classdev cdev;
+        const char *name;
+        unsigned long port;
+        u8 mask;
+};
+
+/*
+ * The device has three leds on the back panel (led_err, led_init and led_run)
+ * and can handle up to seven leds on the front panel.
+ */
+
+static struct ot200_led leds[] = {
+        {
+                .name = "led_run",
+                .port = 0x5a,
+                .mask = BIT(0),
+        },
+        {
+                .name = "led_init",
+                .port = 0x5a,
+                .mask = BIT(1),
+        },
+        {
+                .name = "led_err",
+                .port = 0x5a,
+                .mask = BIT(2),
+        },
+        {
+                .name = "led_1",
+                .port = 0x49,
+                .mask = BIT(7),
+        },
+        {
+                .name = "led_2",
+                .port = 0x49,
+                .mask = BIT(6),
+        },
+        {
+                .name = "led_3",
+                .port = 0x49,
+                .mask = BIT(5),
+        },
+        {
+                .name = "led_4",
+                .port = 0x49,
+                .mask = BIT(4),
+        },
+        {
+                .name = "led_5",
+                .port = 0x49,
+                .mask = BIT(3),
+        },
+        {
+                .name = "led_6",
+                .port = 0x49,
+                .mask = BIT(2),
+        },
+        {
+                .name = "led_7",
+                .port = 0x49,
+                .mask = BIT(1),
+        }
+};
+
+static DEFINE_SPINLOCK(value_lock);
+
+/*
+ * we need to store the current led states, as it is not
+ * possible to read the current led state via inb().
+ */
+static u8 leds_back;
+static u8 leds_front;
+
+static void ot200_led_brightness_set(struct led_classdev *led_cdev,
+                enum led_brightness value)
+{
+        struct ot200_led *led = container_of(led_cdev, struct ot200_led, cdev);
+        u8 *val;
+        unsigned long flags;
+
+        spin_lock_irqsave(&value_lock, flags);
+
+        if (led->port == 0x49)
+                val = &leds_front;
+        else if (led->port == 0x5a)
+                val = &leds_back;
+        else
+                BUG();
+
+        if (value == LED_OFF)
+                *val &= ~led->mask;
+        else
+                *val |= led->mask;
+
+        outb(*val, led->port);
+        spin_unlock_irqrestore(&value_lock, flags);
+}
+
+static int __devinit ot200_led_probe(struct platform_device *pdev)
+{
+        int i;
+        int ret;
+
+        for (i = 0; i < ARRAY_SIZE(leds); i++) {
+
+                leds[i].cdev.name = leds[i].name;
+                leds[i].cdev.brightness_set = ot200_led_brightness_set;
+
+                ret = led_classdev_register(&pdev->dev, &leds[i].cdev);
+                if (ret < 0)
+                        goto err;
+        }
+
+        leds_front = 0;         /* turn off all front leds */
+        leds_back = BIT(1);     /* turn on init led */
+        outb(leds_front, 0x49);
+        outb(leds_back, 0x5a);
+
+        return 0;
+
+err:
+        for (i = i - 1; i >= 0; i--)
+                led_classdev_unregister(&leds[i].cdev);
+
+        return ret;
+}
+
+static int __devexit ot200_led_remove(struct platform_device *pdev)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(leds); i++)
+                led_classdev_unregister(&leds[i].cdev);
+
+        return 0;
+}
+
+static struct platform_driver ot200_led_driver = {
+        .probe          = ot200_led_probe,
+        .remove         = __devexit_p(ot200_led_remove),
+        .driver         = {
+                .name   = "leds-ot200",
+                .owner  = THIS_MODULE,
+        },
+};
+
+module_platform_driver(ot200_led_driver);
+
+MODULE_AUTHOR("Sebastian A. Siewior <bigeasy@linutronix.de>");
+MODULE_DESCRIPTION("ot200 LED driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:leds-ot200");
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 75049e765191..b026896206ca 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -710,7 +710,7 @@ static ssize_t adb_read(struct file *file, char __user *buf,
         req = NULL;
         spin_lock_irqsave(&state->lock, flags);
         add_wait_queue(&state->wait_queue, &wait);
-        current->state = TASK_INTERRUPTIBLE;
+        set_current_state(TASK_INTERRUPTIBLE);
 
         for (;;) {
                 req = state->completed;
@@ -734,7 +734,7 @@ static ssize_t adb_read(struct file *file, char __user *buf,
                 spin_lock_irqsave(&state->lock, flags);
         }
 
-        current->state = TASK_RUNNING;
+        set_current_state(TASK_RUNNING);
         remove_wait_queue(&state->wait_queue, &wait);
         spin_unlock_irqrestore(&state->lock, flags);
         
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index c2907d836e4e..86cb7e5d83d5 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -56,7 +56,8 @@ struct raid_dev {
 struct raid_set {
         struct dm_target *ti;
 
-        uint64_t print_flags;
+        uint32_t bitmap_loaded;
+        uint32_t print_flags;
 
         struct mddev md;
         struct raid_type *raid_type;
@@ -1085,7 +1086,7 @@ static int raid_status(struct dm_target *ti, status_type_t type,
                                 raid_param_cnt += 2;
                 }
 
-                raid_param_cnt += (hweight64(rs->print_flags & ~DMPF_REBUILD) * 2);
+                raid_param_cnt += (hweight32(rs->print_flags & ~DMPF_REBUILD) * 2);
                 if (rs->print_flags & (DMPF_SYNC | DMPF_NOSYNC))
                         raid_param_cnt--;
 
@@ -1197,7 +1198,12 @@ static void raid_resume(struct dm_target *ti)
 {
         struct raid_set *rs = ti->private;
 
-        bitmap_load(&rs->md);
+        if (!rs->bitmap_loaded) {
+                bitmap_load(&rs->md);
+                rs->bitmap_loaded = 1;
+        } else
+                md_wakeup_thread(rs->md.thread);
+
         mddev_resume(&rs->md);
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 9417ae2fa0bb..ce88755baf4a 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7333,7 +7333,8 @@ void md_do_sync(struct mddev *mddev)
                                         printk(KERN_INFO
                                                "md: checkpointing %s of %s.\n",
                                                desc, mdname(mddev));
-                                        mddev->recovery_cp = mddev->curr_resync;
+                                        mddev->recovery_cp =
+                                                mddev->curr_resync_completed;
                                 }
                         } else
                                 mddev->recovery_cp = MaxSector;
@@ -7351,9 +7352,9 @@ void md_do_sync(struct mddev *mddev)
                         rcu_read_unlock();
                 }
         }
+ skip:
         set_bit(MD_CHANGE_DEVS, &mddev->flags);
 
- skip:
         if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery)) {
                 /* We completed so min/max setting can be forgotten if used. */
                 if (test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index 1455e2644ab5..cf0c318d6989 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -887,8 +887,7 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
 
                 /* attach demod */
                 adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach,
-                                &anysee_cxd2820r_config, &adap->dev->i2c_adap,
-                                NULL);
+                                &anysee_cxd2820r_config, &adap->dev->i2c_adap);
 
                 state->has_ci = true;
 
@@ -1189,6 +1188,14 @@ static int anysee_ci_init(struct dvb_usb_device *d)
         if (ret)
                 return ret;
 
+        ret = anysee_wr_reg_mask(d, REG_IOD, (0 << 2)|(0 << 1)|(0 << 0), 0x07);
+        if (ret)
+                return ret;
+
+        ret = anysee_wr_reg_mask(d, REG_IOD, (1 << 2)|(1 << 1)|(1 << 0), 0x07);
+        if (ret)
+                return ret;
+
         ret = dvb_ca_en50221_init(&d->adapter[0].dvb_adap, &state->ci, 0, 1);
         if (ret)
                 return ret;
diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
index 8a57ed8272de..1efc028a76c9 100644
--- a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
+++ b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
@@ -276,14 +276,15 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
         param.flags = 0;
 
         switch (fep->bandwidth_hz) {
+        default:
         case 8000000:
-                param.bandwidth = 0;
+                param.bandwidth = 8;
                 break;
         case 7000000:
-                param.bandwidth = 1;
+                param.bandwidth = 7;
                 break;
         case 6000000:
-                param.bandwidth = 2;
+                param.bandwidth = 6;
                 break;
         }
 
diff --git a/drivers/media/dvb/frontends/cxd2820r.h b/drivers/media/dvb/frontends/cxd2820r.h
index cf0f546aa1d1..5aa306ebb7ef 100644
--- a/drivers/media/dvb/frontends/cxd2820r.h
+++ b/drivers/media/dvb/frontends/cxd2820r.h
@@ -77,14 +77,12 @@ struct cxd2820r_config {
         (defined(CONFIG_DVB_CXD2820R_MODULE) && defined(MODULE))
 extern struct dvb_frontend *cxd2820r_attach(
         const struct cxd2820r_config *config,
-        struct i2c_adapter *i2c,
-        struct dvb_frontend *fe
+        struct i2c_adapter *i2c
 );
 #else
 static inline struct dvb_frontend *cxd2820r_attach(
         const struct cxd2820r_config *config,
-        struct i2c_adapter *i2c,
-        struct dvb_frontend *fe
+        struct i2c_adapter *i2c
 )
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
diff --git a/drivers/media/dvb/frontends/cxd2820r_core.c b/drivers/media/dvb/frontends/cxd2820r_core.c
index caae7f79c837..5c7c2aaf9bf5 100644
--- a/drivers/media/dvb/frontends/cxd2820r_core.c
+++ b/drivers/media/dvb/frontends/cxd2820r_core.c
@@ -482,10 +482,19 @@ static enum dvbfe_search cxd2820r_search(struct dvb_frontend *fe)
 
         /* switch between DVB-T and DVB-T2 when tune fails */
         if (priv->last_tune_failed) {
-                if (priv->delivery_system == SYS_DVBT)
+                if (priv->delivery_system == SYS_DVBT) {
+                        ret = cxd2820r_sleep_t(fe);
+                        if (ret)
+                                goto error;
+
                         c->delivery_system = SYS_DVBT2;
-                else if (priv->delivery_system == SYS_DVBT2)
+                } else if (priv->delivery_system == SYS_DVBT2) {
+                        ret = cxd2820r_sleep_t2(fe);
+                        if (ret)
+                                goto error;
+
                         c->delivery_system = SYS_DVBT;
+                }
         }
 
         /* set frontend */
@@ -562,7 +571,7 @@ static const struct dvb_frontend_ops cxd2820r_ops = {
         .delsys = { SYS_DVBT, SYS_DVBT2, SYS_DVBC_ANNEX_A },
         /* default: DVB-T/T2 */
         .info = {
-                .name = "Sony CXD2820R (DVB-T/T2)",
+                .name = "Sony CXD2820R",
 
                 .caps = FE_CAN_FEC_1_2                  |
                         FE_CAN_FEC_2_3                  |
@@ -572,7 +581,9 @@ static const struct dvb_frontend_ops cxd2820r_ops = {
                         FE_CAN_FEC_AUTO                 |
                         FE_CAN_QPSK                     |
                         FE_CAN_QAM_16                   |
+                        FE_CAN_QAM_32                   |
                         FE_CAN_QAM_64                   |
+                        FE_CAN_QAM_128                  |
                         FE_CAN_QAM_256                  |
                         FE_CAN_QAM_AUTO                 |
                         FE_CAN_TRANSMISSION_MODE_AUTO   |
@@ -602,8 +613,7 @@ static const struct dvb_frontend_ops cxd2820r_ops = {
 };
 
 struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,
-                                     struct i2c_adapter *i2c,
-                                     struct dvb_frontend *fe)
+                struct i2c_adapter *i2c)
 {
         struct cxd2820r_priv *priv = NULL;
         int ret;
diff --git a/drivers/media/radio/wl128x/Kconfig b/drivers/media/radio/wl128x/Kconfig
index 86b28579f0c7..ea1e6545df36 100644
--- a/drivers/media/radio/wl128x/Kconfig
+++ b/drivers/media/radio/wl128x/Kconfig
@@ -4,8 +4,8 @@
 menu "Texas Instruments WL128x FM driver (ST based)"
 config RADIO_WL128X
         tristate "Texas Instruments WL128x FM Radio"
-        depends on VIDEO_V4L2 && RFKILL
-        select TI_ST if NET && GPIOLIB
+        depends on VIDEO_V4L2 && RFKILL && GPIOLIB
+        select TI_ST if NET
         help
         Choose Y here if you have this FM radio chip.
 
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 3aeb29a7ce11..7f26fdf2e54e 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -47,7 +47,7 @@
 #define MOD_AUTHOR      "Jarod Wilson <jarod@wilsonet.com>"
 #define MOD_DESC        "Driver for SoundGraph iMON MultiMedia IR/Display"
 #define MOD_NAME        "imon"
-#define MOD_VERSION     "0.9.3"
+#define MOD_VERSION     "0.9.4"
 
 #define DISPLAY_MINOR_BASE      144
 #define DEVICE_NAME     "lcd%d"
@@ -1658,9 +1658,17 @@ static void usb_rx_callback_intf0(struct urb *urb)
                 return;
 
         ictx = (struct imon_context *)urb->context;
-        if (!ictx || !ictx->dev_present_intf0)
+        if (!ictx)
                 return;
 
+        /*
+         * if we get a callback before we're done configuring the hardware, we
+         * can't yet process the data, as there's nowhere to send it, but we
+         * still need to submit a new rx URB to avoid wedging the hardware
+         */
+        if (!ictx->dev_present_intf0)
+                goto out;
+
         switch (urb->status) {
         case -ENOENT:           /* usbcore unlink successful! */
                 return;
@@ -1678,6 +1686,7 @@ static void usb_rx_callback_intf0(struct urb *urb)
                 break;
         }
 
+out:
         usb_submit_urb(ictx->rx_urb_intf0, GFP_ATOMIC);
 }
 
@@ -1690,9 +1699,17 @@ static void usb_rx_callback_intf1(struct urb *urb)
                 return;
 
         ictx = (struct imon_context *)urb->context;
-        if (!ictx || !ictx->dev_present_intf1)
+        if (!ictx)
                 return;
 
+        /*
+         * if we get a callback before we're done configuring the hardware, we
+         * can't yet process the data, as there's nowhere to send it, but we
+         * still need to submit a new rx URB to avoid wedging the hardware
+         */
+        if (!ictx->dev_present_intf1)
+                goto out;
+
         switch (urb->status) {
         case -ENOENT:           /* usbcore unlink successful! */
                 return;
@@ -1710,6 +1727,7 @@ static void usb_rx_callback_intf1(struct urb *urb)
                 break;
         }
 
+out:
         usb_submit_urb(ictx->rx_urb_intf1, GFP_ATOMIC);
 }
 
@@ -2242,7 +2260,7 @@ find_endpoint_failed:
         mutex_unlock(&ictx->lock);
         usb_free_urb(rx_urb);
 rx_urb_alloc_failed:
-        dev_err(ictx->dev, "unable to initialize intf0, err %d\n", ret);
+        dev_err(ictx->dev, "unable to initialize intf1, err %d\n", ret);
 
         return NULL;
 }
diff --git a/drivers/media/video/atmel-isi.c b/drivers/media/video/atmel-isi.c
index 9fe4519176a4..ec3f6a06f9c3 100644
--- a/drivers/media/video/atmel-isi.c
+++ b/drivers/media/video/atmel-isi.c
@@ -922,7 +922,9 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev)
                         isi->fb_descriptors_phys);
 
         iounmap(isi->regs);
+        clk_unprepare(isi->mck);
         clk_put(isi->mck);
+        clk_unprepare(isi->pclk);
         clk_put(isi->pclk);
         kfree(isi);
 
@@ -955,6 +957,10 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
         if (IS_ERR(pclk))
                 return PTR_ERR(pclk);
 
+        ret = clk_prepare(pclk);
+        if (ret)
+                goto err_clk_prepare_pclk;
+
         isi = kzalloc(sizeof(struct atmel_isi), GFP_KERNEL);
         if (!isi) {
                 ret = -ENOMEM;
@@ -978,6 +984,10 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
                 goto err_clk_get;
         }
 
+        ret = clk_prepare(isi->mck);
+        if (ret)
+                goto err_clk_prepare_mck;
+
         /* Set ISI_MCK's frequency, it should be faster than pixel clock */
         ret = clk_set_rate(isi->mck, pdata->mck_hz);
         if (ret < 0)
@@ -1059,10 +1069,14 @@ err_alloc_ctx:
                         isi->fb_descriptors_phys);
 err_alloc_descriptors:
 err_set_mck_rate:
+        clk_unprepare(isi->mck);
+err_clk_prepare_mck:
         clk_put(isi->mck);
 err_clk_get:
         kfree(isi);
 err_alloc_isi:
+        clk_unprepare(pclk);
+err_clk_prepare_pclk:
         clk_put(pclk);
 
         return ret;
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 9449423098e0..aabbf4854f66 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -853,8 +853,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
         case EM28174_BOARD_PCTV_290E:
                 dvb->fe[0] = dvb_attach(cxd2820r_attach,
                                         &em28xx_cxd2820r_config,
-                                        &dev->i2c_adap,
-                                        NULL);
+                                        &dev->i2c_adap);
                 if (dvb->fe[0]) {
                         /* FE 0 attach tuner */
                         if (!dvb_attach(tda18271_attach,
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
index e5eb56a5b618..6510110f53d0 100644
--- a/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/drivers/media/video/hdpvr/hdpvr-core.c
@@ -154,10 +154,20 @@ static int device_authorization(struct hdpvr_device *dev)
         }
 #endif
 
+        dev->fw_ver = dev->usbc_buf[1];
+
         v4l2_info(&dev->v4l2_dev, "firmware version 0x%x dated %s\n",
-                          dev->usbc_buf[1], &dev->usbc_buf[2]);
+                          dev->fw_ver, &dev->usbc_buf[2]);
+
+        if (dev->fw_ver > 0x15) {
+                dev->options.brightness = 0x80;
+                dev->options.contrast   = 0x40;
+                dev->options.hue        = 0xf;
+                dev->options.saturation = 0x40;
+                dev->options.sharpness  = 0x80;
+        }
 
-        switch (dev->usbc_buf[1]) {
+        switch (dev->fw_ver) {
         case HDPVR_FIRMWARE_VERSION:
                 dev->flags &= ~HDPVR_FLAG_AC3_CAP;
                 break;
@@ -169,7 +179,7 @@ static int device_authorization(struct hdpvr_device *dev)
         default:
                 v4l2_info(&dev->v4l2_dev, "untested firmware, the driver might"
                           " not work.\n");
-                if (dev->usbc_buf[1] >= HDPVR_FIRMWARE_VERSION_AC3)
+                if (dev->fw_ver >= HDPVR_FIRMWARE_VERSION_AC3)
                         dev->flags |= HDPVR_FLAG_AC3_CAP;
                 else
                         dev->flags &= ~HDPVR_FLAG_AC3_CAP;
@@ -270,6 +280,8 @@ static const struct hdpvr_options hdpvr_default_options = {
         .bitrate_mode   = HDPVR_CONSTANT,
         .gop_mode       = HDPVR_SIMPLE_IDR_GOP,
         .audio_codec    = V4L2_MPEG_AUDIO_ENCODING_AAC,
+        /* original picture controls for firmware version <= 0x15 */
+        /* updated in device_authorization() for newer firmware */
         .brightness     = 0x86,
         .contrast       = 0x80,
         .hue            = 0x80,
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
index 087f7c08cb85..11ffe9cc1780 100644
--- a/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/drivers/media/video/hdpvr/hdpvr-video.c
@@ -283,12 +283,13 @@ static int hdpvr_start_streaming(struct hdpvr_device *dev)
 
                 hdpvr_config_call(dev, CTRL_START_STREAMING_VALUE, 0x00);
 
+                dev->status = STATUS_STREAMING;
+
                 INIT_WORK(&dev->worker, hdpvr_transmit_buffers);
                 queue_work(dev->workqueue, &dev->worker);
 
                 v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev,
                          "streaming started\n");
-                dev->status = STATUS_STREAMING;
 
                 return 0;
         }
@@ -722,21 +723,39 @@ static const s32 supported_v4l2_ctrls[] = {
 };
 
 static int fill_queryctrl(struct hdpvr_options *opt, struct v4l2_queryctrl *qc,
-                          int ac3)
+                          int ac3, int fw_ver)
 {
         int err;
 
+        if (fw_ver > 0x15) {
+                switch (qc->id) {
+                case V4L2_CID_BRIGHTNESS:
+                        return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
+                case V4L2_CID_CONTRAST:
+                        return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x40);
+                case V4L2_CID_SATURATION:
+                        return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x40);
+                case V4L2_CID_HUE:
+                        return v4l2_ctrl_query_fill(qc, 0x0, 0x1e, 1, 0xf);
+                case V4L2_CID_SHARPNESS:
+                        return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
+                }
+        } else {
+                switch (qc->id) {
+                case V4L2_CID_BRIGHTNESS:
+                        return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x86);
+                case V4L2_CID_CONTRAST:
+                        return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
+                case V4L2_CID_SATURATION:
+                        return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
+                case V4L2_CID_HUE:
+                        return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
+                case V4L2_CID_SHARPNESS:
+                        return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
+                }
+        }
+
         switch (qc->id) {
-        case V4L2_CID_BRIGHTNESS:
-                return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x86);
-        case V4L2_CID_CONTRAST:
-                return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
-        case V4L2_CID_SATURATION:
-                return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
-        case V4L2_CID_HUE:
-                return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
-        case V4L2_CID_SHARPNESS:
-                return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
         case V4L2_CID_MPEG_AUDIO_ENCODING:
                 return v4l2_ctrl_query_fill(
                         qc, V4L2_MPEG_AUDIO_ENCODING_AAC,
@@ -794,7 +813,8 @@ static int vidioc_queryctrl(struct file *file, void *private_data,
 
                 if (qc->id == supported_v4l2_ctrls[i])
                         return fill_queryctrl(&dev->options, qc,
-                                              dev->flags & HDPVR_FLAG_AC3_CAP);
+                                              dev->flags & HDPVR_FLAG_AC3_CAP,
+                                              dev->fw_ver);
 
                 if (qc->id < supported_v4l2_ctrls[i])
                         break;
diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
index d6439db1d18b..fea3c6926997 100644
--- a/drivers/media/video/hdpvr/hdpvr.h
+++ b/drivers/media/video/hdpvr/hdpvr.h
@@ -113,6 +113,7 @@ struct hdpvr_device {
         /* usb control transfer buffer and lock */
         struct mutex            usbc_mutex;
         u8                      *usbc_buf;
+        u8                      fw_ver;
 };
 
 static inline struct hdpvr_device *to_hdpvr_dev(struct v4l2_device *v4l2_dev)
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c
index a74a79701d34..eaabc27f0fa2 100644
--- a/drivers/media/video/omap3isp/ispccdc.c
+++ b/drivers/media/video/omap3isp/ispccdc.c
@@ -1407,7 +1407,7 @@ static int __ccdc_handle_stopping(struct isp_ccdc_device *ccdc, u32 event)
 static void ccdc_hs_vs_isr(struct isp_ccdc_device *ccdc)
 {
         struct isp_pipeline *pipe = to_isp_pipeline(&ccdc->subdev.entity);
-        struct video_device *vdev = &ccdc->subdev.devnode;
+        struct video_device *vdev = ccdc->subdev.devnode;
         struct v4l2_event event;
 
         memset(&event, 0, sizeof(event));
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index cd13e9f2f5e6..f147395bac9a 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -200,7 +200,7 @@ config MENELAUS
 
 config TWL4030_CORE
         bool "Texas Instruments TWL4030/TWL5030/TWL6030/TPS659x0 Support"
-        depends on I2C=y && GENERIC_HARDIRQS && IRQ_DOMAIN
+        depends on I2C=y && GENERIC_HARDIRQS
         help
           Say yes here if you have TWL4030 / TWL6030 family chip on your board.
           This core driver provides register access and IRQ handling
diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c
index 63be60bc3455..86cc3f7841cd 100644
--- a/drivers/mfd/mcp-core.c
+++ b/drivers/mfd/mcp-core.c
@@ -26,35 +26,9 @@
 #define to_mcp(d)               container_of(d, struct mcp, attached_device)
 #define to_mcp_driver(d)        container_of(d, struct mcp_driver, drv)
 
-static const struct mcp_device_id *mcp_match_id(const struct mcp_device_id *id,
-                                                const char *codec)
-{
-        while (id->name[0]) {
-                if (strcmp(codec, id->name) == 0)
-                        return id;
-                id++;
-        }
-        return NULL;
-}
-
-const struct mcp_device_id *mcp_get_device_id(const struct mcp *mcp)
-{
-        const struct mcp_driver *driver =
-                to_mcp_driver(mcp->attached_device.driver);
-
-        return mcp_match_id(driver->id_table, mcp->codec);
-}
-EXPORT_SYMBOL(mcp_get_device_id);
-
 static int mcp_bus_match(struct device *dev, struct device_driver *drv)
 {
-        const struct mcp *mcp = to_mcp(dev);
-        const struct mcp_driver *driver = to_mcp_driver(drv);
-
-        if (driver->id_table)
-                return !!mcp_match_id(driver->id_table, mcp->codec);
-
-        return 0;
+        return 1;
 }
 
 static int mcp_bus_probe(struct device *dev)
@@ -100,18 +74,9 @@ static int mcp_bus_resume(struct device *dev)
         return ret;
 }
 
-static int mcp_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-        struct mcp *mcp = to_mcp(dev);
-
-        add_uevent_var(env, "MODALIAS=%s%s", MCP_MODULE_PREFIX, mcp->codec);
-        return 0;
-}
-
 static struct bus_type mcp_bus_type = {
         .name           = "mcp",
         .match          = mcp_bus_match,
-        .uevent         = mcp_bus_uevent,
         .probe          = mcp_bus_probe,
         .remove         = mcp_bus_remove,
         .suspend        = mcp_bus_suspend,
@@ -128,9 +93,11 @@ static struct bus_type mcp_bus_type = {
  */
 void mcp_set_telecom_divisor(struct mcp *mcp, unsigned int div)
 {
-        spin_lock_irq(&mcp->lock);
+        unsigned long flags;
+
+        spin_lock_irqsave(&mcp->lock, flags);
         mcp->ops->set_telecom_divisor(mcp, div);
-        spin_unlock_irq(&mcp->lock);
+        spin_unlock_irqrestore(&mcp->lock, flags);
 }
 EXPORT_SYMBOL(mcp_set_telecom_divisor);
 
@@ -143,9 +110,11 @@ EXPORT_SYMBOL(mcp_set_telecom_divisor);
  */
 void mcp_set_audio_divisor(struct mcp *mcp, unsigned int div)
 {
-        spin_lock_irq(&mcp->lock);
+        unsigned long flags;
+
+        spin_lock_irqsave(&mcp->lock, flags);
         mcp->ops->set_audio_divisor(mcp, div);
-        spin_unlock_irq(&mcp->lock);
+        spin_unlock_irqrestore(&mcp->lock, flags);
 }
 EXPORT_SYMBOL(mcp_set_audio_divisor);
 
@@ -198,10 +167,11 @@ EXPORT_SYMBOL(mcp_reg_read);
  */
 void mcp_enable(struct mcp *mcp)
 {
-        spin_lock_irq(&mcp->lock);
+        unsigned long flags;
+        spin_lock_irqsave(&mcp->lock, flags);
         if (mcp->use_count++ == 0)
                 mcp->ops->enable(mcp);
-        spin_unlock_irq(&mcp->lock);
+        spin_unlock_irqrestore(&mcp->lock, flags);
 }
 EXPORT_SYMBOL(mcp_enable);
 
@@ -247,14 +217,9 @@ struct mcp *mcp_host_alloc(struct device *parent, size_t size)
 }
 EXPORT_SYMBOL(mcp_host_alloc);
 
-int mcp_host_register(struct mcp *mcp, void *pdata)
+int mcp_host_register(struct mcp *mcp)
 {
-        if (!mcp->codec)
-                return -EINVAL;
-
-        mcp->attached_device.platform_data = pdata;
         dev_set_name(&mcp->attached_device, "mcp0");
-        request_module("%s%s", MCP_MODULE_PREFIX, mcp->codec);
         return device_register(&mcp->attached_device);
 }
 EXPORT_SYMBOL(mcp_host_register);
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
index 9adc2eb69492..02c53a0766c4 100644
--- a/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@ -19,7 +19,6 @@
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/mcp.h>
-#include <linux/io.h>
 
 #include <mach/dma.h>
 #include <mach/hardware.h>
@@ -27,19 +26,12 @@
 #include <asm/system.h>
 #include <mach/mcp.h>
 
-/* Register offsets */
-#define MCCR0   0x00
-#define MCDR0   0x08
-#define MCDR1   0x0C
-#define MCDR2   0x10
-#define MCSR    0x18
-#define MCCR1   0x00
+#include <mach/assabet.h>
+
 
 struct mcp_sa11x0 {
-        u32             mccr0;
-        u32             mccr1;
-        unsigned char   *mccr0_base;
-        unsigned char   *mccr1_base;
+        u32     mccr0;
+        u32     mccr1;
 };
 
 #define priv(mcp)       ((struct mcp_sa11x0 *)mcp_priv(mcp))
@@ -47,25 +39,25 @@ struct mcp_sa11x0 {
 static void
 mcp_sa11x0_set_telecom_divisor(struct mcp *mcp, unsigned int divisor)
 {
-        struct mcp_sa11x0 *priv = priv(mcp);
+        unsigned int mccr0;
 
         divisor /= 32;
 
-        priv->mccr0 &= ~0x00007f00;
-        priv->mccr0 |= divisor << 8;
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
+        mccr0 = Ser4MCCR0 & ~0x00007f00;
+        mccr0 |= divisor << 8;
+        Ser4MCCR0 = mccr0;
 }
 
 static void
 mcp_sa11x0_set_audio_divisor(struct mcp *mcp, unsigned int divisor)
 {
-        struct mcp_sa11x0 *priv = priv(mcp);
+        unsigned int mccr0;
 
         divisor /= 32;
 
-        priv->mccr0 &= ~0x0000007f;
-        priv->mccr0 |= divisor;
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
+        mccr0 = Ser4MCCR0 & ~0x0000007f;
+        mccr0 |= divisor;
+        Ser4MCCR0 = mccr0;
 }
 
 /*
@@ -79,16 +71,12 @@ mcp_sa11x0_write(struct mcp *mcp, unsigned int reg, unsigned int val)
 {
         int ret = -ETIME;
         int i;
-        u32 mcpreg;
-        struct mcp_sa11x0 *priv = priv(mcp);
 
-        mcpreg = reg << 17 | MCDR2_Wr | (val & 0xffff);
-        __raw_writel(mcpreg, priv->mccr0_base + MCDR2);
+        Ser4MCDR2 = reg << 17 | MCDR2_Wr | (val & 0xffff);
 
         for (i = 0; i < 2; i++) {
                 udelay(mcp->rw_timeout);
-                mcpreg = __raw_readl(priv->mccr0_base + MCSR);
-                if (mcpreg & MCSR_CWC) {
+                if (Ser4MCSR & MCSR_CWC) {
                         ret = 0;
                         break;
                 }
@@ -109,18 +97,13 @@ mcp_sa11x0_read(struct mcp *mcp, unsigned int reg)
 {
         int ret = -ETIME;
         int i;
-        u32 mcpreg;
-        struct mcp_sa11x0 *priv = priv(mcp);
 
-        mcpreg = reg << 17 | MCDR2_Rd;
-        __raw_writel(mcpreg, priv->mccr0_base + MCDR2);
+        Ser4MCDR2 = reg << 17 | MCDR2_Rd;
 
         for (i = 0; i < 2; i++) {
                 udelay(mcp->rw_timeout);
-                mcpreg = __raw_readl(priv->mccr0_base + MCSR);
-                if (mcpreg & MCSR_CRC) {
-                        ret = __raw_readl(priv->mccr0_base + MCDR2)
-                                & 0xffff;
+                if (Ser4MCSR & MCSR_CRC) {
+                        ret = Ser4MCDR2 & 0xffff;
                         break;
                 }
         }
@@ -133,19 +116,13 @@ mcp_sa11x0_read(struct mcp *mcp, unsigned int reg)
 
 static void mcp_sa11x0_enable(struct mcp *mcp)
 {
-        struct mcp_sa11x0 *priv = priv(mcp);
-
-        __raw_writel(-1, priv->mccr0_base + MCSR);
-        priv->mccr0 |= MCCR0_MCE;
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
+        Ser4MCSR = -1;
+        Ser4MCCR0 |= MCCR0_MCE;
 }
 
 static void mcp_sa11x0_disable(struct mcp *mcp)
 {
-        struct mcp_sa11x0 *priv = priv(mcp);
-
-        priv->mccr0 &= ~MCCR0_MCE;
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
+        Ser4MCCR0 &= ~MCCR0_MCE;
 }
 
 /*
@@ -165,69 +142,50 @@ static int mcp_sa11x0_probe(struct platform_device *pdev)
         struct mcp_plat_data *data = pdev->dev.platform_data;
         struct mcp *mcp;
         int ret;
-        struct mcp_sa11x0 *priv;
-        struct resource *res_mem0, *res_mem1;
-        u32 size0, size1;
 
         if (!data)
                 return -ENODEV;
 
-        if (!data->codec)
-                return -ENODEV;
-
-        res_mem0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res_mem0)
-                return -ENODEV;
-        size0 = res_mem0->end - res_mem0->start + 1;
-
-        res_mem1 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        if (!res_mem1)
-                return -ENODEV;
-        size1 = res_mem1->end - res_mem1->start + 1;
-
-        if (!request_mem_region(res_mem0->start, size0, "sa11x0-mcp"))
+        if (!request_mem_region(0x80060000, 0x60, "sa11x0-mcp"))
                 return -EBUSY;
 
-        if (!request_mem_region(res_mem1->start, size1, "sa11x0-mcp")) {
-                ret = -EBUSY;
-                goto release;
-        }
-
         mcp = mcp_host_alloc(&pdev->dev, sizeof(struct mcp_sa11x0));
         if (!mcp) {
                 ret = -ENOMEM;
-                goto release2;
+                goto release;
         }
 
-        priv = priv(mcp);
-
         mcp->owner              = THIS_MODULE;
         mcp->ops                = &mcp_sa11x0;
         mcp->sclk_rate          = data->sclk_rate;
-        mcp->dma_audio_rd       = DDAR_DevAdd(res_mem0->start + MCDR0)
-                                + DDAR_DevRd + DDAR_Brst4 + DDAR_8BitDev;
-        mcp->dma_audio_wr       = DDAR_DevAdd(res_mem0->start + MCDR0)
-                                + DDAR_DevWr + DDAR_Brst4 + DDAR_8BitDev;
-        mcp->dma_telco_rd       = DDAR_DevAdd(res_mem0->start + MCDR1)
-                                + DDAR_DevRd + DDAR_Brst4 + DDAR_8BitDev;
-        mcp->dma_telco_wr       = DDAR_DevAdd(res_mem0->start + MCDR1)
-                                + DDAR_DevWr + DDAR_Brst4 + DDAR_8BitDev;
-        mcp->codec              = data->codec;
+        mcp->dma_audio_rd       = DMA_Ser4MCP0Rd;
+        mcp->dma_audio_wr       = DMA_Ser4MCP0Wr;
+        mcp->dma_telco_rd       = DMA_Ser4MCP1Rd;
+        mcp->dma_telco_wr       = DMA_Ser4MCP1Wr;
+        mcp->gpio_base          = data->gpio_base;
 
         platform_set_drvdata(pdev, mcp);
 
+        if (machine_is_assabet()) {
+                ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);
+        }
+
+        /*
+         * Setup the PPC unit correctly.
+         */
+        PPDR &= ~PPC_RXD4;
+        PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;
+        PSDR |= PPC_RXD4;
+        PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
+        PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
+
         /*
          * Initialise device.  Note that we initially
          * set the sampling rate to minimum.
          */
-        priv->mccr0_base = ioremap(res_mem0->start, size0);
-        priv->mccr1_base = ioremap(res_mem1->start, size1);
-
-        __raw_writel(-1, priv->mccr0_base + MCSR);
-        priv->mccr1 = data->mccr1;
-        priv->mccr0 = data->mccr0 | 0x7f7f;
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
-        __raw_writel(priv->mccr1, priv->mccr1_base + MCCR1);
+        Ser4MCSR = -1;
+        Ser4MCCR1 = data->mccr1;
+        Ser4MCCR0 = data->mccr0 | 0x7f7f;
 
         /*
          * Calculate the read/write timeout (us) from the bit clock
@@ -237,53 +195,36 @@ static int mcp_sa11x0_probe(struct platform_device *pdev)
         mcp->rw_timeout = (64 * 3 * 1000000 + mcp->sclk_rate - 1) /
                           mcp->sclk_rate;
 
-        ret = mcp_host_register(mcp, data->codec_pdata);
+        ret = mcp_host_register(mcp);
         if (ret == 0)
                 goto out;
 
- release2:
-        release_mem_region(res_mem1->start, size1);
  release:
-        release_mem_region(res_mem0->start, size0);
+        release_mem_region(0x80060000, 0x60);
         platform_set_drvdata(pdev, NULL);
 
  out:
         return ret;
 }
 
-static int mcp_sa11x0_remove(struct platform_device *pdev)
+static int mcp_sa11x0_remove(struct platform_device *dev)
 {
-        struct mcp *mcp = platform_get_drvdata(pdev);
-        struct mcp_sa11x0 *priv = priv(mcp);
-        struct resource *res_mem;
-        u32 size;
+        struct mcp *mcp = platform_get_drvdata(dev);
 
-        platform_set_drvdata(pdev, NULL);
+        platform_set_drvdata(dev, NULL);
         mcp_host_unregister(mcp);
+        release_mem_region(0x80060000, 0x60);
 
-        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res_mem) {
-                size = res_mem->end - res_mem->start + 1;
-                release_mem_region(res_mem->start, size);
-        }
-        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        if (res_mem) {
-                size = res_mem->end - res_mem->start + 1;
-                release_mem_region(res_mem->start, size);
-        }
-        iounmap(priv->mccr0_base);
-        iounmap(priv->mccr1_base);
         return 0;
 }
 
 static int mcp_sa11x0_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct mcp *mcp = platform_get_drvdata(dev);
-        struct mcp_sa11x0 *priv = priv(mcp);
-        u32 mccr0;
 
-        mccr0 = priv->mccr0 & ~MCCR0_MCE;
-        __raw_writel(mccr0, priv->mccr0_base + MCCR0);
+        priv(mcp)->mccr0 = Ser4MCCR0;
+        priv(mcp)->mccr1 = Ser4MCCR1;
+        Ser4MCCR0 &= ~MCCR0_MCE;
 
         return 0;
 }
@@ -291,10 +232,9 @@ static int mcp_sa11x0_suspend(struct platform_device *dev, pm_message_t state)
 static int mcp_sa11x0_resume(struct platform_device *dev)
 {
         struct mcp *mcp = platform_get_drvdata(dev);
-        struct mcp_sa11x0 *priv = priv(mcp);
 
-        __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0);
-        __raw_writel(priv->mccr1, priv->mccr1_base + MCCR1);
+        Ser4MCCR1 = priv(mcp)->mccr1;
+        Ser4MCCR0 = priv(mcp)->mccr0;
 
         return 0;
 }
@@ -311,7 +251,6 @@ static struct platform_driver mcp_sa11x0_driver = {
         .resume         = mcp_sa11x0_resume,
         .driver         = {
                 .name   = "sa11x0-mcp",
-                .owner  = THIS_MODULE,
         },
 };
 
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index e04e04ddc15e..8ce3959c6919 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -263,7 +263,9 @@ struct twl_client {
 
 static struct twl_client twl_modules[TWL_NUM_SLAVES];
 
+#ifdef CONFIG_IRQ_DOMAIN
 static struct irq_domain domain;
+#endif
 
 /* mapping the module id to slave id and base address */
 struct twl_mapping {
@@ -1226,13 +1228,13 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
         pdata->irq_base = status;
         pdata->irq_end = pdata->irq_base + nr_irqs;
 
+#ifdef CONFIG_IRQ_DOMAIN
         domain.irq_base = pdata->irq_base;
         domain.nr_irq = nr_irqs;
-#ifdef CONFIG_OF_IRQ
         domain.of_node = of_node_get(node);
         domain.ops = &irq_domain_simple_ops;
-#endif
         irq_domain_add(&domain);
+#endif
 
         if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C) == 0) {
                 dev_dbg(&client->dev, "can't talk I2C?\n");
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index d905f5171153..79ca33dfacca 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -124,7 +124,7 @@ static u8 res_config_addrs[] = {
         [RES_MAIN_REF]  = 0x94,
 };
 
-static int __init twl4030_write_script_byte(u8 address, u8 byte)
+static int __devinit twl4030_write_script_byte(u8 address, u8 byte)
 {
         int err;
 
@@ -138,7 +138,7 @@ out:
         return err;
 }
 
-static int __init twl4030_write_script_ins(u8 address, u16 pmb_message,
+static int __devinit twl4030_write_script_ins(u8 address, u16 pmb_message,
                                            u8 delay, u8 next)
 {
         int err;
@@ -158,7 +158,7 @@ out:
         return err;
 }
 
-static int __init twl4030_write_script(u8 address, struct twl4030_ins *script,
+static int __devinit twl4030_write_script(u8 address, struct twl4030_ins *script,
                                        int len)
 {
         int err;
@@ -183,7 +183,7 @@ static int __init twl4030_write_script(u8 address, struct twl4030_ins *script,
         return err;
 }
 
-static int __init twl4030_config_wakeup3_sequence(u8 address)
+static int __devinit twl4030_config_wakeup3_sequence(u8 address)
 {
         int err;
         u8 data;
@@ -208,7 +208,7 @@ out:
         return err;
 }
 
-static int __init twl4030_config_wakeup12_sequence(u8 address)
+static int __devinit twl4030_config_wakeup12_sequence(u8 address)
 {
         int err = 0;
         u8 data;
@@ -262,7 +262,7 @@ out:
         return err;
 }
 
-static int __init twl4030_config_sleep_sequence(u8 address)
+static int __devinit twl4030_config_sleep_sequence(u8 address)
 {
         int err;
 
@@ -276,7 +276,7 @@ static int __init twl4030_config_sleep_sequence(u8 address)
         return err;
 }
 
-static int __init twl4030_config_warmreset_sequence(u8 address)
+static int __devinit twl4030_config_warmreset_sequence(u8 address)
 {
         int err;
         u8 rd_data;
@@ -324,7 +324,7 @@ out:
         return err;
 }
 
-static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
+static int __devinit twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 {
         int rconfig_addr;
         int err;
@@ -416,7 +416,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
         return 0;
 }
 
-static int __init load_twl4030_script(struct twl4030_script *tscript,
+static int __devinit load_twl4030_script(struct twl4030_script *tscript,
                u8 address)
 {
         int err;
@@ -527,7 +527,7 @@ void twl4030_power_off(void)
                 pr_err("TWL4030 Unable to power off\n");
 }
 
-void __init twl4030_power_init(struct twl4030_power_data *twl4030_scripts)
+void __devinit twl4030_power_init(struct twl4030_power_data *twl4030_scripts)
 {
         int err = 0;
         int i;
diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index dda86293dc9f..b2d8e512d3cb 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -282,6 +282,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
                 /* Default PLL configuration after power up */
                 twl6040->pll = TWL6040_SYSCLK_SEL_LPPLL;
                 twl6040->sysclk = 19200000;
+                twl6040->mclk = 32768;
         } else {
                 /* already powered-down */
                 if (!twl6040->power_count) {
@@ -305,6 +306,7 @@ int twl6040_power(struct twl6040 *twl6040, int on)
                         twl6040_power_down(twl6040);
                 }
                 twl6040->sysclk = 0;
+                twl6040->mclk = 0;
         }
 
 out:
@@ -324,23 +326,38 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
         hppllctl = twl6040_reg_read(twl6040, TWL6040_REG_HPPLLCTL);
         lppllctl = twl6040_reg_read(twl6040, TWL6040_REG_LPPLLCTL);
 
+        /* Force full reconfiguration when switching between PLL */
+        if (pll_id != twl6040->pll) {
+                twl6040->sysclk = 0;
+                twl6040->mclk = 0;
+        }
+
         switch (pll_id) {
         case TWL6040_SYSCLK_SEL_LPPLL:
                 /* low-power PLL divider */
-                switch (freq_out) {
-                case 17640000:
-                        lppllctl |= TWL6040_LPLLFIN;
-                        break;
-                case 19200000:
-                        lppllctl &= ~TWL6040_LPLLFIN;
-                        break;
-                default:
-                        dev_err(twl6040->dev,
-                                "freq_out %d not supported\n", freq_out);
-                        ret = -EINVAL;
-                        goto pll_out;
+                /* Change the sysclk configuration only if it has been canged */
+                if (twl6040->sysclk != freq_out) {
+                        switch (freq_out) {
+                        case 17640000:
+                                lppllctl |= TWL6040_LPLLFIN;
+                                break;
+                        case 19200000:
+                                lppllctl &= ~TWL6040_LPLLFIN;
+                                break;
+                        default:
+                                dev_err(twl6040->dev,
+                                        "freq_out %d not supported\n",
+                                        freq_out);
+                                ret = -EINVAL;
+                                goto pll_out;
+                        }
+                        twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL,
+                                          lppllctl);
                 }
-                twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL, lppllctl);
+
+                /* The PLL in use has not been change, we can exit */
+                if (twl6040->pll == pll_id)
+                        break;
 
                 switch (freq_in) {
                 case 32768:
@@ -371,48 +388,56 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
                         goto pll_out;
                 }
 
-                hppllctl &= ~TWL6040_MCLK_MSK;
+                if (twl6040->mclk != freq_in) {
+                        hppllctl &= ~TWL6040_MCLK_MSK;
+
+                        switch (freq_in) {
+                        case 12000000:
+                                /* PLL enabled, active mode */
+                                hppllctl |= TWL6040_MCLK_12000KHZ |
+                                            TWL6040_HPLLENA;
+                                break;
+                        case 19200000:
+                                /*
+                                * PLL disabled
+                                * (enable PLL if MCLK jitter quality
+                                *  doesn't meet specification)
+                                */
+                                hppllctl |= TWL6040_MCLK_19200KHZ;
+                                break;
+                        case 26000000:
+                                /* PLL enabled, active mode */
+                                hppllctl |= TWL6040_MCLK_26000KHZ |
+                                            TWL6040_HPLLENA;
+                                break;
+                        case 38400000:
+                                /* PLL enabled, active mode */
+                                hppllctl |= TWL6040_MCLK_38400KHZ |
+                                            TWL6040_HPLLENA;
+                                break;
+                        default:
+                                dev_err(twl6040->dev,
+                                        "freq_in %d not supported\n", freq_in);
+                                ret = -EINVAL;
+                                goto pll_out;
+                        }
 
-                switch (freq_in) {
-                case 12000000:
-                        /* PLL enabled, active mode */
-                        hppllctl |= TWL6040_MCLK_12000KHZ |
-                                    TWL6040_HPLLENA;
-                        break;
-                case 19200000:
                         /*
-                         * PLL disabled
-                         * (enable PLL if MCLK jitter quality
-                         *  doesn't meet specification)
+                         * enable clock slicer to ensure input waveform is
+                         * square
                          */
-                        hppllctl |= TWL6040_MCLK_19200KHZ;
-                        break;
-                case 26000000:
-                        /* PLL enabled, active mode */
-                        hppllctl |= TWL6040_MCLK_26000KHZ |
-                                    TWL6040_HPLLENA;
-                        break;
-                case 38400000:
-                        /* PLL enabled, active mode */
-                        hppllctl |= TWL6040_MCLK_38400KHZ |
-                                    TWL6040_HPLLENA;
-                        break;
-                default:
-                        dev_err(twl6040->dev,
-                                "freq_in %d not supported\n", freq_in);
-                        ret = -EINVAL;
-                        goto pll_out;
-                }
+                        hppllctl |= TWL6040_HPLLSQRENA;
 
-                /* enable clock slicer to ensure input waveform is square */
-                hppllctl |= TWL6040_HPLLSQRENA;
-
-                twl6040_reg_write(twl6040, TWL6040_REG_HPPLLCTL, hppllctl);
-                usleep_range(500, 700);
-                lppllctl |= TWL6040_HPLLSEL;
-                twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL, lppllctl);
-                lppllctl &= ~TWL6040_LPLLENA;
-                twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL, lppllctl);
+                        twl6040_reg_write(twl6040, TWL6040_REG_HPPLLCTL,
+                                          hppllctl);
+                        usleep_range(500, 700);
+                        lppllctl |= TWL6040_HPLLSEL;
+                        twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL,
+                                          lppllctl);
+                        lppllctl &= ~TWL6040_LPLLENA;
+                        twl6040_reg_write(twl6040, TWL6040_REG_LPPLLCTL,
+                                          lppllctl);
+                }
                 break;
         default:
                 dev_err(twl6040->dev, "unknown pll id %d\n", pll_id);
@@ -421,6 +446,7 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id,
         }
 
         twl6040->sysclk = freq_out;
+        twl6040->mclk = freq_in;
         twl6040->pll = pll_id;
 
 pll_out:
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 91c4f25e0e55..febc90cdef7e 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -36,15 +36,6 @@ static DEFINE_MUTEX(ucb1x00_mutex);
 static LIST_HEAD(ucb1x00_drivers);
 static LIST_HEAD(ucb1x00_devices);
 
-static struct mcp_device_id ucb1x00_id[] = {
-        { "ucb1x00", 0 },  /* auto-detection */
-        { "ucb1200", UCB_ID_1200 },
-        { "ucb1300", UCB_ID_1300 },
-        { "tc35143", UCB_ID_TC35143 },
-        { }
-};
-MODULE_DEVICE_TABLE(mcp, ucb1x00_id);
-
 /**
  *      ucb1x00_io_set_dir - set IO direction
  *      @ucb: UCB1x00 structure describing chip
@@ -157,16 +148,22 @@ static int ucb1x00_gpio_direction_output(struct gpio_chip *chip, unsigned offset
 {
         struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
         unsigned long flags;
+        unsigned old, mask = 1 << offset;
 
         spin_lock_irqsave(&ucb->io_lock, flags);
-        ucb->io_dir |= (1 << offset);
-        ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir);
-
+        old = ucb->io_out;
         if (value)
-                ucb->io_out |= 1 << offset;
+                ucb->io_out |= mask;
         else
-                ucb->io_out &= ~(1 << offset);
-        ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out);
+                ucb->io_out &= ~mask;
+
+        if (old != ucb->io_out)
+                ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out);
+
+        if (!(ucb->io_dir & mask)) {
+                ucb->io_dir |= mask;
+                ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir);
+        }
         spin_unlock_irqrestore(&ucb->io_lock, flags);
 
         return 0;
@@ -536,33 +533,17 @@ static struct class ucb1x00_class = {
 
 static int ucb1x00_probe(struct mcp *mcp)
 {
-        const struct mcp_device_id *mid;
         struct ucb1x00 *ucb;
         struct ucb1x00_driver *drv;
-        struct ucb1x00_plat_data *pdata;
         unsigned int id;
         int ret = -ENODEV;
         int temp;
 
         mcp_enable(mcp);
         id = mcp_reg_read(mcp, UCB_ID);
-        mid = mcp_get_device_id(mcp);
 
-        if (mid && mid->driver_data) {
-                if (id != mid->driver_data) {
-                        printk(KERN_WARNING "%s wrong ID %04x found: %04x\n",
-                                mid->name, (unsigned int) mid->driver_data, id);
-                        goto err_disable;
-                }
-        } else {
-                mid = &ucb1x00_id[1];
-                while (mid->driver_data) {
-                        if (id == mid->driver_data)
-                                break;
-                        mid++;
-                }
-                printk(KERN_WARNING "%s ID not found: %04x\n",
-                        ucb1x00_id[0].name, id);
+        if (id != UCB_ID_1200 && id != UCB_ID_1300 && id != UCB_ID_TC35143) {
+                printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id);
                 goto err_disable;
         }
 
@@ -571,28 +552,28 @@ static int ucb1x00_probe(struct mcp *mcp)
         if (!ucb)
                 goto err_disable;
 
-        pdata = mcp->attached_device.platform_data;
+
         ucb->dev.class = &ucb1x00_class;
         ucb->dev.parent = &mcp->attached_device;
-        dev_set_name(&ucb->dev, mid->name);
+        dev_set_name(&ucb->dev, "ucb1x00");
 
         spin_lock_init(&ucb->lock);
         spin_lock_init(&ucb->io_lock);
         sema_init(&ucb->adc_sem, 1);
 
-        ucb->id  = mid;
+        ucb->id  = id;
         ucb->mcp = mcp;
         ucb->irq = ucb1x00_detect_irq(ucb);
         if (ucb->irq == NO_IRQ) {
-                printk(KERN_ERR "%s: IRQ probe failed\n", mid->name);
+                printk(KERN_ERR "UCB1x00: IRQ probe failed\n");
                 ret = -ENODEV;
                 goto err_free;
         }
 
         ucb->gpio.base = -1;
-        if (pdata && (pdata->gpio_base >= 0)) {
+        if (mcp->gpio_base != 0) {
                 ucb->gpio.label = dev_name(&ucb->dev);
-                ucb->gpio.base = pdata->gpio_base;
+                ucb->gpio.base = mcp->gpio_base;
                 ucb->gpio.ngpio = 10;
                 ucb->gpio.set = ucb1x00_gpio_set;
                 ucb->gpio.get = ucb1x00_gpio_get;
@@ -605,10 +586,10 @@ static int ucb1x00_probe(struct mcp *mcp)
                 dev_info(&ucb->dev, "gpio_base not set so no gpiolib support");
 
         ret = request_irq(ucb->irq, ucb1x00_irq, IRQF_TRIGGER_RISING,
-                          mid->name, ucb);
+                          "UCB1x00", ucb);
         if (ret) {
-                printk(KERN_ERR "%s: unable to grab irq%d: %d\n",
-                        mid->name, ucb->irq, ret);
+                printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n",
+                        ucb->irq, ret);
                 goto err_gpio;
         }
 
@@ -712,6 +693,7 @@ static int ucb1x00_resume(struct mcp *mcp)
         struct ucb1x00 *ucb = mcp_get_drvdata(mcp);
         struct ucb1x00_dev *dev;
 
+        ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out);
         ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir);
         mutex_lock(&ucb1x00_mutex);
         list_for_each_entry(dev, &ucb->devs, dev_node) {
@@ -730,7 +712,6 @@ static struct mcp_driver ucb1x00_driver = {
         .remove         = ucb1x00_remove,
         .suspend        = ucb1x00_suspend,
         .resume         = ucb1x00_resume,
-        .id_table       = ucb1x00_id,
 };
 
 static int __init ucb1x00_init(void)
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index 40ec3c118868..63a3cbdfa3f3 100644
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -47,7 +47,6 @@ struct ucb1x00_ts {
         u16                     x_res;
         u16                     y_res;
 
-        unsigned int            restart:1;
         unsigned int            adcsync:1;
 };
 
@@ -207,15 +206,17 @@ static int ucb1x00_thread(void *_ts)
 {
         struct ucb1x00_ts *ts = _ts;
         DECLARE_WAITQUEUE(wait, current);
+        bool frozen, ignore = false;
         int valid = 0;
 
         set_freezable();
         add_wait_queue(&ts->irq_wait, &wait);
-        while (!kthread_should_stop()) {
+        while (!kthread_freezable_should_stop(&frozen)) {
                 unsigned int x, y, p;
                 signed long timeout;
 
-                ts->restart = 0;
+                if (frozen)
+                        ignore = true;
 
                 ucb1x00_adc_enable(ts->ucb);
 
@@ -258,7 +259,7 @@ static int ucb1x00_thread(void *_ts)
                          * space.  We therefore leave it to user space
                          * to do any filtering they please.
                          */
-                        if (!ts->restart) {
+                        if (!ignore) {
                                 ucb1x00_ts_evt_add(ts, p, x, y);
                                 valid = 1;
                         }
@@ -267,8 +268,6 @@ static int ucb1x00_thread(void *_ts)
                         timeout = HZ / 100;
                 }
 
-                try_to_freeze();
-
                 schedule_timeout(timeout);
         }
 
@@ -340,26 +339,6 @@ static void ucb1x00_ts_close(struct input_dev *idev)
         ucb1x00_disable(ts->ucb);
 }
 
-#ifdef CONFIG_PM
-static int ucb1x00_ts_resume(struct ucb1x00_dev *dev)
-{
-        struct ucb1x00_ts *ts = dev->priv;
-
-        if (ts->rtask != NULL) {
-                /*
-                 * Restart the TS thread to ensure the
-                 * TS interrupt mode is set up again
-                 * after sleep.
-                 */
-                ts->restart = 1;
-                wake_up(&ts->irq_wait);
-        }
-        return 0;
-}
-#else
-#define ucb1x00_ts_resume NULL
-#endif
-
 
 /*
  * Initialisation.
@@ -382,7 +361,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
         ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;
 
         idev->name       = "Touchscreen panel";
-        idev->id.product = ts->ucb->id->driver_data;
+        idev->id.product = ts->ucb->id;
         idev->open       = ucb1x00_ts_open;
         idev->close      = ucb1x00_ts_close;
 
@@ -425,7 +404,6 @@ static void ucb1x00_ts_remove(struct ucb1x00_dev *dev)
 static struct ucb1x00_driver ucb1x00_ts_driver = {
         .add            = ucb1x00_ts_add,
         .remove         = ucb1x00_ts_remove,
-        .resume         = ucb1x00_ts_resume,
 };
 
 static int __init ucb1x00_ts_init(void)
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 6a1a092db146..c7795096d43b 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -2,24 +2,14 @@
 # Misc strange devices
 #
 
-# This one has to live outside of the MISC_DEVICES conditional,
-# because it may be selected by drivers/platform/x86/hp_accel.
+menu "Misc devices"
+
 config SENSORS_LIS3LV02D
         tristate
         depends on INPUT
         select INPUT_POLLDEV
         default n
 
-menuconfig MISC_DEVICES
-        bool "Misc devices"
-        ---help---
-          Say Y here to get to see options for device drivers from various
-          different categories. This option alone does not add any kernel code.
-
-          If you say N, all options in this submenu will be skipped and disabled.
-
-if MISC_DEVICES
-
 config AD525X_DPOT
         tristate "Analog Devices Digital Potentiometers"
         depends on (I2C || SPI) && SYSFS
@@ -516,5 +506,4 @@ source "drivers/misc/ti-st/Kconfig"
 source "drivers/misc/lis3lv02d/Kconfig"
 source "drivers/misc/carma/Kconfig"
 source "drivers/misc/altera-stapl/Kconfig"
-
-endif # MISC_DEVICES
+endmenu
diff --git a/drivers/misc/c2port/c2port-duramar2150.c b/drivers/misc/c2port/c2port-duramar2150.c
index 778fc3fdfb9b..5484301d57d9 100644
--- a/drivers/misc/c2port/c2port-duramar2150.c
+++ b/drivers/misc/c2port/c2port-duramar2150.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/io.h>
+#include <linux/ioport.h>
 #include <linux/c2port.h>
 
 #define DATA_PORT       0x325
diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c
index 68cd05b6d829..85cc7710193c 100644
--- a/drivers/misc/cb710/core.c
+++ b/drivers/misc/cb710/core.c
@@ -245,6 +245,7 @@ static int __devinit cb710_probe(struct pci_dev *pdev,
         if (err)
                 return err;
 
+        spin_lock_init(&chip->irq_lock);
         chip->pdev = pdev;
         chip->iobase = pcim_iomap_table(pdev)[0];
 
diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c
index bc685bfc4c33..87a390de054c 100644
--- a/drivers/misc/cs5535-mfgpt.c
+++ b/drivers/misc/cs5535-mfgpt.c
@@ -262,7 +262,7 @@ static void __init reset_all_timers(void)
  * In other cases (such as with VSAless OpenFirmware), the system firmware
  * leaves timers available for us to use.
  */
-static int __init scan_timers(struct cs5535_mfgpt_chip *mfgpt)
+static int __devinit scan_timers(struct cs5535_mfgpt_chip *mfgpt)
 {
         struct cs5535_mfgpt_timer timer = { .chip = mfgpt };
         unsigned long flags;
diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c
index 150cd7061b80..28adefe70f96 100644
--- a/drivers/misc/lkdtm.c
+++ b/drivers/misc/lkdtm.c
@@ -354,6 +354,7 @@ static void lkdtm_do_action(enum ctype which)
 static void lkdtm_handler(void)
 {
         unsigned long flags;
+        bool do_it = false;
 
         spin_lock_irqsave(&count_lock, flags);
         count--;
@@ -361,10 +362,13 @@ static void lkdtm_handler(void)
                         cp_name_to_str(cpoint), cp_type_to_str(cptype), count);
 
         if (count == 0) {
-                lkdtm_do_action(cptype);
+                do_it = true;
                 count = cpoint_count;
         }
         spin_unlock_irqrestore(&count_lock, flags);
+
+        if (do_it)
+                lkdtm_do_action(cptype);
 }
 
 static int lkdtm_register_cpoint(enum cname which)
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index cd41d403c9df..cb56e270da11 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -314,7 +314,7 @@ static bool vmballoon_send_get_target(struct vmballoon *b, u32 *new_target)
  * fear that guest will need it. Host may reject some pages, we need to
  * check the return value and maybe submit a different page.
  */
-static bool vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn,
+static int vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn,
                                      unsigned int *hv_status)
 {
         unsigned long status, dummy;
@@ -322,17 +322,17 @@ static bool vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn,
 
         pfn32 = (u32)pfn;
         if (pfn32 != pfn)
-                return false;
+                return -1;
 
         STATS_INC(b->stats.lock);
 
         *hv_status = status = VMWARE_BALLOON_CMD(LOCK, pfn, dummy);
         if (vmballoon_check_status(b, status))
-                return true;
+                return 0;
 
         pr_debug("%s - ppn %lx, hv returns %ld\n", __func__, pfn, status);
         STATS_INC(b->stats.lock_fail);
-        return false;
+        return 1;
 }
 
 /*
@@ -411,7 +411,7 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
         struct page *page;
         gfp_t flags;
         unsigned int hv_status;
-        bool locked = false;
+        int locked;
         flags = can_sleep ? VMW_PAGE_ALLOC_CANSLEEP : VMW_PAGE_ALLOC_NOSLEEP;
 
         do {
@@ -431,7 +431,7 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
 
                 /* inform monitor */
                 locked = vmballoon_send_lock_page(b, page_to_pfn(page), &hv_status);
-                if (!locked) {
+                if (locked > 0) {
                         STATS_INC(b->stats.refused_alloc);
 
                         if (hv_status == VMW_BALLOON_ERROR_RESET ||
@@ -449,7 +449,7 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
                         if (++b->n_refused_pages >= VMW_BALLOON_MAX_REFUSED)
                                 return -EIO;
                 }
-        } while (!locked);
+        } while (locked != 0);
 
         /* track allocated page */
         list_add(&page->lru, &b->pages);
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 0cad48a284a8..c6a383d0244d 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1694,6 +1694,7 @@ static int mmc_add_disk(struct mmc_blk_data *md)
 
                 md->power_ro_lock.show = power_ro_lock_show;
                 md->power_ro_lock.store = power_ro_lock_store;
+                sysfs_attr_init(&md->power_ro_lock.attr);
                 md->power_ro_lock.attr.mode = mode;
                 md->power_ro_lock.attr.name =
                                         "ro_lock_until_next_power_on";
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index f545a3e6eb80..690255c7d4dc 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -290,8 +290,11 @@ static void mmc_wait_for_req_done(struct mmc_host *host,
 static void mmc_pre_req(struct mmc_host *host, struct mmc_request *mrq,
                  bool is_first_req)
 {
-        if (host->ops->pre_req)
+        if (host->ops->pre_req) {
+                mmc_host_clk_hold(host);
                 host->ops->pre_req(host, mrq, is_first_req);
+                mmc_host_clk_release(host);
+        }
 }
 
 /**
@@ -306,8 +309,11 @@ static void mmc_pre_req(struct mmc_host *host, struct mmc_request *mrq,
 static void mmc_post_req(struct mmc_host *host, struct mmc_request *mrq,
                          int err)
 {
-        if (host->ops->post_req)
+        if (host->ops->post_req) {
+                mmc_host_clk_hold(host);
                 host->ops->post_req(host, mrq, err);
+                mmc_host_clk_release(host);
+        }
 }
 
 /**
@@ -620,7 +626,9 @@ int mmc_host_enable(struct mmc_host *host)
                 int err;
 
                 host->en_dis_recurs = 1;
+                mmc_host_clk_hold(host);
                 err = host->ops->enable(host);
+                mmc_host_clk_release(host);
                 host->en_dis_recurs = 0;
 
                 if (err) {
@@ -640,7 +648,9 @@ static int mmc_host_do_disable(struct mmc_host *host, int lazy)
                 int err;
 
                 host->en_dis_recurs = 1;
+                mmc_host_clk_hold(host);
                 err = host->ops->disable(host, lazy);
+                mmc_host_clk_release(host);
                 host->en_dis_recurs = 0;
 
                 if (err < 0) {
@@ -1121,6 +1131,10 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc,
                  * might not allow this operation
                  */
                 voltage = regulator_get_voltage(supply);
+
+                if (mmc->caps2 & MMC_CAP2_BROKEN_VOLTAGE)
+                        min_uV = max_uV = voltage;
+
                 if (voltage < 0)
                         result = voltage;
                 else if (voltage < min_uV || voltage > max_uV)
@@ -1203,8 +1217,11 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, bool cmd11
 
         host->ios.signal_voltage = signal_voltage;
 
-        if (host->ops->start_signal_voltage_switch)
+        if (host->ops->start_signal_voltage_switch) {
+                mmc_host_clk_hold(host);
                 err = host->ops->start_signal_voltage_switch(host, &host->ios);
+                mmc_host_clk_release(host);
+        }
 
         return err;
 }
@@ -1239,6 +1256,7 @@ static void mmc_poweroff_notify(struct mmc_host *host)
         int err = 0;
 
         card = host->card;
+        mmc_claim_host(host);
 
         /*
          * Send power notify command only if card
@@ -1269,6 +1287,7 @@ static void mmc_poweroff_notify(struct mmc_host *host)
                 /* Set the card state to no notification after the poweroff */
                 card->poweroff_notify_state = MMC_NO_POWER_NOTIFICATION;
         }
+        mmc_release_host(host);
 }
 
 /*
@@ -1327,12 +1346,28 @@ static void mmc_power_up(struct mmc_host *host)
 
 void mmc_power_off(struct mmc_host *host)
 {
+        int err = 0;
         mmc_host_clk_hold(host);
 
         host->ios.clock = 0;
         host->ios.vdd = 0;
 
-        mmc_poweroff_notify(host);
+        /*
+         * For eMMC 4.5 device send AWAKE command before
+         * POWER_OFF_NOTIFY command, because in sleep state
+         * eMMC 4.5 devices respond to only RESET and AWAKE cmd
+         */
+        if (host->card && mmc_card_is_sleep(host->card) &&
+            host->bus_ops->resume) {
+                err = host->bus_ops->resume(host);
+
+                if (!err)
+                        mmc_poweroff_notify(host);
+                else
+                        pr_warning("%s: error %d during resume "
+                                   "(continue with poweroff sequence)\n",
+                                   mmc_hostname(host), err);
+        }
 
         /*
          * Reset ocr mask to be the highest possible voltage supported for
@@ -2386,12 +2421,6 @@ int mmc_suspend_host(struct mmc_host *host)
                  */
                 if (mmc_try_claim_host(host)) {
                         if (host->bus_ops->suspend) {
-                                /*
-                                 * For eMMC 4.5 device send notify command
-                                 * before sleep, because in sleep state eMMC 4.5
-                                 * devices respond to only RESET and AWAKE cmd
-                                 */
-                                mmc_poweroff_notify(host);
                                 err = host->bus_ops->suspend(host);
                         }
                         mmc_do_release_host(host);
diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h
index fb8a5cd2e4a1..08a7852ade44 100644
--- a/drivers/mmc/core/host.h
+++ b/drivers/mmc/core/host.h
@@ -14,27 +14,6 @@
 
 int mmc_register_host_class(void);
 void mmc_unregister_host_class(void);
-
-#ifdef CONFIG_MMC_CLKGATE
-void mmc_host_clk_hold(struct mmc_host *host);
-void mmc_host_clk_release(struct mmc_host *host);
-unsigned int mmc_host_clk_rate(struct mmc_host *host);
-
-#else
-static inline void mmc_host_clk_hold(struct mmc_host *host)
-{
-}
-
-static inline void mmc_host_clk_release(struct mmc_host *host)
-{
-}
-
-static inline unsigned int mmc_host_clk_rate(struct mmc_host *host)
-{
-        return host->ios.clock;
-}
-#endif
-
 void mmc_host_deeper_disable(struct work_struct *work);
 
 #endif
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 59b9ba52e66a..a48066344fa8 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -376,7 +376,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
         }
 
         card->ext_csd.raw_hc_erase_gap_size =
-                ext_csd[EXT_CSD_PARTITION_ATTRIBUTE];
+                ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
         card->ext_csd.raw_sec_trim_mult =
                 ext_csd[EXT_CSD_SEC_TRIM_MULT];
         card->ext_csd.raw_sec_erase_mult =
@@ -551,7 +551,7 @@ static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width)
                 goto out;
 
         /* only compare read only fields */
-        err = (!(card->ext_csd.raw_partition_support ==
+        err = !((card->ext_csd.raw_partition_support ==
                         bw_ext_csd[EXT_CSD_PARTITION_SUPPORT]) &&
                 (card->ext_csd.raw_erased_mem_count ==
                         bw_ext_csd[EXT_CSD_ERASED_MEM_CONT]) &&
@@ -1006,7 +1006,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                         err = mmc_select_hs200(card);
                 else if (host->caps & MMC_CAP_MMC_HIGHSPEED)
                         err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                                         EXT_CSD_HS_TIMING, 1, 0);
+                                         EXT_CSD_HS_TIMING, 1,
+                                         card->ext_csd.generic_cmd6_time);
 
                 if (err && err != -EBADMSG)
                         goto free_card;
@@ -1116,7 +1117,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
          * Activate wide bus and DDR (if supported).
          */
         if (!mmc_card_hs200(card) &&
-            (card->csd.mmca_vsn >= CSD_SPEC_VER_3) &&
+            (card->csd.mmca_vsn >= CSD_SPEC_VER_4) &&
             (host->caps & (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA))) {
                 static unsigned ext_csd_bits[][2] = {
                         { EXT_CSD_BUS_WIDTH_8, EXT_CSD_DDR_BUS_WIDTH_8 },
@@ -1315,11 +1316,13 @@ static int mmc_suspend(struct mmc_host *host)
         BUG_ON(!host->card);
 
         mmc_claim_host(host);
-        if (mmc_card_can_sleep(host))
+        if (mmc_card_can_sleep(host)) {
                 err = mmc_card_sleep(host);
-        else if (!mmc_host_is_spi(host))
+                if (!err)
+                        mmc_card_set_sleep(host->card);
+        } else if (!mmc_host_is_spi(host))
                 mmc_deselect_cards(host);
-        host->card->state &= ~MMC_STATE_HIGHSPEED;
+        host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200);
         mmc_release_host(host);
 
         return err;
@@ -1339,7 +1342,11 @@ static int mmc_resume(struct mmc_host *host)
         BUG_ON(!host->card);
 
         mmc_claim_host(host);
-        err = mmc_init_card(host, host->ocr, host->card);
+        if (mmc_card_is_sleep(host->card)) {
+                err = mmc_card_awake(host);
+                mmc_card_clr_sleep(host->card);
+        } else
+                err = mmc_init_card(host, host->ocr, host->card);
         mmc_release_host(host);
 
         return err;
@@ -1349,7 +1356,8 @@ static int mmc_power_restore(struct mmc_host *host)
 {
         int ret;
 
-        host->card->state &= ~MMC_STATE_HIGHSPEED;
+        host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200);
+        mmc_card_clr_sleep(host->card);
         mmc_claim_host(host);
         ret = mmc_init_card(host, host->ocr, host->card);
         mmc_release_host(host);
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index c63ad03c29c7..5017f9354ce2 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -451,9 +451,11 @@ static int sd_select_driver_type(struct mmc_card *card, u8 *status)
          * information and let the hardware specific code
          * return what is possible given the options
          */
+        mmc_host_clk_hold(card->host);
         drive_strength = card->host->ops->select_drive_strength(
                 card->sw_caps.uhs_max_dtr,
                 host_drv_type, card_drv_type);
+        mmc_host_clk_release(card->host);
 
         err = mmc_sd_switch(card, 1, 2, drive_strength, status);
         if (err)
@@ -660,9 +662,12 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card)
                 goto out;
 
         /* SPI mode doesn't define CMD19 */
-        if (!mmc_host_is_spi(card->host) && card->host->ops->execute_tuning)
+        if (!mmc_host_is_spi(card->host) && card->host->ops->execute_tuning) {
+                mmc_host_clk_hold(card->host);
                 err = card->host->ops->execute_tuning(card->host,
                                                       MMC_SEND_TUNING_BLOCK);
+                mmc_host_clk_release(card->host);
+        }
 
 out:
         kfree(status);
@@ -850,8 +855,11 @@ int mmc_sd_setup_card(struct mmc_host *host, struct mmc_card *card,
         if (!reinit) {
                 int ro = -1;
 
-                if (host->ops->get_ro)
+                if (host->ops->get_ro) {
+                        mmc_host_clk_hold(card->host);
                         ro = host->ops->get_ro(host);
+                        mmc_host_clk_release(card->host);
+                }
 
                 if (ro < 0) {
                         pr_warning("%s: host does not "
@@ -967,8 +975,11 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
                  * Since initialization is now complete, enable preset
                  * value registers for UHS-I cards.
                  */
-                if (host->ops->enable_preset_value)
+                if (host->ops->enable_preset_value) {
+                        mmc_host_clk_hold(card->host);
                         host->ops->enable_preset_value(host, true);
+                        mmc_host_clk_release(card->host);
+                }
         } else {
                 /*
                  * Attempt to change to high-speed (if supported)
@@ -1151,8 +1162,11 @@ int mmc_attach_sd(struct mmc_host *host)
                 return err;
 
         /* Disable preset value enable if already set since last time */
-        if (host->ops->enable_preset_value)
+        if (host->ops->enable_preset_value) {
+                mmc_host_clk_hold(host);
                 host->ops->enable_preset_value(host, false);
+                mmc_host_clk_release(host);
+        }
 
         err = mmc_send_app_op_cond(host, 0, &ocr);
         if (err)
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index bd7bacc950dc..12cde6ee17f5 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -98,10 +98,11 @@ fail:
         return ret;
 }
 
-static int sdio_read_cccr(struct mmc_card *card)
+static int sdio_read_cccr(struct mmc_card *card, u32 ocr)
 {
         int ret;
         int cccr_vsn;
+        int uhs = ocr & R4_18V_PRESENT;
         unsigned char data;
         unsigned char speed;
 
@@ -149,7 +150,7 @@ static int sdio_read_cccr(struct mmc_card *card)
                 card->scr.sda_spec3 = 0;
                 card->sw_caps.sd3_bus_mode = 0;
                 card->sw_caps.sd3_drv_type = 0;
-                if (cccr_vsn >= SDIO_CCCR_REV_3_00) {
+                if (cccr_vsn >= SDIO_CCCR_REV_3_00 && uhs) {
                         card->scr.sda_spec3 = 1;
                         ret = mmc_io_rw_direct(card, 0, 0,
                                 SDIO_CCCR_UHS, 0, &data);
@@ -712,7 +713,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
         /*
          * Read the common registers.
          */
-        err = sdio_read_cccr(card);
+        err = sdio_read_cccr(card, ocr);
         if (err)
                 goto remove;
 
diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c
index 68f81b9ee0fb..f573e7f9f740 100644
--- a/drivers/mmc/core/sdio_irq.c
+++ b/drivers/mmc/core/sdio_irq.c
@@ -146,15 +146,21 @@ static int sdio_irq_thread(void *_host)
                 }
 
                 set_current_state(TASK_INTERRUPTIBLE);
-                if (host->caps & MMC_CAP_SDIO_IRQ)
+                if (host->caps & MMC_CAP_SDIO_IRQ) {
+                        mmc_host_clk_hold(host);
                         host->ops->enable_sdio_irq(host, 1);
+                        mmc_host_clk_release(host);
+                }
                 if (!kthread_should_stop())
                         schedule_timeout(period);
                 set_current_state(TASK_RUNNING);
         } while (!kthread_should_stop());
 
-        if (host->caps & MMC_CAP_SDIO_IRQ)
+        if (host->caps & MMC_CAP_SDIO_IRQ) {
+                mmc_host_clk_hold(host);
                 host->ops->enable_sdio_irq(host, 0);
+                mmc_host_clk_release(host);
+        }
 
         pr_debug("%s: IRQ thread exiting with code %d\n",
                  mmc_hostname(host), ret);
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index cf444b0ca2cc..00fcbed1afd2 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -477,7 +477,6 @@ config MMC_SDHI
 config MMC_CB710
         tristate "ENE CB710 MMC/SD Interface support"
         depends on PCI
-        select MISC_DEVICES
         select CB710_CORE
         help
           This option enables support for MMC/SD part of ENE CB710/720 Flash
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index fcfe1eb5acc8..6985cdb0bb26 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -969,11 +969,14 @@ static void atmci_start_request(struct atmel_mci *host,
         host->data_status = 0;
 
         if (host->need_reset) {
+                iflags = atmci_readl(host, ATMCI_IMR);
+                iflags &= (ATMCI_SDIOIRQA | ATMCI_SDIOIRQB);
                 atmci_writel(host, ATMCI_CR, ATMCI_CR_SWRST);
                 atmci_writel(host, ATMCI_CR, ATMCI_CR_MCIEN);
                 atmci_writel(host, ATMCI_MR, host->mode_reg);
                 if (host->caps.has_cfg_reg)
                         atmci_writel(host, ATMCI_CFG, host->cfg_reg);
+                atmci_writel(host, ATMCI_IER, iflags);
                 host->need_reset = false;
         }
         atmci_writel(host, ATMCI_SDCR, slot->sdc_reg);
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 0e342793ff14..8bec1c36b159 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -22,7 +22,6 @@
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/scatterlist.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
@@ -502,8 +501,14 @@ static void dw_mci_submit_data(struct dw_mci *host, struct mmc_data *data)
                 host->dir_status = DW_MCI_SEND_STATUS;
 
         if (dw_mci_submit_data_dma(host, data)) {
+                int flags = SG_MITER_ATOMIC;
+                if (host->data->flags & MMC_DATA_READ)
+                        flags |= SG_MITER_TO_SG;
+                else
+                        flags |= SG_MITER_FROM_SG;
+
+                sg_miter_start(&host->sg_miter, data->sg, data->sg_len, flags);
                 host->sg = data->sg;
-                host->pio_offset = 0;
                 host->part_buf_start = 0;
                 host->part_buf_count = 0;
 
@@ -972,6 +977,7 @@ static void dw_mci_tasklet_func(unsigned long priv)
                                  * generates a block interrupt, hence setting
                                  * the scatter-gather pointer to NULL.
                                  */
+                                sg_miter_stop(&host->sg_miter);
                                 host->sg = NULL;
                                 ctrl = mci_readl(host, CTRL);
                                 ctrl |= SDMMC_CTRL_FIFO_RESET;
@@ -1311,54 +1317,44 @@ static void dw_mci_pull_data(struct dw_mci *host, void *buf, int cnt)
 
 static void dw_mci_read_data_pio(struct dw_mci *host)
 {
-        struct scatterlist *sg = host->sg;
-        void *buf = sg_virt(sg);
-        unsigned int offset = host->pio_offset;
+        struct sg_mapping_iter *sg_miter = &host->sg_miter;
+        void *buf;
+        unsigned int offset;
         struct mmc_data *data = host->data;
         int shift = host->data_shift;
         u32 status;
         unsigned int nbytes = 0, len;
+        unsigned int remain, fcnt;
 
         do {
-                len = host->part_buf_count +
-                        (SDMMC_GET_FCNT(mci_readl(host, STATUS)) << shift);
-                if (offset + len <= sg->length) {
+                if (!sg_miter_next(sg_miter))
+                        goto done;
+
+                host->sg = sg_miter->__sg;
+                buf = sg_miter->addr;
+                remain = sg_miter->length;
+                offset = 0;
+
+                do {
+                        fcnt = (SDMMC_GET_FCNT(mci_readl(host, STATUS))
+                                        << shift) + host->part_buf_count;
+                        len = min(remain, fcnt);
+                        if (!len)
+                                break;
                         dw_mci_pull_data(host, (void *)(buf + offset), len);
-
                         offset += len;
                         nbytes += len;
-
-                        if (offset == sg->length) {
-                                flush_dcache_page(sg_page(sg));
-                                host->sg = sg = sg_next(sg);
-                                if (!sg)
-                                        goto done;
-
-                                offset = 0;
-                                buf = sg_virt(sg);
-                        }
-                } else {
-                        unsigned int remaining = sg->length - offset;
-                        dw_mci_pull_data(host, (void *)(buf + offset),
-                                         remaining);
-                        nbytes += remaining;
-
-                        flush_dcache_page(sg_page(sg));
-                        host->sg = sg = sg_next(sg);
-                        if (!sg)
-                                goto done;
-
-                        offset = len - remaining;
-                        buf = sg_virt(sg);
-                        dw_mci_pull_data(host, buf, offset);
-                        nbytes += offset;
-                }
+                        remain -= len;
+                } while (remain);
+                sg_miter->consumed = offset;
 
                 status = mci_readl(host, MINTSTS);
                 mci_writel(host, RINTSTS, SDMMC_INT_RXDR);
                 if (status & DW_MCI_DATA_ERROR_FLAGS) {
                         host->data_status = status;
                         data->bytes_xfered += nbytes;
+                        sg_miter_stop(sg_miter);
+                        host->sg = NULL;
                         smp_wmb();
 
                         set_bit(EVENT_DATA_ERROR, &host->pending_events);
@@ -1367,65 +1363,66 @@ static void dw_mci_read_data_pio(struct dw_mci *host)
                         return;
                 }
         } while (status & SDMMC_INT_RXDR); /*if the RXDR is ready read again*/
-        host->pio_offset = offset;
         data->bytes_xfered += nbytes;
+
+        if (!remain) {
+                if (!sg_miter_next(sg_miter))
+                        goto done;
+                sg_miter->consumed = 0;
+        }
+        sg_miter_stop(sg_miter);
         return;
 
 done:
         data->bytes_xfered += nbytes;
+        sg_miter_stop(sg_miter);
+        host->sg = NULL;
         smp_wmb();
         set_bit(EVENT_XFER_COMPLETE, &host->pending_events);
 }
 
 static void dw_mci_write_data_pio(struct dw_mci *host)
 {
-        struct scatterlist *sg = host->sg;
-        void *buf = sg_virt(sg);
-        unsigned int offset = host->pio_offset;
+        struct sg_mapping_iter *sg_miter = &host->sg_miter;
+        void *buf;
+        unsigned int offset;
         struct mmc_data *data = host->data;
         int shift = host->data_shift;
         u32 status;
         unsigned int nbytes = 0, len;
+        unsigned int fifo_depth = host->fifo_depth;
+        unsigned int remain, fcnt;
 
         do {
-                len = ((host->fifo_depth -
-                        SDMMC_GET_FCNT(mci_readl(host, STATUS))) << shift)
-                        - host->part_buf_count;
-                if (offset + len <= sg->length) {
+                if (!sg_miter_next(sg_miter))
+                        goto done;
+
+                host->sg = sg_miter->__sg;
+                buf = sg_miter->addr;
+                remain = sg_miter->length;
+                offset = 0;
+
+                do {
+                        fcnt = ((fifo_depth -
+                                 SDMMC_GET_FCNT(mci_readl(host, STATUS)))
+                                        << shift) - host->part_buf_count;
+                        len = min(remain, fcnt);
+                        if (!len)
+                                break;
                         host->push_data(host, (void *)(buf + offset), len);
-
                         offset += len;
                         nbytes += len;
-                        if (offset == sg->length) {
-                                host->sg = sg = sg_next(sg);
-                                if (!sg)
-                                        goto done;
-
-                                offset = 0;
-                                buf = sg_virt(sg);
-                        }
-                } else {
-                        unsigned int remaining = sg->length - offset;
-
-                        host->push_data(host, (void *)(buf + offset),
-                                        remaining);
-                        nbytes += remaining;
-
-                        host->sg = sg = sg_next(sg);
-                        if (!sg)
-                                goto done;
-
-                        offset = len - remaining;
-                        buf = sg_virt(sg);
-                        host->push_data(host, (void *)buf, offset);
-                        nbytes += offset;
-                }
+                        remain -= len;
+                } while (remain);
+                sg_miter->consumed = offset;
 
                 status = mci_readl(host, MINTSTS);
                 mci_writel(host, RINTSTS, SDMMC_INT_TXDR);
                 if (status & DW_MCI_DATA_ERROR_FLAGS) {
                         host->data_status = status;
                         data->bytes_xfered += nbytes;
+                        sg_miter_stop(sg_miter);
+                        host->sg = NULL;
 
                         smp_wmb();
 
@@ -1435,12 +1432,20 @@ static void dw_mci_write_data_pio(struct dw_mci *host)
                         return;
                 }
         } while (status & SDMMC_INT_TXDR); /* if TXDR write again */
-        host->pio_offset = offset;
         data->bytes_xfered += nbytes;
+
+        if (!remain) {
+                if (!sg_miter_next(sg_miter))
+                        goto done;
+                sg_miter->consumed = 0;
+        }
+        sg_miter_stop(sg_miter);
         return;
 
 done:
         data->bytes_xfered += nbytes;
+        sg_miter_stop(sg_miter);
+        host->sg = NULL;
         smp_wmb();
         set_bit(EVENT_XFER_COMPLETE, &host->pending_events);
 }
@@ -1643,6 +1648,7 @@ static void dw_mci_work_routine_card(struct work_struct *work)
                                  * block interrupt, hence setting the
                                  * scatter-gather pointer to NULL.
                                  */
+                                sg_miter_stop(&host->sg_miter);
                                 host->sg = NULL;
 
                                 ctrl = mci_readl(host, CTRL);
diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c
index ab66f2454dc4..1534b582c419 100644
--- a/drivers/mmc/host/of_mmc_spi.c
+++ b/drivers/mmc/host/of_mmc_spi.c
@@ -113,8 +113,8 @@ struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi)
                 const int j = i * 2;
                 u32 mask;
 
-                mask = mmc_vddrange_to_ocrmask(voltage_ranges[j],
-                                               voltage_ranges[j + 1]);
+                mask = mmc_vddrange_to_ocrmask(be32_to_cpu(voltage_ranges[j]),
+                                               be32_to_cpu(voltage_ranges[j + 1]));
                 if (!mask) {
                         ret = -EINVAL;
                         dev_err(dev, "OF: voltage-range #%d is invalid\n", i);
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index ff4adc018041..5d876ff86f37 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -38,6 +38,23 @@ static u8 esdhc_readb(struct sdhci_host *host, int reg)
         int base = reg & ~0x3;
         int shift = (reg & 0x3) * 8;
         u8 ret = (in_be32(host->ioaddr + base) >> shift) & 0xff;
+
+        /*
+         * "DMA select" locates at offset 0x28 in SD specification, but on
+         * P5020 or P3041, it locates at 0x29.
+         */
+        if (reg == SDHCI_HOST_CONTROL) {
+                u32 dma_bits;
+
+                dma_bits = in_be32(host->ioaddr + reg);
+                /* DMA select is 22,23 bits in Protocol Control Register */
+                dma_bits = (dma_bits >> 5) & SDHCI_CTRL_DMA_MASK;
+
+                /* fixup the result */
+                ret &= ~SDHCI_CTRL_DMA_MASK;
+                ret |= dma_bits;
+        }
+
         return ret;
 }
 
@@ -56,6 +73,21 @@ static void esdhc_writew(struct sdhci_host *host, u16 val, int reg)
 
 static void esdhc_writeb(struct sdhci_host *host, u8 val, int reg)
 {
+        /*
+         * "DMA select" location is offset 0x28 in SD specification, but on
+         * P5020 or P3041, it's located at 0x29.
+         */
+        if (reg == SDHCI_HOST_CONTROL) {
+                u32 dma_bits;
+
+                /* DMA select is 22,23 bits in Protocol Control Register */
+                dma_bits = (val & SDHCI_CTRL_DMA_MASK) << 5;
+                clrsetbits_be32(host->ioaddr + reg , SDHCI_CTRL_DMA_MASK << 5,
+                        dma_bits);
+                val &= ~SDHCI_CTRL_DMA_MASK;
+                val |= in_be32(host->ioaddr + reg) & SDHCI_CTRL_DMA_MASK;
+        }
+
         /* Prevent SDHCI core from writing reserved bits (e.g. HISPD). */
         if (reg == SDHCI_HOST_CONTROL)
                 val &= ~ESDHC_HOST_CONTROL_RES;
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 7165e6a09274..6ebdc4010e7c 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -250,7 +250,7 @@ static int mfd_emmc_probe_slot(struct sdhci_pci_slot *slot)
 
 static int mfd_sdio_probe_slot(struct sdhci_pci_slot *slot)
 {
-        slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD;
+        slot->host->mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_NONREMOVABLE;
         return 0;
 }
 
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 03970bcb3495..c5c2a48bdd94 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -2,7 +2,7 @@
  * sdhci-pltfm.c Support for SDHCI platform devices
  * Copyright (c) 2009 Intel Corporation
  *
- * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ * Copyright (c) 2007, 2011 Freescale Semiconductor, Inc.
  * Copyright (c) 2009 MontaVista Software, Inc.
  *
  * Authors: Xiaobo Xie <X.Xie@freescale.com>
@@ -71,6 +71,14 @@ void sdhci_get_of_property(struct platform_device *pdev)
                 if (sdhci_of_wp_inverted(np))
                         host->quirks |= SDHCI_QUIRK_INVERTED_WRITE_PROTECT;
 
+                if (of_device_is_compatible(np, "fsl,p2020-rev1-esdhc"))
+                        host->quirks |= SDHCI_QUIRK_BROKEN_DMA;
+
+                if (of_device_is_compatible(np, "fsl,p2020-esdhc") ||
+                    of_device_is_compatible(np, "fsl,p1010-esdhc") ||
+                    of_device_is_compatible(np, "fsl,mpc8536-esdhc"))
+                        host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
+
                 clk = of_get_property(np, "clock-frequency", &size);
                 if (clk && size == sizeof(*clk) && *clk)
                         pltfm_host->clock = be32_to_cpup(clk);
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index f5d8b53be333..352d4797865b 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1327,7 +1327,7 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto clean_up2;
 
-        mmc_add_host(mmc);
+        INIT_DELAYED_WORK(&host->timeout_work, mmcif_timeout_work);
 
         sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL);
 
@@ -1338,22 +1338,24 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
         }
         ret = request_threaded_irq(irq[1], sh_mmcif_intr, sh_mmcif_irqt, 0, "sh_mmc:int", host);
         if (ret) {
-                free_irq(irq[0], host);
                 dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n");
-                goto clean_up3;
+                goto clean_up4;
         }
 
-        INIT_DELAYED_WORK(&host->timeout_work, mmcif_timeout_work);
-
-        mmc_detect_change(host->mmc, 0);
+        ret = mmc_add_host(mmc);
+        if (ret < 0)
+                goto clean_up5;
 
         dev_info(&pdev->dev, "driver version %s\n", DRIVER_VERSION);
         dev_dbg(&pdev->dev, "chip ver H'%04x\n",
                 sh_mmcif_readl(host->addr, MMCIF_CE_VERSION) & 0x0000ffff);
         return ret;
 
+clean_up5:
+        free_irq(irq[1], host);
+clean_up4:
+        free_irq(irq[0], host);
 clean_up3:
-        mmc_remove_host(mmc);
         pm_runtime_suspend(&pdev->dev);
 clean_up2:
         pm_runtime_disable(&pdev->dev);
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index a95e6d901726..f96c536d130a 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -20,8 +20,8 @@
 #include <linux/mmc/tmio.h>
 #include <linux/mutex.h>
 #include <linux/pagemap.h>
-#include <linux/spinlock.h>
 #include <linux/scatterlist.h>
+#include <linux/spinlock.h>
 
 /* Definitions for values the CTRL_SDIO_STATUS register can take. */
 #define TMIO_SDIO_STAT_IOIRQ    0x0001
@@ -120,6 +120,7 @@ void tmio_mmc_start_dma(struct tmio_mmc_host *host, struct mmc_data *data);
 void tmio_mmc_enable_dma(struct tmio_mmc_host *host, bool enable);
 void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdata);
 void tmio_mmc_release_dma(struct tmio_mmc_host *host);
+void tmio_mmc_abort_dma(struct tmio_mmc_host *host);
 #else
 static inline void tmio_mmc_start_dma(struct tmio_mmc_host *host,
                                struct mmc_data *data)
@@ -140,6 +141,10 @@ static inline void tmio_mmc_request_dma(struct tmio_mmc_host *host,
 static inline void tmio_mmc_release_dma(struct tmio_mmc_host *host)
 {
 }
+
+static inline void tmio_mmc_abort_dma(struct tmio_mmc_host *host)
+{
+}
 #endif
 
 #ifdef CONFIG_PM
diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c
index 7a6e6cc8f8b8..8253ec12003e 100644
--- a/drivers/mmc/host/tmio_mmc_dma.c
+++ b/drivers/mmc/host/tmio_mmc_dma.c
@@ -34,6 +34,18 @@ void tmio_mmc_enable_dma(struct tmio_mmc_host *host, bool enable)
 #endif
 }
 
+void tmio_mmc_abort_dma(struct tmio_mmc_host *host)
+{
+        tmio_mmc_enable_dma(host, false);
+
+        if (host->chan_rx)
+                dmaengine_terminate_all(host->chan_rx);
+        if (host->chan_tx)
+                dmaengine_terminate_all(host->chan_tx);
+
+        tmio_mmc_enable_dma(host, true);
+}
+
 static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)
 {
         struct scatterlist *sg = host->sg_ptr, *sg_tmp;
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index abad01b37cfb..5f9ad74fbf80 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -41,8 +41,8 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/scatterlist.h>
-#include <linux/workqueue.h>
 #include <linux/spinlock.h>
+#include <linux/workqueue.h>
 
 #include "tmio_mmc.h"
 
@@ -246,6 +246,7 @@ static void tmio_mmc_reset_work(struct work_struct *work)
         /* Ready for new calls */
         host->mrq = NULL;
 
+        tmio_mmc_abort_dma(host);
         mmc_request_done(host->mmc, mrq);
 }
 
@@ -272,6 +273,9 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host)
         host->mrq = NULL;
         spin_unlock_irqrestore(&host->lock, flags);
 
+        if (mrq->cmd->error || (mrq->data && mrq->data->error))
+                tmio_mmc_abort_dma(host);
+
         mmc_request_done(host->mmc, mrq);
 }
 
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 6ae9ca01388b..9a9ce71a71fc 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -119,7 +119,7 @@ static int mtd_cls_suspend(struct device *dev, pm_message_t state)
 {
         struct mtd_info *mtd = dev_get_drvdata(dev);
 
-        return mtd_suspend(mtd);
+        return mtd ? mtd_suspend(mtd) : 0;
 }
 
 static int mtd_cls_resume(struct device *dev)
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 4dd056e2e16a..35b4fb55dbd6 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -161,6 +161,37 @@ static int atmel_nand_device_ready(struct mtd_info *mtd)
                 !!host->board->rdy_pin_active_low;
 }
 
+/*
+ * Minimal-overhead PIO for data access.
+ */
+static void atmel_read_buf8(struct mtd_info *mtd, u8 *buf, int len)
+{
+        struct nand_chip        *nand_chip = mtd->priv;
+
+        __raw_readsb(nand_chip->IO_ADDR_R, buf, len);
+}
+
+static void atmel_read_buf16(struct mtd_info *mtd, u8 *buf, int len)
+{
+        struct nand_chip        *nand_chip = mtd->priv;
+
+        __raw_readsw(nand_chip->IO_ADDR_R, buf, len / 2);
+}
+
+static void atmel_write_buf8(struct mtd_info *mtd, const u8 *buf, int len)
+{
+        struct nand_chip        *nand_chip = mtd->priv;
+
+        __raw_writesb(nand_chip->IO_ADDR_W, buf, len);
+}
+
+static void atmel_write_buf16(struct mtd_info *mtd, const u8 *buf, int len)
+{
+        struct nand_chip        *nand_chip = mtd->priv;
+
+        __raw_writesw(nand_chip->IO_ADDR_W, buf, len / 2);
+}
+
 static void dma_complete_func(void *completion)
 {
         complete(completion);
@@ -235,27 +266,33 @@ err_buf:
 static void atmel_read_buf(struct mtd_info *mtd, u8 *buf, int len)
 {
         struct nand_chip *chip = mtd->priv;
+        struct atmel_nand_host *host = chip->priv;
 
         if (use_dma && len > mtd->oobsize)
                 /* only use DMA for bigger than oob size: better performances */
                 if (atmel_nand_dma_op(mtd, buf, len, 1) == 0)
                         return;
 
-        /* if no DMA operation possible, use PIO */
-        memcpy_fromio(buf, chip->IO_ADDR_R, len);
+        if (host->board->bus_width_16)
+                atmel_read_buf16(mtd, buf, len);
+        else
+                atmel_read_buf8(mtd, buf, len);
 }
 
 static void atmel_write_buf(struct mtd_info *mtd, const u8 *buf, int len)
 {
         struct nand_chip *chip = mtd->priv;
+        struct atmel_nand_host *host = chip->priv;
 
         if (use_dma && len > mtd->oobsize)
                 /* only use DMA for bigger than oob size: better performances */
                 if (atmel_nand_dma_op(mtd, (void *)buf, len, 0) == 0)
                         return;
 
-        /* if no DMA operation possible, use PIO */
-        memcpy_toio(chip->IO_ADDR_W, buf, len);
+        if (host->board->bus_width_16)
+                atmel_write_buf16(mtd, buf, len);
+        else
+                atmel_write_buf8(mtd, buf, len);
 }
 
 /*
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index 7f680420bfab..7db6555ed3ba 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@ -69,17 +69,19 @@ static int clear_poll_bit(void __iomem *addr, u32 mask)
  *  [1] enable the module.
  *  [2] reset the module.
  *
- * In most of the cases, it's ok. But there is a hardware bug in the BCH block.
+ * In most of the cases, it's ok.
+ * But in MX23, there is a hardware bug in the BCH block (see erratum #2847).
  * If you try to soft reset the BCH block, it becomes unusable until
  * the next hard reset. This case occurs in the NAND boot mode. When the board
  * boots by NAND, the ROM of the chip will initialize the BCH blocks itself.
  * So If the driver tries to reset the BCH again, the BCH will not work anymore.
- * You will see a DMA timeout in this case.
+ * You will see a DMA timeout in this case. The bug has been fixed
+ * in the following chips, such as MX28.
  *
  * To avoid this bug, just add a new parameter `just_enable` for
  * the mxs_reset_block(), and rewrite it here.
  */
-int gpmi_reset_block(void __iomem *reset_addr, bool just_enable)
+static int gpmi_reset_block(void __iomem *reset_addr, bool just_enable)
 {
         int ret;
         int timeout = 0x400;
@@ -206,7 +208,15 @@ int bch_set_geometry(struct gpmi_nand_data *this)
         if (ret)
                 goto err_out;
 
-        ret = gpmi_reset_block(r->bch_regs, true);
+        /*
+        * Due to erratum #2847 of the MX23, the BCH cannot be soft reset on this
+        * chip, otherwise it will lock up. So we skip resetting BCH on the MX23.
+        * On the other hand, the MX28 needs the reset, because one case has been
+        * seen where the BCH produced ECC errors constantly after 10000
+        * consecutive reboots. The latter case has not been seen on the MX23 yet,
+        * still we don't know if it could happen there as well.
+        */
+        ret = gpmi_reset_block(r->bch_regs, GPMI_IS_MX23(this));
         if (ret)
                 goto err_out;
 
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 35b4565050f1..8a393f9e6027 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2588,7 +2588,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
         instr->state = MTD_ERASING;
 
         while (len) {
-                /* Heck if we have a bad block, we do not erase bad blocks! */
+                /* Check if we have a bad block, we do not erase bad blocks! */
                 if (nand_block_checkbad(mtd, ((loff_t) page) <<
                                         chip->page_shift, 0, allowbbt)) {
                         pr_warn("%s: attempt to erase a bad block at page 0x%08x\n",
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 342626f4bc46..f820b26b9db3 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -909,16 +909,12 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
         }
 }
 
-/* hw is a boolean parameter that determines whether we should try and
- * set the hw address of the device as well as the hw address of the
- * net_device
- */
-static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)
+static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[])
 {
         struct net_device *dev = slave->dev;
         struct sockaddr s_addr;
 
-        if (!hw) {
+        if (slave->bond->params.mode == BOND_MODE_TLB) {
                 memcpy(dev->dev_addr, addr, dev->addr_len);
                 return 0;
         }
@@ -948,8 +944,8 @@ static void alb_swap_mac_addr(struct bonding *bond, struct slave *slave1, struct
         u8 tmp_mac_addr[ETH_ALEN];
 
         memcpy(tmp_mac_addr, slave1->dev->dev_addr, ETH_ALEN);
-        alb_set_slave_mac_addr(slave1, slave2->dev->dev_addr, bond->alb_info.rlb_enabled);
-        alb_set_slave_mac_addr(slave2, tmp_mac_addr, bond->alb_info.rlb_enabled);
+        alb_set_slave_mac_addr(slave1, slave2->dev->dev_addr);
+        alb_set_slave_mac_addr(slave2, tmp_mac_addr);
 
 }
 
@@ -1096,8 +1092,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
 
                 /* Try setting slave mac to bond address and fall-through
                    to code handling that situation below... */
-                alb_set_slave_mac_addr(slave, bond->dev->dev_addr,
-                                       bond->alb_info.rlb_enabled);
+                alb_set_slave_mac_addr(slave, bond->dev->dev_addr);
         }
 
         /* The slave's address is equal to the address of the bond.
@@ -1133,8 +1128,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
         }
 
         if (free_mac_slave) {
-                alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr,
-                                       bond->alb_info.rlb_enabled);
+                alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr);
 
                 pr_warning("%s: Warning: the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",
                            bond->dev->name, slave->dev->name,
@@ -1491,8 +1485,7 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave)
 {
         int res;
 
-        res = alb_set_slave_mac_addr(slave, slave->perm_hwaddr,
-                                     bond->alb_info.rlb_enabled);
+        res = alb_set_slave_mac_addr(slave, slave->perm_hwaddr);
         if (res) {
                 return res;
         }
@@ -1643,8 +1636,7 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
                 alb_swap_mac_addr(bond, swap_slave, new_slave);
         } else {
                 /* set the new_slave to the bond mac address */
-                alb_set_slave_mac_addr(new_slave, bond->dev->dev_addr,
-                                       bond->alb_info.rlb_enabled);
+                alb_set_slave_mac_addr(new_slave, bond->dev->dev_addr);
         }
 
         if (swap_slave) {
@@ -1704,8 +1696,7 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
                 alb_swap_mac_addr(bond, swap_slave, bond->curr_active_slave);
                 alb_fasten_mac_swap(bond, swap_slave, bond->curr_active_slave);
         } else {
-                alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr,
-                                       bond->alb_info.rlb_enabled);
+                alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr);
 
                 read_lock(&bond->lock);
                 alb_send_learning_packets(bond->curr_active_slave, bond_dev->dev_addr);
diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c
index 766896747643..c30f0e6f1048 100644
--- a/drivers/net/can/cc770/cc770.c
+++ b/drivers/net/can/cc770/cc770.c
@@ -440,12 +440,14 @@ static netdev_tx_t cc770_start_xmit(struct sk_buff *skb, struct net_device *dev)
         for (i = 0; i < dlc; i++)
                 cc770_write_reg(priv, msgobj[mo].data[i], cf->data[i]);
 
+        /* Store echo skb before starting the transfer */
+        can_put_echo_skb(skb, dev, 0);
+
         cc770_write_reg(priv, msgobj[mo].ctrl1,
                         RMTPND_RES | TXRQST_SET | CPUUPD_RES | NEWDAT_UNC);
 
         stats->tx_bytes += dlc;
 
-        can_put_echo_skb(skb, dev, 0);
 
         /*
          * HM: We had some cases of repeated IRQs so make sure the
diff --git a/drivers/net/can/cc770/cc770_isa.c b/drivers/net/can/cc770/cc770_isa.c
index 4be5fe2c40a5..9f3a25ccd665 100644
--- a/drivers/net/can/cc770/cc770_isa.c
+++ b/drivers/net/can/cc770/cc770_isa.c
@@ -110,6 +110,11 @@ MODULE_PARM_DESC(bcr, "Bus configuration register (default=0x40 [CBY])");
 #define CC770_IOSIZE          0x20
 #define CC770_IOSIZE_INDIRECT 0x02
 
+/* Spinlock for cc770_isa_port_write_reg_indirect
+ * and cc770_isa_port_read_reg_indirect
+ */
+static DEFINE_SPINLOCK(cc770_isa_port_lock);
+
 static struct platform_device *cc770_isa_devs[MAXDEV];
 
 static u8 cc770_isa_mem_read_reg(const struct cc770_priv *priv, int reg)
@@ -138,18 +143,27 @@ static u8 cc770_isa_port_read_reg_indirect(const struct cc770_priv *priv,
                                              int reg)
 {
         unsigned long base = (unsigned long)priv->reg_base;
+        unsigned long flags;
+        u8 val;
 
+        spin_lock_irqsave(&cc770_isa_port_lock, flags);
         outb(reg, base);
-        return inb(base + 1);
+        val = inb(base + 1);
+        spin_unlock_irqrestore(&cc770_isa_port_lock, flags);
+
+        return val;
 }
 
 static void cc770_isa_port_write_reg_indirect(const struct cc770_priv *priv,
                                                 int reg, u8 val)
 {
         unsigned long base = (unsigned long)priv->reg_base;
+        unsigned long flags;
 
+        spin_lock_irqsave(&cc770_isa_port_lock, flags);
         outb(reg, base);
         outb(val, base + 1);
+        spin_unlock_irqrestore(&cc770_isa_port_lock, flags);
 }
 
 static int __devinit cc770_isa_probe(struct platform_device *pdev)
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 7fd8089946fb..96d235799ec1 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -118,6 +118,9 @@
         (FLEXCAN_ESR_TWRN_INT | FLEXCAN_ESR_RWRN_INT | FLEXCAN_ESR_BOFF_INT)
 #define FLEXCAN_ESR_ERR_ALL \
         (FLEXCAN_ESR_ERR_BUS | FLEXCAN_ESR_ERR_STATE)
+#define FLEXCAN_ESR_ALL_INT \
+        (FLEXCAN_ESR_TWRN_INT | FLEXCAN_ESR_RWRN_INT | \
+         FLEXCAN_ESR_BOFF_INT | FLEXCAN_ESR_ERR_INT)
 
 /* FLEXCAN interrupt flag register (IFLAG) bits */
 #define FLEXCAN_TX_BUF_ID               8
@@ -577,7 +580,9 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
 
         reg_iflag1 = flexcan_read(&regs->iflag1);
         reg_esr = flexcan_read(&regs->esr);
-        flexcan_write(FLEXCAN_ESR_ERR_INT, &regs->esr); /* ACK err IRQ */
+        /* ACK all bus error and state change IRQ sources */
+        if (reg_esr & FLEXCAN_ESR_ALL_INT)
+                flexcan_write(reg_esr & FLEXCAN_ESR_ALL_INT, &regs->esr);
 
         /*
          * schedule NAPI in case of:
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index d11fbb2b95ff..6edc25e0dd15 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -66,6 +66,7 @@
 #define PCH_IF_CREQ_BUSY        BIT(15)
 
 #define PCH_STATUS_INT          0x8000
+#define PCH_RP                  0x00008000
 #define PCH_REC                 0x00007f00
 #define PCH_TEC                 0x000000ff
 
@@ -527,7 +528,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
                 priv->can.can_stats.error_passive++;
                 state = CAN_STATE_ERROR_PASSIVE;
                 cf->can_id |= CAN_ERR_CRTL;
-                if (((errc & PCH_REC) >> 8) > 127)
+                if (errc & PCH_RP)
                         cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
                 if ((errc & PCH_TEC) > 127)
                         cf->data[1] |= CAN_ERR_CRTL_TX_PASSIVE;
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index 2c7f5036f570..214795945bc4 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -39,9 +39,9 @@ MODULE_LICENSE("GPL v2");
 #define DRV_NAME  "peak_pci"
 
 struct peak_pci_chan {
-        void __iomem *cfg_base;      /* Common for all channels */
-        struct net_device *next_dev; /* Chain of network devices */
-        u16 icr_mask;                /* Interrupt mask for fast ack */
+        void __iomem *cfg_base;         /* Common for all channels */
+        struct net_device *prev_dev;    /* Chain of network devices */
+        u16 icr_mask;                   /* Interrupt mask for fast ack */
 };
 
 #define PEAK_PCI_CAN_CLOCK      (16000000 / 2)
@@ -98,7 +98,7 @@ static int __devinit peak_pci_probe(struct pci_dev *pdev,
 {
         struct sja1000_priv *priv;
         struct peak_pci_chan *chan;
-        struct net_device *dev, *dev0 = NULL;
+        struct net_device *dev;
         void __iomem *cfg_base, *reg_base;
         u16 sub_sys_id, icr;
         int i, err, channels;
@@ -196,18 +196,14 @@ static int __devinit peak_pci_probe(struct pci_dev *pdev,
                 }
 
                 /* Create chain of SJA1000 devices */
-                if (i == 0)
-                        dev0 = dev;
-                else
-                        chan->next_dev = dev;
+                chan->prev_dev = pci_get_drvdata(pdev);
+                pci_set_drvdata(pdev, dev);
 
                 dev_info(&pdev->dev,
                          "%s at reg_base=0x%p cfg_base=0x%p irq=%d\n",
                          dev->name, priv->reg_base, chan->cfg_base, dev->irq);
         }
 
-        pci_set_drvdata(pdev, dev0);
-
         /* Enable interrupts */
         writew(icr, cfg_base + PITA_ICR + 2);
 
@@ -217,12 +213,11 @@ failure_remove_channels:
         /* Disable interrupts */
         writew(0x0, cfg_base + PITA_ICR + 2);
 
-        for (dev = dev0; dev; dev = chan->next_dev) {
+        for (dev = pci_get_drvdata(pdev); dev; dev = chan->prev_dev) {
                 unregister_sja1000dev(dev);
                 free_sja1000dev(dev);
                 priv = netdev_priv(dev);
                 chan = priv->priv;
-                dev = chan->next_dev;
         }
 
         pci_iounmap(pdev, reg_base);
@@ -241,7 +236,7 @@ failure_disable_pci:
 
 static void __devexit peak_pci_remove(struct pci_dev *pdev)
 {
-        struct net_device *dev = pci_get_drvdata(pdev); /* First device */
+        struct net_device *dev = pci_get_drvdata(pdev); /* Last device */
         struct sja1000_priv *priv = netdev_priv(dev);
         struct peak_pci_chan *chan = priv->priv;
         void __iomem *cfg_base = chan->cfg_base;
@@ -255,7 +250,7 @@ static void __devexit peak_pci_remove(struct pci_dev *pdev)
                 dev_info(&pdev->dev, "removing device %s\n", dev->name);
                 unregister_sja1000dev(dev);
                 free_sja1000dev(dev);
-                dev = chan->next_dev;
+                dev = chan->prev_dev;
                 if (!dev)
                         break;
                 priv = netdev_priv(dev);
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index df809e3f130e..5a2e1e3588a1 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -745,9 +745,10 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,
                 }
         }
 
-        netif_receive_skb(skb);
+        netif_rx(skb);
         stats->rx_packets++;
         stats->rx_bytes += cf->can_dlc;
+
         return 0;
 }
 
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 9697c14b8dc6..7dae64d44e83 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -627,9 +627,6 @@ static int ems_usb_start(struct ems_usb *dev)
 
                 err = usb_submit_urb(urb, GFP_KERNEL);
                 if (err) {
-                        if (err == -ENODEV)
-                                netif_device_detach(dev->netdev);
-
                         usb_unanchor_urb(urb);
                         usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf,
                                           urb->transfer_dma);
@@ -659,9 +656,6 @@ static int ems_usb_start(struct ems_usb *dev)
 
         err = usb_submit_urb(dev->intr_urb, GFP_KERNEL);
         if (err) {
-                if (err == -ENODEV)
-                        netif_device_detach(dev->netdev);
-
                 dev_warn(netdev->dev.parent, "intr URB submit failed: %d\n",
                          err);
 
@@ -692,9 +686,6 @@ static int ems_usb_start(struct ems_usb *dev)
         return 0;
 
 failed:
-        if (err == -ENODEV)
-                netif_device_detach(dev->netdev);
-
         dev_warn(netdev->dev.parent, "couldn't submit control: %d\n", err);
 
         return err;
diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
index 7fc4e81d4d43..325391d19bad 100644
--- a/drivers/net/dsa/mv88e6060.c
+++ b/drivers/net/dsa/mv88e6060.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/list.h>
+#include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/phy.h>
 #include <net/dsa.h>
diff --git a/drivers/net/dsa/mv88e6123_61_65.c b/drivers/net/dsa/mv88e6123_61_65.c
index c0a458fc698f..c17c75b9f531 100644
--- a/drivers/net/dsa/mv88e6123_61_65.c
+++ b/drivers/net/dsa/mv88e6123_61_65.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/list.h>
+#include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/phy.h>
 #include <net/dsa.h>
@@ -20,12 +21,25 @@ static char *mv88e6123_61_65_probe(struct mii_bus *bus, int sw_addr)
 
         ret = __mv88e6xxx_reg_read(bus, sw_addr, REG_PORT(0), 0x03);
         if (ret >= 0) {
-                ret &= 0xfff0;
-                if (ret == 0x1210)
+                if (ret == 0x1212)
+                        return "Marvell 88E6123 (A1)";
+                if (ret == 0x1213)
+                        return "Marvell 88E6123 (A2)";
+                if ((ret & 0xfff0) == 0x1210)
                         return "Marvell 88E6123";
-                if (ret == 0x1610)
+
+                if (ret == 0x1612)
+                        return "Marvell 88E6161 (A1)";
+                if (ret == 0x1613)
+                        return "Marvell 88E6161 (A2)";
+                if ((ret & 0xfff0) == 0x1610)
                         return "Marvell 88E6161";
-                if (ret == 0x1650)
+
+                if (ret == 0x1652)
+                        return "Marvell 88E6165 (A1)";
+                if (ret == 0x1653)
+                        return "Marvell 88e6165 (A2)";
+                if ((ret & 0xfff0) == 0x1650)
                         return "Marvell 88E6165";
         }
 
diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index e0eb68243834..55888b06d8b4 100644
--- a/drivers/net/dsa/mv88e6131.c
+++ b/drivers/net/dsa/mv88e6131.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/list.h>
+#include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/phy.h>
 #include <net/dsa.h>
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index 5467c040824a..a2c62c2f30ee 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/list.h>
+#include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/phy.h>
 #include <net/dsa.h>
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 8153a3e0a1a4..f9b74c0a8492 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -1842,7 +1842,7 @@ vortex_timer(unsigned long data)
                 ok = 1;
         }
 
-        if (!netif_carrier_ok(dev))
+        if (dev->flags & IFF_SLAVE || !netif_carrier_ok(dev))
                 next_tick = 5*HZ;
 
         if (vp->medialock)
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 986019b2c849..c7ca7ec065ee 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -797,7 +797,7 @@ static int bcm_enet_open(struct net_device *dev)
         if (priv->has_phy) {
                 /* connect to PHY */
                 snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT,
-                         priv->mac_id ? "1" : "0", priv->phy_id);
+                         priv->mii_bus->id, priv->phy_id);
 
                 phydev = phy_connect(dev, phy_id, bcm_enet_adjust_phy_link, 0,
                                      PHY_INTERFACE_MODE_MII);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 2b731b253598..7aee46983be4 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -523,7 +523,6 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
                 skb = build_skb(data);
 
         if (likely(skb)) {
-
 #ifdef BNX2X_STOP_ON_ERROR
                 if (pad + len > fp->rx_buf_size) {
                         BNX2X_ERR("skb_put is about to fail...  "
@@ -557,7 +556,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
 
                 return;
         }
-
+        kfree(new_data);
 drop:
         /* drop the packet and keep the buffer in the bin */
         DP(NETIF_MSG_RX_STATUS,
@@ -3117,7 +3116,7 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)
         int rx_ring_size = 0;
 
 #ifdef BCM_CNIC
-        if (IS_MF_ISCSI_SD(bp)) {
+        if (!bp->rx_ring_size && IS_MF_ISCSI_SD(bp)) {
                 rx_ring_size = MIN_RX_SIZE_NONTPA;
                 bp->rx_ring_size = rx_ring_size;
         } else
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index f99c6e312a5d..31a8b38ab15e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1738,7 +1738,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)
         struct bnx2x_fp_txdata *txdata = &fp_tx->txdata[0];
         u16 tx_start_idx, tx_idx;
         u16 rx_start_idx, rx_idx;
-        u16 pkt_prod, bd_prod, rx_comp_cons;
+        u16 pkt_prod, bd_prod;
         struct sw_tx_bd *tx_buf;
         struct eth_tx_start_bd *tx_start_bd;
         struct eth_tx_parse_bd_e1x  *pbd_e1x = NULL;
@@ -1873,8 +1873,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode)
         if (rx_idx != rx_start_idx + num_pkts)
                 goto test_loopback_exit;
 
-        rx_comp_cons = le16_to_cpu(fp_rx->rx_comp_cons);
-        cqe = &fp_rx->rx_comp_ring[RCQ_BD(rx_comp_cons)];
+        cqe = &fp_rx->rx_comp_ring[RCQ_BD(fp_rx->rx_comp_cons)];
         cqe_fp_flags = cqe->fast_path_cqe.type_error_flags;
         cqe_fp_type = cqe_fp_flags & ETH_FAST_PATH_RX_CQE_TYPE;
         if (!CQE_TYPE_FAST(cqe_fp_type) || (cqe_fp_flags & ETH_RX_ERROR_FALGS))
@@ -2121,18 +2120,16 @@ static int bnx2x_get_sset_count(struct net_device *dev, int stringset)
         case ETH_SS_STATS:
                 if (is_multi(bp)) {
                         num_stats = bnx2x_num_stat_queues(bp) *
-                                BNX2X_NUM_Q_STATS;
-                        if (!IS_MF_MODE_STAT(bp))
-                                num_stats += BNX2X_NUM_STATS;
-                } else {
-                        if (IS_MF_MODE_STAT(bp)) {
-                                num_stats = 0;
-                                for (i = 0; i < BNX2X_NUM_STATS; i++)
-                                        if (IS_FUNC_STAT(i))
-                                                num_stats++;
-                        } else
-                                num_stats = BNX2X_NUM_STATS;
-                }
+                                                BNX2X_NUM_Q_STATS;
+                } else
+                        num_stats = 0;
+                if (IS_MF_MODE_STAT(bp)) {
+                        for (i = 0; i < BNX2X_NUM_STATS; i++)
+                                if (IS_FUNC_STAT(i))
+                                        num_stats++;
+                } else
+                        num_stats += BNX2X_NUM_STATS;
+
                 return num_stats;
 
         case ETH_SS_TEST:
@@ -2151,8 +2148,8 @@ static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
 
         switch (stringset) {
         case ETH_SS_STATS:
+                k = 0;
                 if (is_multi(bp)) {
-                        k = 0;
                         for_each_eth_queue(bp, i) {
                                 memset(queue_name, 0, sizeof(queue_name));
                                 sprintf(queue_name, "%d", i);
@@ -2163,20 +2160,17 @@ static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
                                                 queue_name);
                                 k += BNX2X_NUM_Q_STATS;
                         }
-                        if (IS_MF_MODE_STAT(bp))
-                                break;
-                        for (j = 0; j < BNX2X_NUM_STATS; j++)
-                                strcpy(buf + (k + j)*ETH_GSTRING_LEN,
-                                       bnx2x_stats_arr[j].string);
-                } else {
-                        for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) {
-                                if (IS_MF_MODE_STAT(bp) && IS_PORT_STAT(i))
-                                        continue;
-                                strcpy(buf + j*ETH_GSTRING_LEN,
-                                       bnx2x_stats_arr[i].string);
-                                j++;
-                        }
                 }
+
+
+                for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) {
+                        if (IS_MF_MODE_STAT(bp) && IS_PORT_STAT(i))
+                                continue;
+                        strcpy(buf + (k + j)*ETH_GSTRING_LEN,
+                                   bnx2x_stats_arr[i].string);
+                        j++;
+                }
+
                 break;
 
         case ETH_SS_TEST:
@@ -2190,10 +2184,9 @@ static void bnx2x_get_ethtool_stats(struct net_device *dev,
 {
         struct bnx2x *bp = netdev_priv(dev);
         u32 *hw_stats, *offset;
-        int i, j, k;
+        int i, j, k = 0;
 
         if (is_multi(bp)) {
-                k = 0;
                 for_each_eth_queue(bp, i) {
                         hw_stats = (u32 *)&bp->fp[i].eth_q_stats;
                         for (j = 0; j < BNX2X_NUM_Q_STATS; j++) {
@@ -2214,46 +2207,28 @@ static void bnx2x_get_ethtool_stats(struct net_device *dev,
                         }
                         k += BNX2X_NUM_Q_STATS;
                 }
-                if (IS_MF_MODE_STAT(bp))
-                        return;
-                hw_stats = (u32 *)&bp->eth_stats;
-                for (j = 0; j < BNX2X_NUM_STATS; j++) {
-                        if (bnx2x_stats_arr[j].size == 0) {
-                                /* skip this counter */
-                                buf[k + j] = 0;
-                                continue;
-                        }
-                        offset = (hw_stats + bnx2x_stats_arr[j].offset);
-                        if (bnx2x_stats_arr[j].size == 4) {
-                                /* 4-byte counter */
-                                buf[k + j] = (u64) *offset;
-                                continue;
-                        }
-                        /* 8-byte counter */
-                        buf[k + j] = HILO_U64(*offset, *(offset + 1));
+        }
+
+        hw_stats = (u32 *)&bp->eth_stats;
+        for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) {
+                if (IS_MF_MODE_STAT(bp) && IS_PORT_STAT(i))
+                        continue;
+                if (bnx2x_stats_arr[i].size == 0) {
+                        /* skip this counter */
+                        buf[k + j] = 0;
+                        j++;
+                        continue;
                 }
-        } else {
-                hw_stats = (u32 *)&bp->eth_stats;
-                for (i = 0, j = 0; i < BNX2X_NUM_STATS; i++) {
-                        if (IS_MF_MODE_STAT(bp) && IS_PORT_STAT(i))
-                                continue;
-                        if (bnx2x_stats_arr[i].size == 0) {
-                                /* skip this counter */
-                                buf[j] = 0;
-                                j++;
-                                continue;
-                        }
-                        offset = (hw_stats + bnx2x_stats_arr[i].offset);
-                        if (bnx2x_stats_arr[i].size == 4) {
-                                /* 4-byte counter */
-                                buf[j] = (u64) *offset;
-                                j++;
-                                continue;
-                        }
-                        /* 8-byte counter */
-                        buf[j] = HILO_U64(*offset, *(offset + 1));
+                offset = (hw_stats + bnx2x_stats_arr[i].offset);
+                if (bnx2x_stats_arr[i].size == 4) {
+                        /* 4-byte counter */
+                        buf[k + j] = (u64) *offset;
                         j++;
+                        continue;
                 }
+                /* 8-byte counter */
+                buf[k + j] = HILO_U64(*offset, *(offset + 1));
+                j++;
         }
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index ffeaaa95ed96..254521319150 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -117,10 +117,6 @@ static int dropless_fc;
 module_param(dropless_fc, int, 0);
 MODULE_PARM_DESC(dropless_fc, " Pause on exhausted host ring");
 
-static int poll;
-module_param(poll, int, 0);
-MODULE_PARM_DESC(poll, " Use polling (for debug)");
-
 static int mrrs = -1;
 module_param(mrrs, int, 0);
 MODULE_PARM_DESC(mrrs, " Force Max Read Req Size (0..3) (for debug)");
@@ -941,7 +937,7 @@ void bnx2x_panic_dump(struct bnx2x *bp)
                         struct sw_rx_bd *sw_bd = &fp->rx_buf_ring[j];
 
                         BNX2X_ERR("fp%d: rx_bd[%x]=[%x:%x]  sw_bd=[%p]\n",
-                                  i, j, rx_bd[1], rx_bd[0], sw_bd->skb);
+                                  i, j, rx_bd[1], rx_bd[0], sw_bd->data);
                 }
 
                 start = RX_SGE(fp->rx_sge_prod);
@@ -4834,20 +4830,11 @@ void bnx2x_drv_pulse(struct bnx2x *bp)
 
 static void bnx2x_timer(unsigned long data)
 {
-        u8 cos;
         struct bnx2x *bp = (struct bnx2x *) data;
 
         if (!netif_running(bp->dev))
                 return;
 
-        if (poll) {
-                struct bnx2x_fastpath *fp = &bp->fp[0];
-
-                for_each_cos_in_tx_queue(fp, cos)
-                        bnx2x_tx_int(bp, &fp->txdata[cos]);
-                bnx2x_rx_int(fp, 1000);
-        }
-
         if (!BP_NOMCP(bp)) {
                 int mb_idx = BP_FW_MB_IDX(bp);
                 u32 drv_pulse;
@@ -10063,7 +10050,6 @@ static void __devinit bnx2x_set_modes_bitmap(struct bnx2x *bp)
 static int __devinit bnx2x_init_bp(struct bnx2x *bp)
 {
         int func;
-        int timer_interval;
         int rc;
 
         mutex_init(&bp->port.phy_mutex);
@@ -10139,8 +10125,7 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
         bp->tx_ticks = (50 / BNX2X_BTR) * BNX2X_BTR;
         bp->rx_ticks = (25 / BNX2X_BTR) * BNX2X_BTR;
 
-        timer_interval = (CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ);
-        bp->current_interval = (poll ? poll : timer_interval);
+        bp->current_interval = CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ;
 
         init_timer(&bp->timer);
         bp->timer.expires = jiffies + bp->current_interval;
@@ -10536,6 +10521,9 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
 {
         struct bnx2x *bp;
         int rc;
+        bool chip_is_e1x = (board_type == BCM57710 ||
+                            board_type == BCM57711 ||
+                            board_type == BCM57711E);
 
         SET_NETDEV_DEV(dev, &pdev->dev);
         bp = netdev_priv(dev);
@@ -10624,7 +10612,7 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
         REG_WR(bp, PXP2_REG_PGL_ADDR_90_F0, 0);
         REG_WR(bp, PXP2_REG_PGL_ADDR_94_F0, 0);
 
-        if (CHIP_IS_E1x(bp)) {
+        if (chip_is_e1x) {
                 REG_WR(bp, PXP2_REG_PGL_ADDR_88_F1, 0);
                 REG_WR(bp, PXP2_REG_PGL_ADDR_8C_F1, 0);
                 REG_WR(bp, PXP2_REG_PGL_ADDR_90_F1, 0);
@@ -10635,9 +10623,7 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
          * Enable internal target-read (in case we are probed after PF FLR).
          * Must be done prior to any BAR read access. Only for 57712 and up
          */
-        if (board_type != BCM57710 &&
-            board_type != BCM57711 &&
-            board_type != BCM57711E)
+        if (!chip_is_e1x)
                 REG_WR(bp, PGLUE_B_REG_INTERNAL_PFID_ENABLE_TARGET_READ, 1);
 
         /* Reset the load counter */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index 5ac616093f9f..cb6339c35571 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -50,6 +50,7 @@ static inline void bnx2x_exe_queue_init(struct bnx2x *bp,
                                         int exe_len,
                                         union bnx2x_qable_obj *owner,
                                         exe_q_validate validate,
+                                        exe_q_remove remove,
                                         exe_q_optimize optimize,
                                         exe_q_execute exec,
                                         exe_q_get get)
@@ -66,6 +67,7 @@ static inline void bnx2x_exe_queue_init(struct bnx2x *bp,
 
         /* Owner specific callbacks */
         o->validate      = validate;
+        o->remove        = remove;
         o->optimize      = optimize;
         o->execute       = exec;
         o->get           = get;
@@ -1340,6 +1342,35 @@ static int bnx2x_validate_vlan_mac(struct bnx2x *bp,
         }
 }
 
+static int bnx2x_remove_vlan_mac(struct bnx2x *bp,
+                                  union bnx2x_qable_obj *qo,
+                                  struct bnx2x_exeq_elem *elem)
+{
+        int rc = 0;
+
+        /* If consumption wasn't required, nothing to do */
+        if (test_bit(BNX2X_DONT_CONSUME_CAM_CREDIT,
+                     &elem->cmd_data.vlan_mac.vlan_mac_flags))
+                return 0;
+
+        switch (elem->cmd_data.vlan_mac.cmd) {
+        case BNX2X_VLAN_MAC_ADD:
+        case BNX2X_VLAN_MAC_MOVE:
+                rc = qo->vlan_mac.put_credit(&qo->vlan_mac);
+                break;
+        case BNX2X_VLAN_MAC_DEL:
+                rc = qo->vlan_mac.get_credit(&qo->vlan_mac);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (rc != true)
+                return -EINVAL;
+
+        return 0;
+}
+
 /**
  * bnx2x_wait_vlan_mac - passivly wait for 5 seconds until all work completes.
  *
@@ -1801,8 +1832,14 @@ static int bnx2x_vlan_mac_del_all(struct bnx2x *bp,
 
         list_for_each_entry_safe(exeq_pos, exeq_pos_n, &exeq->exe_queue, link) {
                 if (exeq_pos->cmd_data.vlan_mac.vlan_mac_flags ==
-                    *vlan_mac_flags)
+                    *vlan_mac_flags) {
+                        rc = exeq->remove(bp, exeq->owner, exeq_pos);
+                        if (rc) {
+                                BNX2X_ERR("Failed to remove command\n");
+                                return rc;
+                        }
                         list_del(&exeq_pos->link);
+                }
         }
 
         spin_unlock_bh(&exeq->lock);
@@ -1908,6 +1945,7 @@ void bnx2x_init_mac_obj(struct bnx2x *bp,
                 bnx2x_exe_queue_init(bp,
                                      &mac_obj->exe_queue, 1, qable_obj,
                                      bnx2x_validate_vlan_mac,
+                                     bnx2x_remove_vlan_mac,
                                      bnx2x_optimize_vlan_mac,
                                      bnx2x_execute_vlan_mac,
                                      bnx2x_exeq_get_mac);
@@ -1924,6 +1962,7 @@ void bnx2x_init_mac_obj(struct bnx2x *bp,
                 bnx2x_exe_queue_init(bp,
                                      &mac_obj->exe_queue, CLASSIFY_RULES_COUNT,
                                      qable_obj, bnx2x_validate_vlan_mac,
+                                     bnx2x_remove_vlan_mac,
                                      bnx2x_optimize_vlan_mac,
                                      bnx2x_execute_vlan_mac,
                                      bnx2x_exeq_get_mac);
@@ -1963,6 +2002,7 @@ void bnx2x_init_vlan_obj(struct bnx2x *bp,
                 bnx2x_exe_queue_init(bp,
                                      &vlan_obj->exe_queue, CLASSIFY_RULES_COUNT,
                                      qable_obj, bnx2x_validate_vlan_mac,
+                                     bnx2x_remove_vlan_mac,
                                      bnx2x_optimize_vlan_mac,
                                      bnx2x_execute_vlan_mac,
                                      bnx2x_exeq_get_vlan);
@@ -2009,6 +2049,7 @@ void bnx2x_init_vlan_mac_obj(struct bnx2x *bp,
                 bnx2x_exe_queue_init(bp,
                                      &vlan_mac_obj->exe_queue, 1, qable_obj,
                                      bnx2x_validate_vlan_mac,
+                                     bnx2x_remove_vlan_mac,
                                      bnx2x_optimize_vlan_mac,
                                      bnx2x_execute_vlan_mac,
                                      bnx2x_exeq_get_vlan_mac);
@@ -2025,6 +2066,7 @@ void bnx2x_init_vlan_mac_obj(struct bnx2x *bp,
                                      &vlan_mac_obj->exe_queue,
                                      CLASSIFY_RULES_COUNT,
                                      qable_obj, bnx2x_validate_vlan_mac,
+                                     bnx2x_remove_vlan_mac,
                                      bnx2x_optimize_vlan_mac,
                                      bnx2x_execute_vlan_mac,
                                      bnx2x_exeq_get_vlan_mac);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
index 992308ff82e8..66da39f0c84a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
@@ -161,6 +161,10 @@ typedef int (*exe_q_validate)(struct bnx2x *bp,
                               union bnx2x_qable_obj *o,
                               struct bnx2x_exeq_elem *elem);
 
+typedef int (*exe_q_remove)(struct bnx2x *bp,
+                            union bnx2x_qable_obj *o,
+                            struct bnx2x_exeq_elem *elem);
+
 /**
  * @return positive is entry was optimized, 0 - if not, negative
  *         in case of an error.
@@ -203,11 +207,18 @@ struct bnx2x_exe_queue_obj {
          */
         exe_q_validate          validate;
 
+        /**
+         * Called before removing pending commands, cleaning allocated
+         * resources (e.g., credits from validate)
+         */
+         exe_q_remove           remove;
 
         /**
          * This will try to cancel the current pending commands list
          * considering the new command.
          *
+         * Returns the number of optimized commands or a negative error code
+         *
          * Must run under exe_queue->lock
          */
         exe_q_optimize          optimize;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index bc0121ac291e..1adef266fcd5 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -1081,17 +1081,17 @@ static int bnx2x_storm_stats_update(struct bnx2x *bp)
                estats->rx_stat_ifhcinbadoctets_lo);
 
         ADD_64(fstats->total_bytes_received_hi,
-               tfunc->rcv_error_bytes.hi,
+               le32_to_cpu(tfunc->rcv_error_bytes.hi),
                fstats->total_bytes_received_lo,
-               tfunc->rcv_error_bytes.lo);
+               le32_to_cpu(tfunc->rcv_error_bytes.lo));
 
         memcpy(estats, &(fstats->total_bytes_received_hi),
                sizeof(struct host_func_stats) - 2*sizeof(u32));
 
         ADD_64(estats->error_bytes_received_hi,
-               tfunc->rcv_error_bytes.hi,
+               le32_to_cpu(tfunc->rcv_error_bytes.hi),
                estats->error_bytes_received_lo,
-               tfunc->rcv_error_bytes.lo);
+               le32_to_cpu(tfunc->rcv_error_bytes.lo));
 
         ADD_64(estats->etherstatsoverrsizepkts_hi,
                estats->rx_stat_dot3statsframestoolong_hi,
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index d529af99157d..a1f2e0fed78b 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -6667,14 +6667,9 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 iph = ip_hdr(skb);
                 tcp_opt_len = tcp_optlen(skb);
 
-                if (skb_is_gso_v6(skb)) {
-                        hdr_len = skb_headlen(skb) - ETH_HLEN;
-                } else {
-                        u32 ip_tcp_len;
-
-                        ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr);
-                        hdr_len = ip_tcp_len + tcp_opt_len;
+                hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb) - ETH_HLEN;
 
+                if (!skb_is_gso_v6(skb)) {
                         iph->check = 0;
                         iph->tot_len = htons(mss + hdr_len);
                 }
diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
index 9b44ec8096ba..803ea32aa99d 100644
--- a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
+++ b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
@@ -946,7 +946,7 @@ bnad_get_flash_partition_by_offset(struct bnad *bnad, u32 offset,
 
         flash_attr = kzalloc(sizeof(struct bfa_flash_attr), GFP_KERNEL);
         if (!flash_attr)
-                return -ENOMEM;
+                return 0;
 
         fcomp.bnad = bnad;
         fcomp.comp_status = 0;
@@ -958,7 +958,7 @@ bnad_get_flash_partition_by_offset(struct bnad *bnad, u32 offset,
         if (ret != BFA_STATUS_OK) {
                 spin_unlock_irqrestore(&bnad->bna_lock, flags);
                 kfree(flash_attr);
-                goto out_err;
+                return 0;
         }
         spin_unlock_irqrestore(&bnad->bna_lock, flags);
         wait_for_completion(&fcomp.comp);
@@ -978,8 +978,6 @@ bnad_get_flash_partition_by_offset(struct bnad *bnad, u32 offset,
         }
         kfree(flash_attr);
         return flash_part;
-out_err:
-        return -EINVAL;
 }
 
 static int
@@ -1006,7 +1004,7 @@ bnad_get_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
         /* Query the flash partition based on the offset */
         flash_part = bnad_get_flash_partition_by_offset(bnad,
                                 eeprom->offset, &base_offset);
-        if (flash_part <= 0)
+        if (flash_part == 0)
                 return -EFAULT;
 
         fcomp.bnad = bnad;
@@ -1048,7 +1046,7 @@ bnad_set_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
         /* Query the flash partition based on the offset */
         flash_part = bnad_get_flash_partition_by_offset(bnad,
                                 eeprom->offset, &base_offset);
-        if (flash_part <= 0)
+        if (flash_part == 0)
                 return -EFAULT;
 
         fcomp.bnad = bnad;
diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
index fe0c29acdbe6..ee93a2087fe6 100644
--- a/drivers/net/ethernet/cisco/enic/enic.h
+++ b/drivers/net/ethernet/cisco/enic/enic.h
@@ -32,7 +32,7 @@
 
 #define DRV_NAME                "enic"
 #define DRV_DESCRIPTION         "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION             "2.1.1.28"
+#define DRV_VERSION             "2.1.1.31"
 #define DRV_COPYRIGHT           "Copyright 2008-2011 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX           6
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 2fd9db4b1be5..ab3f67f980d8 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -57,11 +57,13 @@
 
 #define PCI_DEVICE_ID_CISCO_VIC_ENET         0x0043  /* ethernet vnic */
 #define PCI_DEVICE_ID_CISCO_VIC_ENET_DYN     0x0044  /* enet dynamic vnic */
+#define PCI_DEVICE_ID_CISCO_VIC_ENET_VF      0x0071  /* enet SRIOV VF */
 
 /* Supported devices */
 static DEFINE_PCI_DEVICE_TABLE(enic_id_table) = {
         { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET) },
         { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_DYN) },
+        { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_VF) },
         { 0, }  /* end of table */
 };
 
@@ -132,6 +134,11 @@ int enic_sriov_enabled(struct enic *enic)
         return (enic->priv_flags & ENIC_SRIOV_ENABLED) ? 1 : 0;
 }
 
+static int enic_is_sriov_vf(struct enic *enic)
+{
+        return enic->pdev->device == PCI_DEVICE_ID_CISCO_VIC_ENET_VF;
+}
+
 int enic_is_valid_vf(struct enic *enic, int vf)
 {
 #ifdef CONFIG_PCI_IOV
@@ -437,7 +444,7 @@ static void enic_mtu_check(struct enic *enic)
 
         if (mtu && mtu != enic->port_mtu) {
                 enic->port_mtu = mtu;
-                if (enic_is_dynamic(enic)) {
+                if (enic_is_dynamic(enic) || enic_is_sriov_vf(enic)) {
                         mtu = max_t(int, ENIC_MIN_MTU,
                                 min_t(int, ENIC_MAX_MTU, mtu));
                         if (mtu != netdev->mtu)
@@ -849,7 +856,7 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr)
 {
         struct enic *enic = netdev_priv(netdev);
 
-        if (enic_is_dynamic(enic)) {
+        if (enic_is_dynamic(enic) || enic_is_sriov_vf(enic)) {
                 if (!is_valid_ether_addr(addr) && !is_zero_ether_addr(addr))
                         return -EADDRNOTAVAIL;
         } else {
@@ -1608,7 +1615,7 @@ static int enic_open(struct net_device *netdev)
         for (i = 0; i < enic->rq_count; i++)
                 vnic_rq_enable(&enic->rq[i]);
 
-        if (!enic_is_dynamic(enic))
+        if (!enic_is_dynamic(enic) && !enic_is_sriov_vf(enic))
                 enic_dev_add_station_addr(enic);
 
         enic_set_rx_mode(netdev);
@@ -1659,7 +1666,7 @@ static int enic_stop(struct net_device *netdev)
         netif_carrier_off(netdev);
         netif_tx_disable(netdev);
 
-        if (!enic_is_dynamic(enic))
+        if (!enic_is_dynamic(enic) && !enic_is_sriov_vf(enic))
                 enic_dev_del_station_addr(enic);
 
         for (i = 0; i < enic->wq_count; i++) {
@@ -1696,7 +1703,7 @@ static int enic_change_mtu(struct net_device *netdev, int new_mtu)
         if (new_mtu < ENIC_MIN_MTU || new_mtu > ENIC_MAX_MTU)
                 return -EINVAL;
 
-        if (enic_is_dynamic(enic))
+        if (enic_is_dynamic(enic) || enic_is_sriov_vf(enic))
                 return -EOPNOTSUPP;
 
         if (running)
@@ -2263,10 +2270,10 @@ static int __devinit enic_probe(struct pci_dev *pdev,
         int using_dac = 0;
         unsigned int i;
         int err;
-        int num_pps = 1;
 #ifdef CONFIG_PCI_IOV
         int pos = 0;
 #endif
+        int num_pps = 1;
 
         /* Allocate net device structure and initialize.  Private
          * instance data is initialized to zero.
@@ -2376,14 +2383,14 @@ static int __devinit enic_probe(struct pci_dev *pdev,
                         num_pps = enic->num_vfs;
                 }
         }
-
 #endif
+
         /* Allocate structure for port profiles */
         enic->pp = kcalloc(num_pps, sizeof(*enic->pp), GFP_KERNEL);
         if (!enic->pp) {
                 pr_err("port profile alloc failed, aborting\n");
                 err = -ENOMEM;
-                goto err_out_disable_sriov;
+                goto err_out_disable_sriov_pp;
         }
 
         /* Issue device open to get device in known state
@@ -2392,7 +2399,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
         err = enic_dev_open(enic);
         if (err) {
                 dev_err(dev, "vNIC dev open failed, aborting\n");
-                goto err_out_free_pp;
+                goto err_out_disable_sriov;
         }
 
         /* Setup devcmd lock
@@ -2426,7 +2433,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
          * called later by an upper layer.
          */
 
-        if (!enic_is_dynamic(enic)) {
+        if (!enic_is_dynamic(enic) && !enic_is_sriov_vf(enic)) {
                 err = vnic_dev_init(enic->vdev, 0);
                 if (err) {
                         dev_err(dev, "vNIC dev init failed, aborting\n");
@@ -2460,8 +2467,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
         (void)enic_change_mtu(netdev, enic->port_mtu);
 
 #ifdef CONFIG_PCI_IOV
-        if (enic_is_dynamic(enic) && pdev->is_virtfn &&
-                is_zero_ether_addr(enic->mac_addr))
+        if (enic_is_sriov_vf(enic) && is_zero_ether_addr(enic->mac_addr))
                 random_ether_addr(enic->mac_addr);
 #endif
 
@@ -2474,7 +2480,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
         enic->tx_coalesce_usecs = enic->config.intr_timer_usec;
         enic->rx_coalesce_usecs = enic->tx_coalesce_usecs;
 
-        if (enic_is_dynamic(enic))
+        if (enic_is_dynamic(enic) || enic_is_sriov_vf(enic))
                 netdev->netdev_ops = &enic_netdev_dynamic_ops;
         else
                 netdev->netdev_ops = &enic_netdev_ops;
@@ -2516,17 +2522,17 @@ err_out_dev_deinit:
         enic_dev_deinit(enic);
 err_out_dev_close:
         vnic_dev_close(enic->vdev);
-err_out_free_pp:
-        kfree(enic->pp);
 err_out_disable_sriov:
+        kfree(enic->pp);
+err_out_disable_sriov_pp:
 #ifdef CONFIG_PCI_IOV
         if (enic_sriov_enabled(enic)) {
                 pci_disable_sriov(pdev);
                 enic->priv_flags &= ~ENIC_SRIOV_ENABLED;
         }
 err_out_vnic_unregister:
-        vnic_dev_unregister(enic->vdev);
 #endif
+        vnic_dev_unregister(enic->vdev);
 err_out_iounmap:
         enic_iounmap(enic);
 err_out_release_regions:
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 6db6b6ae5e9b..802e5ddef8a8 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -716,12 +716,8 @@ static int
 be_do_flash(struct net_device *netdev, struct ethtool_flash *efl)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
-        char file_name[ETHTOOL_FLASH_MAX_FILENAME];
 
-        file_name[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0;
-        strcpy(file_name, efl->data);
-
-        return be_load_fw(adapter, file_name);
+        return be_load_fw(adapter, efl->data);
 }
 
 static int
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index a6bcdb5cd2be..e703d64434f8 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1786,8 +1786,7 @@ static void be_rx_queues_destroy(struct be_adapter *adapter)
 static u32 be_num_rxqs_want(struct be_adapter *adapter)
 {
         if ((adapter->function_caps & BE_FUNCTION_CAPS_RSS) &&
-             !sriov_enabled(adapter) && be_physfn(adapter) &&
-             !be_is_mc(adapter)) {
+             !sriov_enabled(adapter) && be_physfn(adapter)) {
                 return 1 + MAX_RSS_QS; /* one default non-RSS queue */
         } else {
                 dev_warn(&adapter->pdev->dev,
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index fb5579a3b19d..47f85c337cf7 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -25,6 +25,7 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
index a127cb2476c7..bb336a0959c9 100644
--- a/drivers/net/ethernet/faraday/ftmac100.c
+++ b/drivers/net/ethernet/faraday/ftmac100.c
@@ -25,6 +25,7 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mii.h>
 #include <linux/module.h>
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index 7b25e9cf13f6..e92ef1bd732a 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -986,11 +986,11 @@ static int fec_enet_mii_probe(struct net_device *ndev)
                 printk(KERN_INFO
                         "%s: no PHY, assuming direct connection to switch\n",
                         ndev->name);
-                strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE);
+                strncpy(mdio_bus_id, "fixed-0", MII_BUS_ID_SIZE);
                 phy_id = 0;
         }
 
-        snprintf(phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
+        snprintf(phy_name, sizeof(phy_name), PHY_ID_FMT, mdio_bus_id, phy_id);
         phy_dev = phy_connect(ndev, phy_name, &fec_enet_adjust_link, 0,
                               fep->phy_interface);
         if (IS_ERR(phy_dev)) {
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 669ca3800c01..d94d64b5d695 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -4740,12 +4740,14 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
                 e1000_setup_rctl(adapter);
                 e1000_set_rx_mode(netdev);
 
+                rctl = er32(RCTL);
+
                 /* turn on all-multi mode if wake on multicast is enabled */
-                if (wufc & E1000_WUFC_MC) {
-                        rctl = er32(RCTL);
+                if (wufc & E1000_WUFC_MC)
                         rctl |= E1000_RCTL_MPE;
-                        ew32(RCTL, rctl);
-                }
+
+                /* enable receives in the hardware */
+                ew32(RCTL, rctl | E1000_RCTL_EN);
 
                 if (hw->mac_type >= e1000_82540) {
                         ctrl = er32(CTRL);
diff --git a/drivers/net/ethernet/intel/igb/Makefile b/drivers/net/ethernet/intel/igb/Makefile
index c6e4621b6262..6565c463185c 100644
--- a/drivers/net/ethernet/intel/igb/Makefile
+++ b/drivers/net/ethernet/intel/igb/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel 82575 PCI-Express Ethernet Linux driver
-# Copyright(c) 1999 - 2011 Intel Corporation.
+# Copyright(c) 1999 - 2012 Intel Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
index b8e20f037d0a..08bdc33715ee 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.c
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h
index 08a757eb6608..b927d79ab536 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.h
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h
index f5fc5725ea94..aed217449f0d 100644
--- a/drivers/net/ethernet/intel/igb/e1000_defines.h
+++ b/drivers/net/ethernet/intel/igb/e1000_defines.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
index 4519a1367170..f67cbd3fa307 100644
--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c
index 73aac082c44d..f57338afd71f 100644
--- a/drivers/net/ethernet/intel/igb/e1000_mac.c
+++ b/drivers/net/ethernet/intel/igb/e1000_mac.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -151,7 +151,7 @@ void igb_clear_vfta_i350(struct e1000_hw *hw)
  *  Writes value at the given offset in the register array which stores
  *  the VLAN filter table.
  **/
-void igb_write_vfta_i350(struct e1000_hw *hw, u32 offset, u32 value)
+static void igb_write_vfta_i350(struct e1000_hw *hw, u32 offset, u32 value)
 {
         int i;
 
diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.h b/drivers/net/ethernet/intel/igb/e1000_mac.h
index e45996b4ea34..cbddc4e51e30 100644
--- a/drivers/net/ethernet/intel/igb/e1000_mac.h
+++ b/drivers/net/ethernet/intel/igb/e1000_mac.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_mbx.c b/drivers/net/ethernet/intel/igb/e1000_mbx.c
index 469d95eaa154..5988b8958baf 100644
--- a/drivers/net/ethernet/intel/igb/e1000_mbx.c
+++ b/drivers/net/ethernet/intel/igb/e1000_mbx.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_mbx.h b/drivers/net/ethernet/intel/igb/e1000_mbx.h
index eddb0f83dcea..dbcfa3d5caec 100644
--- a/drivers/net/ethernet/intel/igb/e1000_mbx.h
+++ b/drivers/net/ethernet/intel/igb/e1000_mbx.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_nvm.c b/drivers/net/ethernet/intel/igb/e1000_nvm.c
index 40407124e722..fa2c6ba62139 100644
--- a/drivers/net/ethernet/intel/igb/e1000_nvm.c
+++ b/drivers/net/ethernet/intel/igb/e1000_nvm.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_nvm.h b/drivers/net/ethernet/intel/igb/e1000_nvm.h
index a2a7ca9fa733..825b0228cac0 100644
--- a/drivers/net/ethernet/intel/igb/e1000_nvm.h
+++ b/drivers/net/ethernet/intel/igb/e1000_nvm.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2011 Intel Corporation.
+  Copyright(c) 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index b17d7c20f817..789de5b83aad 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.h b/drivers/net/ethernet/intel/igb/e1000_phy.h
index 8510797b9d81..4c32ac66ff39 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.h
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h
index 0a860bc1198e..ccdf36d503fd 100644
--- a/drivers/net/ethernet/intel/igb/e1000_regs.h
+++ b/drivers/net/ethernet/intel/igb/e1000_regs.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index 3d12e67eebb4..8e33bdd33eea 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 7998bf4d5946..aa399a8a8f0d 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 01e5e89ef959..94be6c32fa7d 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) Gigabit Ethernet Linux driver
-  Copyright(c) 2007-2011 Intel Corporation.
+  Copyright(c) 2007-2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -68,7 +68,7 @@ char igb_driver_name[] = "igb";
 char igb_driver_version[] = DRV_VERSION;
 static const char igb_driver_string[] =
                                 "Intel(R) Gigabit Ethernet Network Driver";
-static const char igb_copyright[] = "Copyright (c) 2007-2011 Intel Corporation.";
+static const char igb_copyright[] = "Copyright (c) 2007-2012 Intel Corporation.";
 
 static const struct e1000_info *igb_info_tbl[] = {
         [board_82575] = &e1000_82575_info,
@@ -4003,8 +4003,8 @@ set_itr_now:
         }
 }
 
-void igb_tx_ctxtdesc(struct igb_ring *tx_ring, u32 vlan_macip_lens,
-                     u32 type_tucmd, u32 mss_l4len_idx)
+static void igb_tx_ctxtdesc(struct igb_ring *tx_ring, u32 vlan_macip_lens,
+                            u32 type_tucmd, u32 mss_l4len_idx)
 {
         struct e1000_adv_tx_context_desc *context_desc;
         u16 i = tx_ring->next_to_use;
@@ -5012,7 +5012,8 @@ static int igb_find_enabled_vfs(struct igb_adapter *adapter)
         vf_devfn = pdev->devfn + 0x80;
         pvfdev = pci_get_device(hw->vendor_id, device_id, NULL);
         while (pvfdev) {
-                if (pvfdev->devfn == vf_devfn)
+                if (pvfdev->devfn == vf_devfn &&
+                    (pvfdev->bus->number >= pdev->bus->number))
                         vfs_found++;
                 vf_devfn += vf_stride;
                 pvfdev = pci_get_device(hw->vendor_id,
@@ -5623,7 +5624,7 @@ static irqreturn_t igb_intr(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-void igb_ring_irq_enable(struct igb_q_vector *q_vector)
+static void igb_ring_irq_enable(struct igb_q_vector *q_vector)
 {
         struct igb_adapter *adapter = q_vector->adapter;
         struct e1000_hw *hw = &adapter->hw;
diff --git a/drivers/net/ethernet/intel/igbvf/Makefile b/drivers/net/ethernet/intel/igbvf/Makefile
index 0fa3db3dd8b6..044b0ad5fcb9 100644
--- a/drivers/net/ethernet/intel/igbvf/Makefile
+++ b/drivers/net/ethernet/intel/igbvf/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel(R) 82576 Virtual Function Linux driver
-# Copyright(c) 2009 - 2010 Intel Corporation.
+# Copyright(c) 2009 - 2012 Intel Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igbvf/defines.h b/drivers/net/ethernet/intel/igbvf/defines.h
index 79f2604673fe..33f40d3474ae 100644
--- a/drivers/net/ethernet/intel/igbvf/defines.h
+++ b/drivers/net/ethernet/intel/igbvf/defines.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c
index 7b600a1f6366..db7dce2351c2 100644
--- a/drivers/net/ethernet/intel/igbvf/ethtool.c
+++ b/drivers/net/ethernet/intel/igbvf/ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 Intel Corporation.
+  Copyright(c) 2009 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -468,6 +468,5 @@ static const struct ethtool_ops igbvf_ethtool_ops = {
 
 void igbvf_set_ethtool_ops(struct net_device *netdev)
 {
-        /* have to "undeclare" const on this struct to remove warnings */
-        SET_ETHTOOL_OPS(netdev, (struct ethtool_ops *)&igbvf_ethtool_ops);
+        SET_ETHTOOL_OPS(netdev, &igbvf_ethtool_ops);
 }
diff --git a/drivers/net/ethernet/intel/igbvf/igbvf.h b/drivers/net/ethernet/intel/igbvf/igbvf.h
index fd4a7b780fdd..2c6d87e4d3d9 100644
--- a/drivers/net/ethernet/intel/igbvf/igbvf.h
+++ b/drivers/net/ethernet/intel/igbvf/igbvf.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 Intel Corporation.
+  Copyright(c) 2009 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igbvf/mbx.c b/drivers/net/ethernet/intel/igbvf/mbx.c
index 048aae248d06..b4b65bc9fc5d 100644
--- a/drivers/net/ethernet/intel/igbvf/mbx.c
+++ b/drivers/net/ethernet/intel/igbvf/mbx.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 Intel Corporation.
+  Copyright(c) 2009 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igbvf/mbx.h b/drivers/net/ethernet/intel/igbvf/mbx.h
index c2883c45d477..24370bcb0e22 100644
--- a/drivers/net/ethernet/intel/igbvf/mbx.h
+++ b/drivers/net/ethernet/intel/igbvf/mbx.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index fd3da3076c2f..4e9141cfe81d 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 Intel Corporation.
+  Copyright(c) 2009 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -53,7 +53,7 @@ const char igbvf_driver_version[] = DRV_VERSION;
 static const char igbvf_driver_string[] =
                   "Intel(R) Gigabit Virtual Function Network Driver";
 static const char igbvf_copyright[] =
-                  "Copyright (c) 2009 - 2011 Intel Corporation.";
+                  "Copyright (c) 2009 - 2012 Intel Corporation.";
 
 static int igbvf_poll(struct napi_struct *napi, int budget);
 static void igbvf_reset(struct igbvf_adapter *);
@@ -1194,11 +1194,6 @@ static int igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
 
-        igbvf_irq_disable(adapter);
-
-        if (!test_bit(__IGBVF_DOWN, &adapter->state))
-                igbvf_irq_enable(adapter);
-
         if (hw->mac.ops.set_vfta(hw, vid, false)) {
                 dev_err(&adapter->pdev->dev,
                         "Failed to remove vlan id %d\n", vid);
diff --git a/drivers/net/ethernet/intel/igbvf/regs.h b/drivers/net/ethernet/intel/igbvf/regs.h
index 77e18d3d6b15..7dc6341715dc 100644
--- a/drivers/net/ethernet/intel/igbvf/regs.h
+++ b/drivers/net/ethernet/intel/igbvf/regs.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 Intel Corporation.
+  Copyright(c) 2009 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c
index af3822f9ea9a..19551977b352 100644
--- a/drivers/net/ethernet/intel/igbvf/vf.c
+++ b/drivers/net/ethernet/intel/igbvf/vf.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 Intel Corporation.
+  Copyright(c) 2009 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
index d7ed58fcd9bb..57db3c68dfcd 100644
--- a/drivers/net/ethernet/intel/igbvf/vf.h
+++ b/drivers/net/ethernet/intel/igbvf/vf.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 Intel Corporation.
+  Copyright(c) 2009 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile
index 7d7387fbdecd..7a16177a12a5 100644
--- a/drivers/net/ethernet/intel/ixgbe/Makefile
+++ b/drivers/net/ethernet/intel/ixgbe/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel 10 Gigabit PCI Express Linux driver
-# Copyright(c) 1999 - 2010 Intel Corporation.
+# Copyright(c) 1999 - 2012 Intel Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 258164d6d45a..e6aeb64105a4 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
index ef2afefb0cd4..b406c367b190 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
index 772072147bea..4e59083a3de2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index a3aa6333073f..383b9413292e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
index 863f9c1f145b..2c834c46bba1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -75,7 +75,7 @@ s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw,
 s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw);
 s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw);
 s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval);
-s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packtetbuf_num);
+s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num);
 s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw);
 
 s32 ixgbe_validate_mac_addr(u8 *mac_addr);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
index 318caf4bf623..8bfaaee5ac5b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
index e162775064da..24333b718166 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
index fcd0e479721f..d3695edfcb8b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h
index 2f318935561a..ba835708fcac 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
index 32cd97bc794d..888a419dc3d9 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h
index a59d5dc59d04..4dec47faeb00 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index da31735311f1..79a92fe987b9 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -112,6 +112,8 @@ static u8 ixgbe_dcbnl_get_state(struct net_device *netdev)
 static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
 {
         u8 err = 0;
+        u8 prio_tc[MAX_USER_PRIORITY] = {0};
+        int i;
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
         /* Fail command if not in CEE mode */
@@ -122,10 +124,15 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
         if (!!state != !(adapter->flags & IXGBE_FLAG_DCB_ENABLED))
                 return err;
 
-        if (state > 0)
+        if (state > 0) {
                 err = ixgbe_setup_tc(netdev, adapter->dcb_cfg.num_tcs.pg_tcs);
-        else
+                ixgbe_dcb_unpack_map(&adapter->dcb_cfg, DCB_TX_CONFIG, prio_tc);
+        } else {
                 err = ixgbe_setup_tc(netdev, 0);
+        }
+
+        for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)
+                netdev_set_prio_tc_map(netdev, i, prio_tc[i]);
 
         return err;
 }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index da7e580f517a..a62975480e37 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -58,7 +58,7 @@ struct ixgbe_stats {
                                 sizeof(((struct rtnl_link_stats64 *)0)->m), \
                                 offsetof(struct rtnl_link_stats64, m)
 
-static struct ixgbe_stats ixgbe_gstrings_stats[] = {
+static const struct ixgbe_stats ixgbe_gstrings_stats[] = {
         {"rx_packets", IXGBE_NETDEV_STAT(rx_packets)},
         {"tx_packets", IXGBE_NETDEV_STAT(tx_packets)},
         {"rx_bytes", IXGBE_NETDEV_STAT(rx_bytes)},
@@ -120,19 +120,23 @@ static struct ixgbe_stats ixgbe_gstrings_stats[] = {
 #endif /* IXGBE_FCOE */
 };
 
-#define IXGBE_QUEUE_STATS_LEN \
-        ((((struct ixgbe_adapter *)netdev_priv(netdev))->num_tx_queues + \
-        ((struct ixgbe_adapter *)netdev_priv(netdev))->num_rx_queues) * \
+/* ixgbe allocates num_tx_queues and num_rx_queues symmetrically so
+ * we set the num_rx_queues to evaluate to num_tx_queues. This is
+ * used because we do not have a good way to get the max number of
+ * rx queues with CONFIG_RPS disabled.
+ */
+#define IXGBE_NUM_RX_QUEUES netdev->num_tx_queues
+
+#define IXGBE_QUEUE_STATS_LEN ( \
+        (netdev->num_tx_queues + IXGBE_NUM_RX_QUEUES) * \
         (sizeof(struct ixgbe_queue_stats) / sizeof(u64)))
 #define IXGBE_GLOBAL_STATS_LEN ARRAY_SIZE(ixgbe_gstrings_stats)
 #define IXGBE_PB_STATS_LEN ( \
-                 (((struct ixgbe_adapter *)netdev_priv(netdev))->flags & \
-                 IXGBE_FLAG_DCB_ENABLED) ? \
-                 (sizeof(((struct ixgbe_adapter *)0)->stats.pxonrxc) + \
-                  sizeof(((struct ixgbe_adapter *)0)->stats.pxontxc) + \
-                  sizeof(((struct ixgbe_adapter *)0)->stats.pxoffrxc) + \
-                  sizeof(((struct ixgbe_adapter *)0)->stats.pxofftxc)) \
-                  / sizeof(u64) : 0)
+                        (sizeof(((struct ixgbe_adapter *)0)->stats.pxonrxc) + \
+                         sizeof(((struct ixgbe_adapter *)0)->stats.pxontxc) + \
+                         sizeof(((struct ixgbe_adapter *)0)->stats.pxoffrxc) + \
+                         sizeof(((struct ixgbe_adapter *)0)->stats.pxofftxc)) \
+                        / sizeof(u64))
 #define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + \
                          IXGBE_PB_STATS_LEN + \
                          IXGBE_QUEUE_STATS_LEN)
@@ -1078,8 +1082,15 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,
                 data[i] = (ixgbe_gstrings_stats[i].sizeof_stat ==
                            sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
         }
-        for (j = 0; j < adapter->num_tx_queues; j++) {
+        for (j = 0; j < IXGBE_NUM_RX_QUEUES; j++) {
                 ring = adapter->tx_ring[j];
+                if (!ring) {
+                        data[i] = 0;
+                        data[i+1] = 0;
+                        i += 2;
+                        continue;
+                }
+
                 do {
                         start = u64_stats_fetch_begin_bh(&ring->syncp);
                         data[i]   = ring->stats.packets;
@@ -1087,8 +1098,15 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,
                 } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
                 i += 2;
         }
-        for (j = 0; j < adapter->num_rx_queues; j++) {
+        for (j = 0; j < IXGBE_NUM_RX_QUEUES; j++) {
                 ring = adapter->rx_ring[j];
+                if (!ring) {
+                        data[i] = 0;
+                        data[i+1] = 0;
+                        i += 2;
+                        continue;
+                }
+
                 do {
                         start = u64_stats_fetch_begin_bh(&ring->syncp);
                         data[i]   = ring->stats.packets;
@@ -1096,22 +1114,20 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,
                 } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
                 i += 2;
         }
-        if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                for (j = 0; j < MAX_TX_PACKET_BUFFERS; j++) {
-                        data[i++] = adapter->stats.pxontxc[j];
-                        data[i++] = adapter->stats.pxofftxc[j];
-                }
-                for (j = 0; j < MAX_RX_PACKET_BUFFERS; j++) {
-                        data[i++] = adapter->stats.pxonrxc[j];
-                        data[i++] = adapter->stats.pxoffrxc[j];
-                }
+
+        for (j = 0; j < IXGBE_MAX_PACKET_BUFFERS; j++) {
+                data[i++] = adapter->stats.pxontxc[j];
+                data[i++] = adapter->stats.pxofftxc[j];
+        }
+        for (j = 0; j < IXGBE_MAX_PACKET_BUFFERS; j++) {
+                data[i++] = adapter->stats.pxonrxc[j];
+                data[i++] = adapter->stats.pxoffrxc[j];
         }
 }
 
 static void ixgbe_get_strings(struct net_device *netdev, u32 stringset,
                               u8 *data)
 {
-        struct ixgbe_adapter *adapter = netdev_priv(netdev);
         char *p = (char *)data;
         int i;
 
@@ -1126,31 +1142,29 @@ static void ixgbe_get_strings(struct net_device *netdev, u32 stringset,
                                ETH_GSTRING_LEN);
                         p += ETH_GSTRING_LEN;
                 }
-                for (i = 0; i < adapter->num_tx_queues; i++) {
+                for (i = 0; i < netdev->num_tx_queues; i++) {
                         sprintf(p, "tx_queue_%u_packets", i);
                         p += ETH_GSTRING_LEN;
                         sprintf(p, "tx_queue_%u_bytes", i);
                         p += ETH_GSTRING_LEN;
                 }
-                for (i = 0; i < adapter->num_rx_queues; i++) {
+                for (i = 0; i < IXGBE_NUM_RX_QUEUES; i++) {
                         sprintf(p, "rx_queue_%u_packets", i);
                         p += ETH_GSTRING_LEN;
                         sprintf(p, "rx_queue_%u_bytes", i);
                         p += ETH_GSTRING_LEN;
                 }
-                if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                        for (i = 0; i < MAX_TX_PACKET_BUFFERS; i++) {
-                                sprintf(p, "tx_pb_%u_pxon", i);
-                                p += ETH_GSTRING_LEN;
-                                sprintf(p, "tx_pb_%u_pxoff", i);
-                                p += ETH_GSTRING_LEN;
-                        }
-                        for (i = 0; i < MAX_RX_PACKET_BUFFERS; i++) {
-                                sprintf(p, "rx_pb_%u_pxon", i);
-                                p += ETH_GSTRING_LEN;
-                                sprintf(p, "rx_pb_%u_pxoff", i);
-                                p += ETH_GSTRING_LEN;
-                        }
+                for (i = 0; i < IXGBE_MAX_PACKET_BUFFERS; i++) {
+                        sprintf(p, "tx_pb_%u_pxon", i);
+                        p += ETH_GSTRING_LEN;
+                        sprintf(p, "tx_pb_%u_pxoff", i);
+                        p += ETH_GSTRING_LEN;
+                }
+                for (i = 0; i < IXGBE_MAX_PACKET_BUFFERS; i++) {
+                        sprintf(p, "rx_pb_%u_pxon", i);
+                        p += ETH_GSTRING_LEN;
+                        sprintf(p, "rx_pb_%u_pxoff", i);
+                        p += ETH_GSTRING_LEN;
                 }
                 /* BUG_ON(p - data != IXGBE_STATS_LEN * ETH_GSTRING_LEN); */
                 break;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
index d18d6157dd2c..4bc794249801 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h
index 261fd62dda18..1dbed17c8107 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 1ee5d0fbb905..3dc6cef58107 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -64,7 +64,7 @@ char ixgbe_default_device_descr[] =
         __stringify(BUILD) "-k"
 const char ixgbe_driver_version[] = DRV_VERSION;
 static const char ixgbe_copyright[] =
-                                "Copyright (c) 1999-2011 Intel Corporation.";
+                                "Copyright (c) 1999-2012 Intel Corporation.";
 
 static const struct ixgbe_info *ixgbe_info_tbl[] = {
         [board_82598] = &ixgbe_82598_info,
@@ -2633,22 +2633,22 @@ static void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter,
         /*
          * we must limit the number of descriptors so that the
          * total size of max desc * buf_len is not greater
-         * than 65535
+         * than 65536
          */
         if (ring_is_ps_enabled(ring)) {
-#if (MAX_SKB_FRAGS > 16)
+#if (PAGE_SIZE < 8192)
                 rscctrl |= IXGBE_RSCCTL_MAXDESC_16;
-#elif (MAX_SKB_FRAGS > 8)
+#elif (PAGE_SIZE < 16384)
                 rscctrl |= IXGBE_RSCCTL_MAXDESC_8;
-#elif (MAX_SKB_FRAGS > 4)
+#elif (PAGE_SIZE < 32768)
                 rscctrl |= IXGBE_RSCCTL_MAXDESC_4;
 #else
                 rscctrl |= IXGBE_RSCCTL_MAXDESC_1;
 #endif
         } else {
-                if (rx_buf_len < IXGBE_RXBUFFER_4K)
+                if (rx_buf_len <= IXGBE_RXBUFFER_4K)
                         rscctrl |= IXGBE_RSCCTL_MAXDESC_16;
-                else if (rx_buf_len < IXGBE_RXBUFFER_8K)
+                else if (rx_buf_len <= IXGBE_RXBUFFER_8K)
                         rscctrl |= IXGBE_RSCCTL_MAXDESC_8;
                 else
                         rscctrl |= IXGBE_RSCCTL_MAXDESC_4;
@@ -2830,7 +2830,7 @@ static void ixgbe_configure_virtualization(struct ixgbe_adapter *adapter)
         IXGBE_WRITE_REG(hw, IXGBE_VT_CTL, vmdctl | vt_reg_bits);
 
         vf_shift = adapter->num_vfs % 32;
-        reg_offset = (adapter->num_vfs > 32) ? 1 : 0;
+        reg_offset = (adapter->num_vfs >= 32) ? 1 : 0;
 
         /* Enable only the PF's pool for Tx/Rx */
         IXGBE_WRITE_REG(hw, IXGBE_VFRE(reg_offset), (1 << vf_shift));
@@ -4330,6 +4330,10 @@ static int ixgbe_set_num_queues(struct ixgbe_adapter *adapter)
         adapter->num_tx_queues = 1;
 
 done:
+        if ((adapter->netdev->reg_state == NETREG_UNREGISTERED) ||
+            (adapter->netdev->reg_state == NETREG_UNREGISTERING))
+                return 0;
+
         /* Notify the stack of the (possibly) reduced queue counts. */
         netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);
         return netif_set_real_num_rx_queues(adapter->netdev,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
index 3f725d48336d..1f3e32b576a5 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h
index b239bdac38da..310bdd961075 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index 7cf1e1f56c69..b91773551a38 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
index 197bdd13106a..cc18165b4c05 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index cf6812dd1436..b01ecb4d2bb1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -67,7 +67,8 @@ static int ixgbe_find_enabled_vfs(struct ixgbe_adapter *adapter)
         vf_devfn = pdev->devfn + 0x80;
         pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, device_id, NULL);
         while (pvfdev) {
-                if (pvfdev->devfn == vf_devfn)
+                if (pvfdev->devfn == vf_devfn &&
+                    (pvfdev->bus->number >= pdev->bus->number))
                         vfs_found++;
                 vf_devfn += 2;
                 pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID,
@@ -646,6 +647,9 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
                         ixgbe_ndo_set_vf_spoofchk(adapter->netdev, vf, false);
                 retval = ixgbe_set_vf_macvlan(adapter, vf, index,
                                               (unsigned char *)(&msgbuf[1]));
+                if (retval == -ENOSPC)
+                        e_warn(drv, "VF %d has requested a MACVLAN filter "
+                                    "but there is no space for it\n", vf);
                 break;
         default:
                 e_err(drv, "Unhandled Msg %8.8x\n", msgbuf[0]);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
index e8badab03359..2ab38d5fda92 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 802bfa0f62cc..9b95bef60970 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -161,19 +161,19 @@
 
 /* Receive DMA Registers */
 #define IXGBE_RDBAL(_i) (((_i) < 64) ? (0x01000 + ((_i) * 0x40)) : \
-                         (0x0D000 + ((_i - 64) * 0x40)))
+                         (0x0D000 + (((_i) - 64) * 0x40)))
 #define IXGBE_RDBAH(_i) (((_i) < 64) ? (0x01004 + ((_i) * 0x40)) : \
-                         (0x0D004 + ((_i - 64) * 0x40)))
+                         (0x0D004 + (((_i) - 64) * 0x40)))
 #define IXGBE_RDLEN(_i) (((_i) < 64) ? (0x01008 + ((_i) * 0x40)) : \
-                         (0x0D008 + ((_i - 64) * 0x40)))
+                         (0x0D008 + (((_i) - 64) * 0x40)))
 #define IXGBE_RDH(_i)   (((_i) < 64) ? (0x01010 + ((_i) * 0x40)) : \
-                         (0x0D010 + ((_i - 64) * 0x40)))
+                         (0x0D010 + (((_i) - 64) * 0x40)))
 #define IXGBE_RDT(_i)   (((_i) < 64) ? (0x01018 + ((_i) * 0x40)) : \
-                         (0x0D018 + ((_i - 64) * 0x40)))
+                         (0x0D018 + (((_i) - 64) * 0x40)))
 #define IXGBE_RXDCTL(_i) (((_i) < 64) ? (0x01028 + ((_i) * 0x40)) : \
-                          (0x0D028 + ((_i - 64) * 0x40)))
+                         (0x0D028 + (((_i) - 64) * 0x40)))
 #define IXGBE_RSCCTL(_i) (((_i) < 64) ? (0x0102C + ((_i) * 0x40)) : \
-                          (0x0D02C + ((_i - 64) * 0x40)))
+                         (0x0D02C + (((_i) - 64) * 0x40)))
 #define IXGBE_RSCDBU     0x03028
 #define IXGBE_RDDCC      0x02F20
 #define IXGBE_RXMEMWRAP  0x03190
@@ -186,7 +186,7 @@
  */
 #define IXGBE_SRRCTL(_i) (((_i) <= 15) ? (0x02100 + ((_i) * 4)) : \
                           (((_i) < 64) ? (0x01014 + ((_i) * 0x40)) : \
-                          (0x0D014 + ((_i - 64) * 0x40))))
+                          (0x0D014 + (((_i) - 64) * 0x40))))
 /*
  * Rx DCA Control Register:
  * 00-15 : 0x02200 + n*4
@@ -195,7 +195,7 @@
  */
 #define IXGBE_DCA_RXCTRL(_i)    (((_i) <= 15) ? (0x02200 + ((_i) * 4)) : \
                                  (((_i) < 64) ? (0x0100C + ((_i) * 0x40)) : \
-                                 (0x0D00C + ((_i - 64) * 0x40))))
+                                 (0x0D00C + (((_i) - 64) * 0x40))))
 #define IXGBE_RDRXCTL           0x02F00
 #define IXGBE_RXPBSIZE(_i)      (0x03C00 + ((_i) * 4))
                                              /* 8 of these 0x03C00 - 0x03C1C */
@@ -344,9 +344,9 @@
 
 #define IXGBE_WUPL      0x05900
 #define IXGBE_WUPM      0x05A00 /* wake up pkt memory 0x5A00-0x5A7C */
-#define IXGBE_FHFT(_n)     (0x09000 + (_n * 0x100)) /* Flex host filter table */
-#define IXGBE_FHFT_EXT(_n) (0x09800 + (_n * 0x100)) /* Ext Flexible Host
-                                                     * Filter Table */
+#define IXGBE_FHFT(_n)  (0x09000 + ((_n) * 0x100)) /* Flex host filter table */
+#define IXGBE_FHFT_EXT(_n)      (0x09800 + ((_n) * 0x100)) /* Ext Flexible Host
+                                                            * Filter Table */
 
 #define IXGBE_FLEXIBLE_FILTER_COUNT_MAX         4
 #define IXGBE_EXT_FLEXIBLE_FILTER_COUNT_MAX     2
@@ -1485,7 +1485,7 @@ enum {
 #define IXGBE_LED_BLINK_BASE     0x00000080
 #define IXGBE_LED_MODE_MASK_BASE 0x0000000F
 #define IXGBE_LED_OFFSET(_base, _i) (_base << (8 * (_i)))
-#define IXGBE_LED_MODE_SHIFT(_i) (8*(_i))
+#define IXGBE_LED_MODE_SHIFT(_i) (8 * (_i))
 #define IXGBE_LED_IVRT(_i)       IXGBE_LED_OFFSET(IXGBE_LED_IVRT_BASE, _i)
 #define IXGBE_LED_BLINK(_i)      IXGBE_LED_OFFSET(IXGBE_LED_BLINK_BASE, _i)
 #define IXGBE_LED_MODE_MASK(_i)  IXGBE_LED_OFFSET(IXGBE_LED_MODE_MASK_BASE, _i)
@@ -2068,9 +2068,9 @@ enum {
 
 /* SR-IOV specific macros */
 #define IXGBE_MBVFICR_INDEX(vf_number)   (vf_number >> 4)
-#define IXGBE_MBVFICR(_i)                (0x00710 + (_i * 4))
-#define IXGBE_VFLRE(_i)                  (((_i & 1) ? 0x001C0 : 0x00600))
-#define IXGBE_VFLREC(_i)                 (0x00700 + (_i * 4))
+#define IXGBE_MBVFICR(_i)               (0x00710 + ((_i) * 4))
+#define IXGBE_VFLRE(_i)         ((((_i) & 1) ? 0x001C0 : 0x00600))
+#define IXGBE_VFLREC(_i)                (0x00700 + ((_i) * 4))
 
 enum ixgbe_fdir_pballoc_type {
         IXGBE_FDIR_PBALLOC_NONE = 0,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
index 8cc5eccfd651..f838a2be8cfb 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2011 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbevf/Makefile b/drivers/net/ethernet/intel/ixgbevf/Makefile
index 1f35d229e71a..4ce4c97ef5ad 100644
--- a/drivers/net/ethernet/intel/ixgbevf/Makefile
+++ b/drivers/net/ethernet/intel/ixgbevf/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel 82599 Virtual Function driver
-# Copyright(c) 1999 - 2010 Intel Corporation.
+# Copyright(c) 1999 - 2012 Intel Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbevf/defines.h b/drivers/net/ethernet/intel/ixgbevf/defines.h
index 2eb89cb94a0d..947b5c830735 100644
--- a/drivers/net/ethernet/intel/ixgbevf/defines.h
+++ b/drivers/net/ethernet/intel/ixgbevf/defines.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
index dc8e6511c640..2bfe0d1d7958 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -56,7 +56,8 @@ struct ixgbe_stats {
                             offsetof(struct ixgbevf_adapter, m),         \
                             offsetof(struct ixgbevf_adapter, b),         \
                             offsetof(struct ixgbevf_adapter, r)
-static struct ixgbe_stats ixgbe_gstrings_stats[] = {
+
+static const struct ixgbe_stats ixgbe_gstrings_stats[] = {
         {"rx_packets", IXGBEVF_STAT(stats.vfgprc, stats.base_vfgprc,
                                     stats.saved_reset_vfgprc)},
         {"tx_packets", IXGBEVF_STAT(stats.vfgptc, stats.base_vfgptc,
@@ -671,7 +672,7 @@ static int ixgbevf_nway_reset(struct net_device *netdev)
         return 0;
 }
 
-static struct ethtool_ops ixgbevf_ethtool_ops = {
+static const struct ethtool_ops ixgbevf_ethtool_ops = {
         .get_settings           = ixgbevf_get_settings,
         .get_drvinfo            = ixgbevf_get_drvinfo,
         .get_regs_len           = ixgbevf_get_regs_len,
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index e6c9d1a927a9..dfed420a1bf6 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -279,12 +279,12 @@ enum ixgbevf_boards {
         board_X540_vf,
 };
 
-extern struct ixgbevf_info ixgbevf_82599_vf_info;
-extern struct ixgbevf_info ixgbevf_X540_vf_info;
-extern struct ixgbe_mbx_operations ixgbevf_mbx_ops;
+extern const struct ixgbevf_info ixgbevf_82599_vf_info;
+extern const struct ixgbevf_info ixgbevf_X540_vf_info;
+extern const struct ixgbe_mbx_operations ixgbevf_mbx_ops;
 
 /* needed by ethtool.c */
-extern char ixgbevf_driver_name[];
+extern const char ixgbevf_driver_name[];
 extern const char ixgbevf_driver_version[];
 
 extern int ixgbevf_up(struct ixgbevf_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 891162d1610c..e51d552410ae 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -53,14 +53,14 @@
 
 #include "ixgbevf.h"
 
-char ixgbevf_driver_name[] = "ixgbevf";
+const char ixgbevf_driver_name[] = "ixgbevf";
 static const char ixgbevf_driver_string[] =
         "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver";
 
 #define DRV_VERSION "2.2.0-k"
 const char ixgbevf_driver_version[] = DRV_VERSION;
 static char ixgbevf_copyright[] =
-        "Copyright (c) 2009 - 2010 Intel Corporation.";
+        "Copyright (c) 2009 - 2012 Intel Corporation.";
 
 static const struct ixgbevf_info *ixgbevf_info_tbl[] = {
         [board_82599_vf] = &ixgbevf_82599_vf_info,
@@ -917,32 +917,39 @@ static irqreturn_t ixgbevf_msix_mbx(int irq, void *data)
         struct ixgbe_hw *hw = &adapter->hw;
         u32 eicr;
         u32 msg;
+        bool got_ack = false;
 
         eicr = IXGBE_READ_REG(hw, IXGBE_VTEICS);
         IXGBE_WRITE_REG(hw, IXGBE_VTEICR, eicr);
 
-        if (!hw->mbx.ops.check_for_ack(hw)) {
+        if (!hw->mbx.ops.check_for_ack(hw))
+                got_ack = true;
+
+        if (!hw->mbx.ops.check_for_msg(hw)) {
+                hw->mbx.ops.read(hw, &msg, 1);
+
+                if ((msg & IXGBE_MBVFICR_VFREQ_MASK) == IXGBE_PF_CONTROL_MSG)
+                        mod_timer(&adapter->watchdog_timer,
+                                  round_jiffies(jiffies + 1));
+
+                if (msg & IXGBE_VT_MSGTYPE_NACK)
+                        pr_warn("Last Request of type %2.2x to PF Nacked\n",
+                                msg & 0xFF);
                 /*
-                 * checking for the ack clears the PFACK bit.  Place
-                 * it back in the v2p_mailbox cache so that anyone
-                 * polling for an ack will not miss it.  Also
-                 * avoid the read below because the code to read
-                 * the mailbox will also clear the ack bit.  This was
-                 * causing lost acks.  Just cache the bit and exit
-                 * the IRQ handler.
+                 * Restore the PFSTS bit in case someone is polling for a
+                 * return message from the PF
                  */
-                hw->mbx.v2p_mailbox |= IXGBE_VFMAILBOX_PFACK;
-                goto out;
+                hw->mbx.v2p_mailbox |= IXGBE_VFMAILBOX_PFSTS;
         }
 
-        /* Not an ack interrupt, go ahead and read the message */
-        hw->mbx.ops.read(hw, &msg, 1);
-
-        if ((msg & IXGBE_MBVFICR_VFREQ_MASK) == IXGBE_PF_CONTROL_MSG)
-                mod_timer(&adapter->watchdog_timer,
-                          round_jiffies(jiffies + 1));
+        /*
+         * checking for the ack clears the PFACK bit.  Place
+         * it back in the v2p_mailbox cache so that anyone
+         * polling for an ack will not miss it
+         */
+        if (got_ack)
+                hw->mbx.v2p_mailbox |= IXGBE_VFMAILBOX_PFACK;
 
-out:
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.c b/drivers/net/ethernet/intel/ixgbevf/mbx.c
index 930fa83f2568..9c955900fe64 100644
--- a/drivers/net/ethernet/intel/ixgbevf/mbx.c
+++ b/drivers/net/ethernet/intel/ixgbevf/mbx.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -26,6 +26,7 @@
 *******************************************************************************/
 
 #include "mbx.h"
+#include "ixgbevf.h"
 
 /**
  *  ixgbevf_poll_for_msg - Wait for message notification
@@ -328,7 +329,7 @@ static s32 ixgbevf_init_mbx_params_vf(struct ixgbe_hw *hw)
         return 0;
 }
 
-struct ixgbe_mbx_operations ixgbevf_mbx_ops = {
+const struct ixgbe_mbx_operations ixgbevf_mbx_ops = {
         .init_params   = ixgbevf_init_mbx_params_vf,
         .read          = ixgbevf_read_mbx_vf,
         .write         = ixgbevf_write_mbx_vf,
diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h
index 9d38a94a348a..cf9131c5c115 100644
--- a/drivers/net/ethernet/intel/ixgbevf/mbx.h
+++ b/drivers/net/ethernet/intel/ixgbevf/mbx.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbevf/regs.h b/drivers/net/ethernet/intel/ixgbevf/regs.h
index 5e4d5e5cdf38..debd8c0e1f28 100644
--- a/drivers/net/ethernet/intel/ixgbevf/regs.h
+++ b/drivers/net/ethernet/intel/ixgbevf/regs.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c
index 21533e300367..74be7411242a 100644
--- a/drivers/net/ethernet/intel/ixgbevf/vf.c
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -26,6 +26,7 @@
 *******************************************************************************/
 
 #include "vf.h"
+#include "ixgbevf.h"
 
 /**
  *  ixgbevf_start_hw_vf - Prepare hardware for Tx/Rx
@@ -282,6 +283,17 @@ static s32 ixgbevf_set_rar_vf(struct ixgbe_hw *hw, u32 index, u8 *addr,
         return ret_val;
 }
 
+static void ixgbevf_write_msg_read_ack(struct ixgbe_hw *hw,
+                                        u32 *msg, u16 size)
+{
+        struct ixgbe_mbx_info *mbx = &hw->mbx;
+        u32 retmsg[IXGBE_VFMAILBOX_SIZE];
+        s32 retval = mbx->ops.write_posted(hw, msg, size);
+
+        if (!retval)
+                mbx->ops.read_posted(hw, retmsg, size);
+}
+
 /**
  *  ixgbevf_update_mc_addr_list_vf - Update Multicast addresses
  *  @hw: pointer to the HW structure
@@ -293,7 +305,6 @@ static s32 ixgbevf_update_mc_addr_list_vf(struct ixgbe_hw *hw,
                                           struct net_device *netdev)
 {
         struct netdev_hw_addr *ha;
-        struct ixgbe_mbx_info *mbx = &hw->mbx;
         u32 msgbuf[IXGBE_VFMAILBOX_SIZE];
         u16 *vector_list = (u16 *)&msgbuf[1];
         u32 cnt, i;
@@ -320,7 +331,7 @@ static s32 ixgbevf_update_mc_addr_list_vf(struct ixgbe_hw *hw,
                 vector_list[i++] = ixgbevf_mta_vector(hw, ha->addr);
         }
 
-        mbx->ops.write_posted(hw, msgbuf, IXGBE_VFMAILBOX_SIZE);
+        ixgbevf_write_msg_read_ack(hw, msgbuf, IXGBE_VFMAILBOX_SIZE);
 
         return 0;
 }
@@ -335,7 +346,6 @@ static s32 ixgbevf_update_mc_addr_list_vf(struct ixgbe_hw *hw,
 static s32 ixgbevf_set_vfta_vf(struct ixgbe_hw *hw, u32 vlan, u32 vind,
                                bool vlan_on)
 {
-        struct ixgbe_mbx_info *mbx = &hw->mbx;
         u32 msgbuf[2];
 
         msgbuf[0] = IXGBE_VF_SET_VLAN;
@@ -343,7 +353,9 @@ static s32 ixgbevf_set_vfta_vf(struct ixgbe_hw *hw, u32 vlan, u32 vind,
         /* Setting the 8 bit field MSG INFO to TRUE indicates "add" */
         msgbuf[0] |= vlan_on << IXGBE_VT_MSGINFO_SHIFT;
 
-        return mbx->ops.write_posted(hw, msgbuf, 2);
+        ixgbevf_write_msg_read_ack(hw, msgbuf, 2);
+
+        return 0;
 }
 
 /**
@@ -401,7 +413,7 @@ static s32 ixgbevf_check_mac_link_vf(struct ixgbe_hw *hw,
         return 0;
 }
 
-static struct ixgbe_mac_operations ixgbevf_mac_ops = {
+static const struct ixgbe_mac_operations ixgbevf_mac_ops = {
         .init_hw             = ixgbevf_init_hw_vf,
         .reset_hw            = ixgbevf_reset_hw_vf,
         .start_hw            = ixgbevf_start_hw_vf,
@@ -415,12 +427,12 @@ static struct ixgbe_mac_operations ixgbevf_mac_ops = {
         .set_vfta            = ixgbevf_set_vfta_vf,
 };
 
-struct ixgbevf_info ixgbevf_82599_vf_info = {
+const struct ixgbevf_info ixgbevf_82599_vf_info = {
         .mac = ixgbe_mac_82599_vf,
         .mac_ops = &ixgbevf_mac_ops,
 };
 
-struct ixgbevf_info ixgbevf_X540_vf_info = {
+const struct ixgbevf_info ixgbevf_X540_vf_info = {
         .mac = ixgbe_mac_X540_vf,
         .mac_ops = &ixgbevf_mac_ops,
 };
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
index 10306b492ee6..25c951daee5d 100644
--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 82599 Virtual Function driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2012 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -167,7 +167,7 @@ struct ixgbevf_hw_stats {
 
 struct ixgbevf_info {
         enum ixgbe_mac_type             mac;
-        struct ixgbe_mac_operations     *mac_ops;
+        const struct ixgbe_mac_operations *mac_ops;
 };
 
 #endif /* __IXGBE_VF_H__ */
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 9c049d2cb97d..9edecfa1f0f4 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -136,6 +136,8 @@ static char mv643xx_eth_driver_version[] = "1.4";
 #define INT_MASK                        0x0068
 #define INT_MASK_EXT                    0x006c
 #define TX_FIFO_URGENT_THRESHOLD        0x0074
+#define RX_DISCARD_FRAME_CNT            0x0084
+#define RX_OVERRUN_FRAME_CNT            0x0088
 #define TXQ_FIX_PRIO_CONF_MOVED         0x00dc
 #define TX_BW_RATE_MOVED                0x00e0
 #define TX_BW_MTU_MOVED                 0x00e8
@@ -334,6 +336,9 @@ struct mib_counters {
         u32 bad_crc_event;
         u32 collision;
         u32 late_collision;
+        /* Non MIB hardware counters */
+        u32 rx_discard;
+        u32 rx_overrun;
 };
 
 struct lro_counters {
@@ -1225,6 +1230,10 @@ static void mib_counters_clear(struct mv643xx_eth_private *mp)
 
         for (i = 0; i < 0x80; i += 4)
                 mib_read(mp, i);
+
+        /* Clear non MIB hw counters also */
+        rdlp(mp, RX_DISCARD_FRAME_CNT);
+        rdlp(mp, RX_OVERRUN_FRAME_CNT);
 }
 
 static void mib_counters_update(struct mv643xx_eth_private *mp)
@@ -1262,6 +1271,9 @@ static void mib_counters_update(struct mv643xx_eth_private *mp)
         p->bad_crc_event += mib_read(mp, 0x74);
         p->collision += mib_read(mp, 0x78);
         p->late_collision += mib_read(mp, 0x7c);
+        /* Non MIB hardware counters */
+        p->rx_discard += rdlp(mp, RX_DISCARD_FRAME_CNT);
+        p->rx_overrun += rdlp(mp, RX_OVERRUN_FRAME_CNT);
         spin_unlock_bh(&mp->mib_counters_lock);
 
         mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ);
@@ -1413,6 +1425,8 @@ static const struct mv643xx_eth_stats mv643xx_eth_stats[] = {
         MIBSTAT(bad_crc_event),
         MIBSTAT(collision),
         MIBSTAT(late_collision),
+        MIBSTAT(rx_discard),
+        MIBSTAT(rx_overrun),
         LROSTAT(lro_aggregated),
         LROSTAT(lro_flushed),
         LROSTAT(lro_no_desc),
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 18a87a57fc0a..33947ac595c0 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -2576,6 +2576,7 @@ static int skge_up(struct net_device *dev)
         }
 
         /* Initialize MAC */
+        netif_carrier_off(dev);
         spin_lock_bh(&hw->phy_lock);
         if (is_genesis(hw))
                 genesis_mac_init(hw, port);
@@ -2797,6 +2798,8 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb,
         td->control = BMU_OWN | BMU_SW | BMU_STF | control | len;
         wmb();
 
+        netdev_sent_queue(dev, skb->len);
+
         skge_write8(hw, Q_ADDR(txqaddr[skge->port], Q_CSR), CSR_START);
 
         netif_printk(skge, tx_queued, KERN_DEBUG, skge->netdev,
@@ -2816,11 +2819,9 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb,
 
 
 /* Free resources associated with this reing element */
-static void skge_tx_free(struct skge_port *skge, struct skge_element *e,
-                         u32 control)
+static inline void skge_tx_unmap(struct pci_dev *pdev, struct skge_element *e,
+                                 u32 control)
 {
-        struct pci_dev *pdev = skge->hw->pdev;
-
         /* skb header vs. fragment */
         if (control & BMU_STF)
                 pci_unmap_single(pdev, dma_unmap_addr(e, mapaddr),
@@ -2830,13 +2831,6 @@ static void skge_tx_free(struct skge_port *skge, struct skge_element *e,
                 pci_unmap_page(pdev, dma_unmap_addr(e, mapaddr),
                                dma_unmap_len(e, maplen),
                                PCI_DMA_TODEVICE);
-
-        if (control & BMU_EOF) {
-                netif_printk(skge, tx_done, KERN_DEBUG, skge->netdev,
-                             "tx done slot %td\n", e - skge->tx_ring.start);
-
-                dev_kfree_skb(e->skb);
-        }
 }
 
 /* Free all buffers in transmit ring */
@@ -2847,10 +2841,15 @@ static void skge_tx_clean(struct net_device *dev)
 
         for (e = skge->tx_ring.to_clean; e != skge->tx_ring.to_use; e = e->next) {
                 struct skge_tx_desc *td = e->desc;
-                skge_tx_free(skge, e, td->control);
+
+                skge_tx_unmap(skge->hw->pdev, e, td->control);
+
+                if (td->control & BMU_EOF)
+                        dev_kfree_skb(e->skb);
                 td->control = 0;
         }
 
+        netdev_reset_queue(dev);
         skge->tx_ring.to_clean = e;
 }
 
@@ -3111,6 +3110,7 @@ static void skge_tx_done(struct net_device *dev)
         struct skge_port *skge = netdev_priv(dev);
         struct skge_ring *ring = &skge->tx_ring;
         struct skge_element *e;
+        unsigned int bytes_compl = 0, pkts_compl = 0;
 
         skge_write8(skge->hw, Q_ADDR(txqaddr[skge->port], Q_CSR), CSR_IRQ_CL_F);
 
@@ -3120,8 +3120,20 @@ static void skge_tx_done(struct net_device *dev)
                 if (control & BMU_OWN)
                         break;
 
-                skge_tx_free(skge, e, control);
+                skge_tx_unmap(skge->hw->pdev, e, control);
+
+                if (control & BMU_EOF) {
+                        netif_printk(skge, tx_done, KERN_DEBUG, skge->netdev,
+                                     "tx done slot %td\n",
+                                     e - skge->tx_ring.start);
+
+                        pkts_compl++;
+                        bytes_compl += e->skb->len;
+
+                        dev_kfree_skb(e->skb);
+                }
         }
+        netdev_completed_queue(dev, pkts_compl, bytes_compl);
         skge->tx_ring.to_clean = e;
 
         /* Can run lockless until we need to synchronize to restart queue. */
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 978f593094c0..eaf09d4f02d0 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1247,6 +1247,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
         u32 reply;
         u32 slave_status = 0;
         u8 is_going_down = 0;
+        int i;
 
         slave_state[slave].comm_toggle ^= 1;
         reply = (u32) slave_state[slave].comm_toggle << 31;
@@ -1258,6 +1259,10 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
         if (cmd == MLX4_COMM_CMD_RESET) {
                 mlx4_warn(dev, "Received reset from slave:%d\n", slave);
                 slave_state[slave].active = false;
+                for (i = 0; i < MLX4_EVENT_TYPES_NUM; ++i) {
+                                slave_state[slave].event_eq[i].eqn = -1;
+                                slave_state[slave].event_eq[i].token = 0;
+                }
                 /*check if we are in the middle of FLR process,
                 if so return "retry" status to the slave*/
                 if (MLX4_COMM_CMD_FLR == slave_state[slave].last_cmd) {
@@ -1452,7 +1457,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_slave_state *s_state;
-        int i, err, port;
+        int i, j, err, port;
 
         priv->mfunc.vhcr = dma_alloc_coherent(&(dev->pdev->dev), PAGE_SIZE,
                                             &priv->mfunc.vhcr_dma,
@@ -1485,6 +1490,8 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
                 for (i = 0; i < dev->num_slaves; ++i) {
                         s_state = &priv->mfunc.master.slave_state[i];
                         s_state->last_cmd = MLX4_COMM_CMD_RESET;
+                        for (j = 0; j < MLX4_EVENT_TYPES_NUM; ++j)
+                                s_state->event_eq[j].eqn = -1;
                         __raw_writel((__force u32) 0,
                                      &priv->mfunc.comm[i].slave_write);
                         __raw_writel((__force u32) 0,
@@ -1609,12 +1616,12 @@ void mlx4_multi_func_cleanup(struct mlx4_dev *dev)
                                 kfree(priv->mfunc.master.slave_state[i].vlan_filter[port]);
                 }
                 kfree(priv->mfunc.master.slave_state);
-                iounmap(priv->mfunc.comm);
-                dma_free_coherent(&(dev->pdev->dev), PAGE_SIZE,
-                                                     priv->mfunc.vhcr,
-                                                     priv->mfunc.vhcr_dma);
-                priv->mfunc.vhcr = NULL;
         }
+
+        iounmap(priv->mfunc.comm);
+        dma_free_coherent(&(dev->pdev->dev), PAGE_SIZE,
+                     priv->mfunc.vhcr, priv->mfunc.vhcr_dma);
+        priv->mfunc.vhcr = NULL;
 }
 
 void mlx4_cmd_cleanup(struct mlx4_dev *dev)
diff --git a/drivers/net/ethernet/mellanox/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c
index 475f9d6af955..7e64033d7de3 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cq.c
@@ -96,7 +96,7 @@ void mlx4_cq_event(struct mlx4_dev *dev, u32 cqn, int event_type)
 static int mlx4_SW2HW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                          int cq_num)
 {
-        return mlx4_cmd(dev, mailbox->dma | dev->caps.function, cq_num, 0,
+        return mlx4_cmd(dev, mailbox->dma, cq_num, 0,
                         MLX4_CMD_SW2HW_CQ, MLX4_CMD_TIME_CLASS_A,
                         MLX4_CMD_WRAPPED);
 }
@@ -111,7 +111,7 @@ static int mlx4_MODIFY_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox
 static int mlx4_HW2SW_CQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                          int cq_num)
 {
-        return mlx4_cmd_box(dev, dev->caps.function, mailbox ? mailbox->dma : 0,
+        return mlx4_cmd_box(dev, 0, mailbox ? mailbox->dma : 0,
                             cq_num, mailbox ? 0 : 1, MLX4_CMD_HW2SW_CQ,
                             MLX4_CMD_TIME_CLASS_A, MLX4_CMD_WRAPPED);
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index 7dbc6a230779..70346fd7f9c4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -183,10 +183,11 @@ static int mlx4_en_set_wol(struct net_device *netdev,
 static int mlx4_en_get_sset_count(struct net_device *dev, int sset)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
+        int bit_count = hweight64(priv->stats_bitmap);
 
         switch (sset) {
         case ETH_SS_STATS:
-                return NUM_ALL_STATS +
+                return (priv->stats_bitmap ? bit_count : NUM_ALL_STATS) +
                         (priv->tx_ring_num + priv->rx_ring_num) * 2;
         case ETH_SS_TEST:
                 return MLX4_EN_NUM_SELF_TEST - !(priv->mdev->dev->caps.flags
@@ -201,14 +202,34 @@ static void mlx4_en_get_ethtool_stats(struct net_device *dev,
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         int index = 0;
-        int i;
+        int i, j = 0;
 
         spin_lock_bh(&priv->stats_lock);
 
-        for (i = 0; i < NUM_MAIN_STATS; i++)
-                data[index++] = ((unsigned long *) &priv->stats)[i];
-        for (i = 0; i < NUM_PORT_STATS; i++)
-                data[index++] = ((unsigned long *) &priv->port_stats)[i];
+        if (!(priv->stats_bitmap)) {
+                for (i = 0; i < NUM_MAIN_STATS; i++)
+                        data[index++] =
+                                ((unsigned long *) &priv->stats)[i];
+                for (i = 0; i < NUM_PORT_STATS; i++)
+                        data[index++] =
+                                ((unsigned long *) &priv->port_stats)[i];
+                for (i = 0; i < NUM_PKT_STATS; i++)
+                        data[index++] =
+                                ((unsigned long *) &priv->pkstats)[i];
+        } else {
+                for (i = 0; i < NUM_MAIN_STATS; i++) {
+                        if ((priv->stats_bitmap >> j) & 1)
+                                data[index++] =
+                                ((unsigned long *) &priv->stats)[i];
+                        j++;
+                }
+                for (i = 0; i < NUM_PORT_STATS; i++) {
+                        if ((priv->stats_bitmap >> j) & 1)
+                                data[index++] =
+                                ((unsigned long *) &priv->port_stats)[i];
+                        j++;
+                }
+        }
         for (i = 0; i < priv->tx_ring_num; i++) {
                 data[index++] = priv->tx_ring[i].packets;
                 data[index++] = priv->tx_ring[i].bytes;
@@ -217,8 +238,6 @@ static void mlx4_en_get_ethtool_stats(struct net_device *dev,
                 data[index++] = priv->rx_ring[i].packets;
                 data[index++] = priv->rx_ring[i].bytes;
         }
-        for (i = 0; i < NUM_PKT_STATS; i++)
-                data[index++] = ((unsigned long *) &priv->pkstats)[i];
         spin_unlock_bh(&priv->stats_lock);
 
 }
@@ -247,11 +266,29 @@ static void mlx4_en_get_strings(struct net_device *dev,
 
         case ETH_SS_STATS:
                 /* Add main counters */
-                for (i = 0; i < NUM_MAIN_STATS; i++)
-                        strcpy(data + (index++) * ETH_GSTRING_LEN, main_strings[i]);
-                for (i = 0; i< NUM_PORT_STATS; i++)
-                        strcpy(data + (index++) * ETH_GSTRING_LEN,
-                        main_strings[i + NUM_MAIN_STATS]);
+                if (!priv->stats_bitmap) {
+                        for (i = 0; i < NUM_MAIN_STATS; i++)
+                                strcpy(data + (index++) * ETH_GSTRING_LEN,
+                                        main_strings[i]);
+                        for (i = 0; i < NUM_PORT_STATS; i++)
+                                strcpy(data + (index++) * ETH_GSTRING_LEN,
+                                        main_strings[i +
+                                        NUM_MAIN_STATS]);
+                        for (i = 0; i < NUM_PKT_STATS; i++)
+                                strcpy(data + (index++) * ETH_GSTRING_LEN,
+                                        main_strings[i +
+                                        NUM_MAIN_STATS +
+                                        NUM_PORT_STATS]);
+                } else
+                        for (i = 0; i < NUM_MAIN_STATS + NUM_PORT_STATS; i++) {
+                                if ((priv->stats_bitmap >> i) & 1) {
+                                        strcpy(data +
+                                               (index++) * ETH_GSTRING_LEN,
+                                               main_strings[i]);
+                                }
+                                if (!(priv->stats_bitmap >> i))
+                                        break;
+                        }
                 for (i = 0; i < priv->tx_ring_num; i++) {
                         sprintf(data + (index++) * ETH_GSTRING_LEN,
                                 "tx%d_packets", i);
@@ -264,9 +301,6 @@ static void mlx4_en_get_strings(struct net_device *dev,
                         sprintf(data + (index++) * ETH_GSTRING_LEN,
                                 "rx%d_bytes", i);
                 }
-                for (i = 0; i< NUM_PKT_STATS; i++)
-                        strcpy(data + (index++) * ETH_GSTRING_LEN,
-                        main_strings[i + NUM_MAIN_STATS + NUM_PORT_STATS]);
                 break;
         }
 }
@@ -479,6 +513,95 @@ static void mlx4_en_get_ringparam(struct net_device *dev,
         param->tx_pending = priv->tx_ring[0].size;
 }
 
+static u32 mlx4_en_get_rxfh_indir_size(struct net_device *dev)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+
+        return priv->rx_ring_num;
+}
+
+static int mlx4_en_get_rxfh_indir(struct net_device *dev, u32 *ring_index)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_rss_map *rss_map = &priv->rss_map;
+        int rss_rings;
+        size_t n = priv->rx_ring_num;
+        int err = 0;
+
+        rss_rings = priv->prof->rss_rings ?: priv->rx_ring_num;
+
+        while (n--) {
+                ring_index[n] = rss_map->qps[n % rss_rings].qpn -
+                        rss_map->base_qpn;
+        }
+
+        return err;
+}
+
+static int mlx4_en_set_rxfh_indir(struct net_device *dev,
+                const u32 *ring_index)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+        int port_up = 0;
+        int err = 0;
+        int i;
+        int rss_rings = 0;
+
+        /* Calculate RSS table size and make sure flows are spread evenly
+         * between rings
+         */
+        for (i = 0; i < priv->rx_ring_num; i++) {
+                if (i > 0 && !ring_index[i] && !rss_rings)
+                        rss_rings = i;
+
+                if (ring_index[i] != (i % (rss_rings ?: priv->rx_ring_num)))
+                        return -EINVAL;
+        }
+
+        if (!rss_rings)
+                rss_rings = priv->rx_ring_num;
+
+        /* RSS table size must be an order of 2 */
+        if (!is_power_of_2(rss_rings))
+                return -EINVAL;
+
+        mutex_lock(&mdev->state_lock);
+        if (priv->port_up) {
+                port_up = 1;
+                mlx4_en_stop_port(dev);
+        }
+
+        priv->prof->rss_rings = rss_rings;
+
+        if (port_up) {
+                err = mlx4_en_start_port(dev);
+                if (err)
+                        en_err(priv, "Failed starting port\n");
+        }
+
+        mutex_unlock(&mdev->state_lock);
+        return err;
+}
+
+static int mlx4_en_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
+                             u32 *rule_locs)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        int err = 0;
+
+        switch (cmd->cmd) {
+        case ETHTOOL_GRXRINGS:
+                cmd->data = priv->rx_ring_num;
+                break;
+        default:
+                err = -EOPNOTSUPP;
+                break;
+        }
+
+        return err;
+}
+
 const struct ethtool_ops mlx4_en_ethtool_ops = {
         .get_drvinfo = mlx4_en_get_drvinfo,
         .get_settings = mlx4_en_get_settings,
@@ -498,6 +621,10 @@ const struct ethtool_ops mlx4_en_ethtool_ops = {
         .set_pauseparam = mlx4_en_set_pauseparam,
         .get_ringparam = mlx4_en_get_ringparam,
         .set_ringparam = mlx4_en_set_ringparam,
+        .get_rxnfc = mlx4_en_get_rxnfc,
+        .get_rxfh_indir_size = mlx4_en_get_rxfh_indir_size,
+        .get_rxfh_indir = mlx4_en_get_rxfh_indir,
+        .set_rxfh_indir = mlx4_en_set_rxfh_indir,
 };
 
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index a06096fcc0b8..2097a7d3c5b8 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -62,10 +62,6 @@ static const char mlx4_en_version[] =
  * Device scope module parameters
  */
 
-
-/* Enable RSS TCP traffic */
-MLX4_EN_PARM_INT(tcp_rss, 1,
-                 "Enable RSS for incomming TCP traffic or disabled (0)");
 /* Enable RSS UDP traffic */
 MLX4_EN_PARM_INT(udp_rss, 1,
                  "Enable RSS for incomming UDP traffic or disabled (0)");
@@ -104,7 +100,6 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
         struct mlx4_en_profile *params = &mdev->profile;
         int i;
 
-        params->tcp_rss = tcp_rss;
         params->udp_rss = udp_rss;
         if (params->udp_rss && !(mdev->dev->caps.flags
                                         & MLX4_DEV_CAP_FLAG_UDP_RSS)) {
@@ -120,6 +115,7 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev)
                 params->prof[i].rx_ring_size = MLX4_EN_DEF_RX_RING_SIZE;
                 params->prof[i].tx_ring_num = MLX4_EN_NUM_TX_RINGS +
                         (!!pfcrx) * MLX4_EN_NUM_PPP_RINGS;
+                params->prof[i].rss_rings = 0;
         }
 
         return 0;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 72fa807b69ce..149e60da0a32 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -702,6 +702,8 @@ int mlx4_en_start_port(struct net_device *dev)
         /* Schedule multicast task to populate multicast list */
         queue_work(mdev->workqueue, &priv->mcast_task);
 
+        mlx4_set_stats_bitmap(mdev->dev, &priv->stats_bitmap);
+
         priv->port_up = true;
         netif_tx_start_all_queues(dev);
         return 0;
@@ -807,38 +809,50 @@ static void mlx4_en_restart(struct work_struct *work)
         mutex_unlock(&mdev->state_lock);
 }
 
-
-static int mlx4_en_open(struct net_device *dev)
+static void mlx4_en_clear_stats(struct net_device *dev)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
         int i;
-        int err = 0;
-
-        mutex_lock(&mdev->state_lock);
-
-        if (!mdev->device_up) {
-                en_err(priv, "Cannot open - device down/disabled\n");
-                err = -EBUSY;
-                goto out;
-        }
 
-        /* Reset HW statistics and performance counters */
         if (mlx4_en_DUMP_ETH_STATS(mdev, priv->port, 1))
                 en_dbg(HW, priv, "Failed dumping statistics\n");
 
         memset(&priv->stats, 0, sizeof(priv->stats));
         memset(&priv->pstats, 0, sizeof(priv->pstats));
+        memset(&priv->pkstats, 0, sizeof(priv->pkstats));
+        memset(&priv->port_stats, 0, sizeof(priv->port_stats));
 
         for (i = 0; i < priv->tx_ring_num; i++) {
                 priv->tx_ring[i].bytes = 0;
                 priv->tx_ring[i].packets = 0;
+                priv->tx_ring[i].tx_csum = 0;
         }
         for (i = 0; i < priv->rx_ring_num; i++) {
                 priv->rx_ring[i].bytes = 0;
                 priv->rx_ring[i].packets = 0;
+                priv->rx_ring[i].csum_ok = 0;
+                priv->rx_ring[i].csum_none = 0;
+        }
+}
+
+static int mlx4_en_open(struct net_device *dev)
+{
+        struct mlx4_en_priv *priv = netdev_priv(dev);
+        struct mlx4_en_dev *mdev = priv->mdev;
+        int err = 0;
+
+        mutex_lock(&mdev->state_lock);
+
+        if (!mdev->device_up) {
+                en_err(priv, "Cannot open - device down/disabled\n");
+                err = -EBUSY;
+                goto out;
         }
 
+        /* Reset HW statistics and SW counters */
+        mlx4_en_clear_stats(dev);
+
         err = mlx4_en_start_port(dev);
         if (err)
                 en_err(priv, "Failed starting port:%d\n", priv->port);
@@ -878,7 +892,8 @@ void mlx4_en_free_resources(struct mlx4_en_priv *priv)
 
         for (i = 0; i < priv->rx_ring_num; i++) {
                 if (priv->rx_ring[i].rx_info)
-                        mlx4_en_destroy_rx_ring(priv, &priv->rx_ring[i]);
+                        mlx4_en_destroy_rx_ring(priv, &priv->rx_ring[i],
+                                priv->prof->rx_ring_size, priv->stride);
                 if (priv->rx_cq[i].buf)
                         mlx4_en_destroy_cq(priv, &priv->rx_cq[i]);
         }
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index e8d6ad2dce0a..d4ad8c226b51 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -168,8 +168,12 @@ static int mlx4_en_prepare_rx_desc(struct mlx4_en_priv *priv,
         return 0;
 
 err:
-        while (i--)
+        while (i--) {
+                dma_addr_t dma = be64_to_cpu(rx_desc->data[i].addr);
+                pci_unmap_single(priv->mdev->pdev, dma, skb_frags[i].size,
+                                 PCI_DMA_FROMDEVICE);
                 put_page(skb_frags[i].page);
+        }
         return -ENOMEM;
 }
 
@@ -380,12 +384,12 @@ err_allocator:
 }
 
 void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
-                             struct mlx4_en_rx_ring *ring)
+                             struct mlx4_en_rx_ring *ring, u32 size, u16 stride)
 {
         struct mlx4_en_dev *mdev = priv->mdev;
 
         mlx4_en_unmap_buffer(&ring->wqres.buf);
-        mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size + TXBB_SIZE);
+        mlx4_free_hwq_res(mdev->dev, &ring->wqres, size * stride + TXBB_SIZE);
         vfree(ring->rx_info);
         ring->rx_info = NULL;
 }
@@ -853,6 +857,7 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
         struct mlx4_en_rss_map *rss_map = &priv->rss_map;
         struct mlx4_qp_context context;
         struct mlx4_rss_context *rss_context;
+        int rss_rings;
         void *ptr;
         u8 rss_mask = (MLX4_RSS_IPV4 | MLX4_RSS_TCP_IPV4 | MLX4_RSS_IPV6 |
                         MLX4_RSS_TCP_IPV6);
@@ -893,10 +898,15 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
         mlx4_en_fill_qp_context(priv, 0, 0, 0, 1, priv->base_qpn,
                                 priv->rx_ring[0].cqn, &context);
 
+        if (!priv->prof->rss_rings || priv->prof->rss_rings > priv->rx_ring_num)
+                rss_rings = priv->rx_ring_num;
+        else
+                rss_rings = priv->prof->rss_rings;
+
         ptr = ((void *) &context) + offsetof(struct mlx4_qp_context, pri_path)
                                         + MLX4_RSS_OFFSET_IN_QPC_PRI_PATH;
         rss_context = ptr;
-        rss_context->base_qpn = cpu_to_be32(ilog2(priv->rx_ring_num) << 24 |
+        rss_context->base_qpn = cpu_to_be32(ilog2(rss_rings) << 24 |
                                             (rss_map->base_qpn));
         rss_context->default_qpn = cpu_to_be32(rss_map->base_qpn);
         if (priv->mdev->profile.udp_rss) {
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 1e9b55eb7217..8fa41f3082cf 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -513,25 +513,22 @@ int mlx4_MAP_EQ_wrapper(struct mlx4_dev *dev, int slave,
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_slave_event_eq_info *event_eq =
-                &priv->mfunc.master.slave_state[slave].event_eq;
+                priv->mfunc.master.slave_state[slave].event_eq;
         u32 in_modifier = vhcr->in_modifier;
         u32 eqn = in_modifier & 0x1FF;
         u64 in_param =  vhcr->in_param;
         int err = 0;
+        int i;
 
         if (slave == dev->caps.function)
                 err = mlx4_cmd(dev, in_param, (in_modifier & 0x80000000) | eqn,
                                0, MLX4_CMD_MAP_EQ, MLX4_CMD_TIME_CLASS_B,
                                MLX4_CMD_NATIVE);
-        if (!err) {
-                if (in_modifier >> 31) {
-                        /* unmap */
-                        event_eq->event_type &= ~in_param;
-                } else {
-                        event_eq->eqn = eqn;
-                        event_eq->event_type = in_param;
-                }
-        }
+        if (!err)
+                for (i = 0; i < MLX4_EVENT_TYPES_NUM; ++i)
+                        if (in_param & (1LL << i))
+                                event_eq[i].eqn = in_modifier >> 31 ? -1 : eqn;
+
         return err;
 }
 
@@ -546,7 +543,7 @@ static int mlx4_MAP_EQ(struct mlx4_dev *dev, u64 event_mask, int unmap,
 static int mlx4_SW2HW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                          int eq_num)
 {
-        return mlx4_cmd(dev, mailbox->dma | dev->caps.function, eq_num, 0,
+        return mlx4_cmd(dev, mailbox->dma, eq_num, 0,
                         MLX4_CMD_SW2HW_EQ, MLX4_CMD_TIME_CLASS_A,
                         MLX4_CMD_WRAPPED);
 }
@@ -554,7 +551,7 @@ static int mlx4_SW2HW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
 static int mlx4_HW2SW_EQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                          int eq_num)
 {
-        return mlx4_cmd_box(dev, dev->caps.function, mailbox->dma, eq_num,
+        return mlx4_cmd_box(dev, 0, mailbox->dma, eq_num,
                             0, MLX4_CMD_HW2SW_EQ, MLX4_CMD_TIME_CLASS_A,
                             MLX4_CMD_WRAPPED);
 }
@@ -818,8 +815,9 @@ int mlx4_init_eq_table(struct mlx4_dev *dev)
         int err;
         int i;
 
-        priv->eq_table.uar_map = kcalloc(sizeof *priv->eq_table.uar_map,
-                                         mlx4_num_eq_uar(dev), GFP_KERNEL);
+        priv->eq_table.uar_map = kcalloc(mlx4_num_eq_uar(dev),
+                                         sizeof *priv->eq_table.uar_map,
+                                         GFP_KERNEL);
         if (!priv->eq_table.uar_map) {
                 err = -ENOMEM;
                 goto err_out_free;
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index a424a19280cc..9ea7cabcaf3c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -158,7 +158,6 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
 
 #define QUERY_FUNC_CAP_FLAGS_OFFSET             0x0
 #define QUERY_FUNC_CAP_NUM_PORTS_OFFSET         0x1
-#define QUERY_FUNC_CAP_FUNCTION_OFFSET          0x3
 #define QUERY_FUNC_CAP_PF_BHVR_OFFSET           0x4
 #define QUERY_FUNC_CAP_QP_QUOTA_OFFSET          0x10
 #define QUERY_FUNC_CAP_CQ_QUOTA_OFFSET          0x14
@@ -182,9 +181,6 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave,
                 field = 1 << 7; /* enable only ethernet interface */
                 MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FLAGS_OFFSET);
 
-                field = slave;
-                MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_FUNCTION_OFFSET);
-
                 field = dev->caps.num_ports;
                 MLX4_PUT(outbox->buf, field, QUERY_FUNC_CAP_NUM_PORTS_OFFSET);
 
@@ -249,9 +245,6 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, struct mlx4_func_cap *func_cap)
                 goto out;
         }
 
-        MLX4_GET(field, outbox, QUERY_FUNC_CAP_FUNCTION_OFFSET);
-        func_cap->function = field;
-
         MLX4_GET(field, outbox, QUERY_FUNC_CAP_NUM_PORTS_OFFSET);
         func_cap->num_ports = field;
 
@@ -692,7 +685,7 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave,
         return err;
 }
 
-static int mlx4_QUERY_PORT(struct mlx4_dev *dev, void *ptr, u8 port)
+int mlx4_QUERY_PORT(struct mlx4_dev *dev, void *ptr, u8 port)
 {
         struct mlx4_cmd_mailbox *outbox = ptr;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.h b/drivers/net/ethernet/mellanox/mlx4/fw.h
index 119e0cc9fab3..e1a5fa56bcbc 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.h
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.h
@@ -119,7 +119,6 @@ struct mlx4_dev_cap {
 };
 
 struct mlx4_func_cap {
-        u8      function;
         u8      num_ports;
         u8      flags;
         u32     pf_context_behaviour;
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 6bb62c580e2d..678558b502fc 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -108,7 +108,7 @@ static struct mlx4_profile default_profile = {
         .num_cq         = 1 << 16,
         .num_mcg        = 1 << 13,
         .num_mpt        = 1 << 19,
-        .num_mtt        = 1 << 20,
+        .num_mtt        = 1 << 20, /* It is really num mtt segements */
 };
 
 static int log_num_mac = 7;
@@ -471,7 +471,6 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
                 return -ENOSYS;
         }
 
-        dev->caps.function              = func_cap.function;
         dev->caps.num_ports             = func_cap.num_ports;
         dev->caps.num_qps               = func_cap.qp_quota;
         dev->caps.num_srqs              = func_cap.srq_quota;
diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index 0785d9b2a265..ca574d850b39 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -136,7 +136,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 port,
         u32 prot;
         int err;
 
-        s_steer = &mlx4_priv(dev)->steer[0];
+        s_steer = &mlx4_priv(dev)->steer[port - 1];
         new_entry = kzalloc(sizeof *new_entry, GFP_KERNEL);
         if (!new_entry)
                 return -ENOMEM;
@@ -220,7 +220,7 @@ static int existing_steering_entry(struct mlx4_dev *dev, u8 port,
         struct mlx4_promisc_qp *pqp;
         struct mlx4_promisc_qp *dqp;
 
-        s_steer = &mlx4_priv(dev)->steer[0];
+        s_steer = &mlx4_priv(dev)->steer[port - 1];
 
         pqp = get_promisc_qp(dev, 0, steer, qpn);
         if (!pqp)
@@ -265,7 +265,7 @@ static bool check_duplicate_entry(struct mlx4_dev *dev, u8 port,
         struct mlx4_steer_index *tmp_entry, *entry = NULL;
         struct mlx4_promisc_qp *dqp, *tmp_dqp;
 
-        s_steer = &mlx4_priv(dev)->steer[0];
+        s_steer = &mlx4_priv(dev)->steer[port - 1];
 
         /* if qp is not promisc, it cannot be duplicated */
         if (!get_promisc_qp(dev, 0, steer, qpn))
@@ -306,7 +306,7 @@ static bool can_remove_steering_entry(struct mlx4_dev *dev, u8 port,
         bool ret = false;
         int i;
 
-        s_steer = &mlx4_priv(dev)->steer[0];
+        s_steer = &mlx4_priv(dev)->steer[port - 1];
 
         mailbox = mlx4_alloc_cmd_mailbox(dev);
         if (IS_ERR(mailbox))
@@ -361,7 +361,7 @@ static int add_promisc_qp(struct mlx4_dev *dev, u8 port,
         int err;
         struct mlx4_priv *priv = mlx4_priv(dev);
 
-        s_steer = &mlx4_priv(dev)->steer[0];
+        s_steer = &mlx4_priv(dev)->steer[port - 1];
 
         mutex_lock(&priv->mcg_table.mutex);
 
@@ -466,7 +466,7 @@ static int remove_promisc_qp(struct mlx4_dev *dev, u8 port,
         int loc, i;
         int err;
 
-        s_steer = &mlx4_priv(dev)->steer[0];
+        s_steer = &mlx4_priv(dev)->steer[port - 1];
         mutex_lock(&priv->mcg_table.mutex);
 
         pqp = get_promisc_qp(dev, 0, steer, qpn);
@@ -1004,7 +1004,7 @@ EXPORT_SYMBOL_GPL(mlx4_multicast_promisc_remove);
 
 int mlx4_unicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port)
 {
-        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
+        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
                 return 0;
 
         if (mlx4_is_mfunc(dev))
@@ -1016,7 +1016,7 @@ EXPORT_SYMBOL_GPL(mlx4_unicast_promisc_add);
 
 int mlx4_unicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port)
 {
-        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_MC_STEER))
+        if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_VEP_UC_STEER))
                 return 0;
 
         if (mlx4_is_mfunc(dev))
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index a80121a2b519..c92269f8c057 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -388,9 +388,8 @@ struct mlx4_slave_eqe {
 };
 
 struct mlx4_slave_event_eq_info {
-        u32 eqn;
+        int eqn;
         u16 token;
-        u64 event_type;
 };
 
 struct mlx4_profile {
@@ -449,6 +448,8 @@ struct mlx4_steer_index {
         struct list_head duplicates;
 };
 
+#define MLX4_EVENT_TYPES_NUM 64
+
 struct mlx4_slave_state {
         u8 comm_toggle;
         u8 last_cmd;
@@ -461,7 +462,8 @@ struct mlx4_slave_state {
         struct mlx4_slave_eqe eq[MLX4_MFUNC_MAX_EQES];
         struct list_head mcast_filters[MLX4_MAX_PORTS + 1];
         struct mlx4_vlan_fltr *vlan_filter[MLX4_MAX_PORTS + 1];
-        struct mlx4_slave_event_eq_info event_eq;
+        /* event type to eq number lookup */
+        struct mlx4_slave_event_eq_info event_eq[MLX4_EVENT_TYPES_NUM];
         u16 eq_pi;
         u16 eq_ci;
         spinlock_t lock;
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index f2a8e65f5f88..d60335f3c473 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -325,11 +325,11 @@ struct mlx4_en_port_profile {
         u8 rx_ppp;
         u8 tx_pause;
         u8 tx_ppp;
+        int rss_rings;
 };
 
 struct mlx4_en_profile {
         int rss_xor;
-        int tcp_rss;
         int udp_rss;
         u8 rss_mask;
         u32 active_ports;
@@ -476,6 +476,7 @@ struct mlx4_en_priv {
         struct mlx4_en_perf_stats pstats;
         struct mlx4_en_pkt_stats pkstats;
         struct mlx4_en_port_stats port_stats;
+        u64 stats_bitmap;
         char *mc_addrs;
         int mc_addrs_cnt;
         struct mlx4_en_stat_out_mbox hw_stats;
@@ -527,7 +528,8 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
                            struct mlx4_en_rx_ring *ring,
                            u32 size, u16 stride);
 void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
-                             struct mlx4_en_rx_ring *ring);
+                             struct mlx4_en_rx_ring *ring,
+                             u32 size, u16 stride);
 int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv);
 void mlx4_en_deactivate_rx_ring(struct mlx4_en_priv *priv,
                                 struct mlx4_en_rx_ring *ring);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index 01df5567e16e..25a80d71fb2a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -291,7 +291,7 @@ static u32 key_to_hw_index(u32 key)
 static int mlx4_SW2HW_MPT(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                           int mpt_index)
 {
-        return mlx4_cmd(dev, mailbox->dma | dev->caps.function , mpt_index,
+        return mlx4_cmd(dev, mailbox->dma, mpt_index,
                         0, MLX4_CMD_SW2HW_MPT, MLX4_CMD_TIME_CLASS_B,
                         MLX4_CMD_WRAPPED);
 }
@@ -304,7 +304,7 @@ static int mlx4_HW2SW_MPT(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox
                             MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);
 }
 
-static int mlx4_mr_reserve_range(struct mlx4_dev *dev, int cnt, int align,
+int mlx4_mr_reserve_range(struct mlx4_dev *dev, int cnt, int align,
                           u32 *base_mridx)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
@@ -320,14 +320,14 @@ static int mlx4_mr_reserve_range(struct mlx4_dev *dev, int cnt, int align,
 }
 EXPORT_SYMBOL_GPL(mlx4_mr_reserve_range);
 
-static void mlx4_mr_release_range(struct mlx4_dev *dev, u32 base_mridx, int cnt)
+void mlx4_mr_release_range(struct mlx4_dev *dev, u32 base_mridx, int cnt)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         mlx4_bitmap_free_range(&priv->mr_table.mpt_bitmap, base_mridx, cnt);
 }
 EXPORT_SYMBOL_GPL(mlx4_mr_release_range);
 
-static int mlx4_mr_alloc_reserved(struct mlx4_dev *dev, u32 mridx, u32 pd,
+int mlx4_mr_alloc_reserved(struct mlx4_dev *dev, u32 mridx, u32 pd,
                            u64 iova, u64 size, u32 access, int npages,
                            int page_shift, struct mlx4_mr *mr)
 {
@@ -457,7 +457,7 @@ int mlx4_mr_alloc(struct mlx4_dev *dev, u32 pd, u64 iova, u64 size, u32 access,
 }
 EXPORT_SYMBOL_GPL(mlx4_mr_alloc);
 
-static void mlx4_mr_free_reserved(struct mlx4_dev *dev, struct mlx4_mr *mr)
+void mlx4_mr_free_reserved(struct mlx4_dev *dev, struct mlx4_mr *mr)
 {
         int err;
 
@@ -852,7 +852,7 @@ err_free:
 }
 EXPORT_SYMBOL_GPL(mlx4_fmr_alloc);
 
-static int mlx4_fmr_alloc_reserved(struct mlx4_dev *dev, u32 mridx,
+int mlx4_fmr_alloc_reserved(struct mlx4_dev *dev, u32 mridx,
                             u32 pd, u32 access, int max_pages,
                             int max_maps, u8 page_shift, struct mlx4_fmr *fmr)
 {
@@ -954,7 +954,7 @@ int mlx4_fmr_free(struct mlx4_dev *dev, struct mlx4_fmr *fmr)
 }
 EXPORT_SYMBOL_GPL(mlx4_fmr_free);
 
-static int mlx4_fmr_free_reserved(struct mlx4_dev *dev, struct mlx4_fmr *fmr)
+int mlx4_fmr_free_reserved(struct mlx4_dev *dev, struct mlx4_fmr *fmr)
 {
         if (fmr->maps)
                 return -EBUSY;
diff --git a/drivers/net/ethernet/mellanox/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c
index 5c9a54df17ab..db4746d0dca7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/pd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/pd.c
@@ -52,8 +52,7 @@ int mlx4_pd_alloc(struct mlx4_dev *dev, u32 *pdn)
         *pdn = mlx4_bitmap_alloc(&priv->pd_bitmap);
         if (*pdn == -1)
                 return -ENOMEM;
-        if (mlx4_is_mfunc(dev))
-                *pdn |= (dev->caps.function + 1) << NOT_MASKED_PD_BITS;
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(mlx4_pd_alloc);
diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index 88b52e547524..f44ae555bf43 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -44,6 +44,11 @@
 #define MLX4_VLAN_VALID         (1u << 31)
 #define MLX4_VLAN_MASK          0xfff
 
+#define MLX4_STATS_TRAFFIC_COUNTERS_MASK        0xfULL
+#define MLX4_STATS_TRAFFIC_DROPS_MASK           0xc0ULL
+#define MLX4_STATS_ERROR_COUNTERS_MASK          0x1ffc30ULL
+#define MLX4_STATS_PORT_COUNTERS_MASK           0x1fe00000ULL
+
 void mlx4_init_mac_table(struct mlx4_dev *dev, struct mlx4_mac_table *table)
 {
         int i;
@@ -898,6 +903,24 @@ int mlx4_DUMP_ETH_STATS_wrapper(struct mlx4_dev *dev, int slave,
                                 struct mlx4_cmd_mailbox *outbox,
                                 struct mlx4_cmd_info *cmd)
 {
+        if (slave != dev->caps.function)
+                return 0;
         return mlx4_common_dump_eth_stats(dev, slave,
                                           vhcr->in_modifier, outbox);
 }
+
+void mlx4_set_stats_bitmap(struct mlx4_dev *dev, u64 *stats_bitmap)
+{
+        if (!mlx4_is_mfunc(dev)) {
+                *stats_bitmap = 0;
+                return;
+        }
+
+        *stats_bitmap = (MLX4_STATS_TRAFFIC_COUNTERS_MASK |
+                         MLX4_STATS_TRAFFIC_DROPS_MASK |
+                         MLX4_STATS_PORT_COUNTERS_MASK);
+
+        if (mlx4_is_master(dev))
+                *stats_bitmap |= MLX4_STATS_ERROR_COUNTERS_MASK;
+}
+EXPORT_SYMBOL(mlx4_set_stats_bitmap);
diff --git a/drivers/net/ethernet/mellanox/mlx4/profile.c b/drivers/net/ethernet/mellanox/mlx4/profile.c
index 66f91ca7a7c6..1129677daa62 100644
--- a/drivers/net/ethernet/mellanox/mlx4/profile.c
+++ b/drivers/net/ethernet/mellanox/mlx4/profile.c
@@ -110,7 +110,7 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
         profile[MLX4_RES_EQ].num      = min_t(unsigned, dev_cap->max_eqs, MAX_MSIX);
         profile[MLX4_RES_DMPT].num    = request->num_mpt;
         profile[MLX4_RES_CMPT].num    = MLX4_NUM_CMPTS;
-        profile[MLX4_RES_MTT].num     = request->num_mtt;
+        profile[MLX4_RES_MTT].num     = request->num_mtt * (1 << log_mtts_per_seg);
         profile[MLX4_RES_MCG].num     = request->num_mcg;
 
         for (i = 0; i < MLX4_RES_NUM; ++i) {
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
index 6b03ac8b9002..738f950a1ce5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx4/qp.c
@@ -162,7 +162,7 @@ static int __mlx4_qp_modify(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
         ((struct mlx4_qp_context *) (mailbox->buf + 8))->local_qpn =
                 cpu_to_be32(qp->qpn);
 
-        ret = mlx4_cmd(dev, mailbox->dma | dev->caps.function,
+        ret = mlx4_cmd(dev, mailbox->dma,
                        qp->qpn | (!!sqd_event << 31),
                        new_state == MLX4_QP_STATE_RST ? 2 : 0,
                        op[cur_state][new_state], MLX4_CMD_TIME_CLASS_C, native);
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index ed20751a057d..bfdb7af19e49 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -73,6 +73,7 @@ struct res_gid {
         struct list_head        list;
         u8                      gid[16];
         enum mlx4_protocol      prot;
+        enum mlx4_steer_type    steer;
 };
 
 enum res_qp_states {
@@ -374,6 +375,7 @@ static struct res_common *alloc_qp_tr(int id)
 
         ret->com.res_id = id;
         ret->com.state = RES_QP_RESERVED;
+        ret->local_qpn = id;
         INIT_LIST_HEAD(&ret->mcg_list);
         spin_lock_init(&ret->mcg_spl);
 
@@ -1561,11 +1563,6 @@ static int mr_get_mtt_size(struct mlx4_mpt_entry *mpt)
         return be32_to_cpu(mpt->mtt_sz);
 }
 
-static int mr_get_pdn(struct mlx4_mpt_entry *mpt)
-{
-        return be32_to_cpu(mpt->pd_flags) & 0xffffff;
-}
-
 static int qp_get_mtt_addr(struct mlx4_qp_context *qpc)
 {
         return be32_to_cpu(qpc->mtt_base_addr_l) & 0xfffffff8;
@@ -1602,16 +1599,6 @@ static int qp_get_mtt_size(struct mlx4_qp_context *qpc)
         return total_pages;
 }
 
-static int qp_get_pdn(struct mlx4_qp_context *qpc)
-{
-        return be32_to_cpu(qpc->pd) & 0xffffff;
-}
-
-static int pdn2slave(int pdn)
-{
-        return (pdn >> NOT_MASKED_PD_BITS) - 1;
-}
-
 static int check_mtt_range(struct mlx4_dev *dev, int slave, int start,
                            int size, struct res_mtt *mtt)
 {
@@ -1656,11 +1643,6 @@ int mlx4_SW2HW_MPT_wrapper(struct mlx4_dev *dev, int slave,
                 mpt->mtt = mtt;
         }
 
-        if (pdn2slave(mr_get_pdn(inbox->buf)) != slave) {
-                err = -EPERM;
-                goto ex_put;
-        }
-
         err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
         if (err)
                 goto ex_put;
@@ -1792,11 +1774,6 @@ int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,
         if (err)
                 goto ex_put_mtt;
 
-        if (pdn2slave(qp_get_pdn(qpc)) != slave) {
-                err = -EPERM;
-                goto ex_put_mtt;
-        }
-
         err = get_res(dev, slave, rcqn, RES_CQ, &rcq);
         if (err)
                 goto ex_put_mtt;
@@ -2048,10 +2025,10 @@ int mlx4_GEN_EQE(struct mlx4_dev *dev, int slave, struct mlx4_eqe *eqe)
         if (!priv->mfunc.master.slave_state)
                 return -EINVAL;
 
-        event_eq = &priv->mfunc.master.slave_state[slave].event_eq;
+        event_eq = &priv->mfunc.master.slave_state[slave].event_eq[eqe->type];
 
         /* Create the event only if the slave is registered */
-        if ((event_eq->event_type & (1 << eqe->type)) == 0)
+        if (event_eq->eqn < 0)
                 return 0;
 
         mutex_lock(&priv->mfunc.master.gen_eqe_mutex[slave]);
@@ -2289,11 +2266,6 @@ ex_put:
         return err;
 }
 
-static int srq_get_pdn(struct mlx4_srq_context *srqc)
-{
-        return be32_to_cpu(srqc->pd) & 0xffffff;
-}
-
 static int srq_get_mtt_size(struct mlx4_srq_context *srqc)
 {
         int log_srq_size = (be32_to_cpu(srqc->state_logsize_srqn) >> 24) & 0xf;
@@ -2333,11 +2305,6 @@ int mlx4_SW2HW_SRQ_wrapper(struct mlx4_dev *dev, int slave,
         if (err)
                 goto ex_put_mtt;
 
-        if (pdn2slave(srq_get_pdn(srqc)) != slave) {
-                err = -EPERM;
-                goto ex_put_mtt;
-        }
-
         err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
         if (err)
                 goto ex_put_mtt;
@@ -2514,7 +2481,8 @@ static struct res_gid *find_gid(struct mlx4_dev *dev, int slave,
 }
 
 static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
-                       u8 *gid, enum mlx4_protocol prot)
+                       u8 *gid, enum mlx4_protocol prot,
+                       enum mlx4_steer_type steer)
 {
         struct res_gid *res;
         int err;
@@ -2530,6 +2498,7 @@ static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
         } else {
                 memcpy(res->gid, gid, 16);
                 res->prot = prot;
+                res->steer = steer;
                 list_add_tail(&res->list, &rqp->mcg_list);
                 err = 0;
         }
@@ -2539,14 +2508,15 @@ static int add_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
 }
 
 static int rem_mcg_res(struct mlx4_dev *dev, int slave, struct res_qp *rqp,
-                       u8 *gid, enum mlx4_protocol prot)
+                       u8 *gid, enum mlx4_protocol prot,
+                       enum mlx4_steer_type steer)
 {
         struct res_gid *res;
         int err;
 
         spin_lock_irq(&rqp->mcg_spl);
         res = find_gid(dev, slave, rqp, gid);
-        if (!res || res->prot != prot)
+        if (!res || res->prot != prot || res->steer != steer)
                 err = -EINVAL;
         else {
                 list_del(&res->list);
@@ -2573,7 +2543,7 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
         int attach = vhcr->op_modifier;
         int block_loopback = vhcr->in_modifier >> 31;
         u8 steer_type_mask = 2;
-        enum mlx4_steer_type type = gid[7] & steer_type_mask;
+        enum mlx4_steer_type type = (gid[7] & steer_type_mask) >> 1;
 
         qpn = vhcr->in_modifier & 0xffffff;
         err = get_res(dev, slave, qpn, RES_QP, &rqp);
@@ -2582,7 +2552,7 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
 
         qp.qpn = qpn;
         if (attach) {
-                err = add_mcg_res(dev, slave, rqp, gid, prot);
+                err = add_mcg_res(dev, slave, rqp, gid, prot, type);
                 if (err)
                         goto ex_put;
 
@@ -2591,7 +2561,7 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
                 if (err)
                         goto ex_rem;
         } else {
-                err = rem_mcg_res(dev, slave, rqp, gid, prot);
+                err = rem_mcg_res(dev, slave, rqp, gid, prot, type);
                 if (err)
                         goto ex_put;
                 err = mlx4_qp_detach_common(dev, &qp, gid, prot, type);
@@ -2602,7 +2572,7 @@ int mlx4_QP_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
 
 ex_rem:
         /* ignore error return below, already in error */
-        err1 = rem_mcg_res(dev, slave, rqp, gid, prot);
+        err1 = rem_mcg_res(dev, slave, rqp, gid, prot, type);
 ex_put:
         put_res(dev, slave, qpn, RES_QP);
 
@@ -2641,7 +2611,7 @@ static void detach_qp(struct mlx4_dev *dev, int slave, struct res_qp *rqp)
         list_for_each_entry_safe(rgid, tmp, &rqp->mcg_list, list) {
                 qp.qpn = rqp->local_qpn;
                 err = mlx4_qp_detach_common(dev, &qp, rgid->gid, rgid->prot,
-                                            MLX4_MC_STEER);
+                                            rgid->steer);
                 list_del(&rgid->list);
                 kfree(rgid);
         }
diff --git a/drivers/net/ethernet/mellanox/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c
index 2823fffc6383..feda6c00829f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/srq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/srq.c
@@ -67,7 +67,7 @@ void mlx4_srq_event(struct mlx4_dev *dev, u32 srqn, int event_type)
 static int mlx4_SW2HW_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
                           int srq_num)
 {
-        return mlx4_cmd(dev, mailbox->dma | dev->caps.function, srq_num, 0,
+        return mlx4_cmd(dev, mailbox->dma, srq_num, 0,
                         MLX4_CMD_SW2HW_SRQ, MLX4_CMD_TIME_CLASS_A,
                         MLX4_CMD_WRAPPED);
 }
diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig
index 1ea811cf515b..fe42fc00d8d3 100644
--- a/drivers/net/ethernet/micrel/Kconfig
+++ b/drivers/net/ethernet/micrel/Kconfig
@@ -42,7 +42,6 @@ config KS8851
         select NET_CORE
         select MII
         select CRC32
-        select MISC_DEVICES
         select EEPROM_93CX6
         ---help---
           SPI driver for Micrel KS8851 SPI attached network chip.
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 6b35e7da9a9c..0c3e4005224d 100644
--- a/drivers/net/ethernet/micrel/ks8851.c
+++ b/drivers/net/ethernet/micrel/ks8851.c
@@ -583,7 +583,7 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
                                         ks8851_dbg_dumpkkt(ks, rxpkt);
 
                                 skb->protocol = eth_type_trans(skb, ks->netdev);
-                                netif_rx(skb);
+                                netif_rx_ni(skb);
 
                                 ks->netdev->stats.rx_packets++;
                                 ks->netdev->stats.rx_bytes += rxlen;
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index e58e78e5c930..231176fcd2ba 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -394,7 +394,6 @@ union ks_tx_hdr {
  * @msg_enable  : The message flags controlling driver output (see ethtool).
  * @frame_cnt   : number of frames received.
  * @bus_width   : i/o bus width.
- * @irq         : irq number assigned to this device.
  * @rc_rxqcr    : Cached copy of KS_RXQCR.
  * @rc_txcr     : Cached copy of KS_TXCR.
  * @rc_ier      : Cached copy of KS_IER.
@@ -441,7 +440,6 @@ struct ks_net {
         u32                     msg_enable;
         u32                     frame_cnt;
         int                     bus_width;
-        int                     irq;
 
         u16                     rc_rxqcr;
         u16                     rc_txcr;
@@ -907,10 +905,10 @@ static int ks_net_open(struct net_device *netdev)
         netif_dbg(ks, ifup, ks->netdev, "%s - entry\n", __func__);
 
         /* reset the HW */
-        err = request_irq(ks->irq, ks_irq, KS_INT_FLAGS, DRV_NAME, netdev);
+        err = request_irq(netdev->irq, ks_irq, KS_INT_FLAGS, DRV_NAME, netdev);
 
         if (err) {
-                pr_err("Failed to request IRQ: %d: %d\n", ks->irq, err);
+                pr_err("Failed to request IRQ: %d: %d\n", netdev->irq, err);
                 return err;
         }
 
@@ -955,7 +953,7 @@ static int ks_net_stop(struct net_device *netdev)
 
         /* set powermode to soft power down to save power */
         ks_set_powermode(ks, PMECR_PM_SOFTDOWN);
-        free_irq(ks->irq, netdev);
+        free_irq(netdev->irq, netdev);
         mutex_unlock(&ks->lock);
         return 0;
 }
@@ -1545,10 +1543,10 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
         if (!ks->hw_addr_cmd)
                 goto err_ioremap1;
 
-        ks->irq = platform_get_irq(pdev, 0);
+        netdev->irq = platform_get_irq(pdev, 0);
 
-        if (ks->irq < 0) {
-                err = ks->irq;
+        if (netdev->irq < 0) {
+                err = netdev->irq;
                 goto err_get_irq;
         }
 
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
index 212f43b308a3..cd827ff4a021 100644
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c
@@ -670,7 +670,7 @@ static void octeon_mgmt_adjust_link(struct net_device *netdev)
 static int octeon_mgmt_init_phy(struct net_device *netdev)
 {
         struct octeon_mgmt *p = netdev_priv(netdev);
-        char phy_id[20];
+        char phy_id[MII_BUS_ID_SIZE + 3];
 
         if (octeon_is_simulation()) {
                 /* No PHYs in the simulator. */
@@ -678,7 +678,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev)
                 return 0;
         }
 
-        snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "0", p->port);
+        snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "mdio-octeon-0", p->port);
 
         p->phydev = phy_connect(netdev, phy_id, octeon_mgmt_adjust_link, 0,
                                 PHY_INTERFACE_MODE_MII);
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 964e9c0948bc..3ead111111e1 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -1745,6 +1745,12 @@ int pch_gbe_up(struct pch_gbe_adapter *adapter)
         struct pch_gbe_rx_ring *rx_ring = adapter->rx_ring;
         int err;
 
+        /* Ensure we have a valid MAC */
+        if (!is_valid_ether_addr(adapter->hw.mac.addr)) {
+                pr_err("Error: Invalid MAC address\n");
+                return -EINVAL;
+        }
+
         /* hardware has been reset, we need to reload some things */
         pch_gbe_set_multi(netdev);
 
@@ -2468,9 +2474,14 @@ static int pch_gbe_probe(struct pci_dev *pdev,
 
         memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
         if (!is_valid_ether_addr(netdev->dev_addr)) {
-                dev_err(&pdev->dev, "Invalid MAC Address\n");
-                ret = -EIO;
-                goto err_free_adapter;
+                /*
+                 * If the MAC is invalid (or just missing), display a warning
+                 * but do not abort setting up the device. pch_gbe_up will
+                 * prevent the interface from being brought up until a valid MAC
+                 * is set.
+                 */
+                dev_err(&pdev->dev, "Invalid MAC address, "
+                                    "interface disabled.\n");
         }
         setup_timer(&adapter->watchdog_timer, pch_gbe_watchdog,
                     (unsigned long)adapter);
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 813d41c4a845..87b650131774 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -38,6 +38,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/ethtool.h>
+#include <linux/if_vlan.h>
 #include <linux/sh_eth.h>
 
 #include "sh_eth.h"
@@ -817,7 +818,8 @@ static int sh_eth_dev_init(struct net_device *ndev)
                 sh_eth_write(ndev, 0, TRIMD);
 
         /* Recv frame limit set register */
-        sh_eth_write(ndev, RFLR_VALUE, RFLR);
+        sh_eth_write(ndev, ndev->mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN,
+                     RFLR);
 
         sh_eth_write(ndev, sh_eth_read(ndev, EESR), EESR);
         sh_eth_write(ndev, mdp->cd->eesipr_value, EESIPR);
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index 47877b13ffad..cdbd844662a7 100644
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -575,9 +575,6 @@ enum RPADIR_BIT {
         RPADIR_PADR = 0x0003f,
 };
 
-/* RFLR */
-#define RFLR_VALUE 0x1000
-
 /* FDR */
 #define DEFAULT_FDR_INIT        0x00000707
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index d0b814ef0675..0319d640f728 100644
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -67,6 +67,7 @@ struct stmmac_extra_stats {
         unsigned long ipc_csum_error;
         unsigned long rx_collision;
         unsigned long rx_crc;
+        unsigned long dribbling_bit;
         unsigned long rx_length;
         unsigned long rx_mii;
         unsigned long rx_multicast;
diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
index d87976364ec5..ad1b627f8ec2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
@@ -201,7 +201,7 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x,
 
         if (unlikely(p->des01.erx.dribbling)) {
                 CHIP_DBG(KERN_ERR "GMAC RX: dribbling error\n");
-                ret = discard_frame;
+                x->dribbling_bit++;
         }
         if (unlikely(p->des01.erx.sa_filter_fail)) {
                 CHIP_DBG(KERN_ERR "GMAC RX : Source Address filter fail\n");
diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
index fda5d2b31d3a..25953bb45a73 100644
--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
@@ -104,7 +104,7 @@ static int ndesc_get_rx_status(void *data, struct stmmac_extra_stats *x,
                 ret = discard_frame;
         }
         if (unlikely(p->des01.rx.dribbling))
-                ret = discard_frame;
+                x->dribbling_bit++;
 
         if (unlikely(p->des01.rx.length_error)) {
                 x->rx_length++;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index 120740020e2c..b4b095fdcf29 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -21,7 +21,7 @@
 *******************************************************************************/
 
 #define STMMAC_RESOURCE_NAME   "stmmaceth"
-#define DRV_MODULE_VERSION      "Dec_2011"
+#define DRV_MODULE_VERSION      "Feb_2012"
 #include <linux/stmmac.h>
 #include <linux/phy.h>
 #include "common.h"
@@ -97,4 +97,5 @@ int stmmac_resume(struct net_device *ndev);
 int stmmac_suspend(struct net_device *ndev);
 int stmmac_dvr_remove(struct net_device *ndev);
 struct stmmac_priv *stmmac_dvr_probe(struct device *device,
-                                struct plat_stmmacenet_data *plat_dat);
+                                     struct plat_stmmacenet_data *plat_dat,
+                                     void __iomem *addr);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index 9573303a706b..f98e1511660f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -47,23 +47,25 @@ struct stmmac_stats {
         offsetof(struct stmmac_priv, xstats.m)}
 
 static const struct stmmac_stats stmmac_gstrings_stats[] = {
+        /* Transmit errors */
         STMMAC_STAT(tx_underflow),
         STMMAC_STAT(tx_carrier),
         STMMAC_STAT(tx_losscarrier),
         STMMAC_STAT(vlan_tag),
         STMMAC_STAT(tx_deferred),
         STMMAC_STAT(tx_vlan),
-        STMMAC_STAT(rx_vlan),
         STMMAC_STAT(tx_jabber),
         STMMAC_STAT(tx_frame_flushed),
         STMMAC_STAT(tx_payload_error),
         STMMAC_STAT(tx_ip_header_error),
+        /* Receive errors */
         STMMAC_STAT(rx_desc),
         STMMAC_STAT(sa_filter_fail),
         STMMAC_STAT(overflow_error),
         STMMAC_STAT(ipc_csum_error),
         STMMAC_STAT(rx_collision),
         STMMAC_STAT(rx_crc),
+        STMMAC_STAT(dribbling_bit),
         STMMAC_STAT(rx_length),
         STMMAC_STAT(rx_mii),
         STMMAC_STAT(rx_multicast),
@@ -73,6 +75,8 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = {
         STMMAC_STAT(sa_rx_filter_fail),
         STMMAC_STAT(rx_missed_cntr),
         STMMAC_STAT(rx_overflow_cntr),
+        STMMAC_STAT(rx_vlan),
+        /* Tx/Rx IRQ errors */
         STMMAC_STAT(tx_undeflow_irq),
         STMMAC_STAT(tx_process_stopped_irq),
         STMMAC_STAT(tx_jabber_irq),
@@ -82,6 +86,7 @@ static const struct stmmac_stats stmmac_gstrings_stats[] = {
         STMMAC_STAT(rx_watchdog_irq),
         STMMAC_STAT(tx_early_irq),
         STMMAC_STAT(fatal_bus_error_irq),
+        /* Extra info */
         STMMAC_STAT(threshold),
         STMMAC_STAT(tx_pkt_n),
         STMMAC_STAT(rx_pkt_n),
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 96fa2da30763..6ee593a55a64 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -241,7 +241,7 @@ static void stmmac_adjust_link(struct net_device *dev)
                         case 1000:
                                 if (likely(priv->plat->has_gmac))
                                         ctrl &= ~priv->hw->link.port;
-                                stmmac_hw_fix_mac_speed(priv);
+                                        stmmac_hw_fix_mac_speed(priv);
                                 break;
                         case 100:
                         case 10:
@@ -785,7 +785,7 @@ static u32 stmmac_get_synopsys_id(struct stmmac_priv *priv)
                 u32 uid = ((hwid & 0x0000ff00) >> 8);
                 u32 synid = (hwid & 0x000000ff);
 
-                pr_info("STMMAC - user ID: 0x%x, Synopsys ID: 0x%x\n",
+                pr_info("stmmac - user ID: 0x%x, Synopsys ID: 0x%x\n",
                         uid, synid);
 
                 return synid;
@@ -869,38 +869,6 @@ static int stmmac_get_hw_features(struct stmmac_priv *priv)
         return hw_cap;
 }
 
-/**
- * stmmac_mac_device_setup
- * @dev : device pointer
- * Description: this is to attach the GMAC or MAC 10/100
- * main core structures that will be completed during the
- * open step.
- */
-static int stmmac_mac_device_setup(struct net_device *dev)
-{
-        struct stmmac_priv *priv = netdev_priv(dev);
-
-        struct mac_device_info *device;
-
-        if (priv->plat->has_gmac)
-                device = dwmac1000_setup(priv->ioaddr);
-        else
-                device = dwmac100_setup(priv->ioaddr);
-
-        if (!device)
-                return -ENOMEM;
-
-        priv->hw = device;
-        priv->hw->ring = &ring_mode_ops;
-
-        if (device_can_wakeup(priv->device)) {
-                priv->wolopts = WAKE_MAGIC; /* Magic Frame as default */
-                enable_irq_wake(priv->wol_irq);
-        }
-
-        return 0;
-}
-
 static void stmmac_check_ether_addr(struct stmmac_priv *priv)
 {
         /* verify if the MAC address is valid, in case of failures it
@@ -930,20 +898,8 @@ static int stmmac_open(struct net_device *dev)
         struct stmmac_priv *priv = netdev_priv(dev);
         int ret;
 
-        /* MAC HW device setup */
-        ret = stmmac_mac_device_setup(dev);
-        if (ret < 0)
-                return ret;
-
         stmmac_check_ether_addr(priv);
 
-        stmmac_verify_args();
-
-        /* Override with kernel parameters if supplied XXX CRS XXX
-         * this needs to have multiple instances */
-        if ((phyaddr >= 0) && (phyaddr <= 31))
-                priv->plat->phy_addr = phyaddr;
-
         /* MDIO bus Registration */
         ret = stmmac_mdio_register(dev);
         if (ret < 0) {
@@ -976,44 +932,6 @@ static int stmmac_open(struct net_device *dev)
                 goto open_error;
         }
 
-        stmmac_get_synopsys_id(priv);
-
-        priv->hw_cap_support = stmmac_get_hw_features(priv);
-
-        if (priv->hw_cap_support) {
-                pr_info(" Support DMA HW capability register");
-
-                /* We can override some gmac/dma configuration fields: e.g.
-                 * enh_desc, tx_coe (e.g. that are passed through the
-                 * platform) with the values from the HW capability
-                 * register (if supported).
-                 */
-                priv->plat->enh_desc = priv->dma_cap.enh_desc;
-                priv->plat->tx_coe = priv->dma_cap.tx_coe;
-                priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up;
-
-                /* By default disable wol on magic frame if not supported */
-                if (!priv->dma_cap.pmt_magic_frame)
-                        priv->wolopts &= ~WAKE_MAGIC;
-
-        } else
-                pr_info(" No HW DMA feature register supported");
-
-        /* Select the enhnaced/normal descriptor structures */
-        stmmac_selec_desc_mode(priv);
-
-        /* PMT module is not integrated in all the MAC devices. */
-        if (priv->plat->pmt) {
-                pr_info(" Remote wake-up capable\n");
-                device_set_wakeup_capable(priv->device, 1);
-        }
-
-        priv->rx_coe = priv->hw->mac->rx_coe(priv->ioaddr);
-        if (priv->rx_coe)
-                pr_info(" Checksum Offload Engine supported\n");
-        if (priv->plat->tx_coe)
-                pr_info(" Checksum insertion supported\n");
-
         /* Create and initialize the TX/RX descriptors chains. */
         priv->dma_tx_size = STMMAC_ALIGN(dma_txsize);
         priv->dma_rx_size = STMMAC_ALIGN(dma_rxsize);
@@ -1030,14 +948,14 @@ static int stmmac_open(struct net_device *dev)
 
         /* Copy the MAC addr into the HW  */
         priv->hw->mac->set_umac_addr(priv->ioaddr, dev->dev_addr, 0);
+
         /* If required, perform hw setup of the bus. */
         if (priv->plat->bus_setup)
                 priv->plat->bus_setup(priv->ioaddr);
+
         /* Initialize the MAC Core */
         priv->hw->mac->core_init(priv->ioaddr);
 
-        netdev_update_features(dev);
-
         /* Request the IRQ lines */
         ret = request_irq(dev->irq, stmmac_interrupt,
                          IRQF_SHARED, dev->name, dev);
@@ -1047,6 +965,17 @@ static int stmmac_open(struct net_device *dev)
                 goto open_error;
         }
 
+        /* Request the Wake IRQ in case of another line is used for WoL */
+        if (priv->wol_irq != dev->irq) {
+                ret = request_irq(priv->wol_irq, stmmac_interrupt,
+                                  IRQF_SHARED, dev->name, dev);
+                if (unlikely(ret < 0)) {
+                        pr_err("%s: ERROR: allocating the ext WoL IRQ %d "
+                               "(error: %d)\n", __func__, priv->wol_irq, ret);
+                        goto open_error_wolirq;
+                }
+        }
+
         /* Enable the MAC Rx/Tx */
         stmmac_set_mac(priv->ioaddr, true);
 
@@ -1062,7 +991,7 @@ static int stmmac_open(struct net_device *dev)
 #ifdef CONFIG_STMMAC_DEBUG_FS
         ret = stmmac_init_fs(dev);
         if (ret < 0)
-                pr_warning("\tFailed debugFS registration");
+                pr_warning("%s: failed debugFS registration\n", __func__);
 #endif
         /* Start the ball rolling... */
         DBG(probe, DEBUG, "%s: DMA RX/TX processes started...\n", dev->name);
@@ -1072,6 +1001,7 @@ static int stmmac_open(struct net_device *dev)
 #ifdef CONFIG_STMMAC_TIMER
         priv->tm->timer_start(tmrate);
 #endif
+
         /* Dump DMA/MAC registers */
         if (netif_msg_hw(priv)) {
                 priv->hw->mac->dump_regs(priv->ioaddr);
@@ -1087,6 +1017,9 @@ static int stmmac_open(struct net_device *dev)
 
         return 0;
 
+open_error_wolirq:
+        free_irq(dev->irq, dev);
+
 open_error:
 #ifdef CONFIG_STMMAC_TIMER
         kfree(priv->tm);
@@ -1127,6 +1060,8 @@ static int stmmac_release(struct net_device *dev)
 
         /* Free the IRQ lines */
         free_irq(dev->irq, dev);
+        if (priv->wol_irq != dev->irq)
+                free_irq(priv->wol_irq, dev);
 
         /* Stop TX/RX DMA and clear the descriptors */
         priv->hw->dma->stop_tx(priv->ioaddr);
@@ -1789,13 +1724,77 @@ static const struct net_device_ops stmmac_netdev_ops = {
 };
 
 /**
+ *  stmmac_hw_init - Init the MAC device
+ *  @priv : pointer to the private device structure.
+ *  Description: this function detects which MAC device
+ *  (GMAC/MAC10-100) has to attached, checks the HW capability
+ *  (if supported) and sets the driver's features (for example
+ *  to use the ring or chaine mode or support the normal/enh
+ *  descriptor structure).
+ */
+static int stmmac_hw_init(struct stmmac_priv *priv)
+{
+        int ret = 0;
+        struct mac_device_info *mac;
+
+        /* Identify the MAC HW device */
+        if (priv->plat->has_gmac)
+                mac = dwmac1000_setup(priv->ioaddr);
+        else
+                mac = dwmac100_setup(priv->ioaddr);
+        if (!mac)
+                return -ENOMEM;
+
+        priv->hw = mac;
+
+        /* To use the chained or ring mode */
+        priv->hw->ring = &ring_mode_ops;
+
+        /* Get and dump the chip ID */
+        stmmac_get_synopsys_id(priv);
+
+        /* Get the HW capability (new GMAC newer than 3.50a) */
+        priv->hw_cap_support = stmmac_get_hw_features(priv);
+        if (priv->hw_cap_support) {
+                pr_info(" DMA HW capability register supported");
+
+                /* We can override some gmac/dma configuration fields: e.g.
+                 * enh_desc, tx_coe (e.g. that are passed through the
+                 * platform) with the values from the HW capability
+                 * register (if supported).
+                 */
+                priv->plat->enh_desc = priv->dma_cap.enh_desc;
+                priv->plat->tx_coe = priv->dma_cap.tx_coe;
+                priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up;
+        } else
+                pr_info(" No HW DMA feature register supported");
+
+        /* Select the enhnaced/normal descriptor structures */
+        stmmac_selec_desc_mode(priv);
+
+        priv->rx_coe = priv->hw->mac->rx_coe(priv->ioaddr);
+        if (priv->rx_coe)
+                pr_info(" RX Checksum Offload Engine supported\n");
+        if (priv->plat->tx_coe)
+                pr_info(" TX Checksum insertion supported\n");
+
+        if (priv->plat->pmt) {
+                pr_info(" Wake-Up On Lan supported\n");
+                device_set_wakeup_capable(priv->device, 1);
+        }
+
+        return ret;
+}
+
+/**
  * stmmac_dvr_probe
  * @device: device pointer
  * Description: this is the main probe function used to
  * call the alloc_etherdev, allocate the priv structure.
  */
 struct stmmac_priv *stmmac_dvr_probe(struct device *device,
-                                        struct plat_stmmacenet_data *plat_dat)
+                                     struct plat_stmmacenet_data *plat_dat,
+                                     void __iomem *addr)
 {
         int ret = 0;
         struct net_device *ndev = NULL;
@@ -1815,10 +1814,27 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
 
         ether_setup(ndev);
 
-        ndev->netdev_ops = &stmmac_netdev_ops;
         stmmac_set_ethtool_ops(ndev);
+        priv->pause = pause;
+        priv->plat = plat_dat;
+        priv->ioaddr = addr;
+        priv->dev->base_addr = (unsigned long)addr;
+
+        /* Verify driver arguments */
+        stmmac_verify_args();
+
+        /* Override with kernel parameters if supplied XXX CRS XXX
+         * this needs to have multiple instances */
+        if ((phyaddr >= 0) && (phyaddr <= 31))
+                priv->plat->phy_addr = phyaddr;
+
+        /* Init MAC and get the capabilities */
+        stmmac_hw_init(priv);
+
+        ndev->netdev_ops = &stmmac_netdev_ops;
 
-        ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
+        ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
+                            NETIF_F_RXCSUM;
         ndev->features |= ndev->hw_features | NETIF_F_HIGHDMA;
         ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
 #ifdef STMMAC_VLAN_TAG_USED
@@ -1830,8 +1846,6 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
         if (flow_ctrl)
                 priv->flow_ctrl = FLOW_AUTO;    /* RX/TX pause on */
 
-        priv->pause = pause;
-        priv->plat = plat_dat;
         netif_napi_add(ndev, &priv->napi, stmmac_poll, 64);
 
         spin_lock_init(&priv->lock);
@@ -1839,15 +1853,10 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
 
         ret = register_netdev(ndev);
         if (ret) {
-                pr_err("%s: ERROR %i registering the device\n",
-                       __func__, ret);
+                pr_err("%s: ERROR %i registering the device\n", __func__, ret);
                 goto error;
         }
 
-        DBG(probe, DEBUG, "%s: Scatter/Gather: %s - HW checksums: %s\n",
-            ndev->name, (ndev->features & NETIF_F_SG) ? "on" : "off",
-            (ndev->features & NETIF_F_IP_CSUM) ? "on" : "off");
-
         return priv;
 
 error:
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index da4a1042523a..73195329aa46 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -154,7 +154,7 @@ int stmmac_mdio_register(struct net_device *ndev)
         else
                 irqlist = priv->mii_irq;
 
-        new_bus->name = "STMMAC MII Bus";
+        new_bus->name = "stmmac";
         new_bus->read = &stmmac_mdio_read;
         new_bus->write = &stmmac_mdio_write;
         new_bus->reset = &stmmac_mdio_reset;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 54a819a36487..50ad5b80cfaf 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -96,13 +96,11 @@ static int __devinit stmmac_pci_probe(struct pci_dev *pdev,
 
         stmmac_default_data();
 
-        priv = stmmac_dvr_probe(&(pdev->dev), &plat_dat);
+        priv = stmmac_dvr_probe(&(pdev->dev), &plat_dat, addr);
         if (!priv) {
-                pr_err("%s: main drivr probe failed", __func__);
+                pr_err("%s: main driver probe failed", __func__);
                 goto err_out;
         }
-        priv->ioaddr = addr;
-        priv->dev->base_addr = (unsigned long)addr;
         priv->dev->irq = pdev->irq;
         priv->wol_irq = pdev->irq;
 
@@ -170,9 +168,9 @@ static int stmmac_pci_resume(struct pci_dev *pdev)
 #define STMMAC_DEVICE_ID 0x1108
 
 static DEFINE_PCI_DEVICE_TABLE(stmmac_id_table) = {
-        {
-        PCI_DEVICE(STMMAC_VENDOR_ID, STMMAC_DEVICE_ID)}, {
-        }
+        {PCI_DEVICE(STMMAC_VENDOR_ID, STMMAC_DEVICE_ID)},
+        {PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_MAC)},
+        {}
 };
 
 MODULE_DEVICE_TABLE(pci, stmmac_id_table);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 1ac83243649a..3aad9810237c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -59,16 +59,20 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
                 goto out_release_region;
         }
         plat_dat = pdev->dev.platform_data;
-        priv = stmmac_dvr_probe(&(pdev->dev), plat_dat);
+
+        /* Custom initialisation (if needed)*/
+        if (plat_dat->init) {
+                ret = plat_dat->init(pdev);
+                if (unlikely(ret))
+                        goto out_unmap;
+        }
+
+        priv = stmmac_dvr_probe(&(pdev->dev), plat_dat, addr);
         if (!priv) {
-                pr_err("%s: main drivr probe failed", __func__);
+                pr_err("%s: main driver probe failed", __func__);
                 goto out_unmap;
         }
 
-        priv->ioaddr = addr;
-        /* Set the I/O base addr */
-        priv->dev->base_addr = (unsigned long)addr;
-
         /* Get the MAC information */
         priv->dev->irq = platform_get_irq_byname(pdev, "macirq");
         if (priv->dev->irq == -ENXIO) {
@@ -92,13 +96,6 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, priv->dev);
 
-        /* Custom initialisation */
-        if (priv->plat->init) {
-                ret = priv->plat->init(pdev);
-                if (unlikely(ret))
-                        goto out_unmap;
-        }
-
         pr_debug("STMMAC platform driver registration completed");
 
         return 0;
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index 4d9a28ffd3c3..cbc8df78d84b 100644
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -1122,7 +1122,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
         pdata = pdev->dev.platform_data;
 
         if (external_switch || dumb_switch) {
-                strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
+                strncpy(mdio_bus_id, "fixed-0", MII_BUS_ID_SIZE); /* fixed phys bus */
                 phy_id = pdev->id;
         } else {
                 for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
@@ -1138,7 +1138,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
         if (phy_id == PHY_MAX_ADDR) {
                 dev_err(&pdev->dev, "no PHY present, falling back "
                                         "to switch on MDIO bus 0\n");
-                strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
+                strncpy(mdio_bus_id, "fixed-0", MII_BUS_ID_SIZE); /* fixed phys bus */
                 phy_id = pdev->id;
         }
 
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 794ac30a577b..4fa0bcb25dfc 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1600,8 +1600,9 @@ static int emac_dev_open(struct net_device *ndev)
                 if (IS_ERR(priv->phydev)) {
                         dev_err(emac_dev, "could not connect to phy %s\n",
                                 priv->phy_id);
+                        ret = PTR_ERR(priv->phydev);
                         priv->phydev = NULL;
-                        return PTR_ERR(priv->phydev);
+                        return ret;
                 }
 
                 priv->link = 0;
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index ef7c9c17bfff..af8b8fc39eb2 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -318,9 +318,9 @@ static int __devinit davinci_mdio_probe(struct platform_device *pdev)
 
         data->clk = clk_get(dev, NULL);
         if (IS_ERR(data->clk)) {
-                data->clk = NULL;
                 dev_err(dev, "failed to get device clock\n");
                 ret = PTR_ERR(data->clk);
+                data->clk = NULL;
                 goto bail_out;
         }
 
diff --git a/drivers/net/ethernet/toshiba/Kconfig b/drivers/net/ethernet/toshiba/Kconfig
index 051764704559..74acb5cf6099 100644
--- a/drivers/net/ethernet/toshiba/Kconfig
+++ b/drivers/net/ethernet/toshiba/Kconfig
@@ -5,7 +5,7 @@
 config NET_VENDOR_TOSHIBA
         bool "Toshiba devices"
         default y
-        depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB) || PPC_PS3
+        depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB || MIPS) || PPC_PS3
         ---help---
           If you have a network (Ethernet) card belonging to this class, say Y
           and read the Ethernet-HOWTO, available from
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index 4128d6b8cc28..cb35b14b73bb 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -2491,9 +2491,6 @@ static int velocity_close(struct net_device *dev)
         if (dev->irq != 0)
                 free_irq(dev->irq, dev);
 
-        /* Power down the chip */
-        pci_set_power_state(vptr->pdev, PCI_D3hot);
-
         velocity_free_rings(vptr);
 
         vptr->flags &= (~VELOCITY_FLAGS_OPENED);
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index 72a854f05bb8..41a8b5a9849e 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -1416,7 +1416,8 @@ static int __devinit eth_init_one(struct platform_device *pdev)
         __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
         udelay(50);
 
-        snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, "0", plat->phy);
+        snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,
+                mdio_bus->id, plat->phy);
         port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
                                    PHY_INTERFACE_MODE_MII);
         if (IS_ERR(port->phydev)) {
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 462d05f05e84..466c58a7353d 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -68,11 +68,11 @@ static void do_set_multicast(struct work_struct *w)
 
         nvdev = hv_get_drvdata(ndevctx->device_ctx);
         if (nvdev == NULL)
-                return;
+                goto out;
 
         rdev = nvdev->extension;
         if (rdev == NULL)
-                return;
+                goto out;
 
         if (net->flags & IFF_PROMISC)
                 rndis_filter_set_packet_filter(rdev,
@@ -83,6 +83,7 @@ static void do_set_multicast(struct work_struct *w)
                         NDIS_PACKET_TYPE_ALL_MULTICAST |
                         NDIS_PACKET_TYPE_DIRECTED);
 
+out:
         kfree(w);
 }
 
@@ -122,7 +123,7 @@ static int netvsc_close(struct net_device *net)
         struct hv_device *device_obj = net_device_ctx->device_ctx;
         int ret;
 
-        netif_stop_queue(net);
+        netif_tx_disable(net);
 
         ret = rndis_filter_close(device_obj);
         if (ret != 0)
@@ -150,10 +151,10 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
         int ret;
         unsigned int i, num_pages, npg_data;
 
-        /* Add multipage for skb->data and additional one for RNDIS */
+        /* Add multipages for skb->data and additional 2 for RNDIS */
         npg_data = (((unsigned long)skb->data + skb_headlen(skb) - 1)
                 >> PAGE_SHIFT) - ((unsigned long)skb->data >> PAGE_SHIFT) + 1;
-        num_pages = skb_shinfo(skb)->nr_frags + npg_data + 1;
+        num_pages = skb_shinfo(skb)->nr_frags + npg_data + 2;
 
         /* Allocate a netvsc packet based on # of frags. */
         packet = kzalloc(sizeof(struct hv_netvsc_packet) +
@@ -172,8 +173,8 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
                                 sizeof(struct hv_netvsc_packet) +
                                     (num_pages * sizeof(struct hv_page_buffer));
 
-        /* Setup the rndis header */
-        packet->page_buf_cnt = num_pages;
+        /* If the rndis msg goes beyond 1 page, we will add 1 later */
+        packet->page_buf_cnt = num_pages - 1;
 
         /* Initialize it from the skb */
         packet->total_data_buflen = skb->len;
@@ -255,7 +256,7 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj,
                 schedule_delayed_work(&ndev_ctx->dwork, msecs_to_jiffies(20));
         } else {
                 netif_carrier_off(net);
-                netif_stop_queue(net);
+                netif_tx_disable(net);
         }
 }
 
@@ -297,7 +298,7 @@ int netvsc_recv_callback(struct hv_device *device_obj,
         skb->ip_summed = CHECKSUM_NONE;
 
         net->stats.rx_packets++;
-        net->stats.rx_bytes += skb->len;
+        net->stats.rx_bytes += packet->total_data_buflen;
 
         /*
          * Pass the skb back up. Network stack will deallocate the skb when it
@@ -336,7 +337,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu)
 
         nvdev->start_remove = true;
         cancel_delayed_work_sync(&ndevctx->dwork);
-        netif_stop_queue(ndev);
+        netif_tx_disable(ndev);
         rndis_filter_device_remove(hdev);
 
         ndev->mtu = mtu;
@@ -459,7 +460,7 @@ static int netvsc_remove(struct hv_device *dev)
         cancel_delayed_work_sync(&ndev_ctx->dwork);
 
         /* Stop outbound asap */
-        netif_stop_queue(net);
+        netif_tx_disable(net);
 
         unregister_netdev(net);
 
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index da181f9a49d1..133b7fbf8595 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -321,6 +321,25 @@ static void rndis_filter_receive_data(struct rndis_device *dev,
         data_offset = RNDIS_HEADER_SIZE + rndis_pkt->data_offset;
 
         pkt->total_data_buflen -= data_offset;
+
+        /*
+         * Make sure we got a valid RNDIS message, now total_data_buflen
+         * should be the data packet size plus the trailer padding size
+         */
+        if (pkt->total_data_buflen < rndis_pkt->data_len) {
+                netdev_err(dev->net_dev->ndev, "rndis message buffer "
+                           "overflow detected (got %u, min %u)"
+                           "...dropping this message!\n",
+                           pkt->total_data_buflen, rndis_pkt->data_len);
+                return;
+        }
+
+        /*
+         * Remove the rndis trailer padding from rndis packet message
+         * rndis_pkt->data_len tell us the real data length, we only copy
+         * the data packet to the stack, without the rndis trailer padding
+         */
+        pkt->total_data_buflen = rndis_pkt->data_len;
         pkt->data = (void *)((unsigned long)pkt->data + data_offset);
 
         pkt->is_data_pkt = true;
@@ -778,6 +797,19 @@ int rndis_filter_send(struct hv_device *dev,
                         (unsigned long)rndisMessage & (PAGE_SIZE-1);
         pkt->page_buf[0].len = rndisMessageSize;
 
+        /* Add one page_buf if the rndis msg goes beyond page boundary */
+        if (pkt->page_buf[0].offset + rndisMessageSize > PAGE_SIZE) {
+                int i;
+                for (i = pkt->page_buf_cnt; i > 1; i--)
+                        pkt->page_buf[i] = pkt->page_buf[i-1];
+                pkt->page_buf_cnt++;
+                pkt->page_buf[0].len = PAGE_SIZE - pkt->page_buf[0].offset;
+                pkt->page_buf[1].pfn = virt_to_phys((void *)((ulong)
+                        rndisMessage + pkt->page_buf[0].len)) >> PAGE_SHIFT;
+                pkt->page_buf[1].offset = 0;
+                pkt->page_buf[1].len = rndisMessageSize - pkt->page_buf[0].len;
+        }
+
         /* Save the packet send completion and context */
         filterPacket->completion = pkt->completion.send.send_completion;
         filterPacket->completion_ctx =
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index f2f820c4b40a..9ea99217f116 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -173,6 +173,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb)
                 skb = ip_check_defrag(skb, IP_DEFRAG_MACVLAN);
                 if (!skb)
                         return RX_HANDLER_CONSUMED;
+                eth = eth_hdr(skb);
                 src = macvlan_hash_lookup(port, eth->h_source);
                 if (!src)
                         /* frame comes from an external address */
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 88cc5db9affd..8985cc62cf41 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -38,12 +38,11 @@
 
 /**
  * mdiobus_alloc_size - allocate a mii_bus structure
+ * @size: extra amount of memory to allocate for private storage.
+ * If non-zero, then bus->priv is points to that memory.
  *
  * Description: called by a bus driver to allocate an mii_bus
  * structure to fill in.
- *
- * 'size' is an an extra amount of memory to allocate for private storage.
- * If non-zero, then bus->priv is points to that memory.
  */
 struct mii_bus *mdiobus_alloc_size(size_t size)
 {
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index ed2a862b835d..6b678f38e5ce 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -92,9 +92,9 @@ struct team_option *__team_find_option(struct team *team, const char *opt_name)
         return NULL;
 }
 
-int team_options_register(struct team *team,
-                          const struct team_option *option,
-                          size_t option_count)
+int __team_options_register(struct team *team,
+                            const struct team_option *option,
+                            size_t option_count)
 {
         int i;
         struct team_option **dst_opts;
@@ -116,8 +116,11 @@ int team_options_register(struct team *team,
                 }
         }
 
-        for (i = 0; i < option_count; i++)
+        for (i = 0; i < option_count; i++) {
+                dst_opts[i]->changed = true;
+                dst_opts[i]->removed = false;
                 list_add_tail(&dst_opts[i]->list, &team->option_list);
+        }
 
         kfree(dst_opts);
         return 0;
@@ -130,10 +133,22 @@ rollback:
         return err;
 }
 
-EXPORT_SYMBOL(team_options_register);
+static void __team_options_mark_removed(struct team *team,
+                                        const struct team_option *option,
+                                        size_t option_count)
+{
+        int i;
+
+        for (i = 0; i < option_count; i++, option++) {
+                struct team_option *del_opt;
 
-static void __team_options_change_check(struct team *team,
-                                        struct team_option *changed_option);
+                del_opt = __team_find_option(team, option->name);
+                if (del_opt) {
+                        del_opt->changed = true;
+                        del_opt->removed = true;
+                }
+        }
+}
 
 static void __team_options_unregister(struct team *team,
                                       const struct team_option *option,
@@ -152,12 +167,29 @@ static void __team_options_unregister(struct team *team,
         }
 }
 
+static void __team_options_change_check(struct team *team);
+
+int team_options_register(struct team *team,
+                          const struct team_option *option,
+                          size_t option_count)
+{
+        int err;
+
+        err = __team_options_register(team, option, option_count);
+        if (err)
+                return err;
+        __team_options_change_check(team);
+        return 0;
+}
+EXPORT_SYMBOL(team_options_register);
+
 void team_options_unregister(struct team *team,
                              const struct team_option *option,
                              size_t option_count)
 {
+        __team_options_mark_removed(team, option, option_count);
+        __team_options_change_check(team);
         __team_options_unregister(team, option, option_count);
-        __team_options_change_check(team, NULL);
 }
 EXPORT_SYMBOL(team_options_unregister);
 
@@ -176,7 +208,8 @@ static int team_option_set(struct team *team, struct team_option *option,
         if (err)
                 return err;
 
-        __team_options_change_check(team, option);
+        option->changed = true;
+        __team_options_change_check(team);
         return err;
 }
 
@@ -653,6 +686,7 @@ static int team_port_del(struct team *team, struct net_device *port_dev)
                 return -ENOENT;
         }
 
+        port->removed = true;
         __team_port_change_check(port, false);
         team_port_list_del_port(team, port);
         team_adjust_ops(team);
@@ -1200,10 +1234,9 @@ err_fill:
         return err;
 }
 
-static int team_nl_fill_options_get_changed(struct sk_buff *skb,
-                                            u32 pid, u32 seq, int flags,
-                                            struct team *team,
-                                            struct team_option *changed_option)
+static int team_nl_fill_options_get(struct sk_buff *skb,
+                                    u32 pid, u32 seq, int flags,
+                                    struct team *team, bool fillall)
 {
         struct nlattr *option_list;
         void *hdr;
@@ -1223,12 +1256,19 @@ static int team_nl_fill_options_get_changed(struct sk_buff *skb,
                 struct nlattr *option_item;
                 long arg;
 
+                /* Include only changed options if fill all mode is not on */
+                if (!fillall && !option->changed)
+                        continue;
                 option_item = nla_nest_start(skb, TEAM_ATTR_ITEM_OPTION);
                 if (!option_item)
                         goto nla_put_failure;
                 NLA_PUT_STRING(skb, TEAM_ATTR_OPTION_NAME, option->name);
-                if (option == changed_option)
+                if (option->changed) {
                         NLA_PUT_FLAG(skb, TEAM_ATTR_OPTION_CHANGED);
+                        option->changed = false;
+                }
+                if (option->removed)
+                        NLA_PUT_FLAG(skb, TEAM_ATTR_OPTION_REMOVED);
                 switch (option->type) {
                 case TEAM_OPTION_TYPE_U32:
                         NLA_PUT_U8(skb, TEAM_ATTR_OPTION_TYPE, NLA_U32);
@@ -1255,13 +1295,13 @@ nla_put_failure:
         return -EMSGSIZE;
 }
 
-static int team_nl_fill_options_get(struct sk_buff *skb,
-                                    struct genl_info *info, int flags,
-                                    struct team *team)
+static int team_nl_fill_options_get_all(struct sk_buff *skb,
+                                        struct genl_info *info, int flags,
+                                        struct team *team)
 {
-        return team_nl_fill_options_get_changed(skb, info->snd_pid,
-                                                info->snd_seq, NLM_F_ACK,
-                                                team, NULL);
+        return team_nl_fill_options_get(skb, info->snd_pid,
+                                        info->snd_seq, NLM_F_ACK,
+                                        team, true);
 }
 
 static int team_nl_cmd_options_get(struct sk_buff *skb, struct genl_info *info)
@@ -1273,7 +1313,7 @@ static int team_nl_cmd_options_get(struct sk_buff *skb, struct genl_info *info)
         if (!team)
                 return -EINVAL;
 
-        err = team_nl_send_generic(info, team, team_nl_fill_options_get);
+        err = team_nl_send_generic(info, team, team_nl_fill_options_get_all);
 
         team_nl_team_put(team);
 
@@ -1365,10 +1405,10 @@ team_put:
         return err;
 }
 
-static int team_nl_fill_port_list_get_changed(struct sk_buff *skb,
-                                              u32 pid, u32 seq, int flags,
-                                              struct team *team,
-                                              struct team_port *changed_port)
+static int team_nl_fill_port_list_get(struct sk_buff *skb,
+                                      u32 pid, u32 seq, int flags,
+                                      struct team *team,
+                                      bool fillall)
 {
         struct nlattr *port_list;
         void *hdr;
@@ -1387,12 +1427,19 @@ static int team_nl_fill_port_list_get_changed(struct sk_buff *skb,
         list_for_each_entry(port, &team->port_list, list) {
                 struct nlattr *port_item;
 
+                /* Include only changed ports if fill all mode is not on */
+                if (!fillall && !port->changed)
+                        continue;
                 port_item = nla_nest_start(skb, TEAM_ATTR_ITEM_PORT);
                 if (!port_item)
                         goto nla_put_failure;
                 NLA_PUT_U32(skb, TEAM_ATTR_PORT_IFINDEX, port->dev->ifindex);
-                if (port == changed_port)
+                if (port->changed) {
                         NLA_PUT_FLAG(skb, TEAM_ATTR_PORT_CHANGED);
+                        port->changed = false;
+                }
+                if (port->removed)
+                        NLA_PUT_FLAG(skb, TEAM_ATTR_PORT_REMOVED);
                 if (port->linkup)
                         NLA_PUT_FLAG(skb, TEAM_ATTR_PORT_LINKUP);
                 NLA_PUT_U32(skb, TEAM_ATTR_PORT_SPEED, port->speed);
@@ -1408,13 +1455,13 @@ nla_put_failure:
         return -EMSGSIZE;
 }
 
-static int team_nl_fill_port_list_get(struct sk_buff *skb,
-                                      struct genl_info *info, int flags,
-                                      struct team *team)
+static int team_nl_fill_port_list_get_all(struct sk_buff *skb,
+                                          struct genl_info *info, int flags,
+                                          struct team *team)
 {
-        return team_nl_fill_port_list_get_changed(skb, info->snd_pid,
-                                                  info->snd_seq, NLM_F_ACK,
-                                                  team, NULL);
+        return team_nl_fill_port_list_get(skb, info->snd_pid,
+                                          info->snd_seq, NLM_F_ACK,
+                                          team, true);
 }
 
 static int team_nl_cmd_port_list_get(struct sk_buff *skb,
@@ -1427,7 +1474,7 @@ static int team_nl_cmd_port_list_get(struct sk_buff *skb,
         if (!team)
                 return -EINVAL;
 
-        err = team_nl_send_generic(info, team, team_nl_fill_port_list_get);
+        err = team_nl_send_generic(info, team, team_nl_fill_port_list_get_all);
 
         team_nl_team_put(team);
 
@@ -1464,8 +1511,7 @@ static struct genl_multicast_group team_change_event_mcgrp = {
         .name = TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME,
 };
 
-static int team_nl_send_event_options_get(struct team *team,
-                                          struct team_option *changed_option)
+static int team_nl_send_event_options_get(struct team *team)
 {
         struct sk_buff *skb;
         int err;
@@ -1475,8 +1521,7 @@ static int team_nl_send_event_options_get(struct team *team,
         if (!skb)
                 return -ENOMEM;
 
-        err = team_nl_fill_options_get_changed(skb, 0, 0, 0, team,
-                                               changed_option);
+        err = team_nl_fill_options_get(skb, 0, 0, 0, team, false);
         if (err < 0)
                 goto err_fill;
 
@@ -1489,18 +1534,17 @@ err_fill:
         return err;
 }
 
-static int team_nl_send_event_port_list_get(struct team_port *port)
+static int team_nl_send_event_port_list_get(struct team *team)
 {
         struct sk_buff *skb;
         int err;
-        struct net *net = dev_net(port->team->dev);
+        struct net *net = dev_net(team->dev);
 
         skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
         if (!skb)
                 return -ENOMEM;
 
-        err = team_nl_fill_port_list_get_changed(skb, 0, 0, 0,
-                                                 port->team, port);
+        err = team_nl_fill_port_list_get(skb, 0, 0, 0, team, false);
         if (err < 0)
                 goto err_fill;
 
@@ -1544,12 +1588,11 @@ static void team_nl_fini(void)
  * Change checkers
  ******************/
 
-static void __team_options_change_check(struct team *team,
-                                        struct team_option *changed_option)
+static void __team_options_change_check(struct team *team)
 {
         int err;
 
-        err = team_nl_send_event_options_get(team, changed_option);
+        err = team_nl_send_event_options_get(team);
         if (err)
                 netdev_warn(team->dev, "Failed to send options change via netlink\n");
 }
@@ -1559,9 +1602,10 @@ static void __team_port_change_check(struct team_port *port, bool linkup)
 {
         int err;
 
-        if (port->linkup == linkup)
+        if (!port->removed && port->linkup == linkup)
                 return;
 
+        port->changed = true;
         port->linkup = linkup;
         if (linkup) {
                 struct ethtool_cmd ecmd;
@@ -1577,7 +1621,7 @@ static void __team_port_change_check(struct team_port *port, bool linkup)
         port->duplex = 0;
 
 send_event:
-        err = team_nl_send_event_port_list_get(port);
+        err = team_nl_send_event_port_list_get(port->team);
         if (err)
                 netdev_warn(port->team->dev, "Failed to send port change of device %s via netlink\n",
                             port->dev->name);
diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig
index c7e0149d1514..45550d42b368 100644
--- a/drivers/net/tokenring/Kconfig
+++ b/drivers/net/tokenring/Kconfig
@@ -7,7 +7,6 @@ menuconfig TR
         bool "Token Ring driver support"
         depends on NETDEVICES && !UML
         depends on (PCI || ISA || MCA || CCW || PCMCIA)
-        select LLC
         help
           Token Ring is IBM's way of communication on a local network; the
           rest of the world uses Ethernet. To participate on a Token Ring
@@ -20,6 +19,10 @@ menuconfig TR
 
 if TR
 
+config WANT_LLC
+        def_bool y
+        select LLC
+
 config PCMCIA_IBMTR
         tristate "IBM PCMCIA tokenring adapter support"
         depends on IBMTR!=y && PCMCIA
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index e84662db51cc..dd78c4cbd459 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -60,6 +60,7 @@
 #define USB_PRODUCT_IPHONE_3GS  0x1294
 #define USB_PRODUCT_IPHONE_4    0x1297
 #define USB_PRODUCT_IPHONE_4_VZW 0x129c
+#define USB_PRODUCT_IPHONE_4S   0x12a0
 
 #define IPHETH_USBINTF_CLASS    255
 #define IPHETH_USBINTF_SUBCLASS 253
@@ -103,6 +104,10 @@ static struct usb_device_id ipheth_table[] = {
                 USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4_VZW,
                 IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
                 IPHETH_USBINTF_PROTO) },
+        { USB_DEVICE_AND_INTERFACE_INFO(
+                USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4S,
+                IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
+                IPHETH_USBINTF_PROTO) },
         { }
 };
 MODULE_DEVICE_TABLE(usb, ipheth_table);
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 49f4667e1fa3..4a3402898f2a 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -422,7 +422,9 @@ static void veth_dellink(struct net_device *dev, struct list_head *head)
         unregister_netdevice_queue(peer, head);
 }
 
-static const struct nla_policy veth_policy[VETH_INFO_MAX + 1];
+static const struct nla_policy veth_policy[VETH_INFO_MAX + 1] = {
+        [VETH_INFO_PEER]        = { .len = sizeof(struct ifinfomsg) },
+};
 
 static struct rtnl_link_ops veth_link_ops = {
         .kind           = DRV_NAME,
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index ee7759575050..87db1ee1c298 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1037,13 +1037,16 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
 
         /*
          * Workaround for early ACK timeouts, add an offset to match the
-         * initval's 64us ack timeout value.
+         * initval's 64us ack timeout value. Use 48us for the CTS timeout.
          * This was initially only meant to work around an issue with delayed
          * BA frames in some implementations, but it has been found to fix ACK
          * timeout issues in other cases as well.
          */
-        if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ)
+        if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ) {
                 acktimeout += 64 - sifstime - ah->slottime;
+                ctstimeout += 48 - sifstime - ah->slottime;
+        }
+
 
         ath9k_hw_set_sifs_time(ah, sifstime);
         ath9k_hw_setslottime(ah, slottime);
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index abf943557dee..53a005d288aa 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -822,6 +822,11 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
                 ARRAY_SIZE(ath9k_tpt_blink));
 #endif
 
+        INIT_WORK(&sc->hw_reset_work, ath_reset_work);
+        INIT_WORK(&sc->hw_check_work, ath_hw_check);
+        INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
+        INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);
+
         /* Register with mac80211 */
         error = ieee80211_register_hw(hw);
         if (error)
@@ -840,10 +845,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
                         goto error_world;
         }
 
-        INIT_WORK(&sc->hw_reset_work, ath_reset_work);
-        INIT_WORK(&sc->hw_check_work, ath_hw_check);
-        INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
-        INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);
         sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
 
         ath_init_leds(sc);
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index b3c3798fe513..635b592ad961 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -694,7 +694,7 @@ static u8 ath_rc_get_highest_rix(struct ath_softc *sc,
                 return rate;
 
         /* This should not happen */
-        WARN_ON(1);
+        WARN_ON_ONCE(1);
 
         rate = ath_rc_priv->valid_rate_index[0];
 
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 0e666fbe0842..7e1a91af1497 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -822,6 +822,14 @@ static bool ath9k_rx_accept(struct ath_common *common,
                 (ATH9K_RXERR_DECRYPT | ATH9K_RXERR_CRC | ATH9K_RXERR_MIC |
                  ATH9K_RXERR_KEYMISS));
 
+        /*
+         * Key miss events are only relevant for pairwise keys where the
+         * descriptor does contain a valid key index. This has been observed
+         * mostly with CCMP encryption.
+         */
+        if (rx_stats->rs_keyix == ATH9K_RXKEYIX_INVALID)
+                rx_stats->rs_status &= ~ATH9K_RXERR_KEYMISS;
+
         if (!rx_stats->rs_datalen)
                 return false;
         /*
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index b97a40ed5fff..3876c7ea54f4 100644
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -31,6 +31,12 @@ config B43_BCMA
         depends on B43 && BCMA
         default y
 
+config B43_BCMA_EXTRA
+        bool "Hardware support that overlaps with the brcmsmac driver"
+        depends on B43_BCMA
+        default n if BRCMSMAC || BRCMSMAC_MODULE
+        default y
+
 config B43_SSB
         bool
         depends on B43 && SSB
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index b91f28ef1032..23ffb1b9a86f 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -116,8 +116,10 @@ MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO");
 #ifdef CONFIG_B43_BCMA
 static const struct bcma_device_id b43_bcma_tbl[] = {
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS),
+#ifdef CONFIG_B43_BCMA_EXTRA
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x17, BCMA_ANY_CLASS),
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, BCMA_ANY_CLASS),
+#endif
         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1D, BCMA_ANY_CLASS),
         BCMA_CORETABLE_END
 };
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index f7ed34034f88..f6affc6fd12a 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -7981,13 +7981,21 @@ int brcms_c_get_curband(struct brcms_c_info *wlc)
 
 void brcms_c_wait_for_tx_completion(struct brcms_c_info *wlc, bool drop)
 {
+        int timeout = 20;
+
         /* flush packet queue when requested */
         if (drop)
                 brcmu_pktq_flush(&wlc->pkt_queue->q, false, NULL, NULL);
 
         /* wait for queue and DMA fifos to run dry */
-        while (!pktq_empty(&wlc->pkt_queue->q) || brcms_txpktpendtot(wlc) > 0)
+        while (!pktq_empty(&wlc->pkt_queue->q) || brcms_txpktpendtot(wlc) > 0) {
                 brcms_msleep(wlc->wl, 1);
+
+                if (--timeout == 0)
+                        break;
+        }
+
+        WARN_ON_ONCE(timeout == 0);
 }
 
 void brcms_c_set_beacon_listen_interval(struct brcms_c_info *wlc, u8 interval)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index c664c2726553..63bbc60be28e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -91,6 +91,7 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv,
                 tx_cmd->tid_tspec = qc[0] & 0xf;
                 tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK;
         } else {
+                tx_cmd->tid_tspec = IWL_TID_NON_QOS;
                 if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
                         tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
                 else
@@ -620,7 +621,7 @@ int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif,
         sta_priv->lq_sta.lq.agg_params.agg_frame_cnt_limit =
                 sta_priv->max_agg_bufsize;
 
-        IWL_INFO(priv, "Tx aggregation enabled on ra = %pM tid = %d\n",
+        IWL_DEBUG_HT(priv, "Tx aggregation enabled on ra = %pM tid = %d\n",
                  sta->addr, tid);
 
         return iwl_send_lq_cmd(priv, ctx,
@@ -808,6 +809,8 @@ static void iwl_rx_reply_tx_agg(struct iwl_priv *priv,
         u32 status = le16_to_cpu(tx_resp->status.status);
         int i;
 
+        WARN_ON(tid == IWL_TID_NON_QOS);
+
         if (agg->wait_for_ba)
                 IWL_DEBUG_TX_REPLY(priv,
                         "got tx response w/o block-ack\n");
@@ -1035,10 +1038,13 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,
                 }
 
                 __skb_queue_head_init(&skbs);
-                priv->tid_data[sta_id][tid].next_reclaimed = next_reclaimed;
 
-                IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d",
-                                          next_reclaimed);
+                if (tid != IWL_TID_NON_QOS) {
+                        priv->tid_data[sta_id][tid].next_reclaimed =
+                                next_reclaimed;
+                        IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d",
+                                                  next_reclaimed);
+                }
 
                 /*we can free until ssn % q.n_bd not inclusive */
                 WARN_ON(iwl_trans_reclaim(trans(priv), sta_id, tid, txq_id,
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 265de39d394c..f822ac447c3b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -815,6 +815,7 @@ struct iwl_qosparam_cmd {
 
 #define IWL_INVALID_STATION     255
 #define IWL_MAX_TID_COUNT       8
+#define IWL_TID_NON_QOS IWL_MAX_TID_COUNT
 
 #define STA_FLG_TX_RATE_MSK             cpu_to_le32(1 << 2)
 #define STA_FLG_PWR_SAVE_MSK            cpu_to_le32(1 << 8)
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 752493f00406..65d1f05007be 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -972,11 +972,11 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
         }
 #endif
 
-        spin_unlock_irqrestore(&trans->shrd->lock, flags);
-
         /* saved interrupt in inta variable now we can reset trans_pcie->inta */
         trans_pcie->inta = 0;
 
+        spin_unlock_irqrestore(&trans->shrd->lock, flags);
+
         /* Now service all interrupt bits discovered above. */
         if (inta & CSR_INT_BIT_HW_ERR) {
                 IWL_ERR(trans, "Hardware error detected.  Restarting.\n");
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index 67d6e324e26f..324d06dfb690 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1262,6 +1262,7 @@ static int iwl_trans_pcie_reclaim(struct iwl_trans *trans, int sta_id, int tid,
         txq->time_stamp = jiffies;
 
         if (unlikely(txq_id >= IWLAGN_FIRST_AMPDU_QUEUE &&
+                     tid != IWL_TID_NON_QOS &&
                      txq_id != trans_pcie->agg_txq[sta_id][tid])) {
                 /*
                  * FIXME: this is a uCode bug which need to be addressed,
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index e05b417a3fae..1d0ec57a0143 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -382,7 +382,8 @@ mwifiex_free_adapter(struct mwifiex_adapter *adapter)
 
         adapter->if_ops.cleanup_if(adapter);
 
-        dev_kfree_skb_any(adapter->sleep_cfm);
+        if (adapter->sleep_cfm)
+                dev_kfree_skb_any(adapter->sleep_cfm);
 }
 
 /*
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 84be196188cc..b728f54451e4 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -822,7 +822,9 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)
                         continue;
 
                 rtnl_lock();
-                mwifiex_del_virtual_intf(priv->wdev->wiphy, priv->netdev);
+                if (priv->wdev && priv->netdev)
+                        mwifiex_del_virtual_intf(priv->wdev->wiphy,
+                                                 priv->netdev);
                 rtnl_unlock();
         }
 
@@ -830,9 +832,11 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)
         if (!priv)
                 goto exit_remove;
 
-        wiphy_unregister(priv->wdev->wiphy);
-        wiphy_free(priv->wdev->wiphy);
-        kfree(priv->wdev);
+        if (priv->wdev) {
+                wiphy_unregister(priv->wdev->wiphy);
+                wiphy_free(priv->wdev->wiphy);
+                kfree(priv->wdev);
+        }
 
         mwifiex_terminate_workqueue(adapter);
 
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 470ca75ec250..b0fbf5d4fea0 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -54,7 +54,7 @@ int mwifiex_copy_mcast_addr(struct mwifiex_multicast_list *mlist,
 int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)
 {
         bool cancel_flag = false;
-        int status = adapter->cmd_wait_q.status;
+        int status;
         struct cmd_ctrl_node *cmd_queued;
 
         if (!adapter->cmd_queued)
@@ -79,6 +79,8 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)
                 mwifiex_cancel_pending_ioctl(adapter);
                 dev_dbg(adapter->dev, "cmd cancel\n");
         }
+
+        status = adapter->cmd_wait_q.status;
         adapter->cmd_wait_q.status = 0;
 
         return status;
@@ -240,6 +242,8 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
 
                 if (!netif_queue_stopped(priv->netdev))
                         mwifiex_stop_net_dev_queue(priv->netdev, adapter);
+                if (netif_carrier_ok(priv->netdev))
+                        netif_carrier_off(priv->netdev);
 
                 /* Clear any past association response stored for
                  * application retrieval */
@@ -271,6 +275,8 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
 
                 if (!netif_queue_stopped(priv->netdev))
                         mwifiex_stop_net_dev_queue(priv->netdev, adapter);
+                if (netif_carrier_ok(priv->netdev))
+                        netif_carrier_off(priv->netdev);
 
                 if (!ret) {
                         dev_dbg(adapter->dev, "info: network found in scan"
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 22a1a8fc6e02..7bef66def10c 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -514,9 +514,9 @@ EXPORT_SYMBOL_GPL(rt2800_write_tx_data);
 
 static int rt2800_agc_to_rssi(struct rt2x00_dev *rt2x00dev, u32 rxwi_w2)
 {
-        int rssi0 = rt2x00_get_field32(rxwi_w2, RXWI_W2_RSSI0);
-        int rssi1 = rt2x00_get_field32(rxwi_w2, RXWI_W2_RSSI1);
-        int rssi2 = rt2x00_get_field32(rxwi_w2, RXWI_W2_RSSI2);
+        s8 rssi0 = rt2x00_get_field32(rxwi_w2, RXWI_W2_RSSI0);
+        s8 rssi1 = rt2x00_get_field32(rxwi_w2, RXWI_W2_RSSI1);
+        s8 rssi2 = rt2x00_get_field32(rxwi_w2, RXWI_W2_RSSI2);
         u16 eeprom;
         u8 offset0;
         u8 offset1;
@@ -552,7 +552,7 @@ static int rt2800_agc_to_rssi(struct rt2x00_dev *rt2x00dev, u32 rxwi_w2)
          * which gives less energy...
          */
         rssi0 = max(rssi0, rssi1);
-        return max(rssi0, rssi2);
+        return (int)max(rssi0, rssi2);
 }
 
 void rt2800_process_rxwi(struct queue_entry *entry,
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 39e0907a3c4e..9245d882c06a 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1501,7 +1501,7 @@ static int rtl_pci_init(struct ieee80211_hw *hw, struct pci_dev *pdev)
                 return err;
         }
 
-        return 1;
+        return 0;
 }
 
 static int rtl_pci_start(struct ieee80211_hw *hw)
@@ -1870,7 +1870,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         }
 
         /* Init PCI sw */
-        err = !rtl_pci_init(hw, pdev);
+        err = rtl_pci_init(hw, pdev);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          ("Failed to init PCI.\n"));
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 0a70149df3fc..98a574a4a465 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -866,6 +866,14 @@ static int fill_ctrlset(struct zd_mac *mac,
 
         ZD_ASSERT(frag_len <= 0xffff);
 
+        /*
+         * Firmware computes the duration itself (for all frames except PSPoll)
+         * and needs the field set to 0 at input, otherwise firmware messes up
+         * duration_id and sets bits 14 and 15 on.
+         */
+        if (!ieee80211_is_pspoll(hdr->frame_control))
+                hdr->duration_id = 0;
+
         txrate = ieee80211_get_tx_rate(mac->hw, info);
 
         cs->modulation = txrate->hw_value;
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index fa679057630f..698b905058dd 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -68,7 +68,7 @@ struct netfront_cb {
 
 #define NET_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE)
 #define NET_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE)
-#define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256)
+#define TX_MAX_TARGET min_t(int, NET_TX_RING_SIZE, 256)
 
 struct netfront_stats {
         u64                     rx_packets;
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index ea2bd1be2640..91a375fb6ae6 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -23,7 +23,6 @@
 #include <asm/machdep.h>
 #endif /* CONFIG_PPC */
 
-#include <asm/setup.h>
 #include <asm/page.h>
 
 char *of_fdt_get_string(struct boot_param_header *blob, u32 offset)
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 980c079e4443..483c0adcad87 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -182,7 +182,7 @@ struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
         if (!phy_id || sz < sizeof(*phy_id))
                 return NULL;
 
-        sprintf(bus_id, PHY_ID_FMT, "0", be32_to_cpu(phy_id[0]));
+        sprintf(bus_id, PHY_ID_FMT, "fixed-0", be32_to_cpu(phy_id[0]));
 
         phy = phy_connect(dev, bus_id, hndlr, 0, iface);
         return IS_ERR(phy) ? NULL : phy;
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 0321fa3b4226..0dab5ecf61bb 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -347,8 +347,6 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
                         return rc;
         }
 
-        pci_write_config_dword(dev, iov->pos + PCI_SRIOV_SYS_PGSIZE, iov->pgsz);
-
         iov->ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE;
         pci_cfg_access_lock(dev);
         pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, iov->ctrl);
@@ -466,6 +464,7 @@ found:
                 return -EIO;
 
         pgsz &= ~(pgsz - 1);
+        pci_write_config_dword(dev, pos + PCI_SRIOV_SYS_PGSIZE, pgsz);
 
         nres = 0;
         for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 97fff785e97e..af295bb21d62 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2802,7 +2802,7 @@ pci_intx(struct pci_dev *pdev, int enable)
 
 /**
  * pci_intx_mask_supported - probe for INTx masking support
- * @pdev: the PCI device to operate on
+ * @dev: the PCI device to operate on
  *
  * Check if the device dev support INTx masking via the config space
  * command word.
@@ -2884,7 +2884,7 @@ done:
 
 /**
  * pci_check_and_mask_intx - mask INTx on pending interrupt
- * @pdev: the PCI device to operate on
+ * @dev: the PCI device to operate on
  *
  * Check if the device dev has its INTx line asserted, mask it and
  * return true in that case. False is returned if not interrupt was
@@ -2898,7 +2898,7 @@ EXPORT_SYMBOL_GPL(pci_check_and_mask_intx);
 
 /**
  * pci_check_and_mask_intx - unmask INTx of no interrupt is pending
- * @pdev: the PCI device to operate on
+ * @dev: the PCI device to operate on
  *
  * Check if the device dev has its INTx line asserted, unmask it if not
  * and return true. False is returned and the mask remains active if
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 7cc9e2f0f47c..71eac9cd724d 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -651,6 +651,11 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
         dev_dbg(&dev->dev, "scanning [bus %02x-%02x] behind bridge, pass %d\n",
                 secondary, subordinate, pass);
 
+        if (!primary && (primary != bus->number) && secondary && subordinate) {
+                dev_warn(&dev->dev, "Primary bus is hard wired to 0\n");
+                primary = bus->number;
+        }
+
         /* Check if setup is sensible at all */
         if (!pass &&
             (primary != bus->number || secondary <= bus->number)) {
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 6def3624c688..ef8b18c48f26 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -77,6 +77,7 @@ void pci_remove_bus(struct pci_bus *pci_bus)
 }
 EXPORT_SYMBOL(pci_remove_bus);
 
+static void __pci_remove_behind_bridge(struct pci_dev *dev);
 /**
  * pci_remove_bus_device - remove a PCI device and any children
  * @dev: the device to remove
@@ -94,7 +95,7 @@ static void __pci_remove_bus_device(struct pci_dev *dev)
         if (dev->subordinate) {
                 struct pci_bus *b = dev->subordinate;
 
-                pci_remove_behind_bridge(dev);
+                __pci_remove_behind_bridge(dev);
                 pci_remove_bus(b);
                 dev->subordinate = NULL;
         }
@@ -107,6 +108,24 @@ void pci_remove_bus_device(struct pci_dev *dev)
         __pci_remove_bus_device(dev);
 }
 
+static void __pci_remove_behind_bridge(struct pci_dev *dev)
+{
+        struct list_head *l, *n;
+
+        if (dev->subordinate)
+                list_for_each_safe(l, n, &dev->subordinate->devices)
+                        __pci_remove_bus_device(pci_dev_b(l));
+}
+
+static void pci_stop_behind_bridge(struct pci_dev *dev)
+{
+        struct list_head *l, *n;
+
+        if (dev->subordinate)
+                list_for_each_safe(l, n, &dev->subordinate->devices)
+                        pci_stop_bus_device(pci_dev_b(l));
+}
+
 /**
  * pci_remove_behind_bridge - remove all devices behind a PCI bridge
  * @dev: PCI bridge device
@@ -117,11 +136,8 @@ void pci_remove_bus_device(struct pci_dev *dev)
  */
 void pci_remove_behind_bridge(struct pci_dev *dev)
 {
-        struct list_head *l, *n;
-
-        if (dev->subordinate)
-                list_for_each_safe(l, n, &dev->subordinate->devices)
-                        __pci_remove_bus_device(pci_dev_b(l));
+        pci_stop_behind_bridge(dev);
+        __pci_remove_behind_bridge(dev);
 }
 
 static void pci_stop_bus_devices(struct pci_bus *bus)
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 7cf3d2fcf56a..1620088a0e7e 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -189,7 +189,7 @@ static int pcifront_bus_read(struct pci_bus *bus, unsigned int devfn,
 
         if (verbose_request)
                 dev_info(&pdev->xdev->dev,
-                         "read dev=%04x:%02x:%02x.%01x - offset %x size %d\n",
+                         "read dev=%04x:%02x:%02x.%d - offset %x size %d\n",
                          pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),
                          PCI_FUNC(devfn), where, size);
 
@@ -228,7 +228,7 @@ static int pcifront_bus_write(struct pci_bus *bus, unsigned int devfn,
 
         if (verbose_request)
                 dev_info(&pdev->xdev->dev,
-                         "write dev=%04x:%02x:%02x.%01x - "
+                         "write dev=%04x:%02x:%02x.%d - "
                          "offset %x size %d val %x\n",
                          pci_domain_nr(bus), bus->number,
                          PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, val);
@@ -432,7 +432,7 @@ static int __devinit pcifront_scan_bus(struct pcifront_device *pdev,
                 d = pci_scan_single_device(b, devfn);
                 if (d)
                         dev_info(&pdev->xdev->dev, "New device on "
-                                 "%04x:%02x:%02x.%02x found.\n", domain, bus,
+                                 "%04x:%02x:%02x.%d found.\n", domain, bus,
                                  PCI_SLOT(devfn), PCI_FUNC(devfn));
         }
 
@@ -1041,7 +1041,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
                 pci_dev = pci_get_slot(pci_bus, PCI_DEVFN(slot, func));
                 if (!pci_dev) {
                         dev_dbg(&pdev->xdev->dev,
-                                "Cannot get PCI device %04x:%02x:%02x.%02x\n",
+                                "Cannot get PCI device %04x:%02x:%02x.%d\n",
                                 domain, bus, slot, func);
                         continue;
                 }
@@ -1049,7 +1049,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
                 pci_dev_put(pci_dev);
 
                 dev_dbg(&pdev->xdev->dev,
-                        "PCI device %04x:%02x:%02x.%02x removed.\n",
+                        "PCI device %04x:%02x:%02x.%d removed.\n",
                         domain, bus, slot, func);
         }
 
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 749c2a16012c..1932029de48d 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1269,10 +1269,8 @@ static int pcmcia_bus_add(struct pcmcia_socket *skt)
 
 static int pcmcia_bus_early_resume(struct pcmcia_socket *skt)
 {
-        if (!verify_cis_cache(skt)) {
-                pcmcia_put_socket(skt);
+        if (!verify_cis_cache(skt))
                 return 0;
-        }
 
         dev_dbg(&skt->dev, "cis mismatch - different card\n");
 
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index 59866905ea37..27f2fe3b7fb4 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -205,7 +205,8 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev)
 
         dev_set_drvdata(&dev->dev, NULL);
 
-        for (; next = s->next, s; s = next) {
+        for (; s; s = next) {
+                next = s->next;
                 soc_pcmcia_remove_one(&s->soc);
                 kfree(s);
         }
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 569bdb3ef104..894cd5e103da 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -189,7 +189,7 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
         pindesc->pctldev = pctldev;
 
         /* Copy basic pin info */
-        if (pindesc->name) {
+        if (name) {
                 pindesc->name = name;
         } else {
                 pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", number);
@@ -510,10 +510,12 @@ static struct dentry *debugfs_root;
 
 static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)
 {
-        static struct dentry *device_root;
+        struct dentry *device_root;
 
         device_root = debugfs_create_dir(dev_name(pctldev->dev),
                                          debugfs_root);
+        pctldev->device_root = device_root;
+
         if (IS_ERR(device_root) || !device_root) {
                 pr_warn("failed to create debugfs directory for %s\n",
                         dev_name(pctldev->dev));
@@ -529,6 +531,11 @@ static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)
         pinconf_init_device_debugfs(device_root, pctldev);
 }
 
+static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev)
+{
+        debugfs_remove_recursive(pctldev->device_root);
+}
+
 static void pinctrl_init_debugfs(void)
 {
         debugfs_root = debugfs_create_dir("pinctrl", NULL);
@@ -553,6 +560,10 @@ static void pinctrl_init_debugfs(void)
 {
 }
 
+static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev)
+{
+}
+
 #endif
 
 /**
@@ -572,40 +583,40 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
         if (pctldesc->name == NULL)
                 return NULL;
 
+        pctldev = kzalloc(sizeof(struct pinctrl_dev), GFP_KERNEL);
+        if (pctldev == NULL)
+                return NULL;
+
+        /* Initialize pin control device struct */
+        pctldev->owner = pctldesc->owner;
+        pctldev->desc = pctldesc;
+        pctldev->driver_data = driver_data;
+        INIT_RADIX_TREE(&pctldev->pin_desc_tree, GFP_KERNEL);
+        spin_lock_init(&pctldev->pin_desc_tree_lock);
+        INIT_LIST_HEAD(&pctldev->gpio_ranges);
+        mutex_init(&pctldev->gpio_ranges_lock);
+        pctldev->dev = dev;
+
         /* If we're implementing pinmuxing, check the ops for sanity */
         if (pctldesc->pmxops) {
-                ret = pinmux_check_ops(pctldesc->pmxops);
+                ret = pinmux_check_ops(pctldev);
                 if (ret) {
                         pr_err("%s pinmux ops lacks necessary functions\n",
                                pctldesc->name);
-                        return NULL;
+                        goto out_err;
                 }
         }
 
         /* If we're implementing pinconfig, check the ops for sanity */
         if (pctldesc->confops) {
-                ret = pinconf_check_ops(pctldesc->confops);
+                ret = pinconf_check_ops(pctldev);
                 if (ret) {
                         pr_err("%s pin config ops lacks necessary functions\n",
                                pctldesc->name);
-                        return NULL;
+                        goto out_err;
                 }
         }
 
-        pctldev = kzalloc(sizeof(struct pinctrl_dev), GFP_KERNEL);
-        if (pctldev == NULL)
-                return NULL;
-
-        /* Initialize pin control device struct */
-        pctldev->owner = pctldesc->owner;
-        pctldev->desc = pctldesc;
-        pctldev->driver_data = driver_data;
-        INIT_RADIX_TREE(&pctldev->pin_desc_tree, GFP_KERNEL);
-        spin_lock_init(&pctldev->pin_desc_tree_lock);
-        INIT_LIST_HEAD(&pctldev->gpio_ranges);
-        mutex_init(&pctldev->gpio_ranges_lock);
-        pctldev->dev = dev;
-
         /* Register all the pins */
         pr_debug("try to register %d pins on %s...\n",
                  pctldesc->npins, pctldesc->name);
@@ -641,6 +652,7 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev)
         if (pctldev == NULL)
                 return;
 
+        pinctrl_remove_device_debugfs(pctldev);
         pinmux_unhog_maps(pctldev);
         /* TODO: check that no pinmuxes are still active? */
         mutex_lock(&pinctrldev_list_mutex);
diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h
index 177a3310547f..cfa86da6b4b1 100644
--- a/drivers/pinctrl/core.h
+++ b/drivers/pinctrl/core.h
@@ -41,6 +41,9 @@ struct pinctrl_dev {
         struct device *dev;
         struct module *owner;
         void *driver_data;
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *device_root;
+#endif
 #ifdef CONFIG_PINMUX
         struct mutex pinmux_hogs_lock;
         struct list_head pinmux_hogs;
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c
index 1259872b0a1d..9fb75456824c 100644
--- a/drivers/pinctrl/pinconf.c
+++ b/drivers/pinctrl/pinconf.c
@@ -205,8 +205,10 @@ int pin_config_group_set(const char *dev_name, const char *pin_group,
 }
 EXPORT_SYMBOL(pin_config_group_set);
 
-int pinconf_check_ops(const struct pinconf_ops *ops)
+int pinconf_check_ops(struct pinctrl_dev *pctldev)
 {
+        const struct pinconf_ops *ops = pctldev->desc->confops;
+
         /* We must be able to read out pin status */
         if (!ops->pin_config_get && !ops->pin_config_group_get)
                 return -EINVAL;
@@ -236,7 +238,7 @@ static int pinconf_pins_show(struct seq_file *s, void *what)
         seq_puts(s, "Format: pin (name): pinmux setting array\n");
 
         /* The pin number can be retrived from the pin controller descriptor */
-        for (i = 0; pin < pctldev->desc->npins; i++) {
+        for (i = 0; i < pctldev->desc->npins; i++) {
                 struct pin_desc *desc;
 
                 pin = pctldev->desc->pins[i].number;
diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index e7dc6165032a..006b77fa737e 100644
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -13,7 +13,7 @@
 
 #ifdef CONFIG_PINCONF
 
-int pinconf_check_ops(const struct pinconf_ops *ops);
+int pinconf_check_ops(struct pinctrl_dev *pctldev);
 void pinconf_init_device_debugfs(struct dentry *devroot,
                                  struct pinctrl_dev *pctldev);
 int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
@@ -23,7 +23,7 @@ int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
 
 #else
 
-static inline int pinconf_check_ops(const struct pinconf_ops *ops)
+static inline int pinconf_check_ops(struct pinctrl_dev *pctldev)
 {
         return 0;
 }
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index a76a348321bb..7c3193f7a044 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -53,11 +53,6 @@ struct pinmux_group {
  * @dev: the device using this pinmux
  * @usecount: the number of active users of this mux setting, used to keep
  *      track of nested use cases
- * @pins: an array of discrete physical pins used in this mapping, taken
- *      from the global pin enumeration space (copied from pinmux map)
- * @num_pins: the number of pins in this mapping array, i.e. the number of
- *      elements in .pins so we can iterate over that array (copied from
- *      pinmux map)
  * @pctldev: pin control device handling this pinmux
  * @func_selector: the function selector for the pinmux device handling
  *      this pinmux
@@ -152,8 +147,7 @@ static int pin_request(struct pinctrl_dev *pctldev,
                 status = 0;
 
         if (status)
-                dev_err(pctldev->dev, "->request on device %s failed "
-                       "for pin %d\n",
+                dev_err(pctldev->dev, "->request on device %s failed for pin %d\n",
                        pctldev->desc->name, pin);
 out_free_pin:
         if (status) {
@@ -355,21 +349,20 @@ int __init pinmux_register_mappings(struct pinmux_map const *maps,
         /* First sanity check the new mapping */
         for (i = 0; i < num_maps; i++) {
                 if (!maps[i].name) {
-                        pr_err("failed to register map %d: "
-                               "no map name given\n", i);
+                        pr_err("failed to register map %d: no map name given\n",
+                                        i);
                         return -EINVAL;
                 }
 
                 if (!maps[i].ctrl_dev && !maps[i].ctrl_dev_name) {
-                        pr_err("failed to register map %s (%d): "
-                               "no pin control device given\n",
+                        pr_err("failed to register map %s (%d): no pin control device given\n",
                                maps[i].name, i);
                         return -EINVAL;
                 }
 
                 if (!maps[i].function) {
-                        pr_err("failed to register map %s (%d): "
-                               "no function ID given\n", maps[i].name, i);
+                        pr_err("failed to register map %s (%d): no function ID given\n",
+                                        maps[i].name, i);
                         return -EINVAL;
                 }
 
@@ -411,7 +404,7 @@ int __init pinmux_register_mappings(struct pinmux_map const *maps,
 }
 
 /**
- * acquire_pins() - acquire all the pins for a certain funcion on a pinmux
+ * acquire_pins() - acquire all the pins for a certain function on a pinmux
  * @pctldev: the device to take the pins on
  * @func_selector: the function selector to acquire the pins for
  * @group_selector: the group selector containing the pins to acquire
@@ -442,8 +435,7 @@ static int acquire_pins(struct pinctrl_dev *pctldev,
                 ret = pin_request(pctldev, pins[i], func, NULL);
                 if (ret) {
                         dev_err(pctldev->dev,
-                                "could not get pin %d for function %s "
-                                "on device %s - conflicting mux mappings?\n",
+                                "could not get pin %d for function %s on device %s - conflicting mux mappings?\n",
                                 pins[i], func ? : "(undefined)",
                                 pinctrl_dev_get_name(pctldev));
                         /* On error release all taken pins */
@@ -458,7 +450,7 @@ static int acquire_pins(struct pinctrl_dev *pctldev,
 
 /**
  * release_pins() - release pins taken by earlier acquirement
- * @pctldev: the device to free the pinx on
+ * @pctldev: the device to free the pins on
  * @group_selector: the group selector containing the pins to free
  */
 static void release_pins(struct pinctrl_dev *pctldev,
@@ -473,8 +465,7 @@ static void release_pins(struct pinctrl_dev *pctldev,
         ret = pctlops->get_group_pins(pctldev, group_selector,
                                       &pins, &num_pins);
         if (ret) {
-                dev_err(pctldev->dev, "could not get pins to release for "
-                        "group selector %d\n",
+                dev_err(pctldev->dev, "could not get pins to release for group selector %d\n",
                         group_selector);
                 return;
         }
@@ -526,8 +517,7 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev,
                 ret = pinctrl_get_group_selector(pctldev, groups[0]);
                 if (ret < 0) {
                         dev_err(pctldev->dev,
-                                "function %s wants group %s but the pin "
-                                "controller does not seem to have that group\n",
+                                "function %s wants group %s but the pin controller does not seem to have that group\n",
                                 pmxops->get_function_name(pctldev, func_selector),
                                 groups[0]);
                         return ret;
@@ -535,8 +525,7 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev,
 
                 if (num_groups > 1)
                         dev_dbg(pctldev->dev,
-                                "function %s support more than one group, "
-                                "default-selecting first group %s (%d)\n",
+                                "function %s support more than one group, default-selecting first group %s (%d)\n",
                                 pmxops->get_function_name(pctldev, func_selector),
                                 groups[0],
                                 ret);
@@ -628,10 +617,8 @@ static int pinmux_enable_muxmap(struct pinctrl_dev *pctldev,
 
         if (pmx->pctldev && pmx->pctldev != pctldev) {
                 dev_err(pctldev->dev,
-                        "different pin control devices given for device %s, "
-                        "function %s\n",
-                        devname,
-                        map->function);
+                        "different pin control devices given for device %s, function %s\n",
+                        devname, map->function);
                 return -EINVAL;
         }
         pmx->dev = dev;
@@ -695,7 +682,6 @@ static void pinmux_free_groups(struct pinmux *pmx)
  */
 struct pinmux *pinmux_get(struct device *dev, const char *name)
 {
-
         struct pinmux_map const *map = NULL;
         struct pinctrl_dev *pctldev = NULL;
         const char *devname = NULL;
@@ -745,8 +731,7 @@ struct pinmux *pinmux_get(struct device *dev, const char *name)
                         else if (map->ctrl_dev_name)
                                 devname = map->ctrl_dev_name;
 
-                        pr_warning("could not find a pinctrl device for pinmux "
-                                   "function %s, fishy, they shall all have one\n",
+                        pr_warning("could not find a pinctrl device for pinmux function %s, fishy, they shall all have one\n",
                                    map->function);
                         pr_warning("given pinctrl device name: %s",
                                    devname ? devname : "UNDEFINED");
@@ -904,8 +889,11 @@ void pinmux_disable(struct pinmux *pmx)
 }
 EXPORT_SYMBOL_GPL(pinmux_disable);
 
-int pinmux_check_ops(const struct pinmux_ops *ops)
+int pinmux_check_ops(struct pinctrl_dev *pctldev)
 {
+        const struct pinmux_ops *ops = pctldev->desc->pmxops;
+        unsigned selector = 0;
+
         /* Check that we implement required operations */
         if (!ops->list_functions ||
             !ops->get_function_name ||
@@ -914,6 +902,18 @@ int pinmux_check_ops(const struct pinmux_ops *ops)
             !ops->disable)
                 return -EINVAL;
 
+        /* Check that all functions registered have names */
+        while (ops->list_functions(pctldev, selector) >= 0) {
+                const char *fname = ops->get_function_name(pctldev,
+                                                           selector);
+                if (!fname) {
+                        pr_err("pinmux ops has no name for function%u\n",
+                                selector);
+                        return -EINVAL;
+                }
+                selector++;
+        }
+
         return 0;
 }
 
@@ -932,8 +932,8 @@ static int pinmux_hog_map(struct pinctrl_dev *pctldev,
                  * without any problems, so then we can hog pinmuxes for
                  * all devices that just want a static pin mux at this point.
                  */
-                dev_err(pctldev->dev, "map %s wants to hog a non-system "
-                        "pinmux, this is not going to work\n", map->name);
+                dev_err(pctldev->dev, "map %s wants to hog a non-system pinmux, this is not going to work\n",
+                                map->name);
                 return -EINVAL;
         }
 
@@ -993,9 +993,12 @@ int pinmux_hog_maps(struct pinctrl_dev *pctldev)
         for (i = 0; i < pinmux_maps_num; i++) {
                 struct pinmux_map const *map = &pinmux_maps[i];
 
-                if (((map->ctrl_dev == dev) ||
-                     !strcmp(map->ctrl_dev_name, devname)) &&
-                    map->hog_on_boot) {
+                if (!map->hog_on_boot)
+                        continue;
+
+                if ((map->ctrl_dev == dev) ||
+                        (map->ctrl_dev_name &&
+                                !strcmp(map->ctrl_dev_name, devname))) {
                         /* OK time to hog! */
                         ret = pinmux_hog_map(pctldev, map);
                         if (ret)
@@ -1122,13 +1125,15 @@ static int pinmux_show(struct seq_file *s, void *what)
 
                 seq_printf(s, "device: %s function: %s (%u),",
                            pinctrl_dev_get_name(pmx->pctldev),
-                           pmxops->get_function_name(pctldev, pmx->func_selector),
+                           pmxops->get_function_name(pctldev,
+                                   pmx->func_selector),
                            pmx->func_selector);
 
                 seq_printf(s, " groups: [");
                 list_for_each_entry(grp, &pmx->groups, node) {
                         seq_printf(s, " %s (%u)",
-                                   pctlops->get_group_name(pctldev, grp->group_selector),
+                                   pctlops->get_group_name(pctldev,
+                                           grp->group_selector),
                                    grp->group_selector);
                 }
                 seq_printf(s, " ]");
diff --git a/drivers/pinctrl/pinmux.h b/drivers/pinctrl/pinmux.h
index 844500b3331b..97f52223fbc2 100644
--- a/drivers/pinctrl/pinmux.h
+++ b/drivers/pinctrl/pinmux.h
@@ -12,7 +12,7 @@
  */
 #ifdef CONFIG_PINMUX
 
-int pinmux_check_ops(const struct pinmux_ops *ops);
+int pinmux_check_ops(struct pinctrl_dev *pctldev);
 void pinmux_init_device_debugfs(struct dentry *devroot,
                                 struct pinctrl_dev *pctldev);
 void pinmux_init_debugfs(struct dentry *subsys_root);
@@ -21,7 +21,7 @@ void pinmux_unhog_maps(struct pinctrl_dev *pctldev);
 
 #else
 
-static inline int pinmux_check_ops(const struct pinmux_ops *ops)
+static inline int pinmux_check_ops(struct pinctrl_dev *pctldev)
 {
         return 0;
 }
diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
index 42a7d603c870..7481146a5b47 100644
--- a/drivers/platform/x86/ibm_rtl.c
+++ b/drivers/platform/x86/ibm_rtl.c
@@ -33,6 +33,8 @@
 #include <linux/mutex.h>
 #include <asm/bios_ebda.h>
 
+#include <asm-generic/io-64-nonatomic-lo-hi.h>
+
 static bool force;
 module_param(force, bool, 0);
 MODULE_PARM_DESC(force, "Force driver load, ignore DMI data");
@@ -83,19 +85,6 @@ static void __iomem *rtl_cmd_addr;
 static u8 rtl_cmd_type;
 static u8 rtl_cmd_width;
 
-#ifndef readq
-static inline __u64 readq(const volatile void __iomem *addr)
-{
-        const volatile u32 __iomem *p = addr;
-        u32 low, high;
-
-        low = readl(p);
-        high = readl(p + 1);
-
-        return low + ((u64)high << 32);
-}
-#endif
-
 static void __iomem *rtl_port_map(phys_addr_t addr, unsigned long len)
 {
         if (rtl_cmd_type == RTL_ADDR_TYPE_MMIO)
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index 809a3ae943c6..88a98cff5a44 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -77,6 +77,8 @@
 #include <asm/processor.h>
 #include "intel_ips.h"
 
+#include <asm-generic/io-64-nonatomic-lo-hi.h>
+
 #define PCI_DEVICE_ID_INTEL_THERMAL_SENSOR 0x3b32
 
 /*
@@ -344,19 +346,6 @@ struct ips_driver {
 static bool
 ips_gpu_turbo_enabled(struct ips_driver *ips);
 
-#ifndef readq
-static inline __u64 readq(const volatile void __iomem *addr)
-{
-        const volatile u32 __iomem *p = addr;
-        u32 low, high;
-
-        low = readl(p);
-        high = readl(p + 1);
-
-        return low + ((u64)high << 32);
-}
-#endif
-
 /**
  * ips_cpu_busy - is CPU busy?
  * @ips: IPS driver struct
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 98bf5676318d..1ed6ea0bad6e 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -62,11 +62,10 @@
 
 #define BQ27500_REG_SOC                 0x2C
 #define BQ27500_REG_DCAP                0x3C /* Design capacity */
-#define BQ27500_FLAG_DSG                BIT(0) /* Discharging */
+#define BQ27500_FLAG_DSC                BIT(0)
 #define BQ27500_FLAG_SOCF               BIT(1) /* State-of-Charge threshold final */
 #define BQ27500_FLAG_SOC1               BIT(2) /* State-of-Charge threshold 1 */
-#define BQ27500_FLAG_CHG                BIT(8) /* Charging */
-#define BQ27500_FLAG_FC                 BIT(9) /* Fully charged */
+#define BQ27500_FLAG_FC                 BIT(9)
 
 #define BQ27000_RS                      20 /* Resistor sense */
 
@@ -312,7 +311,7 @@ static void bq27x00_update(struct bq27x00_device_info *di)
         struct bq27x00_reg_cache cache = {0, };
         bool is_bq27500 = di->chip == BQ27500;
 
-        cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, is_bq27500);
+        cache.flags = bq27x00_read(di, BQ27x00_REG_FLAGS, !is_bq27500);
         if (cache.flags >= 0) {
                 if (!is_bq27500 && (cache.flags & BQ27000_FLAG_CI)) {
                         dev_info(di->dev, "battery is not calibrated! ignoring capacity values\n");
@@ -401,14 +400,10 @@ static int bq27x00_battery_status(struct bq27x00_device_info *di,
         if (di->chip == BQ27500) {
                 if (di->cache.flags & BQ27500_FLAG_FC)
                         status = POWER_SUPPLY_STATUS_FULL;
-                else if (di->cache.flags & BQ27500_FLAG_DSG)
+                else if (di->cache.flags & BQ27500_FLAG_DSC)
                         status = POWER_SUPPLY_STATUS_DISCHARGING;
-                else if (di->cache.flags & BQ27500_FLAG_CHG)
-                        status = POWER_SUPPLY_STATUS_CHARGING;
-                else if (power_supply_am_i_supplied(&di->bat))
-                        status = POWER_SUPPLY_STATUS_NOT_CHARGING;
                 else
-                        status = POWER_SUPPLY_STATUS_UNKNOWN;
+                        status = POWER_SUPPLY_STATUS_CHARGING;
         } else {
                 if (di->cache.flags & BQ27000_FLAG_FC)
                         status = POWER_SUPPLY_STATUS_FULL;
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 0378d019efae..88fd9710bda2 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -974,10 +974,11 @@ static int __devexit charger_manager_remove(struct platform_device *pdev)
         return 0;
 }
 
-const struct platform_device_id charger_manager_id[] = {
+static const struct platform_device_id charger_manager_id[] = {
         { "charger-manager", 0 },
         { },
 };
+MODULE_DEVICE_TABLE(platform, charger_manager_id);
 
 static int cm_suspend_prepare(struct device *dev)
 {
@@ -1069,4 +1070,3 @@ module_exit(charger_manager_cleanup);
 MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");
 MODULE_DESCRIPTION("Charger Manager");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("charger-manager");
diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c
index b15b575c070c..c53dd1292f81 100644
--- a/drivers/power/lp8727_charger.c
+++ b/drivers/power/lp8727_charger.c
@@ -464,6 +464,7 @@ static int __devexit lp8727_remove(struct i2c_client *cl)
 
 static const struct i2c_device_id lp8727_ids[] = {
         {"lp8727", 0},
+        { }
 };
 
 static struct i2c_driver lp8727_driver = {
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index ca86f39a0fdc..e9a83f84adaf 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2731,6 +2731,8 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)
  * @dev: struct device for the regulator
  * @init_data: platform provided init data, passed through by driver
  * @driver_data: private regulator data
+ * @of_node: OpenFirmware node to parse for device tree bindings (may be
+ *           NULL).
  *
  * Called by regulator drivers to register a regulator.
  * Returns 0 on success.
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index b06a2399587c..d0e1180ad961 100644
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -150,7 +150,7 @@ static int max8649_enable_time(struct regulator_dev *rdev)
         if (ret != 0)
                 return ret;
         val &= MAX8649_VOL_MASK;
-        voltage = max8649_list_voltage(rdev, (unsigned char)ret); /* uV */
+        voltage = max8649_list_voltage(rdev, (unsigned char)val); /* uV */
 
         /* get rate */
         ret = regmap_read(info->regmap, MAX8649_RAMP, &val);
diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index 80ecafef1bc3..62dcd0a432bb 100644
--- a/drivers/regulator/mc13xxx-regulator-core.c
+++ b/drivers/regulator/mc13xxx-regulator-core.c
@@ -254,6 +254,7 @@ int __devinit mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
 
         return num;
 }
+EXPORT_SYMBOL_GPL(mc13xxx_get_num_regulators_dt);
 
 struct mc13xxx_regulator_init_data * __devinit mc13xxx_parse_regulators_dt(
         struct platform_device *pdev, struct mc13xxx_regulator *regulators,
@@ -291,6 +292,7 @@ struct mc13xxx_regulator_init_data * __devinit mc13xxx_parse_regulators_dt(
 
         return data;
 }
+EXPORT_SYMBOL_GPL(mc13xxx_parse_regulators_dt);
 #endif
 
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index f1651eb69648..679734d26a16 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -35,7 +35,7 @@ static void of_get_regulation_constraints(struct device_node *np,
         if (constraints->min_uV != constraints->max_uV)
                 constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE;
         /* Only one voltage?  Then make sure it's set. */
-        if (constraints->min_uV == constraints->max_uV)
+        if (min_uV && max_uV && constraints->min_uV == constraints->max_uV)
                 constraints->apply_uV = true;
 
         uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL);
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index e19a4031f45e..3a125b835546 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -774,7 +774,7 @@ config RTC_DRV_EP93XX
 
 config RTC_DRV_SA1100
         tristate "SA11x0/PXA2xx"
-        depends on ARCH_SA1100 || ARCH_PXA || ARCH_MMP
+        depends on ARCH_SA1100 || ARCH_PXA
         help
           If you say Y here you will get access to the real time clock
           built into your SA11x0 or PXA2xx CPU.
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index a3ad957507dc..ee3c122c0599 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -307,8 +307,12 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
                 device_init_wakeup(&pdev->dev, 1);
 
         platform_set_drvdata(pdev, rtc);
-        rtc->rtt = (void __force __iomem *) (AT91_VA_BASE_SYS - AT91_BASE_SYS);
-        rtc->rtt += r->start;
+        rtc->rtt = ioremap(r->start, resource_size(r));
+        if (!rtc->rtt) {
+                dev_err(&pdev->dev, "failed to map registers, aborting.\n");
+                ret = -ENOMEM;
+                goto fail;
+        }
 
         mr = rtt_readl(rtc, MR);
 
@@ -326,7 +330,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
                                 &at91_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc->rtcdev)) {
                 ret = PTR_ERR(rtc->rtcdev);
-                goto fail;
+                goto fail_register;
         }
 
         /* register irq handler after we know what name we'll use */
@@ -351,6 +355,8 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
 
         return 0;
 
+fail_register:
+        iounmap(rtc->rtt);
 fail:
         platform_set_drvdata(pdev, NULL);
         kfree(rtc);
@@ -371,6 +377,7 @@ static int __exit at91_rtc_remove(struct platform_device *pdev)
 
         rtc_device_unregister(rtc->rtcdev);
 
+        iounmap(rtc->rtt);
         platform_set_drvdata(pdev, NULL);
         kfree(rtc);
         return 0;
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 4595d3e645a7..cb9a585312cc 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -27,42 +27,34 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/interrupt.h>
+#include <linux/string.h>
 #include <linux/pm.h>
-#include <linux/slab.h>
-#include <linux/clk.h>
-#include <linux/io.h>
+#include <linux/bitops.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
 
+#ifdef CONFIG_ARCH_PXA
+#include <mach/regs-rtc.h>
+#endif
+
 #define RTC_DEF_DIVIDER         (32768 - 1)
 #define RTC_DEF_TRIM            0
-#define RTC_FREQ                1024
-
-#define RCNR            0x00    /* RTC Count Register */
-#define RTAR            0x04    /* RTC Alarm Register */
-#define RTSR            0x08    /* RTC Status Register */
-#define RTTR            0x0c    /* RTC Timer Trim Register */
-
-#define RTSR_HZE        (1 << 3)        /* HZ interrupt enable */
-#define RTSR_ALE        (1 << 2)        /* RTC alarm interrupt enable */
-#define RTSR_HZ         (1 << 1)        /* HZ rising-edge detected */
-#define RTSR_AL         (1 << 0)        /* RTC alarm detected */
-
-#define rtc_readl(sa1100_rtc, reg)      \
-        readl_relaxed((sa1100_rtc)->base + (reg))
-#define rtc_writel(sa1100_rtc, reg, value)      \
-        writel_relaxed((value), (sa1100_rtc)->base + (reg))
-
-struct sa1100_rtc {
-        struct resource         *ress;
-        void __iomem            *base;
-        struct clk              *clk;
-        int                     irq_1Hz;
-        int                     irq_Alrm;
-        struct rtc_device       *rtc;
-        spinlock_t              lock;           /* Protects this structure */
-};
+
+static const unsigned long RTC_FREQ = 1024;
+static struct rtc_time rtc_alarm;
+static DEFINE_SPINLOCK(sa1100_rtc_lock);
+
+static inline int rtc_periodic_alarm(struct rtc_time *tm)
+{
+        return  (tm->tm_year == -1) ||
+                ((unsigned)tm->tm_mon >= 12) ||
+                ((unsigned)(tm->tm_mday - 1) >= 31) ||
+                ((unsigned)tm->tm_hour > 23) ||
+                ((unsigned)tm->tm_min > 59) ||
+                ((unsigned)tm->tm_sec > 59);
+}
+
 /*
  * Calculate the next alarm time given the requested alarm time mask
  * and the current time.
@@ -90,26 +82,46 @@ static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now,
         }
 }
 
+static int rtc_update_alarm(struct rtc_time *alrm)
+{
+        struct rtc_time alarm_tm, now_tm;
+        unsigned long now, time;
+        int ret;
+
+        do {
+                now = RCNR;
+                rtc_time_to_tm(now, &now_tm);
+                rtc_next_alarm_time(&alarm_tm, &now_tm, alrm);
+                ret = rtc_tm_to_time(&alarm_tm, &time);
+                if (ret != 0)
+                        break;
+
+                RTSR = RTSR & (RTSR_HZE|RTSR_ALE|RTSR_AL);
+                RTAR = time;
+        } while (now != RCNR);
+
+        return ret;
+}
+
 static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
 {
         struct platform_device *pdev = to_platform_device(dev_id);
-        struct sa1100_rtc *sa1100_rtc = platform_get_drvdata(pdev);
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
         unsigned int rtsr;
         unsigned long events = 0;
 
-        spin_lock(&sa1100_rtc->lock);
+        spin_lock(&sa1100_rtc_lock);
 
+        rtsr = RTSR;
         /* clear interrupt sources */
-        rtsr = rtc_readl(sa1100_rtc, RTSR);
-        rtc_writel(sa1100_rtc, RTSR, 0);
-
+        RTSR = 0;
         /* Fix for a nasty initialization problem the in SA11xx RTSR register.
          * See also the comments in sa1100_rtc_probe(). */
         if (rtsr & (RTSR_ALE | RTSR_HZE)) {
                 /* This is the original code, before there was the if test
                  * above. This code does not clear interrupts that were not
                  * enabled. */
-                rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ) & (rtsr >> 2));
+                RTSR = (RTSR_AL | RTSR_HZ) & (rtsr >> 2);
         } else {
                 /* For some reason, it is possible to enter this routine
                  * without interruptions enabled, it has been tested with
@@ -118,13 +130,13 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
                  * This situation leads to an infinite "loop" of interrupt
                  * routine calling and as a result the processor seems to
                  * lock on its first call to open(). */
-                rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ));
+                RTSR = RTSR_AL | RTSR_HZ;
         }
 
         /* clear alarm interrupt if it has occurred */
         if (rtsr & RTSR_AL)
                 rtsr &= ~RTSR_ALE;
-        rtc_writel(sa1100_rtc, RTSR, rtsr & (RTSR_ALE | RTSR_HZE));
+        RTSR = rtsr & (RTSR_ALE | RTSR_HZE);
 
         /* update irq data & counter */
         if (rtsr & RTSR_AL)
@@ -132,100 +144,89 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
         if (rtsr & RTSR_HZ)
                 events |= RTC_UF | RTC_IRQF;
 
-        rtc_update_irq(sa1100_rtc->rtc, 1, events);
+        rtc_update_irq(rtc, 1, events);
 
-        spin_unlock(&sa1100_rtc->lock);
+        if (rtsr & RTSR_AL && rtc_periodic_alarm(&rtc_alarm))
+                rtc_update_alarm(&rtc_alarm);
+
+        spin_unlock(&sa1100_rtc_lock);
 
         return IRQ_HANDLED;
 }
 
 static int sa1100_rtc_open(struct device *dev)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
         int ret;
+        struct platform_device *plat_dev = to_platform_device(dev);
+        struct rtc_device *rtc = platform_get_drvdata(plat_dev);
 
-        ret = request_irq(sa1100_rtc->irq_1Hz, sa1100_rtc_interrupt,
-                                IRQF_DISABLED, "rtc 1Hz", dev);
+        ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED,
+                "rtc 1Hz", dev);
         if (ret) {
-                dev_err(dev, "IRQ %d already in use.\n", sa1100_rtc->irq_1Hz);
+                dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
                 goto fail_ui;
         }
-        ret = request_irq(sa1100_rtc->irq_Alrm, sa1100_rtc_interrupt,
-                                IRQF_DISABLED, "rtc Alrm", dev);
+        ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED,
+                "rtc Alrm", dev);
         if (ret) {
-                dev_err(dev, "IRQ %d already in use.\n", sa1100_rtc->irq_Alrm);
+                dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
                 goto fail_ai;
         }
-        sa1100_rtc->rtc->max_user_freq = RTC_FREQ;
-        rtc_irq_set_freq(sa1100_rtc->rtc, NULL, RTC_FREQ);
+        rtc->max_user_freq = RTC_FREQ;
+        rtc_irq_set_freq(rtc, NULL, RTC_FREQ);
 
         return 0;
 
  fail_ai:
-        free_irq(sa1100_rtc->irq_1Hz, dev);
+        free_irq(IRQ_RTC1Hz, dev);
  fail_ui:
         return ret;
 }
 
 static void sa1100_rtc_release(struct device *dev)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-
-        spin_lock_irq(&sa1100_rtc->lock);
-        rtc_writel(sa1100_rtc, RTSR, 0);
-        spin_unlock_irq(&sa1100_rtc->lock);
+        spin_lock_irq(&sa1100_rtc_lock);
+        RTSR = 0;
+        spin_unlock_irq(&sa1100_rtc_lock);
 
-        free_irq(sa1100_rtc->irq_Alrm, dev);
-        free_irq(sa1100_rtc->irq_1Hz, dev);
+        free_irq(IRQ_RTCAlrm, dev);
+        free_irq(IRQ_RTC1Hz, dev);
 }
 
 static int sa1100_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-        unsigned int rtsr;
-
-        spin_lock_irq(&sa1100_rtc->lock);
-
-        rtsr = rtc_readl(sa1100_rtc, RTSR);
+        spin_lock_irq(&sa1100_rtc_lock);
         if (enabled)
-                rtsr |= RTSR_ALE;
+                RTSR |= RTSR_ALE;
         else
-                rtsr &= ~RTSR_ALE;
-        rtc_writel(sa1100_rtc, RTSR, rtsr);
-
-        spin_unlock_irq(&sa1100_rtc->lock);
+                RTSR &= ~RTSR_ALE;
+        spin_unlock_irq(&sa1100_rtc_lock);
         return 0;
 }
 
 static int sa1100_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-
-        rtc_time_to_tm(rtc_readl(sa1100_rtc, RCNR), tm);
+        rtc_time_to_tm(RCNR, tm);
         return 0;
 }
 
 static int sa1100_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
         unsigned long time;
         int ret;
 
         ret = rtc_tm_to_time(tm, &time);
         if (ret == 0)
-                rtc_writel(sa1100_rtc, RCNR, time);
+                RCNR = time;
         return ret;
 }
 
 static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-        unsigned long time;
-        unsigned int rtsr;
+        u32     rtsr;
 
-        time = rtc_readl(sa1100_rtc, RCNR);
-        rtc_time_to_tm(time, &alrm->time);
-        rtsr = rtc_readl(sa1100_rtc, RTSR);
+        memcpy(&alrm->time, &rtc_alarm, sizeof(struct rtc_time));
+        rtsr = RTSR;
         alrm->enabled = (rtsr & RTSR_ALE) ? 1 : 0;
         alrm->pending = (rtsr & RTSR_AL) ? 1 : 0;
         return 0;
@@ -233,39 +234,26 @@ static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
 static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-        struct rtc_time now_tm, alarm_tm;
-        unsigned long time, alarm;
-        unsigned int rtsr;
-
-        spin_lock_irq(&sa1100_rtc->lock);
-
-        time = rtc_readl(sa1100_rtc, RCNR);
-        rtc_time_to_tm(time, &now_tm);
-        rtc_next_alarm_time(&alarm_tm, &now_tm, &alrm->time);
-        rtc_tm_to_time(&alarm_tm, &alarm);
-        rtc_writel(sa1100_rtc, RTAR, alarm);
-
-        rtsr = rtc_readl(sa1100_rtc, RTSR);
-        if (alrm->enabled)
-                rtsr |= RTSR_ALE;
-        else
-                rtsr &= ~RTSR_ALE;
-        rtc_writel(sa1100_rtc, RTSR, rtsr);
+        int ret;
 
-        spin_unlock_irq(&sa1100_rtc->lock);
+        spin_lock_irq(&sa1100_rtc_lock);
+        ret = rtc_update_alarm(&alrm->time);
+        if (ret == 0) {
+                if (alrm->enabled)
+                        RTSR |= RTSR_ALE;
+                else
+                        RTSR &= ~RTSR_ALE;
+        }
+        spin_unlock_irq(&sa1100_rtc_lock);
 
-        return 0;
+        return ret;
 }
 
 static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
+        seq_printf(seq, "trim/divider\t\t: 0x%08x\n", (u32) RTTR);
+        seq_printf(seq, "RTSR\t\t\t: 0x%08x\n", (u32)RTSR);
 
-        seq_printf(seq, "trim/divider\t\t: 0x%08x\n",
-                        rtc_readl(sa1100_rtc, RTTR));
-        seq_printf(seq, "RTSR\t\t\t: 0x%08x\n",
-                        rtc_readl(sa1100_rtc, RTSR));
         return 0;
 }
 
@@ -282,51 +270,7 @@ static const struct rtc_class_ops sa1100_rtc_ops = {
 
 static int sa1100_rtc_probe(struct platform_device *pdev)
 {
-        struct sa1100_rtc *sa1100_rtc;
-        unsigned int rttr;
-        int ret;
-
-        sa1100_rtc = kzalloc(sizeof(struct sa1100_rtc), GFP_KERNEL);
-        if (!sa1100_rtc)
-                return -ENOMEM;
-
-        spin_lock_init(&sa1100_rtc->lock);
-        platform_set_drvdata(pdev, sa1100_rtc);
-
-        ret = -ENXIO;
-        sa1100_rtc->ress = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!sa1100_rtc->ress) {
-                dev_err(&pdev->dev, "No I/O memory resource defined\n");
-                goto err_ress;
-        }
-
-        sa1100_rtc->irq_1Hz = platform_get_irq(pdev, 0);
-        if (sa1100_rtc->irq_1Hz < 0) {
-                dev_err(&pdev->dev, "No 1Hz IRQ resource defined\n");
-                goto err_ress;
-        }
-        sa1100_rtc->irq_Alrm = platform_get_irq(pdev, 1);
-        if (sa1100_rtc->irq_Alrm < 0) {
-                dev_err(&pdev->dev, "No alarm IRQ resource defined\n");
-                goto err_ress;
-        }
-
-        ret = -ENOMEM;
-        sa1100_rtc->base = ioremap(sa1100_rtc->ress->start,
-                                resource_size(sa1100_rtc->ress));
-        if (!sa1100_rtc->base) {
-                dev_err(&pdev->dev, "Unable to map pxa RTC I/O memory\n");
-                goto err_map;
-        }
-
-        sa1100_rtc->clk = clk_get(&pdev->dev, NULL);
-        if (IS_ERR(sa1100_rtc->clk)) {
-                dev_err(&pdev->dev, "failed to find rtc clock source\n");
-                ret = PTR_ERR(sa1100_rtc->clk);
-                goto err_clk;
-        }
-        clk_prepare(sa1100_rtc->clk);
-        clk_enable(sa1100_rtc->clk);
+        struct rtc_device *rtc;
 
         /*
          * According to the manual we should be able to let RTTR be zero
@@ -335,24 +279,24 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
          * If the clock divider is uninitialized then reset it to the
          * default value to get the 1Hz clock.
          */
-        if (rtc_readl(sa1100_rtc, RTTR) == 0) {
-                rttr = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16);
-                rtc_writel(sa1100_rtc, RTTR, rttr);
-                dev_warn(&pdev->dev, "warning: initializing default clock"
-                         " divider/trim value\n");
+        if (RTTR == 0) {
+                RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16);
+                dev_warn(&pdev->dev, "warning: "
+                        "initializing default clock divider/trim value\n");
                 /* The current RTC value probably doesn't make sense either */
-                rtc_writel(sa1100_rtc, RCNR, 0);
+                RCNR = 0;
         }
 
         device_init_wakeup(&pdev->dev, 1);
 
-        sa1100_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
-                                                &sa1100_rtc_ops, THIS_MODULE);
-        if (IS_ERR(sa1100_rtc->rtc)) {
-                dev_err(&pdev->dev, "Failed to register RTC device -> %d\n",
-                        ret);
-                goto err_rtc_reg;
-        }
+        rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,
+                THIS_MODULE);
+
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
+
+        platform_set_drvdata(pdev, rtc);
+
         /* Fix for a nasty initialization problem the in SA11xx RTSR register.
          * See also the comments in sa1100_rtc_interrupt().
          *
@@ -375,46 +319,33 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
          *
          * Notice that clearing bit 1 and 0 is accomplished by writting ONES to
          * the corresponding bits in RTSR. */
-        rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ));
+        RTSR = RTSR_AL | RTSR_HZ;
 
         return 0;
-
-err_rtc_reg:
-err_clk:
-        iounmap(sa1100_rtc->base);
-err_ress:
-err_map:
-        kfree(sa1100_rtc);
-        return ret;
 }
 
 static int sa1100_rtc_remove(struct platform_device *pdev)
 {
-        struct sa1100_rtc *sa1100_rtc = platform_get_drvdata(pdev);
+        struct rtc_device *rtc = platform_get_drvdata(pdev);
+
+        if (rtc)
+                rtc_device_unregister(rtc);
 
-        rtc_device_unregister(sa1100_rtc->rtc);
-        clk_disable(sa1100_rtc->clk);
-        clk_unprepare(sa1100_rtc->clk);
-        iounmap(sa1100_rtc->base);
         return 0;
 }
 
 #ifdef CONFIG_PM
 static int sa1100_rtc_suspend(struct device *dev)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-
         if (device_may_wakeup(dev))
-                enable_irq_wake(sa1100_rtc->irq_Alrm);
+                enable_irq_wake(IRQ_RTCAlrm);
         return 0;
 }
 
 static int sa1100_rtc_resume(struct device *dev)
 {
-        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
-
         if (device_may_wakeup(dev))
-                disable_irq_wake(sa1100_rtc->irq_Alrm);
+                disable_irq_wake(IRQ_RTCAlrm);
         return 0;
 }
 
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index eef27a197c00..110137e7ec81 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -3261,6 +3261,12 @@ void dasd_generic_path_event(struct ccw_device *cdev, int *path_event)
                         device->path_data.tbvpm |= eventlpm;
                         dasd_schedule_device_bh(device);
                 }
+                if (path_event[chp] & PE_PATHGROUP_ESTABLISHED) {
+                        DBF_DEV_EVENT(DBF_WARNING, device, "%s",
+                                      "Pathgroup re-established\n");
+                        if (device->discipline->kick_validate)
+                                device->discipline->kick_validate(device);
+                }
         }
         dasd_put_device(device);
 }
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index 553b3c5abb0a..b3beed5434e4 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -189,14 +189,12 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
         unsigned long flags;
         struct alias_server *server, *newserver;
         struct alias_lcu *lcu, *newlcu;
-        int is_lcu_known;
         struct dasd_uid uid;
 
         private = (struct dasd_eckd_private *) device->private;
 
         device->discipline->get_uid(device, &uid);
         spin_lock_irqsave(&aliastree.lock, flags);
-        is_lcu_known = 1;
         server = _find_server(&uid);
         if (!server) {
                 spin_unlock_irqrestore(&aliastree.lock, flags);
@@ -208,7 +206,6 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
                 if (!server) {
                         list_add(&newserver->server, &aliastree.serverlist);
                         server = newserver;
-                        is_lcu_known = 0;
                 } else {
                         /* someone was faster */
                         _free_server(newserver);
@@ -226,12 +223,10 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
                 if (!lcu) {
                         list_add(&newlcu->lcu, &server->lculist);
                         lcu = newlcu;
-                        is_lcu_known = 0;
                 } else {
                         /* someone was faster */
                         _free_lcu(newlcu);
                 }
-                is_lcu_known = 0;
         }
         spin_lock(&lcu->lock);
         list_add(&device->alias_list, &lcu->inactive_devices);
@@ -239,64 +234,7 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
         spin_unlock(&lcu->lock);
         spin_unlock_irqrestore(&aliastree.lock, flags);
 
-        return is_lcu_known;
-}
-
-/*
- * The first device to be registered on an LCU will have to do
- * some additional setup steps to configure that LCU on the
- * storage server. All further devices should wait with their
- * initialization until the first device is done.
- * To synchronize this work, the first device will call
- * dasd_alias_lcu_setup_complete when it is done, and all
- * other devices will wait for it with dasd_alias_wait_for_lcu_setup.
- */
-void dasd_alias_lcu_setup_complete(struct dasd_device *device)
-{
-        unsigned long flags;
-        struct alias_server *server;
-        struct alias_lcu *lcu;
-        struct dasd_uid uid;
-
-        device->discipline->get_uid(device, &uid);
-        lcu = NULL;
-        spin_lock_irqsave(&aliastree.lock, flags);
-        server = _find_server(&uid);
-        if (server)
-                lcu = _find_lcu(server, &uid);
-        spin_unlock_irqrestore(&aliastree.lock, flags);
-        if (!lcu) {
-                DBF_EVENT_DEVID(DBF_ERR, device->cdev,
-                                "could not find lcu for %04x %02x",
-                                uid.ssid, uid.real_unit_addr);
-                WARN_ON(1);
-                return;
-        }
-        complete_all(&lcu->lcu_setup);
-}
-
-void dasd_alias_wait_for_lcu_setup(struct dasd_device *device)
-{
-        unsigned long flags;
-        struct alias_server *server;
-        struct alias_lcu *lcu;
-        struct dasd_uid uid;
-
-        device->discipline->get_uid(device, &uid);
-        lcu = NULL;
-        spin_lock_irqsave(&aliastree.lock, flags);
-        server = _find_server(&uid);
-        if (server)
-                lcu = _find_lcu(server, &uid);
-        spin_unlock_irqrestore(&aliastree.lock, flags);
-        if (!lcu) {
-                DBF_EVENT_DEVID(DBF_ERR, device->cdev,
-                                "could not find lcu for %04x %02x",
-                                uid.ssid, uid.real_unit_addr);
-                WARN_ON(1);
-                return;
-        }
-        wait_for_completion(&lcu->lcu_setup);
+        return 0;
 }
 
 /*
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index bbcd5e9206ee..70880be26015 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1534,6 +1534,10 @@ static void dasd_eckd_validate_server(struct dasd_device *device)
         struct dasd_eckd_private *private;
         int enable_pav;
 
+        private = (struct dasd_eckd_private *) device->private;
+        if (private->uid.type == UA_BASE_PAV_ALIAS ||
+            private->uid.type == UA_HYPER_PAV_ALIAS)
+                return;
         if (dasd_nopav || MACHINE_IS_VM)
                 enable_pav = 0;
         else
@@ -1542,11 +1546,28 @@ static void dasd_eckd_validate_server(struct dasd_device *device)
 
         /* may be requested feature is not available on server,
          * therefore just report error and go ahead */
-        private = (struct dasd_eckd_private *) device->private;
         DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "PSF-SSC for SSID %04x "
                         "returned rc=%d", private->uid.ssid, rc);
 }
 
+/*
+ * worker to do a validate server in case of a lost pathgroup
+ */
+static void dasd_eckd_do_validate_server(struct work_struct *work)
+{
+        struct dasd_device *device = container_of(work, struct dasd_device,
+                                                  kick_validate);
+        dasd_eckd_validate_server(device);
+        dasd_put_device(device);
+}
+
+static void dasd_eckd_kick_validate_server(struct dasd_device *device)
+{
+        dasd_get_device(device);
+        /* queue call to do_validate_server to the kernel event daemon. */
+        schedule_work(&device->kick_validate);
+}
+
 static u32 get_fcx_max_data(struct dasd_device *device)
 {
 #if defined(CONFIG_64BIT)
@@ -1588,10 +1609,13 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
         struct dasd_eckd_private *private;
         struct dasd_block *block;
         struct dasd_uid temp_uid;
-        int is_known, rc, i;
+        int rc, i;
         int readonly;
         unsigned long value;
 
+        /* setup work queue for validate server*/
+        INIT_WORK(&device->kick_validate, dasd_eckd_do_validate_server);
+
         if (!ccw_device_is_pathgroup(device->cdev)) {
                 dev_warn(&device->cdev->dev,
                          "A channel path group could not be established\n");
@@ -1651,22 +1675,12 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
                 block->base = device;
         }
 
-        /* register lcu with alias handling, enable PAV if this is a new lcu */
-        is_known = dasd_alias_make_device_known_to_lcu(device);
-        if (is_known < 0) {
-                rc = is_known;
+        /* register lcu with alias handling, enable PAV */
+        rc = dasd_alias_make_device_known_to_lcu(device);
+        if (rc)
                 goto out_err2;
-        }
-        /*
-         * dasd_eckd_validate_server is done on the first device that
-         * is found for an LCU. All later other devices have to wait
-         * for it, so they will read the correct feature codes.
-         */
-        if (!is_known) {
-                dasd_eckd_validate_server(device);
-                dasd_alias_lcu_setup_complete(device);
-        } else
-                dasd_alias_wait_for_lcu_setup(device);
+
+        dasd_eckd_validate_server(device);
 
         /* device may report different configuration data after LCU setup */
         rc = dasd_eckd_read_conf(device);
@@ -4098,7 +4112,7 @@ static int dasd_eckd_restore_device(struct dasd_device *device)
 {
         struct dasd_eckd_private *private;
         struct dasd_eckd_characteristics temp_rdc_data;
-        int is_known, rc;
+        int rc;
         struct dasd_uid temp_uid;
         unsigned long flags;
 
@@ -4121,14 +4135,10 @@ static int dasd_eckd_restore_device(struct dasd_device *device)
                 goto out_err;
 
         /* register lcu with alias handling, enable PAV if this is a new lcu */
-        is_known = dasd_alias_make_device_known_to_lcu(device);
-        if (is_known < 0)
-                return is_known;
-        if (!is_known) {
-                dasd_eckd_validate_server(device);
-                dasd_alias_lcu_setup_complete(device);
-        } else
-                dasd_alias_wait_for_lcu_setup(device);
+        rc = dasd_alias_make_device_known_to_lcu(device);
+        if (rc)
+                return rc;
+        dasd_eckd_validate_server(device);
 
         /* RE-Read Configuration Data */
         rc = dasd_eckd_read_conf(device);
@@ -4270,6 +4280,7 @@ static struct dasd_discipline dasd_eckd_discipline = {
         .restore = dasd_eckd_restore_device,
         .reload = dasd_eckd_reload_device,
         .get_uid = dasd_eckd_get_uid,
+        .kick_validate = dasd_eckd_kick_validate_server,
 };
 
 static int __init
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index afe8c33422ed..33a6743ddc55 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -355,6 +355,7 @@ struct dasd_discipline {
         int (*reload) (struct dasd_device *);
 
         int (*get_uid) (struct dasd_device *, struct dasd_uid *);
+        void (*kick_validate) (struct dasd_device *);
 };
 
 extern struct dasd_discipline *dasd_diag_discipline_pointer;
@@ -455,6 +456,7 @@ struct dasd_device {
         struct work_struct kick_work;
         struct work_struct restore_device;
         struct work_struct reload_device;
+        struct work_struct kick_validate;
         struct timer_list timer;
 
         debug_info_t *debug_area;
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 934458ad55e5..e71a50d4b221 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -87,6 +87,7 @@ struct raw3215_info {
         struct tty_struct *tty;       /* pointer to tty structure if present */
         struct raw3215_req *queued_read; /* pointer to queued read requests */
         struct raw3215_req *queued_write;/* pointer to queued write requests */
+        struct tasklet_struct tlet;   /* tasklet to invoke tty_wakeup */
         wait_queue_head_t empty_wait; /* wait queue for flushing */
         struct timer_list timer;      /* timer for delayed output */
         int line_pos;                 /* position on the line (for tabs) */
@@ -334,19 +335,23 @@ static inline void raw3215_try_io(struct raw3215_info *raw)
 }
 
 /*
+ * Call tty_wakeup from tasklet context
+ */
+static void raw3215_wakeup(unsigned long data)
+{
+        struct raw3215_info *raw = (struct raw3215_info *) data;
+        tty_wakeup(raw->tty);
+}
+
+/*
  * Try to start the next IO and wake up processes waiting on the tty.
  */
 static void raw3215_next_io(struct raw3215_info *raw)
 {
-        struct tty_struct *tty;
-
         raw3215_mk_write_req(raw);
         raw3215_try_io(raw);
-        tty = raw->tty;
-        if (tty != NULL &&
-            RAW3215_BUFFER_SIZE - raw->count >= RAW3215_MIN_SPACE) {
-                tty_wakeup(tty);
-        }
+        if (raw->tty && RAW3215_BUFFER_SIZE - raw->count >= RAW3215_MIN_SPACE)
+                tasklet_schedule(&raw->tlet);
 }
 
 /*
@@ -682,6 +687,7 @@ static int raw3215_probe (struct ccw_device *cdev)
                 return -ENOMEM;
         }
         init_waitqueue_head(&raw->empty_wait);
+        tasklet_init(&raw->tlet, raw3215_wakeup, (unsigned long) raw);
 
         dev_set_drvdata(&cdev->dev, raw);
         cdev->handler = raw3215_irq;
@@ -901,6 +907,7 @@ static int __init con3215_init(void)
 
         raw->flags |= RAW3215_FIXED;
         init_waitqueue_head(&raw->empty_wait);
+        tasklet_init(&raw->tlet, raw3215_wakeup, (unsigned long) raw);
 
         /* Request the console irq */
         if (raw3215_startup(raw) != 0) {
@@ -966,6 +973,7 @@ static void tty3215_close(struct tty_struct *tty, struct file * filp)
         tty->closing = 1;
         /* Shutdown the terminal */
         raw3215_shutdown(raw);
+        tasklet_kill(&raw->tlet);
         tty->closing = 0;
         raw->tty = NULL;
 }
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index 53a31c753cb1..20c4557f5abd 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -364,10 +364,7 @@ static void release_controller(struct kref *kref)
         struct rdac_controller *ctlr;
         ctlr = container_of(kref, struct rdac_controller, kref);
 
-        flush_workqueue(kmpath_rdacd);
-        spin_lock(&list_lock);
         list_del(&ctlr->node);
-        spin_unlock(&list_lock);
         kfree(ctlr);
 }
 
@@ -376,20 +373,17 @@ static struct rdac_controller *get_controller(int index, char *array_name,
 {
         struct rdac_controller *ctlr, *tmp;
 
-        spin_lock(&list_lock);
-
         list_for_each_entry(tmp, &ctlr_list, node) {
                 if ((memcmp(tmp->array_id, array_id, UNIQUE_ID_LEN) == 0) &&
                           (tmp->index == index) &&
                           (tmp->host == sdev->host)) {
                         kref_get(&tmp->kref);
-                        spin_unlock(&list_lock);
                         return tmp;
                 }
         }
         ctlr = kmalloc(sizeof(*ctlr), GFP_ATOMIC);
         if (!ctlr)
-                goto done;
+                return NULL;
 
         /* initialize fields of controller */
         memcpy(ctlr->array_id, array_id, UNIQUE_ID_LEN);
@@ -405,8 +399,7 @@ static struct rdac_controller *get_controller(int index, char *array_name,
         INIT_WORK(&ctlr->ms_work, send_mode_select);
         INIT_LIST_HEAD(&ctlr->ms_head);
         list_add(&ctlr->node, &ctlr_list);
-done:
-        spin_unlock(&list_lock);
+
         return ctlr;
 }
 
@@ -517,9 +510,12 @@ static int initialize_controller(struct scsi_device *sdev,
                         index = 0;
                 else
                         index = 1;
+
+                spin_lock(&list_lock);
                 h->ctlr = get_controller(index, array_name, array_id, sdev);
                 if (!h->ctlr)
                         err = SCSI_DH_RES_TEMP_UNAVAIL;
+                spin_unlock(&list_lock);
         }
         return err;
 }
@@ -906,7 +902,9 @@ static int rdac_bus_attach(struct scsi_device *sdev)
         return 0;
 
 clean_ctlr:
+        spin_lock(&list_lock);
         kref_put(&h->ctlr->kref, release_controller);
+        spin_unlock(&list_lock);
 
 failed:
         kfree(scsi_dh_data);
@@ -921,14 +919,19 @@ static void rdac_bus_detach( struct scsi_device *sdev )
         struct rdac_dh_data *h;
         unsigned long flags;
 
-        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
         scsi_dh_data = sdev->scsi_dh_data;
+        h = (struct rdac_dh_data *) scsi_dh_data->buf;
+        if (h->ctlr && h->ctlr->ms_queued)
+                flush_workqueue(kmpath_rdacd);
+
+        spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
         sdev->scsi_dh_data = NULL;
         spin_unlock_irqrestore(sdev->request_queue->queue_lock, flags);
 
-        h = (struct rdac_dh_data *) scsi_dh_data->buf;
+        spin_lock(&list_lock);
         if (h->ctlr)
                 kref_put(&h->ctlr->kref, release_controller);
+        spin_unlock(&list_lock);
         kfree(scsi_dh_data);
         module_put(THIS_MODULE);
         sdev_printk(KERN_NOTICE, sdev, "%s: Detached\n", RDAC_NAME);
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 67b169b7a5be..b538f0883fd2 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4613,11 +4613,13 @@ static int __ipr_eh_host_reset(struct scsi_cmnd * scsi_cmd)
         ENTER;
         ioa_cfg = (struct ipr_ioa_cfg *) scsi_cmd->device->host->hostdata;
 
-        dev_err(&ioa_cfg->pdev->dev,
-                "Adapter being reset as a result of error recovery.\n");
+        if (!ioa_cfg->in_reset_reload) {
+                dev_err(&ioa_cfg->pdev->dev,
+                        "Adapter being reset as a result of error recovery.\n");
 
-        if (WAIT_FOR_DUMP == ioa_cfg->sdt_state)
-                ioa_cfg->sdt_state = GET_DUMP;
+                if (WAIT_FOR_DUMP == ioa_cfg->sdt_state)
+                        ioa_cfg->sdt_state = GET_DUMP;
+        }
 
         rc = ipr_reset_reload(ioa_cfg, IPR_SHUTDOWN_ABBREV);
 
@@ -4907,7 +4909,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
         struct ipr_ioa_cfg *ioa_cfg;
         struct ipr_resource_entry *res;
         struct ipr_cmd_pkt *cmd_pkt;
-        u32 ioasc;
+        u32 ioasc, int_reg;
         int op_found = 0;
 
         ENTER;
@@ -4920,7 +4922,17 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
          */
         if (ioa_cfg->in_reset_reload || ioa_cfg->ioa_is_dead)
                 return FAILED;
-        if (!res || !ipr_is_gscsi(res))
+        if (!res)
+                return FAILED;
+
+        /*
+         * If we are aborting a timed out op, chances are that the timeout was caused
+         * by a still not detected EEH error. In such cases, reading a register will
+         * trigger the EEH recovery infrastructure.
+         */
+        int_reg = readl(ioa_cfg->regs.sense_interrupt_reg);
+
+        if (!ipr_is_gscsi(res))
                 return FAILED;
 
         list_for_each_entry(ipr_cmd, &ioa_cfg->pending_q, queue) {
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 1a65d6514237..418391b1c361 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -1848,9 +1848,11 @@ static enum sci_status sci_oem_parameters_set(struct isci_host *ihost)
         if (state == SCIC_RESET ||
             state == SCIC_INITIALIZING ||
             state == SCIC_INITIALIZED) {
+                u8 oem_version = pci_info->orom ? pci_info->orom->hdr.version :
+                        ISCI_ROM_VER_1_0;
 
                 if (sci_oem_parameters_validate(&ihost->oem_parameters,
-                                                pci_info->orom->hdr.version))
+                                                oem_version))
                         return SCI_FAILURE_INVALID_PARAMETER_VALUE;
 
                 return SCI_SUCCESS;
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
index 4ceeace80453..70eb1f79b1ba 100644
--- a/drivers/scsi/mac_esp.c
+++ b/drivers/scsi/mac_esp.c
@@ -565,8 +565,7 @@ static int __devinit esp_mac_probe(struct platform_device *dev)
         esp_chips[dev->id] = esp;
         mb();
         if (esp_chips[!dev->id] == NULL) {
-                err = request_irq(host->irq, mac_scsi_esp_intr, 0,
-                                  "Mac ESP", NULL);
+                err = request_irq(host->irq, mac_scsi_esp_intr, 0, "ESP", NULL);
                 if (err < 0) {
                         esp_chips[dev->id] = NULL;
                         goto fail_free_priv;
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index ea2bde206f7f..2bccfbe5661e 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -339,9 +339,6 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance)
 
         printk(KERN_INFO "Macintosh SCSI: resetting the SCSI bus..." );
 
-        /* switch off SCSI IRQ - catch an interrupt without IRQ bit set else */
-        disable_irq(IRQ_MAC_SCSI);
-
         /* get in phase */
         NCR5380_write( TARGET_COMMAND_REG,
                       PHASE_SR_TO_TCR( NCR5380_read(STATUS_REG) ));
@@ -357,9 +354,6 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance)
         for( end = jiffies + AFTER_RESET_DELAY; time_before(jiffies, end); )
                 barrier();
 
-        /* switch on SCSI IRQ again */
-        enable_irq(IRQ_MAC_SCSI);
-
         printk(KERN_INFO " done\n" );
 }
 #endif
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 0b2c95583660..a78036f5e1a6 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -4548,7 +4548,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
                 printk(MPT2SAS_ERR_FMT "%s: pci error recovery reset\n",
                     ioc->name, __func__);
                 r = 0;
-                goto out;
+                goto out_unlocked;
         }
 
         if (mpt2sas_fwfault_debug)
@@ -4604,6 +4604,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
         spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags);
         mutex_unlock(&ioc->reset_in_progress_mutex);
 
+ out_unlocked:
         dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: exit\n", ioc->name,
             __func__));
         return r;
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index a2f1b3043dfb..9f41b3b4358f 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1036,8 +1036,7 @@ qla2x00_link_state_show(struct device *dev, struct device_attribute *attr,
             vha->device_flags & DFLG_NO_CABLE)
                 len = snprintf(buf, PAGE_SIZE, "Link Down\n");
         else if (atomic_read(&vha->loop_state) != LOOP_READY ||
-            test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
-            test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
+            qla2x00_reset_active(vha))
                 len = snprintf(buf, PAGE_SIZE, "Unknown Link State\n");
         else {
                 len = snprintf(buf, PAGE_SIZE, "Link Up - ");
@@ -1359,8 +1358,7 @@ qla2x00_thermal_temp_show(struct device *dev,
                 return snprintf(buf, PAGE_SIZE, "\n");
 
         temp = frac = 0;
-        if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
-            test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
+        if (qla2x00_reset_active(vha))
                 ql_log(ql_log_warn, vha, 0x707b,
                     "ISP reset active.\n");
         else if (!vha->hw->flags.eeh_busy)
@@ -1379,8 +1377,7 @@ qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr,
         int rval = QLA_FUNCTION_FAILED;
         uint16_t state[5];
 
-        if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
-                test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags))
+        if (qla2x00_reset_active(vha))
                 ql_log(ql_log_warn, vha, 0x707c,
                     "ISP reset active.\n");
         else if (!vha->hw->flags.eeh_busy)
@@ -1693,9 +1690,7 @@ qla2x00_get_fc_host_stats(struct Scsi_Host *shost)
         if (IS_FWI2_CAPABLE(ha)) {
                 rval = qla24xx_get_isp_stats(base_vha, stats, stats_dma);
         } else if (atomic_read(&base_vha->loop_state) == LOOP_READY &&
-                    !test_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags) &&
-                    !test_bit(ISP_ABORT_NEEDED, &base_vha->dpc_flags) &&
-                    !ha->dpc_active) {
+            !qla2x00_reset_active(vha) && !ha->dpc_active) {
                 /* Must be in a 'READY' state for statistics retrieval. */
                 rval = qla2x00_get_link_status(base_vha, base_vha->loop_id,
                                                 stats, stats_dma);
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index b1d0f936bf2d..1682e2e4201d 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -108,13 +108,6 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
                 goto exit_fcp_prio_cfg;
         }
 
-        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
-                test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
-                test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
-                ret = -EBUSY;
-                goto exit_fcp_prio_cfg;
-        }
-
         /* Get the sub command */
         oper = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
 
@@ -646,13 +639,6 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
         dma_addr_t rsp_data_dma;
         uint32_t rsp_data_len;
 
-        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
-                test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
-                test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
-                ql_log(ql_log_warn, vha, 0x7018, "Abort active or needed.\n");
-                return -EBUSY;
-        }
-
         if (!vha->flags.online) {
                 ql_log(ql_log_warn, vha, 0x7019, "Host is not online.\n");
                 return -EIO;
@@ -874,13 +860,6 @@ qla84xx_reset(struct fc_bsg_job *bsg_job)
         int rval = 0;
         uint32_t flag;
 
-        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
-            test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
-            test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
-                ql_log(ql_log_warn, vha, 0x702e, "Abort active or needed.\n");
-                return -EBUSY;
-        }
-
         if (!IS_QLA84XX(ha)) {
                 ql_dbg(ql_dbg_user, vha, 0x702f, "Not 84xx, exiting.\n");
                 return -EINVAL;
@@ -922,11 +901,6 @@ qla84xx_updatefw(struct fc_bsg_job *bsg_job)
         uint32_t flag;
         uint32_t fw_ver;
 
-        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
-                test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
-                test_bit(ISP_ABORT_RETRY, &vha->dpc_flags))
-                return -EBUSY;
-
         if (!IS_QLA84XX(ha)) {
                 ql_dbg(ql_dbg_user, vha, 0x7032,
                     "Not 84xx, exiting.\n");
@@ -1036,14 +1010,6 @@ qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job)
         uint32_t data_len = 0;
         uint32_t dma_direction = DMA_NONE;
 
-        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
-                test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
-                test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
-                ql_log(ql_log_warn, vha, 0x7039,
-                    "Abort active or needed.\n");
-                return -EBUSY;
-        }
-
         if (!IS_QLA84XX(ha)) {
                 ql_log(ql_log_warn, vha, 0x703a,
                     "Not 84xx, exiting.\n");
@@ -1246,13 +1212,6 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job)
 
         bsg_job->reply->reply_payload_rcv_len = 0;
 
-        if (test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
-                test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
-                test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
-                ql_log(ql_log_warn, vha, 0x7045, "abort active or needed.\n");
-                return -EBUSY;
-        }
-
         if (!IS_IIDMA_CAPABLE(vha->hw)) {
                 ql_log(ql_log_info, vha, 0x7046, "iiDMA not supported.\n");
                 return -EINVAL;
@@ -1668,6 +1627,15 @@ qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
                 vha = shost_priv(host);
         }
 
+        if (qla2x00_reset_active(vha)) {
+                ql_dbg(ql_dbg_user, vha, 0x709f,
+                    "BSG: ISP abort active/needed -- cmd=%d.\n",
+                    bsg_job->request->msgcode);
+                bsg_job->reply->result = (DID_ERROR << 16);
+                bsg_job->job_done(bsg_job);
+                return -EBUSY;
+        }
+
         ql_dbg(ql_dbg_user, vha, 0x7000,
             "Entered %s msgcode=0x%x.\n", __func__, bsg_job->request->msgcode);
 
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 7c54624b5b13..45cbf0ba624d 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -19,7 +19,8 @@
  * | DPC Thread                   |       0x401c       |                |
  * | Async Events                 |       0x5057       | 0x5052         |
  * | Timer Routines               |       0x6011       | 0x600e,0x600f  |
- * | User Space Interactions      |       0x709e       |                |
+ * | User Space Interactions      |       0x709e       | 0x7018,0x702e  |
+ * |                              |                    | 0x7039,0x7045  |
  * | Task Management              |       0x803c       | 0x8025-0x8026  |
  * |                              |                    | 0x800b,0x8039  |
  * | AER/EEH                      |       0x900f       |                |
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index a6a4eebce4a8..af1003f9de1e 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -44,6 +44,7 @@
  * ISP2100 HBAs.
  */
 #define MAILBOX_REGISTER_COUNT_2100     8
+#define MAILBOX_REGISTER_COUNT_2200     24
 #define MAILBOX_REGISTER_COUNT          32
 
 #define QLA2200A_RISC_ROM_VER   4
diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index 9902834e0b74..7cc4f36cd539 100644
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -131,3 +131,16 @@ qla2x00_hba_err_chk_enabled(srb_t *sp)
         }
         return 0;
 }
+
+static inline int
+qla2x00_reset_active(scsi_qla_host_t *vha)
+{
+        scsi_qla_host_t *base_vha = pci_get_drvdata(vha->hw->pdev);
+
+        /* Test appropriate base-vha and vha flags. */
+        return test_bit(ISP_ABORT_NEEDED, &base_vha->dpc_flags) ||
+            test_bit(ABORT_ISP_ACTIVE, &base_vha->dpc_flags) ||
+            test_bit(ISP_ABORT_RETRY, &base_vha->dpc_flags) ||
+            test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags) ||
+            test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
+}
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index e804585cc59c..349843ea32f6 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2090,7 +2090,6 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
                         break;
                 case CT_IOCB_TYPE:
                         qla24xx_els_ct_entry(vha, rsp->req, pkt, CT_IOCB_TYPE);
-                        clear_bit(MBX_INTERRUPT, &vha->hw->mbx_cmd_flags);
                         break;
                 case ELS_IOCB_TYPE:
                         qla24xx_els_ct_entry(vha, rsp->req, pkt, ELS_IOCB_TYPE);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 34344d3f8658..08f1d01bdc1c 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -342,6 +342,8 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
 
                                 set_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
                                 clear_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
+                                /* Allow next mbx cmd to come in. */
+                                complete(&ha->mbx_cmd_comp);
                                 if (ha->isp_ops->abort_isp(vha)) {
                                         /* Failed. retry later. */
                                         set_bit(ISP_ABORT_NEEDED,
@@ -350,6 +352,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
                                 clear_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
                                 ql_dbg(ql_dbg_mbx, base_vha, 0x101f,
                                     "Finished abort_isp.\n");
+                                goto mbx_done;
                         }
                 }
         }
@@ -358,6 +361,7 @@ premature_exit:
         /* Allow next mbx cmd to come in. */
         complete(&ha->mbx_cmd_comp);
 
+mbx_done:
         if (rval) {
                 ql_dbg(ql_dbg_mbx, base_vha, 0x1020,
                     "**** Failed mbx[0]=%x, mb[1]=%x, mb[2]=%x, cmd=%x ****.\n",
@@ -2581,7 +2585,8 @@ qla2x00_stop_firmware(scsi_qla_host_t *vha)
         ql_dbg(ql_dbg_mbx, vha, 0x10a1, "Entered %s.\n", __func__);
 
         mcp->mb[0] = MBC_STOP_FIRMWARE;
-        mcp->out_mb = MBX_0;
+        mcp->mb[1] = 0;
+        mcp->out_mb = MBX_1|MBX_0;
         mcp->in_mb = MBX_0;
         mcp->tov = 5;
         mcp->flags = 0;
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 1cd46cd7ff90..270ba3130fde 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1165,19 +1165,6 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha)
                 qla82xx_wr_32(ha, QLA82XX_ROMUSB_GLB_SW_RESET, 0xfeffffff);
         else
                 qla82xx_wr_32(ha, QLA82XX_ROMUSB_GLB_SW_RESET, 0xffffffff);
-
-        /* reset ms */
-        val = qla82xx_rd_32(ha, QLA82XX_CRB_QDR_NET + 0xe4);
-        val |= (1 << 1);
-        qla82xx_wr_32(ha, QLA82XX_CRB_QDR_NET + 0xe4, val);
-        msleep(20);
-
-        /* unreset ms */
-        val = qla82xx_rd_32(ha, QLA82XX_CRB_QDR_NET + 0xe4);
-        val &= ~(1 << 1);
-        qla82xx_wr_32(ha, QLA82XX_CRB_QDR_NET + 0xe4, val);
-        msleep(20);
-
         qla82xx_rom_unlock(ha);
 
         /* Read the signature value from the flash.
@@ -3392,7 +3379,7 @@ void qla82xx_watchdog(scsi_qla_host_t *vha)
                                             QLA82XX_CRB_PEG_NET_3 + 0x3c),
                                     qla82xx_rd_32(ha,
                                             QLA82XX_CRB_PEG_NET_4 + 0x3c));
-                                if (LSW(MSB(halt_status)) == 0x67)
+                                if (((halt_status & 0x1fffff00) >> 8) == 0x67)
                                         ql_log(ql_log_warn, vha, 0xb052,
                                             "Firmware aborted with "
                                             "error code 0x00006700. Device is "
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 4ed1e4a96b95..036030c95339 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -625,6 +625,12 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
                         cmd->result = DID_NO_CONNECT << 16;
                         goto qc24_fail_command;
         }
+
+        if (!fcport) {
+                cmd->result = DID_NO_CONNECT << 16;
+                goto qc24_fail_command;
+        }
+
         if (atomic_read(&fcport->state) != FCS_ONLINE) {
                 if (atomic_read(&fcport->state) == FCS_DEVICE_DEAD ||
                         atomic_read(&base_vha->loop_state) == LOOP_DEAD) {
@@ -877,6 +883,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
 
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
         if (ha->isp_ops->abort_command(sp)) {
+                ret = FAILED;
                 ql_dbg(ql_dbg_taskm, vha, 0x8003,
                     "Abort command mbx failed cmd=%p.\n", cmd);
         } else {
@@ -1124,7 +1131,6 @@ static int
 qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
 {
         scsi_qla_host_t *vha = shost_priv(cmd->device->host);
-        fc_port_t *fcport = (struct fc_port *) cmd->device->hostdata;
         struct qla_hw_data *ha = vha->hw;
         int ret = FAILED;
         unsigned int id, lun;
@@ -1133,15 +1139,6 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
         id = cmd->device->id;
         lun = cmd->device->lun;
 
-        if (!fcport) {
-                return ret;
-        }
-
-        ret = fc_block_scsi_eh(cmd);
-        if (ret != 0)
-                return ret;
-        ret = FAILED;
-
         ql_log(ql_log_info, vha, 0x8018,
             "ADAPTER RESET ISSUED nexus=%ld:%d:%d.\n", vha->host_no, id, lun);
 
@@ -2047,7 +2044,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 ha->nvram_data_off = ~0;
                 ha->isp_ops = &qla2100_isp_ops;
         } else if (IS_QLA2200(ha)) {
-                ha->mbx_count = MAILBOX_REGISTER_COUNT;
+                ha->mbx_count = MAILBOX_REGISTER_COUNT_2200;
                 req_length = REQUEST_ENTRY_CNT_2200;
                 rsp_length = RESPONSE_ENTRY_CNT_2100;
                 ha->max_loop_id = SNS_LAST_LOOP_ID_2100;
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 23f33a6d52d7..29d780c38040 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.03.07.12-k"
+#define QLA2XXX_VERSION      "8.03.07.13-k"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    3
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 78f1111158d7..65253dfbe962 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -10,6 +10,8 @@
 #include "ql4_def.h"
 #include "ql4_glbl.h"
 
+#include <asm-generic/io-64-nonatomic-lo-hi.h>
+
 #define MASK(n)         DMA_BIT_MASK(n)
 #define MN_WIN(addr)    (((addr & 0x1fc0000) >> 1) | ((addr >> 25) & 0x3ff))
 #define OCM_WIN(addr)   (((addr & 0x1ff0000) >> 1) | ((addr >> 25) & 0x3ff))
@@ -655,27 +657,6 @@ static int qla4_8xxx_pci_is_same_window(struct scsi_qla_host *ha,
         return 0;
 }
 
-#ifndef readq
-static inline __u64 readq(const volatile void __iomem *addr)
-{
-        const volatile u32 __iomem *p = addr;
-        u32 low, high;
-
-        low = readl(p);
-        high = readl(p + 1);
-
-        return low + ((u64)high << 32);
-}
-#endif
-
-#ifndef writeq
-static inline void writeq(__u64 val, volatile void __iomem *addr)
-{
-        writel(val, addr);
-        writel(val >> 32, addr+4);
-}
-#endif
-
 static int qla4_8xxx_pci_mem_read_direct(struct scsi_qla_host *ha,
                 u64 off, void *data, int size)
 {
diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index bf8bf79e6a1f..c4670642d023 100644
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -7,6 +7,7 @@
 
 #include <linux/pm_runtime.h>
 #include <linux/export.h>
+#include <linux/async.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
@@ -92,6 +93,19 @@ static int scsi_bus_resume_common(struct device *dev)
         return err;
 }
 
+static int scsi_bus_prepare(struct device *dev)
+{
+        if (scsi_is_sdev_device(dev)) {
+                /* sd probing uses async_schedule.  Wait until it finishes. */
+                async_synchronize_full();
+
+        } else if (scsi_is_host_device(dev)) {
+                /* Wait until async scanning is finished */
+                scsi_complete_async_scans();
+        }
+        return 0;
+}
+
 static int scsi_bus_suspend(struct device *dev)
 {
         return scsi_bus_suspend_common(dev, PMSG_SUSPEND);
@@ -110,6 +124,7 @@ static int scsi_bus_poweroff(struct device *dev)
 #else /* CONFIG_PM_SLEEP */
 
 #define scsi_bus_resume_common          NULL
+#define scsi_bus_prepare                NULL
 #define scsi_bus_suspend                NULL
 #define scsi_bus_freeze                 NULL
 #define scsi_bus_poweroff               NULL
@@ -218,6 +233,7 @@ void scsi_autopm_put_host(struct Scsi_Host *shost)
 #endif /* CONFIG_PM_RUNTIME */
 
 const struct dev_pm_ops scsi_bus_pm_ops = {
+        .prepare =              scsi_bus_prepare,
         .suspend =              scsi_bus_suspend,
         .resume =               scsi_bus_resume_common,
         .freeze =               scsi_bus_freeze,
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 68eadd1c67fd..be4fa6d179b1 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -109,6 +109,7 @@ extern void scsi_exit_procfs(void);
 #endif /* CONFIG_PROC_FS */
 
 /* scsi_scan.c */
+extern int scsi_complete_async_scans(void);
 extern int scsi_scan_host_selected(struct Scsi_Host *, unsigned int,
                                    unsigned int, unsigned int, int);
 extern void scsi_forget_host(struct Scsi_Host *);
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 89da43f73c00..29c4c0480976 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1815,6 +1815,7 @@ static void scsi_finish_async_scan(struct async_scan_data *data)
         }
         spin_unlock(&async_scan_lock);
 
+        scsi_autopm_put_host(shost);
         scsi_host_put(shost);
         kfree(data);
 }
@@ -1841,7 +1842,6 @@ static int do_scan_async(void *_data)
 
         do_scsi_scan_host(shost);
         scsi_finish_async_scan(data);
-        scsi_autopm_put_host(shost);
         return 0;
 }
 
@@ -1869,7 +1869,7 @@ void scsi_scan_host(struct Scsi_Host *shost)
         p = kthread_run(do_scan_async, data, "scsi_scan_%d", shost->host_no);
         if (IS_ERR(p))
                 do_scan_async(data);
-        /* scsi_autopm_put_host(shost) is called in do_scan_async() */
+        /* scsi_autopm_put_host(shost) is called in scsi_finish_async_scan() */
 }
 EXPORT_SYMBOL(scsi_scan_host);
 
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c
index 45fee368b092..92d314a73f69 100644
--- a/drivers/sh/clk/cpg.c
+++ b/drivers/sh/clk/cpg.c
@@ -190,7 +190,7 @@ static int __init sh_clk_init_parent(struct clk *clk)
                 return -EINVAL;
         }
 
-        clk->parent = clk->parent_table[val];
+        clk_reparent(clk, clk->parent_table[val]);
         if (!clk->parent) {
                 pr_err("sh_clk_init_parent: unable to set parent");
                 return -EINVAL;
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 3f9a47ec67dc..8293658e7cf9 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -299,7 +299,7 @@ config SPI_S3C24XX_FIQ
 
 config SPI_S3C64XX
         tristate "Samsung S3C64XX series type SPI"
-        depends on (ARCH_S3C64XX || ARCH_S5P64X0)
+        depends on (ARCH_S3C64XX || ARCH_S5P64X0 || ARCH_EXYNOS)
         select S3C64XX_DMA if ARCH_S3C64XX
         help
           SPI driver for Samsung S3C64XX and newer SoCs.
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 2a6429d8c363..10182eb50068 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1720,7 +1720,7 @@ static int pch_spi_resume(struct pci_dev *pdev)
 
 #endif
 
-static struct pci_driver pch_spi_pcidev = {
+static struct pci_driver pch_spi_pcidev_driver = {
         .name = "pch_spi",
         .id_table = pch_spi_pcidev_id,
         .probe = pch_spi_probe,
@@ -1736,7 +1736,7 @@ static int __init pch_spi_init(void)
         if (ret)
                 return ret;
 
-        ret = pci_register_driver(&pch_spi_pcidev);
+        ret = pci_register_driver(&pch_spi_pcidev_driver);
         if (ret)
                 return ret;
 
@@ -1746,7 +1746,7 @@ module_init(pch_spi_init);
 
 static void __exit pch_spi_exit(void)
 {
-        pci_unregister_driver(&pch_spi_pcidev);
+        pci_unregister_driver(&pch_spi_pcidev_driver);
         platform_driver_unregister(&pch_spi_pd_driver);
 }
 module_exit(pch_spi_exit);
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
index 520e8286db28..49d209173f55 100644
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -75,7 +75,7 @@ static u32 get_cfgspace_addr(struct ssb_pcicore *pc,
         u32 tmp;
 
         /* We do only have one cardbus device behind the bridge. */
-        if (pc->cardbusmode && (dev >= 1))
+        if (pc->cardbusmode && (dev > 1))
                 goto out;
 
         if (bus == 0) {
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 21e2f4b87f14..9e6347249783 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -60,8 +60,6 @@ source "drivers/staging/rts5139/Kconfig"
 
 source "drivers/staging/frontier/Kconfig"
 
-source "drivers/staging/pohmelfs/Kconfig"
-
 source "drivers/staging/phison/Kconfig"
 
 source "drivers/staging/line6/Kconfig"
@@ -120,8 +118,6 @@ source "drivers/staging/cptm1217/Kconfig"
 
 source "drivers/staging/ste_rmi4/Kconfig"
 
-source "drivers/staging/gma500/Kconfig"
-
 source "drivers/staging/mei/Kconfig"
 
 source "drivers/staging/nvec/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 7c5808d7212d..943e14830753 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -22,7 +22,6 @@ obj-$(CONFIG_R8712U)		+= rtl8712/
 obj-$(CONFIG_RTS_PSTOR)         += rts_pstor/
 obj-$(CONFIG_RTS5139)           += rts5139/
 obj-$(CONFIG_TRANZPORT)         += frontier/
-obj-$(CONFIG_POHMELFS)          += pohmelfs/
 obj-$(CONFIG_IDE_PHISON)        += phison/
 obj-$(CONFIG_LINE6_USB)         += line6/
 obj-$(CONFIG_USB_SERIAL_QUATECH2)       += serqt_usb2/
@@ -52,7 +51,6 @@ obj-$(CONFIG_FT1000)		+= ft1000/
 obj-$(CONFIG_SPEAKUP)           += speakup/
 obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)       += cptm1217/
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)    += ste_rmi4/
-obj-$(CONFIG_DRM_PSB)           += gma500/
 obj-$(CONFIG_INTEL_MEI)         += mei/
 obj-$(CONFIG_MFD_NVEC)          += nvec/
 obj-$(CONFIG_DRM_OMAP)          += omapdrm/
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index becf711117ef..fef3580ce8de 100644
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -27,6 +27,7 @@ config ANDROID_LOGGER
 
 config ANDROID_RAM_CONSOLE
         bool "Android RAM buffer console"
+        depends on !S390 && !UML
         default n
 
 config ANDROID_RAM_CONSOLE_ENABLE_VERBOSE
@@ -99,10 +100,6 @@ config ANDROID_LOW_MEMORY_KILLER
         ---help---
           Register processes to be killed when memory is low
 
-config ANDROID_PMEM
-        bool "Android pmem allocator"
-        depends on ARM
-
 source "drivers/staging/android/switch/Kconfig"
 
 endif # if ANDROID
diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index eaed1ff64f0f..5fcc24ffdd58 100644
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@ -5,5 +5,4 @@ obj-$(CONFIG_ANDROID_RAM_CONSOLE)	+= ram_console.o
 obj-$(CONFIG_ANDROID_TIMED_OUTPUT)      += timed_output.o
 obj-$(CONFIG_ANDROID_TIMED_GPIO)        += timed_gpio.o
 obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER) += lowmemorykiller.o
-obj-$(CONFIG_ANDROID_PMEM)              += pmem.o
 obj-$(CONFIG_ANDROID_SWITCH)            += switch/
diff --git a/drivers/staging/android/android_pmem.h b/drivers/staging/android/android_pmem.h
deleted file mode 100644
index f633621f5be3..000000000000
--- a/drivers/staging/android/android_pmem.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* include/linux/android_pmem.h
- *
- * Copyright (C) 2007 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- */
-
-#ifndef _ANDROID_PMEM_H_
-#define _ANDROID_PMEM_H_
-
-#define PMEM_IOCTL_MAGIC 'p'
-#define PMEM_GET_PHYS           _IOW(PMEM_IOCTL_MAGIC, 1, unsigned int)
-#define PMEM_MAP                _IOW(PMEM_IOCTL_MAGIC, 2, unsigned int)
-#define PMEM_GET_SIZE           _IOW(PMEM_IOCTL_MAGIC, 3, unsigned int)
-#define PMEM_UNMAP              _IOW(PMEM_IOCTL_MAGIC, 4, unsigned int)
-/* This ioctl will allocate pmem space, backing the file, it will fail
- * if the file already has an allocation, pass it the len as the argument
- * to the ioctl */
-#define PMEM_ALLOCATE           _IOW(PMEM_IOCTL_MAGIC, 5, unsigned int)
-/* This will connect a one pmem file to another, pass the file that is already
- * backed in memory as the argument to the ioctl
- */
-#define PMEM_CONNECT            _IOW(PMEM_IOCTL_MAGIC, 6, unsigned int)
-/* Returns the total size of the pmem region it is sent to as a pmem_region
- * struct (with offset set to 0). 
- */
-#define PMEM_GET_TOTAL_SIZE     _IOW(PMEM_IOCTL_MAGIC, 7, unsigned int)
-#define PMEM_CACHE_FLUSH        _IOW(PMEM_IOCTL_MAGIC, 8, unsigned int)
-
-struct android_pmem_platform_data
-{
-        const char* name;
-        /* starting physical address of memory region */
-        unsigned long start;
-        /* size of memory region */
-        unsigned long size;
-        /* set to indicate the region should not be managed with an allocator */
-        unsigned no_allocator;
-        /* set to indicate maps of this region should be cached, if a mix of
-         * cached and uncached is desired, set this and open the device with
-         * O_SYNC to get an uncached region */
-        unsigned cached;
-        /* The MSM7k has bits to enable a write buffer in the bus controller*/
-        unsigned buffered;
-};
-
-struct pmem_region {
-        unsigned long offset;
-        unsigned long len;
-};
-
-#ifdef CONFIG_ANDROID_PMEM
-int is_pmem_file(struct file *file);
-int get_pmem_file(int fd, unsigned long *start, unsigned long *vstart,
-                  unsigned long *end, struct file **filp);
-int get_pmem_user_addr(struct file *file, unsigned long *start,
-                       unsigned long *end);
-void put_pmem_file(struct file* file);
-void flush_pmem_file(struct file *file, unsigned long start, unsigned long len);
-int pmem_setup(struct android_pmem_platform_data *pdata,
-               long (*ioctl)(struct file *, unsigned int, unsigned long),
-               int (*release)(struct inode *, struct file *));
-int pmem_remap(struct pmem_region *region, struct file *file,
-               unsigned operation);
-
-#else
-static inline int is_pmem_file(struct file *file) { return 0; }
-static inline int get_pmem_file(int fd, unsigned long *start,
-                                unsigned long *vstart, unsigned long *end,
-                                struct file **filp) { return -ENOSYS; }
-static inline int get_pmem_user_addr(struct file *file, unsigned long *start,
-                                     unsigned long *end) { return -ENOSYS; }
-static inline void put_pmem_file(struct file* file) { return; }
-static inline void flush_pmem_file(struct file *file, unsigned long start,
-                                   unsigned long len) { return; }
-static inline int pmem_setup(struct android_pmem_platform_data *pdata,
-              long (*ioctl)(struct file *, unsigned int, unsigned long),
-              int (*release)(struct inode *, struct file *)) { return -ENOSYS; }
-
-static inline int pmem_remap(struct pmem_region *region, struct file *file,
-                             unsigned operation) { return -ENOSYS; }
-#endif
-
-#endif //_ANDROID_PPP_H_
-
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 7491801a661c..f0b7e6605ab5 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -38,6 +38,7 @@
 
 static DEFINE_MUTEX(binder_lock);
 static DEFINE_MUTEX(binder_deferred_lock);
+static DEFINE_MUTEX(binder_mmap_lock);
 
 static HLIST_HEAD(binder_procs);
 static HLIST_HEAD(binder_deferred_list);
@@ -632,6 +633,11 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
         if (mm) {
                 down_write(&mm->mmap_sem);
                 vma = proc->vma;
+                if (vma && mm != vma->vm_mm) {
+                        pr_err("binder: %d: vma mm and task mm mismatch\n",
+                                proc->pid);
+                        vma = NULL;
+                }
         }
 
         if (allocate == 0)
@@ -2759,7 +2765,6 @@ static void binder_vma_open(struct vm_area_struct *vma)
                      proc->pid, vma->vm_start, vma->vm_end,
                      (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags,
                      (unsigned long)pgprot_val(vma->vm_page_prot));
-        dump_stack();
 }
 
 static void binder_vma_close(struct vm_area_struct *vma)
@@ -2803,6 +2808,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma)
         }
         vma->vm_flags = (vma->vm_flags | VM_DONTCOPY) & ~VM_MAYWRITE;
 
+        mutex_lock(&binder_mmap_lock);
         if (proc->buffer) {
                 ret = -EBUSY;
                 failure_string = "already mapped";
@@ -2817,6 +2823,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma)
         }
         proc->buffer = area->addr;
         proc->user_buffer_offset = vma->vm_start - (uintptr_t)proc->buffer;
+        mutex_unlock(&binder_mmap_lock);
 
 #ifdef CONFIG_CPU_CACHE_VIPT
         if (cache_is_vipt_aliasing()) {
@@ -2849,7 +2856,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma)
         binder_insert_free_buffer(proc, buffer);
         proc->free_async_space = proc->buffer_size / 2;
         barrier();
-        proc->files = get_files_struct(current);
+        proc->files = get_files_struct(proc->tsk);
         proc->vma = vma;
 
         /*printk(KERN_INFO "binder_mmap: %d %lx-%lx maps %p\n",
@@ -2860,10 +2867,12 @@ err_alloc_small_buf_failed:
         kfree(proc->pages);
         proc->pages = NULL;
 err_alloc_pages_failed:
+        mutex_lock(&binder_mmap_lock);
         vfree(proc->buffer);
         proc->buffer = NULL;
 err_get_vm_area_failed:
 err_already_mapped:
+        mutex_unlock(&binder_mmap_lock);
 err_bad_arg:
         printk(KERN_ERR "binder_mmap: %d %lx-%lx %s failed %d\n",
                proc->pid, vma->vm_start, vma->vm_end, failure_string, ret);
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 2d8d2b796101..efc7dc1f4831 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -54,6 +54,7 @@ static size_t lowmem_minfree[6] = {
 static int lowmem_minfree_size = 4;
 
 static struct task_struct *lowmem_deathpending;
+static unsigned long lowmem_deathpending_timeout;
 
 #define lowmem_print(level, x...)                       \
         do {                                            \
@@ -103,7 +104,8 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)
          * Note: Currently you need CONFIG_PROFILING
          * for this to work correctly.
          */
-        if (lowmem_deathpending)
+        if (lowmem_deathpending &&
+            time_before_eq(jiffies, lowmem_deathpending_timeout))
                 return 0;
 
         if (lowmem_adj_size < array_size)
@@ -178,6 +180,7 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)
                  */
 #ifdef CONFIG_PROFILING
                 lowmem_deathpending = selected;
+                lowmem_deathpending_timeout = jiffies + HZ;
                 task_handoff_register(&task_nb);
 #endif
                 force_sig(SIGKILL, selected);
diff --git a/drivers/staging/android/pmem.c b/drivers/staging/android/pmem.c
deleted file mode 100644
index 7d97032c6508..000000000000
--- a/drivers/staging/android/pmem.c
+++ /dev/null
@@ -1,1345 +0,0 @@
-/* pmem.c
- *
- * Copyright (C) 2007 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- */
-
-#include <linux/miscdevice.h>
-#include <linux/platform_device.h>
-#include <linux/fs.h>
-#include <linux/file.h>
-#include <linux/mm.h>
-#include <linux/list.h>
-#include <linux/mutex.h>
-#include <linux/debugfs.h>
-#include <linux/mempolicy.h>
-#include <linux/sched.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/cacheflush.h>
-#include "android_pmem.h"
-
-#define PMEM_MAX_DEVICES 10
-#define PMEM_MAX_ORDER 128
-#define PMEM_MIN_ALLOC PAGE_SIZE
-
-#define PMEM_DEBUG 1
-
-/* indicates that a refernce to this file has been taken via get_pmem_file,
- * the file should not be released until put_pmem_file is called */
-#define PMEM_FLAGS_BUSY 0x1
-/* indicates that this is a suballocation of a larger master range */
-#define PMEM_FLAGS_CONNECTED 0x1 << 1
-/* indicates this is a master and not a sub allocation and that it is mmaped */
-#define PMEM_FLAGS_MASTERMAP 0x1 << 2
-/* submap and unsubmap flags indicate:
- * 00: subregion has never been mmaped
- * 10: subregion has been mmaped, reference to the mm was taken
- * 11: subretion has ben released, refernece to the mm still held
- * 01: subretion has been released, reference to the mm has been released
- */
-#define PMEM_FLAGS_SUBMAP 0x1 << 3
-#define PMEM_FLAGS_UNSUBMAP 0x1 << 4
-
-
-struct pmem_data {
-        /* in alloc mode: an index into the bitmap
-         * in no_alloc mode: the size of the allocation */
-        int index;
-        /* see flags above for descriptions */
-        unsigned int flags;
-        /* protects this data field, if the mm_mmap sem will be held at the
-         * same time as this sem, the mm sem must be taken first (as this is
-         * the order for vma_open and vma_close ops */
-        struct rw_semaphore sem;
-        /* info about the mmaping process */
-        struct vm_area_struct *vma;
-        /* task struct of the mapping process */
-        struct task_struct *task;
-        /* process id of teh mapping process */
-        pid_t pid;
-        /* file descriptor of the master */
-        int master_fd;
-        /* file struct of the master */
-        struct file *master_file;
-        /* a list of currently available regions if this is a suballocation */
-        struct list_head region_list;
-        /* a linked list of data so we can access them for debugging */
-        struct list_head list;
-#if PMEM_DEBUG
-        int ref;
-#endif
-};
-
-struct pmem_bits {
-        unsigned allocated:1;           /* 1 if allocated, 0 if free */
-        unsigned order:7;               /* size of the region in pmem space */
-};
-
-struct pmem_region_node {
-        struct pmem_region region;
-        struct list_head list;
-};
-
-#define PMEM_DEBUG_MSGS 0
-#if PMEM_DEBUG_MSGS
-#define DLOG(fmt,args...) \
-        do { printk(KERN_INFO "[%s:%s:%d] "fmt, __FILE__, __func__, __LINE__, \
-                    ##args); } \
-        while (0)
-#else
-#define DLOG(x...) do {} while (0)
-#endif
-
-struct pmem_info {
-        struct miscdevice dev;
-        /* physical start address of the remaped pmem space */
-        unsigned long base;
-        /* vitual start address of the remaped pmem space */
-        unsigned char __iomem *vbase;
-        /* total size of the pmem space */
-        unsigned long size;
-        /* number of entries in the pmem space */
-        unsigned long num_entries;
-        /* pfn of the garbage page in memory */
-        unsigned long garbage_pfn;
-        /* index of the garbage page in the pmem space */
-        int garbage_index;
-        /* the bitmap for the region indicating which entries are allocated
-         * and which are free */
-        struct pmem_bits *bitmap;
-        /* indicates the region should not be managed with an allocator */
-        unsigned no_allocator;
-        /* indicates maps of this region should be cached, if a mix of
-         * cached and uncached is desired, set this and open the device with
-         * O_SYNC to get an uncached region */
-        unsigned cached;
-        unsigned buffered;
-        /* in no_allocator mode the first mapper gets the whole space and sets
-         * this flag */
-        unsigned allocated;
-        /* for debugging, creates a list of pmem file structs, the
-         * data_list_lock should be taken before pmem_data->sem if both are
-         * needed */
-        struct mutex data_list_lock;
-        struct list_head data_list;
-        /* pmem_sem protects the bitmap array
-         * a write lock should be held when modifying entries in bitmap
-         * a read lock should be held when reading data from bits or
-         * dereferencing a pointer into bitmap
-         *
-         * pmem_data->sem protects the pmem data of a particular file
-         * Many of the function that require the pmem_data->sem have a non-
-         * locking version for when the caller is already holding that sem.
-         *
-         * IF YOU TAKE BOTH LOCKS TAKE THEM IN THIS ORDER:
-         * down(pmem_data->sem) => down(bitmap_sem)
-         */
-        struct rw_semaphore bitmap_sem;
-
-        long (*ioctl)(struct file *, unsigned int, unsigned long);
-        int (*release)(struct inode *, struct file *);
-};
-
-static struct pmem_info pmem[PMEM_MAX_DEVICES];
-static int id_count;
-
-#define PMEM_IS_FREE(id, index) !(pmem[id].bitmap[index].allocated)
-#define PMEM_ORDER(id, index) pmem[id].bitmap[index].order
-#define PMEM_BUDDY_INDEX(id, index) (index ^ (1 << PMEM_ORDER(id, index)))
-#define PMEM_NEXT_INDEX(id, index) (index + (1 << PMEM_ORDER(id, index)))
-#define PMEM_OFFSET(index) (index * PMEM_MIN_ALLOC)
-#define PMEM_START_ADDR(id, index) (PMEM_OFFSET(index) + pmem[id].base)
-#define PMEM_LEN(id, index) ((1 << PMEM_ORDER(id, index)) * PMEM_MIN_ALLOC)
-#define PMEM_END_ADDR(id, index) (PMEM_START_ADDR(id, index) + \
-        PMEM_LEN(id, index))
-#define PMEM_START_VADDR(id, index) (PMEM_OFFSET(id, index) + pmem[id].vbase)
-#define PMEM_END_VADDR(id, index) (PMEM_START_VADDR(id, index) + \
-        PMEM_LEN(id, index))
-#define PMEM_REVOKED(data) (data->flags & PMEM_FLAGS_REVOKED)
-#define PMEM_IS_PAGE_ALIGNED(addr) (!((addr) & (~PAGE_MASK)))
-#define PMEM_IS_SUBMAP(data) ((data->flags & PMEM_FLAGS_SUBMAP) && \
-        (!(data->flags & PMEM_FLAGS_UNSUBMAP)))
-
-static int pmem_release(struct inode *, struct file *);
-static int pmem_mmap(struct file *, struct vm_area_struct *);
-static int pmem_open(struct inode *, struct file *);
-static long pmem_ioctl(struct file *, unsigned int, unsigned long);
-
-struct file_operations pmem_fops = {
-        .release = pmem_release,
-        .mmap = pmem_mmap,
-        .open = pmem_open,
-        .unlocked_ioctl = pmem_ioctl,
-};
-
-static int get_id(struct file *file)
-{
-        return MINOR(file->f_dentry->d_inode->i_rdev);
-}
-
-int is_pmem_file(struct file *file)
-{
-        int id;
-
-        if (unlikely(!file || !file->f_dentry || !file->f_dentry->d_inode))
-                return 0;
-        id = get_id(file);
-        if (unlikely(id >= PMEM_MAX_DEVICES))
-                return 0;
-        if (unlikely(file->f_dentry->d_inode->i_rdev !=
-             MKDEV(MISC_MAJOR, pmem[id].dev.minor)))
-                return 0;
-        return 1;
-}
-
-static int has_allocation(struct file *file)
-{
-        struct pmem_data *data;
-        /* check is_pmem_file first if not accessed via pmem_file_ops */
-
-        if (unlikely(!file->private_data))
-                return 0;
-        data = (struct pmem_data *)file->private_data;
-        if (unlikely(data->index < 0))
-                return 0;
-        return 1;
-}
-
-static int is_master_owner(struct file *file)
-{
-        struct file *master_file;
-        struct pmem_data *data;
-        int put_needed, ret = 0;
-
-        if (!is_pmem_file(file) || !has_allocation(file))
-                return 0;
-        data = (struct pmem_data *)file->private_data;
-        if (PMEM_FLAGS_MASTERMAP & data->flags)
-                return 1;
-        master_file = fget_light(data->master_fd, &put_needed);
-        if (master_file && data->master_file == master_file)
-                ret = 1;
-        fput_light(master_file, put_needed);
-        return ret;
-}
-
-static int pmem_free(int id, int index)
-{
-        /* caller should hold the write lock on pmem_sem! */
-        int buddy, curr = index;
-        DLOG("index %d\n", index);
-
-        if (pmem[id].no_allocator) {
-                pmem[id].allocated = 0;
-                return 0;
-        }
-        /* clean up the bitmap, merging any buddies */
-        pmem[id].bitmap[curr].allocated = 0;
-        /* find a slots buddy Buddy# = Slot# ^ (1 << order)
-         * if the buddy is also free merge them
-         * repeat until the buddy is not free or end of the bitmap is reached
-         */
-        do {
-                buddy = PMEM_BUDDY_INDEX(id, curr);
-                if (PMEM_IS_FREE(id, buddy) &&
-                                PMEM_ORDER(id, buddy) == PMEM_ORDER(id, curr)) {
-                        PMEM_ORDER(id, buddy)++;
-                        PMEM_ORDER(id, curr)++;
-                        curr = min(buddy, curr);
-                } else {
-                        break;
-                }
-        } while (curr < pmem[id].num_entries);
-
-        return 0;
-}
-
-static void pmem_revoke(struct file *file, struct pmem_data *data);
-
-static int pmem_release(struct inode *inode, struct file *file)
-{
-        struct pmem_data *data = (struct pmem_data *)file->private_data;
-        struct pmem_region_node *region_node;
-        struct list_head *elt, *elt2;
-        int id = get_id(file), ret = 0;
-
-
-        mutex_lock(&pmem[id].data_list_lock);
-        /* if this file is a master, revoke all the memory in the connected
-         *  files */
-        if (PMEM_FLAGS_MASTERMAP & data->flags) {
-                struct pmem_data *sub_data;
-                list_for_each(elt, &pmem[id].data_list) {
-                        sub_data = list_entry(elt, struct pmem_data, list);
-                        down_read(&sub_data->sem);
-                        if (PMEM_IS_SUBMAP(sub_data) &&
-                            file == sub_data->master_file) {
-                                up_read(&sub_data->sem);
-                                pmem_revoke(file, sub_data);
-                        }  else
-                                up_read(&sub_data->sem);
-                }
-        }
-        list_del(&data->list);
-        mutex_unlock(&pmem[id].data_list_lock);
-
-
-        down_write(&data->sem);
-
-        /* if its not a conencted file and it has an allocation, free it */
-        if (!(PMEM_FLAGS_CONNECTED & data->flags) && has_allocation(file)) {
-                down_write(&pmem[id].bitmap_sem);
-                ret = pmem_free(id, data->index);
-                up_write(&pmem[id].bitmap_sem);
-        }
-
-        /* if this file is a submap (mapped, connected file), downref the
-         * task struct */
-        if (PMEM_FLAGS_SUBMAP & data->flags)
-                if (data->task) {
-                        put_task_struct(data->task);
-                        data->task = NULL;
-                }
-
-        file->private_data = NULL;
-
-        list_for_each_safe(elt, elt2, &data->region_list) {
-                region_node = list_entry(elt, struct pmem_region_node, list);
-                list_del(elt);
-                kfree(region_node);
-        }
-        BUG_ON(!list_empty(&data->region_list));
-
-        up_write(&data->sem);
-        kfree(data);
-        if (pmem[id].release)
-                ret = pmem[id].release(inode, file);
-
-        return ret;
-}
-
-static int pmem_open(struct inode *inode, struct file *file)
-{
-        struct pmem_data *data;
-        int id = get_id(file);
-        int ret = 0;
-
-        DLOG("current %u file %p(%d)\n", current->pid, file, file_count(file));
-        /* setup file->private_data to indicate its unmapped */
-        /*  you can only open a pmem device one time */
-        if (file->private_data != NULL)
-                return -1;
-        data = kmalloc(sizeof(struct pmem_data), GFP_KERNEL);
-        if (!data) {
-                printk("pmem: unable to allocate memory for pmem metadata.");
-                return -1;
-        }
-        data->flags = 0;
-        data->index = -1;
-        data->task = NULL;
-        data->vma = NULL;
-        data->pid = 0;
-        data->master_file = NULL;
-#if PMEM_DEBUG
-        data->ref = 0;
-#endif
-        INIT_LIST_HEAD(&data->region_list);
-        init_rwsem(&data->sem);
-
-        file->private_data = data;
-        INIT_LIST_HEAD(&data->list);
-
-        mutex_lock(&pmem[id].data_list_lock);
-        list_add(&data->list, &pmem[id].data_list);
-        mutex_unlock(&pmem[id].data_list_lock);
-        return ret;
-}
-
-static unsigned long pmem_order(unsigned long len)
-{
-        int i;
-
-        len = (len + PMEM_MIN_ALLOC - 1)/PMEM_MIN_ALLOC;
-        len--;
-        for (i = 0; i < sizeof(len)*8; i++)
-                if (len >> i == 0)
-                        break;
-        return i;
-}
-
-static int pmem_allocate(int id, unsigned long len)
-{
-        /* caller should hold the write lock on pmem_sem! */
-        /* return the corresponding pdata[] entry */
-        int curr = 0;
-        int end = pmem[id].num_entries;
-        int best_fit = -1;
-        unsigned long order = pmem_order(len);
-
-        if (pmem[id].no_allocator) {
-                DLOG("no allocator");
-                if ((len > pmem[id].size) || pmem[id].allocated)
-                        return -1;
-                pmem[id].allocated = 1;
-                return len;
-        }
-
-        if (order > PMEM_MAX_ORDER)
-                return -1;
-        DLOG("order %lx\n", order);
-
-        /* look through the bitmap:
-         *      if you find a free slot of the correct order use it
-         *      otherwise, use the best fit (smallest with size > order) slot
-         */
-        while (curr < end) {
-                if (PMEM_IS_FREE(id, curr)) {
-                        if (PMEM_ORDER(id, curr) == (unsigned char)order) {
-                                /* set the not free bit and clear others */
-                                best_fit = curr;
-                                break;
-                        }
-                        if (PMEM_ORDER(id, curr) > (unsigned char)order &&
-                            (best_fit < 0 ||
-                             PMEM_ORDER(id, curr) < PMEM_ORDER(id, best_fit)))
-                                best_fit = curr;
-                }
-                curr = PMEM_NEXT_INDEX(id, curr);
-        }
-
-        /* if best_fit < 0, there are no suitable slots,
-         * return an error
-         */
-        if (best_fit < 0) {
-                printk("pmem: no space left to allocate!\n");
-                return -1;
-        }
-
-        /* now partition the best fit:
-         *      split the slot into 2 buddies of order - 1
-         *      repeat until the slot is of the correct order
-         */
-        while (PMEM_ORDER(id, best_fit) > (unsigned char)order) {
-                int buddy;
-                PMEM_ORDER(id, best_fit) -= 1;
-                buddy = PMEM_BUDDY_INDEX(id, best_fit);
-                PMEM_ORDER(id, buddy) = PMEM_ORDER(id, best_fit);
-        }
-        pmem[id].bitmap[best_fit].allocated = 1;
-        return best_fit;
-}
-
-static pgprot_t pmem_access_prot(struct file *file, pgprot_t vma_prot)
-{
-        int id = get_id(file);
-#ifdef pgprot_noncached
-        if (pmem[id].cached == 0 || file->f_flags & O_SYNC)
-                return pgprot_noncached(vma_prot);
-#endif
-#ifdef pgprot_ext_buffered
-        else if (pmem[id].buffered)
-                return pgprot_ext_buffered(vma_prot);
-#endif
-        return vma_prot;
-}
-
-static unsigned long pmem_start_addr(int id, struct pmem_data *data)
-{
-        if (pmem[id].no_allocator)
-                return PMEM_START_ADDR(id, 0);
-        else
-                return PMEM_START_ADDR(id, data->index);
-
-}
-
-static void *pmem_start_vaddr(int id, struct pmem_data *data)
-{
-        return pmem_start_addr(id, data) - pmem[id].base + pmem[id].vbase;
-}
-
-static unsigned long pmem_len(int id, struct pmem_data *data)
-{
-        if (pmem[id].no_allocator)
-                return data->index;
-        else
-                return PMEM_LEN(id, data->index);
-}
-
-static int pmem_map_garbage(int id, struct vm_area_struct *vma,
-                            struct pmem_data *data, unsigned long offset,
-                            unsigned long len)
-{
-        int i, garbage_pages = len >> PAGE_SHIFT;
-
-        vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP | VM_SHARED | VM_WRITE;
-        for (i = 0; i < garbage_pages; i++) {
-                if (vm_insert_pfn(vma, vma->vm_start + offset + (i * PAGE_SIZE),
-                    pmem[id].garbage_pfn))
-                        return -EAGAIN;
-        }
-        return 0;
-}
-
-static int pmem_unmap_pfn_range(int id, struct vm_area_struct *vma,
-                                struct pmem_data *data, unsigned long offset,
-                                unsigned long len)
-{
-        int garbage_pages;
-        DLOG("unmap offset %lx len %lx\n", offset, len);
-
-        BUG_ON(!PMEM_IS_PAGE_ALIGNED(len));
-
-        garbage_pages = len >> PAGE_SHIFT;
-        zap_page_range(vma, vma->vm_start + offset, len, NULL);
-        pmem_map_garbage(id, vma, data, offset, len);
-        return 0;
-}
-
-static int pmem_map_pfn_range(int id, struct vm_area_struct *vma,
-                              struct pmem_data *data, unsigned long offset,
-                              unsigned long len)
-{
-        DLOG("map offset %lx len %lx\n", offset, len);
-        BUG_ON(!PMEM_IS_PAGE_ALIGNED(vma->vm_start));
-        BUG_ON(!PMEM_IS_PAGE_ALIGNED(vma->vm_end));
-        BUG_ON(!PMEM_IS_PAGE_ALIGNED(len));
-        BUG_ON(!PMEM_IS_PAGE_ALIGNED(offset));
-
-        if (io_remap_pfn_range(vma, vma->vm_start + offset,
-                (pmem_start_addr(id, data) + offset) >> PAGE_SHIFT,
-                len, vma->vm_page_prot)) {
-                return -EAGAIN;
-        }
-        return 0;
-}
-
-static int pmem_remap_pfn_range(int id, struct vm_area_struct *vma,
-                              struct pmem_data *data, unsigned long offset,
-                              unsigned long len)
-{
-        /* hold the mm semp for the vma you are modifying when you call this */
-        BUG_ON(!vma);
-        zap_page_range(vma, vma->vm_start + offset, len, NULL);
-        return pmem_map_pfn_range(id, vma, data, offset, len);
-}
-
-static void pmem_vma_open(struct vm_area_struct *vma)
-{
-        struct file *file = vma->vm_file;
-        struct pmem_data *data = file->private_data;
-        int id = get_id(file);
-        /* this should never be called as we don't support copying pmem
-         * ranges via fork */
-        BUG_ON(!has_allocation(file));
-        down_write(&data->sem);
-        /* remap the garbage pages, forkers don't get access to the data */
-        pmem_unmap_pfn_range(id, vma, data, 0, vma->vm_start - vma->vm_end);
-        up_write(&data->sem);
-}
-
-static void pmem_vma_close(struct vm_area_struct *vma)
-{
-        struct file *file = vma->vm_file;
-        struct pmem_data *data = file->private_data;
-
-        DLOG("current %u ppid %u file %p count %d\n", current->pid,
-             current->parent->pid, file, file_count(file));
-        if (unlikely(!is_pmem_file(file) || !has_allocation(file))) {
-                printk(KERN_WARNING "pmem: something is very wrong, you are "
-                       "closing a vm backing an allocation that doesn't "
-                       "exist!\n");
-                return;
-        }
-        down_write(&data->sem);
-        if (data->vma == vma) {
-                data->vma = NULL;
-                if ((data->flags & PMEM_FLAGS_CONNECTED) &&
-                    (data->flags & PMEM_FLAGS_SUBMAP))
-                        data->flags |= PMEM_FLAGS_UNSUBMAP;
-        }
-        /* the kernel is going to free this vma now anyway */
-        up_write(&data->sem);
-}
-
-static struct vm_operations_struct vm_ops = {
-        .open = pmem_vma_open,
-        .close = pmem_vma_close,
-};
-
-static int pmem_mmap(struct file *file, struct vm_area_struct *vma)
-{
-        struct pmem_data *data;
-        int index;
-        unsigned long vma_size =  vma->vm_end - vma->vm_start;
-        int ret = 0, id = get_id(file);
-
-        if (vma->vm_pgoff || !PMEM_IS_PAGE_ALIGNED(vma_size)) {
-#if PMEM_DEBUG
-                printk(KERN_ERR "pmem: mmaps must be at offset zero, aligned"
-                                " and a multiple of pages_size.\n");
-#endif
-                return -EINVAL;
-        }
-
-        data = (struct pmem_data *)file->private_data;
-        down_write(&data->sem);
-        /* check this file isn't already mmaped, for submaps check this file
-         * has never been mmaped */
-        if ((data->flags & PMEM_FLAGS_SUBMAP) ||
-            (data->flags & PMEM_FLAGS_UNSUBMAP)) {
-#if PMEM_DEBUG
-                printk(KERN_ERR "pmem: you can only mmap a pmem file once, "
-                       "this file is already mmaped. %x\n", data->flags);
-#endif
-                ret = -EINVAL;
-                goto error;
-        }
-        /* if file->private_data == unalloced, alloc*/
-        if (data && data->index == -1) {
-                down_write(&pmem[id].bitmap_sem);
-                index = pmem_allocate(id, vma->vm_end - vma->vm_start);
-                up_write(&pmem[id].bitmap_sem);
-                data->index = index;
-        }
-        /* either no space was available or an error occured */
-        if (!has_allocation(file)) {
-                ret = -EINVAL;
-                printk("pmem: could not find allocation for map.\n");
-                goto error;
-        }
-
-        if (pmem_len(id, data) < vma_size) {
-#if PMEM_DEBUG
-                printk(KERN_WARNING "pmem: mmap size [%lu] does not match"
-                       "size of backing region [%lu].\n", vma_size,
-                       pmem_len(id, data));
-#endif
-                ret = -EINVAL;
-                goto error;
-        }
-
-        vma->vm_pgoff = pmem_start_addr(id, data) >> PAGE_SHIFT;
-        vma->vm_page_prot = pmem_access_prot(file, vma->vm_page_prot);
-
-        if (data->flags & PMEM_FLAGS_CONNECTED) {
-                struct pmem_region_node *region_node;
-                struct list_head *elt;
-                if (pmem_map_garbage(id, vma, data, 0, vma_size)) {
-                        printk("pmem: mmap failed in kernel!\n");
-                        ret = -EAGAIN;
-                        goto error;
-                }
-                list_for_each(elt, &data->region_list) {
-                        region_node = list_entry(elt, struct pmem_region_node,
-                                                 list);
-                        DLOG("remapping file: %p %lx %lx\n", file,
-                                region_node->region.offset,
-                                region_node->region.len);
-                        if (pmem_remap_pfn_range(id, vma, data,
-                                                 region_node->region.offset,
-                                                 region_node->region.len)) {
-                                ret = -EAGAIN;
-                                goto error;
-                        }
-                }
-                data->flags |= PMEM_FLAGS_SUBMAP;
-                get_task_struct(current->group_leader);
-                data->task = current->group_leader;
-                data->vma = vma;
-#if PMEM_DEBUG
-                data->pid = current->pid;
-#endif
-                DLOG("submmapped file %p vma %p pid %u\n", file, vma,
-                     current->pid);
-        } else {
-                if (pmem_map_pfn_range(id, vma, data, 0, vma_size)) {
-                        printk(KERN_INFO "pmem: mmap failed in kernel!\n");
-                        ret = -EAGAIN;
-                        goto error;
-                }
-                data->flags |= PMEM_FLAGS_MASTERMAP;
-                data->pid = current->pid;
-        }
-        vma->vm_ops = &vm_ops;
-error:
-        up_write(&data->sem);
-        return ret;
-}
-
-/* the following are the api for accessing pmem regions by other drivers
- * from inside the kernel */
-int get_pmem_user_addr(struct file *file, unsigned long *start,
-                   unsigned long *len)
-{
-        struct pmem_data *data;
-        if (!is_pmem_file(file) || !has_allocation(file)) {
-#if PMEM_DEBUG
-                printk(KERN_INFO "pmem: requested pmem data from invalid"
-                                  "file.\n");
-#endif
-                return -1;
-        }
-        data = (struct pmem_data *)file->private_data;
-        down_read(&data->sem);
-        if (data->vma) {
-                *start = data->vma->vm_start;
-                *len = data->vma->vm_end - data->vma->vm_start;
-        } else {
-                *start = 0;
-                *len = 0;
-        }
-        up_read(&data->sem);
-        return 0;
-}
-
-int get_pmem_addr(struct file *file, unsigned long *start,
-                  unsigned long *vstart, unsigned long *len)
-{
-        struct pmem_data *data;
-        int id;
-
-        if (!is_pmem_file(file) || !has_allocation(file)) {
-                return -1;
-        }
-
-        data = (struct pmem_data *)file->private_data;
-        if (data->index == -1) {
-#if PMEM_DEBUG
-                printk(KERN_INFO "pmem: requested pmem data from file with no "
-                       "allocation.\n");
-                return -1;
-#endif
-        }
-        id = get_id(file);
-
-        down_read(&data->sem);
-        *start = pmem_start_addr(id, data);
-        *len = pmem_len(id, data);
-        *vstart = (unsigned long)pmem_start_vaddr(id, data);
-        up_read(&data->sem);
-#if PMEM_DEBUG
-        down_write(&data->sem);
-        data->ref++;
-        up_write(&data->sem);
-#endif
-        return 0;
-}
-
-int get_pmem_file(int fd, unsigned long *start, unsigned long *vstart,
-                  unsigned long *len, struct file **filp)
-{
-        struct file *file;
-
-        file = fget(fd);
-        if (unlikely(file == NULL)) {
-                printk(KERN_INFO "pmem: requested data from file descriptor "
-                       "that doesn't exist.");
-                return -1;
-        }
-
-        if (get_pmem_addr(file, start, vstart, len))
-                goto end;
-
-        if (filp)
-                *filp = file;
-        return 0;
-end:
-        fput(file);
-        return -1;
-}
-
-void put_pmem_file(struct file *file)
-{
-        struct pmem_data *data;
-        int id;
-
-        if (!is_pmem_file(file))
-                return;
-        id = get_id(file);
-        data = (struct pmem_data *)file->private_data;
-#if PMEM_DEBUG
-        down_write(&data->sem);
-        if (data->ref == 0) {
-                printk("pmem: pmem_put > pmem_get %s (pid %d)\n",
-                       pmem[id].dev.name, data->pid);
-                BUG();
-        }
-        data->ref--;
-        up_write(&data->sem);
-#endif
-        fput(file);
-}
-
-void flush_pmem_file(struct file *file, unsigned long offset, unsigned long len)
-{
-        struct pmem_data *data;
-        int id;
-        void *vaddr;
-        struct pmem_region_node *region_node;
-        struct list_head *elt;
-        void *flush_start, *flush_end;
-
-        if (!is_pmem_file(file) || !has_allocation(file)) {
-                return;
-        }
-
-        id = get_id(file);
-        data = (struct pmem_data *)file->private_data;
-        if (!pmem[id].cached || file->f_flags & O_SYNC)
-                return;
-
-        down_read(&data->sem);
-        vaddr = pmem_start_vaddr(id, data);
-        /* if this isn't a submmapped file, flush the whole thing */
-        if (unlikely(!(data->flags & PMEM_FLAGS_CONNECTED))) {
-                dmac_flush_range(vaddr, vaddr + pmem_len(id, data));
-                goto end;
-        }
-        /* otherwise, flush the region of the file we are drawing */
-        list_for_each(elt, &data->region_list) {
-                region_node = list_entry(elt, struct pmem_region_node, list);
-                if ((offset >= region_node->region.offset) &&
-                    ((offset + len) <= (region_node->region.offset +
-                        region_node->region.len))) {
-                        flush_start = vaddr + region_node->region.offset;
-                        flush_end = flush_start + region_node->region.len;
-                        dmac_flush_range(flush_start, flush_end);
-                        break;
-                }
-        }
-end:
-        up_read(&data->sem);
-}
-
-static int pmem_connect(unsigned long connect, struct file *file)
-{
-        struct pmem_data *data = (struct pmem_data *)file->private_data;
-        struct pmem_data *src_data;
-        struct file *src_file;
-        int ret = 0, put_needed;
-
-        down_write(&data->sem);
-        /* retrieve the src file and check it is a pmem file with an alloc */
-        src_file = fget_light(connect, &put_needed);
-        DLOG("connect %p to %p\n", file, src_file);
-        if (!src_file) {
-                printk("pmem: src file not found!\n");
-                ret = -EINVAL;
-                goto err_no_file;
-        }
-        if (unlikely(!is_pmem_file(src_file) || !has_allocation(src_file))) {
-                printk(KERN_INFO "pmem: src file is not a pmem file or has no "
-                       "alloc!\n");
-                ret = -EINVAL;
-                goto err_bad_file;
-        }
-        src_data = (struct pmem_data *)src_file->private_data;
-
-        if (has_allocation(file) && (data->index != src_data->index)) {
-                printk("pmem: file is already mapped but doesn't match this"
-                       " src_file!\n");
-                ret = -EINVAL;
-                goto err_bad_file;
-        }
-        data->index = src_data->index;
-        data->flags |= PMEM_FLAGS_CONNECTED;
-        data->master_fd = connect;
-        data->master_file = src_file;
-
-err_bad_file:
-        fput_light(src_file, put_needed);
-err_no_file:
-        up_write(&data->sem);
-        return ret;
-}
-
-static void pmem_unlock_data_and_mm(struct pmem_data *data,
-                                    struct mm_struct *mm)
-{
-        up_write(&data->sem);
-        if (mm != NULL) {
-                up_write(&mm->mmap_sem);
-                mmput(mm);
-        }
-}
-
-static int pmem_lock_data_and_mm(struct file *file, struct pmem_data *data,
-                                 struct mm_struct **locked_mm)
-{
-        int ret = 0;
-        struct mm_struct *mm = NULL;
-        *locked_mm = NULL;
-lock_mm:
-        down_read(&data->sem);
-        if (PMEM_IS_SUBMAP(data)) {
-                mm = get_task_mm(data->task);
-                if (!mm) {
-#if PMEM_DEBUG
-                        printk("pmem: can't remap task is gone!\n");
-#endif
-                        up_read(&data->sem);
-                        return -1;
-                }
-        }
-        up_read(&data->sem);
-
-        if (mm)
-                down_write(&mm->mmap_sem);
-
-        down_write(&data->sem);
-        /* check that the file didn't get mmaped before we could take the
-         * data sem, this should be safe b/c you can only submap each file
-         * once */
-        if (PMEM_IS_SUBMAP(data) && !mm) {
-                pmem_unlock_data_and_mm(data, mm);
-                up_write(&data->sem);
-                goto lock_mm;
-        }
-        /* now check that vma.mm is still there, it could have been
-         * deleted by vma_close before we could get the data->sem */
-        if ((data->flags & PMEM_FLAGS_UNSUBMAP) && (mm != NULL)) {
-                /* might as well release this */
-                if (data->flags & PMEM_FLAGS_SUBMAP) {
-                        put_task_struct(data->task);
-                        data->task = NULL;
-                        /* lower the submap flag to show the mm is gone */
-                        data->flags &= ~(PMEM_FLAGS_SUBMAP);
-                }
-                pmem_unlock_data_and_mm(data, mm);
-                return -1;
-        }
-        *locked_mm = mm;
-        return ret;
-}
-
-int pmem_remap(struct pmem_region *region, struct file *file,
-                      unsigned operation)
-{
-        int ret;
-        struct pmem_region_node *region_node;
-        struct mm_struct *mm = NULL;
-        struct list_head *elt, *elt2;
-        int id = get_id(file);
-        struct pmem_data *data = (struct pmem_data *)file->private_data;
-
-        /* pmem region must be aligned on a page boundry */
-        if (unlikely(!PMEM_IS_PAGE_ALIGNED(region->offset) ||
-                 !PMEM_IS_PAGE_ALIGNED(region->len))) {
-#if PMEM_DEBUG
-                printk("pmem: request for unaligned pmem suballocation "
-                       "%lx %lx\n", region->offset, region->len);
-#endif
-                return -EINVAL;
-        }
-
-        /* if userspace requests a region of len 0, there's nothing to do */
-        if (region->len == 0)
-                return 0;
-
-        /* lock the mm and data */
-        ret = pmem_lock_data_and_mm(file, data, &mm);
-        if (ret)
-                return 0;
-
-        /* only the owner of the master file can remap the client fds
-         * that back in it */
-        if (!is_master_owner(file)) {
-#if PMEM_DEBUG
-                printk("pmem: remap requested from non-master process\n");
-#endif
-                ret = -EINVAL;
-                goto err;
-        }
-
-        /* check that the requested range is within the src allocation */
-        if (unlikely((region->offset > pmem_len(id, data)) ||
-                     (region->len > pmem_len(id, data)) ||
-                     (region->offset + region->len > pmem_len(id, data)))) {
-#if PMEM_DEBUG
-                printk(KERN_INFO "pmem: suballoc doesn't fit in src_file!\n");
-#endif
-                ret = -EINVAL;
-                goto err;
-        }
-
-        if (operation == PMEM_MAP) {
-                region_node = kmalloc(sizeof(struct pmem_region_node),
-                              GFP_KERNEL);
-                if (!region_node) {
-                        ret = -ENOMEM;
-#if PMEM_DEBUG
-                        printk(KERN_INFO "No space to allocate metadata!");
-#endif
-                        goto err;
-                }
-                region_node->region = *region;
-                list_add(&region_node->list, &data->region_list);
-        } else if (operation == PMEM_UNMAP) {
-                int found = 0;
-                list_for_each_safe(elt, elt2, &data->region_list) {
-                        region_node = list_entry(elt, struct pmem_region_node,
-                                      list);
-                        if (region->len == 0 ||
-                            (region_node->region.offset == region->offset &&
-                            region_node->region.len == region->len)) {
-                                list_del(elt);
-                                kfree(region_node);
-                                found = 1;
-                        }
-                }
-                if (!found) {
-#if PMEM_DEBUG
-                        printk("pmem: Unmap region does not map any mapped "
-                                "region!");
-#endif
-                        ret = -EINVAL;
-                        goto err;
-                }
-        }
-
-        if (data->vma && PMEM_IS_SUBMAP(data)) {
-                if (operation == PMEM_MAP)
-                        ret = pmem_remap_pfn_range(id, data->vma, data,
-                                                   region->offset, region->len);
-                else if (operation == PMEM_UNMAP)
-                        ret = pmem_unmap_pfn_range(id, data->vma, data,
-                                                   region->offset, region->len);
-        }
-
-err:
-        pmem_unlock_data_and_mm(data, mm);
-        return ret;
-}
-
-static void pmem_revoke(struct file *file, struct pmem_data *data)
-{
-        struct pmem_region_node *region_node;
-        struct list_head *elt, *elt2;
-        struct mm_struct *mm = NULL;
-        int id = get_id(file);
-        int ret = 0;
-
-        data->master_file = NULL;
-        ret = pmem_lock_data_and_mm(file, data, &mm);
-        /* if lock_data_and_mm fails either the task that mapped the fd, or
-         * the vma that mapped it have already gone away, nothing more
-         * needs to be done */
-        if (ret)
-                return;
-        /* unmap everything */
-        /* delete the regions and region list nothing is mapped any more */
-        if (data->vma)
-                list_for_each_safe(elt, elt2, &data->region_list) {
-                        region_node = list_entry(elt, struct pmem_region_node,
-                                                 list);
-                        pmem_unmap_pfn_range(id, data->vma, data,
-                                             region_node->region.offset,
-                                             region_node->region.len);
-                        list_del(elt);
-                        kfree(region_node);
-        }
-        /* delete the master file */
-        pmem_unlock_data_and_mm(data, mm);
-}
-
-static void pmem_get_size(struct pmem_region *region, struct file *file)
-{
-        struct pmem_data *data = (struct pmem_data *)file->private_data;
-        int id = get_id(file);
-
-        if (!has_allocation(file)) {
-                region->offset = 0;
-                region->len = 0;
-                return;
-        } else {
-                region->offset = pmem_start_addr(id, data);
-                region->len = pmem_len(id, data);
-        }
-        DLOG("offset %lx len %lx\n", region->offset, region->len);
-}
-
-
-static long pmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-{
-        struct pmem_data *data;
-        int id = get_id(file);
-
-        switch (cmd) {
-        case PMEM_GET_PHYS:
-                {
-                        struct pmem_region region;
-                        DLOG("get_phys\n");
-                        if (!has_allocation(file)) {
-                                region.offset = 0;
-                                region.len = 0;
-                        } else {
-                                data = (struct pmem_data *)file->private_data;
-                                region.offset = pmem_start_addr(id, data);
-                                region.len = pmem_len(id, data);
-                        }
-                        printk(KERN_INFO "pmem: request for physical address of pmem region "
-                                        "from process %d.\n", current->pid);
-                        if (copy_to_user((void __user *)arg, &region,
-                                                sizeof(struct pmem_region)))
-                                return -EFAULT;
-                        break;
-                }
-        case PMEM_MAP:
-                {
-                        struct pmem_region region;
-                        if (copy_from_user(&region, (void __user *)arg,
-                                                sizeof(struct pmem_region)))
-                                return -EFAULT;
-                        data = (struct pmem_data *)file->private_data;
-                        return pmem_remap(&region, file, PMEM_MAP);
-                }
-                break;
-        case PMEM_UNMAP:
-                {
-                        struct pmem_region region;
-                        if (copy_from_user(&region, (void __user *)arg,
-                                                sizeof(struct pmem_region)))
-                                return -EFAULT;
-                        data = (struct pmem_data *)file->private_data;
-                        return pmem_remap(&region, file, PMEM_UNMAP);
-                        break;
-                }
-        case PMEM_GET_SIZE:
-                {
-                        struct pmem_region region;
-                        DLOG("get_size\n");
-                        pmem_get_size(&region, file);
-                        if (copy_to_user((void __user *)arg, &region,
-                                                sizeof(struct pmem_region)))
-                                return -EFAULT;
-                        break;
-                }
-        case PMEM_GET_TOTAL_SIZE:
-                {
-                        struct pmem_region region;
-                        DLOG("get total size\n");
-                        region.offset = 0;
-                        get_id(file);
-                        region.len = pmem[id].size;
-                        if (copy_to_user((void __user *)arg, &region,
-                                                sizeof(struct pmem_region)))
-                                return -EFAULT;
-                        break;
-                }
-        case PMEM_ALLOCATE:
-                {
-                        if (has_allocation(file))
-                                return -EINVAL;
-                        data = (struct pmem_data *)file->private_data;
-                        data->index = pmem_allocate(id, arg);
-                        break;
-                }
-        case PMEM_CONNECT:
-                DLOG("connect\n");
-                return pmem_connect(arg, file);
-                break;
-        case PMEM_CACHE_FLUSH:
-                {
-                        struct pmem_region region;
-                        DLOG("flush\n");
-                        if (copy_from_user(&region, (void __user *)arg,
-                                           sizeof(struct pmem_region)))
-                                return -EFAULT;
-                        flush_pmem_file(file, region.offset, region.len);
-                        break;
-                }
-        default:
-                if (pmem[id].ioctl)
-                        return pmem[id].ioctl(file, cmd, arg);
-                return -EINVAL;
-        }
-        return 0;
-}
-
-#if PMEM_DEBUG
-static ssize_t debug_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
-static ssize_t debug_read(struct file *file, char __user *buf, size_t count,
-                          loff_t *ppos)
-{
-        struct list_head *elt, *elt2;
-        struct pmem_data *data;
-        struct pmem_region_node *region_node;
-        int id = (int)file->private_data;
-        const int debug_bufmax = 4096;
-        static char buffer[4096];
-        int n = 0;
-
-        DLOG("debug open\n");
-        n = scnprintf(buffer, debug_bufmax,
-                      "pid #: mapped regions (offset, len) (offset,len)...\n");
-
-        mutex_lock(&pmem[id].data_list_lock);
-        list_for_each(elt, &pmem[id].data_list) {
-                data = list_entry(elt, struct pmem_data, list);
-                down_read(&data->sem);
-                n += scnprintf(buffer + n, debug_bufmax - n, "pid %u:",
-                                data->pid);
-                list_for_each(elt2, &data->region_list) {
-                        region_node = list_entry(elt2, struct pmem_region_node,
-                                      list);
-                        n += scnprintf(buffer + n, debug_bufmax - n,
-                                        "(%lx,%lx) ",
-                                        region_node->region.offset,
-                                        region_node->region.len);
-                }
-                n += scnprintf(buffer + n, debug_bufmax - n, "\n");
-                up_read(&data->sem);
-        }
-        mutex_unlock(&pmem[id].data_list_lock);
-
-        n++;
-        buffer[n] = 0;
-        return simple_read_from_buffer(buf, count, ppos, buffer, n);
-}
-
-static struct file_operations debug_fops = {
-        .read = debug_read,
-        .open = debug_open,
-};
-#endif
-
-#if 0
-static struct miscdevice pmem_dev = {
-        .name = "pmem",
-        .fops = &pmem_fops,
-};
-#endif
-
-int pmem_setup(struct android_pmem_platform_data *pdata,
-               long (*ioctl)(struct file *, unsigned int, unsigned long),
-               int (*release)(struct inode *, struct file *))
-{
-        int err = 0;
-        int i, index = 0;
-        int id = id_count;
-        id_count++;
-
-        pmem[id].no_allocator = pdata->no_allocator;
-        pmem[id].cached = pdata->cached;
-        pmem[id].buffered = pdata->buffered;
-        pmem[id].base = pdata->start;
-        pmem[id].size = pdata->size;
-        pmem[id].ioctl = ioctl;
-        pmem[id].release = release;
-        init_rwsem(&pmem[id].bitmap_sem);
-        mutex_init(&pmem[id].data_list_lock);
-        INIT_LIST_HEAD(&pmem[id].data_list);
-        pmem[id].dev.name = pdata->name;
-        pmem[id].dev.minor = id;
-        pmem[id].dev.fops = &pmem_fops;
-        printk(KERN_INFO "%s: %d init\n", pdata->name, pdata->cached);
-
-        err = misc_register(&pmem[id].dev);
-        if (err) {
-                printk(KERN_ALERT "Unable to register pmem driver!\n");
-                goto err_cant_register_device;
-        }
-        pmem[id].num_entries = pmem[id].size / PMEM_MIN_ALLOC;
-
-        pmem[id].bitmap = kmalloc(pmem[id].num_entries *
-                                  sizeof(struct pmem_bits), GFP_KERNEL);
-        if (!pmem[id].bitmap)
-                goto err_no_mem_for_metadata;
-
-        memset(pmem[id].bitmap, 0, sizeof(struct pmem_bits) *
-                                          pmem[id].num_entries);
-
-        for (i = sizeof(pmem[id].num_entries) * 8 - 1; i >= 0; i--) {
-                if ((pmem[id].num_entries) &  1<<i) {
-                        PMEM_ORDER(id, index) = i;
-                        index = PMEM_NEXT_INDEX(id, index);
-                }
-        }
-
-        if (pmem[id].cached)
-                pmem[id].vbase = ioremap_cached(pmem[id].base,
-                                                pmem[id].size);
-#ifdef ioremap_ext_buffered
-        else if (pmem[id].buffered)
-                pmem[id].vbase = ioremap_ext_buffered(pmem[id].base,
-                                                      pmem[id].size);
-#endif
-        else
-                pmem[id].vbase = ioremap(pmem[id].base, pmem[id].size);
-
-        if (pmem[id].vbase == 0)
-                goto error_cant_remap;
-
-        pmem[id].garbage_pfn = page_to_pfn(alloc_page(GFP_KERNEL));
-        if (pmem[id].no_allocator)
-                pmem[id].allocated = 0;
-
-#if PMEM_DEBUG
-        debugfs_create_file(pdata->name, S_IFREG | S_IRUGO, NULL, (void *)id,
-                            &debug_fops);
-#endif
-        return 0;
-error_cant_remap:
-        kfree(pmem[id].bitmap);
-err_no_mem_for_metadata:
-        misc_deregister(&pmem[id].dev);
-err_cant_register_device:
-        return -1;
-}
-
-static int pmem_probe(struct platform_device *pdev)
-{
-        struct android_pmem_platform_data *pdata;
-
-        if (!pdev || !pdev->dev.platform_data) {
-                printk(KERN_ALERT "Unable to probe pmem!\n");
-                return -1;
-        }
-        pdata = pdev->dev.platform_data;
-        return pmem_setup(pdata, NULL, NULL);
-}
-
-
-static int pmem_remove(struct platform_device *pdev)
-{
-        int id = pdev->id;
-        __free_page(pfn_to_page(pmem[id].garbage_pfn));
-        misc_deregister(&pmem[id].dev);
-        return 0;
-}
-
-static struct platform_driver pmem_driver = {
-        .probe = pmem_probe,
-        .remove = pmem_remove,
-        .driver = { .name = "android_pmem" }
-};
-
-
-static int __init pmem_init(void)
-{
-        return platform_driver_register(&pmem_driver);
-}
-
-static void __exit pmem_exit(void)
-{
-        platform_driver_unregister(&pmem_driver);
-}
-
-module_init(pmem_init);
-module_exit(pmem_exit);
-
diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c
index e77e4e0396cf..1df9586f2730 100644
--- a/drivers/staging/asus_oled/asus_oled.c
+++ b/drivers/staging/asus_oled/asus_oled.c
@@ -355,7 +355,14 @@ static void send_data(struct asus_oled_dev *odev)
 
 static int append_values(struct asus_oled_dev *odev, uint8_t val, size_t count)
 {
-        while (count-- > 0 && val) {
+        odev->last_val = val;
+
+        if (val == 0) {
+                odev->buf_offs += count;
+                return 0;
+        }
+
+        while (count-- > 0) {
                 size_t x = odev->buf_offs % odev->width;
                 size_t y = odev->buf_offs / odev->width;
                 size_t i;
@@ -406,7 +413,6 @@ static int append_values(struct asus_oled_dev *odev, uint8_t val, size_t count)
                         ;
                 }
 
-                odev->last_val = val;
                 odev->buf_offs++;
         }
 
@@ -805,10 +811,9 @@ error:
 
 static void __exit asus_oled_exit(void)
 {
+        usb_deregister(&oled_driver);
         class_remove_file(oled_class, &class_attr_version.attr);
         class_destroy(oled_class);
-
-        usb_deregister(&oled_driver);
 }
 
 module_init(asus_oled_init);
diff --git a/drivers/staging/gma500/Kconfig b/drivers/staging/gma500/Kconfig
deleted file mode 100644
index c7a2b3bc0a18..000000000000
--- a/drivers/staging/gma500/Kconfig
+++ /dev/null
@@ -1,33 +0,0 @@
-config DRM_PSB
-        tristate "Intel GMA5/600 KMS Framebuffer"
-        depends on DRM && PCI && X86 && BROKEN
-        select FB_CFB_COPYAREA
-        select FB_CFB_FILLRECT
-        select FB_CFB_IMAGEBLIT
-        select DRM_KMS_HELPER
-        select DRM_TTM
-        help
-          Say yes for an experimental 2D KMS framebuffer driver for the
-          Intel GMA500 ('Poulsbo') and other Intel IMG based graphics
-          devices.
-
-config DRM_PSB_MRST
-        bool "Intel GMA600 support (Experimental)"
-        depends on DRM_PSB
-        help
-          Say yes to include support for GMA600 (Intel Moorestown/Oaktrail)
-          platforms with LVDS ports. HDMI and MIPI are not currently
-          supported.
-
-config DRM_PSB_MFLD
-        bool "Intel Medfield support (Experimental)"
-        depends on DRM_PSB
-        help
-          Say yes to include support for Intel Medfield platforms with MIPI
-          interfaces.
-        
-config DRM_PSB_CDV
-        bool "Intel Cedarview support (Experimental)"
-        depends on DRM_PSB
-        help
-          Say yes to include support for Intel Cedarview platforms
diff --git a/drivers/staging/gma500/Makefile b/drivers/staging/gma500/Makefile
deleted file mode 100644
index c729868b1b10..000000000000
--- a/drivers/staging/gma500/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#       KMS driver for the GMA500
-#
-ccflags-y += -Iinclude/drm
-
-psb_gfx-y += gem_glue.o \
-          accel_2d.o \
-          backlight.o \
-          framebuffer.o \
-          gem.o \
-          gtt.o \
-          intel_bios.o \
-          intel_i2c.o \
-          intel_opregion.o \
-          mmu.o \
-          power.o \
-          psb_drv.o \
-          psb_intel_display.o \
-          psb_intel_lvds.o \
-          psb_intel_modes.o \
-          psb_intel_sdvo.o \
-          psb_lid.o \
-          psb_irq.o \
-          psb_device.o \
-          mid_bios.o
-
-psb_gfx-$(CONFIG_DRM_PSB_CDV) +=  cdv_device.o \
-          cdv_intel_crt.o \
-          cdv_intel_display.o \
-          cdv_intel_hdmi.o \
-          cdv_intel_lvds.o
-
-psb_gfx-$(CONFIG_DRM_PSB_MRST) += mrst_device.o \
-          mrst_crtc.o \
-          mrst_lvds.o \
-          mrst_hdmi.o \
-          mrst_hdmi_i2c.o
-
-psb_gfx-$(CONFIG_DRM_PSB_MFLD) += mdfld_device.o \
-          mdfld_output.o \
-          mdfld_pyr_cmd.o \
-          mdfld_tmd_vid.o \
-          mdfld_tpo_cmd.o \
-          mdfld_tpo_vid.o \
-          mdfld_dsi_pkg_sender.o \
-          mdfld_dsi_dpi.o \
-          mdfld_dsi_output.o \
-          mdfld_dsi_dbi.o \
-          mdfld_dsi_dbi_dpu.o \
-          mdfld_intel_display.o
-
-obj-$(CONFIG_DRM_PSB) += psb_gfx.o
diff --git a/drivers/staging/gma500/TODO b/drivers/staging/gma500/TODO
deleted file mode 100644
index fc836158e74c..000000000000
--- a/drivers/staging/gma500/TODO
+++ /dev/null
@@ -1,15 +0,0 @@
--       Sort out the power management side. Not important for Poulsbo but
-        matters for Moorestown/Medfield
--       Debug Oaktrail/Moorestown support (single pipe, no BIOS on mrst,
-                                        some other differences)
--       Add 2D acceleration via console and DRM
--       Add scrolling acceleration using the GTT to do remapping on the main
-        framebuffer.
--       HDMI testing
--       Oaktrail HDMI and other features
--       Oaktrail MIPI
--       Medfield needs a lot of further love
-
-As per kernel policy and the in the interest of the safety of various
-kittens there is no support or plans to add hooks for the closed user space
-stuff.
diff --git a/drivers/staging/gma500/accel_2d.c b/drivers/staging/gma500/accel_2d.c
deleted file mode 100644
index b8f78ebbb145..000000000000
--- a/drivers/staging/gma500/accel_2d.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2007-2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
- * develop this driver.
- *
- **************************************************************************/
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/console.h>
-
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include <drm/drm_crtc.h>
-
-#include "psb_drv.h"
-#include "psb_reg.h"
-#include "framebuffer.h"
-
-/**
- *      psb_spank               -       reset the 2D engine
- *      @dev_priv: our PSB DRM device
- *
- *      Soft reset the graphics engine and then reload the necessary registers.
- *      We use this at initialisation time but it will become relevant for
- *      accelerated X later
- */
-void psb_spank(struct drm_psb_private *dev_priv)
-{
-        PSB_WSGX32(_PSB_CS_RESET_BIF_RESET | _PSB_CS_RESET_DPM_RESET |
-                _PSB_CS_RESET_TA_RESET | _PSB_CS_RESET_USE_RESET |
-                _PSB_CS_RESET_ISP_RESET | _PSB_CS_RESET_TSP_RESET |
-                _PSB_CS_RESET_TWOD_RESET, PSB_CR_SOFT_RESET);
-        PSB_RSGX32(PSB_CR_SOFT_RESET);
-
-        msleep(1);
-
-        PSB_WSGX32(0, PSB_CR_SOFT_RESET);
-        wmb();
-        PSB_WSGX32(PSB_RSGX32(PSB_CR_BIF_CTRL) | _PSB_CB_CTRL_CLEAR_FAULT,
-                   PSB_CR_BIF_CTRL);
-        wmb();
-        (void) PSB_RSGX32(PSB_CR_BIF_CTRL);
-
-        msleep(1);
-        PSB_WSGX32(PSB_RSGX32(PSB_CR_BIF_CTRL) & ~_PSB_CB_CTRL_CLEAR_FAULT,
-                   PSB_CR_BIF_CTRL);
-        (void) PSB_RSGX32(PSB_CR_BIF_CTRL);
-        PSB_WSGX32(dev_priv->gtt.gatt_start, PSB_CR_BIF_TWOD_REQ_BASE);
-}
-
-/**
- *      psb2_2d_wait_available  -       wait for FIFO room
- *      @dev_priv: our DRM device
- *      @size: size (in dwords) of the command we want to issue
- *
- *      Wait until there is room to load the FIFO with our data. If the
- *      device is not responding then reset it
- */
-static int psb_2d_wait_available(struct drm_psb_private *dev_priv,
-                          unsigned size)
-{
-        uint32_t avail = PSB_RSGX32(PSB_CR_2D_SOCIF);
-        unsigned long t = jiffies + HZ;
-
-        while (avail < size) {
-                avail = PSB_RSGX32(PSB_CR_2D_SOCIF);
-                if (time_after(jiffies, t)) {
-                        psb_spank(dev_priv);
-                        return -EIO;
-                }
-        }
-        return 0;
-}
-
-/**
- *      psb_2d_submit           -       submit a 2D command
- *      @dev_priv: our DRM device
- *      @cmdbuf: command to issue
- *      @size: length (in dwords)
- *
- *      Issue one or more 2D commands to the accelerator. This needs to be
- *      serialized later when we add the GEM interfaces for acceleration
- */
-static int psbfb_2d_submit(struct drm_psb_private *dev_priv, uint32_t *cmdbuf,
-                                                                unsigned size)
-{
-        int ret = 0;
-        int i;
-        unsigned submit_size;
-        unsigned long flags;
-
-        spin_lock_irqsave(&dev_priv->lock_2d, flags);
-        while (size > 0) {
-                submit_size = (size < 0x60) ? size : 0x60;
-                size -= submit_size;
-                ret = psb_2d_wait_available(dev_priv, submit_size);
-                if (ret)
-                        break;
-
-                submit_size <<= 2;
-
-                for (i = 0; i < submit_size; i += 4)
-                        PSB_WSGX32(*cmdbuf++, PSB_SGX_2D_SLAVE_PORT + i);
-
-                (void)PSB_RSGX32(PSB_SGX_2D_SLAVE_PORT + i - 4);
-        }
-        spin_unlock_irqrestore(&dev_priv->lock_2d, flags);
-        return ret;
-}
-
-
-/**
- *      psb_accel_2d_copy_direction     -       compute blit order
- *      @xdir: X direction of move
- *      @ydir: Y direction of move
- *
- *      Compute the correct order setings to ensure that an overlapping blit
- *      correctly copies all the pixels.
- */
-static u32 psb_accel_2d_copy_direction(int xdir, int ydir)
-{
-        if (xdir < 0)
-                return (ydir < 0) ? PSB_2D_COPYORDER_BR2TL :
-                                                PSB_2D_COPYORDER_TR2BL;
-        else
-                return (ydir < 0) ? PSB_2D_COPYORDER_BL2TR :
-                                                PSB_2D_COPYORDER_TL2BR;
-}
-
-/**
- *      psb_accel_2d_copy               -       accelerated 2D copy
- *      @dev_priv: our DRM device
- *      @src_offset in bytes
- *      @src_stride in bytes
- *      @src_format psb 2D format defines
- *      @dst_offset in bytes
- *      @dst_stride in bytes
- *      @dst_format psb 2D format defines
- *      @src_x offset in pixels
- *      @src_y offset in pixels
- *      @dst_x offset in pixels
- *      @dst_y offset in pixels
- *      @size_x of the copied area
- *      @size_y of the copied area
- *
- *      Format and issue a 2D accelerated copy command.
- */
-static int psb_accel_2d_copy(struct drm_psb_private *dev_priv,
-                             uint32_t src_offset, uint32_t src_stride,
-                             uint32_t src_format, uint32_t dst_offset,
-                             uint32_t dst_stride, uint32_t dst_format,
-                             uint16_t src_x, uint16_t src_y,
-                             uint16_t dst_x, uint16_t dst_y,
-                             uint16_t size_x, uint16_t size_y)
-{
-        uint32_t blit_cmd;
-        uint32_t buffer[10];
-        uint32_t *buf;
-        uint32_t direction;
-
-        buf = buffer;
-
-        direction =
-            psb_accel_2d_copy_direction(src_x - dst_x, src_y - dst_y);
-
-        if (direction == PSB_2D_COPYORDER_BR2TL ||
-            direction == PSB_2D_COPYORDER_TR2BL) {
-                src_x += size_x - 1;
-                dst_x += size_x - 1;
-        }
-        if (direction == PSB_2D_COPYORDER_BR2TL ||
-            direction == PSB_2D_COPYORDER_BL2TR) {
-                src_y += size_y - 1;
-                dst_y += size_y - 1;
-        }
-
-        blit_cmd =
-            PSB_2D_BLIT_BH |
-            PSB_2D_ROT_NONE |
-            PSB_2D_DSTCK_DISABLE |
-            PSB_2D_SRCCK_DISABLE |
-            PSB_2D_USE_PAT | PSB_2D_ROP3_SRCCOPY | direction;
-
-        *buf++ = PSB_2D_FENCE_BH;
-        *buf++ =
-            PSB_2D_DST_SURF_BH | dst_format | (dst_stride <<
-                                               PSB_2D_DST_STRIDE_SHIFT);
-        *buf++ = dst_offset;
-        *buf++ =
-            PSB_2D_SRC_SURF_BH | src_format | (src_stride <<
-                                               PSB_2D_SRC_STRIDE_SHIFT);
-        *buf++ = src_offset;
-        *buf++ =
-            PSB_2D_SRC_OFF_BH | (src_x << PSB_2D_SRCOFF_XSTART_SHIFT) |
-            (src_y << PSB_2D_SRCOFF_YSTART_SHIFT);
-        *buf++ = blit_cmd;
-        *buf++ =
-            (dst_x << PSB_2D_DST_XSTART_SHIFT) | (dst_y <<
-                                                  PSB_2D_DST_YSTART_SHIFT);
-        *buf++ =
-            (size_x << PSB_2D_DST_XSIZE_SHIFT) | (size_y <<
-                                                  PSB_2D_DST_YSIZE_SHIFT);
-        *buf++ = PSB_2D_FLUSH_BH;
-
-        return psbfb_2d_submit(dev_priv, buffer, buf - buffer);
-}
-
-/**
- *      psbfb_copyarea_accel    -       copyarea acceleration for /dev/fb
- *      @info: our framebuffer
- *      @a: copyarea parameters from the framebuffer core
- *
- *      Perform a 2D copy via the accelerator
- */
-static void psbfb_copyarea_accel(struct fb_info *info,
-                                 const struct fb_copyarea *a)
-{
-        struct psb_fbdev *fbdev = info->par;
-        struct psb_framebuffer *psbfb = &fbdev->pfb;
-        struct drm_device *dev = psbfb->base.dev;
-        struct drm_framebuffer *fb = fbdev->psb_fb_helper.fb;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        uint32_t offset;
-        uint32_t stride;
-        uint32_t src_format;
-        uint32_t dst_format;
-
-        if (!fb)
-                return;
-
-        offset = psbfb->gtt->offset;
-        stride = fb->pitches[0];
-
-        switch (fb->depth) {
-        case 8:
-                src_format = PSB_2D_SRC_332RGB;
-                dst_format = PSB_2D_DST_332RGB;
-                break;
-        case 15:
-                src_format = PSB_2D_SRC_555RGB;
-                dst_format = PSB_2D_DST_555RGB;
-                break;
-        case 16:
-                src_format = PSB_2D_SRC_565RGB;
-                dst_format = PSB_2D_DST_565RGB;
-                break;
-        case 24:
-        case 32:
-                /* this is wrong but since we don't do blending its okay */
-                src_format = PSB_2D_SRC_8888ARGB;
-                dst_format = PSB_2D_DST_8888ARGB;
-                break;
-        default:
-                /* software fallback */
-                cfb_copyarea(info, a);
-                return;
-        }
-
-        if (!gma_power_begin(dev, false)) {
-                cfb_copyarea(info, a);
-                return;
-        }
-        psb_accel_2d_copy(dev_priv,
-                          offset, stride, src_format,
-                          offset, stride, dst_format,
-                          a->sx, a->sy, a->dx, a->dy, a->width, a->height);
-        gma_power_end(dev);
-}
-
-/**
- *      psbfb_copyarea  -       2D copy interface
- *      @info: our framebuffer
- *      @region: region to copy
- *
- *      Copy an area of the framebuffer console either by the accelerator
- *      or directly using the cfb helpers according to the request
- */
-void psbfb_copyarea(struct fb_info *info,
-                           const struct fb_copyarea *region)
-{
-        if (unlikely(info->state != FBINFO_STATE_RUNNING))
-                return;
-
-        /* Avoid the 8 pixel erratum */
-        if (region->width == 8 || region->height == 8 ||
-                (info->flags & FBINFO_HWACCEL_DISABLED))
-                return cfb_copyarea(info, region);
-
-        psbfb_copyarea_accel(info, region);
-}
-
-/**
- *      psbfb_sync      -       synchronize 2D
- *      @info: our framebuffer
- *
- *      Wait for the 2D engine to quiesce so that we can do CPU
- *      access to the framebuffer again
- */
-int psbfb_sync(struct fb_info *info)
-{
-        struct psb_fbdev *fbdev = info->par;
-        struct psb_framebuffer *psbfb = &fbdev->pfb;
-        struct drm_device *dev = psbfb->base.dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned long _end = jiffies + DRM_HZ;
-        int busy = 0;
-        unsigned long flags;
-
-        spin_lock_irqsave(&dev_priv->lock_2d, flags);
-        /*
-         * First idle the 2D engine.
-         */
-
-        if ((PSB_RSGX32(PSB_CR_2D_SOCIF) == _PSB_C2_SOCIF_EMPTY) &&
-            ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) & _PSB_C2B_STATUS_BUSY) == 0))
-                goto out;
-
-        do {
-                busy = (PSB_RSGX32(PSB_CR_2D_SOCIF) != _PSB_C2_SOCIF_EMPTY);
-                cpu_relax();
-        } while (busy && !time_after_eq(jiffies, _end));
-
-        if (busy)
-                busy = (PSB_RSGX32(PSB_CR_2D_SOCIF) != _PSB_C2_SOCIF_EMPTY);
-        if (busy)
-                goto out;
-
-        do {
-                busy = ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) &
-                                                _PSB_C2B_STATUS_BUSY) != 0);
-                cpu_relax();
-        } while (busy && !time_after_eq(jiffies, _end));
-        if (busy)
-                busy = ((PSB_RSGX32(PSB_CR_2D_BLIT_STATUS) &
-                                        _PSB_C2B_STATUS_BUSY) != 0);
-
-out:
-        spin_unlock_irqrestore(&dev_priv->lock_2d, flags);
-        return (busy) ? -EBUSY : 0;
-}
-
-int psb_accel_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct drm_psb_2d_op *op = data;
-        u32 *op_ptr = &op->cmd[0];
-        int i;
-        struct drm_gem_object *obj;
-        struct gtt_range *gtt;
-        int err = -EINVAL;
-
-        if (!dev_priv->ops->accel_2d)
-                return -EOPNOTSUPP;
-        if (op->size > PSB_2D_OP_BUFLEN)
-                return -EINVAL;
-
-        /* The GEM object being used. We need to support separate src/dst/etc
-           in the end but for now keep them all the same */
-        obj = drm_gem_object_lookup(dev, file, op->src);
-        if (obj == NULL)
-                return -ENOENT;
-        gtt = container_of(obj, struct gtt_range, gem);
-
-        if (psb_gtt_pin(gtt) < 0)
-                goto bad_2;
-        for (i = 0; i < op->size; i++, op_ptr++) {
-                u32 r = *op_ptr & 0xF0000000;
-                /* Fill in the GTT offsets for the command buffer */
-                if (r == PSB_2D_SRC_SURF_BH ||
-                        r == PSB_2D_DST_SURF_BH ||
-                        r == PSB_2D_MASK_SURF_BH ||
-                        r == PSB_2D_PAT_SURF_BH) {
-                        i++;
-                        op_ptr++;
-                        if (i == op->size)
-                                goto bad;
-                        if (*op_ptr)
-                                goto bad;
-                        *op_ptr = gtt->offset;
-                        continue;
-                }
-        }
-        psbfb_2d_submit(dev_priv, op->cmd, op->size);
-        err = 0;
-bad:
-        psb_gtt_unpin(gtt);
-bad_2:
-        drm_gem_object_unreference(obj);
-        return err;
-}
diff --git a/drivers/staging/gma500/backlight.c b/drivers/staging/gma500/backlight.c
deleted file mode 100644
index 20793951fcac..000000000000
--- a/drivers/staging/gma500/backlight.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * GMA500 Backlight Interface
- *
- * Copyright (c) 2009-2011, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors: Eric Knopp
- *
- */
-
-#include "psb_drv.h"
-#include "psb_intel_reg.h"
-#include "psb_intel_drv.h"
-#include "intel_bios.h"
-#include "power.h"
-
-int gma_backlight_init(struct drm_device *dev)
-{
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        return dev_priv->ops->backlight_init(dev);
-#else
-        return 0;
-#endif
-}
-
-void gma_backlight_exit(struct drm_device *dev)
-{
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        if (dev_priv->backlight_device) {
-                dev_priv->backlight_device->props.brightness = 0;
-                backlight_update_status(dev_priv->backlight_device);
-                backlight_device_unregister(dev_priv->backlight_device);
-        }
-#endif
-}
diff --git a/drivers/staging/gma500/cdv_device.c b/drivers/staging/gma500/cdv_device.c
deleted file mode 100644
index 8ec10caab13e..000000000000
--- a/drivers/staging/gma500/cdv_device.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-#include <linux/backlight.h>
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include "psb_drm.h"
-#include "psb_drv.h"
-#include "psb_reg.h"
-#include "psb_intel_reg.h"
-#include "intel_bios.h"
-#include "cdv_device.h"
-
-#define VGA_SR_INDEX            0x3c4
-#define VGA_SR_DATA             0x3c5
-
-static void cdv_disable_vga(struct drm_device *dev)
-{
-        u8 sr1;
-        u32 vga_reg;
-
-        vga_reg = VGACNTRL;
-
-        outb(1, VGA_SR_INDEX);
-        sr1 = inb(VGA_SR_DATA);
-        outb(sr1 | 1<<5, VGA_SR_DATA);
-        udelay(300);
-
-        REG_WRITE(vga_reg, VGA_DISP_DISABLE);
-        REG_READ(vga_reg);
-}
-
-static int cdv_output_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        cdv_disable_vga(dev);
-
-        cdv_intel_crt_init(dev, &dev_priv->mode_dev);
-        cdv_intel_lvds_init(dev, &dev_priv->mode_dev);
-
-        /* These bits indicate HDMI not SDVO on CDV, but we don't yet support
-           the HDMI interface */
-        if (REG_READ(SDVOB) & SDVO_DETECTED)
-                cdv_hdmi_init(dev, &dev_priv->mode_dev, SDVOB);
-        if (REG_READ(SDVOC) & SDVO_DETECTED)
-                cdv_hdmi_init(dev, &dev_priv->mode_dev, SDVOC);
-        return 0;
-}
-
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-
-/*
- *      Poulsbo Backlight Interfaces
- */
-
-#define BLC_PWM_PRECISION_FACTOR 100    /* 10000000 */
-#define BLC_PWM_FREQ_CALC_CONSTANT 32
-#define MHz 1000000
-
-#define PSB_BLC_PWM_PRECISION_FACTOR    10
-#define PSB_BLC_MAX_PWM_REG_FREQ        0xFFFE
-#define PSB_BLC_MIN_PWM_REG_FREQ        0x2
-
-#define PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR (0xFFFE)
-#define PSB_BACKLIGHT_PWM_CTL_SHIFT     (16)
-
-static int cdv_brightness;
-static struct backlight_device *cdv_backlight_device;
-
-static int cdv_get_brightness(struct backlight_device *bd)
-{
-        /* return locally cached var instead of HW read (due to DPST etc.) */
-        /* FIXME: ideally return actual value in case firmware fiddled with
-           it */
-        return cdv_brightness;
-}
-
-
-static int cdv_backlight_setup(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned long core_clock;
-        /* u32 bl_max_freq; */
-        /* unsigned long value; */
-        u16 bl_max_freq;
-        uint32_t value;
-        uint32_t blc_pwm_precision_factor;
-
-        /* get bl_max_freq and pol from dev_priv*/
-        if (!dev_priv->lvds_bl) {
-                dev_err(dev->dev, "Has no valid LVDS backlight info\n");
-                return -ENOENT;
-        }
-        bl_max_freq = dev_priv->lvds_bl->freq;
-        blc_pwm_precision_factor = PSB_BLC_PWM_PRECISION_FACTOR;
-
-        core_clock = dev_priv->core_freq;
-
-        value = (core_clock * MHz) / BLC_PWM_FREQ_CALC_CONSTANT;
-        value *= blc_pwm_precision_factor;
-        value /= bl_max_freq;
-        value /= blc_pwm_precision_factor;
-
-        if (value > (unsigned long long)PSB_BLC_MAX_PWM_REG_FREQ ||
-                 value < (unsigned long long)PSB_BLC_MIN_PWM_REG_FREQ)
-                                return -ERANGE;
-        else {
-                /* FIXME */
-        }
-        return 0;
-}
-
-static int cdv_set_brightness(struct backlight_device *bd)
-{
-        int level = bd->props.brightness;
-
-        /* Percentage 1-100% being valid */
-        if (level < 1)
-                level = 1;
-
-        /*cdv_intel_lvds_set_brightness(dev, level); FIXME */
-        cdv_brightness = level;
-        return 0;
-}
-
-static const struct backlight_ops cdv_ops = {
-        .get_brightness = cdv_get_brightness,
-        .update_status  = cdv_set_brightness,
-};
-
-static int cdv_backlight_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int ret;
-        struct backlight_properties props;
-
-        memset(&props, 0, sizeof(struct backlight_properties));
-        props.max_brightness = 100;
-        props.type = BACKLIGHT_PLATFORM;
-
-        cdv_backlight_device = backlight_device_register("psb-bl",
-                                        NULL, (void *)dev, &cdv_ops, &props);
-        if (IS_ERR(cdv_backlight_device))
-                return PTR_ERR(cdv_backlight_device);
-
-        ret = cdv_backlight_setup(dev);
-        if (ret < 0) {
-                backlight_device_unregister(cdv_backlight_device);
-                cdv_backlight_device = NULL;
-                return ret;
-        }
-        cdv_backlight_device->props.brightness = 100;
-        cdv_backlight_device->props.max_brightness = 100;
-        backlight_update_status(cdv_backlight_device);
-        dev_priv->backlight_device = cdv_backlight_device;
-        return 0;
-}
-
-#endif
-
-/*
- *      Provide the Cedarview specific chip logic and low level methods
- *      for power management
- *
- *      FIXME: we need to implement the apm/ospm base management bits
- *      for this and the MID devices.
- */
-
-static inline u32 CDV_MSG_READ32(uint port, uint offset)
-{
-        int mcr = (0x10<<24) | (port << 16) | (offset << 8);
-        uint32_t ret_val = 0;
-        struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
-        pci_write_config_dword(pci_root, 0xD0, mcr);
-        pci_read_config_dword(pci_root, 0xD4, &ret_val);
-        pci_dev_put(pci_root);
-        return ret_val;
-}
-
-static inline void CDV_MSG_WRITE32(uint port, uint offset, u32 value)
-{
-        int mcr = (0x11<<24) | (port << 16) | (offset << 8) | 0xF0;
-        struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
-        pci_write_config_dword(pci_root, 0xD4, value);
-        pci_write_config_dword(pci_root, 0xD0, mcr);
-        pci_dev_put(pci_root);
-}
-
-#define PSB_APM_CMD                     0x0
-#define PSB_APM_STS                     0x04
-#define PSB_PM_SSC                      0x20
-#define PSB_PM_SSS                      0x30
-#define PSB_PWRGT_GFX_MASK              0x3
-#define CDV_PWRGT_DISPLAY_CNTR          0x000fc00c
-#define CDV_PWRGT_DISPLAY_STS           0x000fc00c
-
-static void cdv_init_pm(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 pwr_cnt;
-        int i;
-
-        dev_priv->apm_base = CDV_MSG_READ32(PSB_PUNIT_PORT,
-                                                        PSB_APMBA) & 0xFFFF;
-        dev_priv->ospm_base = CDV_MSG_READ32(PSB_PUNIT_PORT,
-                                                        PSB_OSPMBA) & 0xFFFF;
-
-        /* Force power on for now */
-        pwr_cnt = inl(dev_priv->apm_base + PSB_APM_CMD);
-        pwr_cnt &= ~PSB_PWRGT_GFX_MASK;
-
-        outl(pwr_cnt, dev_priv->apm_base + PSB_APM_CMD);
-        for (i = 0; i < 5; i++) {
-                u32 pwr_sts = inl(dev_priv->apm_base + PSB_APM_STS);
-                if ((pwr_sts & PSB_PWRGT_GFX_MASK) == 0)
-                        break;
-                udelay(10);
-        }
-        pwr_cnt = inl(dev_priv->ospm_base + PSB_PM_SSC);
-        pwr_cnt &= ~CDV_PWRGT_DISPLAY_CNTR;
-        outl(pwr_cnt, dev_priv->ospm_base + PSB_PM_SSC);
-        for (i = 0; i < 5; i++) {
-                u32 pwr_sts = inl(dev_priv->ospm_base + PSB_PM_SSS);
-                if ((pwr_sts & CDV_PWRGT_DISPLAY_STS) == 0)
-                        break;
-                udelay(10);
-        }
-}
-
-/**
- *      cdv_save_display_registers      -       save registers lost on suspend
- *      @dev: our DRM device
- *
- *      Save the state we need in order to be able to restore the interface
- *      upon resume from suspend
- *
- *      FIXME: review
- */
-static int cdv_save_display_registers(struct drm_device *dev)
-{
-        return 0;
-}
-
-/**
- *      cdv_restore_display_registers   -       restore lost register state
- *      @dev: our DRM device
- *
- *      Restore register state that was lost during suspend and resume.
- *
- *      FIXME: review
- */
-static int cdv_restore_display_registers(struct drm_device *dev)
-{
-        return 0;
-}
-
-static int cdv_power_down(struct drm_device *dev)
-{
-        return 0;
-}
-
-static int cdv_power_up(struct drm_device *dev)
-{
-        return 0;
-}
-
-/* FIXME ? - shared with Poulsbo */
-static void cdv_get_core_freq(struct drm_device *dev)
-{
-        uint32_t clock;
-        struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        pci_write_config_dword(pci_root, 0xD0, 0xD0050300);
-        pci_read_config_dword(pci_root, 0xD4, &clock);
-        pci_dev_put(pci_root);
-
-        switch (clock & 0x07) {
-        case 0:
-                dev_priv->core_freq = 100;
-                break;
-        case 1:
-                dev_priv->core_freq = 133;
-                break;
-        case 2:
-                dev_priv->core_freq = 150;
-                break;
-        case 3:
-                dev_priv->core_freq = 178;
-                break;
-        case 4:
-                dev_priv->core_freq = 200;
-                break;
-        case 5:
-        case 6:
-        case 7:
-                dev_priv->core_freq = 266;
-        default:
-                dev_priv->core_freq = 0;
-        }
-}
-
-static int cdv_chip_setup(struct drm_device *dev)
-{
-        cdv_get_core_freq(dev);
-        gma_intel_opregion_init(dev);
-        psb_intel_init_bios(dev);
-        return 0;
-}
-
-/* CDV is much like Poulsbo but has MID like SGX offsets and PM */
-
-const struct psb_ops cdv_chip_ops = {
-        .name = "Cedartrail",
-        .accel_2d = 0,
-        .pipes = 2,
-        .sgx_offset = MRST_SGX_OFFSET,
-        .chip_setup = cdv_chip_setup,
-
-        .crtc_helper = &cdv_intel_helper_funcs,
-        .crtc_funcs = &cdv_intel_crtc_funcs,
-
-        .output_init = cdv_output_init,
-
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-        .backlight_init = cdv_backlight_init,
-#endif
-
-        .init_pm = cdv_init_pm,
-        .save_regs = cdv_save_display_registers,
-        .restore_regs = cdv_restore_display_registers,
-        .power_down = cdv_power_down,
-        .power_up = cdv_power_up,
-};
diff --git a/drivers/staging/gma500/cdv_device.h b/drivers/staging/gma500/cdv_device.h
deleted file mode 100644
index 2a88b7beb551..000000000000
--- a/drivers/staging/gma500/cdv_device.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright © 2011 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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., 
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-extern const struct drm_crtc_helper_funcs cdv_intel_helper_funcs;
-extern const struct drm_crtc_funcs cdv_intel_crtc_funcs;
-extern void cdv_intel_crt_init(struct drm_device *dev,
-                        struct psb_intel_mode_device *mode_dev);
-extern void cdv_intel_lvds_init(struct drm_device *dev,
-                        struct psb_intel_mode_device *mode_dev);
-extern void cdv_hdmi_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev,
-                        int reg);
-extern struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,
-                                             struct drm_crtc *crtc);
-
-extern inline void cdv_intel_wait_for_vblank(struct drm_device *dev)
-{
-        /* Wait for 20ms, i.e. one cycle at 50hz. */
-        /* FIXME: msleep ?? */
-        mdelay(20);
-}
-
-
diff --git a/drivers/staging/gma500/cdv_intel_crt.c b/drivers/staging/gma500/cdv_intel_crt.c
deleted file mode 100644
index efda63b97b45..000000000000
--- a/drivers/staging/gma500/cdv_intel_crt.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Copyright © 2006-2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *      Eric Anholt <eric@anholt.net>
- */
-
-#include <linux/i2c.h>
-#include <drm/drmP.h>
-
-#include "intel_bios.h"
-#include "psb_drv.h"
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "power.h"
-#include <linux/pm_runtime.h>
-
-
-static void cdv_intel_crt_dpms(struct drm_encoder *encoder, int mode)
-{
-        struct drm_device *dev = encoder->dev;
-        u32 temp, reg;
-        reg = ADPA;
-
-        temp = REG_READ(reg);
-        temp &= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE);
-        temp &= ~ADPA_DAC_ENABLE;
-
-        switch (mode) {
-        case DRM_MODE_DPMS_ON:
-                temp |= ADPA_DAC_ENABLE;
-                break;
-        case DRM_MODE_DPMS_STANDBY:
-                temp |= ADPA_DAC_ENABLE | ADPA_HSYNC_CNTL_DISABLE;
-                break;
-        case DRM_MODE_DPMS_SUSPEND:
-                temp |= ADPA_DAC_ENABLE | ADPA_VSYNC_CNTL_DISABLE;
-                break;
-        case DRM_MODE_DPMS_OFF:
-                temp |= ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE;
-                break;
-        }
-
-        REG_WRITE(reg, temp);
-}
-
-static int cdv_intel_crt_mode_valid(struct drm_connector *connector,
-                                struct drm_display_mode *mode)
-{
-        int max_clock = 0;
-        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return MODE_NO_DBLESCAN;
-
-        /* The lowest clock for CDV is 20000KHz */
-        if (mode->clock < 20000)
-                return MODE_CLOCK_LOW;
-
-        /* The max clock for CDV is 355 instead of 400 */
-        max_clock = 355000;
-        if (mode->clock > max_clock)
-                return MODE_CLOCK_HIGH;
-
-        if (mode->hdisplay > 1680 || mode->vdisplay > 1050)
-                return MODE_PANEL;
-
-        return MODE_OK;
-}
-
-static bool cdv_intel_crt_mode_fixup(struct drm_encoder *encoder,
-                                 struct drm_display_mode *mode,
-                                 struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
-static void cdv_intel_crt_mode_set(struct drm_encoder *encoder,
-                               struct drm_display_mode *mode,
-                               struct drm_display_mode *adjusted_mode)
-{
-
-        struct drm_device *dev = encoder->dev;
-        struct drm_crtc *crtc = encoder->crtc;
-        struct psb_intel_crtc *psb_intel_crtc =
-                                        to_psb_intel_crtc(crtc);
-        int dpll_md_reg;
-        u32 adpa, dpll_md;
-        u32 adpa_reg;
-
-        if (psb_intel_crtc->pipe == 0)
-                dpll_md_reg = DPLL_A_MD;
-        else
-                dpll_md_reg = DPLL_B_MD;
-
-        adpa_reg = ADPA;
-
-        /*
-         * Disable separate mode multiplier used when cloning SDVO to CRT
-         * XXX this needs to be adjusted when we really are cloning
-         */
-        {
-                dpll_md = REG_READ(dpll_md_reg);
-                REG_WRITE(dpll_md_reg,
-                           dpll_md & ~DPLL_MD_UDI_MULTIPLIER_MASK);
-        }
-
-        adpa = 0;
-        if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
-                adpa |= ADPA_HSYNC_ACTIVE_HIGH;
-        if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
-                adpa |= ADPA_VSYNC_ACTIVE_HIGH;
-
-        if (psb_intel_crtc->pipe == 0)
-                adpa |= ADPA_PIPE_A_SELECT;
-        else
-                adpa |= ADPA_PIPE_B_SELECT;
-
-        REG_WRITE(adpa_reg, adpa);
-}
-
-
-/**
- * Uses CRT_HOTPLUG_EN and CRT_HOTPLUG_STAT to detect CRT presence.
- *
- * \return true if CRT is connected.
- * \return false if CRT is disconnected.
- */
-static bool cdv_intel_crt_detect_hotplug(struct drm_connector *connector,
-                                                                bool force)
-{
-        struct drm_device *dev = connector->dev;
-        u32 hotplug_en;
-        int i, tries = 0, ret = false;
-        u32 adpa_orig;
-
-        /* disable the DAC when doing the hotplug detection */
-
-        adpa_orig = REG_READ(ADPA);
-
-        REG_WRITE(ADPA, adpa_orig & ~(ADPA_DAC_ENABLE));
-
-        /*
-         * On a CDV thep, CRT detect sequence need to be done twice
-         * to get a reliable result.
-         */
-        tries = 2;
-
-        hotplug_en = REG_READ(PORT_HOTPLUG_EN);
-        hotplug_en &= ~(CRT_HOTPLUG_DETECT_MASK);
-        hotplug_en |= CRT_HOTPLUG_FORCE_DETECT;
-
-        hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64;
-        hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50;
-
-        for (i = 0; i < tries ; i++) {
-                unsigned long timeout;
-                /* turn on the FORCE_DETECT */
-                REG_WRITE(PORT_HOTPLUG_EN, hotplug_en);
-                timeout = jiffies + msecs_to_jiffies(1000);
-                /* wait for FORCE_DETECT to go off */
-                do {
-                        if (!(REG_READ(PORT_HOTPLUG_EN) &
-                                        CRT_HOTPLUG_FORCE_DETECT))
-                                break;
-                        msleep(1);
-                } while (time_after(timeout, jiffies));
-        }
-
-        if ((REG_READ(PORT_HOTPLUG_STAT) & CRT_HOTPLUG_MONITOR_MASK) !=
-            CRT_HOTPLUG_MONITOR_NONE)
-                ret = true;
-
-        /* Restore the saved ADPA */
-        REG_WRITE(ADPA, adpa_orig);
-        return ret;
-}
-
-static enum drm_connector_status cdv_intel_crt_detect(
-                                struct drm_connector *connector, bool force)
-{
-        if (cdv_intel_crt_detect_hotplug(connector, force))
-                return connector_status_connected;
-        else
-                return connector_status_disconnected;
-}
-
-static void cdv_intel_crt_destroy(struct drm_connector *connector)
-{
-        struct psb_intel_output *intel_output = to_psb_intel_output(connector);
-
-        psb_intel_i2c_destroy(intel_output->ddc_bus);
-        drm_sysfs_connector_remove(connector);
-        drm_connector_cleanup(connector);
-        kfree(connector);
-}
-
-static int cdv_intel_crt_get_modes(struct drm_connector *connector)
-{
-        struct psb_intel_output *intel_output =
-                                to_psb_intel_output(connector);
-        return psb_intel_ddc_get_modes(intel_output);
-}
-
-static int cdv_intel_crt_set_property(struct drm_connector *connector,
-                                  struct drm_property *property,
-                                  uint64_t value)
-{
-        return 0;
-}
-
-/*
- * Routines for controlling stuff on the analog port
- */
-
-static const struct drm_encoder_helper_funcs cdv_intel_crt_helper_funcs = {
-        .dpms = cdv_intel_crt_dpms,
-        .mode_fixup = cdv_intel_crt_mode_fixup,
-        .prepare = psb_intel_encoder_prepare,
-        .commit = psb_intel_encoder_commit,
-        .mode_set = cdv_intel_crt_mode_set,
-};
-
-static const struct drm_connector_funcs cdv_intel_crt_connector_funcs = {
-        .dpms = drm_helper_connector_dpms,
-        .detect = cdv_intel_crt_detect,
-        .fill_modes = drm_helper_probe_single_connector_modes,
-        .destroy = cdv_intel_crt_destroy,
-        .set_property = cdv_intel_crt_set_property,
-};
-
-static const struct drm_connector_helper_funcs
-                                cdv_intel_crt_connector_helper_funcs = {
-        .mode_valid = cdv_intel_crt_mode_valid,
-        .get_modes = cdv_intel_crt_get_modes,
-        .best_encoder = psb_intel_best_encoder,
-};
-
-static void cdv_intel_crt_enc_destroy(struct drm_encoder *encoder)
-{
-        drm_encoder_cleanup(encoder);
-}
-
-static const struct drm_encoder_funcs cdv_intel_crt_enc_funcs = {
-        .destroy = cdv_intel_crt_enc_destroy,
-};
-
-void cdv_intel_crt_init(struct drm_device *dev,
-                        struct psb_intel_mode_device *mode_dev)
-{
-
-        struct psb_intel_output *psb_intel_output;
-        struct drm_connector *connector;
-        struct drm_encoder *encoder;
-
-        u32 i2c_reg;
-
-        psb_intel_output = kzalloc(sizeof(struct psb_intel_output), GFP_KERNEL);
-        if (!psb_intel_output)
-                return;
-
-        psb_intel_output->mode_dev = mode_dev;
-        connector = &psb_intel_output->base;
-        drm_connector_init(dev, connector,
-                &cdv_intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
-
-        encoder = &psb_intel_output->enc;
-        drm_encoder_init(dev, encoder,
-                &cdv_intel_crt_enc_funcs, DRM_MODE_ENCODER_DAC);
-
-        drm_mode_connector_attach_encoder(&psb_intel_output->base,
-                                          &psb_intel_output->enc);
-
-        /* Set up the DDC bus. */
-        i2c_reg = GPIOA;
-        /* Remove the following code for CDV */
-        /*
-        if (dev_priv->crt_ddc_bus != 0)
-                i2c_reg = dev_priv->crt_ddc_bus;
-        }*/
-        psb_intel_output->ddc_bus = psb_intel_i2c_create(dev,
-                                                i2c_reg, "CRTDDC_A");
-        if (!psb_intel_output->ddc_bus) {
-                dev_printk(KERN_ERR, &dev->pdev->dev, "DDC bus registration "
-                           "failed.\n");
-                goto failed_ddc;
-        }
-
-        psb_intel_output->type = INTEL_OUTPUT_ANALOG;
-        /*
-        psb_intel_output->clone_mask = (1 << INTEL_ANALOG_CLONE_BIT);
-        psb_intel_output->crtc_mask = (1 << 0) | (1 << 1);
-        */
-        connector->interlace_allowed = 0;
-        connector->doublescan_allowed = 0;
-
-        drm_encoder_helper_add(encoder, &cdv_intel_crt_helper_funcs);
-        drm_connector_helper_add(connector,
-                                        &cdv_intel_crt_connector_helper_funcs);
-
-        drm_sysfs_connector_add(connector);
-
-        return;
-failed_ddc:
-        drm_encoder_cleanup(&psb_intel_output->enc);
-        drm_connector_cleanup(&psb_intel_output->base);
-        kfree(psb_intel_output);
-        return;
-}
diff --git a/drivers/staging/gma500/cdv_intel_display.c b/drivers/staging/gma500/cdv_intel_display.c
deleted file mode 100644
index c63a32776a9e..000000000000
--- a/drivers/staging/gma500/cdv_intel_display.c
+++ /dev/null
@@ -1,1508 +0,0 @@
-/*
- * Copyright © 2006-2011 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *      Eric Anholt <eric@anholt.net>
- */
-
-#include <linux/i2c.h>
-#include <linux/pm_runtime.h>
-
-#include <drm/drmP.h>
-#include "framebuffer.h"
-#include "psb_drv.h"
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "psb_intel_display.h"
-#include "power.h"
-#include "cdv_device.h"
-
-
-struct cdv_intel_range_t {
-        int min, max;
-};
-
-struct cdv_intel_p2_t {
-        int dot_limit;
-        int p2_slow, p2_fast;
-};
-
-struct cdv_intel_clock_t {
-        /* given values */
-        int n;
-        int m1, m2;
-        int p1, p2;
-        /* derived values */
-        int dot;
-        int vco;
-        int m;
-        int p;
-};
-
-#define INTEL_P2_NUM                  2
-
-struct cdv_intel_limit_t {
-        struct cdv_intel_range_t dot, vco, n, m, m1, m2, p, p1;
-        struct cdv_intel_p2_t p2;
-};
-
-#define CDV_LIMIT_SINGLE_LVDS_96        0
-#define CDV_LIMIT_SINGLE_LVDS_100       1
-#define CDV_LIMIT_DAC_HDMI_27           2
-#define CDV_LIMIT_DAC_HDMI_96           3
-
-static const struct cdv_intel_limit_t cdv_intel_limits[] = {
-        {                       /* CDV_SIGNLE_LVDS_96MHz */
-         .dot = {.min = 20000, .max = 115500},
-         .vco = {.min = 1800000, .max = 3600000},
-         .n = {.min = 2, .max = 6},
-         .m = {.min = 60, .max = 160},
-         .m1 = {.min = 0, .max = 0},
-         .m2 = {.min = 58, .max = 158},
-         .p = {.min = 28, .max = 140},
-         .p1 = {.min = 2, .max = 10},
-         .p2 = {.dot_limit = 200000,
-                .p2_slow = 14, .p2_fast = 14},
-         },
-        {                       /* CDV_SINGLE_LVDS_100MHz */
-         .dot = {.min = 20000, .max = 115500},
-         .vco = {.min = 1800000, .max = 3600000},
-         .n = {.min = 2, .max = 6},
-         .m = {.min = 60, .max = 160},
-         .m1 = {.min = 0, .max = 0},
-         .m2 = {.min = 58, .max = 158},
-         .p = {.min = 28, .max = 140},
-         .p1 = {.min = 2, .max = 10},
-         /* The single-channel range is 25-112Mhz, and dual-channel
-          * is 80-224Mhz.  Prefer single channel as much as possible.
-          */
-         .p2 = {.dot_limit = 200000, .p2_slow = 14, .p2_fast = 14},
-         },
-        {                       /* CDV_DAC_HDMI_27MHz */
-         .dot = {.min = 20000, .max = 400000},
-         .vco = {.min = 1809000, .max = 3564000},
-         .n = {.min = 1, .max = 1},
-         .m = {.min = 67, .max = 132},
-         .m1 = {.min = 0, .max = 0},
-         .m2 = {.min = 65, .max = 130},
-         .p = {.min = 5, .max = 90},
-         .p1 = {.min = 1, .max = 9},
-         .p2 = {.dot_limit = 225000, .p2_slow = 10, .p2_fast = 5},
-         },
-        {                       /* CDV_DAC_HDMI_96MHz */
-         .dot = {.min = 20000, .max = 400000},
-         .vco = {.min = 1800000, .max = 3600000},
-         .n = {.min = 2, .max = 6},
-         .m = {.min = 60, .max = 160},
-         .m1 = {.min = 0, .max = 0},
-         .m2 = {.min = 58, .max = 158},
-         .p = {.min = 5, .max = 100},
-         .p1 = {.min = 1, .max = 10},
-         .p2 = {.dot_limit = 225000, .p2_slow = 10, .p2_fast = 5},
-         },
-};
-
-#define _wait_for(COND, MS, W) ({ \
-        unsigned long timeout__ = jiffies + msecs_to_jiffies(MS);       \
-        int ret__ = 0;                                                  \
-        while (!(COND)) {                                               \
-                if (time_after(jiffies, timeout__)) {                   \
-                        ret__ = -ETIMEDOUT;                             \
-                        break;                                          \
-                }                                                       \
-                if (W && !in_dbg_master())                              \
-                        msleep(W);                                      \
-        }                                                               \
-        ret__;                                                          \
-})
-
-#define wait_for(COND, MS) _wait_for(COND, MS, 1)
-
-
-static int cdv_sb_read(struct drm_device *dev, u32 reg, u32 *val)
-{
-        int ret;
-
-        ret = wait_for((REG_READ(SB_PCKT) & SB_BUSY) == 0, 1000);
-        if (ret) {
-                DRM_ERROR("timeout waiting for SB to idle before read\n");
-                return ret;
-        }
-
-        REG_WRITE(SB_ADDR, reg);
-        REG_WRITE(SB_PCKT,
-                   SET_FIELD(SB_OPCODE_READ, SB_OPCODE) |
-                   SET_FIELD(SB_DEST_DPLL, SB_DEST) |
-                   SET_FIELD(0xf, SB_BYTE_ENABLE));
-
-        ret = wait_for((REG_READ(SB_PCKT) & SB_BUSY) == 0, 1000);
-        if (ret) {
-                DRM_ERROR("timeout waiting for SB to idle after read\n");
-                return ret;
-        }
-
-        *val = REG_READ(SB_DATA);
-
-        return 0;
-}
-
-static int cdv_sb_write(struct drm_device *dev, u32 reg, u32 val)
-{
-        int ret;
-        static bool dpio_debug = true;
-        u32 temp;
-
-        if (dpio_debug) {
-                if (cdv_sb_read(dev, reg, &temp) == 0)
-                        DRM_DEBUG_KMS("0x%08x: 0x%08x (before)\n", reg, temp);
-                DRM_DEBUG_KMS("0x%08x: 0x%08x\n", reg, val);
-        }
-
-        ret = wait_for((REG_READ(SB_PCKT) & SB_BUSY) == 0, 1000);
-        if (ret) {
-                DRM_ERROR("timeout waiting for SB to idle before write\n");
-                return ret;
-        }
-
-        REG_WRITE(SB_ADDR, reg);
-        REG_WRITE(SB_DATA, val);
-        REG_WRITE(SB_PCKT,
-                   SET_FIELD(SB_OPCODE_WRITE, SB_OPCODE) |
-                   SET_FIELD(SB_DEST_DPLL, SB_DEST) |
-                   SET_FIELD(0xf, SB_BYTE_ENABLE));
-
-        ret = wait_for((REG_READ(SB_PCKT) & SB_BUSY) == 0, 1000);
-        if (ret) {
-                DRM_ERROR("timeout waiting for SB to idle after write\n");
-                return ret;
-        }
-
-        if (dpio_debug) {
-                if (cdv_sb_read(dev, reg, &temp) == 0)
-                        DRM_DEBUG_KMS("0x%08x: 0x%08x (after)\n", reg, temp);
-        }
-
-        return 0;
-}
-
-/* Reset the DPIO configuration register.  The BIOS does this at every
- * mode set.
- */
-static void cdv_sb_reset(struct drm_device *dev)
-{
-
-        REG_WRITE(DPIO_CFG, 0);
-        REG_READ(DPIO_CFG);
-        REG_WRITE(DPIO_CFG, DPIO_MODE_SELECT_0 | DPIO_CMN_RESET_N);
-}
-
-/* Unlike most Intel display engines, on Cedarview the DPLL registers
- * are behind this sideband bus.  They must be programmed while the
- * DPLL reference clock is on in the DPLL control register, but before
- * the DPLL is enabled in the DPLL control register.
- */
-static int
-cdv_dpll_set_clock_cdv(struct drm_device *dev, struct drm_crtc *crtc,
-                               struct cdv_intel_clock_t *clock)
-{
-        struct psb_intel_crtc *psb_crtc =
-                                to_psb_intel_crtc(crtc);
-        int pipe = psb_crtc->pipe;
-        u32 m, n_vco, p;
-        int ret = 0;
-        int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
-        u32 ref_value;
-
-        cdv_sb_reset(dev);
-
-        if ((REG_READ(dpll_reg) & DPLL_SYNCLOCK_ENABLE) == 0) {
-                DRM_ERROR("Attempting to set DPLL with refclk disabled\n");
-                return -EBUSY;
-        }
-
-        /* Follow the BIOS and write the REF/SFR Register. Hardcoded value */
-        ref_value = 0x68A701;
-
-        cdv_sb_write(dev, SB_REF_SFR(pipe), ref_value);
-
-        /* We don't know what the other fields of these regs are, so
-         * leave them in place.
-         */
-        ret = cdv_sb_read(dev, SB_M(pipe), &m);
-        if (ret)
-                return ret;
-        m &= ~SB_M_DIVIDER_MASK;
-        m |= ((clock->m2) << SB_M_DIVIDER_SHIFT);
-        ret = cdv_sb_write(dev, SB_M(pipe), m);
-        if (ret)
-                return ret;
-
-        ret = cdv_sb_read(dev, SB_N_VCO(pipe), &n_vco);
-        if (ret)
-                return ret;
-
-        /* Follow the BIOS to program the N_DIVIDER REG */
-        n_vco &= 0xFFFF;
-        n_vco |= 0x107;
-        n_vco &= ~(SB_N_VCO_SEL_MASK |
-                   SB_N_DIVIDER_MASK |
-                   SB_N_CB_TUNE_MASK);
-
-        n_vco |= ((clock->n) << SB_N_DIVIDER_SHIFT);
-
-        if (clock->vco < 2250000) {
-                n_vco |= (2 << SB_N_CB_TUNE_SHIFT);
-                n_vco |= (0 << SB_N_VCO_SEL_SHIFT);
-        } else if (clock->vco < 2750000) {
-                n_vco |= (1 << SB_N_CB_TUNE_SHIFT);
-                n_vco |= (1 << SB_N_VCO_SEL_SHIFT);
-        } else if (clock->vco < 3300000) {
-                n_vco |= (0 << SB_N_CB_TUNE_SHIFT);
-                n_vco |= (2 << SB_N_VCO_SEL_SHIFT);
-        } else {
-                n_vco |= (0 << SB_N_CB_TUNE_SHIFT);
-                n_vco |= (3 << SB_N_VCO_SEL_SHIFT);
-        }
-
-        ret = cdv_sb_write(dev, SB_N_VCO(pipe), n_vco);
-        if (ret)
-                return ret;
-
-        ret = cdv_sb_read(dev, SB_P(pipe), &p);
-        if (ret)
-                return ret;
-        p &= ~(SB_P2_DIVIDER_MASK | SB_P1_DIVIDER_MASK);
-        p |= SET_FIELD(clock->p1, SB_P1_DIVIDER);
-        switch (clock->p2) {
-        case 5:
-                p |= SET_FIELD(SB_P2_5, SB_P2_DIVIDER);
-                break;
-        case 10:
-                p |= SET_FIELD(SB_P2_10, SB_P2_DIVIDER);
-                break;
-        case 14:
-                p |= SET_FIELD(SB_P2_14, SB_P2_DIVIDER);
-                break;
-        case 7:
-                p |= SET_FIELD(SB_P2_7, SB_P2_DIVIDER);
-                break;
-        default:
-                DRM_ERROR("Bad P2 clock: %d\n", clock->p2);
-                return -EINVAL;
-        }
-        ret = cdv_sb_write(dev, SB_P(pipe), p);
-        if (ret)
-                return ret;
-
-        /* always Program the Lane Register for the Pipe A*/
-        if (pipe == 0) {
-                /* Program the Lane0/1 for HDMI B */
-                u32 lane_reg, lane_value;
-
-                lane_reg = PSB_LANE0;
-                cdv_sb_read(dev, lane_reg, &lane_value);
-                lane_value &= ~(LANE_PLL_MASK);
-                lane_value |= LANE_PLL_ENABLE;
-                cdv_sb_write(dev, lane_reg, lane_value);
-
-                lane_reg = PSB_LANE1;
-                cdv_sb_read(dev, lane_reg, &lane_value);
-                lane_value &= ~(LANE_PLL_MASK);
-                lane_value |= LANE_PLL_ENABLE;
-                cdv_sb_write(dev, lane_reg, lane_value);
-
-                /* Program the Lane2/3 for HDMI C */
-                lane_reg = PSB_LANE2;
-                cdv_sb_read(dev, lane_reg, &lane_value);
-                lane_value &= ~(LANE_PLL_MASK);
-                lane_value |= LANE_PLL_ENABLE;
-                cdv_sb_write(dev, lane_reg, lane_value);
-
-                lane_reg = PSB_LANE3;
-                cdv_sb_read(dev, lane_reg, &lane_value);
-                lane_value &= ~(LANE_PLL_MASK);
-                lane_value |= LANE_PLL_ENABLE;
-                cdv_sb_write(dev, lane_reg, lane_value);
-        }
-
-        return 0;
-}
-
-/*
- * Returns whether any output on the specified pipe is of the specified type
- */
-bool cdv_intel_pipe_has_type(struct drm_crtc *crtc, int type)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_mode_config *mode_config = &dev->mode_config;
-        struct drm_connector *l_entry;
-
-        list_for_each_entry(l_entry, &mode_config->connector_list, head) {
-                if (l_entry->encoder && l_entry->encoder->crtc == crtc) {
-                        struct psb_intel_output *psb_intel_output =
-                            to_psb_intel_output(l_entry);
-                        if (psb_intel_output->type == type)
-                                return true;
-                }
-        }
-        return false;
-}
-
-static const struct cdv_intel_limit_t *cdv_intel_limit(struct drm_crtc *crtc,
-                                                        int refclk)
-{
-        const struct cdv_intel_limit_t *limit;
-        if (cdv_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
-                /*
-                 * Now only single-channel LVDS is supported on CDV. If it is
-                 * incorrect, please add the dual-channel LVDS.
-                 */
-                if (refclk == 96000)
-                        limit = &cdv_intel_limits[CDV_LIMIT_SINGLE_LVDS_96];
-                else
-                        limit = &cdv_intel_limits[CDV_LIMIT_SINGLE_LVDS_100];
-        } else {
-                if (refclk == 27000)
-                        limit = &cdv_intel_limits[CDV_LIMIT_DAC_HDMI_27];
-                else
-                        limit = &cdv_intel_limits[CDV_LIMIT_DAC_HDMI_96];
-        }
-        return limit;
-}
-
-/* m1 is reserved as 0 in CDV, n is a ring counter */
-static void cdv_intel_clock(struct drm_device *dev,
-                        int refclk, struct cdv_intel_clock_t *clock)
-{
-        clock->m = clock->m2 + 2;
-        clock->p = clock->p1 * clock->p2;
-        clock->vco = (refclk * clock->m) / clock->n;
-        clock->dot = clock->vco / clock->p;
-}
-
-
-#define INTELPllInvalid(s)   { /* ErrorF (s) */; return false; }
-static bool cdv_intel_PLL_is_valid(struct drm_crtc *crtc,
-                                const struct cdv_intel_limit_t *limit,
-                               struct cdv_intel_clock_t *clock)
-{
-        if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1)
-                INTELPllInvalid("p1 out of range\n");
-        if (clock->p < limit->p.min || limit->p.max < clock->p)
-                INTELPllInvalid("p out of range\n");
-        /* unnecessary to check the range of m(m1/M2)/n again */
-        if (clock->vco < limit->vco.min || limit->vco.max < clock->vco)
-                INTELPllInvalid("vco out of range\n");
-        /* XXX: We may need to be checking "Dot clock"
-         * depending on the multiplier, connector, etc.,
-         * rather than just a single range.
-         */
-        if (clock->dot < limit->dot.min || limit->dot.max < clock->dot)
-                INTELPllInvalid("dot out of range\n");
-
-        return true;
-}
-
-static bool cdv_intel_find_best_PLL(struct drm_crtc *crtc, int target,
-                                int refclk,
-                                struct cdv_intel_clock_t *best_clock)
-{
-        struct drm_device *dev = crtc->dev;
-        struct cdv_intel_clock_t clock;
-        const struct cdv_intel_limit_t *limit = cdv_intel_limit(crtc, refclk);
-        int err = target;
-
-
-        if (cdv_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
-            (REG_READ(LVDS) & LVDS_PORT_EN) != 0) {
-                /*
-                 * For LVDS, if the panel is on, just rely on its current
-                 * settings for dual-channel.  We haven't figured out how to
-                 * reliably set up different single/dual channel state, if we
-                 * even can.
-                 */
-                if ((REG_READ(LVDS) & LVDS_CLKB_POWER_MASK) ==
-                    LVDS_CLKB_POWER_UP)
-                        clock.p2 = limit->p2.p2_fast;
-                else
-                        clock.p2 = limit->p2.p2_slow;
-        } else {
-                if (target < limit->p2.dot_limit)
-                        clock.p2 = limit->p2.p2_slow;
-                else
-                        clock.p2 = limit->p2.p2_fast;
-        }
-
-        memset(best_clock, 0, sizeof(*best_clock));
-        clock.m1 = 0;
-        /* m1 is reserved as 0 in CDV, n is a ring counter.
-           So skip the m1 loop */
-        for (clock.n = limit->n.min; clock.n <= limit->n.max; clock.n++) {
-                for (clock.m2 = limit->m2.min; clock.m2 <= limit->m2.max;
-                                             clock.m2++) {
-                        for (clock.p1 = limit->p1.min;
-                                        clock.p1 <= limit->p1.max;
-                                        clock.p1++) {
-                                int this_err;
-
-                                cdv_intel_clock(dev, refclk, &clock);
-
-                                if (!cdv_intel_PLL_is_valid(crtc,
-                                                                limit, &clock))
-                                                continue;
-
-                                this_err = abs(clock.dot - target);
-                                if (this_err < err) {
-                                        *best_clock = clock;
-                                        err = this_err;
-                                }
-                        }
-                }
-        }
-
-        return err != target;
-}
-
-int cdv_intel_pipe_set_base(struct drm_crtc *crtc,
-                            int x, int y, struct drm_framebuffer *old_fb)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
-        int pipe = psb_intel_crtc->pipe;
-        unsigned long start, offset;
-        int dspbase = (pipe == 0 ? DSPABASE : DSPBBASE);
-        int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);
-        int dspstride = (pipe == 0) ? DSPASTRIDE : DSPBSTRIDE;
-        int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
-        u32 dspcntr;
-        int ret = 0;
-
-        if (!gma_power_begin(dev, true))
-                return 0;
-
-        /* no fb bound */
-        if (!crtc->fb) {
-                dev_err(dev->dev, "No FB bound\n");
-                goto psb_intel_pipe_cleaner;
-        }
-
-
-        /* We are displaying this buffer, make sure it is actually loaded
-           into the GTT */
-        ret = psb_gtt_pin(psbfb->gtt);
-        if (ret < 0)
-                goto psb_intel_pipe_set_base_exit;
-        start = psbfb->gtt->offset;
-        offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
-
-        REG_WRITE(dspstride, crtc->fb->pitches[0]);
-
-        dspcntr = REG_READ(dspcntr_reg);
-        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
-
-        switch (crtc->fb->bits_per_pixel) {
-        case 8:
-                dspcntr |= DISPPLANE_8BPP;
-                break;
-        case 16:
-                if (crtc->fb->depth == 15)
-                        dspcntr |= DISPPLANE_15_16BPP;
-                else
-                        dspcntr |= DISPPLANE_16BPP;
-                break;
-        case 24:
-        case 32:
-                dspcntr |= DISPPLANE_32BPP_NO_ALPHA;
-                break;
-        default:
-                dev_err(dev->dev, "Unknown color depth\n");
-                ret = -EINVAL;
-                goto psb_intel_pipe_set_base_exit;
-        }
-        REG_WRITE(dspcntr_reg, dspcntr);
-
-        dev_dbg(dev->dev,
-                "Writing base %08lX %08lX %d %d\n", start, offset, x, y);
-
-        REG_WRITE(dspbase, offset);
-        REG_READ(dspbase);
-        REG_WRITE(dspsurf, start);
-        REG_READ(dspsurf);
-
-psb_intel_pipe_cleaner:
-        /* If there was a previous display we can now unpin it */
-        if (old_fb)
-                psb_gtt_unpin(to_psb_fb(old_fb)->gtt);
-
-psb_intel_pipe_set_base_exit:
-        gma_power_end(dev);
-        return ret;
-}
-
-/**
- * Sets the power management mode of the pipe and plane.
- *
- * This code should probably grow support for turning the cursor off and back
- * on appropriately at the same time as we're turning the pipe off/on.
- */
-static void cdv_intel_crtc_dpms(struct drm_crtc *crtc, int mode)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
-        int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
-        int dspbase_reg = (pipe == 0) ? DSPABASE : DSPBBASE;
-        int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
-        u32 temp;
-        bool enabled;
-
-        /* XXX: When our outputs are all unaware of DPMS modes other than off
-         * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.
-         */
-        switch (mode) {
-        case DRM_MODE_DPMS_ON:
-        case DRM_MODE_DPMS_STANDBY:
-        case DRM_MODE_DPMS_SUSPEND:
-                /* Enable the DPLL */
-                temp = REG_READ(dpll_reg);
-                if ((temp & DPLL_VCO_ENABLE) == 0) {
-                        REG_WRITE(dpll_reg, temp);
-                        REG_READ(dpll_reg);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                        REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);
-                        REG_READ(dpll_reg);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                        REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);
-                        REG_READ(dpll_reg);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                }
-
-                /* Jim Bish - switch plan and pipe per scott */
-                /* Enable the plane */
-                temp = REG_READ(dspcntr_reg);
-                if ((temp & DISPLAY_PLANE_ENABLE) == 0) {
-                        REG_WRITE(dspcntr_reg,
-                                  temp | DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));
-                }
-
-                udelay(150);
-
-                /* Enable the pipe */
-                temp = REG_READ(pipeconf_reg);
-                if ((temp & PIPEACONF_ENABLE) == 0)
-                        REG_WRITE(pipeconf_reg, temp | PIPEACONF_ENABLE);
-
-                psb_intel_crtc_load_lut(crtc);
-
-                /* Give the overlay scaler a chance to enable
-                 * if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, true); TODO */
-                break;
-        case DRM_MODE_DPMS_OFF:
-                /* Give the overlay scaler a chance to disable
-                 * if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, FALSE); TODO */
-
-                /* Disable the VGA plane that we never use */
-                REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);
-
-                /* Jim Bish - changed pipe/plane here as well. */
-
-                /* Wait for vblank for the disable to take effect */
-                cdv_intel_wait_for_vblank(dev);
-
-                /* Next, disable display pipes */
-                temp = REG_READ(pipeconf_reg);
-                if ((temp & PIPEACONF_ENABLE) != 0) {
-                        REG_WRITE(pipeconf_reg, temp & ~PIPEACONF_ENABLE);
-                        REG_READ(pipeconf_reg);
-                }
-
-                /* Wait for vblank for the disable to take effect. */
-                cdv_intel_wait_for_vblank(dev);
-
-                udelay(150);
-
-                /* Disable display plane */
-                temp = REG_READ(dspcntr_reg);
-                if ((temp & DISPLAY_PLANE_ENABLE) != 0) {
-                        REG_WRITE(dspcntr_reg,
-                                  temp & ~DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));
-                        REG_READ(dspbase_reg);
-                }
-
-                temp = REG_READ(dpll_reg);
-                if ((temp & DPLL_VCO_ENABLE) != 0) {
-                        REG_WRITE(dpll_reg, temp & ~DPLL_VCO_ENABLE);
-                        REG_READ(dpll_reg);
-                }
-
-                /* Wait for the clocks to turn off. */
-                udelay(150);
-                break;
-        }
-        enabled = crtc->enabled && mode != DRM_MODE_DPMS_OFF;
-        /*Set FIFO Watermarks*/
-        REG_WRITE(DSPARB, 0x3F3E);
-}
-
-static void cdv_intel_crtc_prepare(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
-}
-
-static void cdv_intel_crtc_commit(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-}
-
-void cdv_intel_encoder_prepare(struct drm_encoder *encoder)
-{
-        struct drm_encoder_helper_funcs *encoder_funcs =
-            encoder->helper_private;
-        /* lvds has its own version of prepare see cdv_intel_lvds_prepare */
-        encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF);
-}
-
-void cdv_intel_encoder_commit(struct drm_encoder *encoder)
-{
-        struct drm_encoder_helper_funcs *encoder_funcs =
-            encoder->helper_private;
-        /* lvds has its own version of commit see cdv_intel_lvds_commit */
-        encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
-}
-
-static bool cdv_intel_crtc_mode_fixup(struct drm_crtc *crtc,
-                                  struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
-
-/**
- * Return the pipe currently connected to the panel fitter,
- * or -1 if the panel fitter is not present or not in use
- */
-static int cdv_intel_panel_fitter_pipe(struct drm_device *dev)
-{
-        u32 pfit_control;
-
-        pfit_control = REG_READ(PFIT_CONTROL);
-
-        /* See if the panel fitter is in use */
-        if ((pfit_control & PFIT_ENABLE) == 0)
-                return -1;
-        return (pfit_control >> 29) & 0x3;
-}
-
-static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,
-                               struct drm_display_mode *mode,
-                               struct drm_display_mode *adjusted_mode,
-                               int x, int y,
-                               struct drm_framebuffer *old_fb)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
-        int dpll_md_reg = (psb_intel_crtc->pipe == 0) ? DPLL_A_MD : DPLL_B_MD;
-        int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
-        int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
-        int htot_reg = (pipe == 0) ? HTOTAL_A : HTOTAL_B;
-        int hblank_reg = (pipe == 0) ? HBLANK_A : HBLANK_B;
-        int hsync_reg = (pipe == 0) ? HSYNC_A : HSYNC_B;
-        int vtot_reg = (pipe == 0) ? VTOTAL_A : VTOTAL_B;
-        int vblank_reg = (pipe == 0) ? VBLANK_A : VBLANK_B;
-        int vsync_reg = (pipe == 0) ? VSYNC_A : VSYNC_B;
-        int dspsize_reg = (pipe == 0) ? DSPASIZE : DSPBSIZE;
-        int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;
-        int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
-        int refclk;
-        struct cdv_intel_clock_t clock;
-        u32 dpll = 0, dspcntr, pipeconf;
-        bool ok, is_sdvo = false, is_dvo = false;
-        bool is_crt = false, is_lvds = false, is_tv = false;
-        bool is_hdmi = false;
-        struct drm_mode_config *mode_config = &dev->mode_config;
-        struct drm_connector *connector;
-
-        list_for_each_entry(connector, &mode_config->connector_list, head) {
-                struct psb_intel_output *psb_intel_output =
-                    to_psb_intel_output(connector);
-
-                if (!connector->encoder
-                    || connector->encoder->crtc != crtc)
-                        continue;
-
-                switch (psb_intel_output->type) {
-                case INTEL_OUTPUT_LVDS:
-                        is_lvds = true;
-                        break;
-                case INTEL_OUTPUT_SDVO:
-                        is_sdvo = true;
-                        break;
-                case INTEL_OUTPUT_DVO:
-                        is_dvo = true;
-                        break;
-                case INTEL_OUTPUT_TVOUT:
-                        is_tv = true;
-                        break;
-                case INTEL_OUTPUT_ANALOG:
-                        is_crt = true;
-                        break;
-                case INTEL_OUTPUT_HDMI:
-                        is_hdmi = true;
-                        break;
-                }
-        }
-
-        refclk = 96000;
-
-        /* Hack selection about ref clk for CRT */
-        /* Select 27MHz as the reference clk for HDMI */
-        if (is_crt || is_hdmi)
-                refclk = 27000;
-
-        drm_mode_debug_printmodeline(adjusted_mode);
-
-        ok = cdv_intel_find_best_PLL(crtc, adjusted_mode->clock, refclk,
-                                 &clock);
-        if (!ok) {
-                dev_err(dev->dev, "Couldn't find PLL settings for mode!\n");
-                return 0;
-        }
-
-        dpll = DPLL_VGA_MODE_DIS;
-        if (is_tv) {
-                /* XXX: just matching BIOS for now */
-/*      dpll |= PLL_REF_INPUT_TVCLKINBC; */
-                dpll |= 3;
-        }
-                dpll |= PLL_REF_INPUT_DREFCLK;
-
-        dpll |= DPLL_SYNCLOCK_ENABLE;
-        dpll |= DPLL_VGA_MODE_DIS;
-        if (is_lvds)
-                dpll |= DPLLB_MODE_LVDS;
-        else
-                dpll |= DPLLB_MODE_DAC_SERIAL;
-        /* dpll |= (2 << 11); */
-
-        /* setup pipeconf */
-        pipeconf = REG_READ(pipeconf_reg);
-
-        /* Set up the display plane register */
-        dspcntr = DISPPLANE_GAMMA_ENABLE;
-
-        if (pipe == 0)
-                dspcntr |= DISPPLANE_SEL_PIPE_A;
-        else
-                dspcntr |= DISPPLANE_SEL_PIPE_B;
-
-        dspcntr |= DISPLAY_PLANE_ENABLE;
-        pipeconf |= PIPEACONF_ENABLE;
-
-        REG_WRITE(dpll_reg, dpll | DPLL_VGA_MODE_DIS | DPLL_SYNCLOCK_ENABLE);
-        REG_READ(dpll_reg);
-
-        cdv_dpll_set_clock_cdv(dev, crtc, &clock);
-
-        udelay(150);
-
-
-        /* The LVDS pin pair needs to be on before the DPLLs are enabled.
-         * This is an exception to the general rule that mode_set doesn't turn
-         * things on.
-         */
-        if (is_lvds) {
-                u32 lvds = REG_READ(LVDS);
-
-                lvds |=
-                    LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP |
-                    LVDS_PIPEB_SELECT;
-                /* Set the B0-B3 data pairs corresponding to
-                 * whether we're going to
-                 * set the DPLLs for dual-channel mode or not.
-                 */
-                if (clock.p2 == 7)
-                        lvds |= LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP;
-                else
-                        lvds &= ~(LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP);
-
-                /* It would be nice to set 24 vs 18-bit mode (LVDS_A3_POWER_UP)
-                 * appropriately here, but we need to look more
-                 * thoroughly into how panels behave in the two modes.
-                 */
-
-                REG_WRITE(LVDS, lvds);
-                REG_READ(LVDS);
-        }
-
-        dpll |= DPLL_VCO_ENABLE;
-
-        /* Disable the panel fitter if it was on our pipe */
-        if (cdv_intel_panel_fitter_pipe(dev) == pipe)
-                REG_WRITE(PFIT_CONTROL, 0);
-
-        DRM_DEBUG_KMS("Mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');
-        drm_mode_debug_printmodeline(mode);
-
-        REG_WRITE(dpll_reg,
-                (REG_READ(dpll_reg) & ~DPLL_LOCK) | DPLL_VCO_ENABLE);
-        REG_READ(dpll_reg);
-        /* Wait for the clocks to stabilize. */
-        udelay(150); /* 42 usec w/o calibration, 110 with.  rounded up. */
-
-        if (!(REG_READ(dpll_reg) & DPLL_LOCK)) {
-                dev_err(dev->dev, "Failed to get DPLL lock\n");
-                return -EBUSY;
-        }
-
-        {
-                int sdvo_pixel_multiply = adjusted_mode->clock / mode->clock;
-                REG_WRITE(dpll_md_reg, (0 << DPLL_MD_UDI_DIVIDER_SHIFT) | ((sdvo_pixel_multiply - 1) << DPLL_MD_UDI_MULTIPLIER_SHIFT));
-        }
-
-        REG_WRITE(htot_reg, (adjusted_mode->crtc_hdisplay - 1) |
-                  ((adjusted_mode->crtc_htotal - 1) << 16));
-        REG_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - 1) |
-                  ((adjusted_mode->crtc_hblank_end - 1) << 16));
-        REG_WRITE(hsync_reg, (adjusted_mode->crtc_hsync_start - 1) |
-                  ((adjusted_mode->crtc_hsync_end - 1) << 16));
-        REG_WRITE(vtot_reg, (adjusted_mode->crtc_vdisplay - 1) |
-                  ((adjusted_mode->crtc_vtotal - 1) << 16));
-        REG_WRITE(vblank_reg, (adjusted_mode->crtc_vblank_start - 1) |
-                  ((adjusted_mode->crtc_vblank_end - 1) << 16));
-        REG_WRITE(vsync_reg, (adjusted_mode->crtc_vsync_start - 1) |
-                  ((adjusted_mode->crtc_vsync_end - 1) << 16));
-        /* pipesrc and dspsize control the size that is scaled from,
-         * which should always be the user's requested size.
-         */
-        REG_WRITE(dspsize_reg,
-                  ((mode->vdisplay - 1) << 16) | (mode->hdisplay - 1));
-        REG_WRITE(dsppos_reg, 0);
-        REG_WRITE(pipesrc_reg,
-                  ((mode->hdisplay - 1) << 16) | (mode->vdisplay - 1));
-        REG_WRITE(pipeconf_reg, pipeconf);
-        REG_READ(pipeconf_reg);
-
-        cdv_intel_wait_for_vblank(dev);
-
-        REG_WRITE(dspcntr_reg, dspcntr);
-
-        /* Flush the plane changes */
-        {
-                struct drm_crtc_helper_funcs *crtc_funcs =
-                    crtc->helper_private;
-                crtc_funcs->mode_set_base(crtc, x, y, old_fb);
-        }
-
-        cdv_intel_wait_for_vblank(dev);
-
-        return 0;
-}
-
-/** Loads the palette/gamma unit for the CRTC with the prepared values */
-void cdv_intel_crtc_load_lut(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv =
-                                (struct drm_psb_private *)dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int palreg = PALETTE_A;
-        int i;
-
-        /* The clocks have to be on to load the palette. */
-        if (!crtc->enabled)
-                return;
-
-        switch (psb_intel_crtc->pipe) {
-        case 0:
-                break;
-        case 1:
-                palreg = PALETTE_B;
-                break;
-        case 2:
-                palreg = PALETTE_C;
-                break;
-        default:
-                dev_err(dev->dev, "Illegal Pipe Number.\n");
-                return;
-        }
-
-        if (gma_power_begin(dev, false)) {
-                for (i = 0; i < 256; i++) {
-                        REG_WRITE(palreg + 4 * i,
-                                  ((psb_intel_crtc->lut_r[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 16) |
-                                  ((psb_intel_crtc->lut_g[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 8) |
-                                  (psb_intel_crtc->lut_b[i] +
-                                  psb_intel_crtc->lut_adj[i]));
-                }
-                gma_power_end(dev);
-        } else {
-                for (i = 0; i < 256; i++) {
-                        dev_priv->save_palette_a[i] =
-                                  ((psb_intel_crtc->lut_r[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 16) |
-                                  ((psb_intel_crtc->lut_g[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 8) |
-                                  (psb_intel_crtc->lut_b[i] +
-                                  psb_intel_crtc->lut_adj[i]);
-                }
-
-        }
-}
-
-/**
- * Save HW states of giving crtc
- */
-static void cdv_intel_crtc_save(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        /* struct drm_psb_private *dev_priv =
-                        (struct drm_psb_private *)dev->dev_private; */
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct psb_intel_crtc_state *crtc_state = psb_intel_crtc->crtc_state;
-        int pipeA = (psb_intel_crtc->pipe == 0);
-        uint32_t paletteReg;
-        int i;
-
-        if (!crtc_state) {
-                dev_dbg(dev->dev, "No CRTC state found\n");
-                return;
-        }
-
-        crtc_state->saveDSPCNTR = REG_READ(pipeA ? DSPACNTR : DSPBCNTR);
-        crtc_state->savePIPECONF = REG_READ(pipeA ? PIPEACONF : PIPEBCONF);
-        crtc_state->savePIPESRC = REG_READ(pipeA ? PIPEASRC : PIPEBSRC);
-        crtc_state->saveFP0 = REG_READ(pipeA ? FPA0 : FPB0);
-        crtc_state->saveFP1 = REG_READ(pipeA ? FPA1 : FPB1);
-        crtc_state->saveDPLL = REG_READ(pipeA ? DPLL_A : DPLL_B);
-        crtc_state->saveHTOTAL = REG_READ(pipeA ? HTOTAL_A : HTOTAL_B);
-        crtc_state->saveHBLANK = REG_READ(pipeA ? HBLANK_A : HBLANK_B);
-        crtc_state->saveHSYNC = REG_READ(pipeA ? HSYNC_A : HSYNC_B);
-        crtc_state->saveVTOTAL = REG_READ(pipeA ? VTOTAL_A : VTOTAL_B);
-        crtc_state->saveVBLANK = REG_READ(pipeA ? VBLANK_A : VBLANK_B);
-        crtc_state->saveVSYNC = REG_READ(pipeA ? VSYNC_A : VSYNC_B);
-        crtc_state->saveDSPSTRIDE = REG_READ(pipeA ? DSPASTRIDE : DSPBSTRIDE);
-
-        /*NOTE: DSPSIZE DSPPOS only for psb*/
-        crtc_state->saveDSPSIZE = REG_READ(pipeA ? DSPASIZE : DSPBSIZE);
-        crtc_state->saveDSPPOS = REG_READ(pipeA ? DSPAPOS : DSPBPOS);
-
-        crtc_state->saveDSPBASE = REG_READ(pipeA ? DSPABASE : DSPBBASE);
-
-        DRM_DEBUG("(%x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x)\n",
-                        crtc_state->saveDSPCNTR,
-                        crtc_state->savePIPECONF,
-                        crtc_state->savePIPESRC,
-                        crtc_state->saveFP0,
-                        crtc_state->saveFP1,
-                        crtc_state->saveDPLL,
-                        crtc_state->saveHTOTAL,
-                        crtc_state->saveHBLANK,
-                        crtc_state->saveHSYNC,
-                        crtc_state->saveVTOTAL,
-                        crtc_state->saveVBLANK,
-                        crtc_state->saveVSYNC,
-                        crtc_state->saveDSPSTRIDE,
-                        crtc_state->saveDSPSIZE,
-                        crtc_state->saveDSPPOS,
-                        crtc_state->saveDSPBASE
-                );
-
-        paletteReg = pipeA ? PALETTE_A : PALETTE_B;
-        for (i = 0; i < 256; ++i)
-                crtc_state->savePalette[i] = REG_READ(paletteReg + (i << 2));
-}
-
-/**
- * Restore HW states of giving crtc
- */
-static void cdv_intel_crtc_restore(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        /* struct drm_psb_private * dev_priv =
-                                (struct drm_psb_private *)dev->dev_private; */
-        struct psb_intel_crtc *psb_intel_crtc =  to_psb_intel_crtc(crtc);
-        struct psb_intel_crtc_state *crtc_state = psb_intel_crtc->crtc_state;
-        /* struct drm_crtc_helper_funcs * crtc_funcs = crtc->helper_private; */
-        int pipeA = (psb_intel_crtc->pipe == 0);
-        uint32_t paletteReg;
-        int i;
-
-        if (!crtc_state) {
-                dev_dbg(dev->dev, "No crtc state\n");
-                return;
-        }
-
-        DRM_DEBUG(
-                "current:(%x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x)\n",
-                REG_READ(pipeA ? DSPACNTR : DSPBCNTR),
-                REG_READ(pipeA ? PIPEACONF : PIPEBCONF),
-                REG_READ(pipeA ? PIPEASRC : PIPEBSRC),
-                REG_READ(pipeA ? FPA0 : FPB0),
-                REG_READ(pipeA ? FPA1 : FPB1),
-                REG_READ(pipeA ? DPLL_A : DPLL_B),
-                REG_READ(pipeA ? HTOTAL_A : HTOTAL_B),
-                REG_READ(pipeA ? HBLANK_A : HBLANK_B),
-                REG_READ(pipeA ? HSYNC_A : HSYNC_B),
-                REG_READ(pipeA ? VTOTAL_A : VTOTAL_B),
-                REG_READ(pipeA ? VBLANK_A : VBLANK_B),
-                REG_READ(pipeA ? VSYNC_A : VSYNC_B),
-                REG_READ(pipeA ? DSPASTRIDE : DSPBSTRIDE),
-                REG_READ(pipeA ? DSPASIZE : DSPBSIZE),
-                REG_READ(pipeA ? DSPAPOS : DSPBPOS),
-                REG_READ(pipeA ? DSPABASE : DSPBBASE)
-                );
-
-        DRM_DEBUG(
-                "saved: (%x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x)\n",
-                crtc_state->saveDSPCNTR,
-                crtc_state->savePIPECONF,
-                crtc_state->savePIPESRC,
-                crtc_state->saveFP0,
-                crtc_state->saveFP1,
-                crtc_state->saveDPLL,
-                crtc_state->saveHTOTAL,
-                crtc_state->saveHBLANK,
-                crtc_state->saveHSYNC,
-                crtc_state->saveVTOTAL,
-                crtc_state->saveVBLANK,
-                crtc_state->saveVSYNC,
-                crtc_state->saveDSPSTRIDE,
-                crtc_state->saveDSPSIZE,
-                crtc_state->saveDSPPOS,
-                crtc_state->saveDSPBASE
-                );
-
-
-        if (crtc_state->saveDPLL & DPLL_VCO_ENABLE) {
-                REG_WRITE(pipeA ? DPLL_A : DPLL_B,
-                        crtc_state->saveDPLL & ~DPLL_VCO_ENABLE);
-                REG_READ(pipeA ? DPLL_A : DPLL_B);
-                DRM_DEBUG("write dpll: %x\n",
-                                REG_READ(pipeA ? DPLL_A : DPLL_B));
-                udelay(150);
-        }
-
-        REG_WRITE(pipeA ? FPA0 : FPB0, crtc_state->saveFP0);
-        REG_READ(pipeA ? FPA0 : FPB0);
-
-        REG_WRITE(pipeA ? FPA1 : FPB1, crtc_state->saveFP1);
-        REG_READ(pipeA ? FPA1 : FPB1);
-
-        REG_WRITE(pipeA ? DPLL_A : DPLL_B, crtc_state->saveDPLL);
-        REG_READ(pipeA ? DPLL_A : DPLL_B);
-        udelay(150);
-
-        REG_WRITE(pipeA ? HTOTAL_A : HTOTAL_B, crtc_state->saveHTOTAL);
-        REG_WRITE(pipeA ? HBLANK_A : HBLANK_B, crtc_state->saveHBLANK);
-        REG_WRITE(pipeA ? HSYNC_A : HSYNC_B, crtc_state->saveHSYNC);
-        REG_WRITE(pipeA ? VTOTAL_A : VTOTAL_B, crtc_state->saveVTOTAL);
-        REG_WRITE(pipeA ? VBLANK_A : VBLANK_B, crtc_state->saveVBLANK);
-        REG_WRITE(pipeA ? VSYNC_A : VSYNC_B, crtc_state->saveVSYNC);
-        REG_WRITE(pipeA ? DSPASTRIDE : DSPBSTRIDE, crtc_state->saveDSPSTRIDE);
-
-        REG_WRITE(pipeA ? DSPASIZE : DSPBSIZE, crtc_state->saveDSPSIZE);
-        REG_WRITE(pipeA ? DSPAPOS : DSPBPOS, crtc_state->saveDSPPOS);
-
-        REG_WRITE(pipeA ? PIPEASRC : PIPEBSRC, crtc_state->savePIPESRC);
-        REG_WRITE(pipeA ? DSPABASE : DSPBBASE, crtc_state->saveDSPBASE);
-        REG_WRITE(pipeA ? PIPEACONF : PIPEBCONF, crtc_state->savePIPECONF);
-
-        cdv_intel_wait_for_vblank(dev);
-
-        REG_WRITE(pipeA ? DSPACNTR : DSPBCNTR, crtc_state->saveDSPCNTR);
-        REG_WRITE(pipeA ? DSPABASE : DSPBBASE, crtc_state->saveDSPBASE);
-
-        cdv_intel_wait_for_vblank(dev);
-
-        paletteReg = pipeA ? PALETTE_A : PALETTE_B;
-        for (i = 0; i < 256; ++i)
-                REG_WRITE(paletteReg + (i << 2), crtc_state->savePalette[i]);
-}
-
-static int cdv_intel_crtc_cursor_set(struct drm_crtc *crtc,
-                                 struct drm_file *file_priv,
-                                 uint32_t handle,
-                                 uint32_t width, uint32_t height)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;
-        uint32_t base = (pipe == 0) ? CURABASE : CURBBASE;
-        uint32_t temp;
-        size_t addr = 0;
-        struct gtt_range *gt;
-        struct drm_gem_object *obj;
-        int ret;
-
-        /* if we want to turn of the cursor ignore width and height */
-        if (!handle) {
-                /* turn off the cursor */
-                temp = CURSOR_MODE_DISABLE;
-
-                if (gma_power_begin(dev, false)) {
-                        REG_WRITE(control, temp);
-                        REG_WRITE(base, 0);
-                        gma_power_end(dev);
-                }
-
-                /* unpin the old GEM object */
-                if (psb_intel_crtc->cursor_obj) {
-                        gt = container_of(psb_intel_crtc->cursor_obj,
-                                                        struct gtt_range, gem);
-                        psb_gtt_unpin(gt);
-                        drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-                        psb_intel_crtc->cursor_obj = NULL;
-                }
-
-                return 0;
-        }
-
-        /* Currently we only support 64x64 cursors */
-        if (width != 64 || height != 64) {
-                dev_dbg(dev->dev, "we currently only support 64x64 cursors\n");
-                return -EINVAL;
-        }
-
-        obj = drm_gem_object_lookup(dev, file_priv, handle);
-        if (!obj)
-                return -ENOENT;
-
-        if (obj->size < width * height * 4) {
-                dev_dbg(dev->dev, "buffer is to small\n");
-                return -ENOMEM;
-        }
-
-        gt = container_of(obj, struct gtt_range, gem);
-
-        /* Pin the memory into the GTT */
-        ret = psb_gtt_pin(gt);
-        if (ret) {
-                dev_err(dev->dev, "Can not pin down handle 0x%x\n", handle);
-                return ret;
-        }
-
-        addr = gt->offset;      /* Or resource.start ??? */
-
-        psb_intel_crtc->cursor_addr = addr;
-
-        temp = 0;
-        /* set the pipe for the cursor */
-        temp |= (pipe << 28);
-        temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
-
-        if (gma_power_begin(dev, false)) {
-                REG_WRITE(control, temp);
-                REG_WRITE(base, addr);
-                gma_power_end(dev);
-        }
-
-        /* unpin the old GEM object */
-        if (psb_intel_crtc->cursor_obj) {
-                gt = container_of(psb_intel_crtc->cursor_obj,
-                                                        struct gtt_range, gem);
-                psb_gtt_unpin(gt);
-                drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-                psb_intel_crtc->cursor_obj = obj;
-        }
-        return 0;
-}
-
-static int cdv_intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        uint32_t temp = 0;
-        uint32_t adder;
-
-
-        if (x < 0) {
-                temp |= (CURSOR_POS_SIGN << CURSOR_X_SHIFT);
-                x = -x;
-        }
-        if (y < 0) {
-                temp |= (CURSOR_POS_SIGN << CURSOR_Y_SHIFT);
-                y = -y;
-        }
-
-        temp |= ((x & CURSOR_POS_MASK) << CURSOR_X_SHIFT);
-        temp |= ((y & CURSOR_POS_MASK) << CURSOR_Y_SHIFT);
-
-        adder = psb_intel_crtc->cursor_addr;
-
-        if (gma_power_begin(dev, false)) {
-                REG_WRITE((pipe == 0) ? CURAPOS : CURBPOS, temp);
-                REG_WRITE((pipe == 0) ? CURABASE : CURBBASE, adder);
-                gma_power_end(dev);
-        }
-        return 0;
-}
-
-static void cdv_intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,
-                         u16 *green, u16 *blue, uint32_t start, uint32_t size)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int i;
-        int end = (start + size > 256) ? 256 : start + size;
-
-        for (i = start; i < end; i++) {
-                psb_intel_crtc->lut_r[i] = red[i] >> 8;
-                psb_intel_crtc->lut_g[i] = green[i] >> 8;
-                psb_intel_crtc->lut_b[i] = blue[i] >> 8;
-        }
-
-        cdv_intel_crtc_load_lut(crtc);
-}
-
-static int cdv_crtc_set_config(struct drm_mode_set *set)
-{
-        int ret = 0;
-        struct drm_device *dev = set->crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (!dev_priv->rpm_enabled)
-                return drm_crtc_helper_set_config(set);
-
-        pm_runtime_forbid(&dev->pdev->dev);
-
-        ret = drm_crtc_helper_set_config(set);
-
-        pm_runtime_allow(&dev->pdev->dev);
-
-        return ret;
-}
-
-/** Derive the pixel clock for the given refclk and divisors for 8xx chips. */
-
-/* FIXME: why are we using this, should it be cdv_ in this tree ? */
-
-static void i8xx_clock(int refclk, struct cdv_intel_clock_t *clock)
-{
-        clock->m = 5 * (clock->m1 + 2) + (clock->m2 + 2);
-        clock->p = clock->p1 * clock->p2;
-        clock->vco = refclk * clock->m / (clock->n + 2);
-        clock->dot = clock->vco / clock->p;
-}
-
-/* Returns the clock of the currently programmed mode of the given pipe. */
-static int cdv_intel_crtc_clock_get(struct drm_device *dev,
-                                struct drm_crtc *crtc)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        u32 dpll;
-        u32 fp;
-        struct cdv_intel_clock_t clock;
-        bool is_lvds;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (gma_power_begin(dev, false)) {
-                dpll = REG_READ((pipe == 0) ? DPLL_A : DPLL_B);
-                if ((dpll & DISPLAY_RATE_SELECT_FPA1) == 0)
-                        fp = REG_READ((pipe == 0) ? FPA0 : FPB0);
-                else
-                        fp = REG_READ((pipe == 0) ? FPA1 : FPB1);
-                is_lvds = (pipe == 1) && (REG_READ(LVDS) & LVDS_PORT_EN);
-                gma_power_end(dev);
-        } else {
-                dpll = (pipe == 0) ?
-                        dev_priv->saveDPLL_A : dev_priv->saveDPLL_B;
-
-                if ((dpll & DISPLAY_RATE_SELECT_FPA1) == 0)
-                        fp = (pipe == 0) ?
-                                dev_priv->saveFPA0 :
-                                dev_priv->saveFPB0;
-                else
-                        fp = (pipe == 0) ?
-                                dev_priv->saveFPA1 :
-                                dev_priv->saveFPB1;
-
-                is_lvds = (pipe == 1) && (dev_priv->saveLVDS & LVDS_PORT_EN);
-        }
-
-        clock.m1 = (fp & FP_M1_DIV_MASK) >> FP_M1_DIV_SHIFT;
-        clock.m2 = (fp & FP_M2_DIV_MASK) >> FP_M2_DIV_SHIFT;
-        clock.n = (fp & FP_N_DIV_MASK) >> FP_N_DIV_SHIFT;
-
-        if (is_lvds) {
-                clock.p1 =
-                    ffs((dpll &
-                         DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS) >>
-                        DPLL_FPA01_P1_POST_DIV_SHIFT);
-                if (clock.p1 == 0) {
-                        clock.p1 = 4;
-                        dev_err(dev->dev, "PLL %d\n", dpll);
-                }
-                clock.p2 = 14;
-
-                if ((dpll & PLL_REF_INPUT_MASK) ==
-                    PLLB_REF_INPUT_SPREADSPECTRUMIN) {
-                        /* XXX: might not be 66MHz */
-                        i8xx_clock(66000, &clock);
-                } else
-                        i8xx_clock(48000, &clock);
-        } else {
-                if (dpll & PLL_P1_DIVIDE_BY_TWO)
-                        clock.p1 = 2;
-                else {
-                        clock.p1 =
-                            ((dpll &
-                              DPLL_FPA01_P1_POST_DIV_MASK_I830) >>
-                             DPLL_FPA01_P1_POST_DIV_SHIFT) + 2;
-                }
-                if (dpll & PLL_P2_DIVIDE_BY_4)
-                        clock.p2 = 4;
-                else
-                        clock.p2 = 2;
-
-                i8xx_clock(48000, &clock);
-        }
-
-        /* XXX: It would be nice to validate the clocks, but we can't reuse
-         * i830PllIsValid() because it relies on the xf86_config connector
-         * configuration being accurate, which it isn't necessarily.
-         */
-
-        return clock.dot;
-}
-
-/** Returns the currently programmed mode of the given pipe. */
-struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,
-                                             struct drm_crtc *crtc)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        struct drm_display_mode *mode;
-        int htot;
-        int hsync;
-        int vtot;
-        int vsync;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (gma_power_begin(dev, false)) {
-                htot = REG_READ((pipe == 0) ? HTOTAL_A : HTOTAL_B);
-                hsync = REG_READ((pipe == 0) ? HSYNC_A : HSYNC_B);
-                vtot = REG_READ((pipe == 0) ? VTOTAL_A : VTOTAL_B);
-                vsync = REG_READ((pipe == 0) ? VSYNC_A : VSYNC_B);
-                gma_power_end(dev);
-        } else {
-                htot = (pipe == 0) ?
-                        dev_priv->saveHTOTAL_A : dev_priv->saveHTOTAL_B;
-                hsync = (pipe == 0) ?
-                        dev_priv->saveHSYNC_A : dev_priv->saveHSYNC_B;
-                vtot = (pipe == 0) ?
-                        dev_priv->saveVTOTAL_A : dev_priv->saveVTOTAL_B;
-                vsync = (pipe == 0) ?
-                        dev_priv->saveVSYNC_A : dev_priv->saveVSYNC_B;
-        }
-
-        mode = kzalloc(sizeof(*mode), GFP_KERNEL);
-        if (!mode)
-                return NULL;
-
-        mode->clock = cdv_intel_crtc_clock_get(dev, crtc);
-        mode->hdisplay = (htot & 0xffff) + 1;
-        mode->htotal = ((htot & 0xffff0000) >> 16) + 1;
-        mode->hsync_start = (hsync & 0xffff) + 1;
-        mode->hsync_end = ((hsync & 0xffff0000) >> 16) + 1;
-        mode->vdisplay = (vtot & 0xffff) + 1;
-        mode->vtotal = ((vtot & 0xffff0000) >> 16) + 1;
-        mode->vsync_start = (vsync & 0xffff) + 1;
-        mode->vsync_end = ((vsync & 0xffff0000) >> 16) + 1;
-
-        drm_mode_set_name(mode);
-        drm_mode_set_crtcinfo(mode, 0);
-
-        return mode;
-}
-
-static void cdv_intel_crtc_destroy(struct drm_crtc *crtc)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-
-        kfree(psb_intel_crtc->crtc_state);
-        drm_crtc_cleanup(crtc);
-        kfree(psb_intel_crtc);
-}
-
-const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = {
-        .dpms = cdv_intel_crtc_dpms,
-        .mode_fixup = cdv_intel_crtc_mode_fixup,
-        .mode_set = cdv_intel_crtc_mode_set,
-        .mode_set_base = cdv_intel_pipe_set_base,
-        .prepare = cdv_intel_crtc_prepare,
-        .commit = cdv_intel_crtc_commit,
-};
-
-const struct drm_crtc_funcs cdv_intel_crtc_funcs = {
-        .save = cdv_intel_crtc_save,
-        .restore = cdv_intel_crtc_restore,
-        .cursor_set = cdv_intel_crtc_cursor_set,
-        .cursor_move = cdv_intel_crtc_cursor_move,
-        .gamma_set = cdv_intel_crtc_gamma_set,
-        .set_config = cdv_crtc_set_config,
-        .destroy = cdv_intel_crtc_destroy,
-};
-
-/*
- * Set the default value of cursor control and base register
- * to zero. This is a workaround for h/w defect on oaktrail
- */
-void cdv_intel_cursor_init(struct drm_device *dev, int pipe)
-{
-        uint32_t control;
-        uint32_t base;
-
-        switch (pipe) {
-        case 0:
-                control = CURACNTR;
-                base = CURABASE;
-                break;
-        case 1:
-                control = CURBCNTR;
-                base = CURBBASE;
-                break;
-        case 2:
-                control = CURCCNTR;
-                base = CURCBASE;
-                break;
-        default:
-                return;
-        }
-
-        REG_WRITE(control, 0);
-        REG_WRITE(base, 0);
-}
-
diff --git a/drivers/staging/gma500/cdv_intel_hdmi.c b/drivers/staging/gma500/cdv_intel_hdmi.c
deleted file mode 100644
index cbca2b0c7d58..000000000000
--- a/drivers/staging/gma500/cdv_intel_hdmi.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Copyright © 2006-2011 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *      jim liu <jim.liu@intel.com>
- *
- * FIXME:
- *      We should probably make this generic and share it with Medfield
- */
-
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_edid.h>
-#include "psb_intel_drv.h"
-#include "psb_drv.h"
-#include "psb_intel_reg.h"
-#include <linux/pm_runtime.h>
-
-/* hdmi control bits */
-#define HDMI_NULL_PACKETS_DURING_VSYNC  (1 << 9)
-#define HDMI_BORDER_ENABLE              (1 << 7)
-#define HDMI_AUDIO_ENABLE               (1 << 6)
-#define HDMI_VSYNC_ACTIVE_HIGH          (1 << 4)
-#define HDMI_HSYNC_ACTIVE_HIGH          (1 << 3)
-/* hdmi-b control bits */
-#define HDMIB_PIPE_B_SELECT             (1 << 30)
-
-
-struct mid_intel_hdmi_priv {
-        u32 hdmi_reg;
-        u32 save_HDMIB;
-        bool has_hdmi_sink;
-        bool has_hdmi_audio;
-        /* Should set this when detect hotplug */
-        bool hdmi_device_connected;
-        struct mdfld_hdmi_i2c *i2c_bus;
-        struct i2c_adapter *hdmi_i2c_adapter;   /* for control functions */
-        struct drm_device *dev;
-};
-
-static void cdv_hdmi_mode_set(struct drm_encoder *encoder,
-                        struct drm_display_mode *mode,
-                        struct drm_display_mode *adjusted_mode)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *output = enc_to_psb_intel_output(encoder);
-        struct mid_intel_hdmi_priv *hdmi_priv = output->dev_priv;
-        u32 hdmib;
-        struct drm_crtc *crtc = encoder->crtc;
-        struct psb_intel_crtc *intel_crtc = to_psb_intel_crtc(crtc);
-
-        hdmib = (2 << 10);
-
-        if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
-                hdmib |= HDMI_VSYNC_ACTIVE_HIGH;
-        if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
-                hdmib |= HDMI_HSYNC_ACTIVE_HIGH;
-
-        if (intel_crtc->pipe == 1)
-                hdmib |= HDMIB_PIPE_B_SELECT;
-
-        if (hdmi_priv->has_hdmi_audio) {
-                hdmib |= HDMI_AUDIO_ENABLE;
-                hdmib |= HDMI_NULL_PACKETS_DURING_VSYNC;
-        }
-
-        REG_WRITE(hdmi_priv->hdmi_reg, hdmib);
-        REG_READ(hdmi_priv->hdmi_reg);
-}
-
-static bool cdv_hdmi_mode_fixup(struct drm_encoder *encoder,
-                                  struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
-static void cdv_hdmi_dpms(struct drm_encoder *encoder, int mode)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *output = enc_to_psb_intel_output(encoder);
-        struct mid_intel_hdmi_priv *hdmi_priv = output->dev_priv;
-        u32 hdmib;
-
-        hdmib = REG_READ(hdmi_priv->hdmi_reg);
-
-        if (mode != DRM_MODE_DPMS_ON)
-                REG_WRITE(hdmi_priv->hdmi_reg, hdmib & ~HDMIB_PORT_EN);
-        else
-                REG_WRITE(hdmi_priv->hdmi_reg, hdmib | HDMIB_PORT_EN);
-        REG_READ(hdmi_priv->hdmi_reg);
-}
-
-static void cdv_hdmi_save(struct drm_connector *connector)
-{
-        struct drm_device *dev = connector->dev;
-        struct psb_intel_output *output = to_psb_intel_output(connector);
-        struct mid_intel_hdmi_priv *hdmi_priv = output->dev_priv;
-
-        hdmi_priv->save_HDMIB = REG_READ(hdmi_priv->hdmi_reg);
-}
-
-static void cdv_hdmi_restore(struct drm_connector *connector)
-{
-        struct drm_device *dev = connector->dev;
-        struct psb_intel_output *output = to_psb_intel_output(connector);
-        struct mid_intel_hdmi_priv *hdmi_priv = output->dev_priv;
-
-        REG_WRITE(hdmi_priv->hdmi_reg, hdmi_priv->save_HDMIB);
-        REG_READ(hdmi_priv->hdmi_reg);
-}
-
-static enum drm_connector_status cdv_hdmi_detect(
-                                struct drm_connector *connector, bool force)
-{
-        struct psb_intel_output *psb_intel_output =
-                                                to_psb_intel_output(connector);
-        struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_output->dev_priv;
-        struct edid *edid = NULL;
-        enum drm_connector_status status = connector_status_disconnected;
-
-        edid = drm_get_edid(&psb_intel_output->base,
-                         psb_intel_output->hdmi_i2c_adapter);
-
-        hdmi_priv->has_hdmi_sink = false;
-        hdmi_priv->has_hdmi_audio = false;
-        if (edid) {
-                if (edid->input & DRM_EDID_INPUT_DIGITAL) {
-                        status = connector_status_connected;
-                        hdmi_priv->has_hdmi_sink =
-                                                drm_detect_hdmi_monitor(edid);
-                        hdmi_priv->has_hdmi_audio =
-                                                drm_detect_monitor_audio(edid);
-                }
-
-                psb_intel_output->base.display_info.raw_edid = NULL;
-                kfree(edid);
-        }
-        return status;
-}
-
-static int cdv_hdmi_set_property(struct drm_connector *connector,
-                                       struct drm_property *property,
-                                       uint64_t value)
-{
-        struct drm_encoder *encoder = connector->encoder;
-
-        if (!strcmp(property->name, "scaling mode") && encoder) {
-                struct psb_intel_crtc *crtc = to_psb_intel_crtc(encoder->crtc);
-                bool centre;
-                uint64_t curValue;
-
-                if (!crtc)
-                        return -1;
-
-                switch (value) {
-                case DRM_MODE_SCALE_FULLSCREEN:
-                        break;
-                case DRM_MODE_SCALE_NO_SCALE:
-                        break;
-                case DRM_MODE_SCALE_ASPECT:
-                        break;
-                default:
-                        return -1;
-                }
-
-                if (drm_connector_property_get_value(connector,
-                                                        property, &curValue))
-                        return -1;
-
-                if (curValue == value)
-                        return 0;
-
-                if (drm_connector_property_set_value(connector,
-                                                        property, value))
-                        return -1;
-
-                centre = (curValue == DRM_MODE_SCALE_NO_SCALE) ||
-                        (value == DRM_MODE_SCALE_NO_SCALE);
-
-                if (crtc->saved_mode.hdisplay != 0 &&
-                    crtc->saved_mode.vdisplay != 0) {
-                        if (centre) {
-                                if (!drm_crtc_helper_set_mode(encoder->crtc, &crtc->saved_mode,
-                                            encoder->crtc->x, encoder->crtc->y, encoder->crtc->fb))
-                                        return -1;
-                        } else {
-                                struct drm_encoder_helper_funcs *helpers
-                                                    = encoder->helper_private;
-                                helpers->mode_set(encoder, &crtc->saved_mode,
-                                             &crtc->saved_adjusted_mode);
-                        }
-                }
-        }
-        return 0;
-}
-
-/*
- * Return the list of HDMI DDC modes if available.
- */
-static int cdv_hdmi_get_modes(struct drm_connector *connector)
-{
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-        struct edid *edid = NULL;
-        int ret = 0;
-
-        edid = drm_get_edid(&psb_intel_output->base,
-                         psb_intel_output->hdmi_i2c_adapter);
-        if (edid) {
-                drm_mode_connector_update_edid_property(&psb_intel_output->
-                                                        base, edid);
-                ret = drm_add_edid_modes(&psb_intel_output->base, edid);
-                kfree(edid);
-        }
-        return ret;
-}
-
-static int cdv_hdmi_mode_valid(struct drm_connector *connector,
-                                 struct drm_display_mode *mode)
-{
-
-        if (mode->clock > 165000)
-                return MODE_CLOCK_HIGH;
-        if (mode->clock < 20000)
-                return MODE_CLOCK_HIGH;
-
-        /* just in case */
-        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return MODE_NO_DBLESCAN;
-
-        /* just in case */
-        if (mode->flags & DRM_MODE_FLAG_INTERLACE)
-                return MODE_NO_INTERLACE;
-
-        /*
-         * FIXME: for now we limit the size to 1680x1050 on CDV, otherwise it
-         * will go beyond the stolen memory size allocated to the framebuffer
-         */
-        if (mode->hdisplay > 1680)
-                return MODE_PANEL;
-        if (mode->vdisplay > 1050)
-                return MODE_PANEL;
-        return MODE_OK;
-}
-
-static void cdv_hdmi_destroy(struct drm_connector *connector)
-{
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-
-        if (psb_intel_output->ddc_bus)
-                psb_intel_i2c_destroy(psb_intel_output->ddc_bus);
-        drm_sysfs_connector_remove(connector);
-        drm_connector_cleanup(connector);
-        kfree(connector);
-}
-
-static const struct drm_encoder_helper_funcs cdv_hdmi_helper_funcs = {
-        .dpms = cdv_hdmi_dpms,
-        .mode_fixup = cdv_hdmi_mode_fixup,
-        .prepare = psb_intel_encoder_prepare,
-        .mode_set = cdv_hdmi_mode_set,
-        .commit = psb_intel_encoder_commit,
-};
-
-static const struct drm_connector_helper_funcs
-                                        cdv_hdmi_connector_helper_funcs = {
-        .get_modes = cdv_hdmi_get_modes,
-        .mode_valid = cdv_hdmi_mode_valid,
-        .best_encoder = psb_intel_best_encoder,
-};
-
-static const struct drm_connector_funcs cdv_hdmi_connector_funcs = {
-        .dpms = drm_helper_connector_dpms,
-        .save = cdv_hdmi_save,
-        .restore = cdv_hdmi_restore,
-        .detect = cdv_hdmi_detect,
-        .fill_modes = drm_helper_probe_single_connector_modes,
-        .set_property = cdv_hdmi_set_property,
-        .destroy = cdv_hdmi_destroy,
-};
-
-void cdv_hdmi_init(struct drm_device *dev,
-                        struct psb_intel_mode_device *mode_dev, int reg)
-{
-        struct psb_intel_output *psb_intel_output;
-        struct drm_connector *connector;
-        struct drm_encoder *encoder;
-        struct mid_intel_hdmi_priv *hdmi_priv;
-        int ddc_bus;
-
-        psb_intel_output = kzalloc(sizeof(struct psb_intel_output) +
-                               sizeof(struct mid_intel_hdmi_priv), GFP_KERNEL);
-        if (!psb_intel_output)
-                return;
-
-        hdmi_priv = (struct mid_intel_hdmi_priv *)(psb_intel_output + 1);
-        psb_intel_output->mode_dev = mode_dev;
-        connector = &psb_intel_output->base;
-        encoder = &psb_intel_output->enc;
-        drm_connector_init(dev, &psb_intel_output->base,
-                           &cdv_hdmi_connector_funcs,
-                           DRM_MODE_CONNECTOR_DVID);
-
-        drm_encoder_init(dev, &psb_intel_output->enc, &psb_intel_lvds_enc_funcs,
-                         DRM_MODE_ENCODER_TMDS);
-
-        drm_mode_connector_attach_encoder(&psb_intel_output->base,
-                                          &psb_intel_output->enc);
-        psb_intel_output->type = INTEL_OUTPUT_HDMI;
-        hdmi_priv->hdmi_reg = reg;
-        hdmi_priv->has_hdmi_sink = false;
-        psb_intel_output->dev_priv = hdmi_priv;
-
-        drm_encoder_helper_add(encoder, &cdv_hdmi_helper_funcs);
-        drm_connector_helper_add(connector,
-                                 &cdv_hdmi_connector_helper_funcs);
-        connector->display_info.subpixel_order = SubPixelHorizontalRGB;
-        connector->interlace_allowed = false;
-        connector->doublescan_allowed = false;
-
-        drm_connector_attach_property(connector,
-            dev->mode_config.scaling_mode_property, DRM_MODE_SCALE_FULLSCREEN);
-
-        switch (reg) {
-        case SDVOB:
-                ddc_bus = GPIOE;
-                break;
-        case SDVOC:
-                ddc_bus = GPIOD;
-                break;
-        default:
-                DRM_ERROR("unknown reg 0x%x for HDMI\n", reg);
-                goto failed_ddc;
-                break;
-        }
-
-        psb_intel_output->ddc_bus = psb_intel_i2c_create(dev,
-                                ddc_bus, (reg == SDVOB) ? "HDMIB" : "HDMIC");
-
-        if (!psb_intel_output->ddc_bus) {
-                dev_err(dev->dev, "No ddc adapter available!\n");
-                goto failed_ddc;
-        }
-        psb_intel_output->hdmi_i2c_adapter =
-                                &(psb_intel_output->ddc_bus->adapter);
-        hdmi_priv->dev = dev;
-        drm_sysfs_connector_add(connector);
-        return;
-
-failed_ddc:
-        drm_encoder_cleanup(&psb_intel_output->enc);
-        drm_connector_cleanup(&psb_intel_output->base);
-        kfree(psb_intel_output);
-}
diff --git a/drivers/staging/gma500/cdv_intel_lvds.c b/drivers/staging/gma500/cdv_intel_lvds.c
deleted file mode 100644
index 988b2d0acf43..000000000000
--- a/drivers/staging/gma500/cdv_intel_lvds.c
+++ /dev/null
@@ -1,721 +0,0 @@
-/*
- * Copyright © 2006-2011 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *      Eric Anholt <eric@anholt.net>
- *      Dave Airlie <airlied@linux.ie>
- *      Jesse Barnes <jesse.barnes@intel.com>
- */
-
-#include <linux/i2c.h>
-#include <linux/dmi.h>
-#include <drm/drmP.h>
-
-#include "intel_bios.h"
-#include "psb_drv.h"
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "power.h"
-#include <linux/pm_runtime.h>
-#include "cdv_device.h"
-
-/**
- * LVDS I2C backlight control macros
- */
-#define BRIGHTNESS_MAX_LEVEL 100
-#define BRIGHTNESS_MASK 0xFF
-#define BLC_I2C_TYPE    0x01
-#define BLC_PWM_TYPT    0x02
-
-#define BLC_POLARITY_NORMAL 0
-#define BLC_POLARITY_INVERSE 1
-
-#define PSB_BLC_MAX_PWM_REG_FREQ       (0xFFFE)
-#define PSB_BLC_MIN_PWM_REG_FREQ        (0x2)
-#define PSB_BLC_PWM_PRECISION_FACTOR    (10)
-#define PSB_BACKLIGHT_PWM_CTL_SHIFT     (16)
-#define PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR (0xFFFE)
-
-struct cdv_intel_lvds_priv {
-        /**
-         * Saved LVDO output states
-         */
-        uint32_t savePP_ON;
-        uint32_t savePP_OFF;
-        uint32_t saveLVDS;
-        uint32_t savePP_CONTROL;
-        uint32_t savePP_CYCLE;
-        uint32_t savePFIT_CONTROL;
-        uint32_t savePFIT_PGM_RATIOS;
-        uint32_t saveBLC_PWM_CTL;
-};
-
-/*
- * Returns the maximum level of the backlight duty cycle field.
- */
-static u32 cdv_intel_lvds_get_max_backlight(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 retval;
-
-        if (gma_power_begin(dev, false)) {
-                retval = ((REG_READ(BLC_PWM_CTL) &
-                          BACKLIGHT_MODULATION_FREQ_MASK) >>
-                          BACKLIGHT_MODULATION_FREQ_SHIFT) * 2;
-
-                gma_power_end(dev);
-        } else
-                retval = ((dev_priv->saveBLC_PWM_CTL &
-                          BACKLIGHT_MODULATION_FREQ_MASK) >>
-                          BACKLIGHT_MODULATION_FREQ_SHIFT) * 2;
-
-        return retval;
-}
-
-/*
- * Set LVDS backlight level by I2C command
- */
-static int cdv_lvds_i2c_set_brightness(struct drm_device *dev,
-                                        unsigned int level)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_i2c_chan *lvds_i2c_bus = dev_priv->lvds_i2c_bus;
-        u8 out_buf[2];
-        unsigned int blc_i2c_brightness;
-
-        struct i2c_msg msgs[] = {
-                {
-                        .addr = lvds_i2c_bus->slave_addr,
-                        .flags = 0,
-                        .len = 2,
-                        .buf = out_buf,
-                }
-        };
-
-        blc_i2c_brightness = BRIGHTNESS_MASK & ((unsigned int)level *
-                             BRIGHTNESS_MASK /
-                             BRIGHTNESS_MAX_LEVEL);
-
-        if (dev_priv->lvds_bl->pol == BLC_POLARITY_INVERSE)
-                blc_i2c_brightness = BRIGHTNESS_MASK - blc_i2c_brightness;
-
-        out_buf[0] = dev_priv->lvds_bl->brightnesscmd;
-        out_buf[1] = (u8)blc_i2c_brightness;
-
-        if (i2c_transfer(&lvds_i2c_bus->adapter, msgs, 1) == 1)
-                return 0;
-
-        DRM_ERROR("I2C transfer error\n");
-        return -1;
-}
-
-
-static int cdv_lvds_pwm_set_brightness(struct drm_device *dev, int level)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        u32 max_pwm_blc;
-        u32 blc_pwm_duty_cycle;
-
-        max_pwm_blc = cdv_intel_lvds_get_max_backlight(dev);
-
-        /*BLC_PWM_CTL Should be initiated while backlight device init*/
-        BUG_ON((max_pwm_blc & PSB_BLC_MAX_PWM_REG_FREQ) == 0);
-
-        blc_pwm_duty_cycle = level * max_pwm_blc / BRIGHTNESS_MAX_LEVEL;
-
-        if (dev_priv->lvds_bl->pol == BLC_POLARITY_INVERSE)
-                blc_pwm_duty_cycle = max_pwm_blc - blc_pwm_duty_cycle;
-
-        blc_pwm_duty_cycle &= PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR;
-        REG_WRITE(BLC_PWM_CTL,
-                  (max_pwm_blc << PSB_BACKLIGHT_PWM_CTL_SHIFT) |
-                  (blc_pwm_duty_cycle));
-
-        return 0;
-}
-
-/*
- * Set LVDS backlight level either by I2C or PWM
- */
-void cdv_intel_lvds_set_brightness(struct drm_device *dev, int level)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (!dev_priv->lvds_bl) {
-                DRM_ERROR("NO LVDS Backlight Info\n");
-                return;
-        }
-
-        if (dev_priv->lvds_bl->type == BLC_I2C_TYPE)
-                cdv_lvds_i2c_set_brightness(dev, level);
-        else
-                cdv_lvds_pwm_set_brightness(dev, level);
-}
-
-/**
- * Sets the backlight level.
- *
- * level backlight level, from 0 to cdv_intel_lvds_get_max_backlight().
- */
-static void cdv_intel_lvds_set_backlight(struct drm_device *dev, int level)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 blc_pwm_ctl;
-
-        if (gma_power_begin(dev, false)) {
-                blc_pwm_ctl =
-                        REG_READ(BLC_PWM_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
-                REG_WRITE(BLC_PWM_CTL,
-                                (blc_pwm_ctl |
-                                (level << BACKLIGHT_DUTY_CYCLE_SHIFT)));
-                gma_power_end(dev);
-        } else {
-                blc_pwm_ctl = dev_priv->saveBLC_PWM_CTL &
-                                ~BACKLIGHT_DUTY_CYCLE_MASK;
-                dev_priv->saveBLC_PWM_CTL = (blc_pwm_ctl |
-                                        (level << BACKLIGHT_DUTY_CYCLE_SHIFT));
-        }
-}
-
-/**
- * Sets the power state for the panel.
- */
-static void cdv_intel_lvds_set_power(struct drm_device *dev,
-                                 struct psb_intel_output *output, bool on)
-{
-        u32 pp_status;
-
-        if (!gma_power_begin(dev, true))
-                return;
-
-        if (on) {
-                REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) |
-                          POWER_TARGET_ON);
-                do {
-                        pp_status = REG_READ(PP_STATUS);
-                } while ((pp_status & PP_ON) == 0);
-
-                cdv_intel_lvds_set_backlight(dev,
-                                         output->
-                                         mode_dev->backlight_duty_cycle);
-        } else {
-                cdv_intel_lvds_set_backlight(dev, 0);
-
-                REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) &
-                          ~POWER_TARGET_ON);
-                do {
-                        pp_status = REG_READ(PP_STATUS);
-                } while (pp_status & PP_ON);
-        }
-        gma_power_end(dev);
-}
-
-static void cdv_intel_lvds_encoder_dpms(struct drm_encoder *encoder, int mode)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *output = enc_to_psb_intel_output(encoder);
-        if (mode == DRM_MODE_DPMS_ON)
-                cdv_intel_lvds_set_power(dev, output, true);
-        else
-                cdv_intel_lvds_set_power(dev, output, false);
-        /* XXX: We never power down the LVDS pairs. */
-}
-
-static void cdv_intel_lvds_save(struct drm_connector *connector)
-{
-}
-
-static void cdv_intel_lvds_restore(struct drm_connector *connector)
-{
-}
-
-int cdv_intel_lvds_mode_valid(struct drm_connector *connector,
-                                 struct drm_display_mode *mode)
-{
-        struct psb_intel_output *psb_intel_output =
-                                to_psb_intel_output(connector);
-        struct drm_display_mode *fixed_mode =
-            psb_intel_output->mode_dev->panel_fixed_mode;
-
-        /* just in case */
-        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return MODE_NO_DBLESCAN;
-
-        /* just in case */
-        if (mode->flags & DRM_MODE_FLAG_INTERLACE)
-                return MODE_NO_INTERLACE;
-
-        if (fixed_mode) {
-                if (mode->hdisplay > fixed_mode->hdisplay)
-                        return MODE_PANEL;
-                if (mode->vdisplay > fixed_mode->vdisplay)
-                        return MODE_PANEL;
-        }
-        return MODE_OK;
-}
-
-bool cdv_intel_lvds_mode_fixup(struct drm_encoder *encoder,
-                                  struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        struct psb_intel_mode_device *mode_dev =
-            enc_to_psb_intel_output(encoder)->mode_dev;
-        struct drm_device *dev = encoder->dev;
-        struct drm_encoder *tmp_encoder;
-        struct drm_display_mode *panel_fixed_mode = mode_dev->panel_fixed_mode;
-
-        /* Should never happen!! */
-        list_for_each_entry(tmp_encoder, &dev->mode_config.encoder_list,
-                            head) {
-                if (tmp_encoder != encoder
-                    && tmp_encoder->crtc == encoder->crtc) {
-                        printk(KERN_ERR "Can't enable LVDS and another "
-                               "encoder on the same pipe\n");
-                        return false;
-                }
-        }
-
-        /*
-         * If we have timings from the BIOS for the panel, put them in
-         * to the adjusted mode.  The CRTC will be set up for this mode,
-         * with the panel scaling set up to source from the H/VDisplay
-         * of the original mode.
-         */
-        if (panel_fixed_mode != NULL) {
-                adjusted_mode->hdisplay = panel_fixed_mode->hdisplay;
-                adjusted_mode->hsync_start = panel_fixed_mode->hsync_start;
-                adjusted_mode->hsync_end = panel_fixed_mode->hsync_end;
-                adjusted_mode->htotal = panel_fixed_mode->htotal;
-                adjusted_mode->vdisplay = panel_fixed_mode->vdisplay;
-                adjusted_mode->vsync_start = panel_fixed_mode->vsync_start;
-                adjusted_mode->vsync_end = panel_fixed_mode->vsync_end;
-                adjusted_mode->vtotal = panel_fixed_mode->vtotal;
-                adjusted_mode->clock = panel_fixed_mode->clock;
-                drm_mode_set_crtcinfo(adjusted_mode,
-                                      CRTC_INTERLACE_HALVE_V);
-        }
-
-        /*
-         * XXX: It would be nice to support lower refresh rates on the
-         * panels to reduce power consumption, and perhaps match the
-         * user's requested refresh rate.
-         */
-
-        return true;
-}
-
-static void cdv_intel_lvds_prepare(struct drm_encoder *encoder)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *output = enc_to_psb_intel_output(encoder);
-        struct psb_intel_mode_device *mode_dev = output->mode_dev;
-
-        if (!gma_power_begin(dev, true))
-                return;
-
-        mode_dev->saveBLC_PWM_CTL = REG_READ(BLC_PWM_CTL);
-        mode_dev->backlight_duty_cycle = (mode_dev->saveBLC_PWM_CTL &
-                                          BACKLIGHT_DUTY_CYCLE_MASK);
-
-        cdv_intel_lvds_set_power(dev, output, false);
-
-        gma_power_end(dev);
-}
-
-static void cdv_intel_lvds_commit(struct drm_encoder *encoder)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *output = enc_to_psb_intel_output(encoder);
-        struct psb_intel_mode_device *mode_dev = output->mode_dev;
-
-        if (mode_dev->backlight_duty_cycle == 0)
-                mode_dev->backlight_duty_cycle =
-                    cdv_intel_lvds_get_max_backlight(dev);
-
-        cdv_intel_lvds_set_power(dev, output, true);
-}
-
-static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder,
-                                struct drm_display_mode *mode,
-                                struct drm_display_mode *adjusted_mode)
-{
-        struct drm_device *dev = encoder->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 pfit_control;
-
-        /*
-         * The LVDS pin pair will already have been turned on in the
-         * cdv_intel_crtc_mode_set since it has a large impact on the DPLL
-         * settings.
-         */
-
-        /*
-         * Enable automatic panel scaling so that non-native modes fill the
-         * screen.  Should be enabled before the pipe is enabled, according to
-         * register description and PRM.
-         */
-        if (mode->hdisplay != adjusted_mode->hdisplay ||
-            mode->vdisplay != adjusted_mode->vdisplay)
-                pfit_control = (PFIT_ENABLE | VERT_AUTO_SCALE |
-                                HORIZ_AUTO_SCALE | VERT_INTERP_BILINEAR |
-                                HORIZ_INTERP_BILINEAR);
-        else
-                pfit_control = 0;
-
-        if (dev_priv->lvds_dither)
-                pfit_control |= PANEL_8TO6_DITHER_ENABLE;
-
-        REG_WRITE(PFIT_CONTROL, pfit_control);
-}
-
-/**
- * Detect the LVDS connection.
- *
- * This always returns CONNECTOR_STATUS_CONNECTED.
- * This connector should only have
- * been set up if the LVDS was actually connected anyway.
- */
-static enum drm_connector_status cdv_intel_lvds_detect(
-                                struct drm_connector *connector, bool force)
-{
-        return connector_status_connected;
-}
-
-/**
- * Return the list of DDC modes if available, or the BIOS fixed mode otherwise.
- */
-static int cdv_intel_lvds_get_modes(struct drm_connector *connector)
-{
-        struct drm_device *dev = connector->dev;
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-        struct psb_intel_mode_device *mode_dev =
-                                        psb_intel_output->mode_dev;
-        int ret;
-
-        ret = psb_intel_ddc_get_modes(psb_intel_output);
-
-        if (ret)
-                return ret;
-
-        /* Didn't get an EDID, so
-         * Set wide sync ranges so we get all modes
-         * handed to valid_mode for checking
-         */
-        connector->display_info.min_vfreq = 0;
-        connector->display_info.max_vfreq = 200;
-        connector->display_info.min_hfreq = 0;
-        connector->display_info.max_hfreq = 200;
-        if (mode_dev->panel_fixed_mode != NULL) {
-                struct drm_display_mode *mode =
-                    drm_mode_duplicate(dev, mode_dev->panel_fixed_mode);
-                drm_mode_probed_add(connector, mode);
-                return 1;
-        }
-
-        return 0;
-}
-
-/**
- * cdv_intel_lvds_destroy - unregister and free LVDS structures
- * @connector: connector to free
- *
- * Unregister the DDC bus for this connector then free the driver private
- * structure.
- */
-void cdv_intel_lvds_destroy(struct drm_connector *connector)
-{
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-
-        if (psb_intel_output->ddc_bus)
-                psb_intel_i2c_destroy(psb_intel_output->ddc_bus);
-        drm_sysfs_connector_remove(connector);
-        drm_connector_cleanup(connector);
-        kfree(connector);
-}
-
-int cdv_intel_lvds_set_property(struct drm_connector *connector,
-                                       struct drm_property *property,
-                                       uint64_t value)
-{
-        struct drm_encoder *encoder = connector->encoder;
-
-        if (!strcmp(property->name, "scaling mode") && encoder) {
-                struct psb_intel_crtc *crtc =
-                                        to_psb_intel_crtc(encoder->crtc);
-                uint64_t curValue;
-
-                if (!crtc)
-                        return -1;
-
-                switch (value) {
-                case DRM_MODE_SCALE_FULLSCREEN:
-                        break;
-                case DRM_MODE_SCALE_NO_SCALE:
-                        break;
-                case DRM_MODE_SCALE_ASPECT:
-                        break;
-                default:
-                        return -1;
-                }
-
-                if (drm_connector_property_get_value(connector,
-                                                     property,
-                                                     &curValue))
-                        return -1;
-
-                if (curValue == value)
-                        return 0;
-
-                if (drm_connector_property_set_value(connector,
-                                                        property,
-                                                        value))
-                        return -1;
-
-                if (crtc->saved_mode.hdisplay != 0 &&
-                    crtc->saved_mode.vdisplay != 0) {
-                        if (!drm_crtc_helper_set_mode(encoder->crtc,
-                                                      &crtc->saved_mode,
-                                                      encoder->crtc->x,
-                                                      encoder->crtc->y,
-                                                      encoder->crtc->fb))
-                                return -1;
-                }
-        } else if (!strcmp(property->name, "backlight") && encoder) {
-                if (drm_connector_property_set_value(connector,
-                                                        property,
-                                                        value))
-                        return -1;
-                else {
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-                        struct drm_psb_private *dev_priv =
-                                                encoder->dev->dev_private;
-                        struct backlight_device *bd =
-                                                dev_priv->backlight_device;
-                        bd->props.brightness = value;
-                        backlight_update_status(bd);
-#endif
-                }
-        } else if (!strcmp(property->name, "DPMS") && encoder) {
-                struct drm_encoder_helper_funcs *helpers =
-                                        encoder->helper_private;
-                helpers->dpms(encoder, value);
-        }
-        return 0;
-}
-
-static const struct drm_encoder_helper_funcs
-                                        cdv_intel_lvds_helper_funcs = {
-        .dpms = cdv_intel_lvds_encoder_dpms,
-        .mode_fixup = cdv_intel_lvds_mode_fixup,
-        .prepare = cdv_intel_lvds_prepare,
-        .mode_set = cdv_intel_lvds_mode_set,
-        .commit = cdv_intel_lvds_commit,
-};
-
-static const struct drm_connector_helper_funcs
-                                cdv_intel_lvds_connector_helper_funcs = {
-        .get_modes = cdv_intel_lvds_get_modes,
-        .mode_valid = cdv_intel_lvds_mode_valid,
-        .best_encoder = psb_intel_best_encoder,
-};
-
-static const struct drm_connector_funcs cdv_intel_lvds_connector_funcs = {
-        .dpms = drm_helper_connector_dpms,
-        .save = cdv_intel_lvds_save,
-        .restore = cdv_intel_lvds_restore,
-        .detect = cdv_intel_lvds_detect,
-        .fill_modes = drm_helper_probe_single_connector_modes,
-        .set_property = cdv_intel_lvds_set_property,
-        .destroy = cdv_intel_lvds_destroy,
-};
-
-
-static void cdv_intel_lvds_enc_destroy(struct drm_encoder *encoder)
-{
-        drm_encoder_cleanup(encoder);
-}
-
-const struct drm_encoder_funcs cdv_intel_lvds_enc_funcs = {
-        .destroy = cdv_intel_lvds_enc_destroy,
-};
-
-/**
- * cdv_intel_lvds_init - setup LVDS connectors on this device
- * @dev: drm device
- *
- * Create the connector, register the LVDS DDC bus, and try to figure out what
- * modes we can display on the LVDS panel (if present).
- */
-void cdv_intel_lvds_init(struct drm_device *dev,
-                     struct psb_intel_mode_device *mode_dev)
-{
-        struct psb_intel_output *psb_intel_output;
-        struct cdv_intel_lvds_priv *lvds_priv;
-        struct drm_connector *connector;
-        struct drm_encoder *encoder;
-        struct drm_display_mode *scan;
-        struct drm_crtc *crtc;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 lvds;
-        int pipe;
-
-        psb_intel_output = kzalloc(sizeof(struct psb_intel_output) +
-                        sizeof(struct cdv_intel_lvds_priv), GFP_KERNEL);
-        if (!psb_intel_output)
-                return;
-
-        lvds_priv = (struct cdv_intel_lvds_priv *)(psb_intel_output + 1);
-
-        psb_intel_output->dev_priv = lvds_priv;
-
-        psb_intel_output->mode_dev = mode_dev;
-        connector = &psb_intel_output->base;
-        encoder = &psb_intel_output->enc;
-
-
-        drm_connector_init(dev, &psb_intel_output->base,
-                           &cdv_intel_lvds_connector_funcs,
-                           DRM_MODE_CONNECTOR_LVDS);
-
-        drm_encoder_init(dev, &psb_intel_output->enc,
-                         &cdv_intel_lvds_enc_funcs,
-                         DRM_MODE_ENCODER_LVDS);
-
-
-        drm_mode_connector_attach_encoder(&psb_intel_output->base,
-                                          &psb_intel_output->enc);
-        psb_intel_output->type = INTEL_OUTPUT_LVDS;
-
-        drm_encoder_helper_add(encoder, &cdv_intel_lvds_helper_funcs);
-        drm_connector_helper_add(connector,
-                                 &cdv_intel_lvds_connector_helper_funcs);
-        connector->display_info.subpixel_order = SubPixelHorizontalRGB;
-        connector->interlace_allowed = false;
-        connector->doublescan_allowed = false;
-
-        /*Attach connector properties*/
-        drm_connector_attach_property(connector,
-                                      dev->mode_config.scaling_mode_property,
-                                      DRM_MODE_SCALE_FULLSCREEN);
-        drm_connector_attach_property(connector,
-                                      dev_priv->backlight_property,
-                                      BRIGHTNESS_MAX_LEVEL);
-
-        /**
-         * Set up I2C bus
-         * FIXME: distroy i2c_bus when exit
-         */
-        psb_intel_output->i2c_bus = psb_intel_i2c_create(dev,
-                                                         GPIOB,
-                                                         "LVDSBLC_B");
-        if (!psb_intel_output->i2c_bus) {
-                dev_printk(KERN_ERR,
-                        &dev->pdev->dev, "I2C bus registration failed.\n");
-                goto failed_blc_i2c;
-        }
-        psb_intel_output->i2c_bus->slave_addr = 0x2C;
-        dev_priv->lvds_i2c_bus =  psb_intel_output->i2c_bus;
-
-        /*
-         * LVDS discovery:
-         * 1) check for EDID on DDC
-         * 2) check for VBT data
-         * 3) check to see if LVDS is already on
-         *    if none of the above, no panel
-         * 4) make sure lid is open
-         *    if closed, act like it's not there for now
-         */
-
-        /* Set up the DDC bus. */
-        psb_intel_output->ddc_bus = psb_intel_i2c_create(dev,
-                                                         GPIOC,
-                                                         "LVDSDDC_C");
-        if (!psb_intel_output->ddc_bus) {
-                dev_printk(KERN_ERR, &dev->pdev->dev,
-                           "DDC bus registration " "failed.\n");
-                goto failed_ddc;
-        }
-
-        /*
-         * Attempt to get the fixed panel mode from DDC.  Assume that the
-         * preferred mode is the right one.
-         */
-        psb_intel_ddc_get_modes(psb_intel_output);
-        list_for_each_entry(scan, &connector->probed_modes, head) {
-                if (scan->type & DRM_MODE_TYPE_PREFERRED) {
-                        mode_dev->panel_fixed_mode =
-                            drm_mode_duplicate(dev, scan);
-                        goto out;       /* FIXME: check for quirks */
-                }
-        }
-
-        /* Failed to get EDID, what about VBT? do we need this?*/
-        if (dev_priv->lfp_lvds_vbt_mode) {
-                mode_dev->panel_fixed_mode =
-                        drm_mode_duplicate(dev, dev_priv->lfp_lvds_vbt_mode);
-                if (mode_dev->panel_fixed_mode) {
-                        mode_dev->panel_fixed_mode->type |=
-                                DRM_MODE_TYPE_PREFERRED;
-                        goto out;       /* FIXME: check for quirks */
-                }
-        }
-        /*
-         * If we didn't get EDID, try checking if the panel is already turned
-         * on.  If so, assume that whatever is currently programmed is the
-         * correct mode.
-         */
-        lvds = REG_READ(LVDS);
-        pipe = (lvds & LVDS_PIPEB_SELECT) ? 1 : 0;
-        crtc = psb_intel_get_crtc_from_pipe(dev, pipe);
-
-        if (crtc && (lvds & LVDS_PORT_EN)) {
-                mode_dev->panel_fixed_mode =
-                    cdv_intel_crtc_mode_get(dev, crtc);
-                if (mode_dev->panel_fixed_mode) {
-                        mode_dev->panel_fixed_mode->type |=
-                            DRM_MODE_TYPE_PREFERRED;
-                        goto out;       /* FIXME: check for quirks */
-                }
-        }
-
-        /* If we still don't have a mode after all that, give up. */
-        if (!mode_dev->panel_fixed_mode) {
-                DRM_DEBUG
-                        ("Found no modes on the lvds, ignoring the LVDS\n");
-                goto failed_find;
-        }
-
-out:
-        drm_sysfs_connector_add(connector);
-        return;
-
-failed_find:
-        printk(KERN_ERR "Failed find\n");
-        if (psb_intel_output->ddc_bus)
-                psb_intel_i2c_destroy(psb_intel_output->ddc_bus);
-failed_ddc:
-        printk(KERN_ERR "Failed DDC\n");
-        if (psb_intel_output->i2c_bus)
-                psb_intel_i2c_destroy(psb_intel_output->i2c_bus);
-failed_blc_i2c:
-        printk(KERN_ERR "Failed BLC\n");
-        drm_encoder_cleanup(encoder);
-        drm_connector_cleanup(connector);
-        kfree(connector);
-}
diff --git a/drivers/staging/gma500/displays/hdmi.h b/drivers/staging/gma500/displays/hdmi.h
deleted file mode 100644
index d58ba9bd010f..000000000000
--- a/drivers/staging/gma500/displays/hdmi.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c)  2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Thomas Eaton <thomas.g.eaton@intel.com>
- * Scott Rowe <scott.m.rowe@intel.com>
- */
-
-#ifndef HDMI_H
-#define HDMI_H
-
-extern void hdmi_init(struct drm_device *dev);
-
-#endif
diff --git a/drivers/staging/gma500/displays/pyr_cmd.h b/drivers/staging/gma500/displays/pyr_cmd.h
deleted file mode 100644
index 84bae5c8c552..000000000000
--- a/drivers/staging/gma500/displays/pyr_cmd.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c)  2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicensen
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Thomas Eaton <thomas.g.eaton@intel.com>
- * Scott Rowe <scott.m.rowe@intel.com>
- */
-
-#ifndef PYR_CMD_H
-#define PYR_CMD_H
-
-extern void pyr_cmd_init(struct drm_device *dev, struct panel_funcs *p_funcs);
-
-#endif
-
diff --git a/drivers/staging/gma500/displays/pyr_vid.h b/drivers/staging/gma500/displays/pyr_vid.h
deleted file mode 100644
index ce98860fa68a..000000000000
--- a/drivers/staging/gma500/displays/pyr_vid.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c)  2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicensen
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Thomas Eaton <thomas.g.eaton@intel.com>
- * Scott Rowe <scott.m.rowe@intel.com>
-*/
-
-#ifndef PYR_VID_H
-#define PYR_VID_H
-
-extern void pyr_vid_init(struct drm_device *dev, struct panel_funcs *p_funcs);
-extern struct drm_display_mode *pyr_vid_get_config_mode(struct drm_device* dev);
-
-#endif
diff --git a/drivers/staging/gma500/displays/tmd_cmd.h b/drivers/staging/gma500/displays/tmd_cmd.h
deleted file mode 100644
index 641e85eedece..000000000000
--- a/drivers/staging/gma500/displays/tmd_cmd.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c)  2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicensen
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Thomas Eaton <thomas.g.eaton@intel.com>
- * Scott Rowe <scott.m.rowe@intel.com>
- */
-
-#ifndef TMD_CMD_H
-#define TMD_CMD_H
-
-extern void tmd_cmd_init(struct drm_device *dev, struct panel_funcs *p_funcs);
-extern struct drm_display_mode *tmd_cmd_get_config_mode(struct drm_device *dev);
-
-#endif
diff --git a/drivers/staging/gma500/displays/tmd_vid.h b/drivers/staging/gma500/displays/tmd_vid.h
deleted file mode 100644
index 7a5fa3b935e3..000000000000
--- a/drivers/staging/gma500/displays/tmd_vid.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c)  2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicensen
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Thomas Eaton <thomas.g.eaton@intel.com>
- * Scott Rowe <scott.m.rowe@intel.com>
-*/
-
-#ifndef TMD_VID_H
-#define TMD_VID_H
-
-extern void tmd_vid_init(struct drm_device *dev, struct panel_funcs *p_funcs);
-extern struct drm_display_mode *tmd_vid_get_config_mode(struct drm_device *dev);
-
-#endif
diff --git a/drivers/staging/gma500/displays/tpo_cmd.h b/drivers/staging/gma500/displays/tpo_cmd.h
deleted file mode 100644
index 610552730d71..000000000000
--- a/drivers/staging/gma500/displays/tpo_cmd.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c)  2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicensen
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Thomas Eaton <thomas.g.eaton@intel.com>
- * Scott Rowe <scott.m.rowe@intel.com>
-*/
-
-#ifndef TPO_CMD_H
-#define TPO_CMD_H
-
-extern void tpo_cmd_init(struct drm_device *dev, struct panel_funcs *p_funcs);
-/* extern struct drm_display_mode * */
-/* tpo_cmd_get_config_mode(struct drm_device *dev); */
-
-#endif
diff --git a/drivers/staging/gma500/displays/tpo_vid.h b/drivers/staging/gma500/displays/tpo_vid.h
deleted file mode 100644
index c24f05722de1..000000000000
--- a/drivers/staging/gma500/displays/tpo_vid.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c)  2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicensen
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Thomas Eaton <thomas.g.eaton@intel.com>
- * Scott Rowe <scott.m.rowe@intel.com>
- */
-
-#ifndef TPO_VID_H
-#define TPO_VID_H
-
-extern void tpo_vid_init(struct drm_device *dev, struct panel_funcs *p_funcs);
-
-#endif
diff --git a/drivers/staging/gma500/framebuffer.c b/drivers/staging/gma500/framebuffer.c
deleted file mode 100644
index b00761cba144..000000000000
--- a/drivers/staging/gma500/framebuffer.c
+++ /dev/null
@@ -1,856 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2007-2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/fb.h>
-#include <linux/init.h>
-#include <linux/console.h>
-
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_fb_helper.h>
-
-#include "psb_drv.h"
-#include "psb_intel_reg.h"
-#include "psb_intel_drv.h"
-#include "framebuffer.h"
-#include "gtt.h"
-
-#include "mdfld_output.h"
-
-static void psb_user_framebuffer_destroy(struct drm_framebuffer *fb);
-static int psb_user_framebuffer_create_handle(struct drm_framebuffer *fb,
-                                              struct drm_file *file_priv,
-                                              unsigned int *handle);
-
-static const struct drm_framebuffer_funcs psb_fb_funcs = {
-        .destroy = psb_user_framebuffer_destroy,
-        .create_handle = psb_user_framebuffer_create_handle,
-};
-
-#define CMAP_TOHW(_val, _width) ((((_val) << (_width)) + 0x7FFF - (_val)) >> 16)
-
-static int psbfb_setcolreg(unsigned regno, unsigned red, unsigned green,
-                           unsigned blue, unsigned transp,
-                           struct fb_info *info)
-{
-        struct psb_fbdev *fbdev = info->par;
-        struct drm_framebuffer *fb = fbdev->psb_fb_helper.fb;
-        uint32_t v;
-
-        if (!fb)
-                return -ENOMEM;
-
-        if (regno > 255)
-                return 1;
-
-        red = CMAP_TOHW(red, info->var.red.length);
-        blue = CMAP_TOHW(blue, info->var.blue.length);
-        green = CMAP_TOHW(green, info->var.green.length);
-        transp = CMAP_TOHW(transp, info->var.transp.length);
-
-        v = (red << info->var.red.offset) |
-            (green << info->var.green.offset) |
-            (blue << info->var.blue.offset) |
-            (transp << info->var.transp.offset);
-
-        if (regno < 16) {
-                switch (fb->bits_per_pixel) {
-                case 16:
-                        ((uint32_t *) info->pseudo_palette)[regno] = v;
-                        break;
-                case 24:
-                case 32:
-                        ((uint32_t *) info->pseudo_palette)[regno] = v;
-                        break;
-                }
-        }
-
-        return 0;
-}
-
-static int psbfb_pan(struct fb_var_screeninfo *var, struct fb_info *info)
-{
-        struct psb_fbdev *fbdev = info->par;
-        struct psb_framebuffer *psbfb = &fbdev->pfb;
-        struct drm_device *dev = psbfb->base.dev;
-
-        /*
-         *      We have to poke our nose in here. The core fb code assumes
-         *      panning is part of the hardware that can be invoked before
-         *      the actual fb is mapped. In our case that isn't quite true.
-         */
-        if (psbfb->gtt->npage)
-                psb_gtt_roll(dev, psbfb->gtt, var->yoffset);
-        return 0;
-}
-
-void psbfb_suspend(struct drm_device *dev)
-{
-        struct drm_framebuffer *fb = 0;
-        struct psb_framebuffer *psbfb = to_psb_fb(fb);
-
-        console_lock();
-        mutex_lock(&dev->mode_config.mutex);
-        list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
-                struct fb_info *info = psbfb->fbdev;
-                fb_set_suspend(info, 1);
-                drm_fb_helper_blank(FB_BLANK_POWERDOWN, info);
-        }
-        mutex_unlock(&dev->mode_config.mutex);
-        console_unlock();
-}
-
-void psbfb_resume(struct drm_device *dev)
-{
-        struct drm_framebuffer *fb = 0;
-        struct psb_framebuffer *psbfb = to_psb_fb(fb);
-
-        console_lock();
-        mutex_lock(&dev->mode_config.mutex);
-        list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
-                struct fb_info *info = psbfb->fbdev;
-                fb_set_suspend(info, 0);
-                drm_fb_helper_blank(FB_BLANK_UNBLANK, info);
-        }
-        mutex_unlock(&dev->mode_config.mutex);
-        console_unlock();
-        drm_helper_disable_unused_functions(dev);
-}
-
-static int psbfb_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-{
-        struct psb_framebuffer *psbfb = vma->vm_private_data;
-        struct drm_device *dev = psbfb->base.dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int page_num;
-        int i;
-        unsigned long address;
-        int ret;
-        unsigned long pfn;
-        /* FIXME: assumes fb at stolen base which may not be true */
-        unsigned long phys_addr = (unsigned long)dev_priv->stolen_base;
-
-        page_num = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-        address = (unsigned long)vmf->virtual_address;
-
-        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-
-        for (i = 0; i < page_num; i++) {
-                pfn = (phys_addr >> PAGE_SHIFT);
-
-                ret = vm_insert_mixed(vma, address, pfn);
-                if (unlikely((ret == -EBUSY) || (ret != 0 && i > 0)))
-                        break;
-                else if (unlikely(ret != 0)) {
-                        ret = (ret == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS;
-                        return ret;
-                }
-                address += PAGE_SIZE;
-                phys_addr += PAGE_SIZE;
-        }
-        return VM_FAULT_NOPAGE;
-}
-
-static void psbfb_vm_open(struct vm_area_struct *vma)
-{
-}
-
-static void psbfb_vm_close(struct vm_area_struct *vma)
-{
-}
-
-static struct vm_operations_struct psbfb_vm_ops = {
-        .fault  = psbfb_vm_fault,
-        .open   = psbfb_vm_open,
-        .close  = psbfb_vm_close
-};
-
-static int psbfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
-{
-        struct psb_fbdev *fbdev = info->par;
-        struct psb_framebuffer *psbfb = &fbdev->pfb;
-
-        if (vma->vm_pgoff != 0)
-                return -EINVAL;
-        if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
-                return -EINVAL;
-
-        if (!psbfb->addr_space)
-                psbfb->addr_space = vma->vm_file->f_mapping;
-        /*
-         * If this is a GEM object then info->screen_base is the virtual
-         * kernel remapping of the object. FIXME: Review if this is
-         * suitable for our mmap work
-         */
-        vma->vm_ops = &psbfb_vm_ops;
-        vma->vm_private_data = (void *)psbfb;
-        vma->vm_flags |= VM_RESERVED | VM_IO |
-                                        VM_MIXEDMAP | VM_DONTEXPAND;
-        return 0;
-}
-
-static int psbfb_ioctl(struct fb_info *info, unsigned int cmd,
-                                                unsigned long arg)
-{
-        return -ENOTTY;
-}
-
-static struct fb_ops psbfb_ops = {
-        .owner = THIS_MODULE,
-        .fb_check_var = drm_fb_helper_check_var,
-        .fb_set_par = drm_fb_helper_set_par,
-        .fb_blank = drm_fb_helper_blank,
-        .fb_setcolreg = psbfb_setcolreg,
-        .fb_fillrect = cfb_fillrect,
-        .fb_copyarea = psbfb_copyarea,
-        .fb_imageblit = cfb_imageblit,
-        .fb_mmap = psbfb_mmap,
-        .fb_sync = psbfb_sync,
-        .fb_ioctl = psbfb_ioctl,
-};
-
-static struct fb_ops psbfb_roll_ops = {
-        .owner = THIS_MODULE,
-        .fb_check_var = drm_fb_helper_check_var,
-        .fb_set_par = drm_fb_helper_set_par,
-        .fb_blank = drm_fb_helper_blank,
-        .fb_setcolreg = psbfb_setcolreg,
-        .fb_fillrect = cfb_fillrect,
-        .fb_copyarea = cfb_copyarea,
-        .fb_imageblit = cfb_imageblit,
-        .fb_pan_display = psbfb_pan,
-        .fb_mmap = psbfb_mmap,
-        .fb_sync = psbfb_sync,
-        .fb_ioctl = psbfb_ioctl,
-};
-
-static struct fb_ops psbfb_unaccel_ops = {
-        .owner = THIS_MODULE,
-        .fb_check_var = drm_fb_helper_check_var,
-        .fb_set_par = drm_fb_helper_set_par,
-        .fb_blank = drm_fb_helper_blank,
-        .fb_setcolreg = psbfb_setcolreg,
-        .fb_fillrect = cfb_fillrect,
-        .fb_copyarea = cfb_copyarea,
-        .fb_imageblit = cfb_imageblit,
-        .fb_mmap = psbfb_mmap,
-        .fb_ioctl = psbfb_ioctl,
-};
-
-/**
- *      psb_framebuffer_init    -       initialize a framebuffer
- *      @dev: our DRM device
- *      @fb: framebuffer to set up
- *      @mode_cmd: mode description
- *      @gt: backing object
- *
- *      Configure and fill in the boilerplate for our frame buffer. Return
- *      0 on success or an error code if we fail.
- */
-static int psb_framebuffer_init(struct drm_device *dev,
-                                        struct psb_framebuffer *fb,
-                                        struct drm_mode_fb_cmd2 *mode_cmd,
-                                        struct gtt_range *gt)
-{
-        u32 bpp, depth;
-        int ret;
-
-        drm_fb_get_bpp_depth(mode_cmd->pixel_format, &depth, &bpp);
-
-        if (mode_cmd->pitches[0] & 63)
-                return -EINVAL;
-        switch (bpp) {
-        case 8:
-        case 16:
-        case 24:
-        case 32:
-                break;
-        default:
-                return -EINVAL;
-        }
-        ret = drm_framebuffer_init(dev, &fb->base, &psb_fb_funcs);
-        if (ret) {
-                dev_err(dev->dev, "framebuffer init failed: %d\n", ret);
-                return ret;
-        }
-        drm_helper_mode_fill_fb_struct(&fb->base, mode_cmd);
-        fb->gtt = gt;
-        return 0;
-}
-
-/**
- *      psb_framebuffer_create  -       create a framebuffer backed by gt
- *      @dev: our DRM device
- *      @mode_cmd: the description of the requested mode
- *      @gt: the backing object
- *
- *      Create a framebuffer object backed by the gt, and fill in the
- *      boilerplate required
- *
- *      TODO: review object references
- */
-
-static struct drm_framebuffer *psb_framebuffer_create
-                        (struct drm_device *dev,
-                         struct drm_mode_fb_cmd2 *mode_cmd,
-                         struct gtt_range *gt)
-{
-        struct psb_framebuffer *fb;
-        int ret;
-
-        fb = kzalloc(sizeof(*fb), GFP_KERNEL);
-        if (!fb)
-                return ERR_PTR(-ENOMEM);
-
-        ret = psb_framebuffer_init(dev, fb, mode_cmd, gt);
-        if (ret) {
-                kfree(fb);
-                return ERR_PTR(ret);
-        }
-        return &fb->base;
-}
-
-/**
- *      psbfb_alloc             -       allocate frame buffer memory
- *      @dev: the DRM device
- *      @aligned_size: space needed
- *      @force: fall back to GEM buffers if need be
- *
- *      Allocate the frame buffer. In the usual case we get a GTT range that
- *      is stolen memory backed and life is simple. If there isn't sufficient
- *      stolen memory or the system has no stolen memory we allocate a range
- *      and back it with a GEM object.
- *
- *      In this case the GEM object has no handle.
- */
-static struct gtt_range *psbfb_alloc(struct drm_device *dev,
-                                                int aligned_size, int force)
-{
-        struct gtt_range *backing;
-        /* Begin by trying to use stolen memory backing */
-        backing = psb_gtt_alloc_range(dev, aligned_size, "fb", 1);
-        if (backing) {
-                if (drm_gem_private_object_init(dev,
-                                        &backing->gem, aligned_size) == 0)
-                        return backing;
-                psb_gtt_free_range(dev, backing);
-        }
-        if (!force)
-                return NULL;
-
-        /* Next try using GEM host memory */
-        backing = psb_gtt_alloc_range(dev, aligned_size, "fb(gem)", 0);
-        if (backing == NULL)
-                return NULL;
-
-        /* Now back it with an object */
-        if (drm_gem_object_init(dev, &backing->gem, aligned_size) != 0) {
-                psb_gtt_free_range(dev, backing);
-                return NULL;
-        }
-        return backing;
-}
-
-/**
- *      psbfb_create            -       create a framebuffer
- *      @fbdev: the framebuffer device
- *      @sizes: specification of the layout
- *
- *      Create a framebuffer to the specifications provided
- */
-static int psbfb_create(struct psb_fbdev *fbdev,
-                                struct drm_fb_helper_surface_size *sizes)
-{
-        struct drm_device *dev = fbdev->psb_fb_helper.dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct fb_info *info;
-        struct drm_framebuffer *fb;
-        struct psb_framebuffer *psbfb = &fbdev->pfb;
-        struct drm_mode_fb_cmd2 mode_cmd;
-        struct device *device = &dev->pdev->dev;
-        int size;
-        int ret;
-        struct gtt_range *backing;
-        int gtt_roll = 1;
-        u32 bpp, depth;
-
-        mode_cmd.width = sizes->surface_width;
-        mode_cmd.height = sizes->surface_height;
-        bpp = sizes->surface_bpp;
-
-        /* No 24bit packed */
-        if (bpp == 24)
-                bpp = 32;
-
-        /* Acceleration via the GTT requires pitch to be 4096 byte aligned 
-           (ie 1024 or 2048 pixels in normal use) */
-        mode_cmd.pitches[0] =  ALIGN(mode_cmd.width * ((bpp + 7) / 8), 4096);
-        depth = sizes->surface_depth;
-
-        size = mode_cmd.pitches[0] * mode_cmd.height;
-        size = ALIGN(size, PAGE_SIZE);
-
-        /* Allocate the framebuffer in the GTT with stolen page backing */
-        backing = psbfb_alloc(dev, size, 0);
-        if (backing == NULL) {
-                /*
-                 *      We couldn't get the space we wanted, fall back to the
-                 *      display engine requirement instead.  The HW requires
-                 *      the pitch to be 64 byte aligned
-                 */
-
-                gtt_roll = 0;   /* Don't use GTT accelerated scrolling */
-
-                mode_cmd.pitches[0] =  ALIGN(mode_cmd.width * ((bpp + 7) / 8), 64);
-                depth = sizes->surface_depth;
-
-                size = mode_cmd.pitches[0] * mode_cmd.height;
-                size = ALIGN(size, PAGE_SIZE);
-
-                /* Allocate the framebuffer in the GTT with stolen page
-                   backing when there is room */
-                backing = psbfb_alloc(dev, size, 1);
-                if (backing == NULL)
-                        return -ENOMEM;
-        }
-
-        mutex_lock(&dev->struct_mutex);
-
-        info = framebuffer_alloc(0, device);
-        if (!info) {
-                ret = -ENOMEM;
-                goto out_err1;
-        }
-        info->par = fbdev;
-
-        mode_cmd.pixel_format = drm_mode_legacy_fb_format(bpp, depth);
-
-        ret = psb_framebuffer_init(dev, psbfb, &mode_cmd, backing);
-        if (ret)
-                goto out_unref;
-
-        fb = &psbfb->base;
-        psbfb->fbdev = info;
-
-        fbdev->psb_fb_helper.fb = fb;
-        fbdev->psb_fb_helper.fbdev = info;
-
-        strcpy(info->fix.id, "psbfb");
-
-        info->flags = FBINFO_DEFAULT;
-        if (gtt_roll) { /* GTT rolling seems best */
-                info->fbops = &psbfb_roll_ops;
-                info->flags |= FBINFO_HWACCEL_YPAN;
-        }
-        else if (dev_priv->ops->accel_2d)       /* 2D engine */
-                info->fbops = &psbfb_ops;
-        else    /* Software */
-                info->fbops = &psbfb_unaccel_ops;
-
-        ret = fb_alloc_cmap(&info->cmap, 256, 0);
-        if (ret) {
-                ret = -ENOMEM;
-                goto out_unref;
-        }
-
-        info->fix.smem_start = dev->mode_config.fb_base;
-        info->fix.smem_len = size;
-        info->fix.ywrapstep = gtt_roll;
-        info->fix.ypanstep = gtt_roll;
-
-        if (backing->stolen) {
-                /* Accessed stolen memory directly */
-                info->screen_base = (char *)dev_priv->vram_addr +
-                                                        backing->offset;
-        } else {
-                /* Pin the pages into the GTT and create a mapping to them */
-                psb_gtt_pin(backing);
-                info->screen_base = vm_map_ram(backing->pages, backing->npage,
-                                -1, PAGE_KERNEL);
-                if (info->screen_base == NULL) {
-                        psb_gtt_unpin(backing);
-                        ret = -ENOMEM;
-                        goto out_unref;
-                }
-                psbfb->vm_map = 1;
-        }
-        info->screen_size = size;
-
-        if (dev_priv->gtt.stolen_size) {
-                info->apertures = alloc_apertures(1);
-                if (!info->apertures) {
-                        ret = -ENOMEM;
-                        goto out_unref;
-                }
-                info->apertures->ranges[0].base = dev->mode_config.fb_base;
-                info->apertures->ranges[0].size = dev_priv->gtt.stolen_size;
-        }
-
-        drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
-        drm_fb_helper_fill_var(info, &fbdev->psb_fb_helper,
-                                sizes->fb_width, sizes->fb_height);
-
-        info->fix.mmio_start = pci_resource_start(dev->pdev, 0);
-        info->fix.mmio_len = pci_resource_len(dev->pdev, 0);
-
-        info->pixmap.size = 64 * 1024;
-        info->pixmap.buf_align = 8;
-        info->pixmap.access_align = 32;
-        info->pixmap.flags = FB_PIXMAP_SYSTEM;
-        info->pixmap.scan_align = 1;
-
-        dev_info(dev->dev, "allocated %dx%d fb\n",
-                                        psbfb->base.width, psbfb->base.height);
-
-        mutex_unlock(&dev->struct_mutex);
-        return 0;
-out_unref:
-        if (backing->stolen)
-                psb_gtt_free_range(dev, backing);
-        else {
-                if (psbfb->vm_map)
-                        vm_unmap_ram(info->screen_base, backing->npage);
-                drm_gem_object_unreference(&backing->gem);
-        }
-out_err1:
-        mutex_unlock(&dev->struct_mutex);
-        psb_gtt_free_range(dev, backing);
-        return ret;
-}
-
-/**
- *      psb_user_framebuffer_create     -       create framebuffer
- *      @dev: our DRM device
- *      @filp: client file
- *      @cmd: mode request
- *
- *      Create a new framebuffer backed by a userspace GEM object
- */
-static struct drm_framebuffer *psb_user_framebuffer_create
-                        (struct drm_device *dev, struct drm_file *filp,
-                         struct drm_mode_fb_cmd2 *cmd)
-{
-        struct gtt_range *r;
-        struct drm_gem_object *obj;
-
-        /*
-         *      Find the GEM object and thus the gtt range object that is
-         *      to back this space
-         */
-        obj = drm_gem_object_lookup(dev, filp, cmd->handles[0]);
-        if (obj == NULL)
-                return ERR_PTR(-ENOENT);
-
-        /* Let the core code do all the work */
-        r = container_of(obj, struct gtt_range, gem);
-        return psb_framebuffer_create(dev, cmd, r);
-}
-
-static void psbfb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
-                                                        u16 blue, int regno)
-{
-}
-
-static void psbfb_gamma_get(struct drm_crtc *crtc, u16 *red,
-                                        u16 *green, u16 *blue, int regno)
-{
-}
-
-static int psbfb_probe(struct drm_fb_helper *helper,
-                                struct drm_fb_helper_surface_size *sizes)
-{
-        struct psb_fbdev *psb_fbdev = (struct psb_fbdev *)helper;
-        int new_fb = 0;
-        int ret;
-
-        if (!helper->fb) {
-                ret = psbfb_create(psb_fbdev, sizes);
-                if (ret)
-                        return ret;
-                new_fb = 1;
-        }
-        return new_fb;
-}
-
-struct drm_fb_helper_funcs psb_fb_helper_funcs = {
-        .gamma_set = psbfb_gamma_set,
-        .gamma_get = psbfb_gamma_get,
-        .fb_probe = psbfb_probe,
-};
-
-int psb_fbdev_destroy(struct drm_device *dev, struct psb_fbdev *fbdev)
-{
-        struct fb_info *info;
-        struct psb_framebuffer *psbfb = &fbdev->pfb;
-
-        if (fbdev->psb_fb_helper.fbdev) {
-                info = fbdev->psb_fb_helper.fbdev;
-
-                /* If this is our base framebuffer then kill any virtual map
-                   for the framebuffer layer and unpin it */
-                if (psbfb->vm_map) {
-                        vm_unmap_ram(info->screen_base, psbfb->gtt->npage);
-                        psb_gtt_unpin(psbfb->gtt);
-                }
-                unregister_framebuffer(info);
-                if (info->cmap.len)
-                        fb_dealloc_cmap(&info->cmap);
-                framebuffer_release(info);
-        }
-        drm_fb_helper_fini(&fbdev->psb_fb_helper);
-        drm_framebuffer_cleanup(&psbfb->base);
-
-        if (psbfb->gtt)
-                drm_gem_object_unreference(&psbfb->gtt->gem);
-        return 0;
-}
-
-int psb_fbdev_init(struct drm_device *dev)
-{
-        struct psb_fbdev *fbdev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        fbdev = kzalloc(sizeof(struct psb_fbdev), GFP_KERNEL);
-        if (!fbdev) {
-                dev_err(dev->dev, "no memory\n");
-                return -ENOMEM;
-        }
-
-        dev_priv->fbdev = fbdev;
-        fbdev->psb_fb_helper.funcs = &psb_fb_helper_funcs;
-
-        drm_fb_helper_init(dev, &fbdev->psb_fb_helper, dev_priv->ops->crtcs,
-                                                        INTELFB_CONN_LIMIT);
-
-        drm_fb_helper_single_add_all_connectors(&fbdev->psb_fb_helper);
-        drm_fb_helper_initial_config(&fbdev->psb_fb_helper, 32);
-        return 0;
-}
-
-void psb_fbdev_fini(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (!dev_priv->fbdev)
-                return;
-
-        psb_fbdev_destroy(dev, dev_priv->fbdev);
-        kfree(dev_priv->fbdev);
-        dev_priv->fbdev = NULL;
-}
-
-static void psbfb_output_poll_changed(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_fbdev *fbdev = (struct psb_fbdev *)dev_priv->fbdev;
-        drm_fb_helper_hotplug_event(&fbdev->psb_fb_helper);
-}
-
-/**
- *      psb_user_framebuffer_create_handle - add hamdle to a framebuffer
- *      @fb: framebuffer
- *      @file_priv: our DRM file
- *      @handle: returned handle
- *
- *      Our framebuffer object is a GTT range which also contains a GEM
- *      object. We need to turn it into a handle for userspace. GEM will do
- *      the work for us
- */
-static int psb_user_framebuffer_create_handle(struct drm_framebuffer *fb,
-                                              struct drm_file *file_priv,
-                                              unsigned int *handle)
-{
-        struct psb_framebuffer *psbfb = to_psb_fb(fb);
-        struct gtt_range *r = psbfb->gtt;
-        return drm_gem_handle_create(file_priv, &r->gem, handle);
-}
-
-/**
- *      psb_user_framebuffer_destroy    -       destruct user created fb
- *      @fb: framebuffer
- *
- *      User framebuffers are backed by GEM objects so all we have to do is
- *      clean up a bit and drop the reference, GEM will handle the fallout
- */
-static void psb_user_framebuffer_destroy(struct drm_framebuffer *fb)
-{
-        struct psb_framebuffer *psbfb = to_psb_fb(fb);
-        struct gtt_range *r = psbfb->gtt;
-        struct drm_device *dev = fb->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_fbdev *fbdev = dev_priv->fbdev;
-        struct drm_crtc *crtc;
-        int reset = 0;
-
-        /* Should never get stolen memory for a user fb */
-        WARN_ON(r->stolen);
-
-        /* Check if we are erroneously live */
-        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
-                if (crtc->fb == fb)
-                        reset = 1;
-
-        if (reset)
-                /*
-                 * Now force a sane response before we permit the DRM CRTC
-                 * layer to do stupid things like blank the display. Instead
-                 * we reset this framebuffer as if the user had forced a reset.
-                 * We must do this before the cleanup so that the DRM layer
-                 * doesn't get a chance to stick its oar in where it isn't
-                 * wanted.
-                 */
-                drm_fb_helper_restore_fbdev_mode(&fbdev->psb_fb_helper);
-
-        /* Let DRM do its clean up */
-        drm_framebuffer_cleanup(fb);
-        /*  We are no longer using the resource in GEM */
-        drm_gem_object_unreference_unlocked(&r->gem);
-        kfree(fb);
-}
-
-static const struct drm_mode_config_funcs psb_mode_funcs = {
-        .fb_create = psb_user_framebuffer_create,
-        .output_poll_changed = psbfb_output_poll_changed,
-};
-
-static int psb_create_backlight_property(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct drm_property *backlight;
-
-        if (dev_priv->backlight_property)
-                return 0;
-
-        backlight = drm_property_create(dev, DRM_MODE_PROP_RANGE,
-                                                        "backlight", 2);
-        backlight->values[0] = 0;
-        backlight->values[1] = 100;
-
-        dev_priv->backlight_property = backlight;
-
-        return 0;
-}
-
-static void psb_setup_outputs(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct drm_connector *connector;
-
-        drm_mode_create_scaling_mode_property(dev);
-        psb_create_backlight_property(dev);
-
-        dev_priv->ops->output_init(dev);
-
-        list_for_each_entry(connector, &dev->mode_config.connector_list,
-                            head) {
-                struct psb_intel_output *psb_intel_output =
-                    to_psb_intel_output(connector);
-                struct drm_encoder *encoder = &psb_intel_output->enc;
-                int crtc_mask = 0, clone_mask = 0;
-
-                /* valid crtcs */
-                switch (psb_intel_output->type) {
-                case INTEL_OUTPUT_ANALOG:
-                        crtc_mask = (1 << 0);
-                        clone_mask = (1 << INTEL_OUTPUT_ANALOG);
-                        break;
-                case INTEL_OUTPUT_SDVO:
-                        crtc_mask = ((1 << 0) | (1 << 1));
-                        clone_mask = (1 << INTEL_OUTPUT_SDVO);
-                        break;
-                case INTEL_OUTPUT_LVDS:
-                        if (IS_MRST(dev))
-                                crtc_mask = (1 << 0);
-                        else
-                                crtc_mask = (1 << 1);
-                        clone_mask = (1 << INTEL_OUTPUT_LVDS);
-                        break;
-                case INTEL_OUTPUT_MIPI:
-                        crtc_mask = (1 << 0);
-                        clone_mask = (1 << INTEL_OUTPUT_MIPI);
-                        break;
-                case INTEL_OUTPUT_MIPI2:
-                        crtc_mask = (1 << 2);
-                        clone_mask = (1 << INTEL_OUTPUT_MIPI2);
-                        break;
-                case INTEL_OUTPUT_HDMI:
-                        /* HDMI on crtc 1 for SoC devices and crtc 0 for
-                           Cedarview. HDMI on Poulsbo is only via external
-                           logic */
-                        if (IS_MFLD(dev) || IS_MRST(dev))
-                                crtc_mask = (1 << 1);
-                        else
-                                crtc_mask = (1 << 0);   /* Cedarview */
-                        clone_mask = (1 << INTEL_OUTPUT_HDMI);
-                        break;
-                }
-                encoder->possible_crtcs = crtc_mask;
-                encoder->possible_clones =
-                    psb_intel_connector_clones(dev, clone_mask);
-        }
-}
-
-void psb_modeset_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv =
-            (struct drm_psb_private *) dev->dev_private;
-        struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;
-        int i;
-
-        drm_mode_config_init(dev);
-
-        dev->mode_config.min_width = 0;
-        dev->mode_config.min_height = 0;
-
-        dev->mode_config.funcs = (void *) &psb_mode_funcs;
-
-        /* set memory base */
-        /* MRST and PSB should use BAR 2*/
-        pci_read_config_dword(dev->pdev, PSB_BSM, (u32 *)
-                                        &(dev->mode_config.fb_base));
-
-        /* num pipes is 2 for PSB but 1 for Mrst */
-        for (i = 0; i < dev_priv->num_pipe; i++)
-                psb_intel_crtc_init(dev, i, mode_dev);
-
-        dev->mode_config.max_width = 2048;
-        dev->mode_config.max_height = 2048;
-
-        psb_setup_outputs(dev);
-}
-
-void psb_modeset_cleanup(struct drm_device *dev)
-{
-        mutex_lock(&dev->struct_mutex);
-
-        drm_kms_helper_poll_fini(dev);
-        psb_fbdev_fini(dev);
-        drm_mode_config_cleanup(dev);
-
-        mutex_unlock(&dev->struct_mutex);
-}
diff --git a/drivers/staging/gma500/framebuffer.h b/drivers/staging/gma500/framebuffer.h
deleted file mode 100644
index d1b2289447f0..000000000000
--- a/drivers/staging/gma500/framebuffer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2008-2011, Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *      Eric Anholt <eric@anholt.net>
- *
- */
-
-#ifndef _FRAMEBUFFER_H_
-#define _FRAMEBUFFER_H_
-
-#include <drm/drmP.h>
-#include <drm/drm_fb_helper.h>
-
-#include "psb_drv.h"
-
-struct psb_framebuffer {
-        struct drm_framebuffer base;
-        struct address_space *addr_space;
-        struct fb_info *fbdev;
-        struct gtt_range *gtt;
-        bool vm_map;            /* True if we must undo a vm_map_ram */
-};
-
-struct psb_fbdev {
-        struct drm_fb_helper psb_fb_helper;
-        struct psb_framebuffer pfb;
-};
-
-#define to_psb_fb(x) container_of(x, struct psb_framebuffer, base)
-
-extern int psb_intel_connector_clones(struct drm_device *dev, int type_mask);
-
-#endif
-
diff --git a/drivers/staging/gma500/gem.c b/drivers/staging/gma500/gem.c
deleted file mode 100644
index f6433c037d24..000000000000
--- a/drivers/staging/gma500/gem.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- *  psb GEM interface
- *
- * Copyright (c) 2011, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors: Alan Cox
- *
- * TODO:
- *      -       we need to work out if the MMU is relevant (eg for
- *              accelerated operations on a GEM object)
- */
-
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include "psb_drm.h"
-#include "psb_drv.h"
-
-int psb_gem_init_object(struct drm_gem_object *obj)
-{
-        return -EINVAL;
-}
-
-void psb_gem_free_object(struct drm_gem_object *obj)
-{
-        struct gtt_range *gtt = container_of(obj, struct gtt_range, gem);
-        drm_gem_object_release_wrap(obj);
-        /* This must occur last as it frees up the memory of the GEM object */
-        psb_gtt_free_range(obj->dev, gtt);
-}
-
-int psb_gem_get_aperture(struct drm_device *dev, void *data,
-                                struct drm_file *file)
-{
-        return -EINVAL;
-}
-
-/**
- *      psb_gem_dumb_map_gtt    -       buffer mapping for dumb interface
- *      @file: our drm client file
- *      @dev: drm device
- *      @handle: GEM handle to the object (from dumb_create)
- *
- *      Do the necessary setup to allow the mapping of the frame buffer
- *      into user memory. We don't have to do much here at the moment.
- */
-int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev,
-                         uint32_t handle, uint64_t *offset)
-{
-        int ret = 0;
-        struct drm_gem_object *obj;
-
-        if (!(dev->driver->driver_features & DRIVER_GEM))
-                return -ENODEV;
-
-        mutex_lock(&dev->struct_mutex);
-
-        /* GEM does all our handle to object mapping */
-        obj = drm_gem_object_lookup(dev, file, handle);
-        if (obj == NULL) {
-                ret = -ENOENT;
-                goto unlock;
-        }
-        /* What validation is needed here ? */
-
-        /* Make it mmapable */
-        if (!obj->map_list.map) {
-                ret = gem_create_mmap_offset(obj);
-                if (ret)
-                        goto out;
-        }
-        /* GEM should really work out the hash offsets for us */
-        *offset = (u64)obj->map_list.hash.key << PAGE_SHIFT;
-out:
-        drm_gem_object_unreference(obj);
-unlock:
-        mutex_unlock(&dev->struct_mutex);
-        return ret;
-}
-
-/**
- *      psb_gem_create          -       create a mappable object
- *      @file: the DRM file of the client
- *      @dev: our device
- *      @size: the size requested
- *      @handlep: returned handle (opaque number)
- *
- *      Create a GEM object, fill in the boilerplate and attach a handle to
- *      it so that userspace can speak about it. This does the core work
- *      for the various methods that do/will create GEM objects for things
- */
-static int psb_gem_create(struct drm_file *file,
-        struct drm_device *dev, uint64_t size, uint32_t *handlep)
-{
-        struct gtt_range *r;
-        int ret;
-        u32 handle;
-
-        size = roundup(size, PAGE_SIZE);
-
-        /* Allocate our object - for now a direct gtt range which is not
-           stolen memory backed */
-        r = psb_gtt_alloc_range(dev, size, "gem", 0);
-        if (r == NULL) {
-                dev_err(dev->dev, "no memory for %lld byte GEM object\n", size);
-                return -ENOSPC;
-        }
-        /* Initialize the extra goodies GEM needs to do all the hard work */
-        if (drm_gem_object_init(dev, &r->gem, size) != 0) {
-                psb_gtt_free_range(dev, r);
-                /* GEM doesn't give an error code so use -ENOMEM */
-                dev_err(dev->dev, "GEM init failed for %lld\n", size);
-                return -ENOMEM;
-        }
-        /* Give the object a handle so we can carry it more easily */
-        ret = drm_gem_handle_create(file, &r->gem, &handle);
-        if (ret) {
-                dev_err(dev->dev, "GEM handle failed for %p, %lld\n",
-                                                        &r->gem, size);
-                drm_gem_object_release(&r->gem);
-                psb_gtt_free_range(dev, r);
-                return ret;
-        }
-        /* We have the initial and handle reference but need only one now */
-        drm_gem_object_unreference(&r->gem);
-        *handlep = handle;
-        return 0;
-}
-
-/**
- *      psb_gem_dumb_create     -       create a dumb buffer
- *      @drm_file: our client file
- *      @dev: our device
- *      @args: the requested arguments copied from userspace
- *
- *      Allocate a buffer suitable for use for a frame buffer of the
- *      form described by user space. Give userspace a handle by which
- *      to reference it.
- */
-int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
-                        struct drm_mode_create_dumb *args)
-{
-        args->pitch = ALIGN(args->width * ((args->bpp + 7) / 8), 64);
-        args->size = args->pitch * args->height;
-        return psb_gem_create(file, dev, args->size, &args->handle);
-}
-
-/**
- *      psb_gem_dumb_destroy    -       destroy a dumb buffer
- *      @file: client file
- *      @dev: our DRM device
- *      @handle: the object handle
- *
- *      Destroy a handle that was created via psb_gem_dumb_create, at least
- *      we hope it was created that way. i915 seems to assume the caller
- *      does the checking but that might be worth review ! FIXME
- */
-int psb_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
-                        uint32_t handle)
-{
-        /* No special work needed, drop the reference and see what falls out */
-        return drm_gem_handle_delete(file, handle);
-}
-
-/**
- *      psb_gem_fault           -       pagefault handler for GEM objects
- *      @vma: the VMA of the GEM object
- *      @vmf: fault detail
- *
- *      Invoked when a fault occurs on an mmap of a GEM managed area. GEM
- *      does most of the work for us including the actual map/unmap calls
- *      but we need to do the actual page work.
- *
- *      This code eventually needs to handle faulting objects in and out
- *      of the GTT and repacking it when we run out of space. We can put
- *      that off for now and for our simple uses
- *
- *      The VMA was set up by GEM. In doing so it also ensured that the
- *      vma->vm_private_data points to the GEM object that is backing this
- *      mapping.
- */
-int psb_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-{
-        struct drm_gem_object *obj;
-        struct gtt_range *r;
-        int ret;
-        unsigned long pfn;
-        pgoff_t page_offset;
-        struct drm_device *dev;
-        struct drm_psb_private *dev_priv;
-
-        obj = vma->vm_private_data;     /* GEM object */
-        dev = obj->dev;
-        dev_priv = dev->dev_private;
-
-        r = container_of(obj, struct gtt_range, gem);   /* Get the gtt range */
-
-        /* Make sure we don't parallel update on a fault, nor move or remove
-           something from beneath our feet */
-        mutex_lock(&dev->struct_mutex);
-
-        /* For now the mmap pins the object and it stays pinned. As things
-           stand that will do us no harm */
-        if (r->mmapping == 0) {
-                ret = psb_gtt_pin(r);
-                if (ret < 0) {
-                        dev_err(dev->dev, "gma500: pin failed: %d\n", ret);
-                        goto fail;
-                }
-                r->mmapping = 1;
-        }
-
-        /* Page relative to the VMA start - we must calculate this ourselves
-           because vmf->pgoff is the fake GEM offset */
-        page_offset = ((unsigned long) vmf->virtual_address - vma->vm_start)
-                                >> PAGE_SHIFT;
-
-        /* CPU view of the page, don't go via the GART for CPU writes */
-        if (r->stolen)
-                pfn = (dev_priv->stolen_base + r->offset) >> PAGE_SHIFT;
-        else
-                pfn = page_to_pfn(r->pages[page_offset]);
-        ret = vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn);
-
-fail:
-        mutex_unlock(&dev->struct_mutex);
-        switch (ret) {
-        case 0:
-        case -ERESTARTSYS:
-        case -EINTR:
-                return VM_FAULT_NOPAGE;
-        case -ENOMEM:
-                return VM_FAULT_OOM;
-        default:
-                return VM_FAULT_SIGBUS;
-        }
-}
-
-static int psb_gem_create_stolen(struct drm_file *file, struct drm_device *dev,
-                                                int size, u32 *handle)
-{
-        struct gtt_range *gtt = psb_gtt_alloc_range(dev, size, "gem", 1);
-        if (gtt == NULL)
-                return -ENOMEM;
-        if (drm_gem_private_object_init(dev, &gtt->gem, size) != 0)
-                goto free_gtt;
-        if (drm_gem_handle_create(file, &gtt->gem, handle) == 0)
-                return 0;
-free_gtt:
-        psb_gtt_free_range(dev, gtt);
-        return -ENOMEM;
-}
-
-/*
- *      GEM interfaces for our specific client
- */
-int psb_gem_create_ioctl(struct drm_device *dev, void *data,
-                                        struct drm_file *file)
-{
-        struct drm_psb_gem_create *args = data;
-        int ret;
-        if (args->flags & PSB_GEM_CREATE_STOLEN) {
-                ret = psb_gem_create_stolen(file, dev, args->size,
-                                                        &args->handle);
-                if (ret == 0)
-                        return 0;
-                /* Fall throguh */
-                args->flags &= ~PSB_GEM_CREATE_STOLEN;
-        }
-        return psb_gem_create(file, dev, args->size, &args->handle);
-}
-
-int psb_gem_mmap_ioctl(struct drm_device *dev, void *data,
-                                        struct drm_file *file)
-{
-        struct drm_psb_gem_mmap *args = data;
-        return dev->driver->dumb_map_offset(file, dev,
-                                                args->handle, &args->offset);
-}
-
diff --git a/drivers/staging/gma500/gem_glue.c b/drivers/staging/gma500/gem_glue.c
deleted file mode 100644
index daac12120653..000000000000
--- a/drivers/staging/gma500/gem_glue.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-#include <drm/drmP.h>
-#include <drm/drm.h>
-
-void drm_gem_object_release_wrap(struct drm_gem_object *obj)
-{
-        /* Remove the list map if one is present */
-        if (obj->map_list.map) {
-                struct drm_gem_mm *mm = obj->dev->mm_private;
-                struct drm_map_list *list = &obj->map_list;
-                drm_ht_remove_item(&mm->offset_hash, &list->hash);
-                drm_mm_put_block(list->file_offset_node);
-                kfree(list->map);
-                list->map = NULL;
-        }
-        drm_gem_object_release(obj);
-}
-
-/**
- *      gem_create_mmap_offset          -       invent an mmap offset
- *      @obj: our object
- *
- *      Standard implementation of offset generation for mmap as is
- *      duplicated in several drivers. This belongs in GEM.
- */
-int gem_create_mmap_offset(struct drm_gem_object *obj)
-{
-        struct drm_device *dev = obj->dev;
-        struct drm_gem_mm *mm = dev->mm_private;
-        struct drm_map_list *list;
-        struct drm_local_map *map;
-        int ret;
-
-        list = &obj->map_list;
-        list->map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL);
-        if (list->map == NULL)
-                return -ENOMEM;
-        map = list->map;
-        map->type = _DRM_GEM;
-        map->size = obj->size;
-        map->handle = obj;
-
-        list->file_offset_node = drm_mm_search_free(&mm->offset_manager,
-                                        obj->size / PAGE_SIZE, 0, 0);
-        if (!list->file_offset_node) {
-                dev_err(dev->dev, "failed to allocate offset for bo %d\n",
-                                                                obj->name);
-                ret = -ENOSPC;
-                goto free_it;
-        }
-        list->file_offset_node = drm_mm_get_block(list->file_offset_node,
-                                        obj->size / PAGE_SIZE, 0);
-        if (!list->file_offset_node) {
-                ret = -ENOMEM;
-                goto free_it;
-        }
-        list->hash.key = list->file_offset_node->start;
-        ret = drm_ht_insert_item(&mm->offset_hash, &list->hash);
-        if (ret) {
-                dev_err(dev->dev, "failed to add to map hash\n");
-                goto free_mm;
-        }
-        return 0;
-
-free_mm:
-        drm_mm_put_block(list->file_offset_node);
-free_it:
-        kfree(list->map);
-        list->map = NULL;
-        return ret;
-}
diff --git a/drivers/staging/gma500/gem_glue.h b/drivers/staging/gma500/gem_glue.h
deleted file mode 100644
index ce5ce30f74db..000000000000
--- a/drivers/staging/gma500/gem_glue.h
+++ /dev/null
@@ -1,2 +0,0 @@
-extern void drm_gem_object_release_wrap(struct drm_gem_object *obj);
-extern int gem_create_mmap_offset(struct drm_gem_object *obj);
diff --git a/drivers/staging/gma500/gtt.c b/drivers/staging/gma500/gtt.c
deleted file mode 100644
index e770bd190a5c..000000000000
--- a/drivers/staging/gma500/gtt.c
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * Copyright (c) 2007, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors: Thomas Hellstrom <thomas-at-tungstengraphics.com>
- *          Alan Cox <alan@linux.intel.com>
- */
-
-#include <drm/drmP.h>
-#include "psb_drv.h"
-
-
-/*
- *      GTT resource allocator - manage page mappings in GTT space
- */
-
-/**
- *      psb_gtt_mask_pte        -       generate GTT pte entry
- *      @pfn: page number to encode
- *      @type: type of memory in the GTT
- *
- *      Set the GTT entry for the appropriate memory type.
- */
-static inline uint32_t psb_gtt_mask_pte(uint32_t pfn, int type)
-{
-        uint32_t mask = PSB_PTE_VALID;
-
-        if (type & PSB_MMU_CACHED_MEMORY)
-                mask |= PSB_PTE_CACHED;
-        if (type & PSB_MMU_RO_MEMORY)
-                mask |= PSB_PTE_RO;
-        if (type & PSB_MMU_WO_MEMORY)
-                mask |= PSB_PTE_WO;
-
-        return (pfn << PAGE_SHIFT) | mask;
-}
-
-/**
- *      psb_gtt_entry           -       find the GTT entries for a gtt_range
- *      @dev: our DRM device
- *      @r: our GTT range
- *
- *      Given a gtt_range object return the GTT offset of the page table
- *      entries for this gtt_range
- */
-u32 *psb_gtt_entry(struct drm_device *dev, struct gtt_range *r)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned long offset;
-
-        offset = r->resource.start - dev_priv->gtt_mem->start;
-
-        return dev_priv->gtt_map + (offset >> PAGE_SHIFT);
-}
-
-/**
- *      psb_gtt_insert  -       put an object into the GTT
- *      @dev: our DRM device
- *      @r: our GTT range
- *
- *      Take our preallocated GTT range and insert the GEM object into
- *      the GTT. This is protected via the gtt mutex which the caller
- *      must hold.
- */
-static int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)
-{
-        u32 *gtt_slot, pte;
-        struct page **pages;
-        int i;
-
-        if (r->pages == NULL) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-
-        WARN_ON(r->stolen);     /* refcount these maybe ? */
-
-        gtt_slot = psb_gtt_entry(dev, r);
-        pages = r->pages;
-
-        /* Make sure changes are visible to the GPU */
-        set_pages_array_uc(pages, r->npage);
-
-        /* Write our page entries into the GTT itself */
-        for (i = r->roll; i < r->npage; i++) {
-                pte = psb_gtt_mask_pte(page_to_pfn(r->pages[i]), 0);
-                iowrite32(pte, gtt_slot++);
-        }
-        for (i = 0; i < r->roll; i++) {
-                pte = psb_gtt_mask_pte(page_to_pfn(r->pages[i]), 0);
-                iowrite32(pte, gtt_slot++);
-        }
-        /* Make sure all the entries are set before we return */
-        ioread32(gtt_slot - 1);
-
-        return 0;
-}
-
-/**
- *      psb_gtt_remove  -       remove an object from the GTT
- *      @dev: our DRM device
- *      @r: our GTT range
- *
- *      Remove a preallocated GTT range from the GTT. Overwrite all the
- *      page table entries with the dummy page. This is protected via the gtt
- *      mutex which the caller must hold.
- */
-static void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 *gtt_slot, pte;
-        int i;
-
-        WARN_ON(r->stolen);
-
-        gtt_slot = psb_gtt_entry(dev, r);
-        pte = psb_gtt_mask_pte(page_to_pfn(dev_priv->scratch_page), 0);
-
-        for (i = 0; i < r->npage; i++)
-                iowrite32(pte, gtt_slot++);
-        ioread32(gtt_slot - 1);
-        set_pages_array_wb(r->pages, r->npage);
-}
-
-/**
- *      psb_gtt_roll    -       set scrolling position
- *      @dev: our DRM device
- *      @r: the gtt mapping we are using
- *      @roll: roll offset
- *
- *      Roll an existing pinned mapping by moving the pages through the GTT.
- *      This allows us to implement hardware scrolling on the consoles without
- *      a 2D engine
- */
-void psb_gtt_roll(struct drm_device *dev, struct gtt_range *r, int roll)
-{
-        u32 *gtt_slot, pte;
-        int i;
-
-        if (roll >= r->npage) {
-                WARN_ON(1);
-                return;
-        }
-
-        r->roll = roll;
-
-        /* Not currently in the GTT - no worry we will write the mapping at
-           the right position when it gets pinned */
-        if (!r->stolen && !r->in_gart)
-                return;
-
-        gtt_slot = psb_gtt_entry(dev, r);
-
-        for (i = r->roll; i < r->npage; i++) {
-                pte = psb_gtt_mask_pte(page_to_pfn(r->pages[i]), 0);
-                iowrite32(pte, gtt_slot++);
-        }
-        for (i = 0; i < r->roll; i++) {
-                pte = psb_gtt_mask_pte(page_to_pfn(r->pages[i]), 0);
-                iowrite32(pte, gtt_slot++);
-        }
-        ioread32(gtt_slot - 1);
-}
-
-/**
- *      psb_gtt_attach_pages    -       attach and pin GEM pages
- *      @gt: the gtt range
- *
- *      Pin and build an in kernel list of the pages that back our GEM object.
- *      While we hold this the pages cannot be swapped out. This is protected
- *      via the gtt mutex which the caller must hold.
- */
-static int psb_gtt_attach_pages(struct gtt_range *gt)
-{
-        struct inode *inode;
-        struct address_space *mapping;
-        int i;
-        struct page *p;
-        int pages = gt->gem.size / PAGE_SIZE;
-
-        WARN_ON(gt->pages);
-
-        /* This is the shared memory object that backs the GEM resource */
-        inode = gt->gem.filp->f_path.dentry->d_inode;
-        mapping = inode->i_mapping;
-
-        gt->pages = kmalloc(pages * sizeof(struct page *), GFP_KERNEL);
-        if (gt->pages == NULL)
-                return -ENOMEM;
-        gt->npage = pages;
-
-        for (i = 0; i < pages; i++) {
-                /* FIXME: needs updating as per mail from Hugh Dickins */
-                p = read_cache_page_gfp(mapping, i,
-                                        __GFP_COLD | GFP_KERNEL);
-                if (IS_ERR(p))
-                        goto err;
-                gt->pages[i] = p;
-        }
-        return 0;
-
-err:
-        while (i--)
-                page_cache_release(gt->pages[i]);
-        kfree(gt->pages);
-        gt->pages = NULL;
-        return PTR_ERR(p);
-}
-
-/**
- *      psb_gtt_detach_pages    -       attach and pin GEM pages
- *      @gt: the gtt range
- *
- *      Undo the effect of psb_gtt_attach_pages. At this point the pages
- *      must have been removed from the GTT as they could now be paged out
- *      and move bus address. This is protected via the gtt mutex which the
- *      caller must hold.
- */
-static void psb_gtt_detach_pages(struct gtt_range *gt)
-{
-        int i;
-        for (i = 0; i < gt->npage; i++) {
-                /* FIXME: do we need to force dirty */
-                set_page_dirty(gt->pages[i]);
-                page_cache_release(gt->pages[i]);
-        }
-        kfree(gt->pages);
-        gt->pages = NULL;
-}
-
-/**
- *      psb_gtt_pin             -       pin pages into the GTT
- *      @gt: range to pin
- *
- *      Pin a set of pages into the GTT. The pins are refcounted so that
- *      multiple pins need multiple unpins to undo.
- *
- *      Non GEM backed objects treat this as a no-op as they are always GTT
- *      backed objects.
- */
-int psb_gtt_pin(struct gtt_range *gt)
-{
-        int ret = 0;
-        struct drm_device *dev = gt->gem.dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        mutex_lock(&dev_priv->gtt_mutex);
-
-        if (gt->in_gart == 0 && gt->stolen == 0) {
-                ret = psb_gtt_attach_pages(gt);
-                if (ret < 0)
-                        goto out;
-                ret = psb_gtt_insert(dev, gt);
-                if (ret < 0) {
-                        psb_gtt_detach_pages(gt);
-                        goto out;
-                }
-        }
-        gt->in_gart++;
-out:
-        mutex_unlock(&dev_priv->gtt_mutex);
-        return ret;
-}
-
-/**
- *      psb_gtt_unpin           -       Drop a GTT pin requirement
- *      @gt: range to pin
- *
- *      Undoes the effect of psb_gtt_pin. On the last drop the GEM object
- *      will be removed from the GTT which will also drop the page references
- *      and allow the VM to clean up or page stuff.
- *
- *      Non GEM backed objects treat this as a no-op as they are always GTT
- *      backed objects.
- */
-void psb_gtt_unpin(struct gtt_range *gt)
-{
-        struct drm_device *dev = gt->gem.dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        mutex_lock(&dev_priv->gtt_mutex);
-
-        WARN_ON(!gt->in_gart);
-
-        gt->in_gart--;
-        if (gt->in_gart == 0 && gt->stolen == 0) {
-                psb_gtt_remove(dev, gt);
-                psb_gtt_detach_pages(gt);
-        }
-        mutex_unlock(&dev_priv->gtt_mutex);
-}
-
-/*
- *      GTT resource allocator - allocate and manage GTT address space
- */
-
-/**
- *      psb_gtt_alloc_range     -       allocate GTT address space
- *      @dev: Our DRM device
- *      @len: length (bytes) of address space required
- *      @name: resource name
- *      @backed: resource should be backed by stolen pages
- *
- *      Ask the kernel core to find us a suitable range of addresses
- *      to use for a GTT mapping.
- *
- *      Returns a gtt_range structure describing the object, or NULL on
- *      error. On successful return the resource is both allocated and marked
- *      as in use.
- */
-struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,
-                                                const char *name, int backed)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct gtt_range *gt;
-        struct resource *r = dev_priv->gtt_mem;
-        int ret;
-        unsigned long start, end;
-
-        if (backed) {
-                /* The start of the GTT is the stolen pages */
-                start = r->start;
-                end = r->start + dev_priv->gtt.stolen_size - 1;
-        } else {
-                /* The rest we will use for GEM backed objects */
-                start = r->start + dev_priv->gtt.stolen_size;
-                end = r->end;
-        }
-
-        gt = kzalloc(sizeof(struct gtt_range), GFP_KERNEL);
-        if (gt == NULL)
-                return NULL;
-        gt->resource.name = name;
-        gt->stolen = backed;
-        gt->in_gart = backed;
-        gt->roll = 0;
-        /* Ensure this is set for non GEM objects */
-        gt->gem.dev = dev;
-        ret = allocate_resource(dev_priv->gtt_mem, &gt->resource,
-                                len, start, end, PAGE_SIZE, NULL, NULL);
-        if (ret == 0) {
-                gt->offset = gt->resource.start - r->start;
-                return gt;
-        }
-        kfree(gt);
-        return NULL;
-}
-
-/**
- *      psb_gtt_free_range      -       release GTT address space
- *      @dev: our DRM device
- *      @gt: a mapping created with psb_gtt_alloc_range
- *
- *      Release a resource that was allocated with psb_gtt_alloc_range. If the
- *      object has been pinned by mmap users we clean this up here currently.
- */
-void psb_gtt_free_range(struct drm_device *dev, struct gtt_range *gt)
-{
-        /* Undo the mmap pin if we are destroying the object */
-        if (gt->mmapping) {
-                psb_gtt_unpin(gt);
-                gt->mmapping = 0;
-        }
-        WARN_ON(gt->in_gart && !gt->stolen);
-        release_resource(&gt->resource);
-        kfree(gt);
-}
-
-void psb_gtt_alloc(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        init_rwsem(&dev_priv->gtt.sem);
-}
-
-void psb_gtt_takedown(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (dev_priv->gtt_map) {
-                iounmap(dev_priv->gtt_map);
-                dev_priv->gtt_map = NULL;
-        }
-        if (dev_priv->gtt_initialized) {
-                pci_write_config_word(dev->pdev, PSB_GMCH_CTRL,
-                                      dev_priv->gmch_ctrl);
-                PSB_WVDC32(dev_priv->pge_ctl, PSB_PGETBL_CTL);
-                (void) PSB_RVDC32(PSB_PGETBL_CTL);
-        }
-        if (dev_priv->vram_addr)
-                iounmap(dev_priv->gtt_map);
-}
-
-int psb_gtt_init(struct drm_device *dev, int resume)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned gtt_pages;
-        unsigned long stolen_size, vram_stolen_size;
-        unsigned i, num_pages;
-        unsigned pfn_base;
-        uint32_t vram_pages;
-        uint32_t dvmt_mode = 0;
-        struct psb_gtt *pg;
-
-        int ret = 0;
-        uint32_t pte;
-
-        mutex_init(&dev_priv->gtt_mutex);
-
-        psb_gtt_alloc(dev);
-        pg = &dev_priv->gtt;
-
-        /* Enable the GTT */
-        pci_read_config_word(dev->pdev, PSB_GMCH_CTRL, &dev_priv->gmch_ctrl);
-        pci_write_config_word(dev->pdev, PSB_GMCH_CTRL,
-                              dev_priv->gmch_ctrl | _PSB_GMCH_ENABLED);
-
-        dev_priv->pge_ctl = PSB_RVDC32(PSB_PGETBL_CTL);
-        PSB_WVDC32(dev_priv->pge_ctl | _PSB_PGETBL_ENABLED, PSB_PGETBL_CTL);
-        (void) PSB_RVDC32(PSB_PGETBL_CTL);
-
-        /* The root resource we allocate address space from */
-        dev_priv->gtt_initialized = 1;
-
-        pg->gtt_phys_start = dev_priv->pge_ctl & PAGE_MASK;
-
-        /*
-         *      The video mmu has a hw bug when accessing 0x0D0000000.
-         *      Make gatt start at 0x0e000,0000. This doesn't actually
-         *      matter for us but may do if the video acceleration ever
-         *      gets opened up.
-         */
-        pg->mmu_gatt_start = 0xE0000000;
-
-        pg->gtt_start = pci_resource_start(dev->pdev, PSB_GTT_RESOURCE);
-        gtt_pages = pci_resource_len(dev->pdev, PSB_GTT_RESOURCE)
-                                                                >> PAGE_SHIFT;
-        /* Some CDV firmware doesn't report this currently. In which case the
-           system has 64 gtt pages */
-        if (pg->gtt_start == 0 || gtt_pages == 0) {
-                dev_err(dev->dev, "GTT PCI BAR not initialized.\n");
-                gtt_pages = 64;
-                pg->gtt_start = dev_priv->pge_ctl;
-        }
-
-        pg->gatt_start = pci_resource_start(dev->pdev, PSB_GATT_RESOURCE);
-        pg->gatt_pages = pci_resource_len(dev->pdev, PSB_GATT_RESOURCE)
-                                                                >> PAGE_SHIFT;
-        dev_priv->gtt_mem = &dev->pdev->resource[PSB_GATT_RESOURCE];
-
-        if (pg->gatt_pages == 0 || pg->gatt_start == 0) {
-                static struct resource fudge;   /* Preferably peppermint */
-                /* This can occur on CDV SDV systems. Fudge it in this case.
-                   We really don't care what imaginary space is being allocated
-                   at this point */
-                dev_err(dev->dev, "GATT PCI BAR not initialized.\n");
-                pg->gatt_start = 0x40000000;
-                pg->gatt_pages = (128 * 1024 * 1024) >> PAGE_SHIFT;
-                /* This is a little confusing but in fact the GTT is providing
-                   a view from the GPU into memory and not vice versa. As such
-                   this is really allocating space that is not the same as the
-                   CPU address space on CDV */
-                fudge.start = 0x40000000;
-                fudge.end = 0x40000000 + 128 * 1024 * 1024 - 1;
-                fudge.name = "fudge";
-                fudge.flags = IORESOURCE_MEM;
-                dev_priv->gtt_mem = &fudge;
-        }
-
-        pci_read_config_dword(dev->pdev, PSB_BSM, &dev_priv->stolen_base);
-        vram_stolen_size = pg->gtt_phys_start - dev_priv->stolen_base
-                                                                - PAGE_SIZE;
-
-        stolen_size = vram_stolen_size;
-
-        printk(KERN_INFO "Stolen memory information\n");
-        printk(KERN_INFO "       base in RAM: 0x%x\n", dev_priv->stolen_base);
-        printk(KERN_INFO "       size: %luK, calculated by (GTT RAM base) - (Stolen base), seems wrong\n",
-                vram_stolen_size/1024);
-        dvmt_mode = (dev_priv->gmch_ctrl >> 4) & 0x7;
-        printk(KERN_INFO "      the correct size should be: %dM(dvmt mode=%d)\n",
-                (dvmt_mode == 1) ? 1 : (2 << (dvmt_mode - 1)), dvmt_mode);
-
-        if (resume && (gtt_pages != pg->gtt_pages) &&
-            (stolen_size != pg->stolen_size)) {
-                dev_err(dev->dev, "GTT resume error.\n");
-                ret = -EINVAL;
-                goto out_err;
-        }
-
-        pg->gtt_pages = gtt_pages;
-        pg->stolen_size = stolen_size;
-        dev_priv->vram_stolen_size = vram_stolen_size;
-
-        /*
-         *      Map the GTT and the stolen memory area
-         */
-        dev_priv->gtt_map = ioremap_nocache(pg->gtt_phys_start,
-                                                gtt_pages << PAGE_SHIFT);
-        if (!dev_priv->gtt_map) {
-                dev_err(dev->dev, "Failure to map gtt.\n");
-                ret = -ENOMEM;
-                goto out_err;
-        }
-
-        dev_priv->vram_addr = ioremap_wc(dev_priv->stolen_base, stolen_size);
-        if (!dev_priv->vram_addr) {
-                dev_err(dev->dev, "Failure to map stolen base.\n");
-                ret = -ENOMEM;
-                goto out_err;
-        }
-
-        /*
-         * Insert vram stolen pages into the GTT
-         */
-
-        pfn_base = dev_priv->stolen_base >> PAGE_SHIFT;
-        vram_pages = num_pages = vram_stolen_size >> PAGE_SHIFT;
-        printk(KERN_INFO"Set up %d stolen pages starting at 0x%08x, GTT offset %dK\n",
-                num_pages, pfn_base << PAGE_SHIFT, 0);
-        for (i = 0; i < num_pages; ++i) {
-                pte = psb_gtt_mask_pte(pfn_base + i, 0);
-                iowrite32(pte, dev_priv->gtt_map + i);
-        }
-
-        /*
-         * Init rest of GTT to the scratch page to avoid accidents or scribbles
-         */
-
-        pfn_base = page_to_pfn(dev_priv->scratch_page);
-        pte = psb_gtt_mask_pte(pfn_base, 0);
-        for (; i < gtt_pages; ++i)
-                iowrite32(pte, dev_priv->gtt_map + i);
-
-        (void) ioread32(dev_priv->gtt_map + i - 1);
-        return 0;
-
-out_err:
-        psb_gtt_takedown(dev);
-        return ret;
-}
diff --git a/drivers/staging/gma500/gtt.h b/drivers/staging/gma500/gtt.h
deleted file mode 100644
index aa1742387f5a..000000000000
--- a/drivers/staging/gma500/gtt.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2007-2008, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-#ifndef _PSB_GTT_H_
-#define _PSB_GTT_H_
-
-#include <drm/drmP.h>
-
-/* This wants cleaning up with respect to the psb_dev and un-needed stuff */
-struct psb_gtt {
-        uint32_t gatt_start;
-        uint32_t mmu_gatt_start;
-        uint32_t gtt_start;
-        uint32_t gtt_phys_start;
-        unsigned gtt_pages;
-        unsigned gatt_pages;
-        unsigned long stolen_size;
-        unsigned long vram_stolen_size;
-        struct rw_semaphore sem;
-};
-
-/* Exported functions */
-extern int psb_gtt_init(struct drm_device *dev, int resume);
-extern void psb_gtt_takedown(struct drm_device *dev);
-
-/* Each gtt_range describes an allocation in the GTT area */
-struct gtt_range {
-        struct resource resource;       /* Resource for our allocation */
-        u32 offset;                     /* GTT offset of our object */
-        struct drm_gem_object gem;      /* GEM high level stuff */
-        int in_gart;                    /* Currently in the GART (ref ct) */
-        bool stolen;                    /* Backed from stolen RAM */
-        bool mmapping;                  /* Is mmappable */
-        struct page **pages;            /* Backing pages if present */
-        int npage;                      /* Number of backing pages */
-        int roll;                       /* Roll applied to the GTT entries */
-};
-
-extern struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,
-                                                const char *name, int backed);
-extern void psb_gtt_kref_put(struct gtt_range *gt);
-extern void psb_gtt_free_range(struct drm_device *dev, struct gtt_range *gt);
-extern int psb_gtt_pin(struct gtt_range *gt);
-extern void psb_gtt_unpin(struct gtt_range *gt);
-extern void psb_gtt_roll(struct drm_device *dev,
-                                        struct gtt_range *gt, int roll);
-
-#endif
diff --git a/drivers/staging/gma500/intel_bios.c b/drivers/staging/gma500/intel_bios.c
deleted file mode 100644
index 096757f9bc89..000000000000
--- a/drivers/staging/gma500/intel_bios.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (c) 2006 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include "psb_drm.h"
-#include "psb_drv.h"
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "intel_bios.h"
-
-
-static void *find_section(struct bdb_header *bdb, int section_id)
-{
-        u8 *base = (u8 *)bdb;
-        int index = 0;
-        u16 total, current_size;
-        u8 current_id;
-
-        /* skip to first section */
-        index += bdb->header_size;
-        total = bdb->bdb_size;
-
-        /* walk the sections looking for section_id */
-        while (index < total) {
-                current_id = *(base + index);
-                index++;
-                current_size = *((u16 *)(base + index));
-                index += 2;
-                if (current_id == section_id)
-                        return base + index;
-                index += current_size;
-        }
-
-        return NULL;
-}
-
-static void fill_detail_timing_data(struct drm_display_mode *panel_fixed_mode,
-                        struct lvds_dvo_timing *dvo_timing)
-{
-        panel_fixed_mode->hdisplay = (dvo_timing->hactive_hi << 8) |
-                dvo_timing->hactive_lo;
-        panel_fixed_mode->hsync_start = panel_fixed_mode->hdisplay +
-                ((dvo_timing->hsync_off_hi << 8) | dvo_timing->hsync_off_lo);
-        panel_fixed_mode->hsync_end = panel_fixed_mode->hsync_start +
-                dvo_timing->hsync_pulse_width;
-        panel_fixed_mode->htotal = panel_fixed_mode->hdisplay +
-                ((dvo_timing->hblank_hi << 8) | dvo_timing->hblank_lo);
-
-        panel_fixed_mode->vdisplay = (dvo_timing->vactive_hi << 8) |
-                dvo_timing->vactive_lo;
-        panel_fixed_mode->vsync_start = panel_fixed_mode->vdisplay +
-                dvo_timing->vsync_off;
-        panel_fixed_mode->vsync_end = panel_fixed_mode->vsync_start +
-                dvo_timing->vsync_pulse_width;
-        panel_fixed_mode->vtotal = panel_fixed_mode->vdisplay +
-                ((dvo_timing->vblank_hi << 8) | dvo_timing->vblank_lo);
-        panel_fixed_mode->clock = dvo_timing->clock * 10;
-        panel_fixed_mode->type = DRM_MODE_TYPE_PREFERRED;
-
-        /* Some VBTs have bogus h/vtotal values */
-        if (panel_fixed_mode->hsync_end > panel_fixed_mode->htotal)
-                panel_fixed_mode->htotal = panel_fixed_mode->hsync_end + 1;
-        if (panel_fixed_mode->vsync_end > panel_fixed_mode->vtotal)
-                panel_fixed_mode->vtotal = panel_fixed_mode->vsync_end + 1;
-
-        drm_mode_set_name(panel_fixed_mode);
-}
-
-static void parse_backlight_data(struct drm_psb_private *dev_priv,
-                                struct bdb_header *bdb)
-{
-        struct bdb_lvds_backlight *vbt_lvds_bl = NULL;
-        struct bdb_lvds_backlight *lvds_bl;
-        u8 p_type = 0;
-        void *bl_start = NULL;
-        struct bdb_lvds_options *lvds_opts
-                                = find_section(bdb, BDB_LVDS_OPTIONS);
-
-        dev_priv->lvds_bl = NULL;
-
-        if (lvds_opts)
-                p_type = lvds_opts->panel_type;
-        else
-                return;
-
-        bl_start = find_section(bdb, BDB_LVDS_BACKLIGHT);
-        vbt_lvds_bl = (struct bdb_lvds_backlight *)(bl_start + 1) + p_type;
-
-        lvds_bl = kzalloc(sizeof(*vbt_lvds_bl), GFP_KERNEL);
-        if (!lvds_bl) {
-                dev_err(dev_priv->dev->dev, "out of memory for backlight data\n");
-                return;
-        }
-        memcpy(lvds_bl, vbt_lvds_bl, sizeof(*vbt_lvds_bl));
-        dev_priv->lvds_bl = lvds_bl;
-}
-
-/* Try to find integrated panel data */
-static void parse_lfp_panel_data(struct drm_psb_private *dev_priv,
-                            struct bdb_header *bdb)
-{
-        struct bdb_lvds_options *lvds_options;
-        struct bdb_lvds_lfp_data *lvds_lfp_data;
-        struct bdb_lvds_lfp_data_entry *entry;
-        struct lvds_dvo_timing *dvo_timing;
-        struct drm_display_mode *panel_fixed_mode;
-
-        /* Defaults if we can't find VBT info */
-        dev_priv->lvds_dither = 0;
-        dev_priv->lvds_vbt = 0;
-
-        lvds_options = find_section(bdb, BDB_LVDS_OPTIONS);
-        if (!lvds_options)
-                return;
-
-        dev_priv->lvds_dither = lvds_options->pixel_dither;
-        if (lvds_options->panel_type == 0xff)
-                return;
-
-        lvds_lfp_data = find_section(bdb, BDB_LVDS_LFP_DATA);
-        if (!lvds_lfp_data)
-                return;
-
-
-        entry = &lvds_lfp_data->data[lvds_options->panel_type];
-        dvo_timing = &entry->dvo_timing;
-
-        panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode),
-                                      GFP_KERNEL);
-        if (panel_fixed_mode == NULL) {
-                dev_err(dev_priv->dev->dev, "out of memory for fixed panel mode\n");
-                return;
-        }
-
-        dev_priv->lvds_vbt = 1;
-        fill_detail_timing_data(panel_fixed_mode, dvo_timing);
-
-        if (panel_fixed_mode->htotal > 0 && panel_fixed_mode->vtotal > 0) {
-                dev_priv->lfp_lvds_vbt_mode = panel_fixed_mode;
-                drm_mode_debug_printmodeline(panel_fixed_mode);
-        } else {
-                dev_dbg(dev_priv->dev->dev, "ignoring invalid LVDS VBT\n");
-                dev_priv->lvds_vbt = 0;
-                kfree(panel_fixed_mode);
-        }
-        return;
-}
-
-/* Try to find sdvo panel data */
-static void parse_sdvo_panel_data(struct drm_psb_private *dev_priv,
-                      struct bdb_header *bdb)
-{
-        struct bdb_sdvo_lvds_options *sdvo_lvds_options;
-        struct lvds_dvo_timing *dvo_timing;
-        struct drm_display_mode *panel_fixed_mode;
-
-        dev_priv->sdvo_lvds_vbt_mode = NULL;
-
-        sdvo_lvds_options = find_section(bdb, BDB_SDVO_LVDS_OPTIONS);
-        if (!sdvo_lvds_options)
-                return;
-
-        dvo_timing = find_section(bdb, BDB_SDVO_PANEL_DTDS);
-        if (!dvo_timing)
-                return;
-
-        panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode), GFP_KERNEL);
-
-        if (!panel_fixed_mode)
-                return;
-
-        fill_detail_timing_data(panel_fixed_mode,
-                        dvo_timing + sdvo_lvds_options->panel_type);
-
-        dev_priv->sdvo_lvds_vbt_mode = panel_fixed_mode;
-
-        return;
-}
-
-static void parse_general_features(struct drm_psb_private *dev_priv,
-                       struct bdb_header *bdb)
-{
-        struct bdb_general_features *general;
-
-        /* Set sensible defaults in case we can't find the general block */
-        dev_priv->int_tv_support = 1;
-        dev_priv->int_crt_support = 1;
-
-        general = find_section(bdb, BDB_GENERAL_FEATURES);
-        if (general) {
-                dev_priv->int_tv_support = general->int_tv_support;
-                dev_priv->int_crt_support = general->int_crt_support;
-                dev_priv->lvds_use_ssc = general->enable_ssc;
-
-                if (dev_priv->lvds_use_ssc) {
-                        dev_priv->lvds_ssc_freq
-                                = general->ssc_freq ? 100 : 96;
-                }
-        }
-}
-
-/**
- * psb_intel_init_bios - initialize VBIOS settings & find VBT
- * @dev: DRM device
- *
- * Loads the Video BIOS and checks that the VBT exists.  Sets scratch registers
- * to appropriate values.
- *
- * VBT existence is a sanity check that is relied on by other i830_bios.c code.
- * Note that it would be better to use a BIOS call to get the VBT, as BIOSes may
- * feed an updated VBT back through that, compared to what we'll fetch using
- * this method of groping around in the BIOS data.
- *
- * Returns 0 on success, nonzero on failure.
- */
-bool psb_intel_init_bios(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct pci_dev *pdev = dev->pdev;
-        struct vbt_header *vbt = NULL;
-        struct bdb_header *bdb;
-        u8 __iomem *bios;
-        size_t size;
-        int i;
-
-        bios = pci_map_rom(pdev, &size);
-        if (!bios)
-                return -1;
-
-        /* Scour memory looking for the VBT signature */
-        for (i = 0; i + 4 < size; i++) {
-                if (!memcmp(bios + i, "$VBT", 4)) {
-                        vbt = (struct vbt_header *)(bios + i);
-                        break;
-                }
-        }
-
-        if (!vbt) {
-                dev_err(dev->dev, "VBT signature missing\n");
-                pci_unmap_rom(pdev, bios);
-                return -1;
-        }
-
-        bdb = (struct bdb_header *)(bios + i + vbt->bdb_offset);
-
-        /* Grab useful general definitions */
-        parse_general_features(dev_priv, bdb);
-        parse_lfp_panel_data(dev_priv, bdb);
-        parse_sdvo_panel_data(dev_priv, bdb);
-        parse_backlight_data(dev_priv, bdb);
-
-        pci_unmap_rom(pdev, bios);
-
-        return 0;
-}
-
-/**
- * Destroy and free VBT data
- */
-void psb_intel_destroy_bios(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct drm_display_mode *sdvo_lvds_vbt_mode =
-                                dev_priv->sdvo_lvds_vbt_mode;
-        struct drm_display_mode *lfp_lvds_vbt_mode =
-                                dev_priv->lfp_lvds_vbt_mode;
-        struct bdb_lvds_backlight *lvds_bl =
-                                dev_priv->lvds_bl;
-
-        /*free sdvo panel mode*/
-        if (sdvo_lvds_vbt_mode) {
-                dev_priv->sdvo_lvds_vbt_mode = NULL;
-                kfree(sdvo_lvds_vbt_mode);
-        }
-
-        if (lfp_lvds_vbt_mode) {
-                dev_priv->lfp_lvds_vbt_mode = NULL;
-                kfree(lfp_lvds_vbt_mode);
-        }
-
-        if (lvds_bl) {
-                dev_priv->lvds_bl = NULL;
-                kfree(lvds_bl);
-        }
-}
diff --git a/drivers/staging/gma500/intel_bios.h b/drivers/staging/gma500/intel_bios.h
deleted file mode 100644
index 70f1bf018183..000000000000
--- a/drivers/staging/gma500/intel_bios.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
- * Copyright (c) 2006 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#ifndef _I830_BIOS_H_
-#define _I830_BIOS_H_
-
-#include <drm/drmP.h>
-
-struct vbt_header {
-        u8 signature[20];               /**< Always starts with 'VBT$' */
-        u16 version;                    /**< decimal */
-        u16 header_size;                /**< in bytes */
-        u16 vbt_size;                   /**< in bytes */
-        u8 vbt_checksum;
-        u8 reserved0;
-        u32 bdb_offset;                 /**< from beginning of VBT */
-        u32 aim_offset[4];              /**< from beginning of VBT */
-} __attribute__((packed));
-
-
-struct bdb_header {
-        u8 signature[16];               /**< Always 'BIOS_DATA_BLOCK' */
-        u16 version;                    /**< decimal */
-        u16 header_size;                /**< in bytes */
-        u16 bdb_size;                   /**< in bytes */
-};
-
-/* strictly speaking, this is a "skip" block, but it has interesting info */
-struct vbios_data {
-        u8 type; /* 0 == desktop, 1 == mobile */
-        u8 relstage;
-        u8 chipset;
-        u8 lvds_present:1;
-        u8 tv_present:1;
-        u8 rsvd2:6; /* finish byte */
-        u8 rsvd3[4];
-        u8 signon[155];
-        u8 copyright[61];
-        u16 code_segment;
-        u8 dos_boot_mode;
-        u8 bandwidth_percent;
-        u8 rsvd4; /* popup memory size */
-        u8 resize_pci_bios;
-        u8 rsvd5; /* is crt already on ddc2 */
-} __attribute__((packed));
-
-/*
- * There are several types of BIOS data blocks (BDBs), each block has
- * an ID and size in the first 3 bytes (ID in first, size in next 2).
- * Known types are listed below.
- */
-#define BDB_GENERAL_FEATURES      1
-#define BDB_GENERAL_DEFINITIONS   2
-#define BDB_OLD_TOGGLE_LIST       3
-#define BDB_MODE_SUPPORT_LIST     4
-#define BDB_GENERIC_MODE_TABLE    5
-#define BDB_EXT_MMIO_REGS         6
-#define BDB_SWF_IO                7
-#define BDB_SWF_MMIO              8
-#define BDB_DOT_CLOCK_TABLE       9
-#define BDB_MODE_REMOVAL_TABLE   10
-#define BDB_CHILD_DEVICE_TABLE   11
-#define BDB_DRIVER_FEATURES      12
-#define BDB_DRIVER_PERSISTENCE   13
-#define BDB_EXT_TABLE_PTRS       14
-#define BDB_DOT_CLOCK_OVERRIDE   15
-#define BDB_DISPLAY_SELECT       16
-/* 17 rsvd */
-#define BDB_DRIVER_ROTATION      18
-#define BDB_DISPLAY_REMOVE       19
-#define BDB_OEM_CUSTOM           20
-#define BDB_EFP_LIST             21 /* workarounds for VGA hsync/vsync */
-#define BDB_SDVO_LVDS_OPTIONS    22
-#define BDB_SDVO_PANEL_DTDS      23
-#define BDB_SDVO_LVDS_PNP_IDS    24
-#define BDB_SDVO_LVDS_POWER_SEQ  25
-#define BDB_TV_OPTIONS           26
-#define BDB_LVDS_OPTIONS         40
-#define BDB_LVDS_LFP_DATA_PTRS   41
-#define BDB_LVDS_LFP_DATA        42
-#define BDB_LVDS_BACKLIGHT       43
-#define BDB_LVDS_POWER           44
-#define BDB_SKIP                254 /* VBIOS private block, ignore */
-
-struct bdb_general_features {
-        /* bits 1 */
-        u8 panel_fitting:2;
-        u8 flexaim:1;
-        u8 msg_enable:1;
-        u8 clear_screen:3;
-        u8 color_flip:1;
-
-        /* bits 2 */
-        u8 download_ext_vbt:1;
-        u8 enable_ssc:1;
-        u8 ssc_freq:1;
-        u8 enable_lfp_on_override:1;
-        u8 disable_ssc_ddt:1;
-        u8 rsvd8:3; /* finish byte */
-
-        /* bits 3 */
-        u8 disable_smooth_vision:1;
-        u8 single_dvi:1;
-        u8 rsvd9:6; /* finish byte */
-
-        /* bits 4 */
-        u8 legacy_monitor_detect;
-
-        /* bits 5 */
-        u8 int_crt_support:1;
-        u8 int_tv_support:1;
-        u8 rsvd11:6; /* finish byte */
-} __attribute__((packed));
-
-struct bdb_general_definitions {
-        /* DDC GPIO */
-        u8 crt_ddc_gmbus_pin;
-
-        /* DPMS bits */
-        u8 dpms_acpi:1;
-        u8 skip_boot_crt_detect:1;
-        u8 dpms_aim:1;
-        u8 rsvd1:5; /* finish byte */
-
-        /* boot device bits */
-        u8 boot_display[2];
-        u8 child_dev_size;
-
-        /* device info */
-        u8 tv_or_lvds_info[33];
-        u8 dev1[33];
-        u8 dev2[33];
-        u8 dev3[33];
-        u8 dev4[33];
-        /* may be another device block here on some platforms */
-};
-
-struct bdb_lvds_options {
-        u8 panel_type;
-        u8 rsvd1;
-        /* LVDS capabilities, stored in a dword */
-        u8 pfit_mode:2;
-        u8 pfit_text_mode_enhanced:1;
-        u8 pfit_gfx_mode_enhanced:1;
-        u8 pfit_ratio_auto:1;
-        u8 pixel_dither:1;
-        u8 lvds_edid:1;
-        u8 rsvd2:1;
-        u8 rsvd4;
-} __attribute__((packed));
-
-struct bdb_lvds_backlight {
-        u8 type:2;
-        u8 pol:1;
-        u8 gpio:3;
-        u8 gmbus:2;
-        u16 freq;
-        u8 minbrightness;
-        u8 i2caddr;
-        u8 brightnesscmd;
-        /*FIXME: more...*/
-} __attribute__((packed));
-
-/* LFP pointer table contains entries to the struct below */
-struct bdb_lvds_lfp_data_ptr {
-        u16 fp_timing_offset; /* offsets are from start of bdb */
-        u8 fp_table_size;
-        u16 dvo_timing_offset;
-        u8 dvo_table_size;
-        u16 panel_pnp_id_offset;
-        u8 pnp_table_size;
-} __attribute__((packed));
-
-struct bdb_lvds_lfp_data_ptrs {
-        u8 lvds_entries; /* followed by one or more lvds_data_ptr structs */
-        struct bdb_lvds_lfp_data_ptr ptr[16];
-} __attribute__((packed));
-
-/* LFP data has 3 blocks per entry */
-struct lvds_fp_timing {
-        u16 x_res;
-        u16 y_res;
-        u32 lvds_reg;
-        u32 lvds_reg_val;
-        u32 pp_on_reg;
-        u32 pp_on_reg_val;
-        u32 pp_off_reg;
-        u32 pp_off_reg_val;
-        u32 pp_cycle_reg;
-        u32 pp_cycle_reg_val;
-        u32 pfit_reg;
-        u32 pfit_reg_val;
-        u16 terminator;
-} __attribute__((packed));
-
-struct lvds_dvo_timing {
-        u16 clock;              /**< In 10khz */
-        u8 hactive_lo;
-        u8 hblank_lo;
-        u8 hblank_hi:4;
-        u8 hactive_hi:4;
-        u8 vactive_lo;
-        u8 vblank_lo;
-        u8 vblank_hi:4;
-        u8 vactive_hi:4;
-        u8 hsync_off_lo;
-        u8 hsync_pulse_width;
-        u8 vsync_pulse_width:4;
-        u8 vsync_off:4;
-        u8 rsvd0:6;
-        u8 hsync_off_hi:2;
-        u8 h_image;
-        u8 v_image;
-        u8 max_hv;
-        u8 h_border;
-        u8 v_border;
-        u8 rsvd1:3;
-        u8 digital:2;
-        u8 vsync_positive:1;
-        u8 hsync_positive:1;
-        u8 rsvd2:1;
-} __attribute__((packed));
-
-struct lvds_pnp_id {
-        u16 mfg_name;
-        u16 product_code;
-        u32 serial;
-        u8 mfg_week;
-        u8 mfg_year;
-} __attribute__((packed));
-
-struct bdb_lvds_lfp_data_entry {
-        struct lvds_fp_timing fp_timing;
-        struct lvds_dvo_timing dvo_timing;
-        struct lvds_pnp_id pnp_id;
-} __attribute__((packed));
-
-struct bdb_lvds_lfp_data {
-        struct bdb_lvds_lfp_data_entry data[16];
-} __attribute__((packed));
-
-struct aimdb_header {
-        char signature[16];
-        char oem_device[20];
-        u16 aimdb_version;
-        u16 aimdb_header_size;
-        u16 aimdb_size;
-} __attribute__((packed));
-
-struct aimdb_block {
-        u8 aimdb_id;
-        u16 aimdb_size;
-} __attribute__((packed));
-
-struct vch_panel_data {
-        u16 fp_timing_offset;
-        u8 fp_timing_size;
-        u16 dvo_timing_offset;
-        u8 dvo_timing_size;
-        u16 text_fitting_offset;
-        u8 text_fitting_size;
-        u16 graphics_fitting_offset;
-        u8 graphics_fitting_size;
-} __attribute__((packed));
-
-struct vch_bdb_22 {
-        struct aimdb_block aimdb_block;
-        struct vch_panel_data panels[16];
-} __attribute__((packed));
-
-struct bdb_sdvo_lvds_options {
-        u8 panel_backlight;
-        u8 h40_set_panel_type;
-        u8 panel_type;
-        u8 ssc_clk_freq;
-        u16 als_low_trip;
-        u16 als_high_trip;
-        u8 sclalarcoeff_tab_row_num;
-        u8 sclalarcoeff_tab_row_size;
-        u8 coefficient[8];
-        u8 panel_misc_bits_1;
-        u8 panel_misc_bits_2;
-        u8 panel_misc_bits_3;
-        u8 panel_misc_bits_4;
-} __attribute__((packed));
-
-
-extern bool psb_intel_init_bios(struct drm_device *dev);
-extern void psb_intel_destroy_bios(struct drm_device *dev);
-
-/*
- * Driver<->VBIOS interaction occurs through scratch bits in
- * GR18 & SWF*.
- */
-
-/* GR18 bits are set on display switch and hotkey events */
-#define GR18_DRIVER_SWITCH_EN   (1<<7) /* 0: VBIOS control, 1: driver control */
-#define GR18_HOTKEY_MASK        0x78 /* See also SWF4 15:0 */
-#define   GR18_HK_NONE          (0x0<<3)
-#define   GR18_HK_LFP_STRETCH   (0x1<<3)
-#define   GR18_HK_TOGGLE_DISP   (0x2<<3)
-#define   GR18_HK_DISP_SWITCH   (0x4<<3) /* see SWF14 15:0 for what to enable */
-#define   GR18_HK_POPUP_DISABLED (0x6<<3)
-#define   GR18_HK_POPUP_ENABLED (0x7<<3)
-#define   GR18_HK_PFIT          (0x8<<3)
-#define   GR18_HK_APM_CHANGE    (0xa<<3)
-#define   GR18_HK_MULTIPLE      (0xc<<3)
-#define GR18_USER_INT_EN        (1<<2)
-#define GR18_A0000_FLUSH_EN     (1<<1)
-#define GR18_SMM_EN             (1<<0)
-
-/* Set by driver, cleared by VBIOS */
-#define SWF00_YRES_SHIFT        16
-#define SWF00_XRES_SHIFT        0
-#define SWF00_RES_MASK          0xffff
-
-/* Set by VBIOS at boot time and driver at runtime */
-#define SWF01_TV2_FORMAT_SHIFT  8
-#define SWF01_TV1_FORMAT_SHIFT  0
-#define SWF01_TV_FORMAT_MASK    0xffff
-
-#define SWF10_VBIOS_BLC_I2C_EN  (1<<29)
-#define SWF10_GTT_OVERRIDE_EN   (1<<28)
-#define SWF10_LFP_DPMS_OVR      (1<<27) /* override DPMS on display switch */
-#define SWF10_ACTIVE_TOGGLE_LIST_MASK (7<<24)
-#define   SWF10_OLD_TOGGLE      0x0
-#define   SWF10_TOGGLE_LIST_1   0x1
-#define   SWF10_TOGGLE_LIST_2   0x2
-#define   SWF10_TOGGLE_LIST_3   0x3
-#define   SWF10_TOGGLE_LIST_4   0x4
-#define SWF10_PANNING_EN        (1<<23)
-#define SWF10_DRIVER_LOADED     (1<<22)
-#define SWF10_EXTENDED_DESKTOP  (1<<21)
-#define SWF10_EXCLUSIVE_MODE    (1<<20)
-#define SWF10_OVERLAY_EN        (1<<19)
-#define SWF10_PLANEB_HOLDOFF    (1<<18)
-#define SWF10_PLANEA_HOLDOFF    (1<<17)
-#define SWF10_VGA_HOLDOFF       (1<<16)
-#define SWF10_ACTIVE_DISP_MASK  0xffff
-#define   SWF10_PIPEB_LFP2      (1<<15)
-#define   SWF10_PIPEB_EFP2      (1<<14)
-#define   SWF10_PIPEB_TV2       (1<<13)
-#define   SWF10_PIPEB_CRT2      (1<<12)
-#define   SWF10_PIPEB_LFP       (1<<11)
-#define   SWF10_PIPEB_EFP       (1<<10)
-#define   SWF10_PIPEB_TV        (1<<9)
-#define   SWF10_PIPEB_CRT       (1<<8)
-#define   SWF10_PIPEA_LFP2      (1<<7)
-#define   SWF10_PIPEA_EFP2      (1<<6)
-#define   SWF10_PIPEA_TV2       (1<<5)
-#define   SWF10_PIPEA_CRT2      (1<<4)
-#define   SWF10_PIPEA_LFP       (1<<3)
-#define   SWF10_PIPEA_EFP       (1<<2)
-#define   SWF10_PIPEA_TV        (1<<1)
-#define   SWF10_PIPEA_CRT       (1<<0)
-
-#define SWF11_MEMORY_SIZE_SHIFT 16
-#define SWF11_SV_TEST_EN        (1<<15)
-#define SWF11_IS_AGP            (1<<14)
-#define SWF11_DISPLAY_HOLDOFF   (1<<13)
-#define SWF11_DPMS_REDUCED      (1<<12)
-#define SWF11_IS_VBE_MODE       (1<<11)
-#define SWF11_PIPEB_ACCESS      (1<<10) /* 0 here means pipe a */
-#define SWF11_DPMS_MASK         0x07
-#define   SWF11_DPMS_OFF        (1<<2)
-#define   SWF11_DPMS_SUSPEND    (1<<1)
-#define   SWF11_DPMS_STANDBY    (1<<0)
-#define   SWF11_DPMS_ON         0
-
-#define SWF14_GFX_PFIT_EN       (1<<31)
-#define SWF14_TEXT_PFIT_EN      (1<<30)
-#define SWF14_LID_STATUS_CLOSED (1<<29) /* 0 here means open */
-#define SWF14_POPUP_EN          (1<<28)
-#define SWF14_DISPLAY_HOLDOFF   (1<<27)
-#define SWF14_DISP_DETECT_EN    (1<<26)
-#define SWF14_DOCKING_STATUS_DOCKED (1<<25) /* 0 here means undocked */
-#define SWF14_DRIVER_STATUS     (1<<24)
-#define SWF14_OS_TYPE_WIN9X     (1<<23)
-#define SWF14_OS_TYPE_WINNT     (1<<22)
-/* 21:19 rsvd */
-#define SWF14_PM_TYPE_MASK      0x00070000
-#define   SWF14_PM_ACPI_VIDEO   (0x4 << 16)
-#define   SWF14_PM_ACPI         (0x3 << 16)
-#define   SWF14_PM_APM_12       (0x2 << 16)
-#define   SWF14_PM_APM_11       (0x1 << 16)
-#define SWF14_HK_REQUEST_MASK   0x0000ffff /* see GR18 6:3 for event type */
-          /* if GR18 indicates a display switch */
-#define   SWF14_DS_PIPEB_LFP2_EN (1<<15)
-#define   SWF14_DS_PIPEB_EFP2_EN (1<<14)
-#define   SWF14_DS_PIPEB_TV2_EN  (1<<13)
-#define   SWF14_DS_PIPEB_CRT2_EN (1<<12)
-#define   SWF14_DS_PIPEB_LFP_EN  (1<<11)
-#define   SWF14_DS_PIPEB_EFP_EN  (1<<10)
-#define   SWF14_DS_PIPEB_TV_EN   (1<<9)
-#define   SWF14_DS_PIPEB_CRT_EN  (1<<8)
-#define   SWF14_DS_PIPEA_LFP2_EN (1<<7)
-#define   SWF14_DS_PIPEA_EFP2_EN (1<<6)
-#define   SWF14_DS_PIPEA_TV2_EN  (1<<5)
-#define   SWF14_DS_PIPEA_CRT2_EN (1<<4)
-#define   SWF14_DS_PIPEA_LFP_EN  (1<<3)
-#define   SWF14_DS_PIPEA_EFP_EN  (1<<2)
-#define   SWF14_DS_PIPEA_TV_EN   (1<<1)
-#define   SWF14_DS_PIPEA_CRT_EN  (1<<0)
-          /* if GR18 indicates a panel fitting request */
-#define   SWF14_PFIT_EN         (1<<0) /* 0 means disable */
-          /* if GR18 indicates an APM change request */
-#define   SWF14_APM_HIBERNATE   0x4
-#define   SWF14_APM_SUSPEND     0x3
-#define   SWF14_APM_STANDBY     0x1
-#define   SWF14_APM_RESTORE     0x0
-
-#endif /* _I830_BIOS_H_ */
diff --git a/drivers/staging/gma500/intel_i2c.c b/drivers/staging/gma500/intel_i2c.c
deleted file mode 100644
index 51cbf65268e6..000000000000
--- a/drivers/staging/gma500/intel_i2c.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright © 2006-2007 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *      Eric Anholt <eric@anholt.net>
- */
-
-#include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
-#include <linux/export.h>
-
-#include "psb_drv.h"
-#include "psb_intel_reg.h"
-
-/*
- * Intel GPIO access functions
- */
-
-#define I2C_RISEFALL_TIME 20
-
-static int get_clock(void *data)
-{
-        struct psb_intel_i2c_chan *chan = data;
-        struct drm_device *dev = chan->drm_dev;
-        u32 val;
-
-        val = REG_READ(chan->reg);
-        return (val & GPIO_CLOCK_VAL_IN) != 0;
-}
-
-static int get_data(void *data)
-{
-        struct psb_intel_i2c_chan *chan = data;
-        struct drm_device *dev = chan->drm_dev;
-        u32 val;
-
-        val = REG_READ(chan->reg);
-        return (val & GPIO_DATA_VAL_IN) != 0;
-}
-
-static void set_clock(void *data, int state_high)
-{
-        struct psb_intel_i2c_chan *chan = data;
-        struct drm_device *dev = chan->drm_dev;
-        u32 reserved = 0, clock_bits;
-
-        /* On most chips, these bits must be preserved in software. */
-        reserved =
-                    REG_READ(chan->reg) & (GPIO_DATA_PULLUP_DISABLE |
-                                           GPIO_CLOCK_PULLUP_DISABLE);
-
-        if (state_high)
-                clock_bits = GPIO_CLOCK_DIR_IN | GPIO_CLOCK_DIR_MASK;
-        else
-                clock_bits = GPIO_CLOCK_DIR_OUT | GPIO_CLOCK_DIR_MASK |
-                    GPIO_CLOCK_VAL_MASK;
-        REG_WRITE(chan->reg, reserved | clock_bits);
-        udelay(I2C_RISEFALL_TIME);      /* wait for the line to change state */
-}
-
-static void set_data(void *data, int state_high)
-{
-        struct psb_intel_i2c_chan *chan = data;
-        struct drm_device *dev = chan->drm_dev;
-        u32 reserved = 0, data_bits;
-
-        /* On most chips, these bits must be preserved in software. */
-        reserved =
-                    REG_READ(chan->reg) & (GPIO_DATA_PULLUP_DISABLE |
-                                           GPIO_CLOCK_PULLUP_DISABLE);
-
-        if (state_high)
-                data_bits = GPIO_DATA_DIR_IN | GPIO_DATA_DIR_MASK;
-        else
-                data_bits =
-                    GPIO_DATA_DIR_OUT | GPIO_DATA_DIR_MASK |
-                    GPIO_DATA_VAL_MASK;
-
-        REG_WRITE(chan->reg, reserved | data_bits);
-        udelay(I2C_RISEFALL_TIME);      /* wait for the line to change state */
-}
-
-/**
- * psb_intel_i2c_create - instantiate an Intel i2c bus using the specified GPIO reg
- * @dev: DRM device
- * @output: driver specific output device
- * @reg: GPIO reg to use
- * @name: name for this bus
- *
- * Creates and registers a new i2c bus with the Linux i2c layer, for use
- * in output probing and control (e.g. DDC or SDVO control functions).
- *
- * Possible values for @reg include:
- *   %GPIOA
- *   %GPIOB
- *   %GPIOC
- *   %GPIOD
- *   %GPIOE
- *   %GPIOF
- *   %GPIOG
- *   %GPIOH
- * see PRM for details on how these different busses are used.
- */
-struct psb_intel_i2c_chan *psb_intel_i2c_create(struct drm_device *dev,
-                                        const u32 reg, const char *name)
-{
-        struct psb_intel_i2c_chan *chan;
-
-        chan = kzalloc(sizeof(struct psb_intel_i2c_chan), GFP_KERNEL);
-        if (!chan)
-                goto out_free;
-
-        chan->drm_dev = dev;
-        chan->reg = reg;
-        snprintf(chan->adapter.name, I2C_NAME_SIZE, "intel drm %s", name);
-        chan->adapter.owner = THIS_MODULE;
-        chan->adapter.algo_data = &chan->algo;
-        chan->adapter.dev.parent = &dev->pdev->dev;
-        chan->algo.setsda = set_data;
-        chan->algo.setscl = set_clock;
-        chan->algo.getsda = get_data;
-        chan->algo.getscl = get_clock;
-        chan->algo.udelay = 20;
-        chan->algo.timeout = usecs_to_jiffies(2200);
-        chan->algo.data = chan;
-
-        i2c_set_adapdata(&chan->adapter, chan);
-
-        if (i2c_bit_add_bus(&chan->adapter))
-                goto out_free;
-
-        /* JJJ:  raise SCL and SDA? */
-        set_data(chan, 1);
-        set_clock(chan, 1);
-        udelay(20);
-
-        return chan;
-
-out_free:
-        kfree(chan);
-        return NULL;
-}
-
-/**
- * psb_intel_i2c_destroy - unregister and free i2c bus resources
- * @output: channel to free
- *
- * Unregister the adapter from the i2c layer, then free the structure.
- */
-void psb_intel_i2c_destroy(struct psb_intel_i2c_chan *chan)
-{
-        if (!chan)
-                return;
-
-        i2c_del_adapter(&chan->adapter);
-        kfree(chan);
-}
diff --git a/drivers/staging/gma500/intel_opregion.c b/drivers/staging/gma500/intel_opregion.c
deleted file mode 100644
index d946bc1b17bf..000000000000
--- a/drivers/staging/gma500/intel_opregion.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * FIXME: resolve with the i915 version
- */
-
-#include "psb_drv.h"
-
-struct opregion_header {
-        u8 signature[16];
-        u32 size;
-        u32 opregion_ver;
-        u8 bios_ver[32];
-        u8 vbios_ver[16];
-        u8 driver_ver[16];
-        u32 mboxes;
-        u8 reserved[164];
-} __packed;
-
-struct opregion_apci {
-        /*FIXME: add it later*/
-} __packed;
-
-struct opregion_swsci {
-        /*FIXME: add it later*/
-} __packed;
-
-struct opregion_acpi {
-        /*FIXME: add it later*/
-} __packed;
-
-int gma_intel_opregion_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 opregion_phy;
-        void *base;
-        u32 *lid_state;
-
-        dev_priv->lid_state = NULL;
-
-        pci_read_config_dword(dev->pdev, 0xfc, &opregion_phy);
-        if (opregion_phy == 0)
-                return -ENOTSUPP;
-
-        base = ioremap(opregion_phy, 8*1024);
-        if (!base)
-                return -ENOMEM;
-
-        lid_state = base + 0x01ac;
-
-        dev_priv->lid_state = lid_state;
-        dev_priv->lid_last_state = readl(lid_state);
-        return 0;
-}
-
-int gma_intel_opregion_exit(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        if (dev_priv->lid_state)
-                iounmap(dev_priv->lid_state);
-        return 0;
-}
diff --git a/drivers/staging/gma500/mdfld_device.c b/drivers/staging/gma500/mdfld_device.c
deleted file mode 100644
index f47aeb7a2039..000000000000
--- a/drivers/staging/gma500/mdfld_device.c
+++ /dev/null
@@ -1,714 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-#include <linux/backlight.h>
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include "psb_reg.h"
-#include "psb_intel_reg.h"
-#include "psb_drm.h"
-#include "psb_drv.h"
-#include "mdfld_output.h"
-#include "mdfld_dsi_output.h"
-#include "mid_bios.h"
-
-/*
- *      Provide the Medfield specific backlight management
- */
-
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-
-static int mdfld_brightness;
-struct backlight_device *mdfld_backlight_device;
-
-static int mfld_set_brightness(struct backlight_device *bd)
-{
-        struct drm_device *dev = bl_get_data(mdfld_backlight_device);
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int level = bd->props.brightness;
-
-        /* Percentage 1-100% being valid */
-        if (level < 1)
-                level = 1;
-
-        if (gma_power_begin(dev, 0)) {
-                /* Calculate and set the brightness value */
-                u32 adjusted_level;
-
-                /* Adjust the backlight level with the percent in
-                 * dev_priv->blc_adj2;
-                 */
-                adjusted_level = level * dev_priv->blc_adj2;
-                adjusted_level = adjusted_level / 100;
-#if 0
-#ifndef CONFIG_MDFLD_DSI_DPU
-                if(!(dev_priv->dsr_fb_update & MDFLD_DSR_MIPI_CONTROL) && 
-                        (dev_priv->dbi_panel_on || dev_priv->dbi_panel_on2)){
-                        mdfld_dsi_dbi_exit_dsr(dev,MDFLD_DSR_MIPI_CONTROL, 0, 0);
-                        dev_dbg(dev->dev, "Out of DSR before set brightness to %d.\n",adjusted_level);
-                }
-#endif
-                mdfld_dsi_brightness_control(dev, 0, adjusted_level);
-
-                if ((dev_priv->dbi_panel_on2) || (dev_priv->dpi_panel_on2))
-                        mdfld_dsi_brightness_control(dev, 2, adjusted_level);
-#endif
-                gma_power_end(dev);
-        }
-        mdfld_brightness = level;
-        return 0;
-}
-
-int psb_get_brightness(struct backlight_device *bd)
-{
-        /* return locally cached var instead of HW read (due to DPST etc.) */
-        /* FIXME: ideally return actual value in case firmware fiddled with
-           it */
-        return mdfld_brightness;
-}
-
-static const struct backlight_ops mfld_ops = {
-        .get_brightness = psb_get_brightness,
-        .update_status  = mfld_set_brightness,
-};
-
-static int mdfld_backlight_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct backlight_properties props;
-        memset(&props, 0, sizeof(struct backlight_properties));
-        props.max_brightness = 100;
-        props.type = BACKLIGHT_PLATFORM;
-
-        mdfld_backlight_device = backlight_device_register("mfld-bl",
-                                        NULL, (void *)dev, &mfld_ops, &props);
-                                        
-        if (IS_ERR(mdfld_backlight_device))
-                return PTR_ERR(mdfld_backlight_device);
-
-        dev_priv->blc_adj1 = 100;
-        dev_priv->blc_adj2 = 100;
-        mdfld_backlight_device->props.brightness = 100;
-        mdfld_backlight_device->props.max_brightness = 100;
-        backlight_update_status(mdfld_backlight_device);
-        dev_priv->backlight_device = mdfld_backlight_device;
-        return 0;
-}
-
-#endif
-
-/*
- *      Provide the Medfield specific chip logic and low level methods for
- *      power management.
- */
-
-static void mdfld_init_pm(struct drm_device *dev)
-{
-        /* No work needed here yet */
-}
-
-/**
- * mdfld_save_display_registers -       save registers for pipe
- * @dev: our device
- * @pipe: pipe to save
- *
- * Save the pipe state of the device before we power it off. Keep everything
- * we need to put it back again
- */
-static int mdfld_save_display_registers(struct drm_device *dev, int pipe)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int i;
-
-        /* register */
-        u32 dpll_reg = MRST_DPLL_A;
-        u32 fp_reg = MRST_FPA0;
-        u32 pipeconf_reg = PIPEACONF;
-        u32 htot_reg = HTOTAL_A;
-        u32 hblank_reg = HBLANK_A;
-        u32 hsync_reg = HSYNC_A;
-        u32 vtot_reg = VTOTAL_A;
-        u32 vblank_reg = VBLANK_A;
-        u32 vsync_reg = VSYNC_A;
-        u32 pipesrc_reg = PIPEASRC;
-        u32 dspstride_reg = DSPASTRIDE;
-        u32 dsplinoff_reg = DSPALINOFF;
-        u32 dsptileoff_reg = DSPATILEOFF;
-        u32 dspsize_reg = DSPASIZE;
-        u32 dsppos_reg = DSPAPOS;
-        u32 dspsurf_reg = DSPASURF;
-        u32 mipi_reg = MIPI;
-        u32 dspcntr_reg = DSPACNTR;
-        u32 dspstatus_reg = PIPEASTAT;
-        u32 palette_reg = PALETTE_A;
-
-        /* pointer to values */
-        u32 *dpll_val = &dev_priv->saveDPLL_A;
-        u32 *fp_val = &dev_priv->saveFPA0;
-        u32 *pipeconf_val = &dev_priv->savePIPEACONF;
-        u32 *htot_val = &dev_priv->saveHTOTAL_A;
-        u32 *hblank_val = &dev_priv->saveHBLANK_A;
-        u32 *hsync_val = &dev_priv->saveHSYNC_A;
-        u32 *vtot_val = &dev_priv->saveVTOTAL_A;
-        u32 *vblank_val = &dev_priv->saveVBLANK_A;
-        u32 *vsync_val = &dev_priv->saveVSYNC_A;
-        u32 *pipesrc_val = &dev_priv->savePIPEASRC;
-        u32 *dspstride_val = &dev_priv->saveDSPASTRIDE;
-        u32 *dsplinoff_val = &dev_priv->saveDSPALINOFF;
-        u32 *dsptileoff_val = &dev_priv->saveDSPATILEOFF;
-        u32 *dspsize_val = &dev_priv->saveDSPASIZE;
-        u32 *dsppos_val = &dev_priv->saveDSPAPOS;
-        u32 *dspsurf_val = &dev_priv->saveDSPASURF;
-        u32 *mipi_val = &dev_priv->saveMIPI;
-        u32 *dspcntr_val = &dev_priv->saveDSPACNTR;
-        u32 *dspstatus_val = &dev_priv->saveDSPASTATUS;
-        u32 *palette_val = dev_priv->save_palette_a;
-
-        switch (pipe) {
-        case 0:
-                break;
-        case 1:
-                /* register */
-                dpll_reg = MDFLD_DPLL_B;
-                fp_reg = MDFLD_DPLL_DIV0;
-                pipeconf_reg = PIPEBCONF;
-                htot_reg = HTOTAL_B;
-                hblank_reg = HBLANK_B;
-                hsync_reg = HSYNC_B;
-                vtot_reg = VTOTAL_B;
-                vblank_reg = VBLANK_B;
-                vsync_reg = VSYNC_B;
-                pipesrc_reg = PIPEBSRC;
-                dspstride_reg = DSPBSTRIDE;
-                dsplinoff_reg = DSPBLINOFF;
-                dsptileoff_reg = DSPBTILEOFF;
-                dspsize_reg = DSPBSIZE;
-                dsppos_reg = DSPBPOS;
-                dspsurf_reg = DSPBSURF;
-                dspcntr_reg = DSPBCNTR;
-                dspstatus_reg = PIPEBSTAT;
-                palette_reg = PALETTE_B;
-
-                /* values */
-                dpll_val = &dev_priv->saveDPLL_B;
-                fp_val = &dev_priv->saveFPB0;
-                pipeconf_val = &dev_priv->savePIPEBCONF;
-                htot_val = &dev_priv->saveHTOTAL_B;
-                hblank_val = &dev_priv->saveHBLANK_B;
-                hsync_val = &dev_priv->saveHSYNC_B;
-                vtot_val = &dev_priv->saveVTOTAL_B;
-                vblank_val = &dev_priv->saveVBLANK_B;
-                vsync_val = &dev_priv->saveVSYNC_B;
-                pipesrc_val = &dev_priv->savePIPEBSRC;
-                dspstride_val = &dev_priv->saveDSPBSTRIDE;
-                dsplinoff_val = &dev_priv->saveDSPBLINOFF;
-                dsptileoff_val = &dev_priv->saveDSPBTILEOFF;
-                dspsize_val = &dev_priv->saveDSPBSIZE;
-                dsppos_val = &dev_priv->saveDSPBPOS;
-                dspsurf_val = &dev_priv->saveDSPBSURF;
-                dspcntr_val = &dev_priv->saveDSPBCNTR;
-                dspstatus_val = &dev_priv->saveDSPBSTATUS;
-                palette_val = dev_priv->save_palette_b;
-                break;
-        case 2:
-                /* register */
-                pipeconf_reg = PIPECCONF;
-                htot_reg = HTOTAL_C;
-                hblank_reg = HBLANK_C;
-                hsync_reg = HSYNC_C;
-                vtot_reg = VTOTAL_C;
-                vblank_reg = VBLANK_C;
-                vsync_reg = VSYNC_C;
-                pipesrc_reg = PIPECSRC;
-                dspstride_reg = DSPCSTRIDE;
-                dsplinoff_reg = DSPCLINOFF;
-                dsptileoff_reg = DSPCTILEOFF;
-                dspsize_reg = DSPCSIZE;
-                dsppos_reg = DSPCPOS;
-                dspsurf_reg = DSPCSURF;
-                mipi_reg = MIPI_C;
-                dspcntr_reg = DSPCCNTR;
-                dspstatus_reg = PIPECSTAT;
-                palette_reg = PALETTE_C;
-
-                /* pointer to values */
-                pipeconf_val = &dev_priv->savePIPECCONF;
-                htot_val = &dev_priv->saveHTOTAL_C;
-                hblank_val = &dev_priv->saveHBLANK_C;
-                hsync_val = &dev_priv->saveHSYNC_C;
-                vtot_val = &dev_priv->saveVTOTAL_C;
-                vblank_val = &dev_priv->saveVBLANK_C;
-                vsync_val = &dev_priv->saveVSYNC_C;
-                pipesrc_val = &dev_priv->savePIPECSRC;
-                dspstride_val = &dev_priv->saveDSPCSTRIDE;
-                dsplinoff_val = &dev_priv->saveDSPCLINOFF;
-                dsptileoff_val = &dev_priv->saveDSPCTILEOFF;
-                dspsize_val = &dev_priv->saveDSPCSIZE;
-                dsppos_val = &dev_priv->saveDSPCPOS;
-                dspsurf_val = &dev_priv->saveDSPCSURF;
-                mipi_val = &dev_priv->saveMIPI_C;
-                dspcntr_val = &dev_priv->saveDSPCCNTR;
-                dspstatus_val = &dev_priv->saveDSPCSTATUS;
-                palette_val = dev_priv->save_palette_c;
-                break;
-        default:
-                DRM_ERROR("%s, invalid pipe number.\n", __func__);
-                return -EINVAL;
-        }
-
-        /* Pipe & plane A info */
-        *dpll_val = PSB_RVDC32(dpll_reg);
-        *fp_val = PSB_RVDC32(fp_reg);
-        *pipeconf_val = PSB_RVDC32(pipeconf_reg);
-        *htot_val = PSB_RVDC32(htot_reg);
-        *hblank_val = PSB_RVDC32(hblank_reg);
-        *hsync_val = PSB_RVDC32(hsync_reg);
-        *vtot_val = PSB_RVDC32(vtot_reg);
-        *vblank_val = PSB_RVDC32(vblank_reg);
-        *vsync_val = PSB_RVDC32(vsync_reg);
-        *pipesrc_val = PSB_RVDC32(pipesrc_reg);
-        *dspstride_val = PSB_RVDC32(dspstride_reg);
-        *dsplinoff_val = PSB_RVDC32(dsplinoff_reg);
-        *dsptileoff_val = PSB_RVDC32(dsptileoff_reg);
-        *dspsize_val = PSB_RVDC32(dspsize_reg);
-        *dsppos_val = PSB_RVDC32(dsppos_reg);
-        *dspsurf_val = PSB_RVDC32(dspsurf_reg);
-        *dspcntr_val = PSB_RVDC32(dspcntr_reg);
-        *dspstatus_val = PSB_RVDC32(dspstatus_reg);
-
-        /*save palette (gamma) */
-        for (i = 0; i < 256; i++)
-                palette_val[i] = PSB_RVDC32(palette_reg + (i<<2));
-
-        if (pipe == 1) {
-                dev_priv->savePFIT_CONTROL = PSB_RVDC32(PFIT_CONTROL);
-                dev_priv->savePFIT_PGM_RATIOS = PSB_RVDC32(PFIT_PGM_RATIOS);
-                dev_priv->saveHDMIPHYMISCCTL = PSB_RVDC32(HDMIPHYMISCCTL);
-                dev_priv->saveHDMIB_CONTROL = PSB_RVDC32(HDMIB_CONTROL);
-                return 0;
-        }
-        *mipi_val = PSB_RVDC32(mipi_reg);
-        return 0;
-}
-
-/**
- * mdfld_save_cursor_overlay_registers  -       save cursor overlay info
- * @dev: our device
- *
- * Save the cursor and overlay register state
- */
-static int mdfld_save_cursor_overlay_registers(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        /* Save cursor regs */
-        dev_priv->saveDSPACURSOR_CTRL = PSB_RVDC32(CURACNTR);
-        dev_priv->saveDSPACURSOR_BASE = PSB_RVDC32(CURABASE);
-        dev_priv->saveDSPACURSOR_POS = PSB_RVDC32(CURAPOS);
-
-        dev_priv->saveDSPBCURSOR_CTRL = PSB_RVDC32(CURBCNTR);
-        dev_priv->saveDSPBCURSOR_BASE = PSB_RVDC32(CURBBASE);
-        dev_priv->saveDSPBCURSOR_POS = PSB_RVDC32(CURBPOS);
-
-        dev_priv->saveDSPCCURSOR_CTRL = PSB_RVDC32(CURCCNTR);
-        dev_priv->saveDSPCCURSOR_BASE = PSB_RVDC32(CURCBASE);
-        dev_priv->saveDSPCCURSOR_POS = PSB_RVDC32(CURCPOS);
-
-        /* HW overlay */
-        dev_priv->saveOV_OVADD = PSB_RVDC32(OV_OVADD);
-        dev_priv->saveOV_OGAMC0 = PSB_RVDC32(OV_OGAMC0);
-        dev_priv->saveOV_OGAMC1 = PSB_RVDC32(OV_OGAMC1);
-        dev_priv->saveOV_OGAMC2 = PSB_RVDC32(OV_OGAMC2);
-        dev_priv->saveOV_OGAMC3 = PSB_RVDC32(OV_OGAMC3);
-        dev_priv->saveOV_OGAMC4 = PSB_RVDC32(OV_OGAMC4);
-        dev_priv->saveOV_OGAMC5 = PSB_RVDC32(OV_OGAMC5);
-
-        dev_priv->saveOV_OVADD_C = PSB_RVDC32(OV_OVADD + OV_C_OFFSET);
-        dev_priv->saveOV_OGAMC0_C = PSB_RVDC32(OV_OGAMC0 + OV_C_OFFSET);
-        dev_priv->saveOV_OGAMC1_C = PSB_RVDC32(OV_OGAMC1 + OV_C_OFFSET);
-        dev_priv->saveOV_OGAMC2_C = PSB_RVDC32(OV_OGAMC2 + OV_C_OFFSET);
-        dev_priv->saveOV_OGAMC3_C = PSB_RVDC32(OV_OGAMC3 + OV_C_OFFSET);
-        dev_priv->saveOV_OGAMC4_C = PSB_RVDC32(OV_OGAMC4 + OV_C_OFFSET);
-        dev_priv->saveOV_OGAMC5_C = PSB_RVDC32(OV_OGAMC5 + OV_C_OFFSET);
-
-        return 0;
-}
-/*
- * mdfld_restore_display_registers      -       restore the state of a pipe
- * @dev: our device
- * @pipe: the pipe to restore
- *
- * Restore the state of a pipe to that which was saved by the register save
- * functions.
- */
-static int mdfld_restore_display_registers(struct drm_device *dev, int pipe)
-{
-        /* To get  panel out of ULPS mode */
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dsi_config *dsi_config = NULL;
-        u32 i = 0;
-        u32 dpll = 0;
-        u32 timeout = 0;
-        u32 reg_offset = 0;
-
-        /* register */
-        u32 dpll_reg = MRST_DPLL_A;
-        u32 fp_reg = MRST_FPA0;
-        u32 pipeconf_reg = PIPEACONF;
-        u32 htot_reg = HTOTAL_A;
-        u32 hblank_reg = HBLANK_A;
-        u32 hsync_reg = HSYNC_A;
-        u32 vtot_reg = VTOTAL_A;
-        u32 vblank_reg = VBLANK_A;
-        u32 vsync_reg = VSYNC_A;
-        u32 pipesrc_reg = PIPEASRC;
-        u32 dspstride_reg = DSPASTRIDE;
-        u32 dsplinoff_reg = DSPALINOFF;
-        u32 dsptileoff_reg = DSPATILEOFF;
-        u32 dspsize_reg = DSPASIZE;
-        u32 dsppos_reg = DSPAPOS;
-        u32 dspsurf_reg = DSPASURF;
-        u32 dspstatus_reg = PIPEASTAT;
-        u32 mipi_reg = MIPI;
-        u32 dspcntr_reg = DSPACNTR;
-        u32 palette_reg = PALETTE_A;
-
-        /* values */
-        u32 dpll_val = dev_priv->saveDPLL_A & ~DPLL_VCO_ENABLE;
-        u32 fp_val = dev_priv->saveFPA0;
-        u32 pipeconf_val = dev_priv->savePIPEACONF;
-        u32 htot_val = dev_priv->saveHTOTAL_A;
-        u32 hblank_val = dev_priv->saveHBLANK_A;
-        u32 hsync_val = dev_priv->saveHSYNC_A;
-        u32 vtot_val = dev_priv->saveVTOTAL_A;
-        u32 vblank_val = dev_priv->saveVBLANK_A;
-        u32 vsync_val = dev_priv->saveVSYNC_A;
-        u32 pipesrc_val = dev_priv->savePIPEASRC;
-        u32 dspstride_val = dev_priv->saveDSPASTRIDE;
-        u32 dsplinoff_val = dev_priv->saveDSPALINOFF;
-        u32 dsptileoff_val = dev_priv->saveDSPATILEOFF;
-        u32 dspsize_val = dev_priv->saveDSPASIZE;
-        u32 dsppos_val = dev_priv->saveDSPAPOS;
-        u32 dspsurf_val = dev_priv->saveDSPASURF;
-        u32 dspstatus_val = dev_priv->saveDSPASTATUS;
-        u32 mipi_val = dev_priv->saveMIPI;
-        u32 dspcntr_val = dev_priv->saveDSPACNTR;
-        u32 *palette_val = dev_priv->save_palette_a;
-
-        switch (pipe) {
-        case 0:
-                dsi_config = dev_priv->dsi_configs[0];
-                break;
-        case 1:
-                /* register */
-                dpll_reg = MDFLD_DPLL_B;
-                fp_reg = MDFLD_DPLL_DIV0;
-                pipeconf_reg = PIPEBCONF;
-                htot_reg = HTOTAL_B;
-                hblank_reg = HBLANK_B;
-                hsync_reg = HSYNC_B;
-                vtot_reg = VTOTAL_B;
-                vblank_reg = VBLANK_B;
-                vsync_reg = VSYNC_B;
-                pipesrc_reg = PIPEBSRC;
-                dspstride_reg = DSPBSTRIDE;
-                dsplinoff_reg = DSPBLINOFF;
-                dsptileoff_reg = DSPBTILEOFF;
-                dspsize_reg = DSPBSIZE;
-                dsppos_reg = DSPBPOS;
-                dspsurf_reg = DSPBSURF;
-                dspcntr_reg = DSPBCNTR;
-                palette_reg = PALETTE_B;
-                dspstatus_reg = PIPEBSTAT;
-
-                /* values */
-                dpll_val = dev_priv->saveDPLL_B & ~DPLL_VCO_ENABLE;
-                fp_val = dev_priv->saveFPB0;
-                pipeconf_val = dev_priv->savePIPEBCONF;
-                htot_val = dev_priv->saveHTOTAL_B;
-                hblank_val = dev_priv->saveHBLANK_B;
-                hsync_val = dev_priv->saveHSYNC_B;
-                vtot_val = dev_priv->saveVTOTAL_B;
-                vblank_val = dev_priv->saveVBLANK_B;
-                vsync_val = dev_priv->saveVSYNC_B;
-                pipesrc_val = dev_priv->savePIPEBSRC;
-                dspstride_val = dev_priv->saveDSPBSTRIDE;
-                dsplinoff_val = dev_priv->saveDSPBLINOFF;
-                dsptileoff_val = dev_priv->saveDSPBTILEOFF;
-                dspsize_val = dev_priv->saveDSPBSIZE;
-                dsppos_val = dev_priv->saveDSPBPOS;
-                dspsurf_val = dev_priv->saveDSPBSURF;
-                dspcntr_val = dev_priv->saveDSPBCNTR;
-                dspstatus_val = dev_priv->saveDSPBSTATUS;
-                palette_val = dev_priv->save_palette_b;
-                break;
-        case 2:
-                reg_offset = MIPIC_REG_OFFSET;
-
-                /* register */
-                pipeconf_reg = PIPECCONF;
-                htot_reg = HTOTAL_C;
-                hblank_reg = HBLANK_C;
-                hsync_reg = HSYNC_C;
-                vtot_reg = VTOTAL_C;
-                vblank_reg = VBLANK_C;
-                vsync_reg = VSYNC_C;
-                pipesrc_reg = PIPECSRC;
-                dspstride_reg = DSPCSTRIDE;
-                dsplinoff_reg = DSPCLINOFF;
-                dsptileoff_reg = DSPCTILEOFF;
-                dspsize_reg = DSPCSIZE;
-                dsppos_reg = DSPCPOS;
-                dspsurf_reg = DSPCSURF;
-                mipi_reg = MIPI_C;
-                dspcntr_reg = DSPCCNTR;
-                palette_reg = PALETTE_C;
-                dspstatus_reg = PIPECSTAT;
-
-                /* values */
-                pipeconf_val = dev_priv->savePIPECCONF;
-                htot_val = dev_priv->saveHTOTAL_C;
-                hblank_val = dev_priv->saveHBLANK_C;
-                hsync_val = dev_priv->saveHSYNC_C;
-                vtot_val = dev_priv->saveVTOTAL_C;
-                vblank_val = dev_priv->saveVBLANK_C;
-                vsync_val = dev_priv->saveVSYNC_C;
-                pipesrc_val = dev_priv->savePIPECSRC;
-                dspstride_val = dev_priv->saveDSPCSTRIDE;
-                dsplinoff_val = dev_priv->saveDSPCLINOFF;
-                dsptileoff_val = dev_priv->saveDSPCTILEOFF;
-                dspsize_val = dev_priv->saveDSPCSIZE;
-                dsppos_val = dev_priv->saveDSPCPOS;
-                dspsurf_val = dev_priv->saveDSPCSURF;
-                dspstatus_val = dev_priv->saveDSPCSTATUS;
-                mipi_val = dev_priv->saveMIPI_C;
-                dspcntr_val = dev_priv->saveDSPCCNTR;
-                palette_val = dev_priv->save_palette_c;
-
-                dsi_config = dev_priv->dsi_configs[1];
-                break;
-        default:
-                DRM_ERROR("%s, invalid pipe number.\n", __func__);
-                return -EINVAL;
-        }
-
-        /* Make sure VGA plane is off. it initializes to on after reset!*/
-        PSB_WVDC32(0x80000000, VGACNTRL);
-        if (pipe == 1) {
-                PSB_WVDC32(dpll_val & ~DPLL_VCO_ENABLE, dpll_reg);
-                PSB_RVDC32(dpll_reg);
-
-                PSB_WVDC32(fp_val, fp_reg);
-        } else {
-                dpll = PSB_RVDC32(dpll_reg);
-
-                if (!(dpll & DPLL_VCO_ENABLE)) {
-
-                        /* When ungating power of DPLL, needs to wait 0.5us before enable the VCO */
-                        if (dpll & MDFLD_PWR_GATE_EN) {
-                                dpll &= ~MDFLD_PWR_GATE_EN;
-                                PSB_WVDC32(dpll, dpll_reg);
-                                udelay(500);    /* FIXME: 1 ? */
-                        }
-
-                        PSB_WVDC32(fp_val, fp_reg);
-                        PSB_WVDC32(dpll_val, dpll_reg);
-                        /* FIXME_MDFLD PO - change 500 to 1 after PO */
-                        udelay(500);
-
-                        dpll_val |= DPLL_VCO_ENABLE;
-                        PSB_WVDC32(dpll_val, dpll_reg);
-                        PSB_RVDC32(dpll_reg);
-
-                        /* wait for DSI PLL to lock */
-                        while ((timeout < 20000) && !(PSB_RVDC32(pipeconf_reg) & PIPECONF_DSIPLL_LOCK)) {
-                                udelay(150);
-                                timeout++;
-                        }
-
-                        if (timeout == 20000) {
-                                DRM_ERROR("%s, can't lock DSIPLL.\n",
-                                                        __func__);
-                                return -EINVAL;
-                        }
-                }
-        }
-        /* Restore mode */
-        PSB_WVDC32(htot_val, htot_reg);
-        PSB_WVDC32(hblank_val, hblank_reg);
-        PSB_WVDC32(hsync_val, hsync_reg);
-        PSB_WVDC32(vtot_val, vtot_reg);
-        PSB_WVDC32(vblank_val, vblank_reg);
-        PSB_WVDC32(vsync_val, vsync_reg);
-        PSB_WVDC32(pipesrc_val, pipesrc_reg);
-        PSB_WVDC32(dspstatus_val, dspstatus_reg);
-
-        /* Set up the plane */
-        PSB_WVDC32(dspstride_val, dspstride_reg);
-        PSB_WVDC32(dsplinoff_val, dsplinoff_reg);
-        PSB_WVDC32(dsptileoff_val, dsptileoff_reg);
-        PSB_WVDC32(dspsize_val, dspsize_reg);
-        PSB_WVDC32(dsppos_val, dsppos_reg);
-        PSB_WVDC32(dspsurf_val, dspsurf_reg);
-
-        if (pipe == 1) {
-                PSB_WVDC32(dev_priv->savePFIT_CONTROL, PFIT_CONTROL);
-                PSB_WVDC32(dev_priv->savePFIT_PGM_RATIOS, PFIT_PGM_RATIOS);
-                PSB_WVDC32(dev_priv->saveHDMIPHYMISCCTL, HDMIPHYMISCCTL);
-                PSB_WVDC32(dev_priv->saveHDMIB_CONTROL, HDMIB_CONTROL);
-
-        } else {
-                /* Set up pipe related registers */
-                PSB_WVDC32(mipi_val, mipi_reg);
-                /* Setup MIPI adapter + MIPI IP registers */
-                mdfld_dsi_controller_init(dsi_config, pipe);
-                msleep(20);
-        }
-        /* Enable the plane */
-        PSB_WVDC32(dspcntr_val, dspcntr_reg);
-        msleep(20);
-        /* Enable the pipe */
-        PSB_WVDC32(pipeconf_val, pipeconf_reg);
-
-        for (i = 0; i < 256; i++)
-                PSB_WVDC32(palette_val[i], palette_reg + (i<<2));
-        if (pipe == 1)
-                return 0;
-        if (!mdfld_panel_dpi(dev))
-                mdfld_enable_te(dev, pipe);
-        return 0;
-}
-
-/**
- * mdfld_restore_cursor_overlay_registers       -       restore cursor
- * @dev: our device
- *
- * Restore the cursor and overlay state that was saved earlier
- */
-static int mdfld_restore_cursor_overlay_registers(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        /* Enable Cursor A */
-        PSB_WVDC32(dev_priv->saveDSPACURSOR_CTRL, CURACNTR);
-        PSB_WVDC32(dev_priv->saveDSPACURSOR_POS, CURAPOS);
-        PSB_WVDC32(dev_priv->saveDSPACURSOR_BASE, CURABASE);
-
-        PSB_WVDC32(dev_priv->saveDSPBCURSOR_CTRL, CURBCNTR);
-        PSB_WVDC32(dev_priv->saveDSPBCURSOR_POS, CURBPOS);
-        PSB_WVDC32(dev_priv->saveDSPBCURSOR_BASE, CURBBASE);
-
-        PSB_WVDC32(dev_priv->saveDSPCCURSOR_CTRL, CURCCNTR);
-        PSB_WVDC32(dev_priv->saveDSPCCURSOR_POS, CURCPOS);
-        PSB_WVDC32(dev_priv->saveDSPCCURSOR_BASE, CURCBASE);
-
-        /* Restore HW overlay */
-        PSB_WVDC32(dev_priv->saveOV_OVADD, OV_OVADD);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC0, OV_OGAMC0);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC1, OV_OGAMC1);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC2, OV_OGAMC2);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC3, OV_OGAMC3);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC4, OV_OGAMC4);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC5, OV_OGAMC5);
-
-        PSB_WVDC32(dev_priv->saveOV_OVADD_C, OV_OVADD + OV_C_OFFSET);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC0_C, OV_OGAMC0 + OV_C_OFFSET);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC1_C, OV_OGAMC1 + OV_C_OFFSET);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC2_C, OV_OGAMC2 + OV_C_OFFSET);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC3_C, OV_OGAMC3 + OV_C_OFFSET);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC4_C, OV_OGAMC4 + OV_C_OFFSET);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC5_C, OV_OGAMC5 + OV_C_OFFSET);
-
-        return 0;
-}
-
-/**
- *      mdfld_save_display_registers    -       save registers lost on suspend
- *      @dev: our DRM device
- *
- *      Save the state we need in order to be able to restore the interface
- *      upon resume from suspend
- */
-static int mdfld_save_registers(struct drm_device *dev)
-{
-        /* FIXME: We need to shut down panels here if using them
-           and once the right bits are merged */
-        mdfld_save_cursor_overlay_registers(dev);
-        mdfld_save_display_registers(dev, 0);
-        mdfld_save_display_registers(dev, 0);
-        mdfld_save_display_registers(dev, 2);
-        mdfld_save_display_registers(dev, 1);
-        mdfld_disable_crtc(dev, 0);
-        mdfld_disable_crtc(dev, 2);
-        mdfld_disable_crtc(dev, 1);
-        return 0;
-}
-
-/**
- *      mdfld_restore_display_registers -       restore lost register state
- *      @dev: our DRM device
- *
- *      Restore register state that was lost during suspend and resume.
- */
-static int mdfld_restore_registers(struct drm_device *dev)
-{
-        mdfld_restore_display_registers(dev, 1);
-        mdfld_restore_display_registers(dev, 0);
-        mdfld_restore_display_registers(dev, 2);
-        mdfld_restore_cursor_overlay_registers(dev);
-        return 0;
-}
-
-static int mdfld_power_down(struct drm_device *dev)
-{
-        /* FIXME */
-        return 0;
-}
-
-static int mdfld_power_up(struct drm_device *dev)
-{
-        /* FIXME */
-        return 0;
-}
-
-const struct psb_ops mdfld_chip_ops = {
-        .name = "Medfield",
-        .accel_2d = 0,
-        .pipes = 3,
-        .crtcs = 2,
-        .sgx_offset = MRST_SGX_OFFSET,
-
-        .chip_setup = mid_chip_setup,
-
-        .crtc_helper = &mdfld_helper_funcs,
-        .crtc_funcs = &mdfld_intel_crtc_funcs,
-
-        .output_init = mdfld_output_init,
-
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-        .backlight_init = mdfld_backlight_init,
-#endif
-
-        .init_pm = mdfld_init_pm,
-        .save_regs = mdfld_save_registers,
-        .restore_regs = mdfld_restore_registers,
-        .power_down = mdfld_power_down,
-        .power_up = mdfld_power_up,
-};
-
diff --git a/drivers/staging/gma500/mdfld_dsi_dbi.c b/drivers/staging/gma500/mdfld_dsi_dbi.c
deleted file mode 100644
index fd211f3467c4..000000000000
--- a/drivers/staging/gma500/mdfld_dsi_dbi.c
+++ /dev/null
@@ -1,761 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *  jim liu <jim.liu@intel.com>
- *  Jackie Li<yaodong.li@intel.com>
- */
-
-#include "mdfld_dsi_dbi.h"
-#include "mdfld_dsi_dbi_dpu.h"
-#include "mdfld_dsi_pkg_sender.h"
-
-#include "power.h"
-#include <linux/pm_runtime.h>
-
-int enable_gfx_rtpm;
-
-extern struct drm_device *gpDrmDevice;
-extern int gfxrtdelay;
-int enter_dsr;
-struct mdfld_dsi_dbi_output *gdbi_output;
-extern bool gbgfxsuspended;
-extern int enable_gfx_rtpm;
-extern int gfxrtdelay;
-
-#define MDFLD_DSR_MAX_IDLE_COUNT        2
-
-/*
- * set refreshing area
- */
-int mdfld_dsi_dbi_update_area(struct mdfld_dsi_dbi_output *dbi_output,
-                                u16 x1, u16 y1, u16 x2, u16 y2)
-{
-        struct mdfld_dsi_pkg_sender *sender =
-                mdfld_dsi_encoder_get_pkg_sender(&dbi_output->base);
-        u8 param[4];
-        u8 cmd;
-        int err;
-
-        if (!sender) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-
-        /* Set column */
-        cmd = DCS_SET_COLUMN_ADDRESS;
-        param[0] = x1 >> 8;
-        param[1] = x1;
-        param[2] = x2 >> 8;
-        param[3] = x2;
-
-        err = mdfld_dsi_send_dcs(sender,
-                                 cmd,
-                                 param,
-                                 4,
-                                 CMD_DATA_SRC_SYSTEM_MEM,
-                                 MDFLD_DSI_QUEUE_PACKAGE);
-        if (err) {
-                dev_err(sender->dev->dev, "DCS 0x%x sent failed\n", cmd);
-                goto err_out;
-        }
-
-        /* Set page */
-        cmd = DCS_SET_PAGE_ADDRESS;
-        param[0] = y1 >> 8;
-        param[1] = y1;
-        param[2] = y2 >> 8;
-        param[3] = y2;
-
-        err = mdfld_dsi_send_dcs(sender,
-                                 cmd,
-                                 param,
-                                 4,
-                                 CMD_DATA_SRC_SYSTEM_MEM,
-                                 MDFLD_DSI_QUEUE_PACKAGE);
-        if (err) {
-                dev_err(sender->dev->dev, "DCS 0x%x sent failed\n", cmd);
-                goto err_out;
-        }
-
-        /*update screen*/
-        err = mdfld_dsi_send_dcs(sender,
-                                 write_mem_start,
-                                 NULL,
-                                 0,
-                                 CMD_DATA_SRC_PIPE,
-                                 MDFLD_DSI_QUEUE_PACKAGE);
-        if (err) {
-                dev_err(sender->dev->dev, "DCS 0x%x sent failed\n", cmd);
-                goto err_out;
-        }
-        mdfld_dsi_cmds_kick_out(sender);
-err_out:
-        return err;
-}
-
-/*
- * set panel's power state
- */
-int mdfld_dsi_dbi_update_power(struct mdfld_dsi_dbi_output *dbi_output,
-                                                                int mode)
-{
-        struct drm_device *dev = dbi_output->dev;
-        struct mdfld_dsi_pkg_sender *sender =
-                mdfld_dsi_encoder_get_pkg_sender(&dbi_output->base);
-        u8 param = 0;
-        u32 err = 0;
-
-        if (!sender) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-
-        if (mode == DRM_MODE_DPMS_ON) {
-                /* Exit sleep mode */
-                err = mdfld_dsi_send_dcs(sender,
-                                         DCS_EXIT_SLEEP_MODE,
-                                         NULL,
-                                         0,
-                                         CMD_DATA_SRC_SYSTEM_MEM,
-                                         MDFLD_DSI_QUEUE_PACKAGE);
-                if (err) {
-                        dev_err(dev->dev, "DCS 0x%x sent failed\n",
-                                                DCS_EXIT_SLEEP_MODE);
-                        goto power_err;
-                }
-
-                /* Set display on */
-                err = mdfld_dsi_send_dcs(sender,
-                                         DCS_SET_DISPLAY_ON,
-                                         NULL,
-                                         0,
-                                         CMD_DATA_SRC_SYSTEM_MEM,
-                                         MDFLD_DSI_QUEUE_PACKAGE);
-                if (err) {
-                        dev_err(dev->dev, "DCS 0x%x sent failed\n",
-                                                        DCS_SET_DISPLAY_ON);
-                        goto power_err;
-                }
-
-                /* set tear effect on */
-                err = mdfld_dsi_send_dcs(sender,
-                                         DCS_SET_TEAR_ON,
-                                         &param,
-                                         1,
-                                         CMD_DATA_SRC_SYSTEM_MEM,
-                                         MDFLD_DSI_QUEUE_PACKAGE);
-                if (err) {
-                        dev_err(dev->dev, "DCS 0x%x sent failed\n",
-                                                        set_tear_on);
-                        goto power_err;
-                }
-
-                /**
-                 * FIXME: remove this later
-                 */
-                err = mdfld_dsi_send_dcs(sender,
-                                         DCS_WRITE_MEM_START,
-                                         NULL,
-                                         0,
-                                         CMD_DATA_SRC_PIPE,
-                                         MDFLD_DSI_QUEUE_PACKAGE);
-                if (err) {
-                        dev_err(dev->dev, "DCS 0x%x sent failed\n",
-                                                DCS_WRITE_MEM_START);
-                        goto power_err;
-                }
-        } else {
-                /* Set tear effect off */
-                err = mdfld_dsi_send_dcs(sender,
-                                         DCS_SET_TEAR_OFF,
-                                         NULL,
-                                         0,
-                                         CMD_DATA_SRC_SYSTEM_MEM,
-                                         MDFLD_DSI_QUEUE_PACKAGE);
-                if (err) {
-                        dev_err(dev->dev, "DCS 0x%x sent failed\n",
-                                                        DCS_SET_TEAR_OFF);
-                        goto power_err;
-                }
-
-                /* Turn display off */
-                err = mdfld_dsi_send_dcs(sender,
-                                         DCS_SET_DISPLAY_OFF,
-                                         NULL,
-                                         0,
-                                         CMD_DATA_SRC_SYSTEM_MEM,
-                                         MDFLD_DSI_QUEUE_PACKAGE);
-                if (err) {
-                        dev_err(dev->dev, "DCS 0x%x sent failed\n",
-                                                DCS_SET_DISPLAY_OFF);
-                        goto power_err;
-                }
-
-                /* Now enter sleep mode */
-                err = mdfld_dsi_send_dcs(sender,
-                                         DCS_ENTER_SLEEP_MODE,
-                                         NULL,
-                                         0,
-                                         CMD_DATA_SRC_SYSTEM_MEM,
-                                         MDFLD_DSI_QUEUE_PACKAGE);
-                if (err) {
-                        dev_err(dev->dev, "DCS 0x%x sent failed\n",
-                                                        DCS_ENTER_SLEEP_MODE);
-                        goto power_err;
-                }
-        }
-        mdfld_dsi_cmds_kick_out(sender);
-power_err:
-        return err;
-}
-
-/*
- * send a generic DCS command with a parameter list
- */
-int mdfld_dsi_dbi_send_dcs(struct mdfld_dsi_dbi_output *dbi_output,
-                        u8 dcs,  u8 *param, u32 num, u8 data_src)
-{
-        struct mdfld_dsi_pkg_sender *sender =
-                mdfld_dsi_encoder_get_pkg_sender(&dbi_output->base);
-        int ret;
-
-        if (!sender) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-
-        ret = mdfld_dsi_send_dcs(sender,
-                                 dcs,
-                                 param,
-                                 num,
-                                 data_src,
-                                 MDFLD_DSI_SEND_PACKAGE);
-
-        return ret;
-}
-
-/*
- * Enter DSR
- */
-void mdfld_dsi_dbi_enter_dsr(struct mdfld_dsi_dbi_output *dbi_output, int pipe)
-{
-        u32 reg_val;
-        struct drm_device *dev = dbi_output->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct drm_crtc *crtc = dbi_output->base.base.crtc;
-        struct psb_intel_crtc *psb_crtc = (crtc) ?
-                                        to_psb_intel_crtc(crtc) : NULL;
-        u32 dpll_reg = MRST_DPLL_A;
-        u32 pipeconf_reg = PIPEACONF;
-        u32 dspcntr_reg = DSPACNTR;
-
-        if (!dbi_output)
-                return;
-
-        /* FIXME check if can go */
-        dev_priv->is_in_idle = true;
-
-        gdbi_output = dbi_output;
-        if ((dbi_output->mode_flags & MODE_SETTING_ON_GOING) ||
-                (psb_crtc && psb_crtc->mode_flags & MODE_SETTING_ON_GOING))
-                return;
-
-        if (pipe == 2) {
-                dpll_reg = MRST_DPLL_A;
-                pipeconf_reg = PIPECCONF;
-                dspcntr_reg = DSPCCNTR;
-        }
-
-        if (!gma_power_begin(dev, true)) {
-                dev_err(dev->dev, "hw begin failed\n");
-                return;
-        }
-        /* Disable te interrupts */
-        mdfld_disable_te(dev, pipe);
-
-        /* Disable plane */
-        reg_val = REG_READ(dspcntr_reg);
-        if (!(reg_val & DISPLAY_PLANE_ENABLE)) {
-                REG_WRITE(dspcntr_reg, reg_val & ~DISPLAY_PLANE_ENABLE);
-                REG_READ(dspcntr_reg);
-        }
-
-        /* Disable pipe */
-        reg_val = REG_READ(pipeconf_reg);
-        if (!(reg_val & DISPLAY_PLANE_ENABLE)) {
-                reg_val &= ~DISPLAY_PLANE_ENABLE;
-                reg_val |= (PIPECONF_PLANE_OFF | PIPECONF_CURSOR_OFF);
-                REG_WRITE(pipeconf_reg, reg_val);
-                REG_READ(pipeconf_reg);
-                mdfldWaitForPipeDisable(dev, pipe);
-        }
-
-        /* Disable DPLL */
-        reg_val = REG_READ(dpll_reg);
-        if (!(reg_val & DPLL_VCO_ENABLE)) {
-                reg_val &= ~DPLL_VCO_ENABLE;
-                REG_WRITE(dpll_reg, reg_val);
-                REG_READ(dpll_reg);
-                udelay(500);
-        }
-
-        gma_power_end(dev);
-        dbi_output->mode_flags |= MODE_SETTING_IN_DSR;
-        if (pipe == 2) {
-                enter_dsr = 1;
-                /* pm_schedule_suspend(&dev->pdev->dev, gfxrtdelay); */
-        }
-}
-
-static void mdfld_dbi_output_exit_dsr(struct mdfld_dsi_dbi_output *dbi_output,
-                        int pipe)
-{
-        struct drm_device *dev = dbi_output->dev;
-        struct drm_crtc *crtc = dbi_output->base.base.crtc;
-        struct psb_intel_crtc *psb_crtc = (crtc) ?
-                                        to_psb_intel_crtc(crtc) : NULL;
-        u32 reg_val;
-        u32 dpll_reg = MRST_DPLL_A;
-        u32 pipeconf_reg = PIPEACONF;
-        u32 dspcntr_reg = DSPACNTR;
-        u32 reg_offset = 0;
-
-        /*if mode setting on-going, back off*/
-        if ((dbi_output->mode_flags & MODE_SETTING_ON_GOING) ||
-                (psb_crtc && psb_crtc->mode_flags & MODE_SETTING_ON_GOING))
-                return;
-
-        if (pipe == 2) {
-                dpll_reg = MRST_DPLL_A;
-                pipeconf_reg = PIPECCONF;
-                dspcntr_reg = DSPCCNTR;
-                reg_offset = MIPIC_REG_OFFSET;
-        }
-
-        if (!gma_power_begin(dev, true)) {
-                dev_err(dev->dev, "hw begin failed\n");
-                return;
-        }
-
-        /* Enable DPLL */
-        reg_val = REG_READ(dpll_reg);
-        if (!(reg_val & DPLL_VCO_ENABLE)) {
-                if (reg_val & MDFLD_PWR_GATE_EN) {
-                        reg_val &= ~MDFLD_PWR_GATE_EN;
-                        REG_WRITE(dpll_reg, reg_val);
-                        REG_READ(dpll_reg);
-                        udelay(500);
-                }
-
-                reg_val |= DPLL_VCO_ENABLE;
-                REG_WRITE(dpll_reg, reg_val);
-                REG_READ(dpll_reg);
-                udelay(500);
-
-                /* Add timeout */
-                while (!(REG_READ(pipeconf_reg) & PIPECONF_DSIPLL_LOCK))
-                        cpu_relax();
-        }
-
-        /* Enable pipe */
-        reg_val = REG_READ(pipeconf_reg);
-        if (!(reg_val & PIPEACONF_ENABLE)) {
-                reg_val |= PIPEACONF_ENABLE;
-                REG_WRITE(pipeconf_reg, reg_val);
-                REG_READ(pipeconf_reg);
-                udelay(500);
-                mdfldWaitForPipeEnable(dev, pipe);
-        }
-
-        /* Enable plane */
-        reg_val = REG_READ(dspcntr_reg);
-        if (!(reg_val & DISPLAY_PLANE_ENABLE)) {
-                reg_val |= DISPLAY_PLANE_ENABLE;
-                REG_WRITE(dspcntr_reg, reg_val);
-                REG_READ(dspcntr_reg);
-                udelay(500);
-        }
-
-        /* Enable TE interrupt on this pipe */
-        mdfld_enable_te(dev, pipe);
-        gma_power_end(dev);
-
-        /*clean IN_DSR flag*/
-        dbi_output->mode_flags &= ~MODE_SETTING_IN_DSR;
-}
-
-/*
- * Exit from DSR
- */
-void mdfld_dsi_dbi_exit_dsr(struct drm_device *dev, u32 update_src)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dsr_info *dsr_info = dev_priv->dbi_dsr_info;
-        struct mdfld_dsi_dbi_output **dbi_output;
-        int i;
-        int pipe;
-
-        /* FIXME can go ? */
-        dev_priv->is_in_idle = false;
-        dbi_output = dsr_info->dbi_outputs;
-
-#ifdef CONFIG_PM_RUNTIME
-         if (!enable_gfx_rtpm) {
-/*                pm_runtime_allow(&gpDrmDevice->pdev->dev); */
-/*              schedule_delayed_work(&rtpm_work, 30 * 1000);*/ /* FIXME: HZ ? */
-        }
-#endif
-
-        /* For each output, exit dsr */
-        for (i = 0; i < dsr_info->dbi_output_num; i++) {
-                /* If panel has been turned off, skip */
-                if (!dbi_output[i] || !dbi_output[i]->dbi_panel_on)
-                        continue;
-                pipe = dbi_output[i]->channel_num ? 2 : 0;
-                enter_dsr = 0;
-                mdfld_dbi_output_exit_dsr(dbi_output[i], pipe);
-        }
-        dev_priv->dsr_fb_update |= update_src;
-}
-
-static bool mdfld_dbi_is_in_dsr(struct drm_device *dev)
-{
-        if (REG_READ(MRST_DPLL_A) & DPLL_VCO_ENABLE)
-                return false;
-        if ((REG_READ(PIPEACONF) & PIPEACONF_ENABLE) ||
-           (REG_READ(PIPECCONF) & PIPEACONF_ENABLE))
-                return false;
-        if ((REG_READ(DSPACNTR) & DISPLAY_PLANE_ENABLE) ||
-           (REG_READ(DSPCCNTR) & DISPLAY_PLANE_ENABLE))
-                return false;
-
-        return true;
-}
-
-/* Periodically update dbi panel */
-void mdfld_dbi_update_panel(struct drm_device *dev, int pipe)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dsr_info *dsr_info = dev_priv->dbi_dsr_info;
-        struct mdfld_dsi_dbi_output **dbi_outputs;
-        struct mdfld_dsi_dbi_output *dbi_output;
-        int i;
-        int can_enter_dsr = 0;
-        u32 damage_mask;
-
-        dbi_outputs = dsr_info->dbi_outputs;
-        dbi_output = pipe ? dbi_outputs[1] : dbi_outputs[0];
-
-        if (!dbi_output)
-                return;
-
-        if (pipe == 0)
-                damage_mask = dev_priv->dsr_fb_update & MDFLD_DSR_DAMAGE_MASK_0;
-        else if (pipe == 2)
-                damage_mask = dev_priv->dsr_fb_update & MDFLD_DSR_DAMAGE_MASK_2;
-        else
-                return;
-
-        /* If FB is damaged and panel is on update on-panel FB */
-        if (damage_mask && dbi_output->dbi_panel_on) {
-                dbi_output->dsr_fb_update_done = false;
-
-                if (dbi_output->p_funcs->update_fb)
-                        dbi_output->p_funcs->update_fb(dbi_output, pipe);
-
-                if (dev_priv->dsr_enable && dbi_output->dsr_fb_update_done)
-                        dev_priv->dsr_fb_update &= ~damage_mask;
-
-                /*clean IN_DSR flag*/
-                dbi_output->mode_flags &= ~MODE_SETTING_IN_DSR;
-
-                dbi_output->dsr_idle_count = 0;
-        } else {
-                dbi_output->dsr_idle_count++;
-        }
-
-        switch (dsr_info->dbi_output_num) {
-        case 1:
-                if (dbi_output->dsr_idle_count > MDFLD_DSR_MAX_IDLE_COUNT)
-                        can_enter_dsr = 1;
-                break;
-        case 2:
-                if (dbi_outputs[0]->dsr_idle_count > MDFLD_DSR_MAX_IDLE_COUNT
-                   && dbi_outputs[1]->dsr_idle_count > MDFLD_DSR_MAX_IDLE_COUNT)
-                        can_enter_dsr = 1;
-                break;
-        default:
-                DRM_ERROR("Wrong DBI output number\n");
-        }
-
-        /* Try to enter DSR */
-        if (can_enter_dsr) {
-                for (i = 0; i < dsr_info->dbi_output_num; i++) {
-                        if (!mdfld_dbi_is_in_dsr(dev) && dbi_outputs[i] &&
-                           !(dbi_outputs[i]->mode_flags & MODE_SETTING_ON_GOING)) {
-                                mdfld_dsi_dbi_enter_dsr(dbi_outputs[i],
-                                        dbi_outputs[i]->channel_num ? 2 : 0);
-#if 0
-                                enter_dsr = 1;
-                                pr_err("%s: enter_dsr = 1\n", __func__);
-#endif
-                        }
-                }
-        /*schedule rpm suspend after gfxrtdelay*/
-#ifdef CONFIG_GFX_RTPM
-                if (!dev_priv->rpm_enabled
-                        || !enter_dsr
-        /*              || (REG_READ(HDMIB_CONTROL) & HDMIB_PORT_EN) */
-                        || pm_schedule_suspend(&dev->pdev->dev, gfxrtdelay))
-                        dev_warn(dev->dev,
-                                "Runtime PM schedule suspend failed, rpm %d\n",
-                                        dev_priv->rpm_enabled);
-#endif
-        }
-}
-
-int mdfld_dbi_dsr_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dsr_info *dsr_info = dev_priv->dbi_dsr_info;
-
-        if (!dsr_info || IS_ERR(dsr_info)) {
-                dsr_info = kzalloc(sizeof(struct mdfld_dbi_dsr_info),
-                                                                GFP_KERNEL);
-                if (!dsr_info) {
-                        dev_err(dev->dev, "No memory\n");
-                        return -ENOMEM;
-                }
-                dev_priv->dbi_dsr_info = dsr_info;
-        }
-        return 0;
-}
-
-void mdfld_dbi_dsr_exit(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dsr_info *dsr_info = dev_priv->dbi_dsr_info;
-
-        if (dsr_info) {
-                kfree(dsr_info);
-                dev_priv->dbi_dsr_info = NULL;
-        }
-}
-
-void mdfld_dsi_controller_dbi_init(struct mdfld_dsi_config *dsi_config,
-                                                                int pipe)
-{
-        struct drm_device *dev = dsi_config->dev;
-        u32 reg_offset = pipe ? MIPIC_REG_OFFSET : 0;
-        int lane_count = dsi_config->lane_count;
-        u32 val = 0;
-
-        dev_dbg(dev->dev, "Init DBI interface on pipe %d...\n", pipe);
-
-        /* Un-ready device */
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset), 0x00000000);
-
-        /* Init dsi adapter before kicking off */
-        REG_WRITE((MIPIA_CONTROL_REG + reg_offset), 0x00000018);
-
-        /* TODO: figure out how to setup these registers */
-        REG_WRITE((MIPIA_DPHY_PARAM_REG + reg_offset), 0x150c3408);
-        REG_WRITE((MIPIA_CLK_LANE_SWITCH_TIME_CNT_REG + reg_offset),
-                                                        0x000a0014);
-        REG_WRITE((MIPIA_DBI_BW_CTRL_REG + reg_offset), 0x00000400);
-        REG_WRITE((MIPIA_DBI_FIFO_THROTTLE_REG + reg_offset), 0x00000001);
-        REG_WRITE((MIPIA_HS_LS_DBI_ENABLE_REG + reg_offset), 0x00000000);
-
-        /* Enable all interrupts */
-        REG_WRITE((MIPIA_INTR_EN_REG + reg_offset), 0xffffffff);
-        /* Max value: 20 clock cycles of txclkesc */
-        REG_WRITE((MIPIA_TURN_AROUND_TIMEOUT_REG + reg_offset), 0x0000001f);
-        /* Min 21 txclkesc, max: ffffh */
-        REG_WRITE((MIPIA_DEVICE_RESET_TIMER_REG + reg_offset), 0x0000ffff);
-        /* Min: 7d0 max: 4e20 */
-        REG_WRITE((MIPIA_INIT_COUNT_REG + reg_offset), 0x00000fa0);
-
-        /* Set up func_prg */
-        val |= lane_count;
-        val |= (dsi_config->channel_num << DSI_DBI_VIRT_CHANNEL_OFFSET);
-        val |= DSI_DBI_COLOR_FORMAT_OPTION2;
-        REG_WRITE((MIPIA_DSI_FUNC_PRG_REG + reg_offset), val);
-
-        REG_WRITE((MIPIA_HS_TX_TIMEOUT_REG + reg_offset), 0x3fffff);
-        REG_WRITE((MIPIA_LP_RX_TIMEOUT_REG + reg_offset), 0xffff);
-
-        /* De-assert dbi_stall when half of DBI FIFO is empty */
-        /* REG_WRITE((MIPIA_DBI_FIFO_THROTTLE_REG + reg_offset), 0x00000000); */
-
-        REG_WRITE((MIPIA_HIGH_LOW_SWITCH_COUNT_REG + reg_offset), 0x46);
-        REG_WRITE((MIPIA_EOT_DISABLE_REG + reg_offset), 0x00000000);
-        REG_WRITE((MIPIA_LP_BYTECLK_REG + reg_offset), 0x00000004);
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset), 0x00000001);
-}
-
-#if 0
-/*DBI encoder helper funcs*/
-static const struct drm_encoder_helper_funcs mdfld_dsi_dbi_helper_funcs = {
-        .dpms = mdfld_dsi_dbi_dpms,
-        .mode_fixup = mdfld_dsi_dbi_mode_fixup,
-        .prepare = mdfld_dsi_dbi_prepare,
-        .mode_set = mdfld_dsi_dbi_mode_set,
-        .commit = mdfld_dsi_dbi_commit,
-};
-
-/*DBI encoder funcs*/
-static const struct drm_encoder_funcs mdfld_dsi_dbi_encoder_funcs = {
-        .destroy = drm_encoder_cleanup,
-};
-
-#endif
-
-/*
- * Init DSI DBI encoder.
- * Allocate an mdfld_dsi_encoder and attach it to given @dsi_connector
- * return pointer of newly allocated DBI encoder, NULL on error
- */
-struct mdfld_dsi_encoder *mdfld_dsi_dbi_init(struct drm_device *dev,
-                                struct mdfld_dsi_connector *dsi_connector,
-                                struct panel_funcs *p_funcs)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dsi_dbi_output *dbi_output = NULL;
-        struct mdfld_dsi_config *dsi_config;
-        struct drm_connector *connector = NULL;
-        struct drm_encoder *encoder = NULL;
-        struct drm_display_mode *fixed_mode = NULL;
-        struct psb_gtt *pg = dev_priv ? (&dev_priv->gtt) : NULL;
-        struct mdfld_dbi_dpu_info *dpu_info = dev_priv ? (dev_priv->dbi_dpu_info) : NULL;
-        struct mdfld_dbi_dsr_info *dsr_info = dev_priv ? (dev_priv->dbi_dsr_info) : NULL;
-        u32 data = 0;
-        int pipe;
-        int ret;
-
-        if (!pg || !dsi_connector || !p_funcs) {
-                WARN_ON(1);
-                return NULL;
-        }
-
-        dsi_config = mdfld_dsi_get_config(dsi_connector);
-        pipe = dsi_connector->pipe;
-
-        /*panel hard-reset*/
-        if (p_funcs->reset) {
-                ret = p_funcs->reset(pipe);
-                if (ret) {
-                        DRM_ERROR("Panel %d hard-reset failed\n", pipe);
-                        return NULL;
-                }
-        }
-        /* Panel drvIC init */
-        if (p_funcs->drv_ic_init)
-                p_funcs->drv_ic_init(dsi_config, pipe);
-
-        /* Panel power mode detect */
-        ret = mdfld_dsi_get_power_mode(dsi_config,
-                                       &data,
-                                       MDFLD_DSI_HS_TRANSMISSION);
-        if (ret) {
-                DRM_ERROR("Panel %d get power mode failed\n", pipe);
-                dsi_connector->status = connector_status_disconnected;
-        } else {
-                DRM_INFO("pipe %d power mode 0x%x\n", pipe, data);
-                dsi_connector->status = connector_status_connected;
-        }
-
-        /*TODO: get panel info from DDB*/
-
-        dbi_output = kzalloc(sizeof(struct mdfld_dsi_dbi_output), GFP_KERNEL);
-        if (!dbi_output) {
-                dev_err(dev->dev, "No memory\n");
-                return NULL;
-        }
-
-        if (dsi_connector->pipe == 0) {
-                dbi_output->channel_num = 0;
-                dev_priv->dbi_output = dbi_output;
-        } else if (dsi_connector->pipe == 2) {
-                dbi_output->channel_num = 1;
-                dev_priv->dbi_output2 = dbi_output;
-        } else {
-                dev_err(dev->dev, "only support 2 DSI outputs\n");
-                goto out_err1;
-        }
-
-        dbi_output->dev = dev;
-        dbi_output->p_funcs = p_funcs;
-        fixed_mode = dsi_config->fixed_mode;
-        dbi_output->panel_fixed_mode = fixed_mode;
-
-        /* Create drm encoder object */
-        connector = &dsi_connector->base.base;
-        encoder = &dbi_output->base.base;
-        /* Review this if we ever get MIPI-HDMI bridges or similar */
-        drm_encoder_init(dev,
-                        encoder,
-                        p_funcs->encoder_funcs,
-                        DRM_MODE_ENCODER_LVDS);
-        drm_encoder_helper_add(encoder, p_funcs->encoder_helper_funcs);
-
-        /* Attach to given connector */
-        drm_mode_connector_attach_encoder(connector, encoder);
-
-        /* Set possible CRTCs and clones */
-        if (dsi_connector->pipe) {
-                encoder->possible_crtcs = (1 << 2);
-                encoder->possible_clones = (1 << 1);
-        } else {
-                encoder->possible_crtcs = (1 << 0);
-                encoder->possible_clones = (1 << 0);
-        }
-
-        dev_priv->dsr_fb_update = 0;
-        dev_priv->dsr_enable = false;
-        dev_priv->exit_idle = mdfld_dsi_dbi_exit_dsr;
-
-        dbi_output->first_boot = true;
-        dbi_output->mode_flags = MODE_SETTING_IN_ENCODER;
-
-        /* Add this output to dpu_info if in DPU mode */
-        if (dpu_info && dsi_connector->status == connector_status_connected) {
-                if (dsi_connector->pipe == 0)
-                        dpu_info->dbi_outputs[0] = dbi_output;
-                else
-                        dpu_info->dbi_outputs[1] = dbi_output;
-
-                dpu_info->dbi_output_num++;
-        } else if (dsi_connector->status == connector_status_connected) {
-                /* Add this output to dsr_info if not */
-                if (dsi_connector->pipe == 0)
-                        dsr_info->dbi_outputs[0] = dbi_output;
-                else
-                        dsr_info->dbi_outputs[1] = dbi_output;
-
-                dsr_info->dbi_output_num++;
-        }
-        return &dbi_output->base;
-out_err1:
-        kfree(dbi_output);
-        return NULL;
-}
diff --git a/drivers/staging/gma500/mdfld_dsi_dbi.h b/drivers/staging/gma500/mdfld_dsi_dbi.h
deleted file mode 100644
index f0fa986fd934..000000000000
--- a/drivers/staging/gma500/mdfld_dsi_dbi.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * jim liu <jim.liu@intel.com>
- * Jackie Li<yaodong.li@intel.com>
- */
-
-#ifndef __MDFLD_DSI_DBI_H__
-#define __MDFLD_DSI_DBI_H__
-
-#include <linux/backlight.h>
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_edid.h>
-
-#include "psb_drv.h"
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "power.h"
-
-#include "mdfld_dsi_output.h"
-#include "mdfld_output.h"
-
-/*
- * DBI encoder which inherits from mdfld_dsi_encoder
- */
-struct mdfld_dsi_dbi_output {
-        struct mdfld_dsi_encoder base;
-        struct drm_display_mode *panel_fixed_mode;
-        u8 last_cmd;
-        u8 lane_count;
-        u8 channel_num;
-        struct drm_device *dev;
-
-        /* Backlight operations */
-
-        /* DSR timer */
-        u32 dsr_idle_count;
-        bool dsr_fb_update_done;
-
-        /* Mode setting flags */
-        u32 mode_flags;
-
-        /* Panel status */
-        bool dbi_panel_on;
-        bool first_boot;
-        struct panel_funcs *p_funcs;
-
-        /* DPU */
-        u32 *dbi_cb_addr;
-        u32 dbi_cb_phy;
-        spinlock_t cb_lock;
-        u32 cb_write;
-};
-
-#define MDFLD_DSI_DBI_OUTPUT(dsi_encoder) \
-        container_of(dsi_encoder, struct mdfld_dsi_dbi_output, base)
-
-struct mdfld_dbi_dsr_info {
-        int dbi_output_num;
-        struct mdfld_dsi_dbi_output *dbi_outputs[2];
-
-        u32 dsr_idle_count;
-};
-
-#define DBI_CB_TIMEOUT_COUNT    0xffff
-
-/* Offsets */
-#define CMD_MEM_ADDR_OFFSET     0
-
-#define CMD_DATA_SRC_SYSTEM_MEM 0
-#define CMD_DATA_SRC_PIPE       1
-
-static inline int mdfld_dsi_dbi_fifo_ready(struct mdfld_dsi_dbi_output *dbi_output)
-{
-        struct drm_device *dev = dbi_output->dev;
-        u32 retry = DBI_CB_TIMEOUT_COUNT;
-        int reg_offset = (dbi_output->channel_num == 1) ? MIPIC_REG_OFFSET : 0;
-        int ret = 0;
-
-        /* Query the dbi fifo status*/
-        while (retry--) {
-                if (REG_READ(MIPIA_GEN_FIFO_STAT_REG + reg_offset) & (1 << 27))
-                        break;
-        }
-
-        if (!retry) {
-                DRM_ERROR("Timeout waiting for DBI FIFO empty\n");
-                ret = -EAGAIN;
-        }
-        return ret;
-}
-
-static inline int mdfld_dsi_dbi_cmd_sent(struct mdfld_dsi_dbi_output *dbi_output)
-{
-        struct drm_device *dev = dbi_output->dev;
-        u32 retry = DBI_CB_TIMEOUT_COUNT;
-        int reg_offset = (dbi_output->channel_num == 1) ? MIPIC_REG_OFFSET : 0;
-        int ret = 0;
-
-        /* Query the command execution status */
-        while (retry--)
-                if (!(REG_READ(MIPIA_CMD_ADD_REG + reg_offset) & (1 << 0)))
-                        break;
-
-        if (!retry) {
-                DRM_ERROR("Timeout waiting for DBI command status\n");
-                ret = -EAGAIN;
-        }
-
-        return ret;
-}
-
-static inline int mdfld_dsi_dbi_cb_ready(struct mdfld_dsi_dbi_output *dbi_output)
-{
-        int ret = 0;
-
-        /* Query the command execution status*/
-        ret = mdfld_dsi_dbi_cmd_sent(dbi_output);
-        if (ret) {
-                DRM_ERROR("Peripheral is busy\n");
-                ret = -EAGAIN;
-        }
-        /* Query the dbi fifo status*/
-        ret = mdfld_dsi_dbi_fifo_ready(dbi_output);
-        if (ret) {
-                DRM_ERROR("DBI FIFO is not empty\n");
-                ret = -EAGAIN;
-        }
-        return ret;
-}
-
-extern void mdfld_dsi_dbi_output_init(struct drm_device *dev,
-                        struct psb_intel_mode_device *mode_dev, int pipe);
-extern void mdfld_dsi_dbi_exit_dsr(struct drm_device *dev, u32 update_src);
-extern void mdfld_dsi_dbi_enter_dsr(struct mdfld_dsi_dbi_output *dbi_output,
-                        int pipe);
-extern int mdfld_dbi_dsr_init(struct drm_device *dev);
-extern void mdfld_dbi_dsr_exit(struct drm_device *dev);
-extern struct mdfld_dsi_encoder *mdfld_dsi_dbi_init(struct drm_device *dev,
-                        struct mdfld_dsi_connector *dsi_connector,
-                        struct panel_funcs *p_funcs);
-extern int mdfld_dsi_dbi_send_dcs(struct mdfld_dsi_dbi_output *dbi_output,
-                        u8 dcs, u8 *param, u32 num, u8 data_src);
-extern int mdfld_dsi_dbi_update_area(struct mdfld_dsi_dbi_output *dbi_output,
-                        u16 x1, u16 y1, u16 x2, u16 y2);
-extern int mdfld_dsi_dbi_update_power(struct mdfld_dsi_dbi_output *dbi_output,
-                        int mode);
-extern void mdfld_dsi_controller_dbi_init(struct mdfld_dsi_config *dsi_config,
-                        int pipe);
-
-#endif /*__MDFLD_DSI_DBI_H__*/
diff --git a/drivers/staging/gma500/mdfld_dsi_dbi_dpu.c b/drivers/staging/gma500/mdfld_dsi_dbi_dpu.c
deleted file mode 100644
index a4e2ff442b1f..000000000000
--- a/drivers/staging/gma500/mdfld_dsi_dbi_dpu.c
+++ /dev/null
@@ -1,778 +0,0 @@
-/*
- * Copyright © 2010-2011 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Jim Liu <jim.liu@intel.com>
- * Jackie Li<yaodong.li@intel.com>
- */
-
-#include "mdfld_dsi_dbi_dpu.h"
-#include "mdfld_dsi_dbi.h"
-
-/*
- * NOTE: all mdlfd_x_damage funcs should be called by holding dpu_update_lock
- */
-
-static int mdfld_cursor_damage(struct mdfld_dbi_dpu_info *dpu_info,
-                           mdfld_plane_t plane,
-                           struct psb_drm_dpu_rect *damaged_rect)
-{
-        int x, y;
-        int new_x, new_y;
-        struct psb_drm_dpu_rect *rect;
-        struct psb_drm_dpu_rect *pipe_rect;
-        int cursor_size;
-        struct mdfld_cursor_info *cursor;
-        mdfld_plane_t fb_plane;
-
-        if (plane == MDFLD_CURSORA) {
-                cursor = &dpu_info->cursors[0];
-                x = dpu_info->cursors[0].x;
-                y = dpu_info->cursors[0].y;
-                cursor_size = dpu_info->cursors[0].size;
-                pipe_rect = &dpu_info->damage_pipea;
-                fb_plane = MDFLD_PLANEA;
-        } else {
-                cursor = &dpu_info->cursors[1];
-                x = dpu_info->cursors[1].x;
-                y = dpu_info->cursors[1].y;
-                cursor_size = dpu_info->cursors[1].size;
-                pipe_rect = &dpu_info->damage_pipec;
-                fb_plane = MDFLD_PLANEC;
-        }
-        new_x = damaged_rect->x;
-        new_y = damaged_rect->y;
-
-        if (x == new_x && y == new_y)
-                return 0;
-
-        rect = &dpu_info->damaged_rects[plane];
-        /* Move to right */
-        if (new_x >= x) {
-                if (new_y > y) {
-                        rect->x = x;
-                        rect->y = y;
-                        rect->width = (new_x + cursor_size) - x;
-                        rect->height = (new_y + cursor_size) - y;
-                        goto cursor_out;
-                } else {
-                        rect->x = x;
-                        rect->y = new_y;
-                        rect->width = (new_x + cursor_size) - x;
-                        rect->height = (y - new_y);
-                        goto cursor_out;
-                }
-        } else {
-                if (new_y > y) {
-                        rect->x = new_x;
-                        rect->y = y;
-                        rect->width = (x + cursor_size) - new_x;
-                        rect->height = new_y - y;
-                        goto cursor_out;
-                } else {
-                        rect->x = new_x;
-                        rect->y = new_y;
-                        rect->width = (x + cursor_size) - new_x;
-                        rect->height = (y + cursor_size) - new_y;
-                }
-        }
-cursor_out:
-        if (new_x < 0)
-                cursor->x = 0;
-        else if (new_x > 864)
-                cursor->x = 864;
-        else
-                cursor->x = new_x;
-
-        if (new_y < 0)
-                cursor->y = 0;
-        else if (new_y > 480)
-                cursor->y = 480;
-        else
-                cursor->y = new_y;
-
-        /*
-         * FIXME: this is a workaround for cursor plane update,
-         * remove it later!
-         */
-        rect->x = 0;
-        rect->y = 0;
-        rect->width = 864;
-        rect->height = 480;
-
-        mdfld_check_boundary(dpu_info, rect);
-        mdfld_dpu_region_extent(pipe_rect, rect);
-
-        /* Update pending status of dpu_info */
-        dpu_info->pending |= (1 << plane);
-        /* Update fb panel as well */
-        dpu_info->pending |= (1 << fb_plane);
-        return 0;
-}
-
-static int mdfld_fb_damage(struct mdfld_dbi_dpu_info *dpu_info,
-                                   mdfld_plane_t plane,
-                                   struct psb_drm_dpu_rect *damaged_rect)
-{
-        struct psb_drm_dpu_rect *rect;
-
-        if (plane == MDFLD_PLANEA)
-                rect = &dpu_info->damage_pipea;
-        else
-                rect = &dpu_info->damage_pipec;
-
-        mdfld_check_boundary(dpu_info, damaged_rect);
-
-        /* Add fb damage area to this pipe */
-        mdfld_dpu_region_extent(rect, damaged_rect);
-
-        /* Update pending status of dpu_info */
-        dpu_info->pending |= (1 << plane);
-        return 0;
-}
-
-/* Do nothing here, right now */
-static int mdfld_overlay_damage(struct mdfld_dbi_dpu_info *dpu_info,
-                                mdfld_plane_t plane,
-                                struct psb_drm_dpu_rect *damaged_rect)
-{
-        return 0;
-}
-
-int mdfld_dbi_dpu_report_damage(struct drm_device *dev,
-                                mdfld_plane_t plane,
-                                struct psb_drm_dpu_rect *rect)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dpu_info *dpu_info = dev_priv->dbi_dpu_info;
-        int ret = 0;
-
-        /* DPU not in use, no damage reporting needed */
-        if (dpu_info == NULL)
-                return 0;
-
-        spin_lock(&dpu_info->dpu_update_lock);
-
-        switch (plane) {
-        case MDFLD_PLANEA:
-        case MDFLD_PLANEC:
-                mdfld_fb_damage(dpu_info, plane, rect);
-                break;
-        case MDFLD_CURSORA:
-        case MDFLD_CURSORC:
-                mdfld_cursor_damage(dpu_info, plane, rect);
-                break;
-        case MDFLD_OVERLAYA:
-        case MDFLD_OVERLAYC:
-                mdfld_overlay_damage(dpu_info, plane, rect);
-                break;
-        default:
-                DRM_ERROR("Invalid plane type %d\n", plane);
-                ret = -EINVAL;
-        }
-        spin_unlock(&dpu_info->dpu_update_lock);
-        return ret;
-}
-
-int mdfld_dbi_dpu_report_fullscreen_damage(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv;
-        struct mdfld_dbi_dpu_info *dpu_info;
-        struct mdfld_dsi_config  *dsi_config;
-        struct psb_drm_dpu_rect rect;
-        int i;
-
-        if (!dev) {
-                DRM_ERROR("Invalid parameter\n");
-                return -EINVAL;
-        }
-
-        dev_priv = dev->dev_private;
-        dpu_info = dev_priv->dbi_dpu_info;
-
-        /* This is fine - we may be in non DPU mode */
-        if (!dpu_info)
-                return -EINVAL;
-
-        for (i = 0; i < dpu_info->dbi_output_num; i++) {
-                dsi_config = dev_priv->dsi_configs[i];
-                if (dsi_config) {
-                        rect.x = rect.y = 0;
-                        rect.width = dsi_config->fixed_mode->hdisplay;
-                        rect.height = dsi_config->fixed_mode->vdisplay;
-                        mdfld_dbi_dpu_report_damage(dev,
-                                    i ? (MDFLD_PLANEC) : (MDFLD_PLANEA),
-                                    &rect);
-                }
-        }
-        /* Exit DSR state */
-        mdfld_dpu_exit_dsr(dev);
-        return 0;
-}
-
-int mdfld_dsi_dbi_dsr_off(struct drm_device *dev,
-                                        struct psb_drm_dpu_rect *rect)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dpu_info *dpu_info = dev_priv->dbi_dpu_info;
-
-        mdfld_dbi_dpu_report_damage(dev, MDFLD_PLANEA, rect);
-
-        /* If dual display mode */
-        if (dpu_info->dbi_output_num == 2)
-                mdfld_dbi_dpu_report_damage(dev, MDFLD_PLANEC, rect);
-
-        /* Force dsi to exit DSR mode */
-        mdfld_dpu_exit_dsr(dev);
-        return 0;
-}
-
-static void mdfld_dpu_cursor_plane_flush(struct mdfld_dbi_dpu_info *dpu_info,
-                                                 mdfld_plane_t plane)
-{
-        struct drm_device *dev = dpu_info->dev;
-        u32 curpos_reg = CURAPOS;
-        u32 curbase_reg = CURABASE;
-        u32 curcntr_reg = CURACNTR;
-        struct mdfld_cursor_info *cursor = &dpu_info->cursors[0];
-
-        if (plane == MDFLD_CURSORC) {
-                curpos_reg = CURCPOS;
-                curbase_reg = CURCBASE;
-                curcntr_reg = CURCCNTR;
-                cursor = &dpu_info->cursors[1];
-        }
-
-        REG_WRITE(curcntr_reg, REG_READ(curcntr_reg));
-        REG_WRITE(curpos_reg,
-                (((cursor->x & CURSOR_POS_MASK) << CURSOR_X_SHIFT) |
-                ((cursor->y & CURSOR_POS_MASK) << CURSOR_Y_SHIFT)));
-        REG_WRITE(curbase_reg, REG_READ(curbase_reg));
-}
-
-static void mdfld_dpu_fb_plane_flush(struct mdfld_dbi_dpu_info *dpu_info,
-                                                 mdfld_plane_t plane)
-{
-        u32 pipesrc_reg = PIPEASRC;
-        u32 dspsize_reg = DSPASIZE;
-        u32 dspoff_reg = DSPALINOFF;
-        u32 dspsurf_reg = DSPASURF;
-        u32 dspstride_reg = DSPASTRIDE;
-        u32 stride;
-        struct psb_drm_dpu_rect *rect = &dpu_info->damage_pipea;
-        struct drm_device *dev = dpu_info->dev;
-
-        if (plane == MDFLD_PLANEC) {
-                pipesrc_reg = PIPECSRC;
-                dspsize_reg = DSPCSIZE;
-                dspoff_reg = DSPCLINOFF;
-                dspsurf_reg = DSPCSURF;
-                dspstride_reg = DSPCSTRIDE;
-                rect = &dpu_info->damage_pipec;
-        }
-
-        stride = REG_READ(dspstride_reg);
-        /* FIXME: should I do the pipe src update here? */
-        REG_WRITE(pipesrc_reg, ((rect->width - 1) << 16) | (rect->height - 1));
-        /* Flush plane */
-        REG_WRITE(dspsize_reg, ((rect->height - 1) << 16) | (rect->width - 1));
-        REG_WRITE(dspoff_reg, ((rect->x * 4) + (rect->y * stride)));
-        REG_WRITE(dspsurf_reg, REG_READ(dspsurf_reg));
-
-        /*
-         * TODO: wait for flip finished and restore the pipesrc reg,
-         * or cursor will be show at a wrong position
-         */
-}
-
-static void mdfld_dpu_overlay_plane_flush(struct mdfld_dbi_dpu_info *dpu_info,
-                                                  mdfld_plane_t plane)
-{
-}
-
-/*
- * TODO: we are still in dbi normal mode now, we will try to use partial
- * mode later.
- */
-static int mdfld_dbi_prepare_cb(struct mdfld_dsi_dbi_output *dbi_output,
-                                struct mdfld_dbi_dpu_info *dpu_info, int pipe)
-{
-        u8 *cb_addr = (u8 *)dbi_output->dbi_cb_addr;
-        u32 *index;
-        struct psb_drm_dpu_rect *rect = pipe ?
-                (&dpu_info->damage_pipec) : (&dpu_info->damage_pipea);
-
-        /* FIXME: lock command buffer, this may lead to a deadlock,
-           as we already hold the dpu_update_lock */
-        if (!spin_trylock(&dbi_output->cb_lock)) {
-                DRM_ERROR("lock command buffer failed, try again\n");
-                return -EAGAIN;
-        }
-
-        index = &dbi_output->cb_write;
-
-        if (*index) {
-                DRM_ERROR("DBI command buffer unclean\n");
-                return -EAGAIN;
-        }
-
-        /* Column address */
-        *(cb_addr + ((*index)++)) = set_column_address;
-        *(cb_addr + ((*index)++)) = rect->x >> 8;
-        *(cb_addr + ((*index)++)) = rect->x;
-        *(cb_addr + ((*index)++)) = (rect->x + rect->width - 1) >> 8;
-        *(cb_addr + ((*index)++)) = (rect->x + rect->width - 1);
-
-        *index = 8;
-
-        /* Page address */
-        *(cb_addr + ((*index)++)) = set_page_addr;
-        *(cb_addr + ((*index)++)) = rect->y >> 8;
-        *(cb_addr + ((*index)++)) = rect->y;
-        *(cb_addr + ((*index)++)) = (rect->y + rect->height - 1) >> 8;
-        *(cb_addr + ((*index)++)) = (rect->y + rect->height - 1);
-
-        *index = 16;
-
-        /*write memory*/
-        *(cb_addr + ((*index)++)) = write_mem_start;
-
-        return 0;
-}
-
-static int mdfld_dbi_flush_cb(struct mdfld_dsi_dbi_output *dbi_output, int pipe)
-{
-        u32 cmd_phy = dbi_output->dbi_cb_phy;
-        u32 *index = &dbi_output->cb_write;
-        int reg_offset = pipe ? MIPIC_REG_OFFSET : 0;
-        struct drm_device *dev = dbi_output->dev;
-
-        if (*index == 0 || !dbi_output)
-                return 0;
-
-        REG_WRITE((MIPIA_CMD_LEN_REG + reg_offset), 0x010505);
-        REG_WRITE((MIPIA_CMD_ADD_REG + reg_offset), cmd_phy | 3);
-
-        *index = 0;
-
-        /* FIXME: unlock command buffer */
-        spin_unlock(&dbi_output->cb_lock);
-        return 0;
-}
-
-static int mdfld_dpu_update_pipe(struct mdfld_dsi_dbi_output *dbi_output,
-                                 struct mdfld_dbi_dpu_info *dpu_info, int pipe)
-{
-        struct drm_device *dev =  dbi_output->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        mdfld_plane_t cursor_plane = MDFLD_CURSORA;
-        mdfld_plane_t fb_plane = MDFLD_PLANEA;
-        mdfld_plane_t overlay_plane = MDFLD_OVERLAYA;
-        int ret = 0;
-        u32 plane_mask = MDFLD_PIPEA_PLANE_MASK;
-
-        /* Damaged rects on this pipe */
-        if (pipe) {
-                cursor_plane = MDFLD_CURSORC;
-                fb_plane = MDFLD_PLANEC;
-                overlay_plane = MDFLD_OVERLAYC;
-                plane_mask = MDFLD_PIPEC_PLANE_MASK;
-        }
-
-        /*update cursor which assigned to @pipe*/
-        if (dpu_info->pending & (1 << cursor_plane))
-                mdfld_dpu_cursor_plane_flush(dpu_info, cursor_plane);
-
-        /*update fb which assigned to @pipe*/
-        if (dpu_info->pending & (1 << fb_plane))
-                mdfld_dpu_fb_plane_flush(dpu_info, fb_plane);
-
-        /* TODO: update overlay */
-        if (dpu_info->pending & (1 << overlay_plane))
-                mdfld_dpu_overlay_plane_flush(dpu_info, overlay_plane);
-
-        /* Flush damage area to panel fb */
-        if (dpu_info->pending & plane_mask) {
-                ret = mdfld_dbi_prepare_cb(dbi_output, dpu_info, pipe);
-                /*
-                 * TODO: remove b_dsr_enable later,
-                 * added it so that text console could boot smoothly
-                 */
-                /* Clean pending flags on this pipe */
-                if (!ret && dev_priv->dsr_enable) {
-                        dpu_info->pending &= ~plane_mask;
-                        /* Reset overlay pipe damage rect */
-                        mdfld_dpu_init_damage(dpu_info, pipe);
-                }
-        }
-        return ret;
-}
-
-static int mdfld_dpu_update_fb(struct drm_device *dev)
-{
-        struct drm_crtc *crtc;
-        struct psb_intel_crtc *psb_crtc;
-        struct mdfld_dsi_dbi_output **dbi_output;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dpu_info *dpu_info = dev_priv->dbi_dpu_info;
-        bool pipe_updated[2];
-        unsigned long irq_flags;
-        u32 dpll_reg = MRST_DPLL_A;
-        u32 dspcntr_reg = DSPACNTR;
-        u32 pipeconf_reg = PIPEACONF;
-        u32 dsplinoff_reg = DSPALINOFF;
-        u32 dspsurf_reg = DSPASURF;
-        u32 mipi_state_reg = MIPIA_INTR_STAT_REG;
-        u32 reg_offset = 0;
-        int pipe;
-        int i;
-        int ret;
-
-        dbi_output = dpu_info->dbi_outputs;
-        pipe_updated[0] = pipe_updated[1] = false;
-
-        if (!gma_power_begin(dev, true))
-                return -EAGAIN;
-
-        /* Try to prevent any new damage reports */
-        if (!spin_trylock_irqsave(&dpu_info->dpu_update_lock, irq_flags))
-                return -EAGAIN;
-
-        for (i = 0; i < dpu_info->dbi_output_num; i++) {
-                crtc = dbi_output[i]->base.base.crtc;
-                psb_crtc = (crtc) ? to_psb_intel_crtc(crtc) : NULL;
-
-                pipe = dbi_output[i]->channel_num ? 2 : 0;
-
-                if (pipe == 2) {
-                        dspcntr_reg = DSPCCNTR;
-                        pipeconf_reg = PIPECCONF;
-                        dsplinoff_reg = DSPCLINOFF;
-                        dspsurf_reg = DSPCSURF;
-                        reg_offset = MIPIC_REG_OFFSET;
-                }
-
-                if (!(REG_READ((MIPIA_GEN_FIFO_STAT_REG + reg_offset))
-                                                        & (1 << 27)) ||
-                        !(REG_READ(dpll_reg) & DPLL_VCO_ENABLE) ||
-                        !(REG_READ(dspcntr_reg) & DISPLAY_PLANE_ENABLE) ||
-                        !(REG_READ(pipeconf_reg) & DISPLAY_PLANE_ENABLE)) {
-                        dev_err(dev->dev,
-                                "DBI FIFO is busy, DSI %d state %x\n",
-                                pipe,
-                                REG_READ(mipi_state_reg + reg_offset));
-                        continue;
-                }
-
-                /*
-                 *      If DBI output is in a exclusive state then the pipe
-                 *      change won't be updated
-                 */
-                if (dbi_output[i]->dbi_panel_on &&
-                   !(dbi_output[i]->mode_flags & MODE_SETTING_ON_GOING) &&
-                   !(psb_crtc &&
-                        psb_crtc->mode_flags & MODE_SETTING_ON_GOING) &&
-                   !(dbi_output[i]->mode_flags & MODE_SETTING_IN_DSR)) {
-                        ret = mdfld_dpu_update_pipe(dbi_output[i],
-                                dpu_info, dbi_output[i]->channel_num ? 2 : 0);
-                        if (!ret)
-                                pipe_updated[i] = true;
-                }
-        }
-
-        for (i = 0; i < dpu_info->dbi_output_num; i++)
-                if (pipe_updated[i])
-                        mdfld_dbi_flush_cb(dbi_output[i],
-                                dbi_output[i]->channel_num ? 2 : 0);
-
-        spin_unlock_irqrestore(&dpu_info->dpu_update_lock, irq_flags);
-        gma_power_end(dev);
-        return 0;
-}
-
-static int __mdfld_dbi_exit_dsr(struct mdfld_dsi_dbi_output *dbi_output,
-                                                                int pipe)
-{
-        struct drm_device *dev = dbi_output->dev;
-        struct drm_crtc *crtc = dbi_output->base.base.crtc;
-        struct psb_intel_crtc *psb_crtc = (crtc) ? to_psb_intel_crtc(crtc)
-                                                                : NULL;
-        u32 reg_val;
-        u32 dpll_reg = MRST_DPLL_A;
-        u32 pipeconf_reg = PIPEACONF;
-        u32 dspcntr_reg = DSPACNTR;
-        u32 dspbase_reg = DSPABASE;
-        u32 dspsurf_reg = DSPASURF;
-        u32 reg_offset = 0;
-
-        if (!dbi_output)
-                return 0;
-
-        /* If mode setting on-going, back off */
-        if ((dbi_output->mode_flags & MODE_SETTING_ON_GOING) ||
-                (psb_crtc && psb_crtc->mode_flags & MODE_SETTING_ON_GOING))
-                return -EAGAIN;
-
-        if (pipe == 2) {
-                dpll_reg = MRST_DPLL_A;
-                pipeconf_reg = PIPECCONF;
-                dspcntr_reg = DSPCCNTR;
-                dspbase_reg = MDFLD_DSPCBASE;
-                dspsurf_reg = DSPCSURF;
-
-                reg_offset = MIPIC_REG_OFFSET;
-        }
-
-        if (!gma_power_begin(dev, true))
-                return -EAGAIN;
-
-        /* Enable DPLL */
-        reg_val = REG_READ(dpll_reg);
-        if (!(reg_val & DPLL_VCO_ENABLE)) {
-
-                if (reg_val & MDFLD_PWR_GATE_EN) {
-                        reg_val &= ~MDFLD_PWR_GATE_EN;
-                        REG_WRITE(dpll_reg, reg_val);
-                        REG_READ(dpll_reg);
-                        udelay(500);
-                }
-
-                reg_val |= DPLL_VCO_ENABLE;
-                REG_WRITE(dpll_reg, reg_val);
-                REG_READ(dpll_reg);
-                udelay(500);
-
-                /* FIXME: add timeout */
-                while (!(REG_READ(pipeconf_reg) & PIPECONF_DSIPLL_LOCK))
-                        cpu_relax();
-        }
-
-        /* Enable pipe */
-        reg_val = REG_READ(pipeconf_reg);
-        if (!(reg_val & PIPEACONF_ENABLE)) {
-                reg_val |= PIPEACONF_ENABLE;
-                REG_WRITE(pipeconf_reg, reg_val);
-                REG_READ(pipeconf_reg);
-                udelay(500);
-                mdfldWaitForPipeEnable(dev, pipe);
-        }
-
-        /* Enable plane */
-        reg_val = REG_READ(dspcntr_reg);
-        if (!(reg_val & DISPLAY_PLANE_ENABLE)) {
-                reg_val |= DISPLAY_PLANE_ENABLE;
-                REG_WRITE(dspcntr_reg, reg_val);
-                REG_READ(dspcntr_reg);
-                udelay(500);
-        }
-
-        gma_power_end(dev);
-
-        /* Clean IN_DSR flag */
-        dbi_output->mode_flags &= ~MODE_SETTING_IN_DSR;
-
-        return 0;
-}
-
-int mdfld_dpu_exit_dsr(struct drm_device *dev)
-{
-        struct mdfld_dsi_dbi_output **dbi_output;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dpu_info *dpu_info = dev_priv->dbi_dpu_info;
-        int i;
-        int pipe;
-
-        dbi_output = dpu_info->dbi_outputs;
-
-        for (i = 0; i < dpu_info->dbi_output_num; i++) {
-                /* If this output is not in DSR mode, don't call exit dsr */
-                if (dbi_output[i]->mode_flags & MODE_SETTING_IN_DSR)
-                        __mdfld_dbi_exit_dsr(dbi_output[i],
-                                        dbi_output[i]->channel_num ? 2 : 0);
-        }
-
-        /* Enable TE interrupt */
-        for (i = 0; i < dpu_info->dbi_output_num; i++) {
-                /* If this output is not in DSR mode, don't call exit dsr */
-                pipe = dbi_output[i]->channel_num ? 2 : 0;
-                if (dbi_output[i]->dbi_panel_on && pipe) {
-                        mdfld_disable_te(dev, 0);
-                        mdfld_enable_te(dev, 2);
-                } else if (dbi_output[i]->dbi_panel_on && !pipe) {
-                        mdfld_disable_te(dev, 2);
-                        mdfld_enable_te(dev, 0);
-                }
-        }
-        return 0;
-}
-
-static int mdfld_dpu_enter_dsr(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dpu_info *dpu_info = dev_priv->dbi_dpu_info;
-        struct mdfld_dsi_dbi_output **dbi_output;
-        int i;
-
-        dbi_output = dpu_info->dbi_outputs;
-
-        for (i = 0; i < dpu_info->dbi_output_num; i++) {
-                /* If output is off or already in DSR state, don't re-enter */
-                if (dbi_output[i]->dbi_panel_on &&
-                   !(dbi_output[i]->mode_flags & MODE_SETTING_IN_DSR)) {
-                        mdfld_dsi_dbi_enter_dsr(dbi_output[i],
-                                dbi_output[i]->channel_num ? 2 : 0);
-                }
-        }
-
-        return 0;
-}
-
-static void mdfld_dbi_dpu_timer_func(unsigned long data)
-{
-        struct drm_device *dev = (struct drm_device *)data;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dpu_info *dpu_info = dev_priv->dbi_dpu_info;
-        struct timer_list *dpu_timer = &dpu_info->dpu_timer;
-        unsigned long flags;
-
-        if (dpu_info->pending) {
-                dpu_info->idle_count = 0;
-                /* Update panel fb with damaged area */
-                mdfld_dpu_update_fb(dev);
-        } else {
-                dpu_info->idle_count++;
-        }
-
-        if (dpu_info->idle_count >= MDFLD_MAX_IDLE_COUNT) {
-                mdfld_dpu_enter_dsr(dev);
-                /* Stop timer by return */
-                return;
-        }
-
-        spin_lock_irqsave(&dpu_info->dpu_timer_lock, flags);
-        if (!timer_pending(dpu_timer)) {
-                dpu_timer->expires = jiffies + MDFLD_DSR_DELAY;
-                add_timer(dpu_timer);
-        }
-        spin_unlock_irqrestore(&dpu_info->dpu_timer_lock, flags);
-}
-
-void mdfld_dpu_update_panel(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dpu_info *dpu_info = dev_priv->dbi_dpu_info;
-
-        if (dpu_info->pending) {
-                dpu_info->idle_count = 0;
-
-                /*update panel fb with damaged area*/
-                mdfld_dpu_update_fb(dev);
-        } else {
-                dpu_info->idle_count++;
-        }
-
-        if (dpu_info->idle_count >= MDFLD_MAX_IDLE_COUNT) {
-                /*enter dsr*/
-                mdfld_dpu_enter_dsr(dev);
-        }
-}
-
-static int mdfld_dbi_dpu_timer_init(struct drm_device *dev,
-                                struct mdfld_dbi_dpu_info *dpu_info)
-{
-        struct timer_list *dpu_timer = &dpu_info->dpu_timer;
-        unsigned long flags;
-
-        spin_lock_init(&dpu_info->dpu_timer_lock);
-        spin_lock_irqsave(&dpu_info->dpu_timer_lock, flags);
-
-        init_timer(dpu_timer);
-
-        dpu_timer->data = (unsigned long)dev;
-        dpu_timer->function = mdfld_dbi_dpu_timer_func;
-        dpu_timer->expires = jiffies + MDFLD_DSR_DELAY;
-
-        spin_unlock_irqrestore(&dpu_info->dpu_timer_lock, flags);
-
-        return 0;
-}
-
-void mdfld_dbi_dpu_timer_start(struct mdfld_dbi_dpu_info *dpu_info)
-{
-        struct timer_list *dpu_timer = &dpu_info->dpu_timer;
-        unsigned long flags;
-
-        spin_lock_irqsave(&dpu_info->dpu_timer_lock, flags);
-        if (!timer_pending(dpu_timer)) {
-                dpu_timer->expires = jiffies + MDFLD_DSR_DELAY;
-                add_timer(dpu_timer);
-        }
-        spin_unlock_irqrestore(&dpu_info->dpu_timer_lock, flags);
-}
-
-int mdfld_dbi_dpu_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dpu_info *dpu_info = dev_priv->dbi_dpu_info;
-
-        if (!dpu_info || IS_ERR(dpu_info)) {
-                dpu_info = kzalloc(sizeof(struct mdfld_dbi_dpu_info),
-                                                                GFP_KERNEL);
-                if (!dpu_info) {
-                        DRM_ERROR("No memory\n");
-                        return -ENOMEM;
-                }
-                dev_priv->dbi_dpu_info = dpu_info;
-        }
-
-        dpu_info->dev = dev;
-
-        dpu_info->cursors[0].size = MDFLD_CURSOR_SIZE;
-        dpu_info->cursors[1].size = MDFLD_CURSOR_SIZE;
-
-        /*init dpu_update_lock*/
-        spin_lock_init(&dpu_info->dpu_update_lock);
-
-        /*init dpu refresh timer*/
-        mdfld_dbi_dpu_timer_init(dev, dpu_info);
-
-        /*init pipe damage area*/
-        mdfld_dpu_init_damage(dpu_info, 0);
-        mdfld_dpu_init_damage(dpu_info, 2);
-
-        return 0;
-}
-
-void mdfld_dbi_dpu_exit(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dbi_dpu_info *dpu_info = dev_priv->dbi_dpu_info;
-
-        if (!dpu_info)
-                return;
-
-        del_timer_sync(&dpu_info->dpu_timer);
-        kfree(dpu_info);
-        dev_priv->dbi_dpu_info = NULL;
-}
-
-
diff --git a/drivers/staging/gma500/mdfld_dsi_dbi_dpu.h b/drivers/staging/gma500/mdfld_dsi_dbi_dpu.h
deleted file mode 100644
index 42367ed48c08..000000000000
--- a/drivers/staging/gma500/mdfld_dsi_dbi_dpu.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * jim liu <jim.liu@intel.com>
- * Jackie Li<yaodong.li@intel.com>
- */
-
-#ifndef __MDFLD_DSI_DBI_DPU_H__
-#define __MDFLD_DSI_DBI_DPU_H__
-
-#include "mdfld_dsi_dbi.h"
-
-typedef enum {
-        MDFLD_PLANEA,
-        MDFLD_PLANEC,
-        MDFLD_CURSORA,
-        MDFLD_CURSORC,
-        MDFLD_OVERLAYA,
-        MDFLD_OVERLAYC,
-        MDFLD_PLANE_NUM,
-} mdfld_plane_t;
-
-#define MDFLD_PIPEA_PLANE_MASK  0x15
-#define MDFLD_PIPEC_PLANE_MASK  0x2A
-
-struct mdfld_cursor_info {
-        int x, y;
-        int size;
-};
-
-#define MDFLD_CURSOR_SIZE       64
-
-/*
- * enter DSR mode if screen has no update for 2 frames.
- */
-#define MDFLD_MAX_IDLE_COUNT    2
-
-struct mdfld_dbi_dpu_info {
-        struct drm_device *dev;
-        /* Lock */
-        spinlock_t dpu_update_lock;
-
-        /* Cursor postion */
-        struct mdfld_cursor_info cursors[2];
-
-        /* Damaged area for each plane */
-        struct psb_drm_dpu_rect damaged_rects[MDFLD_PLANE_NUM];
-
-        /* Final damaged area */
-        struct psb_drm_dpu_rect damage_pipea;
-        struct psb_drm_dpu_rect damage_pipec;
-
-        /* Pending */
-        u32 pending;
-
-        /* DPU timer */
-        struct timer_list dpu_timer;
-        spinlock_t dpu_timer_lock;
-
-        /* DPU idle count */
-        u32 idle_count;
-
-        /* DSI outputs */
-        struct mdfld_dsi_dbi_output *dbi_outputs[2];
-        int dbi_output_num;
-};
-
-static inline int mdfld_dpu_region_extent(struct psb_drm_dpu_rect *origin,
-                         struct psb_drm_dpu_rect *rect)
-{
-        int x1, y1, x2, y2;
-
-        x1 = origin->x + origin->width;
-        y1 = origin->y + origin->height;
-
-        x2 = rect->x + rect->width;
-        y2 = rect->y + rect->height;
-
-        origin->x = min(origin->x, rect->x);
-        origin->y = min(origin->y, rect->y);
-        origin->width = max(x1, x2) - origin->x;
-        origin->height = max(y1, y2) - origin->y;
-
-        return 0;
-}
-
-static inline void mdfld_check_boundary(struct mdfld_dbi_dpu_info *dpu_info,
-                                struct psb_drm_dpu_rect *rect)
-{
-        if (rect->x < 0)
-                rect->x = 0;
-        if (rect->y < 0)
-                rect->y = 0;
-
-        if (rect->x + rect->width > 864)
-                rect->width = 864 - rect->x;
-        if (rect->y + rect->height > 480)
-                rect->height = 480 - rect->height;
-
-        if (!rect->width)
-                rect->width = 1;
-        if (!rect->height)
-                rect->height = 1;
-}
-
-static inline void mdfld_dpu_init_damage(struct mdfld_dbi_dpu_info *dpu_info,
-                                int pipe)
-{
-        struct psb_drm_dpu_rect *rect;
-
-        if (pipe == 0)
-                rect = &dpu_info->damage_pipea;
-        else
-                rect = &dpu_info->damage_pipec;
-
-        rect->x = 864;
-        rect->y = 480;
-        rect->width = -864;
-        rect->height = -480;
-}
-
-extern int mdfld_dsi_dbi_dsr_off(struct drm_device *dev,
-                                struct psb_drm_dpu_rect *rect);
-extern int mdfld_dbi_dpu_report_damage(struct drm_device *dev,
-                                mdfld_plane_t plane,
-                                struct psb_drm_dpu_rect *rect);
-extern int mdfld_dbi_dpu_report_fullscreen_damage(struct drm_device *dev);
-extern int mdfld_dpu_exit_dsr(struct drm_device *dev);
-extern void mdfld_dbi_dpu_timer_start(struct mdfld_dbi_dpu_info *dpu_info);
-extern int mdfld_dbi_dpu_init(struct drm_device *dev);
-extern void mdfld_dbi_dpu_exit(struct drm_device *dev);
-extern void mdfld_dpu_update_panel(struct drm_device *dev);
-
-#endif /*__MDFLD_DSI_DBI_DPU_H__*/
diff --git a/drivers/staging/gma500/mdfld_dsi_dpi.c b/drivers/staging/gma500/mdfld_dsi_dpi.c
deleted file mode 100644
index e685f1217baa..000000000000
--- a/drivers/staging/gma500/mdfld_dsi_dpi.c
+++ /dev/null
@@ -1,805 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * jim liu <jim.liu@intel.com>
- * Jackie Li<yaodong.li@intel.com>
- */
-
-#include "mdfld_dsi_dpi.h"
-#include "mdfld_output.h"
-#include "mdfld_dsi_pkg_sender.h"
-
-
-static void mdfld_wait_for_HS_DATA_FIFO(struct drm_device *dev, u32 pipe)
-{
-        u32 gen_fifo_stat_reg = MIPIA_GEN_FIFO_STAT_REG;
-        int timeout = 0;
-
-        if (pipe == 2)
-                gen_fifo_stat_reg += MIPIC_REG_OFFSET;
-
-        udelay(500);
-
-        /* This will time out after approximately 2+ seconds */
-        while ((timeout < 20000) && (REG_READ(gen_fifo_stat_reg) & DSI_FIFO_GEN_HS_DATA_FULL)) {
-                udelay(100);
-                timeout++;
-        }
-
-        if (timeout == 20000)
-                dev_warn(dev->dev, "MIPI: HS Data FIFO was never cleared!\n");
-}
-
-static void mdfld_wait_for_HS_CTRL_FIFO(struct drm_device *dev, u32 pipe)
-{
-        u32 gen_fifo_stat_reg = MIPIA_GEN_FIFO_STAT_REG;
-        int timeout = 0;
-
-        if (pipe == 2)
-                gen_fifo_stat_reg += MIPIC_REG_OFFSET;
-
-        udelay(500);
-
-        /* This will time out after approximately 2+ seconds */
-        while ((timeout < 20000) && (REG_READ(gen_fifo_stat_reg) & DSI_FIFO_GEN_HS_CTRL_FULL)) {
-                udelay(100);
-                timeout++;
-        }
-        if (timeout == 20000)
-                dev_warn(dev->dev, "MIPI: HS CMD FIFO was never cleared!\n");
-}
-
-static void mdfld_wait_for_DPI_CTRL_FIFO(struct drm_device *dev, u32 pipe)
-{
-        u32 gen_fifo_stat_reg = MIPIA_GEN_FIFO_STAT_REG;
-        int timeout = 0;
-
-        if (pipe == 2)
-                gen_fifo_stat_reg += MIPIC_REG_OFFSET;
-
-        udelay(500);
-
-        /* This will time out after approximately 2+ seconds */
-        while ((timeout < 20000) && ((REG_READ(gen_fifo_stat_reg) & DPI_FIFO_EMPTY)
-                                                        != DPI_FIFO_EMPTY)) {
-                udelay(100);
-                timeout++;
-        }
-
-        if (timeout == 20000)
-                dev_warn(dev->dev, "MIPI: DPI FIFO was never cleared!\n");
-}
-
-static void mdfld_wait_for_SPL_PKG_SENT(struct drm_device *dev, u32 pipe)
-{
-        u32 intr_stat_reg = MIPIA_INTR_STAT_REG;
-        int timeout = 0;
-
-        if (pipe == 2)
-                intr_stat_reg += MIPIC_REG_OFFSET;
-
-        udelay(500);
-
-        /* This will time out after approximately 2+ seconds */
-        while ((timeout < 20000) && (!(REG_READ(intr_stat_reg) & DSI_INTR_STATE_SPL_PKG_SENT))) {
-                udelay(100);
-                timeout++;
-        }
-
-        if (timeout == 20000)
-                dev_warn(dev->dev, "MIPI: SPL_PKT_SENT_INTERRUPT was not sent successfully!\n");
-}
-
-
-/* ************************************************************************* *\
- * FUNCTION: mdfld_dsi_tpo_ic_init
- *
- * DESCRIPTION:  This function is called only by mrst_dsi_mode_set and
- *               restore_display_registers.  since this function does not
- *               acquire the mutex, it is important that the calling function
- *               does!
-\* ************************************************************************* */
-void mdfld_dsi_tpo_ic_init(struct mdfld_dsi_config *dsi_config, u32 pipe)
-{
-        struct drm_device *dev = dsi_config->dev;
-        u32 dcsChannelNumber = dsi_config->channel_num;
-        u32 gen_data_reg = MIPIA_HS_GEN_DATA_REG; 
-        u32 gen_ctrl_reg = MIPIA_HS_GEN_CTRL_REG;
-        u32 gen_ctrl_val = GEN_LONG_WRITE;
-
-        if (pipe == 2) {
-                gen_data_reg = HS_GEN_DATA_REG + MIPIC_REG_OFFSET; 
-                gen_ctrl_reg = HS_GEN_CTRL_REG + MIPIC_REG_OFFSET;
-        }
-
-        gen_ctrl_val |= dcsChannelNumber << DCS_CHANNEL_NUMBER_POS;
-
-        /* Flip page order */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x00008036);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x02 << WORD_COUNTS_POS));
-
-        /* 0xF0 */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x005a5af0);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x03 << WORD_COUNTS_POS));
-
-        /* Write protection key */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x005a5af1);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x03 << WORD_COUNTS_POS));
-
-        /* 0xFC */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x005a5afc);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x03 << WORD_COUNTS_POS));
-
-        /* 0xB7 */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x770000b7);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x00000044);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x05 << WORD_COUNTS_POS));
-
-        /* 0xB6 */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x000a0ab6);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x03 << WORD_COUNTS_POS));
-
-        /* 0xF2 */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x081010f2);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x4a070708);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x000000c5);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x09 << WORD_COUNTS_POS));
-
-        /* 0xF8 */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x024003f8);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x01030a04);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x0e020220);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x00000004);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x0d << WORD_COUNTS_POS));
-
-        /* 0xE2 */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x398fc3e2);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x0000916f);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x06 << WORD_COUNTS_POS));
-
-        /* 0xB0 */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x000000b0);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x02 << WORD_COUNTS_POS));
-
-        /* 0xF4 */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x240242f4);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x78ee2002);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x2a071050);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x507fee10);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x10300710);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x14 << WORD_COUNTS_POS));
-
-        /* 0xBA */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x19fe07ba);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x101c0a31);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x00000010);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x09 << WORD_COUNTS_POS));
-
-        /* 0xBB */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x28ff07bb);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x24280a31);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x00000034);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x09 << WORD_COUNTS_POS));
-
-        /* 0xFB */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x535d05fb);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x1b1a2130);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x221e180e);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x131d2120);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x535d0508);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x1c1a2131);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x231f160d);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x111b2220);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x535c2008);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x1f1d2433);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x2c251a10);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x2c34372d);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x00000023);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x31 << WORD_COUNTS_POS));
-
-        /* 0xFA */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x525c0bfa);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x1c1c232f);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x2623190e);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x18212625);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x545d0d0e);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x1e1d2333);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x26231a10);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x1a222725);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x545d280f);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x21202635);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x31292013);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x31393d33);
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x00000029);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x31 << WORD_COUNTS_POS));
-
-        /* Set DM */
-        mdfld_wait_for_HS_DATA_FIFO(dev, pipe);
-        REG_WRITE(gen_data_reg, 0x000100f7);
-        mdfld_wait_for_HS_CTRL_FIFO(dev, pipe);
-        REG_WRITE(gen_ctrl_reg, gen_ctrl_val | (0x03 << WORD_COUNTS_POS));
-}
-
-static u16 mdfld_dsi_dpi_to_byte_clock_count(int pixel_clock_count,
-                                                int num_lane, int bpp)
-{
-        return (u16)((pixel_clock_count * bpp) / (num_lane * 8)); 
-}
-
-/*
- * Calculate the dpi time basing on a given drm mode @mode
- * return 0 on success.
- * FIXME: I was using proposed mode value for calculation, may need to 
- * use crtc mode values later 
- */
-int mdfld_dsi_dpi_timing_calculation(struct drm_display_mode *mode, 
-                        struct mdfld_dsi_dpi_timing *dpi_timing,
-                        int num_lane, int bpp)
-{
-        int pclk_hsync, pclk_hfp, pclk_hbp, pclk_hactive;
-        int pclk_vsync, pclk_vfp, pclk_vbp, pclk_vactive;
-        
-        if(!mode || !dpi_timing) {
-                DRM_ERROR("Invalid parameter\n");
-                return -EINVAL;
-        }
-        
-        pclk_hactive = mode->hdisplay;
-        pclk_hfp = mode->hsync_start - mode->hdisplay;
-        pclk_hsync = mode->hsync_end - mode->hsync_start;
-        pclk_hbp = mode->htotal - mode->hsync_end;
-        
-        pclk_vactive = mode->vdisplay;
-        pclk_vfp = mode->vsync_start - mode->vdisplay;
-        pclk_vsync = mode->vsync_end - mode->vsync_start;
-        pclk_vbp = mode->vtotal - mode->vsync_end;
-
-        /*
-         * byte clock counts were calculated by following formula
-         * bclock_count = pclk_count * bpp / num_lane / 8
-         */
-        dpi_timing->hsync_count = mdfld_dsi_dpi_to_byte_clock_count(pclk_hsync, num_lane, bpp);
-        dpi_timing->hbp_count = mdfld_dsi_dpi_to_byte_clock_count(pclk_hbp, num_lane, bpp);
-        dpi_timing->hfp_count = mdfld_dsi_dpi_to_byte_clock_count(pclk_hfp, num_lane, bpp);
-        dpi_timing->hactive_count = mdfld_dsi_dpi_to_byte_clock_count(pclk_hactive, num_lane, bpp);
-        dpi_timing->vsync_count = mdfld_dsi_dpi_to_byte_clock_count(pclk_vsync, num_lane, bpp);
-        dpi_timing->vbp_count = mdfld_dsi_dpi_to_byte_clock_count(pclk_vbp, num_lane, bpp);
-        dpi_timing->vfp_count = mdfld_dsi_dpi_to_byte_clock_count(pclk_vfp, num_lane, bpp);
-
-        return 0; 
-}
-
-void mdfld_dsi_dpi_controller_init(struct mdfld_dsi_config *dsi_config, int pipe)
-{
-        struct drm_device *dev = dsi_config->dev;
-        u32 reg_offset = pipe ? MIPIC_REG_OFFSET : 0;
-        int lane_count = dsi_config->lane_count;
-        struct mdfld_dsi_dpi_timing dpi_timing;
-        struct drm_display_mode *mode = dsi_config->mode;
-        u32 val = 0;
-        
-        /*un-ready device*/
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset), 0x00000000);
-        
-        /*init dsi adapter before kicking off*/
-        REG_WRITE((MIPIA_CONTROL_REG + reg_offset), 0x00000018);
-        
-        /*enable all interrupts*/
-        REG_WRITE((MIPIA_INTR_EN_REG + reg_offset), 0xffffffff);
-        
-
-        /*set up func_prg*/
-        val |= lane_count;
-        val |= dsi_config->channel_num << DSI_DPI_VIRT_CHANNEL_OFFSET;
-                
-        switch(dsi_config->bpp) {
-        case 16:
-                val |= DSI_DPI_COLOR_FORMAT_RGB565;
-                break;
-        case 18:
-                val |= DSI_DPI_COLOR_FORMAT_RGB666;
-                break;
-        case 24:
-                val |= DSI_DPI_COLOR_FORMAT_RGB888;
-                break;
-        default:
-                DRM_ERROR("unsupported color format, bpp = %d\n", dsi_config->bpp);
-        }
-        REG_WRITE((MIPIA_DSI_FUNC_PRG_REG + reg_offset), val);
-        
-        REG_WRITE((MIPIA_HS_TX_TIMEOUT_REG + reg_offset), 
-                        (mode->vtotal * mode->htotal * dsi_config->bpp / (8 * lane_count)) & DSI_HS_TX_TIMEOUT_MASK);
-        REG_WRITE((MIPIA_LP_RX_TIMEOUT_REG + reg_offset), 0xffff & DSI_LP_RX_TIMEOUT_MASK);
-        
-        /*max value: 20 clock cycles of txclkesc*/
-        REG_WRITE((MIPIA_TURN_AROUND_TIMEOUT_REG + reg_offset), 0x14 & DSI_TURN_AROUND_TIMEOUT_MASK);
-        
-        /*min 21 txclkesc, max: ffffh*/
-        REG_WRITE((MIPIA_DEVICE_RESET_TIMER_REG + reg_offset), 0xffff & DSI_RESET_TIMER_MASK);
-
-        REG_WRITE((MIPIA_DPI_RESOLUTION_REG + reg_offset), mode->vdisplay << 16 | mode->hdisplay);
-        
-        /*set DPI timing registers*/
-        mdfld_dsi_dpi_timing_calculation(mode, &dpi_timing, dsi_config->lane_count, dsi_config->bpp);
-        
-        REG_WRITE((MIPIA_HSYNC_COUNT_REG + reg_offset), dpi_timing.hsync_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_HBP_COUNT_REG + reg_offset), dpi_timing.hbp_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_HFP_COUNT_REG + reg_offset), dpi_timing.hfp_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_HACTIVE_COUNT_REG + reg_offset), dpi_timing.hactive_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_VSYNC_COUNT_REG + reg_offset), dpi_timing.vsync_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_VBP_COUNT_REG + reg_offset), dpi_timing.vbp_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_VFP_COUNT_REG + reg_offset), dpi_timing.vfp_count & DSI_DPI_TIMING_MASK);
-        
-        REG_WRITE((MIPIA_HIGH_LOW_SWITCH_COUNT_REG + reg_offset), 0x46);
-        
-        /*min: 7d0 max: 4e20*/
-        REG_WRITE((MIPIA_INIT_COUNT_REG + reg_offset), 0x000007d0);
-        
-        /*set up video mode*/
-        val = 0;
-        val = dsi_config->video_mode | DSI_DPI_COMPLETE_LAST_LINE;
-        REG_WRITE((MIPIA_VIDEO_MODE_FORMAT_REG + reg_offset), val);
-        
-        REG_WRITE((MIPIA_EOT_DISABLE_REG + reg_offset), 0x00000000);
-        
-        REG_WRITE((MIPIA_LP_BYTECLK_REG + reg_offset), 0x00000004);
-        
-        /*TODO: figure out how to setup these registers*/
-        REG_WRITE((MIPIA_DPHY_PARAM_REG + reg_offset), 0x150c3408);
-        
-        REG_WRITE((MIPIA_CLK_LANE_SWITCH_TIME_CNT_REG + reg_offset), (0xa << 16) | 0x14);
-        /*set device ready*/
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset), 0x00000001);
-}
-
-void mdfld_dsi_dpi_turn_on(struct mdfld_dsi_dpi_output *output, int pipe)
-{
-        struct drm_device *dev = output->dev;
-        u32 reg_offset = 0;
-        
-        if(output->panel_on) 
-                return;
-                
-        if(pipe) 
-                reg_offset = MIPIC_REG_OFFSET;
-
-        /* clear special packet sent bit */
-        if(REG_READ(MIPIA_INTR_STAT_REG + reg_offset) & DSI_INTR_STATE_SPL_PKG_SENT) {
-                REG_WRITE((MIPIA_INTR_STAT_REG + reg_offset), DSI_INTR_STATE_SPL_PKG_SENT);
-        }
-                
-        /*send turn on package*/
-        REG_WRITE((MIPIA_DPI_CONTROL_REG + reg_offset), DSI_DPI_CTRL_HS_TURN_ON);
-        
-        /*wait for SPL_PKG_SENT interrupt*/
-        mdfld_wait_for_SPL_PKG_SENT(dev, pipe);
-        
-        if(REG_READ(MIPIA_INTR_STAT_REG + reg_offset) & DSI_INTR_STATE_SPL_PKG_SENT) {
-                REG_WRITE((MIPIA_INTR_STAT_REG + reg_offset), DSI_INTR_STATE_SPL_PKG_SENT);
-        }
-
-        output->panel_on = 1;
-
-        /* FIXME the following is disabled to WA the X slow start issue for TMD panel */
-        /* if(pipe == 2) */
-        /*      dev_priv->dpi_panel_on2 = true; */
-        /* else if (pipe == 0) */
-        /*      dev_priv->dpi_panel_on = true; */
-}
-
-static void mdfld_dsi_dpi_shut_down(struct mdfld_dsi_dpi_output *output, int pipe)
-{
-        struct drm_device *dev = output->dev;
-        u32 reg_offset = 0;
-        
-        /*if output is on, or mode setting didn't happen, ignore this*/
-        if((!output->panel_on) || output->first_boot) {
-                output->first_boot = 0; 
-                return;
-        }
-        
-        if(pipe)
-                reg_offset = MIPIC_REG_OFFSET;
-
-        /* Wait for dpi fifo to empty */
-        mdfld_wait_for_DPI_CTRL_FIFO(dev, pipe);
-
-        /* Clear the special packet interrupt bit if set */
-        if(REG_READ(MIPIA_INTR_STAT_REG + reg_offset) & DSI_INTR_STATE_SPL_PKG_SENT) {
-                REG_WRITE((MIPIA_INTR_STAT_REG + reg_offset), DSI_INTR_STATE_SPL_PKG_SENT);
-        }
-        
-        if(REG_READ(MIPIA_DPI_CONTROL_REG + reg_offset) == DSI_DPI_CTRL_HS_SHUTDOWN) {
-                dev_warn(dev->dev, "try to send the same package again, abort!");
-                goto shutdown_out;
-        }
-        
-        REG_WRITE((MIPIA_DPI_CONTROL_REG + reg_offset), DSI_DPI_CTRL_HS_SHUTDOWN);
-
-shutdown_out:
-        output->panel_on = 0;
-        output->first_boot = 0;
-
-        /* FIXME the following is disabled to WA the X slow start issue for TMD panel */
-        /* if(pipe == 2) */
-        /*      dev_priv->dpi_panel_on2 = false; */
-        /* else if (pipe == 0) */
-        /*      dev_priv->dpi_panel_on = false;  */
-        /* #ifdef CONFIG_PM_RUNTIME*/ 
-        /*      if (drm_psb_ospm && !enable_gfx_rtpm) { */
-        /*              pm_runtime_allow(&gpDrmDevice->pdev->dev); */
-        /*      schedule_delayed_work(&dev_priv->rtpm_work, 30 * 1000); */
-        /* } */
-        /*if (enable_gfx_rtpm) */
-        /*              pm_schedule_suspend(&dev->pdev->dev, gfxrtdelay); */
-        /* #endif */
-}
-
-void mdfld_dsi_dpi_set_power(struct drm_encoder *encoder, bool on)
-{
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dpi_output *dpi_output = MDFLD_DSI_DPI_OUTPUT(dsi_encoder);
-        struct mdfld_dsi_config *dsi_config = mdfld_dsi_encoder_get_config(dsi_encoder);
-        int pipe = mdfld_dsi_encoder_get_pipe(dsi_encoder);
-        struct drm_device *dev = dsi_config->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 mipi_reg = MIPI;
-        u32 pipeconf_reg = PIPEACONF;
-        
-        if(pipe) {
-                mipi_reg = MIPI_C;
-                pipeconf_reg = PIPECCONF;
-        }
-        
-        /* Start up display island if it was shutdown */
-        if (!gma_power_begin(dev, true))
-                return;
-
-        if(on) {
-                if (mdfld_get_panel_type(dev, pipe) == TMD_VID){
-                        mdfld_dsi_dpi_turn_on(dpi_output, pipe);
-                } else {
-                        /* Enable mipi port */
-                        REG_WRITE(mipi_reg, (REG_READ(mipi_reg) | (1 << 31)));
-                        REG_READ(mipi_reg);
-
-                        mdfld_dsi_dpi_turn_on(dpi_output, pipe);
-                        mdfld_dsi_tpo_ic_init(dsi_config, pipe);
-                }
-
-                if(pipe == 2) {
-                        dev_priv->dpi_panel_on2 = true;
-                }
-                else {
-                        dev_priv->dpi_panel_on  = true;
-                }
-
-        } else {
-                if (mdfld_get_panel_type(dev, pipe) == TMD_VID) {
-                        mdfld_dsi_dpi_shut_down(dpi_output, pipe);
-                } else {
-                        mdfld_dsi_dpi_shut_down(dpi_output, pipe);
-                        /* Disable mipi port */
-                        REG_WRITE(mipi_reg, (REG_READ(mipi_reg) & ~(1<<31)));
-                        REG_READ(mipi_reg);
-                }
-
-                if(pipe == 2)
-                        dev_priv->dpi_panel_on2 = false;
-                else
-                        dev_priv->dpi_panel_on  = false;
-        }
-        gma_power_end(dev);
-}
-
-void mdfld_dsi_dpi_dpms(struct drm_encoder *encoder, int mode)
-{
-        dev_dbg(encoder->dev->dev, "DPMS %s\n",
-                        (mode == DRM_MODE_DPMS_ON ? "on":"off"));
-
-        if (mode == DRM_MODE_DPMS_ON)
-                mdfld_dsi_dpi_set_power(encoder, true);
-        else {
-                mdfld_dsi_dpi_set_power(encoder, false);
-#if 0 /* FIXME */
-#ifdef CONFIG_PM_RUNTIME
-                if (enable_gfx_rtpm)
-                        pm_schedule_suspend(&gpDrmDevice->pdev->dev, gfxrtdelay);
-#endif
-#endif
-        }
-}
-
-bool mdfld_dsi_dpi_mode_fixup(struct drm_encoder *encoder,
-                                     struct drm_display_mode *mode,
-                                     struct drm_display_mode *adjusted_mode)
-{
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_config *dsi_config = mdfld_dsi_encoder_get_config(dsi_encoder);
-        struct drm_display_mode *fixed_mode = dsi_config->fixed_mode;
-
-        if(fixed_mode) {
-                adjusted_mode->hdisplay = fixed_mode->hdisplay;
-                adjusted_mode->hsync_start = fixed_mode->hsync_start;
-                adjusted_mode->hsync_end = fixed_mode->hsync_end;
-                adjusted_mode->htotal = fixed_mode->htotal;
-                adjusted_mode->vdisplay = fixed_mode->vdisplay;
-                adjusted_mode->vsync_start = fixed_mode->vsync_start;
-                adjusted_mode->vsync_end = fixed_mode->vsync_end;
-                adjusted_mode->vtotal = fixed_mode->vtotal;
-                adjusted_mode->clock = fixed_mode->clock;
-                drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
-        }
-        
-        return true;
-}
-
-void mdfld_dsi_dpi_prepare(struct drm_encoder *encoder) 
-{
-        mdfld_dsi_dpi_set_power(encoder, false);
-}
-
-void mdfld_dsi_dpi_commit(struct drm_encoder *encoder) 
-{
-        mdfld_dsi_dpi_set_power(encoder, true);
-}
-
-void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
-                                   struct drm_display_mode *mode,
-                                   struct drm_display_mode *adjusted_mode)
-{
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dpi_output *dpi_output = MDFLD_DSI_DPI_OUTPUT(dsi_encoder);
-        struct mdfld_dsi_config *dsi_config = mdfld_dsi_encoder_get_config(dsi_encoder);
-        struct drm_device *dev = dsi_config->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int pipe = mdfld_dsi_encoder_get_pipe(dsi_encoder);
-        
-        u32 pipeconf_reg = PIPEACONF;
-        u32 dspcntr_reg = DSPACNTR;
-        u32 mipi_reg = MIPI;
-        u32 reg_offset = 0;
-        
-        u32 pipeconf = dev_priv->pipeconf;
-        u32 dspcntr = dev_priv->dspcntr;
-        u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
-        
-        dev_dbg(dev->dev, "set mode %dx%d on pipe %d\n",
-                                mode->hdisplay, mode->vdisplay, pipe);
-
-        if(pipe) {
-                pipeconf_reg = PIPECCONF;
-                dspcntr_reg = DSPCCNTR;
-                mipi_reg = MIPI_C;
-                reg_offset = MIPIC_REG_OFFSET;
-        } else {
-                mipi |= 2;
-        }
-        
-        if (!gma_power_begin(dev, true))
-                return;
-
-        /* Set up mipi port FIXME: do at init time */
-        REG_WRITE(mipi_reg, mipi);
-        REG_READ(mipi_reg);
-
-        /* Set up DSI controller DPI interface */
-        mdfld_dsi_dpi_controller_init(dsi_config, pipe);
-
-        if (mdfld_get_panel_type(dev, pipe) != TMD_VID) {
-                /* Turn on DPI interface */
-                mdfld_dsi_dpi_turn_on(dpi_output, pipe);
-        }
-        
-        /* Set up pipe */
-        REG_WRITE(pipeconf_reg, pipeconf);
-        REG_READ(pipeconf_reg);
-        
-        /* Set up display plane */
-        REG_WRITE(dspcntr_reg, dspcntr);
-        REG_READ(dspcntr_reg);
-        
-        msleep(20); /* FIXME: this should wait for vblank */
-        
-        dev_dbg(dev->dev, "State %x, power %d\n",
-                REG_READ(MIPIA_INTR_STAT_REG + reg_offset),
-                dpi_output->panel_on);
-
-        if (mdfld_get_panel_type(dev, pipe) != TMD_VID) {
-                /* Init driver ic */
-                mdfld_dsi_tpo_ic_init(dsi_config, pipe);
-                /* Init backlight */
-                mdfld_dsi_brightness_init(dsi_config, pipe);
-        }
-        gma_power_end(dev);
-}
-
-
-/*
- * Init DSI DPI encoder. 
- * Allocate an mdfld_dsi_encoder and attach it to given @dsi_connector
- * return pointer of newly allocated DPI encoder, NULL on error
- */ 
-struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev, 
-                                struct mdfld_dsi_connector *dsi_connector,
-                                struct panel_funcs *p_funcs)
-{
-        struct mdfld_dsi_dpi_output *dpi_output = NULL;
-        struct mdfld_dsi_config *dsi_config;
-        struct drm_connector *connector = NULL;
-        struct drm_encoder *encoder = NULL;
-        struct drm_display_mode *fixed_mode = NULL;
-        int pipe;
-        u32 data;
-        int ret;
-
-        if (!dsi_connector || !p_funcs) {
-                WARN_ON(1);
-                return NULL;
-        }
-
-        dsi_config = mdfld_dsi_get_config(dsi_connector);
-        pipe = dsi_connector->pipe;
-
-        /* Panel hard-reset */
-        if (p_funcs->reset) {
-                ret = p_funcs->reset(pipe);
-                if (ret) {
-                        DRM_ERROR("Panel %d hard-reset failed\n", pipe);
-                        return NULL;
-                }
-        }
-
-        /* Panel drvIC init */
-        if (p_funcs->drv_ic_init)
-                p_funcs->drv_ic_init(dsi_config, pipe);
-
-        /* Panel power mode detect */
-        ret = mdfld_dsi_get_power_mode(dsi_config,
-                                        &data,
-                                        MDFLD_DSI_LP_TRANSMISSION);
-        if (ret) {
-                DRM_ERROR("Panel %d get power mode failed\n", pipe);
-                dsi_connector->status = connector_status_disconnected;
-        } else {
-                DRM_INFO("pipe %d power mode 0x%x\n", pipe, data);
-                dsi_connector->status = connector_status_connected;
-        }
-
-        dpi_output = kzalloc(sizeof(struct mdfld_dsi_dpi_output), GFP_KERNEL);
-        if(!dpi_output) {
-                dev_err(dev->dev, "No memory for dsi_dpi_output\n");
-                return NULL;
-        }
-
-        if(dsi_connector->pipe) 
-                dpi_output->panel_on = 0;
-        else
-                dpi_output->panel_on = 0;
-        
-        dpi_output->dev = dev;
-        dpi_output->p_funcs = p_funcs;
-        dpi_output->first_boot = 1;
-        
-        /* Get fixed mode */
-        dsi_config = mdfld_dsi_get_config(dsi_connector);
-        fixed_mode = dsi_config->fixed_mode;
-        
-        /* Create drm encoder object */
-        connector = &dsi_connector->base.base;
-        encoder = &dpi_output->base.base;
-        /*
-         * On existing hardware this will be a panel of some form,
-         * if future devices also have HDMI bridges this will need
-         * revisiting
-         */
-        drm_encoder_init(dev,
-                        encoder,
-                        p_funcs->encoder_funcs,
-                        DRM_MODE_ENCODER_LVDS);
-        drm_encoder_helper_add(encoder,
-                                p_funcs->encoder_helper_funcs);
-        
-        /* Attach to given connector */
-        drm_mode_connector_attach_encoder(connector, encoder);
-        
-        /* Set possible crtcs and clones */
-        if(dsi_connector->pipe) {
-                encoder->possible_crtcs = (1 << 2);
-                encoder->possible_clones = (1 << 1);
-        } else {
-                encoder->possible_crtcs = (1 << 0);
-                encoder->possible_clones = (1 << 0);
-        }
-        return &dpi_output->base;
-}
-
diff --git a/drivers/staging/gma500/mdfld_dsi_dpi.h b/drivers/staging/gma500/mdfld_dsi_dpi.h
deleted file mode 100644
index ed92d45ee74a..000000000000
--- a/drivers/staging/gma500/mdfld_dsi_dpi.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * jim liu <jim.liu@intel.com>
- * Jackie Li<yaodong.li@intel.com>
- */
-
-#ifndef __MDFLD_DSI_DPI_H__
-#define __MDFLD_DSI_DPI_H__
-
-#include "mdfld_dsi_output.h"
-#include "mdfld_output.h"
-
-struct mdfld_dsi_dpi_timing {
-        u16 hsync_count;
-        u16 hbp_count;
-        u16 hfp_count;
-        u16 hactive_count;
-        u16 vsync_count;
-        u16 vbp_count;
-        u16 vfp_count;
-};
-
-struct mdfld_dsi_dpi_output {
-        struct mdfld_dsi_encoder base;
-        struct drm_device *dev;
-
-        int panel_on;
-        int first_boot;
-
-        struct panel_funcs *p_funcs;
-};
-
-#define MDFLD_DSI_DPI_OUTPUT(dsi_encoder) \
-        container_of(dsi_encoder, struct mdfld_dsi_dpi_output, base)
-
-extern int mdfld_dsi_dpi_timing_calculation(struct drm_display_mode *mode,
-                        struct mdfld_dsi_dpi_timing *dpi_timing,
-                        int num_lane, int bpp);
-extern struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev,
-                        struct mdfld_dsi_connector *dsi_connector,
-                        struct panel_funcs *p_funcs);
-
-/* Medfield DPI helper functions */
-extern void mdfld_dsi_dpi_dpms(struct drm_encoder *encoder, int mode);
-extern bool mdfld_dsi_dpi_mode_fixup(struct drm_encoder *encoder,
-                        struct drm_display_mode *mode,
-                        struct drm_display_mode *adjusted_mode);
-extern void mdfld_dsi_dpi_prepare(struct drm_encoder *encoder);
-extern void mdfld_dsi_dpi_commit(struct drm_encoder *encoder);
-extern void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
-                        struct drm_display_mode *mode,
-                        struct drm_display_mode *adjusted_mode);
-extern void mdfld_dsi_dpi_turn_on(struct mdfld_dsi_dpi_output *output,
-                        int pipe);
-extern void mdfld_dsi_dpi_controller_init(struct mdfld_dsi_config *si_config,
-                        int pipe);
-#endif /*__MDFLD_DSI_DPI_H__*/
diff --git a/drivers/staging/gma500/mdfld_dsi_output.c b/drivers/staging/gma500/mdfld_dsi_output.c
deleted file mode 100644
index 3f979db2c3a5..000000000000
--- a/drivers/staging/gma500/mdfld_dsi_output.c
+++ /dev/null
@@ -1,1014 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * jim liu <jim.liu@intel.com>
- * Jackie Li<yaodong.li@intel.com>
- */
-
-#include "mdfld_dsi_output.h"
-#include "mdfld_dsi_dbi.h"
-#include "mdfld_dsi_dpi.h"
-#include "mdfld_output.h"
-#include <asm/intel_scu_ipc.h>
-#include "mdfld_dsi_pkg_sender.h"
-#include <linux/pm_runtime.h>
-#include <linux/moduleparam.h>
-
-#define MDFLD_DSI_BRIGHTNESS_MAX_LEVEL 100
-
-static int CABC_control = 1;
-static int LABC_control = 1;
-
-module_param (CABC_control, int, 0644);
-module_param (LABC_control, int, 0644);
-
-/**
- * make these MCS command global 
- * we don't need 'movl' everytime we send them.
- * FIXME: these datas were provided by OEM, we should get them from GCT.
- **/
-static u32 mdfld_dbi_mcs_hysteresis[] = {
-        0x42000f57, 0x8c006400, 0xff00bf00, 0xffffffff,
-        0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-        0x38000aff, 0x82005000, 0xff00ab00, 0xffffffff,
-        0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-        0x000000ff,
-};
-
-static u32 mdfld_dbi_mcs_display_profile[] = {
-        0x50281450, 0x0000c882, 0x00000000, 0x00000000,
-        0x00000000,
-};
-
-static u32 mdfld_dbi_mcs_kbbc_profile[] = {
-        0x00ffcc60, 0x00000000, 0x00000000, 0x00000000,
-}; 
-        
-static u32 mdfld_dbi_mcs_gamma_profile[] = {
-        0x81111158, 0x88888888, 0x88888888,
-}; 
-
-/*
- * write hysteresis values.
- */
-static void mdfld_dsi_write_hysteresis (struct mdfld_dsi_config *dsi_config,
-                                                                int pipe)
-{
-        struct mdfld_dsi_pkg_sender *sender = mdfld_dsi_get_pkg_sender(dsi_config);
-
-        if(!sender) {
-                WARN_ON(1);
-                return;
-        }
-        mdfld_dsi_send_mcs_long_hs(sender,
-                                   mdfld_dbi_mcs_hysteresis,
-                                   17,
-                                   MDFLD_DSI_SEND_PACKAGE);
-}
-
-/*
- * write display profile values.
- */
-static void mdfld_dsi_write_display_profile(struct mdfld_dsi_config *dsi_config, int pipe)
-{
-        struct mdfld_dsi_pkg_sender *sender = mdfld_dsi_get_pkg_sender(dsi_config);
-
-        if(!sender) {
-                WARN_ON(1);
-                return;
-        }
-        mdfld_dsi_send_mcs_long_hs(sender,
-                                   mdfld_dbi_mcs_display_profile,
-                                   5,
-                                   MDFLD_DSI_SEND_PACKAGE);
-}
-
-/*
- * write KBBC profile values.
- */
-static void mdfld_dsi_write_kbbc_profile (struct mdfld_dsi_config * dsi_config, int pipe)
-{
-        struct mdfld_dsi_pkg_sender *sender = mdfld_dsi_get_pkg_sender(dsi_config);
-
-        if(!sender) {
-                WARN_ON(1);
-                return;
-        }
-        mdfld_dsi_send_mcs_long_hs(sender,
-                                   mdfld_dbi_mcs_kbbc_profile,
-                                   4,
-                                   MDFLD_DSI_SEND_PACKAGE);
-}
-
-/*
- * write gamma setting.
- */
-static void mdfld_dsi_write_gamma_setting (struct mdfld_dsi_config *dsi_config, int pipe)
-{
-        struct mdfld_dsi_pkg_sender *sender = mdfld_dsi_get_pkg_sender(dsi_config);
-
-        if(!sender) {
-                WARN_ON(1);
-                return;
-        }
-        mdfld_dsi_send_mcs_long_hs(sender,
-                                   mdfld_dbi_mcs_gamma_profile,
-                                   3,
-                                   MDFLD_DSI_SEND_PACKAGE);
-}
-
-/*
- * Check and see if the generic control or data buffer is empty and ready.
- */
-void mdfld_dsi_gen_fifo_ready (struct drm_device *dev, u32 gen_fifo_stat_reg, u32 fifo_stat)
-{
-        u32 GEN_BF_time_out_count = 0;
-        
-        /* Check MIPI Adatper command registers */
-        for (GEN_BF_time_out_count = 0; GEN_BF_time_out_count < GEN_FB_TIME_OUT; GEN_BF_time_out_count++)
-        {
-                if ((REG_READ(gen_fifo_stat_reg) & fifo_stat) == fifo_stat)
-                        break;
-                udelay (100);
-        }
-
-        if (GEN_BF_time_out_count == GEN_FB_TIME_OUT)
-                dev_err(dev->dev,
-        "mdfld_dsi_gen_fifo_ready, Timeout. gen_fifo_stat_reg = 0x%x. \n",
-                                                gen_fifo_stat_reg);
-}
-
-/*
- * Manage the DSI MIPI keyboard and display brightness.
- * FIXME: this is exported to OSPM code. should work out an specific 
- * display interface to OSPM. 
- */
-void mdfld_dsi_brightness_init(struct mdfld_dsi_config *dsi_config, int pipe)
-{
-        struct mdfld_dsi_pkg_sender *sender = mdfld_dsi_get_pkg_sender(dsi_config);
-        struct drm_device *dev = sender->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 gen_ctrl_val;
-        
-        if(!sender) {
-                WARN_ON(1);
-                return;
-        }
-        /* Set default display backlight value to 85% (0xd8)*/
-        mdfld_dsi_send_mcs_short_hs(sender,
-                                    write_display_brightness,
-                                    0xd8,
-                                    1,
-                                    MDFLD_DSI_SEND_PACKAGE);
-
-        /* Set minimum brightness setting of CABC function to 20% (0x33)*/
-        mdfld_dsi_send_mcs_short_hs(sender,
-                                    write_cabc_min_bright,
-                                    0x33,
-                                    1,
-                                    MDFLD_DSI_SEND_PACKAGE);
-
-        mdfld_dsi_write_hysteresis(dsi_config, pipe);
-        mdfld_dsi_write_display_profile (dsi_config, pipe);
-        mdfld_dsi_write_kbbc_profile (dsi_config, pipe);
-        mdfld_dsi_write_gamma_setting (dsi_config, pipe);
-
-        /* Enable backlight or/and LABC */
-        gen_ctrl_val = BRIGHT_CNTL_BLOCK_ON | DISPLAY_DIMMING_ON| BACKLIGHT_ON;
-        if (LABC_control == 1 || CABC_control == 1)
-                gen_ctrl_val |= DISPLAY_DIMMING_ON| DISPLAY_BRIGHTNESS_AUTO | GAMMA_AUTO;
-
-        if (LABC_control == 1)
-                gen_ctrl_val |= AMBIENT_LIGHT_SENSE_ON;
-
-        dev_priv->mipi_ctrl_display = gen_ctrl_val;
-
-        mdfld_dsi_send_mcs_short_hs(sender,
-                                    write_ctrl_display,
-                                    (u8)gen_ctrl_val,
-                                    1,
-                                    MDFLD_DSI_SEND_PACKAGE);
-
-        if (CABC_control == 0)
-                return;
-        mdfld_dsi_send_mcs_short_hs(sender,
-                                    write_ctrl_cabc,
-                                    UI_IMAGE,
-                                    1,
-                                    MDFLD_DSI_SEND_PACKAGE);
-}
-
-/*
- * Manage the mipi display brightness.
- * TODO: refine this interface later
- */
-void mdfld_dsi_brightness_control(struct drm_device *dev, int pipe, int level)
-{
-        struct mdfld_dsi_pkg_sender *sender;
-        struct drm_psb_private *dev_priv;
-        struct mdfld_dsi_config *dsi_config;
-        u32 gen_ctrl_val;
-        int p_type;     
-        
-        if (!dev || (pipe != 0 && pipe != 2)) {
-                dev_err(dev->dev, "Invalid parameter\n");
-                return;
-        }
-
-        p_type = mdfld_get_panel_type(dev, 0);
-
-        dev_priv = dev->dev_private;
-
-        if(pipe)
-                dsi_config = dev_priv->dsi_configs[1];
-        else
-                dsi_config = dev_priv->dsi_configs[0];
-
-        sender = mdfld_dsi_get_pkg_sender(dsi_config);
-
-        if(!sender) {
-                WARN_ON(1);
-                return;
-        }
-
-        gen_ctrl_val = ((level * 0xff) / MDFLD_DSI_BRIGHTNESS_MAX_LEVEL) & 0xff;
-
-        dev_dbg(dev->dev,
-                "pipe = %d, gen_ctrl_val = %d.  \n", pipe, gen_ctrl_val);
-        
-        if(p_type == TMD_VID || p_type == TMD_CMD){
-                /* Set display backlight value */
-                mdfld_dsi_send_mcs_short_hs(sender, 
-                                        tmd_write_display_brightness, 
-                                        (u8)gen_ctrl_val, 
-                                         1, 
-                                        MDFLD_DSI_SEND_PACKAGE);                
-        } else {                        
-                /* Set display backlight value */
-                mdfld_dsi_send_mcs_short_hs(sender,
-                                    write_display_brightness,
-                                    (u8)gen_ctrl_val,
-                                    1,
-                                    MDFLD_DSI_SEND_PACKAGE);
-
-
-                /* Enable backlight control */
-                if (level == 0)
-                        gen_ctrl_val = 0;
-                else 
-                        gen_ctrl_val = dev_priv->mipi_ctrl_display;
-
-                mdfld_dsi_send_mcs_short_hs(sender,
-                                    write_ctrl_display,
-                                   (u8)gen_ctrl_val,
-                                   1,
-                                   MDFLD_DSI_SEND_PACKAGE);
-        }
-}
-
-/*
- * shut down DSI controller
- */ 
-void mdfld_dsi_controller_shutdown(struct mdfld_dsi_config * dsi_config, int pipe)
-{
-        struct drm_device * dev;
-        u32 reg_offset = pipe ? MIPIC_REG_OFFSET : 0;
-        int retry = 100;
-        
-        if (!dsi_config) {
-                WARN_ON(1);
-                return;
-        }
-        
-        dev = dsi_config->dev;
-        
-        if (!gma_power_begin(dev, true)) {
-                dev_err(dev->dev, "hw begin failed\n");
-                return;
-        }
-                
-        if(!(REG_READ(MIPIA_DEVICE_READY_REG + reg_offset) &  DSI_DEVICE_READY)) 
-                goto shutdown_out;
-        
-        /* Send shut down package, clean packet send bit first */
-        if(REG_READ(MIPIA_INTR_STAT_REG + reg_offset) & DSI_INTR_STATE_SPL_PKG_SENT) {
-                REG_WRITE((MIPIA_INTR_STAT_REG + reg_offset), 
-                                (REG_READ(MIPIA_INTR_STAT_REG + reg_offset) | DSI_INTR_STATE_SPL_PKG_SENT));
-        }
-        
-        /*send shut down package in HS*/
-        REG_WRITE((MIPIA_DPI_CONTROL_REG + reg_offset), DSI_DPI_CTRL_HS_SHUTDOWN);
-        
-        
-        /*
-         * make sure shut down is sent.
-         * FIXME: add max retry counter
-         */
-        while(!(REG_READ(MIPIA_INTR_STAT_REG + reg_offset) & DSI_INTR_STATE_SPL_PKG_SENT)) {
-                retry--;
-                
-                if(!retry) {
-                        dev_err(dev->dev, "timeout\n");
-                        break;
-                }
-        }
-        
-        /*sleep 1 ms to ensure shutdown finished*/
-        msleep(100);
-        
-        /*un-ready device*/
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset),
-                           (REG_READ(MIPIA_DEVICE_READY_REG + reg_offset) & ~DSI_DEVICE_READY));
-
-shutdown_out:                      
-        gma_power_end(dev);
-}
-
-void mdfld_dsi_controller_startup(struct mdfld_dsi_config * dsi_config, int pipe)
-{
-        struct drm_device * dev;
-        u32 reg_offset = pipe ? MIPIC_REG_OFFSET : 0;
-        int retry = 100;
-        
-        
-        if (!dsi_config) {
-                WARN_ON(1);
-                return;
-        }
-        
-        dev = dsi_config->dev;
-        dev_dbg(dev->dev, "starting up DSI controller on pipe %d...\n", pipe);
-        
-        if (!gma_power_begin(dev, true)) {
-                dev_err(dev->dev, "hw begin failed\n");
-                return;
-        }
-        
-        if((REG_READ(MIPIA_DEVICE_READY_REG + reg_offset) & DSI_DEVICE_READY)) 
-                goto startup_out;
-        
-        /*if config DPI, turn on DPI interface*/
-        if(dsi_config->type == MDFLD_DSI_ENCODER_DPI) {
-                if(REG_READ(MIPIA_INTR_STAT_REG + reg_offset) & DSI_INTR_STATE_SPL_PKG_SENT) {
-                        REG_WRITE((MIPIA_INTR_STAT_REG + reg_offset), DSI_INTR_STATE_SPL_PKG_SENT);
-                }
-                
-                REG_WRITE((MIPIA_DPI_CONTROL_REG + reg_offset), DSI_DPI_CTRL_HS_TURN_ON);
-                
-                /*
-                 * make sure shut down is sent.
-                 * FIXME: add max retry counter
-                 */
-                while(!(REG_READ(MIPIA_INTR_STAT_REG + reg_offset) & DSI_INTR_STATE_SPL_PKG_SENT)) {
-                        retry--;
-                        if(!retry) {
-                                dev_err(dev->dev, "timeout\n");
-                                break;
-                        }
-                }
-                
-                msleep(100);
-        }
-        
-        /*set device ready*/
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset),
-                           (REG_READ(MIPIA_DEVICE_READY_REG + reg_offset) | DSI_DEVICE_READY));
-
-startup_out:    
-        gma_power_end(dev);
-}
-
-
-static int mdfld_dsi_get_panel_status(struct mdfld_dsi_config *dsi_config,
-                                        u8 dcs,
-                                        u32 *data,
-                                        u8 transmission)
-{
-        struct mdfld_dsi_pkg_sender *sender
-                = mdfld_dsi_get_pkg_sender(dsi_config);
-
-        if (!sender || !data) {
-                DRM_ERROR("Invalid parameter\n");
-                return -EINVAL;
-        }
-
-        if (transmission == MDFLD_DSI_HS_TRANSMISSION)
-                return mdfld_dsi_read_mcs_hs(sender, dcs, data, 1);
-        else if (transmission == MDFLD_DSI_LP_TRANSMISSION)
-                return mdfld_dsi_read_mcs_lp(sender, dcs, data, 1);
-        else
-                return -EINVAL;
-}
-
-int mdfld_dsi_get_power_mode(struct mdfld_dsi_config *dsi_config,
-                                u32 *mode,
-                                u8 transmission)
-{
-        if (!dsi_config || !mode) {
-                DRM_ERROR("Invalid parameter\n");
-                return -EINVAL;
-        }
-
-        return mdfld_dsi_get_panel_status(dsi_config, 0x0a, mode, transmission);
-}
-
-int mdfld_dsi_get_diagnostic_result(struct mdfld_dsi_config *dsi_config,
-                                        u32 *result,
-                                        u8 transmission)
-{
-        if (!dsi_config || !result) {
-                DRM_ERROR("Invalid parameter\n");
-                return -EINVAL;
-        }
-
-        return mdfld_dsi_get_panel_status(dsi_config, 0x0f, result,
-                                          transmission);
-}
-
-/*
- * NOTE: this function was used by OSPM.
- * TODO: will be removed later, should work out display interfaces for OSPM
- */
-void mdfld_dsi_controller_init(struct mdfld_dsi_config * dsi_config, int pipe)
-{
-        if(!dsi_config || ((pipe != 0) && (pipe != 2))) {
-                WARN_ON(1);
-                return;
-        }
-
-        if(dsi_config->type)
-                mdfld_dsi_dpi_controller_init(dsi_config, pipe);
-        else
-                mdfld_dsi_controller_dbi_init(dsi_config, pipe);
-}
-
-static void mdfld_dsi_connector_save(struct drm_connector * connector)
-{
-}
-
-static void mdfld_dsi_connector_restore(struct drm_connector * connector)
-{
-}
-
-static enum drm_connector_status mdfld_dsi_connector_detect(struct drm_connector * connector, bool force)
-{
-        struct psb_intel_output *psb_output
-                                        = to_psb_intel_output(connector);
-        struct mdfld_dsi_connector *dsi_connector
-                                        = MDFLD_DSI_CONNECTOR(psb_output);
-        return dsi_connector->status;
-}
-
-static int mdfld_dsi_connector_set_property(struct drm_connector *connector,
-                                        struct drm_property *property,
-                                        uint64_t value)
-{
-        struct drm_encoder *encoder = connector->encoder;
-
-        if (!strcmp(property->name, "scaling mode") && encoder) {
-                struct psb_intel_crtc * psb_crtc = to_psb_intel_crtc(encoder->crtc);
-                bool bTransitionFromToCentered;
-                uint64_t curValue;
-
-                if (!psb_crtc)
-                        goto set_prop_error;
-
-                switch (value) {
-                case DRM_MODE_SCALE_FULLSCREEN:
-                        break;
-                case DRM_MODE_SCALE_NO_SCALE:
-                        break;
-                case DRM_MODE_SCALE_ASPECT:
-                        break;
-                default:
-                        goto set_prop_error;
-                }
-
-                if (drm_connector_property_get_value(connector, property, &curValue))
-                        goto set_prop_error;
-
-                if (curValue == value)
-                        goto set_prop_done;
-
-                if (drm_connector_property_set_value(connector, property, value))
-                        goto set_prop_error;
-
-                bTransitionFromToCentered = (curValue == DRM_MODE_SCALE_NO_SCALE) ||
-                        (value == DRM_MODE_SCALE_NO_SCALE);
-
-                if (psb_crtc->saved_mode.hdisplay != 0 &&
-                    psb_crtc->saved_mode.vdisplay != 0) {
-                        if (bTransitionFromToCentered) {
-                                if (!drm_crtc_helper_set_mode(encoder->crtc, &psb_crtc->saved_mode,
-                                            encoder->crtc->x, encoder->crtc->y, encoder->crtc->fb))
-                                        goto set_prop_error;
-                        } else {
-                                struct drm_encoder_helper_funcs *pEncHFuncs  = encoder->helper_private;
-                                pEncHFuncs->mode_set(encoder, &psb_crtc->saved_mode,
-                                                     &psb_crtc->saved_adjusted_mode);
-                        }
-                }
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-        } else if (!strcmp(property->name, "backlight") && encoder) {
-                struct drm_psb_private *dev_priv = encoder->dev->dev_private;
-                struct backlight_device *psb_bd = dev_priv->backlight_device;
-                dev_dbg(encoder->dev->dev, "backlight level = %d\n", (int)value);
-                if (drm_connector_property_set_value(connector, property, value))
-                        goto set_prop_error;
-                else {
-                        dev_dbg(encoder->dev->dev,
-                                        "set brightness to %d", (int)value);
-                        if (psb_bd) {
-                                psb_bd->props.brightness = value;
-                                backlight_update_status(psb_bd);
-                        }
-                }
-#endif
-        }
-set_prop_done:
-    return 0;
-set_prop_error:
-    return -1;
-}
-
-static void mdfld_dsi_connector_destroy(struct drm_connector *connector)
-{
-        struct psb_intel_output * psb_output = to_psb_intel_output(connector);
-        struct mdfld_dsi_connector * dsi_connector = MDFLD_DSI_CONNECTOR(psb_output);
-        struct mdfld_dsi_pkg_sender * sender;
-        
-        if(!dsi_connector)
-                return;
-        
-        drm_sysfs_connector_remove(connector);
-        drm_connector_cleanup(connector);
-        
-        sender = dsi_connector->pkg_sender;
-
-        mdfld_dsi_pkg_sender_destroy(sender);
-
-        kfree(dsi_connector);
-}
-
-static int mdfld_dsi_connector_get_modes(struct drm_connector * connector)
-{
-        struct psb_intel_output * psb_output = to_psb_intel_output(connector);
-        struct mdfld_dsi_connector * dsi_connector = MDFLD_DSI_CONNECTOR(psb_output);
-        struct mdfld_dsi_config * dsi_config = mdfld_dsi_get_config(dsi_connector);
-        struct drm_display_mode * fixed_mode = dsi_config->fixed_mode;
-        struct drm_display_mode * dup_mode = NULL;
-        struct drm_device * dev = connector->dev;
-        
-        connector->display_info.min_vfreq = 0;
-        connector->display_info.max_vfreq = 200;
-        connector->display_info.min_hfreq = 0;
-        connector->display_info.max_hfreq = 200;
-
-        if(fixed_mode) {
-                dev_dbg(dev->dev, "fixed_mode %dx%d\n",
-                        fixed_mode->hdisplay, fixed_mode->vdisplay);
-                
-                dup_mode = drm_mode_duplicate(dev, fixed_mode);
-                drm_mode_probed_add(connector, dup_mode);
-                return 1;
-        }
-        dev_err(dev->dev, "Didn't get any modes!\n");
-        return 0;
-}
-
-static int mdfld_dsi_connector_mode_valid(struct drm_connector * connector, struct drm_display_mode * mode)
-{
-        struct psb_intel_output * psb_output = to_psb_intel_output(connector);
-        struct mdfld_dsi_connector * dsi_connector = MDFLD_DSI_CONNECTOR(psb_output);
-        struct mdfld_dsi_config * dsi_config = mdfld_dsi_get_config(dsi_connector);
-        struct drm_display_mode * fixed_mode = dsi_config->fixed_mode;
-
-        dev_dbg(connector->dev->dev, "mode %p, fixed mode %p\n",
-                                                        mode, fixed_mode);
-
-        if(mode->flags & DRM_MODE_FLAG_DBLSCAN) 
-                return MODE_NO_DBLESCAN;
-
-        if(mode->flags & DRM_MODE_FLAG_INTERLACE)
-                return MODE_NO_INTERLACE;
-
-        /**
-         * FIXME: current DC has no fitting unit, reject any mode setting request
-         * will figure out a way to do up-scaling(pannel fitting) later.  
-         **/
-        if(fixed_mode) {
-                if(mode->hdisplay != fixed_mode->hdisplay)
-                        return MODE_PANEL;
-
-                if(mode->vdisplay != fixed_mode->vdisplay)
-                        return MODE_PANEL;
-        }
-        dev_dbg(connector->dev->dev, "mode ok\n");
-
-        return MODE_OK;
-}
-
-static void mdfld_dsi_connector_dpms(struct drm_connector *connector, int mode)
-{
-#ifdef CONFIG_PM_RUNTIME
-        struct drm_device * dev = connector->dev;
-        struct drm_psb_private * dev_priv = dev->dev_private;
-        bool panel_on, panel_on2;
-#endif
-        /* First, execute DPMS */
-        drm_helper_connector_dpms(connector, mode);
-
-#ifdef CONFIG_PM_RUNTIME
-        if(mdfld_panel_dpi(dev)) {
-                /* DPI panel */
-                panel_on = dev_priv->dpi_panel_on;
-                panel_on2 = dev_priv->dpi_panel_on2;
-        } else {
-                /* DBI panel */
-                panel_on = dev_priv->dbi_panel_on;
-                panel_on2 = dev_priv->dbi_panel_on2;
-        }
-
-        /* Then check all display panels + monitors status */
-        /* Make sure that the Display (B) sub-system status isn't i3 when
-         * R/W the DC register, otherwise "Fabric error" issue would occur
-         * during S0i3 state. */
-        if(!panel_on && !panel_on2 && !(REG_READ(HDMIB_CONTROL)
-                                                & HDMIB_PORT_EN)) {
-                /* Request rpm idle */
-                if(dev_priv->rpm_enabled)
-                        pm_request_idle(&dev->pdev->dev);
-        }
-        /*
-         * if rpm wasn't enabled yet, try to allow it
-         * FIXME: won't enable rpm for DPI since DPI
-         * CRTC setting is a little messy now.
-         * Enable it later!
-         */
-#if 0
-        if(!dev_priv->rpm_enabled && !mdfld_panel_dpi(dev))
-                ospm_runtime_pm_allow(dev);
-#endif
-#endif
-}
-
-static struct drm_encoder *mdfld_dsi_connector_best_encoder(
-                                        struct drm_connector *connector) 
-{
-        struct psb_intel_output * psb_output = to_psb_intel_output(connector);
-        struct mdfld_dsi_connector * dsi_connector = MDFLD_DSI_CONNECTOR(psb_output);
-        struct mdfld_dsi_config * dsi_config = mdfld_dsi_get_config(dsi_connector);
-        struct mdfld_dsi_encoder * encoder = NULL;
-        
-        if(dsi_config->type == MDFLD_DSI_ENCODER_DBI) 
-                encoder = dsi_config->encoders[MDFLD_DSI_ENCODER_DBI];
-        else if (dsi_config->type == MDFLD_DSI_ENCODER_DPI) 
-                encoder = dsi_config->encoders[MDFLD_DSI_ENCODER_DPI];
-        
-        dev_dbg(connector->dev->dev, "get encoder %p\n", encoder);
-        
-        if(!encoder) {
-                dev_err(connector->dev->dev,
-                        "Invalid encoder for type %d\n", dsi_config->type);
-                return NULL;
-        }
-        dsi_config->encoder = encoder;  
-        return &encoder->base;  
-}
-
-/* DSI connector funcs */
-static const struct drm_connector_funcs mdfld_dsi_connector_funcs = {
-        .dpms = /*drm_helper_connector_dpms*/mdfld_dsi_connector_dpms,
-        .save = mdfld_dsi_connector_save,
-        .restore = mdfld_dsi_connector_restore,
-        .detect = mdfld_dsi_connector_detect,
-        .fill_modes = drm_helper_probe_single_connector_modes,
-        .set_property = mdfld_dsi_connector_set_property,
-        .destroy = mdfld_dsi_connector_destroy,
-};
-
-/* DSI connector helper funcs */
-static const struct drm_connector_helper_funcs mdfld_dsi_connector_helper_funcs = {
-        .get_modes = mdfld_dsi_connector_get_modes,
-        .mode_valid = mdfld_dsi_connector_mode_valid,
-        .best_encoder = mdfld_dsi_connector_best_encoder,
-};
-
-static int mdfld_dsi_get_default_config(struct drm_device * dev, 
-                                                                                struct mdfld_dsi_config * config, int pipe)
-{
-        if(!dev || !config) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-        
-        config->bpp = 24;
-        config->type = mdfld_panel_dpi(dev);
-        config->lane_count = 2;
-        config->channel_num = 0;
-        /*NOTE: video mode is ignored when type is MDFLD_DSI_ENCODER_DBI*/
-        if (mdfld_get_panel_type(dev, pipe) == TMD_VID) {
-                config->video_mode = MDFLD_DSI_VIDEO_NON_BURST_MODE_SYNC_PULSE;
-        } else {
-                config->video_mode = MDFLD_DSI_VIDEO_BURST_MODE;
-        }
-        
-        return 0;
-}
-
-/*
- * Returns the panel fixed mode from configuration. 
- */
-struct drm_display_mode *
-mdfld_dsi_get_configuration_mode(struct mdfld_dsi_config * dsi_config, int pipe)
-{
-        struct drm_device *dev = dsi_config->dev;
-        struct drm_display_mode *mode;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_timing_info *ti = &dev_priv->gct_data.DTD;
-        bool use_gct = false;
-
-        mode = kzalloc(sizeof(*mode), GFP_KERNEL);
-        if (!mode) {
-                dev_err(dev->dev, "Out of memory for mode\n");
-                return NULL;
-        }
-        if (use_gct) {
-                dev_dbg(dev->dev, "gct find MIPI panel.\n");
-
-                mode->hdisplay = (ti->hactive_hi << 8) | ti->hactive_lo;
-                mode->vdisplay = (ti->vactive_hi << 8) | ti->vactive_lo;
-                mode->hsync_start = mode->hdisplay + \
-                                ((ti->hsync_offset_hi << 8) | \
-                                ti->hsync_offset_lo);
-                mode->hsync_end = mode->hsync_start + \
-                                ((ti->hsync_pulse_width_hi << 8) | \
-                                ti->hsync_pulse_width_lo);
-                mode->htotal = mode->hdisplay + ((ti->hblank_hi << 8) | \
-                                                                ti->hblank_lo);
-                mode->vsync_start = \
-                        mode->vdisplay + ((ti->vsync_offset_hi << 8) | \
-                                                ti->vsync_offset_lo);
-                mode->vsync_end = \
-                        mode->vsync_start + ((ti->vsync_pulse_width_hi << 8) | \
-                                                ti->vsync_pulse_width_lo);
-                mode->vtotal = mode->vdisplay + \
-                                ((ti->vblank_hi << 8) | ti->vblank_lo);
-                mode->clock = ti->pixel_clock * 10;
-        } else {
-                if(dsi_config->type == MDFLD_DSI_ENCODER_DPI) { 
-                        if (mdfld_get_panel_type(dev, pipe) == TMD_VID) {
-                                mode->hdisplay = 480;
-                                mode->vdisplay = 854;
-                                mode->hsync_start = 487;
-                                mode->hsync_end = 490;
-                                mode->htotal = 499;
-                                mode->vsync_start = 861;
-                                mode->vsync_end = 865;
-                                mode->vtotal = 873;
-                                mode->clock = 33264;
-                        } else {
-                                mode->hdisplay = 864;
-                                mode->vdisplay = 480;
-                                mode->hsync_start = 873;
-                                mode->hsync_end = 876;
-                                mode->htotal = 887;
-                                mode->vsync_start = 487;
-                                mode->vsync_end = 490;
-                                mode->vtotal = 499;
-                                mode->clock = 33264;
-                        }
-                } else if(dsi_config->type == MDFLD_DSI_ENCODER_DBI) {
-                        mode->hdisplay = 864;
-                        mode->vdisplay = 480;
-                        mode->hsync_start = 872;
-                        mode->hsync_end = 876;
-                        mode->htotal = 884;
-                        mode->vsync_start = 482;
-                        mode->vsync_end = 494;
-                        mode->vtotal = 486;
-                        mode->clock = 25777;
-                        
-                }
-        }
-
-        drm_mode_set_name(mode);
-        drm_mode_set_crtcinfo(mode, 0);
-        
-        mode->type |= DRM_MODE_TYPE_PREFERRED;
-
-        return mode;
-}
-
-int mdfld_dsi_panel_reset(int pipe)
-{
-        unsigned gpio;
-        int ret = 0;
-
-        switch (pipe) {
-        case 0:
-                gpio = 128;
-                break;
-        case 2:
-                gpio = 34;
-                break;
-        default:
-                DRM_ERROR("Invalid output\n");
-                return -EINVAL;
-        }
-
-        ret = gpio_request(gpio, "gfx");
-        if (ret) {
-                DRM_ERROR("gpio_rqueset failed\n");
-                return ret;
-        }
-
-        ret = gpio_direction_output(gpio, 1);
-        if (ret) {
-                DRM_ERROR("gpio_direction_output failed\n");
-                goto gpio_error;
-        }
-
-        gpio_get_value(128);
-
-gpio_error:
-        if (gpio_is_valid(gpio))
-                gpio_free(gpio);
-
-        return ret;
-}
-
-/*
- * MIPI output init
- * @dev drm device
- * @pipe pipe number. 0 or 2
- * @config 
- * 
- * Do the initialization of a MIPI output, including create DRM mode objects
- * initialization of DSI output on @pipe 
- */
-void mdfld_dsi_output_init(struct drm_device *dev,
-                           int pipe, 
-                           struct mdfld_dsi_config *config,
-                           struct panel_funcs* p_cmd_funcs,
-                           struct panel_funcs* p_vid_funcs)
-{
-        struct mdfld_dsi_config * dsi_config;
-        struct mdfld_dsi_connector * dsi_connector;
-        struct psb_intel_output * psb_output;
-        struct drm_connector * connector;
-        struct mdfld_dsi_encoder * encoder;
-        struct drm_psb_private * dev_priv = dev->dev_private;
-        struct panel_info dsi_panel_info;
-        u32 width_mm, height_mm;
-
-        dev_dbg(dev->dev, "init DSI output on pipe %d\n", pipe);
-        
-        if(!dev || ((pipe != 0) && (pipe != 2))) {
-                WARN_ON(1);
-                return;
-        }
-        
-        /*create a new connetor*/
-        dsi_connector = kzalloc(sizeof(struct mdfld_dsi_connector), GFP_KERNEL);
-        if(!dsi_connector) {
-                DRM_ERROR("No memory");
-                return;
-        }
-        
-        dsi_connector->pipe =  pipe;
-        
-        /*set DSI config*/
-        if(config) { 
-                dsi_config = config;
-        } else {
-                dsi_config = kzalloc(sizeof(struct mdfld_dsi_config), GFP_KERNEL);
-                if(!dsi_config) {
-                        dev_err(dev->dev,
-                                "cannot allocate memory for DSI config\n");
-                        goto dsi_init_err0;
-                }
-                
-                mdfld_dsi_get_default_config(dev, dsi_config, pipe);
-        }
-        
-        dsi_connector->private = dsi_config;
-        
-        dsi_config->changed = 1;
-        dsi_config->dev = dev;
-        
-        /* Init fixed mode basing on DSI config type */
-        if(dsi_config->type == MDFLD_DSI_ENCODER_DBI) {
-                dsi_config->fixed_mode = p_cmd_funcs->get_config_mode(dev);
-                if(p_cmd_funcs->get_panel_info(dev, pipe, &dsi_panel_info))
-                        goto dsi_init_err0;
-        } else if(dsi_config->type == MDFLD_DSI_ENCODER_DPI) {
-                dsi_config->fixed_mode = p_vid_funcs->get_config_mode(dev);
-                if(p_vid_funcs->get_panel_info(dev, pipe, &dsi_panel_info))
-                        goto dsi_init_err0;
-        }
-
-        width_mm = dsi_panel_info.width_mm;
-        height_mm = dsi_panel_info.height_mm;
-
-        dsi_config->mode = dsi_config->fixed_mode;
-        dsi_config->connector = dsi_connector;
-        
-        if(!dsi_config->fixed_mode) {
-                dev_err(dev->dev, "No pannel fixed mode was found\n");
-                goto dsi_init_err0;
-        }
-        
-        if(pipe && dev_priv->dsi_configs[0]) {
-                dsi_config->dvr_ic_inited = 0;
-                dev_priv->dsi_configs[1] = dsi_config;
-        } else if(pipe == 0) {
-                dsi_config->dvr_ic_inited = 1;
-                dev_priv->dsi_configs[0] = dsi_config;
-        } else {
-                dev_err(dev->dev, "Trying to init MIPI1 before MIPI0\n");
-                goto dsi_init_err0;
-        }
-
-        /*init drm connector object*/
-        psb_output = &dsi_connector->base;
-        
-        psb_output->type = (pipe == 0) ? INTEL_OUTPUT_MIPI : INTEL_OUTPUT_MIPI2;
-
-        connector = &psb_output->base;
-        /* Revisit type if MIPI/HDMI bridges ever appear on Medfield */
-        drm_connector_init(dev, connector, &mdfld_dsi_connector_funcs,
-                                                DRM_MODE_CONNECTOR_LVDS);
-        drm_connector_helper_add(connector, &mdfld_dsi_connector_helper_funcs);
-        
-        connector->display_info.subpixel_order = SubPixelHorizontalRGB;
-        connector->display_info.width_mm = width_mm;
-        connector->display_info.height_mm = height_mm;
-        connector->interlace_allowed = false;
-        connector->doublescan_allowed = false;
-        
-        /* Attach properties */
-        drm_connector_attach_property(connector, dev->mode_config.scaling_mode_property, DRM_MODE_SCALE_FULLSCREEN);
-        drm_connector_attach_property(connector, dev_priv->backlight_property, MDFLD_DSI_BRIGHTNESS_MAX_LEVEL);
-
-        /* Init DSI package sender on this output */
-        if (mdfld_dsi_pkg_sender_init(dsi_connector, pipe)) {
-                DRM_ERROR("Package Sender initialization failed on pipe %d\n", pipe);
-                goto dsi_init_err0;
-        }
-
-        /* Init DBI & DPI encoders */
-        if (p_cmd_funcs) {
-                encoder = mdfld_dsi_dbi_init(dev, dsi_connector, p_cmd_funcs);
-                if(!encoder) {
-                        dev_err(dev->dev, "Create DBI encoder failed\n");
-                        goto dsi_init_err1;
-                }
-                encoder->private = dsi_config;
-                dsi_config->encoders[MDFLD_DSI_ENCODER_DBI] = encoder;
-        }
-        
-        if(p_vid_funcs) {
-                encoder = mdfld_dsi_dpi_init(dev, dsi_connector, p_vid_funcs);
-                if(!encoder) {
-                        dev_err(dev->dev, "Create DPI encoder failed\n");
-                        goto dsi_init_err1;
-                }
-                encoder->private = dsi_config;
-                dsi_config->encoders[MDFLD_DSI_ENCODER_DPI] = encoder;
-        }
-        
-        drm_sysfs_connector_add(connector);
-        return;
-        
-        /*TODO: add code to destroy outputs on error*/
-dsi_init_err1:
-        /*destroy sender*/
-        mdfld_dsi_pkg_sender_destroy(dsi_connector->pkg_sender);
-
-        drm_connector_cleanup(connector);
-        kfree(dsi_config->fixed_mode);
-        kfree(dsi_config);
-dsi_init_err0:
-        kfree(dsi_connector);
-}
diff --git a/drivers/staging/gma500/mdfld_dsi_output.h b/drivers/staging/gma500/mdfld_dsi_output.h
deleted file mode 100644
index 4699267efd60..000000000000
--- a/drivers/staging/gma500/mdfld_dsi_output.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * jim liu <jim.liu@intel.com>
- * Jackie Li<yaodong.li@intel.com>
- */
-
-#ifndef __MDFLD_DSI_OUTPUT_H__
-#define __MDFLD_DSI_OUTPUT_H__
-
-#include <linux/backlight.h>
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_edid.h>
-
-#include "psb_drv.h"
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "power.h"
-#include "mdfld_output.h"
-
-#include <asm/mrst.h>
-
-
-static inline struct mdfld_dsi_config *
-        mdfld_dsi_get_config(struct mdfld_dsi_connector *connector)
-{
-        if (!connector)
-                return NULL;
-        return (struct mdfld_dsi_config *)connector->private;
-}
-
-static inline void *mdfld_dsi_get_pkg_sender(struct mdfld_dsi_config *config)
-{
-        struct mdfld_dsi_connector *dsi_connector;
-
-        if (!config)
-                return NULL;
-
-        dsi_connector = config->connector;
-
-        if (!dsi_connector)
-                return NULL;
-
-        return dsi_connector->pkg_sender;
-}
-
-static inline struct mdfld_dsi_config *
-        mdfld_dsi_encoder_get_config(struct mdfld_dsi_encoder *encoder)
-{
-        if (!encoder)
-                return NULL;
-        return (struct mdfld_dsi_config *)encoder->private;
-}
-
-static inline struct mdfld_dsi_connector *
-        mdfld_dsi_encoder_get_connector(struct mdfld_dsi_encoder *encoder)
-{
-        struct mdfld_dsi_config *config;
-
-        if (!encoder)
-                return NULL;
-
-        config = mdfld_dsi_encoder_get_config(encoder);
-        if (!config)
-                return NULL;
-
-        return config->connector;
-}
-
-static inline void *mdfld_dsi_encoder_get_pkg_sender(
-        struct mdfld_dsi_encoder *encoder)
-{
-        struct mdfld_dsi_config *dsi_config;
-
-        dsi_config = mdfld_dsi_encoder_get_config(encoder);
-        if (!dsi_config)
-                return NULL;
-
-        return mdfld_dsi_get_pkg_sender(dsi_config);
-}
-
-static inline int mdfld_dsi_encoder_get_pipe(struct mdfld_dsi_encoder *encoder)
-{
-        struct mdfld_dsi_connector *connector;
-
-        if (!encoder)
-                return -1;
-
-        connector = mdfld_dsi_encoder_get_connector(encoder);
-        if (!connector)
-                return -1;
-
-        return connector->pipe;
-}
-
-extern void mdfld_dsi_gen_fifo_ready(struct drm_device *dev,
-                                u32 gen_fifo_stat_reg, u32 fifo_stat);
-extern void mdfld_dsi_brightness_init(struct mdfld_dsi_config *dsi_config,
-                                int pipe);
-extern void mdfld_dsi_brightness_control(struct drm_device *dev, int pipe,
-                                int level);
-extern void mdfld_dsi_output_init(struct drm_device *dev, int pipe,
-                                struct mdfld_dsi_config *config,
-                                struct panel_funcs *p_cmd_funcs,
-                                struct panel_funcs *p_vid_funcs);
-extern void mdfld_dsi_controller_init(struct mdfld_dsi_config *dsi_config,
-                                int pipe);
-extern int mdfld_dsi_get_power_mode(struct mdfld_dsi_config *dsi_config,
-                                u32 *mode,
-                                u8 transmission);
-extern int mdfld_dsi_get_diagnostic_result(struct mdfld_dsi_config *dsi_config,
-                                u32 *result,
-                                u8 transmission);
-extern int mdfld_dsi_panel_reset(int pipe);
-
-#endif /*__MDFLD_DSI_OUTPUT_H__*/
diff --git a/drivers/staging/gma500/mdfld_dsi_pkg_sender.c b/drivers/staging/gma500/mdfld_dsi_pkg_sender.c
deleted file mode 100644
index 9b96a5c9abcd..000000000000
--- a/drivers/staging/gma500/mdfld_dsi_pkg_sender.c
+++ /dev/null
@@ -1,1484 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Jackie Li<yaodong.li@intel.com>
- */
-
-#include <linux/freezer.h>
-
-#include "mdfld_dsi_output.h"
-#include "mdfld_dsi_pkg_sender.h"
-#include "mdfld_dsi_dbi.h"
-#include "mdfld_dsi_dpi.h"
-
-#define MDFLD_DSI_DBI_FIFO_TIMEOUT              100
-#define MDFLD_DSI_MAX_RETURN_PACKET_SIZE        512
-#define MDFLD_DSI_READ_MAX_COUNT                5000
-
-static const char * const dsi_errors[] = {
-        "RX SOT Error",
-        "RX SOT Sync Error",
-        "RX EOT Sync Error",
-        "RX Escape Mode Entry Error",
-        "RX LP TX Sync Error",
-        "RX HS Receive Timeout Error",
-        "RX False Control Error",
-        "RX ECC Single Bit Error",
-        "RX ECC Multibit Error",
-        "RX Checksum Error",
-        "RX DSI Data Type Not Recognised",
-        "RX DSI VC ID Invalid",
-        "TX False Control Error",
-        "TX ECC Single Bit Error",
-        "TX ECC Multibit Error",
-        "TX Checksum Error",
-        "TX DSI Data Type Not Recognised",
-        "TX DSI VC ID invalid",
-        "High Contention",
-        "Low contention",
-        "DPI FIFO Under run",
-        "HS TX Timeout",
-        "LP RX Timeout",
-        "Turn Around ACK Timeout",
-        "ACK With No Error",
-        "RX Invalid TX Length",
-        "RX Prot Violation",
-        "HS Generic Write FIFO Full",
-        "LP Generic Write FIFO Full",
-        "Generic Read Data Avail",
-        "Special Packet Sent",
-        "Tearing Effect",
-};
-
-static int wait_for_gen_fifo_empty(struct mdfld_dsi_pkg_sender *sender,
-                                                                u32 mask)
-{
-        struct drm_device *dev = sender->dev;
-        u32 gen_fifo_stat_reg = sender->mipi_gen_fifo_stat_reg;
-        int retry = 0xffff;
-
-        while (retry--) {
-                if ((mask & REG_READ(gen_fifo_stat_reg)) == mask)
-                        return 0;
-                udelay(100);
-        }
-        dev_err(dev->dev, "fifo is NOT empty 0x%08x\n",
-                                        REG_READ(gen_fifo_stat_reg));
-        return -EIO;
-}
-
-static int wait_for_all_fifos_empty(struct mdfld_dsi_pkg_sender *sender)
-{
-        return wait_for_gen_fifo_empty(sender, (1 << 2) | (1 << 10) | (1 << 18)
-                | (1 << 26) | (1 << 27) | (1 << 28));
-}
-
-static int wait_for_lp_fifos_empty(struct mdfld_dsi_pkg_sender *sender)
-{
-        return wait_for_gen_fifo_empty(sender, (1 << 10) | (1 << 26));
-}
-
-static int wait_for_hs_fifos_empty(struct mdfld_dsi_pkg_sender *sender)
-{
-        return wait_for_gen_fifo_empty(sender, (1 << 2) | (1 << 18));
-}
-
-static int wait_for_dbi_fifo_empty(struct mdfld_dsi_pkg_sender *sender)
-{
-        return wait_for_gen_fifo_empty(sender, (1 << 27));
-}
-
-static int handle_dsi_error(struct mdfld_dsi_pkg_sender *sender, u32 mask)
-{
-        u32 intr_stat_reg = sender->mipi_intr_stat_reg;
-        struct drm_device *dev = sender->dev;
-
-        switch (mask) {
-        case (1 << 0):
-        case (1 << 1):
-        case (1 << 2):
-        case (1 << 3):
-        case (1 << 4):
-        case (1 << 5):
-        case (1 << 6):
-        case (1 << 7):
-        case (1 << 8):
-        case (1 << 9):
-        case (1 << 10):
-        case (1 << 11):
-        case (1 << 12):
-        case (1 << 13):
-                break;
-        case (1 << 14):
-                /*wait for all fifo empty*/
-                /*wait_for_all_fifos_empty(sender)*/;
-                break;
-        case (1 << 15):
-                break;
-        case (1 << 16):
-                break;
-        case (1 << 17):
-                break;
-        case (1 << 18):
-        case (1 << 19):
-                /*wait for contention recovery time*/
-                /*mdelay(10);*/
-                /*wait for all fifo empty*/
-                if (0)
-                        wait_for_all_fifos_empty(sender);
-                break;
-        case (1 << 20):
-                break;
-        case (1 << 21):
-                /*wait for all fifo empty*/
-                /*wait_for_all_fifos_empty(sender);*/
-                break;
-        case (1 << 22):
-                break;
-        case (1 << 23):
-        case (1 << 24):
-        case (1 << 25):
-        case (1 << 26):
-        case (1 << 27):
-                /* HS Gen fifo full */
-                REG_WRITE(intr_stat_reg, mask);
-                wait_for_hs_fifos_empty(sender);
-                break;
-        case (1 << 28):
-                /* LP Gen fifo full\n */
-                REG_WRITE(intr_stat_reg, mask);
-                wait_for_lp_fifos_empty(sender);
-                break;
-        case (1 << 29):
-        case (1 << 30):
-        case (1 << 31):
-                break;
-        }
-
-        if (mask & REG_READ(intr_stat_reg))
-                dev_warn(dev->dev, "Cannot clean interrupt 0x%08x\n", mask);
-
-        return 0;
-}
-
-static int dsi_error_handler(struct mdfld_dsi_pkg_sender *sender)
-{
-        struct drm_device *dev = sender->dev;
-        u32 intr_stat_reg = sender->mipi_intr_stat_reg;
-        u32 mask;
-        u32 intr_stat;
-        int i;
-        int err = 0;
-
-        intr_stat = REG_READ(intr_stat_reg);
-
-        for (i = 0; i < 32; i++) {
-                mask = (0x00000001UL) << i;
-                if (intr_stat & mask) {
-                        dev_dbg(dev->dev, "[DSI]: %s\n", dsi_errors[i]);
-                        err = handle_dsi_error(sender, mask);
-                        if (err)
-                                dev_err(dev->dev, "Cannot handle error\n");
-                }
-        }
-        return err;
-}
-
-static inline int dbi_cmd_sent(struct mdfld_dsi_pkg_sender *sender)
-{
-        struct drm_device *dev = sender->dev;
-        u32 retry = 0xffff;
-        u32 dbi_cmd_addr_reg = sender->mipi_cmd_addr_reg;
-
-        /* Query the command execution status */
-        while (retry--) {
-                if (!(REG_READ(dbi_cmd_addr_reg) & (1 << 0)))
-                        break;
-        }
-
-        if (!retry) {
-                dev_err(dev->dev, "Timeout waiting for DBI Command status\n");
-                return -EAGAIN;
-        }
-        return 0;
-}
-
-/*
- * NOTE: this interface is abandoned expect for write_mem_start DCS
- * other DCS are sent via generic pkg interfaces
- */
-static int send_dcs_pkg(struct mdfld_dsi_pkg_sender *sender,
-                        struct mdfld_dsi_pkg *pkg)
-{
-        struct drm_device *dev = sender->dev;
-        struct mdfld_dsi_dcs_pkg *dcs_pkg = &pkg->pkg.dcs_pkg;
-        u32 dbi_cmd_len_reg = sender->mipi_cmd_len_reg;
-        u32 dbi_cmd_addr_reg = sender->mipi_cmd_addr_reg;
-        u32 cb_phy = sender->dbi_cb_phy;
-        u32 index = 0;
-        u8 *cb = (u8 *)sender->dbi_cb_addr;
-        int i;
-        int ret;
-
-        if (!sender->dbi_pkg_support) {
-                dev_err(dev->dev, "Trying to send DCS on a non DBI output, abort!\n");
-                return -ENOTSUPP;
-        }
-
-        /*wait for DBI fifo empty*/
-        wait_for_dbi_fifo_empty(sender);
-
-        *(cb + (index++)) = dcs_pkg->cmd;
-        if (dcs_pkg->param_num) {
-                for (i = 0; i < dcs_pkg->param_num; i++)
-                        *(cb + (index++)) = *(dcs_pkg->param + i);
-        }
-
-        REG_WRITE(dbi_cmd_len_reg, (1 + dcs_pkg->param_num));
-        REG_WRITE(dbi_cmd_addr_reg,
-                (cb_phy << CMD_MEM_ADDR_OFFSET)
-                | (1 << 0)
-                | ((dcs_pkg->data_src == CMD_DATA_SRC_PIPE) ? (1 << 1) : 0));
-
-        ret = dbi_cmd_sent(sender);
-        if (ret) {
-                dev_err(dev->dev, "command 0x%x not complete\n", dcs_pkg->cmd);
-                return -EAGAIN;
-        }
-        return 0;
-}
-
-static int __send_short_pkg(struct mdfld_dsi_pkg_sender *sender,
-                                struct mdfld_dsi_pkg *pkg)
-{
-        struct drm_device *dev = sender->dev;
-        u32 hs_gen_ctrl_reg = sender->mipi_hs_gen_ctrl_reg;
-        u32 lp_gen_ctrl_reg = sender->mipi_lp_gen_ctrl_reg;
-        u32 gen_ctrl_val = 0;
-        struct mdfld_dsi_gen_short_pkg *short_pkg = &pkg->pkg.short_pkg;
-
-        gen_ctrl_val |= short_pkg->cmd << MCS_COMMANDS_POS;
-        gen_ctrl_val |= 0 << DCS_CHANNEL_NUMBER_POS;
-        gen_ctrl_val |= pkg->pkg_type;
-        gen_ctrl_val |= short_pkg->param << MCS_PARAMETER_POS;
-
-        if (pkg->transmission_type == MDFLD_DSI_HS_TRANSMISSION) {
-                /* wait for hs fifo empty */
-                /* wait_for_hs_fifos_empty(sender); */
-                /* Send pkg */
-                REG_WRITE(hs_gen_ctrl_reg, gen_ctrl_val);
-        } else if (pkg->transmission_type == MDFLD_DSI_LP_TRANSMISSION) {
-                /* wait_for_lp_fifos_empty(sender); */
-                /* Send pkg*/
-                REG_WRITE(lp_gen_ctrl_reg, gen_ctrl_val);
-        } else {
-                dev_err(dev->dev, "Unknown transmission type %d\n",
-                                                        pkg->transmission_type);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static int __send_long_pkg(struct mdfld_dsi_pkg_sender *sender,
-                                struct mdfld_dsi_pkg *pkg)
-{
-        struct drm_device *dev = sender->dev;
-        u32 hs_gen_ctrl_reg = sender->mipi_hs_gen_ctrl_reg;
-        u32 hs_gen_data_reg = sender->mipi_hs_gen_data_reg;
-        u32 lp_gen_ctrl_reg = sender->mipi_lp_gen_ctrl_reg;
-        u32 lp_gen_data_reg = sender->mipi_lp_gen_data_reg;
-        u32 gen_ctrl_val = 0;
-        u32 *dp;
-        int i;
-        struct mdfld_dsi_gen_long_pkg *long_pkg = &pkg->pkg.long_pkg;
-
-        dp = long_pkg->data;
-
-        /*
-         * Set up word count for long pkg
-         * FIXME: double check word count field.
-         * currently, using the byte counts of the payload as the word count.
-         * ------------------------------------------------------------
-         * | DI |   WC   | ECC|         PAYLOAD              |CHECKSUM|
-         * ------------------------------------------------------------
-         */
-        gen_ctrl_val |= (long_pkg->len << 2) << WORD_COUNTS_POS;
-        gen_ctrl_val |= 0 << DCS_CHANNEL_NUMBER_POS;
-        gen_ctrl_val |= pkg->pkg_type;
-
-        if (pkg->transmission_type == MDFLD_DSI_HS_TRANSMISSION) {
-                /* Wait for hs ctrl and data fifos to be empty */
-                /* wait_for_hs_fifos_empty(sender); */
-                for (i = 0; i < long_pkg->len; i++)
-                        REG_WRITE(hs_gen_data_reg, *(dp + i));
-                REG_WRITE(hs_gen_ctrl_reg, gen_ctrl_val);
-        } else if (pkg->transmission_type == MDFLD_DSI_LP_TRANSMISSION) {
-                /* wait_for_lp_fifos_empty(sender); */
-                for (i = 0; i < long_pkg->len; i++)
-                        REG_WRITE(lp_gen_data_reg, *(dp + i));
-                REG_WRITE(lp_gen_ctrl_reg, gen_ctrl_val);
-        } else {
-                dev_err(dev->dev, "Unknown transmission type %d\n",
-                                                pkg->transmission_type);
-                return -EINVAL;
-        }
-
-        return 0;
-
-}
-
-static int send_mcs_short_pkg(struct mdfld_dsi_pkg_sender *sender,
-                                struct mdfld_dsi_pkg *pkg)
-{
-        return __send_short_pkg(sender, pkg);
-}
-
-static int send_mcs_long_pkg(struct mdfld_dsi_pkg_sender *sender,
-                                struct mdfld_dsi_pkg *pkg)
-{
-        return __send_long_pkg(sender, pkg);
-}
-
-static int send_gen_short_pkg(struct mdfld_dsi_pkg_sender *sender,
-                                struct mdfld_dsi_pkg *pkg)
-{
-        return __send_short_pkg(sender, pkg);
-}
-
-static int send_gen_long_pkg(struct mdfld_dsi_pkg_sender *sender,
-                                struct mdfld_dsi_pkg *pkg)
-{
-        return __send_long_pkg(sender, pkg);
-}
-
-static int send_pkg_prepare(struct mdfld_dsi_pkg_sender *sender,
-                                struct mdfld_dsi_pkg *pkg)
-{
-        u8 cmd;
-        u8 *data;
-
-        switch (pkg->pkg_type) {
-        case MDFLD_DSI_PKG_DCS:
-                cmd = pkg->pkg.dcs_pkg.cmd;
-                break;
-        case MDFLD_DSI_PKG_MCS_SHORT_WRITE_0:
-        case MDFLD_DSI_PKG_MCS_SHORT_WRITE_1:
-                cmd = pkg->pkg.short_pkg.cmd;
-                break;
-        case MDFLD_DSI_PKG_MCS_LONG_WRITE:
-                data = (u8 *)pkg->pkg.long_pkg.data;
-                cmd = *data;
-                break;
-        default:
-                return 0;
-        }
-
-        /* This prevents other package sending while doing msleep */
-        sender->status = MDFLD_DSI_PKG_SENDER_BUSY;
-
-        /* Check panel mode v.s. sending command */
-        if ((sender->panel_mode & MDFLD_DSI_PANEL_MODE_SLEEP) &&
-                cmd != exit_sleep_mode) {
-                dev_err(sender->dev->dev,
-                                "sending 0x%x when panel sleep in\n", cmd);
-                sender->status = MDFLD_DSI_PKG_SENDER_FREE;
-                return -EINVAL;
-        }
-
-        /* Wait for 120 milliseconds in case exit_sleep_mode just be sent */
-        if (cmd == DCS_ENTER_SLEEP_MODE) {
-                /*TODO: replace it with msleep later*/
-                mdelay(120);
-        }
-        return 0;
-}
-
-static int send_pkg_done(struct mdfld_dsi_pkg_sender *sender,
-                                struct mdfld_dsi_pkg *pkg)
-{
-        u8 cmd;
-        u8 *data;
-
-        switch (pkg->pkg_type) {
-        case MDFLD_DSI_PKG_DCS:
-                cmd = pkg->pkg.dcs_pkg.cmd;
-                break;
-        case MDFLD_DSI_PKG_MCS_SHORT_WRITE_0:
-        case MDFLD_DSI_PKG_MCS_SHORT_WRITE_1:
-                cmd = pkg->pkg.short_pkg.cmd;
-                break;
-        case MDFLD_DSI_PKG_MCS_LONG_WRITE:
-                data = (u8 *)pkg->pkg.long_pkg.data;
-                cmd = *data;
-                break;
-        default:
-                return 0;
-        }
-
-        /* Update panel status */
-        if (cmd == DCS_ENTER_SLEEP_MODE) {
-                sender->panel_mode |= MDFLD_DSI_PANEL_MODE_SLEEP;
-                /*TODO: replace it with msleep later*/
-                mdelay(120);
-        } else if (cmd == DCS_EXIT_SLEEP_MODE) {
-                sender->panel_mode &= ~MDFLD_DSI_PANEL_MODE_SLEEP;
-                /*TODO: replace it with msleep later*/
-                mdelay(120);
-        } else if (unlikely(cmd == DCS_SOFT_RESET)) {
-                /*TODO: replace it with msleep later*/
-                mdelay(5);
-        }
-        sender->status = MDFLD_DSI_PKG_SENDER_FREE;
-        return 0;
-
-}
-
-static int do_send_pkg(struct mdfld_dsi_pkg_sender *sender,
-                        struct mdfld_dsi_pkg *pkg)
-{
-        int ret;
-
-        if (sender->status == MDFLD_DSI_PKG_SENDER_BUSY) {
-                dev_err(sender->dev->dev, "sender is busy\n");
-                return -EAGAIN;
-        }
-
-        ret = send_pkg_prepare(sender, pkg);
-        if (ret) {
-                dev_err(sender->dev->dev, "send_pkg_prepare error\n");
-                return ret;
-        }
-
-        switch (pkg->pkg_type) {
-        case MDFLD_DSI_PKG_DCS:
-                ret = send_dcs_pkg(sender, pkg);
-                break;
-        case MDFLD_DSI_PKG_GEN_SHORT_WRITE_0:
-        case MDFLD_DSI_PKG_GEN_SHORT_WRITE_1:
-        case MDFLD_DSI_PKG_GEN_SHORT_WRITE_2:
-        case MDFLD_DSI_PKG_GEN_READ_0:
-        case MDFLD_DSI_PKG_GEN_READ_1:
-        case MDFLD_DSI_PKG_GEN_READ_2:
-                ret = send_gen_short_pkg(sender, pkg);
-                break;
-        case MDFLD_DSI_PKG_GEN_LONG_WRITE:
-                ret = send_gen_long_pkg(sender, pkg);
-                break;
-        case MDFLD_DSI_PKG_MCS_SHORT_WRITE_0:
-        case MDFLD_DSI_PKG_MCS_SHORT_WRITE_1:
-        case MDFLD_DSI_PKG_MCS_READ:
-                ret = send_mcs_short_pkg(sender, pkg);
-                break;
-        case MDFLD_DSI_PKG_MCS_LONG_WRITE:
-                ret = send_mcs_long_pkg(sender, pkg);
-                break;
-        default:
-                dev_err(sender->dev->dev, "Invalid pkg type 0x%x\n",
-                                                        pkg->pkg_type);
-                ret = -EINVAL;
-        }
-        send_pkg_done(sender, pkg);
-        return ret;
-}
-
-static int send_pkg(struct mdfld_dsi_pkg_sender *sender,
-                        struct mdfld_dsi_pkg *pkg)
-{
-        int err ;
-
-        /* Handle DSI error */
-        err = dsi_error_handler(sender);
-        if (err) {
-                dev_err(sender->dev->dev, "Error handling failed\n");
-                err = -EAGAIN;
-                goto send_pkg_err;
-        }
-
-        /* Send pkg */
-        err = do_send_pkg(sender, pkg);
-        if (err) {
-                dev_err(sender->dev->dev, "sent pkg failed\n");
-                err = -EAGAIN;
-                goto send_pkg_err;
-        }
-
-        /* FIXME: should I query complete and fifo empty here? */
-send_pkg_err:
-        return err;
-}
-
-static struct mdfld_dsi_pkg *pkg_sender_get_pkg_locked(
-                                        struct mdfld_dsi_pkg_sender *sender)
-{
-        struct mdfld_dsi_pkg *pkg;
-
-        if (list_empty(&sender->free_list)) {
-                dev_err(sender->dev->dev, "No free pkg left\n");
-                return NULL;
-        }
-        pkg = list_first_entry(&sender->free_list, struct mdfld_dsi_pkg, entry);
-        /* Detach from free list */
-        list_del_init(&pkg->entry);
-        return pkg;
-}
-
-static void pkg_sender_put_pkg_locked(struct mdfld_dsi_pkg_sender *sender,
-                                        struct mdfld_dsi_pkg *pkg)
-{
-        memset(pkg, 0, sizeof(struct mdfld_dsi_pkg));
-        INIT_LIST_HEAD(&pkg->entry);
-        list_add_tail(&pkg->entry, &sender->free_list);
-}
-
-static int mdfld_dbi_cb_init(struct mdfld_dsi_pkg_sender *sender,
-                                        struct psb_gtt *pg, int pipe)
-{
-        unsigned long phys;
-        void *virt_addr = NULL;
-
-        switch (pipe) {
-        case 0:
-                /* FIXME: Doesn't this collide with stolen space ? */
-                phys = pg->gtt_phys_start - 0x1000;
-                break;
-        case 2:
-                phys = pg->gtt_phys_start - 0x800;
-                break;
-        default:
-                dev_err(sender->dev->dev, "Unsupported channel %d\n", pipe);
-                return -EINVAL;
-        }
-
-        virt_addr = ioremap_nocache(phys, 0x800);
-        if (!virt_addr) {
-                dev_err(sender->dev->dev, "Map DBI command buffer error\n");
-                return -ENOMEM;
-        }
-        sender->dbi_cb_phy = phys;
-        sender->dbi_cb_addr = virt_addr;
-        return 0;
-}
-
-static void mdfld_dbi_cb_destroy(struct mdfld_dsi_pkg_sender *sender)
-{
-        if (sender && sender->dbi_cb_addr)
-                iounmap(sender->dbi_cb_addr);
-}
-
-static void pkg_sender_queue_pkg(struct mdfld_dsi_pkg_sender *sender,
-                                        struct mdfld_dsi_pkg *pkg,
-                                        int delay)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&sender->lock, flags);
-
-        if (!delay) {
-                send_pkg(sender, pkg);
-                pkg_sender_put_pkg_locked(sender, pkg);
-        } else {
-                /* Queue it */
-                list_add_tail(&pkg->entry, &sender->pkg_list);
-        }
-        spin_unlock_irqrestore(&sender->lock, flags);
-}
-
-static void process_pkg_list(struct mdfld_dsi_pkg_sender *sender)
-{
-        struct mdfld_dsi_pkg *pkg;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sender->lock, flags);
-
-        while (!list_empty(&sender->pkg_list)) {
-                pkg = list_first_entry(&sender->pkg_list,
-                                        struct mdfld_dsi_pkg, entry);
-                send_pkg(sender, pkg);
-                list_del_init(&pkg->entry);
-                pkg_sender_put_pkg_locked(sender, pkg);
-        }
-
-        spin_unlock_irqrestore(&sender->lock, flags);
-}
-
-static int mdfld_dsi_send_mcs_long(struct mdfld_dsi_pkg_sender *sender,
-        u32 *data, u32 len, u8 transmission, int delay)
-{
-        struct mdfld_dsi_pkg *pkg;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sender->lock, flags);
-        pkg = pkg_sender_get_pkg_locked(sender);
-        spin_unlock_irqrestore(&sender->lock, flags);
-
-        if (!pkg) {
-                dev_err(sender->dev->dev, "No memory\n");
-                return -ENOMEM;
-        }
-        pkg->pkg_type = MDFLD_DSI_PKG_MCS_LONG_WRITE;
-        pkg->transmission_type = transmission;
-        pkg->pkg.long_pkg.data = data;
-        pkg->pkg.long_pkg.len = len;
-        INIT_LIST_HEAD(&pkg->entry);
-
-        pkg_sender_queue_pkg(sender, pkg, delay);
-        return 0;
-}
-
-static int mdfld_dsi_send_mcs_short(struct mdfld_dsi_pkg_sender *sender,
-                                        u8 cmd, u8 param, u8 param_num,
-                                        u8 transmission,
-                                        int delay)
-{
-        struct mdfld_dsi_pkg *pkg;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sender->lock, flags);
-        pkg = pkg_sender_get_pkg_locked(sender);
-        spin_unlock_irqrestore(&sender->lock, flags);
-
-        if (!pkg) {
-                dev_err(sender->dev->dev, "No memory\n");
-                return -ENOMEM;
-        }
-
-        if (param_num) {
-                pkg->pkg_type = MDFLD_DSI_PKG_MCS_SHORT_WRITE_1;
-                pkg->pkg.short_pkg.param = param;
-        } else {
-                pkg->pkg_type = MDFLD_DSI_PKG_MCS_SHORT_WRITE_0;
-                pkg->pkg.short_pkg.param = 0;
-        }
-        pkg->transmission_type = transmission;
-        pkg->pkg.short_pkg.cmd = cmd;
-        INIT_LIST_HEAD(&pkg->entry);
-
-        pkg_sender_queue_pkg(sender, pkg, delay);
-        return 0;
-}
-
-static int mdfld_dsi_send_gen_short(struct mdfld_dsi_pkg_sender *sender,
-                                        u8 param0, u8 param1, u8 param_num,
-                                        u8 transmission,
-                                        int delay)
-{
-        struct mdfld_dsi_pkg *pkg;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sender->lock, flags);
-        pkg = pkg_sender_get_pkg_locked(sender);
-        spin_unlock_irqrestore(&sender->lock, flags);
-
-        if (!pkg) {
-                dev_err(sender->dev->dev, "No pkg memory\n");
-                return -ENOMEM;
-        }
-
-        switch (param_num) {
-        case 0:
-                pkg->pkg_type = MDFLD_DSI_PKG_GEN_SHORT_WRITE_0;
-                pkg->pkg.short_pkg.cmd = 0;
-                pkg->pkg.short_pkg.param = 0;
-                break;
-        case 1:
-                pkg->pkg_type = MDFLD_DSI_PKG_GEN_SHORT_WRITE_1;
-                pkg->pkg.short_pkg.cmd = param0;
-                pkg->pkg.short_pkg.param = 0;
-                break;
-        case 2:
-                pkg->pkg_type = MDFLD_DSI_PKG_GEN_SHORT_WRITE_2;
-                pkg->pkg.short_pkg.cmd = param0;
-                pkg->pkg.short_pkg.param = param1;
-                break;
-        }
-
-        pkg->transmission_type = transmission;
-        INIT_LIST_HEAD(&pkg->entry);
-
-        pkg_sender_queue_pkg(sender, pkg, delay);
-        return 0;
-}
-
-static int mdfld_dsi_send_gen_long(struct mdfld_dsi_pkg_sender *sender,
-                                u32 *data, u32 len, u8 transmission, int delay)
-{
-        struct mdfld_dsi_pkg *pkg;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sender->lock, flags);
-        pkg = pkg_sender_get_pkg_locked(sender);
-        spin_unlock_irqrestore(&sender->lock, flags);
-
-        if (!pkg) {
-                dev_err(sender->dev->dev, "No pkg memory\n");
-                return -ENOMEM;
-        }
-
-        pkg->pkg_type = MDFLD_DSI_PKG_GEN_LONG_WRITE;
-        pkg->transmission_type = transmission;
-        pkg->pkg.long_pkg.data = data;
-        pkg->pkg.long_pkg.len = len;
-
-        INIT_LIST_HEAD(&pkg->entry);
-
-        pkg_sender_queue_pkg(sender, pkg, delay);
-
-        return 0;
-}
-
-static int __read_panel_data(struct mdfld_dsi_pkg_sender *sender,
-                                struct mdfld_dsi_pkg *pkg,
-                                u32 *data,
-                                u16 len)
-{
-        unsigned long flags;
-        struct drm_device *dev = sender->dev;
-        int i;
-        u32 gen_data_reg;
-        int retry = MDFLD_DSI_READ_MAX_COUNT;
-        u8 transmission = pkg->transmission_type;
-
-        /*
-         * do reading.
-         * 0) send out generic read request
-         * 1) polling read data avail interrupt
-         * 2) read data
-         */
-        spin_lock_irqsave(&sender->lock, flags);
-
-        REG_WRITE(sender->mipi_intr_stat_reg, 1 << 29);
-
-        if ((REG_READ(sender->mipi_intr_stat_reg) & (1 << 29)))
-                DRM_ERROR("Can NOT clean read data valid interrupt\n");
-
-        /*send out read request*/
-        send_pkg(sender, pkg);
-
-        pkg_sender_put_pkg_locked(sender, pkg);
-
-        /*polling read data avail interrupt*/
-        while (retry && !(REG_READ(sender->mipi_intr_stat_reg) & (1 << 29))) {
-                udelay(100);
-                retry--;
-        }
-
-        if (!retry) {
-                spin_unlock_irqrestore(&sender->lock, flags);
-                return -ETIMEDOUT;
-        }
-
-        REG_WRITE(sender->mipi_intr_stat_reg, (1 << 29));
-
-        /*read data*/
-        if (transmission == MDFLD_DSI_HS_TRANSMISSION)
-                gen_data_reg = sender->mipi_hs_gen_data_reg;
-        else if (transmission == MDFLD_DSI_LP_TRANSMISSION)
-                gen_data_reg = sender->mipi_lp_gen_data_reg;
-        else {
-                DRM_ERROR("Unknown transmission");
-                spin_unlock_irqrestore(&sender->lock, flags);
-                return -EINVAL;
-        }
-
-        for (i=0; i<len; i++)
-                *(data + i) = REG_READ(gen_data_reg);
-
-        spin_unlock_irqrestore(&sender->lock, flags);
- 
-        return 0;
-}
-
-static int mdfld_dsi_read_gen(struct mdfld_dsi_pkg_sender *sender,
-                                u8 param0,
-                                u8 param1,
-                                u8 param_num,
-                                u32 *data,
-                                u16 len,
-                                u8 transmission)
-{
-        struct mdfld_dsi_pkg *pkg;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sender->lock, flags);
-
-        pkg = pkg_sender_get_pkg_locked(sender);
-
-        spin_unlock_irqrestore(&sender->lock,flags);
-
-        if (!pkg) {
-                dev_err(sender->dev->dev, "No pkg memory\n");
-                return -ENOMEM;
-        }
-
-        switch (param_num) {
-        case 0:
-                pkg->pkg_type = MDFLD_DSI_PKG_GEN_READ_0;
-                pkg->pkg.short_pkg.cmd = 0;
-                pkg->pkg.short_pkg.param = 0;
-                break;
-        case 1:
-                pkg->pkg_type = MDFLD_DSI_PKG_GEN_READ_1;
-                pkg->pkg.short_pkg.cmd = param0;
-                pkg->pkg.short_pkg.param = 0;
-                break;
-        case 2:
-                pkg->pkg_type = MDFLD_DSI_PKG_GEN_READ_2;
-                pkg->pkg.short_pkg.cmd = param0;
-                pkg->pkg.short_pkg.param = param1;
-                break;
-        }
-
-        pkg->transmission_type = transmission;
-
-        INIT_LIST_HEAD(&pkg->entry);
-
-        return __read_panel_data(sender, pkg, data, len);
-}
- 
-static int mdfld_dsi_read_mcs(struct mdfld_dsi_pkg_sender *sender,
-                                u8 cmd,
-                                u32 *data,
-                                u16 len,
-                                u8 transmission)
-{
-        struct mdfld_dsi_pkg *pkg;
-        unsigned long flags;
-
-        spin_lock_irqsave(&sender->lock, flags);
-
-        pkg = pkg_sender_get_pkg_locked(sender);
-
-        spin_unlock_irqrestore(&sender->lock, flags);
- 
-        if (!pkg) {
-                dev_err(sender->dev->dev, "No pkg memory\n");
-                return -ENOMEM;
-        }
-
-        pkg->pkg_type = MDFLD_DSI_PKG_MCS_READ;
-        pkg->pkg.short_pkg.cmd = cmd;
-        pkg->pkg.short_pkg.param = 0;
-
-        pkg->transmission_type = transmission;
- 
-        INIT_LIST_HEAD(&pkg->entry);
-
-        return __read_panel_data(sender, pkg, data, len);
-}
-
-void dsi_controller_dbi_init(struct mdfld_dsi_config * dsi_config, int pipe)
-{
-        struct drm_device * dev = dsi_config->dev;
-        u32 reg_offset = pipe ? MIPIC_REG_OFFSET : 0;
-        int lane_count = dsi_config->lane_count;
-        u32 val = 0;
-
-        /*un-ready device*/
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset), 0x00000000);
-
-        /*init dsi adapter before kicking off*/
-        REG_WRITE((MIPIA_CONTROL_REG + reg_offset), 0x00000018);
-
-        /*TODO: figure out how to setup these registers*/
-        REG_WRITE((MIPIA_DPHY_PARAM_REG + reg_offset), 0x150c3408);
-        REG_WRITE((MIPIA_CLK_LANE_SWITCH_TIME_CNT_REG + reg_offset), 0x000a0014);
-        REG_WRITE((MIPIA_DBI_BW_CTRL_REG + reg_offset), 0x00000400);
-        REG_WRITE((MIPIA_DBI_FIFO_THROTTLE_REG + reg_offset), 0x00000001);
-        REG_WRITE((MIPIA_HS_LS_DBI_ENABLE_REG + reg_offset), 0x00000000);
-
-        /*enable all interrupts*/
-        REG_WRITE((MIPIA_INTR_EN_REG + reg_offset), 0xffffffff);
-        /*max value: 20 clock cycles of txclkesc*/
-        REG_WRITE((MIPIA_TURN_AROUND_TIMEOUT_REG + reg_offset), 0x0000001f);
-        /*min 21 txclkesc, max: ffffh*/
-        REG_WRITE((MIPIA_DEVICE_RESET_TIMER_REG + reg_offset), 0x0000ffff);
-        /*min: 7d0 max: 4e20*/
-        REG_WRITE((MIPIA_INIT_COUNT_REG + reg_offset), 0x00000fa0);
-
-        /*set up max return packet size*/
-        REG_WRITE((MIPIA_MAX_RETURN_PACK_SIZE_REG + reg_offset),
-                        MDFLD_DSI_MAX_RETURN_PACKET_SIZE);
-
-        /*set up func_prg*/
-        val |= lane_count;
-        val |= (dsi_config->channel_num << DSI_DBI_VIRT_CHANNEL_OFFSET);
-        val |= DSI_DBI_COLOR_FORMAT_OPTION2;
-        REG_WRITE((MIPIA_DSI_FUNC_PRG_REG + reg_offset), val);
-
-        REG_WRITE((MIPIA_HS_TX_TIMEOUT_REG + reg_offset), 0x3fffff);
-        REG_WRITE((MIPIA_LP_RX_TIMEOUT_REG + reg_offset), 0xffff);
-
-        REG_WRITE((MIPIA_HIGH_LOW_SWITCH_COUNT_REG + reg_offset), 0x46);
-        REG_WRITE((MIPIA_EOT_DISABLE_REG + reg_offset), 0x00000000);
-        REG_WRITE((MIPIA_LP_BYTECLK_REG + reg_offset), 0x00000004);
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset), 0x00000001);
-}
-
-void dsi_controller_dpi_init(struct mdfld_dsi_config * dsi_config, int pipe)
-{
-        struct drm_device * dev = dsi_config->dev;
-        u32 reg_offset = pipe ? MIPIC_REG_OFFSET : 0;
-        int lane_count = dsi_config->lane_count;
-        struct mdfld_dsi_dpi_timing dpi_timing;
-        struct drm_display_mode * mode = dsi_config->mode;
-        u32 val = 0;
-
-        /*un-ready device*/
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset), 0x00000000);
-
-        /*init dsi adapter before kicking off*/
-        REG_WRITE((MIPIA_CONTROL_REG + reg_offset), 0x00000018);
-
-        /*enable all interrupts*/
-        REG_WRITE((MIPIA_INTR_EN_REG + reg_offset), 0xffffffff);
-
-        /*set up func_prg*/
-        val |= lane_count;
-        val |= dsi_config->channel_num << DSI_DPI_VIRT_CHANNEL_OFFSET;
-
-        switch(dsi_config->bpp) {
-        case 16:
-                val |= DSI_DPI_COLOR_FORMAT_RGB565;
-                break;
-        case 18:
-                val |= DSI_DPI_COLOR_FORMAT_RGB666;
-                break;
-        case 24:
-                val |= DSI_DPI_COLOR_FORMAT_RGB888;
-                break;
-        default:
-                DRM_ERROR("unsupported color format, bpp = %d\n", dsi_config->bpp);
-        }
-
-        REG_WRITE((MIPIA_DSI_FUNC_PRG_REG + reg_offset), val);
-
-        REG_WRITE((MIPIA_HS_TX_TIMEOUT_REG + reg_offset),
-                        (mode->vtotal * mode->htotal * dsi_config->bpp / (8 * lane_count)) & DSI_HS_TX_TIMEOUT_MASK);
-        REG_WRITE((MIPIA_LP_RX_TIMEOUT_REG + reg_offset), 0xffff & DSI_LP_RX_TIMEOUT_MASK);
-
-        /*max value: 20 clock cycles of txclkesc*/
-        REG_WRITE((MIPIA_TURN_AROUND_TIMEOUT_REG + reg_offset), 0x14 & DSI_TURN_AROUND_TIMEOUT_MASK);
-
-        /*min 21 txclkesc, max: ffffh*/
-        REG_WRITE((MIPIA_DEVICE_RESET_TIMER_REG + reg_offset), 0xffff & DSI_RESET_TIMER_MASK);
-
-        REG_WRITE((MIPIA_DPI_RESOLUTION_REG + reg_offset), mode->vdisplay << 16 | mode->hdisplay);
-
-        /*set DPI timing registers*/
-        mdfld_dsi_dpi_timing_calculation(mode, &dpi_timing, dsi_config->lane_count, dsi_config->bpp);
-
-        REG_WRITE((MIPIA_HSYNC_COUNT_REG + reg_offset), dpi_timing.hsync_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_HBP_COUNT_REG + reg_offset), dpi_timing.hbp_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_HFP_COUNT_REG + reg_offset), dpi_timing.hfp_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_HACTIVE_COUNT_REG + reg_offset), dpi_timing.hactive_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_VSYNC_COUNT_REG + reg_offset), dpi_timing.vsync_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_VBP_COUNT_REG + reg_offset), dpi_timing.vbp_count & DSI_DPI_TIMING_MASK);
-        REG_WRITE((MIPIA_VFP_COUNT_REG + reg_offset), dpi_timing.vfp_count & DSI_DPI_TIMING_MASK);
-
-        REG_WRITE((MIPIA_HIGH_LOW_SWITCH_COUNT_REG + reg_offset), 0x46);
-
-        /*min: 7d0 max: 4e20*/
-        REG_WRITE((MIPIA_INIT_COUNT_REG + reg_offset), 0x000007d0);
-
-        /*set up video mode*/
-        val = dsi_config->video_mode | DSI_DPI_COMPLETE_LAST_LINE;
-        REG_WRITE((MIPIA_VIDEO_MODE_FORMAT_REG + reg_offset), val);
-
-        REG_WRITE((MIPIA_EOT_DISABLE_REG + reg_offset), 0x00000000);
-
-        REG_WRITE((MIPIA_LP_BYTECLK_REG + reg_offset), 0x00000004);
-
-        /*TODO: figure out how to setup these registers*/
-        REG_WRITE((MIPIA_DPHY_PARAM_REG + reg_offset), 0x150c3408);
-
-        REG_WRITE((MIPIA_CLK_LANE_SWITCH_TIME_CNT_REG + reg_offset), (0xa << 16) | 0x14);
-
-        /*set device ready*/
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset), 0x00000001);
-}
-
-static void dsi_controller_init(struct mdfld_dsi_config * dsi_config, int pipe)
-{
-        if (!dsi_config || ((pipe != 0) && (pipe != 2))) {
-                DRM_ERROR("Invalid parameters\n");
-                return;
-        }
-
-        if (dsi_config->type == MDFLD_DSI_ENCODER_DPI)
-                dsi_controller_dpi_init(dsi_config, pipe);
-        else if (dsi_config->type == MDFLD_DSI_ENCODER_DBI)
-                dsi_controller_dbi_init(dsi_config, pipe);
-        else
-                DRM_ERROR("Bad DSI encoder type\n");
-}
-
-void mdfld_dsi_cmds_kick_out(struct mdfld_dsi_pkg_sender *sender)
-{
-        process_pkg_list(sender);
-}
-
-int mdfld_dsi_send_dcs(struct mdfld_dsi_pkg_sender *sender,
-                        u8 dcs, u8 *param, u32 param_num, u8 data_src,
-                        int delay)
-{
-        struct mdfld_dsi_pkg *pkg;
-        u32 cb_phy = sender->dbi_cb_phy;
-        struct drm_device *dev = sender->dev;
-        u32 index = 0;
-        u8 *cb = (u8 *)sender->dbi_cb_addr;
-        unsigned long flags;
-        int retry;
-        u8 *dst = NULL;
-        u32 len;
-
-        if (!sender) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-
-        if (!sender->dbi_pkg_support) {
-                dev_err(dev->dev, "No DBI pkg sending on this sender\n");
-                return -ENOTSUPP;
-        }
-
-        if (param_num > MDFLD_MAX_DCS_PARAM) {
-                dev_err(dev->dev, "Sender only supports up to %d DCS params\n",
-                                                        MDFLD_MAX_DCS_PARAM);
-                return -EINVAL;
-        }
-
-        /*
-         * If dcs is write_mem_start, send it directly using DSI adapter
-         * interface
-         */
-        if (dcs == DCS_WRITE_MEM_START) {
-                if (!spin_trylock(&sender->lock))
-                        return -EAGAIN;
-
-                /*
-                 * query whether DBI FIFO is empty,
-                 * if not wait it becoming empty
-                 */
-                retry = MDFLD_DSI_DBI_FIFO_TIMEOUT;
-                while (retry &&
-                    !(REG_READ(sender->mipi_gen_fifo_stat_reg) & (1 << 27))) {
-                        udelay(500);
-                        retry--;
-                }
-
-                /* If DBI FIFO timeout, drop this frame */
-                if (!retry) {
-                        spin_unlock(&sender->lock);
-                        return 0;
-                }
-
-                *(cb + (index++)) = write_mem_start;
-
-                REG_WRITE(sender->mipi_cmd_len_reg, 1);
-                REG_WRITE(sender->mipi_cmd_addr_reg,
-                                        cb_phy | (1 << 0) | (1 << 1));
-
-                retry = MDFLD_DSI_DBI_FIFO_TIMEOUT;
-                while (retry &&
-                        (REG_READ(sender->mipi_cmd_addr_reg) & (1 << 0))) {
-                        udelay(1);
-                        retry--;
-                }
-
-                spin_unlock(&sender->lock);
-                return 0;
-        }
-
-        /* Get a free pkg */
-        spin_lock_irqsave(&sender->lock, flags);
-        pkg = pkg_sender_get_pkg_locked(sender);
-        spin_unlock_irqrestore(&sender->lock, flags);
-
-        if (!pkg) {
-                dev_err(dev->dev, "No packages memory\n");
-                return -ENOMEM;
-        }
-
-        dst = pkg->pkg.dcs_pkg.param;
-        memcpy(dst, param, param_num);
-
-        pkg->pkg_type = MDFLD_DSI_PKG_DCS;
-        pkg->transmission_type = MDFLD_DSI_DCS;
-        pkg->pkg.dcs_pkg.cmd = dcs;
-        pkg->pkg.dcs_pkg.param_num = param_num;
-        pkg->pkg.dcs_pkg.data_src = data_src;
-
-        INIT_LIST_HEAD(&pkg->entry);
-
-        if (param_num == 0)
-                return mdfld_dsi_send_mcs_short_hs(sender, dcs, 0, 0, delay);
-        else if (param_num == 1)
-                return mdfld_dsi_send_mcs_short_hs(sender, dcs,
-                                                        param[0], 1, delay);
-        else if (param_num > 1) {
-                len = (param_num + 1) / 4;
-                if ((param_num + 1) % 4)
-                        len++;
-                return mdfld_dsi_send_mcs_long_hs(sender,
-                                (u32 *)&pkg->pkg.dcs_pkg, len, delay);
-        }
-        return 0;
-}
-
-int mdfld_dsi_send_mcs_short_hs(struct mdfld_dsi_pkg_sender *sender,
-                                u8 cmd, u8 param, u8 param_num, int delay)
-{
-        if (!sender) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-        return mdfld_dsi_send_mcs_short(sender, cmd, param, param_num,
-                                        MDFLD_DSI_HS_TRANSMISSION, delay);
-}
-
-int mdfld_dsi_send_mcs_short_lp(struct mdfld_dsi_pkg_sender *sender,
-                                u8 cmd, u8 param, u8 param_num, int delay)
-{
-        if (!sender) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-        return mdfld_dsi_send_mcs_short(sender, cmd, param, param_num,
-                                        MDFLD_DSI_LP_TRANSMISSION, delay);
-}
-
-int mdfld_dsi_send_mcs_long_hs(struct mdfld_dsi_pkg_sender *sender,
-                                u32 *data,
-                                u32 len,
-                                int delay)
-{
-        if (!sender || !data || !len) {
-                DRM_ERROR("Invalid parameters\n");
-                return -EINVAL;
-        }
-        return mdfld_dsi_send_mcs_long(sender, data, len,
-                                        MDFLD_DSI_HS_TRANSMISSION, delay);
-}
-
-int mdfld_dsi_send_mcs_long_lp(struct mdfld_dsi_pkg_sender *sender,
-                                u32 *data,
-                                u32 len,
-                                int delay)
-{
-        if (!sender || !data || !len) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-        return mdfld_dsi_send_mcs_long(sender, data, len,
-                                MDFLD_DSI_LP_TRANSMISSION, delay);
-}
-
-int mdfld_dsi_send_gen_short_hs(struct mdfld_dsi_pkg_sender *sender,
-                                u8 param0, u8 param1, u8 param_num, int delay)
-{
-        if (!sender) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-        return mdfld_dsi_send_gen_short(sender, param0, param1, param_num,
-                                        MDFLD_DSI_HS_TRANSMISSION, delay);
-}
-
-int mdfld_dsi_send_gen_short_lp(struct mdfld_dsi_pkg_sender *sender,
-                                u8 param0, u8 param1, u8 param_num, int delay)
-{
-        if (!sender || param_num < 0 || param_num > 2) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-        return mdfld_dsi_send_gen_short(sender, param0, param1, param_num,
-                                        MDFLD_DSI_LP_TRANSMISSION, delay);
-}
-
-int mdfld_dsi_send_gen_long_hs(struct mdfld_dsi_pkg_sender *sender,
-                                u32 *data,
-                                u32 len,
-                                int delay)
-{
-        if (!sender || !data || !len) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-        return mdfld_dsi_send_gen_long(sender, data, len,
-                                        MDFLD_DSI_HS_TRANSMISSION, delay);
-}
-
-int mdfld_dsi_send_gen_long_lp(struct mdfld_dsi_pkg_sender *sender,
-                                u32 *data,
-                                u32 len,
-                                int delay)
-{
-        if (!sender || !data || !len) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-        return mdfld_dsi_send_gen_long(sender, data, len,
-                                        MDFLD_DSI_LP_TRANSMISSION, delay);
-}
-
-int mdfld_dsi_read_gen_hs(struct mdfld_dsi_pkg_sender *sender,
-                        u8 param0,
-                        u8 param1,
-                        u8 param_num,
-                        u32 *data,
-                        u16 len)
-{
-        if (!sender || !data || param_num < 0 || param_num > 2
-                || !data || !len) {
-                DRM_ERROR("Invalid parameters\n");
-                return -EINVAL;
-        }
-
-        return mdfld_dsi_read_gen(sender, param0, param1, param_num,
-                                data, len, MDFLD_DSI_HS_TRANSMISSION);
-
-}
-
-int mdfld_dsi_read_gen_lp(struct mdfld_dsi_pkg_sender *sender,
-                        u8 param0,
-                        u8 param1,
-                        u8 param_num,
-                        u32 *data,
-                        u16 len)
-{
-        if (!sender || !data || param_num < 0 || param_num > 2
-                || !data || !len) {
-                DRM_ERROR("Invalid parameters\n");
-                return -EINVAL;
-        }
-
-        return mdfld_dsi_read_gen(sender, param0, param1, param_num,
-                                data, len, MDFLD_DSI_LP_TRANSMISSION);
-}
-
-int mdfld_dsi_read_mcs_hs(struct mdfld_dsi_pkg_sender *sender,
-                        u8 cmd,
-                        u32 *data,
-                        u16 len)
-{
-        if (!sender || !data || !len) {
-                DRM_ERROR("Invalid parameters\n");
-                return -EINVAL;
-        }
-
-        return mdfld_dsi_read_mcs(sender, cmd, data, len,
-                                MDFLD_DSI_HS_TRANSMISSION);
-}
-
-int mdfld_dsi_read_mcs_lp(struct mdfld_dsi_pkg_sender *sender,
-                        u8 cmd,
-                        u32 *data,
-                        u16 len)
-{
-        if (!sender || !data || !len) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-
-        return mdfld_dsi_read_mcs(sender, cmd, data, len,
-                                MDFLD_DSI_LP_TRANSMISSION);
-}
- 
-int mdfld_dsi_pkg_sender_init(struct mdfld_dsi_connector *dsi_connector,
-                                                                int pipe)
-{
-        int ret;
-        struct mdfld_dsi_pkg_sender *pkg_sender;
-        struct mdfld_dsi_config *dsi_config =
-                                        mdfld_dsi_get_config(dsi_connector);
-        struct drm_device *dev = dsi_config->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_gtt *pg = &dev_priv->gtt;
-        int i;
-        struct mdfld_dsi_pkg *pkg, *tmp;
-        u32 mipi_val = 0;
-
-        if (!dsi_connector) {
-                WARN_ON(1);
-                return -EINVAL;
-        }
-
-        pkg_sender = dsi_connector->pkg_sender;
-
-        if (!pkg_sender || IS_ERR(pkg_sender)) {
-                pkg_sender = kzalloc(sizeof(struct mdfld_dsi_pkg_sender),
-                                                                GFP_KERNEL);
-                if (!pkg_sender) {
-                        dev_err(dev->dev, "Create DSI pkg sender failed\n");
-                        return -ENOMEM;
-                }
-
-                dsi_connector->pkg_sender = (void *)pkg_sender;
-        }
-
-        pkg_sender->dev = dev;
-        pkg_sender->dsi_connector = dsi_connector;
-        pkg_sender->pipe = pipe;
-        pkg_sender->pkg_num = 0;
-        pkg_sender->panel_mode = 0;
-        pkg_sender->status = MDFLD_DSI_PKG_SENDER_FREE;
-
-        /* Init dbi command buffer*/
-
-        if (dsi_config->type == MDFLD_DSI_ENCODER_DBI) {
-                pkg_sender->dbi_pkg_support = 1;
-                ret = mdfld_dbi_cb_init(pkg_sender, pg, pipe);
-                if (ret) {
-                        dev_err(dev->dev, "DBI command buffer map failed\n");
-                        goto mapping_err;
-                }
-        }
-
-        /* Init regs */
-        if (pipe == 0) {
-                pkg_sender->dpll_reg = MRST_DPLL_A;
-                pkg_sender->dspcntr_reg = DSPACNTR;
-                pkg_sender->pipeconf_reg = PIPEACONF;
-                pkg_sender->dsplinoff_reg = DSPALINOFF;
-                pkg_sender->dspsurf_reg = DSPASURF;
-                pkg_sender->pipestat_reg = PIPEASTAT;
-
-                pkg_sender->mipi_intr_stat_reg = MIPIA_INTR_STAT_REG;
-                pkg_sender->mipi_lp_gen_data_reg = MIPIA_LP_GEN_DATA_REG;
-                pkg_sender->mipi_hs_gen_data_reg = MIPIA_HS_GEN_DATA_REG;
-                pkg_sender->mipi_lp_gen_ctrl_reg = MIPIA_LP_GEN_CTRL_REG;
-                pkg_sender->mipi_hs_gen_ctrl_reg = MIPIA_HS_GEN_CTRL_REG;
-                pkg_sender->mipi_gen_fifo_stat_reg = MIPIA_GEN_FIFO_STAT_REG;
-                pkg_sender->mipi_data_addr_reg = MIPIA_DATA_ADD_REG;
-                pkg_sender->mipi_data_len_reg = MIPIA_DATA_LEN_REG;
-                pkg_sender->mipi_cmd_addr_reg = MIPIA_CMD_ADD_REG;
-                pkg_sender->mipi_cmd_len_reg = MIPIA_CMD_LEN_REG;
-        } else if (pipe == 2) {
-                pkg_sender->dpll_reg = MRST_DPLL_A;
-                pkg_sender->dspcntr_reg = DSPCCNTR;
-                pkg_sender->pipeconf_reg = PIPECCONF;
-                pkg_sender->dsplinoff_reg = DSPCLINOFF;
-                pkg_sender->dspsurf_reg = DSPCSURF;
-                pkg_sender->pipestat_reg = PIPECSTAT;
-
-                pkg_sender->mipi_intr_stat_reg =
-                                MIPIA_INTR_STAT_REG + MIPIC_REG_OFFSET;
-                pkg_sender->mipi_lp_gen_data_reg =
-                                MIPIA_LP_GEN_DATA_REG + MIPIC_REG_OFFSET;
-                pkg_sender->mipi_hs_gen_data_reg =
-                                MIPIA_HS_GEN_DATA_REG + MIPIC_REG_OFFSET;
-                pkg_sender->mipi_lp_gen_ctrl_reg =
-                                MIPIA_LP_GEN_CTRL_REG + MIPIC_REG_OFFSET;
-                pkg_sender->mipi_hs_gen_ctrl_reg =
-                                MIPIA_HS_GEN_CTRL_REG + MIPIC_REG_OFFSET;
-                pkg_sender->mipi_gen_fifo_stat_reg =
-                                MIPIA_GEN_FIFO_STAT_REG + MIPIC_REG_OFFSET;
-                pkg_sender->mipi_data_addr_reg =
-                                MIPIA_DATA_ADD_REG + MIPIC_REG_OFFSET;
-                pkg_sender->mipi_data_len_reg =
-                                MIPIA_DATA_LEN_REG + MIPIC_REG_OFFSET;
-                pkg_sender->mipi_cmd_addr_reg =
-                                MIPIA_CMD_ADD_REG + MIPIC_REG_OFFSET;
-                pkg_sender->mipi_cmd_len_reg =
-                                MIPIA_CMD_LEN_REG + MIPIC_REG_OFFSET;
-        }
-
-        /* Init pkg list */
-        INIT_LIST_HEAD(&pkg_sender->pkg_list);
-        INIT_LIST_HEAD(&pkg_sender->free_list);
-
-        spin_lock_init(&pkg_sender->lock);
-
-        /* Allocate free pkg pool */
-        for (i = 0; i < MDFLD_MAX_PKG_NUM; i++) {
-                pkg = kzalloc(sizeof(struct mdfld_dsi_pkg), GFP_KERNEL);
-                if (!pkg) {
-                        dev_err(dev->dev, "Out of memory allocating pkg pool");
-                        ret = -ENOMEM;
-                        goto pkg_alloc_err;
-                }
-                INIT_LIST_HEAD(&pkg->entry);
-                list_add_tail(&pkg->entry, &pkg_sender->free_list);
-        }
-
-        /*
-         * For video mode, don't enable DPI timing output here,
-         * will init the DPI timing output during mode setting.
-         */
-        if (dsi_config->type == MDFLD_DSI_ENCODER_DPI)
-                mipi_val = PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
-        else if (dsi_config->type == MDFLD_DSI_ENCODER_DBI)
-                mipi_val = PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX
-                        | TE_TRIGGER_GPIO_PIN;
-        else
-                DRM_ERROR("Bad DSI encoder type\n");
-
-        if (pipe == 0) {
-                mipi_val |= 0x2;
-                REG_WRITE(MIPI, mipi_val);
-                REG_READ(MIPI);
-        } else if (pipe == 2) {
-                REG_WRITE(MIPI_C, mipi_val);
-                REG_READ(MIPI_C);
-        }
-
-        /*do dsi controller init*/
-        dsi_controller_init(dsi_config, pipe);
-        
-        return 0;
-
-pkg_alloc_err:
-        list_for_each_entry_safe(pkg, tmp, &pkg_sender->free_list, entry) {
-                list_del(&pkg->entry);
-                kfree(pkg);
-        }
-
-        /* Free mapped command buffer */
-        mdfld_dbi_cb_destroy(pkg_sender);
-mapping_err:
-        kfree(pkg_sender);
-        dsi_connector->pkg_sender = NULL;
-        return ret;
-}
-
-void mdfld_dsi_pkg_sender_destroy(struct mdfld_dsi_pkg_sender *sender)
-{
-        struct mdfld_dsi_pkg *pkg, *tmp;
-
-        if (!sender || IS_ERR(sender))
-                return;
-
-        /* Free pkg pool */
-        list_for_each_entry_safe(pkg, tmp, &sender->free_list, entry) {
-                list_del(&pkg->entry);
-                kfree(pkg);
-        }
-        /* Free pkg list */
-        list_for_each_entry_safe(pkg, tmp, &sender->pkg_list, entry) {
-                list_del(&pkg->entry);
-                kfree(pkg);
-        }
-        mdfld_dbi_cb_destroy(sender);   /* free mapped command buffer */
-        kfree(sender);
-}
diff --git a/drivers/staging/gma500/mdfld_dsi_pkg_sender.h b/drivers/staging/gma500/mdfld_dsi_pkg_sender.h
deleted file mode 100644
index f24abc700684..000000000000
--- a/drivers/staging/gma500/mdfld_dsi_pkg_sender.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Jackie Li<yaodong.li@intel.com>
- */
-#ifndef __MDFLD_DSI_PKG_SENDER_H__
-#define __MDFLD_DSI_PKG_SENDER_H__
-
-#include <linux/kthread.h>
-
-#define MDFLD_MAX_DCS_PARAM     8
-#define MDFLD_MAX_PKG_NUM       2048
-
-enum {
-        MDFLD_DSI_PKG_DCS,
-        MDFLD_DSI_PKG_GEN_SHORT_WRITE_0 = 0x03,
-        MDFLD_DSI_PKG_GEN_SHORT_WRITE_1 = 0x13,
-        MDFLD_DSI_PKG_GEN_SHORT_WRITE_2 = 0x23,
-        MDFLD_DSI_PKG_GEN_READ_0 = 0x04,
-        MDFLD_DSI_PKG_GEN_READ_1 = 0x14,
-        MDFLD_DSI_PKG_GEN_READ_2 = 0x24,
-        MDFLD_DSI_PKG_GEN_LONG_WRITE = 0x29,
-        MDFLD_DSI_PKG_MCS_SHORT_WRITE_0 = 0x05,
-        MDFLD_DSI_PKG_MCS_SHORT_WRITE_1 = 0x15,
-        MDFLD_DSI_PKG_MCS_READ = 0x06,
-        MDFLD_DSI_PKG_MCS_LONG_WRITE = 0x39,
-};
-
-enum {
-        MDFLD_DSI_LP_TRANSMISSION,
-        MDFLD_DSI_HS_TRANSMISSION,
-        MDFLD_DSI_DCS,
-};
-
-enum {
-        MDFLD_DSI_PANEL_MODE_SLEEP = 0x1,
-};
-
-enum {
-        MDFLD_DSI_PKG_SENDER_FREE = 0x0,
-        MDFLD_DSI_PKG_SENDER_BUSY = 0x1,
-};
-
-enum {
-        MDFLD_DSI_SEND_PACKAGE,
-        MDFLD_DSI_QUEUE_PACKAGE,
-};
-
-struct mdfld_dsi_gen_short_pkg {
-        u8 cmd;
-        u8 param;
-};
-
-struct mdfld_dsi_gen_long_pkg {
-        u32 *data;
-        u32 len;
-};
-
-struct mdfld_dsi_dcs_pkg {
-        u8 cmd;
-        u8 param[MDFLD_MAX_DCS_PARAM];
-        u32 param_num;
-        u8 data_src;
-};
-
-struct mdfld_dsi_pkg {
-        u8 pkg_type;
-        u8 transmission_type;
-
-        union {
-                struct mdfld_dsi_gen_short_pkg short_pkg;
-                struct mdfld_dsi_gen_long_pkg long_pkg;
-                struct mdfld_dsi_dcs_pkg dcs_pkg;
-        } pkg;
-
-        struct list_head entry;
-};
-
-struct mdfld_dsi_pkg_sender {
-        struct drm_device *dev;
-        struct mdfld_dsi_connector *dsi_connector;
-        u32 status;
-
-        u32 panel_mode;
-
-        int pipe;
-
-        spinlock_t lock;
-        struct list_head pkg_list;
-        struct list_head free_list;
-
-        u32 pkg_num;
-
-        int dbi_pkg_support;
-
-        u32 dbi_cb_phy;
-        void *dbi_cb_addr;
-
-        /* Registers */
-        u32 dpll_reg;
-        u32 dspcntr_reg;
-        u32 pipeconf_reg;
-        u32 pipestat_reg;
-        u32 dsplinoff_reg;
-        u32 dspsurf_reg;
-
-        u32 mipi_intr_stat_reg;
-        u32 mipi_lp_gen_data_reg;
-        u32 mipi_hs_gen_data_reg;
-        u32 mipi_lp_gen_ctrl_reg;
-        u32 mipi_hs_gen_ctrl_reg;
-        u32 mipi_gen_fifo_stat_reg;
-        u32 mipi_data_addr_reg;
-        u32 mipi_data_len_reg;
-        u32 mipi_cmd_addr_reg;
-        u32 mipi_cmd_len_reg;
-};
-
-/* DCS definitions */
-#define DCS_SOFT_RESET                  0x01
-#define DCS_ENTER_SLEEP_MODE            0x10
-#define DCS_EXIT_SLEEP_MODE             0x11
-#define DCS_SET_DISPLAY_OFF             0x28
-#define DCS_SET_DISPLAY_ON              0x29
-#define DCS_SET_COLUMN_ADDRESS          0x2a
-#define DCS_SET_PAGE_ADDRESS            0x2b
-#define DCS_WRITE_MEM_START             0x2c
-#define DCS_SET_TEAR_OFF                0x34
-#define DCS_SET_TEAR_ON                 0x35
-
-extern int mdfld_dsi_pkg_sender_init(struct mdfld_dsi_connector *dsi_connector,
-                        int pipe);
-extern void mdfld_dsi_pkg_sender_destroy(struct mdfld_dsi_pkg_sender *sender);
-extern int mdfld_dsi_send_dcs(struct mdfld_dsi_pkg_sender *sender, u8 dcs,
-                        u8 *param, u32 param_num, u8 data_src, int delay);
-extern int mdfld_dsi_send_mcs_short_hs(struct mdfld_dsi_pkg_sender *sender,
-                        u8 cmd, u8 param, u8 param_num, int delay);
-extern int mdfld_dsi_send_mcs_short_lp(struct mdfld_dsi_pkg_sender *sender,
-                        u8 cmd, u8 param, u8 param_num, int delay);
-extern int mdfld_dsi_send_mcs_long_hs(struct mdfld_dsi_pkg_sender *sender,
-                        u32 *data, u32 len, int delay);
-extern int mdfld_dsi_send_mcs_long_lp(struct mdfld_dsi_pkg_sender *sender,
-                        u32 *data, u32 len, int delay);
-extern int mdfld_dsi_send_gen_short_hs(struct mdfld_dsi_pkg_sender *sender,
-                        u8 param0, u8 param1, u8 param_num, int delay);
-extern int mdfld_dsi_send_gen_short_lp(struct mdfld_dsi_pkg_sender *sender,
-                        u8 param0, u8 param1, u8 param_num, int delay);
-extern int mdfld_dsi_send_gen_long_hs(struct mdfld_dsi_pkg_sender *sender,
-                        u32 *data, u32 len, int delay);
-extern int mdfld_dsi_send_gen_long_lp(struct mdfld_dsi_pkg_sender *sender,
-                        u32 *data, u32 len, int delay);
-
-extern int mdfld_dsi_read_gen_hs(struct mdfld_dsi_pkg_sender *sender,
-                        u8 param0, u8 param1, u8 param_num, u32 *data, u16 len);
-extern int mdfld_dsi_read_gen_lp(struct mdfld_dsi_pkg_sender *sender,
-                        u8 param0, u8 param1, u8 param_num, u32 *data, u16 len);
-extern int mdfld_dsi_read_mcs_hs(struct mdfld_dsi_pkg_sender *sender,
-                        u8 cmd, u32 *data, u16 len);
-extern int mdfld_dsi_read_mcs_lp(struct mdfld_dsi_pkg_sender *sender,
-                        u8 cmd, u32 *data, u16 len);
-
-extern void mdfld_dsi_cmds_kick_out(struct mdfld_dsi_pkg_sender *sender);
-
-#endif /* __MDFLD_DSI_PKG_SENDER_H__ */
diff --git a/drivers/staging/gma500/mdfld_intel_display.c b/drivers/staging/gma500/mdfld_intel_display.c
deleted file mode 100644
index 0b37b7b6b02a..000000000000
--- a/drivers/staging/gma500/mdfld_intel_display.c
+++ /dev/null
@@ -1,1404 +0,0 @@
-/*
- * Copyright © 2006-2011 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *      Eric Anholt <eric@anholt.net>
- */
-
-#include "framebuffer.h"
-#include "psb_intel_display.h"
-#include "mdfld_dsi_dbi.h"
-#include "mdfld_dsi_dpi.h"
-#include "mdfld_dsi_dbi_dpu.h"
-
-#include <linux/pm_runtime.h>
-
-#ifdef MIN
-#undef MIN
-#endif
-
-#define MIN(x, y) (((x) < (y)) ? (x) : (y))
-
-/* Hardcoded currently */
-static int ksel = KSEL_CRYSTAL_19;
-
-extern void mdfld_save_display(struct drm_device *dev);
-extern bool gbgfxsuspended;
-
-struct psb_intel_range_t {
-        int min, max;
-};
-
-struct mdfld_limit_t {
-        struct psb_intel_range_t dot, m, p1;
-};
-
-struct mdfld_intel_clock_t {
-        /* given values */
-        int n;
-        int m1, m2;
-        int p1, p2;
-        /* derived values */
-        int dot;
-        int vco;
-        int m;
-        int p;
-};
-
-
-
-#define COUNT_MAX 0x10000000
-
-void mdfldWaitForPipeDisable(struct drm_device *dev, int pipe)
-{
-        int count, temp;
-        u32 pipeconf_reg = PIPEACONF;
-        
-        switch (pipe) {
-        case 0:
-                break;
-        case 1:
-                pipeconf_reg = PIPEBCONF;
-                break;
-        case 2:
-                pipeconf_reg = PIPECCONF;
-                break;
-        default:
-                DRM_ERROR("Illegal Pipe Number. \n");
-                return;
-        }
-
-        /* FIXME JLIU7_PO */
-        psb_intel_wait_for_vblank(dev);
-        return;
-
-        /* Wait for for the pipe disable to take effect. */
-        for (count = 0; count < COUNT_MAX; count++) {
-                temp = REG_READ(pipeconf_reg);
-                if ((temp & PIPEACONF_PIPE_STATE) == 0)
-                        break;
-        }
-}
-
-void mdfldWaitForPipeEnable(struct drm_device *dev, int pipe)
-{
-        int count, temp;
-        u32 pipeconf_reg = PIPEACONF;
-        
-        switch (pipe) {
-        case 0:
-                break;
-        case 1:
-                pipeconf_reg = PIPEBCONF;
-                break;
-        case 2:
-                pipeconf_reg = PIPECCONF;
-                break;
-        default:
-                dev_err(dev->dev, "Illegal Pipe Number.\n");
-                return;
-        }
-
-        /* FIXME JLIU7_PO */
-        psb_intel_wait_for_vblank(dev);
-        return;
-
-        /* Wait for for the pipe enable to take effect. */
-        for (count = 0; count < COUNT_MAX; count++) {
-                temp = REG_READ(pipeconf_reg);
-                if ((temp & PIPEACONF_PIPE_STATE) == 1)
-                        break;
-        }
-}
-
-
-static int mdfld_intel_crtc_cursor_set(struct drm_crtc *crtc,
-                                 struct drm_file *file_priv,
-                                 uint32_t handle,
-                                 uint32_t width, uint32_t height)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        uint32_t control = CURACNTR;
-        uint32_t base = CURABASE;
-        uint32_t temp;
-        size_t addr = 0;
-        struct gtt_range *gt;
-        struct drm_gem_object *obj;
-        int ret;
-
-        switch (pipe) {
-        case 0:
-                break;
-        case 1:
-                control = CURBCNTR;
-                base = CURBBASE;
-                break;
-        case 2:
-                control = CURCCNTR;
-                base = CURCBASE;
-                break;
-        default:
-                dev_err(dev->dev, "Illegal Pipe Number. \n");
-                return -EINVAL;
-        }
-        
-#if 1 /* FIXME_JLIU7 can't enalbe cursorB/C HW issue. need to remove after HW fix */
-        if (pipe != 0)
-                return 0;
-#endif 
-        /* if we want to turn of the cursor ignore width and height */
-        if (!handle) {
-                dev_dbg(dev->dev, "cursor off\n");
-                /* turn off the cursor */
-                temp = 0;
-                temp |= CURSOR_MODE_DISABLE;
-
-                if (gma_power_begin(dev, true)) {
-                        REG_WRITE(control, temp);
-                        REG_WRITE(base, 0);
-                        gma_power_end(dev);
-                }
-                /* Unpin the old GEM object */
-                if (psb_intel_crtc->cursor_obj) {
-                        gt = container_of(psb_intel_crtc->cursor_obj,
-                                                        struct gtt_range, gem);
-                        psb_gtt_unpin(gt);
-                        drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-                        psb_intel_crtc->cursor_obj = NULL;
-                }
-                return 0;
-        }
-
-        /* Currently we only support 64x64 cursors */
-        if (width != 64 || height != 64) {
-                DRM_ERROR("we currently only support 64x64 cursors\n");
-                return -EINVAL;
-        }
-
-        obj = drm_gem_object_lookup(dev, file_priv, handle);
-        if (!obj)
-                return -ENOENT;
-
-        if (obj->size < width * height * 4) {
-                dev_dbg(dev->dev, "buffer is to small\n");
-                return -ENOMEM;
-        }
-
-        gt = container_of(obj, struct gtt_range, gem);
-
-        /* Pin the memory into the GTT */
-        ret = psb_gtt_pin(gt);
-        if (ret) {
-                dev_err(dev->dev, "Can not pin down handle 0x%x\n", handle);
-                return ret;
-        }
-
-
-        addr = gt->offset;      /* Or resource.start ??? */
-
-        psb_intel_crtc->cursor_addr = addr;
-
-        temp = 0;
-        /* set the pipe for the cursor */
-        temp |= (pipe << 28);
-        temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
-
-        if (gma_power_begin(dev, true)) {
-                REG_WRITE(control, temp);
-                REG_WRITE(base, addr);
-                gma_power_end(dev);
-        }
-        /* unpin the old GEM object */
-        if (psb_intel_crtc->cursor_obj) {
-                gt = container_of(psb_intel_crtc->cursor_obj,
-                                                        struct gtt_range, gem);
-                psb_gtt_unpin(gt);
-                drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-                psb_intel_crtc->cursor_obj = obj;
-        }
-        return 0;
-}
-
-static int mdfld_intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private * dev_priv = (struct drm_psb_private *)dev->dev_private;
-        struct mdfld_dbi_dpu_info *dpu_info = dev_priv->dbi_dpu_info;
-        struct psb_drm_dpu_rect rect;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        uint32_t pos = CURAPOS;
-        uint32_t base = CURABASE;
-        uint32_t temp = 0;
-        uint32_t addr;
-
-        switch (pipe) {
-        case 0:
-                if (dpu_info) {
-                        rect.x = x;
-                        rect.y = y;
-                
-                        mdfld_dbi_dpu_report_damage(dev, MDFLD_CURSORA, &rect);
-                        mdfld_dpu_exit_dsr(dev);
-                } else if (!(dev_priv->dsr_fb_update & MDFLD_DSR_CURSOR_0))
-                        mdfld_dsi_dbi_exit_dsr(dev, MDFLD_DSR_CURSOR_0);
-                break;
-        case 1:
-                pos = CURBPOS;
-                base = CURBBASE;
-                break;
-        case 2:
-                if (dpu_info) {
-                        mdfld_dbi_dpu_report_damage(dev, MDFLD_CURSORC, &rect);
-                        mdfld_dpu_exit_dsr(dev);
-                } else if (!(dev_priv->dsr_fb_update & MDFLD_DSR_CURSOR_2))
-                        mdfld_dsi_dbi_exit_dsr(dev, MDFLD_DSR_CURSOR_2);
-                pos = CURCPOS;
-                base = CURCBASE;
-                break;
-        default:
-                DRM_ERROR("Illegal Pipe Number. \n");
-                return -EINVAL;
-        }
-                
-#if 1 /* FIXME_JLIU7 can't enable cursorB/C HW issue. need to remove after HW fix */
-        if (pipe != 0)
-                return 0;
-#endif 
-        if (x < 0) {
-                temp |= (CURSOR_POS_SIGN << CURSOR_X_SHIFT);
-                x = -x;
-        }
-        if (y < 0) {
-                temp |= (CURSOR_POS_SIGN << CURSOR_Y_SHIFT);
-                y = -y;
-        }
-
-        temp |= ((x & CURSOR_POS_MASK) << CURSOR_X_SHIFT);
-        temp |= ((y & CURSOR_POS_MASK) << CURSOR_Y_SHIFT);
-
-        addr = psb_intel_crtc->cursor_addr;
-
-        if (gma_power_begin(dev, true)) {
-                REG_WRITE(pos, temp);
-                REG_WRITE(base, addr);
-                gma_power_end(dev);
-        }
-
-        return 0;
-}
-
-const struct drm_crtc_funcs mdfld_intel_crtc_funcs = {
-        .cursor_set = mdfld_intel_crtc_cursor_set,
-        .cursor_move = mdfld_intel_crtc_cursor_move,
-        .gamma_set = psb_intel_crtc_gamma_set,
-        .set_config = drm_crtc_helper_set_config,
-        .destroy = psb_intel_crtc_destroy,
-};
-
-static struct drm_device globle_dev;
-
-void mdfld__intel_plane_set_alpha(int enable)
-{
-        struct drm_device *dev = &globle_dev;
-        int dspcntr_reg = DSPACNTR;
-        u32 dspcntr;
-
-        dspcntr = REG_READ(dspcntr_reg);
-
-        if (enable) {
-                dspcntr &= ~DISPPLANE_32BPP_NO_ALPHA;
-                dspcntr |= DISPPLANE_32BPP;
-        } else {
-                dspcntr &= ~DISPPLANE_32BPP;
-                dspcntr |= DISPPLANE_32BPP_NO_ALPHA;
-        }
-
-        REG_WRITE(dspcntr_reg, dspcntr);
-}
-
-int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb)
-{
-        struct drm_device *dev = crtc->dev;
-        /* struct drm_i915_master_private *master_priv; */
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
-        int pipe = psb_intel_crtc->pipe;
-        unsigned long start, offset;
-        int dsplinoff = DSPALINOFF;
-        int dspsurf = DSPASURF;
-        int dspstride = DSPASTRIDE;
-        int dspcntr_reg = DSPACNTR;
-        u32 dspcntr;
-        int ret = 0;
-
-        memcpy(&globle_dev, dev, sizeof(struct drm_device));
-
-        if (!gma_power_begin(dev, true))
-                return 0;
-
-        /* no fb bound */
-        if (!crtc->fb) {
-                dev_err(dev->dev, "No FB bound\n");
-                goto psb_intel_pipe_cleaner;
-        }
-
-        switch (pipe) {
-        case 0:
-                dsplinoff = DSPALINOFF;
-                break;
-        case 1:
-                dsplinoff = DSPBLINOFF;
-                dspsurf = DSPBSURF;
-                dspstride = DSPBSTRIDE;
-                dspcntr_reg = DSPBCNTR;
-                break;
-        case 2:
-                dsplinoff = DSPCLINOFF;
-                dspsurf = DSPCSURF;
-                dspstride = DSPCSTRIDE;
-                dspcntr_reg = DSPCCNTR;
-                break;
-        default:
-                dev_err(dev->dev, "Illegal Pipe Number.\n");
-                return -EINVAL;
-        }
-
-        ret = psb_gtt_pin(psbfb->gtt);
-        if (ret < 0)
-                goto psb_intel_pipe_set_base_exit;
-
-        start = psbfb->gtt->offset;
-        offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
-
-        REG_WRITE(dspstride, crtc->fb->pitches[0]);
-        dspcntr = REG_READ(dspcntr_reg);
-        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
-
-        switch (crtc->fb->bits_per_pixel) {
-        case 8:
-                dspcntr |= DISPPLANE_8BPP;
-                break;
-        case 16:
-                if (crtc->fb->depth == 15)
-                        dspcntr |= DISPPLANE_15_16BPP;
-                else
-                        dspcntr |= DISPPLANE_16BPP;
-                break;
-        case 24:
-        case 32:
-                dspcntr |= DISPPLANE_32BPP_NO_ALPHA;
-                break;
-        default:
-                dev_err(dev->dev, "Unknown color depth\n");
-                ret = -EINVAL;
-                goto psb_intel_pipe_set_base_exit;
-        }
-        REG_WRITE(dspcntr_reg, dspcntr);
-
-        dev_dbg(dev->dev, "Writing base %08lX %08lX %d %d\n",
-                                                start, offset, x, y);
-
-        REG_WRITE(dsplinoff, offset);
-        REG_READ(dsplinoff);
-        REG_WRITE(dspsurf, start);
-        REG_READ(dspsurf);
-
-psb_intel_pipe_cleaner:
-        /* If there was a previous display we can now unpin it */
-        if (old_fb)
-                psb_gtt_unpin(to_psb_fb(old_fb)->gtt);
-
-psb_intel_pipe_set_base_exit:
-        gma_power_end(dev);
-        return ret;
-}
-
-/**
- * Disable the pipe, plane and pll.
- *
- */
-void mdfld_disable_crtc (struct drm_device *dev, int pipe)
-{
-        int dpll_reg = MRST_DPLL_A;
-        int dspcntr_reg = DSPACNTR;
-        int dspbase_reg = MRST_DSPABASE;
-        int pipeconf_reg = PIPEACONF;
-        u32 gen_fifo_stat_reg = GEN_FIFO_STAT_REG;
-        u32 temp;
-
-        switch (pipe) {
-        case 0:
-                break;
-        case 1:
-                dpll_reg = MDFLD_DPLL_B;
-                dspcntr_reg = DSPBCNTR;
-                dspbase_reg = DSPBSURF;
-                pipeconf_reg = PIPEBCONF;
-                break;
-        case 2:
-                dpll_reg = MRST_DPLL_A;
-                dspcntr_reg = DSPCCNTR;
-                dspbase_reg = MDFLD_DSPCBASE;
-                pipeconf_reg = PIPECCONF;
-                gen_fifo_stat_reg = GEN_FIFO_STAT_REG + MIPIC_REG_OFFSET;
-                break;
-        default:
-                dev_err(dev->dev, "Illegal Pipe Number. \n");
-                return;
-        }
-
-        if (pipe != 1)
-                mdfld_dsi_gen_fifo_ready (dev, gen_fifo_stat_reg, HS_CTRL_FIFO_EMPTY | HS_DATA_FIFO_EMPTY);
-
-        /* Disable display plane */
-        temp = REG_READ(dspcntr_reg);
-        if ((temp & DISPLAY_PLANE_ENABLE) != 0) {
-                REG_WRITE(dspcntr_reg,
-                          temp & ~DISPLAY_PLANE_ENABLE);
-                /* Flush the plane changes */
-                REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));
-                REG_READ(dspbase_reg);
-        }
-
-        /* FIXME_JLIU7 MDFLD_PO revisit */
-        /* Wait for vblank for the disable to take effect */
-/* MDFLD_PO_JLIU7               psb_intel_wait_for_vblank(dev); */
-
-        /* Next, disable display pipes */
-        temp = REG_READ(pipeconf_reg);
-        if ((temp & PIPEACONF_ENABLE) != 0) {
-                temp &= ~PIPEACONF_ENABLE;
-                temp |= PIPECONF_PLANE_OFF | PIPECONF_CURSOR_OFF;
-                REG_WRITE(pipeconf_reg, temp);
-                REG_READ(pipeconf_reg);
-
-                /* Wait for for the pipe disable to take effect. */
-                mdfldWaitForPipeDisable(dev, pipe);
-        }
-
-        temp = REG_READ(dpll_reg);
-        if (temp & DPLL_VCO_ENABLE) {
-                if (((pipe != 1) && !((REG_READ(PIPEACONF) | REG_READ(PIPECCONF)) & PIPEACONF_ENABLE))
-                                || (pipe == 1)){
-                        temp &= ~(DPLL_VCO_ENABLE);
-                        REG_WRITE(dpll_reg, temp);
-                        REG_READ(dpll_reg);
-                        /* Wait for the clocks to turn off. */
-                        /* FIXME_MDFLD PO may need more delay */
-                        udelay(500);
-
-                        if (!(temp & MDFLD_PWR_GATE_EN)) {
-                                /* gating power of DPLL */
-                                REG_WRITE(dpll_reg, temp | MDFLD_PWR_GATE_EN);
-                                /* FIXME_MDFLD PO - change 500 to 1 after PO */
-                                udelay(5000);
-                        }
-                }
-        }
-
-}
-
-/**
- * Sets the power management mode of the pipe and plane.
- *
- * This code should probably grow support for turning the cursor off and back
- * on appropriately at the same time as we're turning the pipe off/on.
- */
-static void mdfld_crtc_dpms(struct drm_crtc *crtc, int mode)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        int dpll_reg = MRST_DPLL_A;
-        int dspcntr_reg = DSPACNTR;
-        int dspbase_reg = MRST_DSPABASE;
-        int pipeconf_reg = PIPEACONF;
-        u32 pipestat_reg = PIPEASTAT;
-        u32 gen_fifo_stat_reg = GEN_FIFO_STAT_REG;
-        u32 pipeconf = dev_priv->pipeconf;
-        u32 dspcntr = dev_priv->dspcntr;
-        u32 mipi_enable_reg = MIPIA_DEVICE_READY_REG;
-        u32 temp;
-        bool enabled;
-        int timeout = 0;
-
-        if (!gma_power_begin(dev, true))
-                return;
-
-         /* Ignore if system is already in DSR and in suspended state. */
-        if(/*gbgfxsuspended */0 && dev_priv->dispstatus == false && mode == 3){
-            if(dev_priv->rpm_enabled && pipe == 1){
-        //          dev_priv->is_mipi_on = false;
-                  pm_request_idle(&dev->pdev->dev);
-            }
-            return;
-        }else if(mode == 0) {
-                //do not need to set gbdispstatus=true in crtc.
-                //this will be set in encoder such as mdfld_dsi_dbi_dpms
-            //gbdispstatus = true;
-        }
-
-/* FIXME_JLIU7 MDFLD_PO replaced w/ the following function */
-/* mdfld_dbi_dpms (struct drm_device *dev, int pipe, bool enabled) */
-
-        switch (pipe) {
-        case 0:
-                break;
-        case 1:
-                dpll_reg = DPLL_B;
-                dspcntr_reg = DSPBCNTR;
-                dspbase_reg = MRST_DSPBBASE;
-                pipeconf_reg = PIPEBCONF;
-                pipeconf = dev_priv->pipeconf1;
-                dspcntr = dev_priv->dspcntr1;
-                dpll_reg = MDFLD_DPLL_B;
-                break;
-        case 2:
-                dpll_reg = MRST_DPLL_A;
-                dspcntr_reg = DSPCCNTR;
-                dspbase_reg = MDFLD_DSPCBASE;
-                pipeconf_reg = PIPECCONF;
-                pipestat_reg = PIPECSTAT;
-                pipeconf = dev_priv->pipeconf2;
-                dspcntr = dev_priv->dspcntr2;
-                gen_fifo_stat_reg = GEN_FIFO_STAT_REG + MIPIC_REG_OFFSET;
-                mipi_enable_reg = MIPIA_DEVICE_READY_REG + MIPIC_REG_OFFSET;
-                break;
-        default:
-                dev_err(dev->dev, "Illegal Pipe Number.\n");
-                return;
-        }
-
-        /* XXX: When our outputs are all unaware of DPMS modes other than off
-         * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.
-         */
-        switch (mode) {
-        case DRM_MODE_DPMS_ON:
-        case DRM_MODE_DPMS_STANDBY:
-        case DRM_MODE_DPMS_SUSPEND:
-                /* Enable the DPLL */
-                temp = REG_READ(dpll_reg);
-
-                if ((temp & DPLL_VCO_ENABLE) == 0) {
-                        /* When ungating power of DPLL, needs to wait 0.5us before enable the VCO */
-                        if (temp & MDFLD_PWR_GATE_EN) {
-                                temp &= ~MDFLD_PWR_GATE_EN;
-                                REG_WRITE(dpll_reg, temp);
-                                /* FIXME_MDFLD PO - change 500 to 1 after PO */
-                                udelay(500);
-                        }
-
-                        REG_WRITE(dpll_reg, temp);
-                        REG_READ(dpll_reg);
-                        /* FIXME_MDFLD PO - change 500 to 1 after PO */
-                        udelay(500);
-                        
-                        REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);
-                        REG_READ(dpll_reg);
-
-                        /**
-                         * wait for DSI PLL to lock
-                         * NOTE: only need to poll status of pipe 0 and pipe 1,
-                         * since both MIPI pipes share the same PLL.
-                         */
-                        while ((pipe != 2) && (timeout < 20000) && !(REG_READ(pipeconf_reg) & PIPECONF_DSIPLL_LOCK)) {
-                                udelay(150);
-                                timeout ++;
-                        }
-                }
-
-                /* Enable the plane */
-                temp = REG_READ(dspcntr_reg);
-                if ((temp & DISPLAY_PLANE_ENABLE) == 0) {
-                        REG_WRITE(dspcntr_reg,
-                                temp | DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));
-                }
-
-                /* Enable the pipe */
-                temp = REG_READ(pipeconf_reg);
-                if ((temp & PIPEACONF_ENABLE) == 0) {
-                        REG_WRITE(pipeconf_reg, pipeconf);
-
-                        /* Wait for for the pipe enable to take effect. */
-                        mdfldWaitForPipeEnable(dev, pipe);
-                }
-
-                /*workaround for sighting 3741701 Random X blank display*/
-                /*perform w/a in video mode only on pipe A or C*/
-                if ((pipe == 0 || pipe == 2) &&
-                        (mdfld_panel_dpi(dev) == true)) {
-                        REG_WRITE(pipestat_reg, REG_READ(pipestat_reg));
-                        msleep(100);
-                        if(PIPE_VBLANK_STATUS & REG_READ(pipestat_reg)) {
-                                printk(KERN_ALERT "OK");
-                        } else {
-                                printk(KERN_ALERT "STUCK!!!!");
-                                /*shutdown controller*/
-                                temp = REG_READ(dspcntr_reg);
-                                REG_WRITE(dspcntr_reg, temp & ~DISPLAY_PLANE_ENABLE);
-                                REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));
-                                /*mdfld_dsi_dpi_shut_down(dev, pipe);*/
-                                REG_WRITE(0xb048, 1);
-                                msleep(100);
-                                temp = REG_READ(pipeconf_reg);
-                                temp &= ~PIPEACONF_ENABLE;
-                                REG_WRITE(pipeconf_reg, temp);
-                                msleep(100); /*wait for pipe disable*/
-                        /*printk(KERN_ALERT "70008 is %x\n", REG_READ(0x70008));
-                        printk(KERN_ALERT "b074 is %x\n", REG_READ(0xb074));*/
-                                REG_WRITE(mipi_enable_reg, 0);
-                                msleep(100);
-                        printk(KERN_ALERT "70008 is %x\n", REG_READ(0x70008));
-                        printk(KERN_ALERT "b074 is %x\n", REG_READ(0xb074));
-                                REG_WRITE(0xb004, REG_READ(0xb004));
-                                /* try to bring the controller back up again*/
-                                REG_WRITE(mipi_enable_reg, 1);
-                                temp = REG_READ(dspcntr_reg);
-                                REG_WRITE(dspcntr_reg, temp | DISPLAY_PLANE_ENABLE);
-                                REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));
-                                /*mdfld_dsi_dpi_turn_on(dev, pipe);*/
-                                REG_WRITE(0xb048, 2);
-                                msleep(100);
-                                temp = REG_READ(pipeconf_reg);
-                                temp |= PIPEACONF_ENABLE;
-                                REG_WRITE(pipeconf_reg, temp);
-                        }
-                }
-
-                psb_intel_crtc_load_lut(crtc);
-
-                /* Give the overlay scaler a chance to enable
-                   if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, true); TODO */
-
-                break;
-        case DRM_MODE_DPMS_OFF:
-                /* Give the overlay scaler a chance to disable
-                 * if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, FALSE); TODO */
-                if (pipe != 1)
-                        mdfld_dsi_gen_fifo_ready (dev, gen_fifo_stat_reg, HS_CTRL_FIFO_EMPTY | HS_DATA_FIFO_EMPTY);
-
-                /* Disable the VGA plane that we never use */
-                REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);
-
-                /* Disable display plane */
-                temp = REG_READ(dspcntr_reg);
-                if ((temp & DISPLAY_PLANE_ENABLE) != 0) {
-                        REG_WRITE(dspcntr_reg,
-                                  temp & ~DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));
-                        REG_READ(dspbase_reg);
-                }
-
-                /* FIXME_JLIU7 MDFLD_PO revisit */
-                /* Wait for vblank for the disable to take effect */
-// MDFLD_PO_JLIU7               psb_intel_wait_for_vblank(dev);
-
-                /* Next, disable display pipes */
-                temp = REG_READ(pipeconf_reg);
-                if ((temp & PIPEACONF_ENABLE) != 0) {
-                        temp &= ~PIPEACONF_ENABLE;
-                        temp |= PIPECONF_PLANE_OFF | PIPECONF_CURSOR_OFF;
-                        REG_WRITE(pipeconf_reg, temp);
-//                      REG_WRITE(pipeconf_reg, 0);
-                        REG_READ(pipeconf_reg);
-
-                        /* Wait for for the pipe disable to take effect. */
-                        mdfldWaitForPipeDisable(dev, pipe);
-                }
-
-                temp = REG_READ(dpll_reg);
-                if (temp & DPLL_VCO_ENABLE) {
-                        if (((pipe != 1) && !((REG_READ(PIPEACONF) | REG_READ(PIPECCONF)) & PIPEACONF_ENABLE))
-                                        || (pipe == 1)){
-                                temp &= ~(DPLL_VCO_ENABLE);
-                                REG_WRITE(dpll_reg, temp);
-                                REG_READ(dpll_reg);
-                                /* Wait for the clocks to turn off. */
-                                /* FIXME_MDFLD PO may need more delay */
-                                udelay(500);
-#if 0 /* MDFLD_PO_JLIU7 */      
-                if (!(temp & MDFLD_PWR_GATE_EN)) {
-                        /* gating power of DPLL */
-                        REG_WRITE(dpll_reg, temp | MDFLD_PWR_GATE_EN);
-                        /* FIXME_MDFLD PO - change 500 to 1 after PO */
-                        udelay(5000);
-                }
-#endif  /* MDFLD_PO_JLIU7 */    
-                        }
-                }
-                break;
-        }
-
-        enabled = crtc->enabled && mode != DRM_MODE_DPMS_OFF;
-
-#if 0                           /* JB: Add vblank support later */
-        if (enabled)
-                dev_priv->vblank_pipe |= (1 << pipe);
-        else
-                dev_priv->vblank_pipe &= ~(1 << pipe);
-#endif
-
-        gma_power_end(dev);
-}
-
-
-#define MDFLD_LIMT_DPLL_19          0
-#define MDFLD_LIMT_DPLL_25          1
-#define MDFLD_LIMT_DPLL_83          2
-#define MDFLD_LIMT_DPLL_100         3
-#define MDFLD_LIMT_DSIPLL_19        4
-#define MDFLD_LIMT_DSIPLL_25        5
-#define MDFLD_LIMT_DSIPLL_83        6
-#define MDFLD_LIMT_DSIPLL_100       7
-
-#define MDFLD_DOT_MIN             19750  /* FIXME_MDFLD JLIU7 need to find out  min & max for MDFLD */
-#define MDFLD_DOT_MAX             120000
-#define MDFLD_DPLL_M_MIN_19         113
-#define MDFLD_DPLL_M_MAX_19         155
-#define MDFLD_DPLL_P1_MIN_19        2
-#define MDFLD_DPLL_P1_MAX_19        10
-#define MDFLD_DPLL_M_MIN_25         101
-#define MDFLD_DPLL_M_MAX_25         130
-#define MDFLD_DPLL_P1_MIN_25        2
-#define MDFLD_DPLL_P1_MAX_25        10
-#define MDFLD_DPLL_M_MIN_83         64
-#define MDFLD_DPLL_M_MAX_83         64
-#define MDFLD_DPLL_P1_MIN_83        2
-#define MDFLD_DPLL_P1_MAX_83        2
-#define MDFLD_DPLL_M_MIN_100        64
-#define MDFLD_DPLL_M_MAX_100        64
-#define MDFLD_DPLL_P1_MIN_100       2
-#define MDFLD_DPLL_P1_MAX_100       2
-#define MDFLD_DSIPLL_M_MIN_19       131
-#define MDFLD_DSIPLL_M_MAX_19       175
-#define MDFLD_DSIPLL_P1_MIN_19      3
-#define MDFLD_DSIPLL_P1_MAX_19      8
-#define MDFLD_DSIPLL_M_MIN_25       97
-#define MDFLD_DSIPLL_M_MAX_25       140
-#define MDFLD_DSIPLL_P1_MIN_25      3
-#define MDFLD_DSIPLL_P1_MAX_25      9
-#define MDFLD_DSIPLL_M_MIN_83       33
-#define MDFLD_DSIPLL_M_MAX_83       92
-#define MDFLD_DSIPLL_P1_MIN_83      2
-#define MDFLD_DSIPLL_P1_MAX_83      3
-#define MDFLD_DSIPLL_M_MIN_100      97
-#define MDFLD_DSIPLL_M_MAX_100      140
-#define MDFLD_DSIPLL_P1_MIN_100     3
-#define MDFLD_DSIPLL_P1_MAX_100     9
-
-static const struct mdfld_limit_t mdfld_limits[] = {
-        {                       /* MDFLD_LIMT_DPLL_19 */
-         .dot = {.min = MDFLD_DOT_MIN, .max = MDFLD_DOT_MAX},
-         .m = {.min = MDFLD_DPLL_M_MIN_19, .max = MDFLD_DPLL_M_MAX_19},
-         .p1 = {.min = MDFLD_DPLL_P1_MIN_19, .max = MDFLD_DPLL_P1_MAX_19},
-         },
-        {                       /* MDFLD_LIMT_DPLL_25 */
-         .dot = {.min = MDFLD_DOT_MIN, .max = MDFLD_DOT_MAX},
-         .m = {.min = MDFLD_DPLL_M_MIN_25, .max = MDFLD_DPLL_M_MAX_25},
-         .p1 = {.min = MDFLD_DPLL_P1_MIN_25, .max = MDFLD_DPLL_P1_MAX_25},
-         },
-        {                       /* MDFLD_LIMT_DPLL_83 */
-         .dot = {.min = MDFLD_DOT_MIN, .max = MDFLD_DOT_MAX},
-         .m = {.min = MDFLD_DPLL_M_MIN_83, .max = MDFLD_DPLL_M_MAX_83},
-         .p1 = {.min = MDFLD_DPLL_P1_MIN_83, .max = MDFLD_DPLL_P1_MAX_83},
-         },
-        {                       /* MDFLD_LIMT_DPLL_100 */
-         .dot = {.min = MDFLD_DOT_MIN, .max = MDFLD_DOT_MAX},
-         .m = {.min = MDFLD_DPLL_M_MIN_100, .max = MDFLD_DPLL_M_MAX_100},
-         .p1 = {.min = MDFLD_DPLL_P1_MIN_100, .max = MDFLD_DPLL_P1_MAX_100},
-         },
-        {                       /* MDFLD_LIMT_DSIPLL_19 */
-         .dot = {.min = MDFLD_DOT_MIN, .max = MDFLD_DOT_MAX},
-         .m = {.min = MDFLD_DSIPLL_M_MIN_19, .max = MDFLD_DSIPLL_M_MAX_19},
-         .p1 = {.min = MDFLD_DSIPLL_P1_MIN_19, .max = MDFLD_DSIPLL_P1_MAX_19},
-         },
-        {                       /* MDFLD_LIMT_DSIPLL_25 */
-         .dot = {.min = MDFLD_DOT_MIN, .max = MDFLD_DOT_MAX},
-         .m = {.min = MDFLD_DSIPLL_M_MIN_25, .max = MDFLD_DSIPLL_M_MAX_25},
-         .p1 = {.min = MDFLD_DSIPLL_P1_MIN_25, .max = MDFLD_DSIPLL_P1_MAX_25},
-         },
-        {                       /* MDFLD_LIMT_DSIPLL_83 */
-         .dot = {.min = MDFLD_DOT_MIN, .max = MDFLD_DOT_MAX},
-         .m = {.min = MDFLD_DSIPLL_M_MIN_83, .max = MDFLD_DSIPLL_M_MAX_83},
-         .p1 = {.min = MDFLD_DSIPLL_P1_MIN_83, .max = MDFLD_DSIPLL_P1_MAX_83},
-         },
-        {                       /* MDFLD_LIMT_DSIPLL_100 */
-         .dot = {.min = MDFLD_DOT_MIN, .max = MDFLD_DOT_MAX},
-         .m = {.min = MDFLD_DSIPLL_M_MIN_100, .max = MDFLD_DSIPLL_M_MAX_100},
-         .p1 = {.min = MDFLD_DSIPLL_P1_MIN_100, .max = MDFLD_DSIPLL_P1_MAX_100},
-         },
-};
-
-#define MDFLD_M_MIN         21
-#define MDFLD_M_MAX         180
-static const u32 mdfld_m_converts[] = {
-/* M configuration table from 9-bit LFSR table */
-        224, 368, 440, 220, 366, 439, 219, 365, 182, 347, /* 21 - 30 */
-        173, 342, 171, 85, 298, 149, 74, 37, 18, 265,   /* 31 - 40 */
-        388, 194, 353, 432, 216, 108, 310, 155, 333, 166, /* 41 - 50 */
-        83, 41, 276, 138, 325, 162, 337, 168, 340, 170, /* 51 - 60 */
-        341, 426, 469, 234, 373, 442, 221, 110, 311, 411, /* 61 - 70 */
-        461, 486, 243, 377, 188, 350, 175, 343, 427, 213, /* 71 - 80 */
-        106, 53, 282, 397, 354, 227, 113, 56, 284, 142, /* 81 - 90 */
-        71, 35, 273, 136, 324, 418, 465, 488, 500, 506, /* 91 - 100 */
-        253, 126, 63, 287, 399, 455, 483, 241, 376, 444, /* 101 - 110 */
-        478, 495, 503, 251, 381, 446, 479, 239, 375, 443, /* 111 - 120 */
-        477, 238, 119, 315, 157, 78, 295, 147, 329, 420, /* 121 - 130 */
-        210, 105, 308, 154, 77, 38, 275, 137, 68, 290, /* 131 - 140 */
-        145, 328, 164, 82, 297, 404, 458, 485, 498, 249, /* 141 - 150 */
-        380, 190, 351, 431, 471, 235, 117, 314, 413, 206, /* 151 - 160 */
-        103, 51, 25, 12, 262, 387, 193, 96, 48, 280, /* 161 - 170 */
-        396, 198, 99, 305, 152, 76, 294, 403, 457, 228, /* 171 - 180 */
-};
-
-static const struct mdfld_limit_t *mdfld_limit(struct drm_crtc *crtc)
-{
-        const struct mdfld_limit_t *limit = NULL;
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_MIPI)
-            || psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_MIPI2)) {
-                if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19))
-                        limit = &mdfld_limits[MDFLD_LIMT_DSIPLL_19];
-                else if (ksel == KSEL_BYPASS_25) 
-                        limit = &mdfld_limits[MDFLD_LIMT_DSIPLL_25];
-                else if ((ksel == KSEL_BYPASS_83_100) && (dev_priv->core_freq == 166))
-                        limit = &mdfld_limits[MDFLD_LIMT_DSIPLL_83];
-                else if ((ksel == KSEL_BYPASS_83_100) &&
-                         (dev_priv->core_freq == 100 || dev_priv->core_freq == 200))
-                        limit = &mdfld_limits[MDFLD_LIMT_DSIPLL_100];
-        } else if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_HDMI)) {
-                if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19))
-                        limit = &mdfld_limits[MDFLD_LIMT_DPLL_19];
-                else if (ksel == KSEL_BYPASS_25) 
-                        limit = &mdfld_limits[MDFLD_LIMT_DPLL_25];
-                else if ((ksel == KSEL_BYPASS_83_100) && (dev_priv->core_freq == 166))
-                        limit = &mdfld_limits[MDFLD_LIMT_DPLL_83];
-                else if ((ksel == KSEL_BYPASS_83_100) &&
-                         (dev_priv->core_freq == 100 || dev_priv->core_freq == 200))
-                        limit = &mdfld_limits[MDFLD_LIMT_DPLL_100];
-        } else {
-                limit = NULL;
-                dev_err(dev->dev, "mdfld_limit Wrong display type.\n");
-        }
-
-        return limit;
-}
-
-/** Derive the pixel clock for the given refclk and divisors for 8xx chips. */
-static void mdfld_clock(int refclk, struct mdfld_intel_clock_t *clock)
-{
-        clock->dot = (refclk * clock->m) / clock->p1;
-}
-
-/**
- * Returns a set of divisors for the desired target clock with the given refclk,
- * or FALSE.  Divisor values are the actual divisors for
- */
-static bool
-mdfldFindBestPLL(struct drm_crtc *crtc, int target, int refclk,
-                struct mdfld_intel_clock_t *best_clock)
-{
-        struct mdfld_intel_clock_t clock;
-        const struct mdfld_limit_t *limit = mdfld_limit(crtc);
-        int err = target;
-
-        memset(best_clock, 0, sizeof(*best_clock));
-
-        for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) {
-                for (clock.p1 = limit->p1.min; clock.p1 <= limit->p1.max;
-                     clock.p1++) {
-                        int this_err;
-
-                        mdfld_clock(refclk, &clock);
-
-                        this_err = abs(clock.dot - target);
-                        if (this_err < err) {
-                                *best_clock = clock;
-                                err = this_err;
-                        }
-                }
-        }
-        return err != target;
-}
-
-/**
- * Return the pipe currently connected to the panel fitter,
- * or -1 if the panel fitter is not present or not in use
- */
-static int mdfld_panel_fitter_pipe(struct drm_device *dev)
-{
-        u32 pfit_control;
-
-        pfit_control = REG_READ(PFIT_CONTROL);
-
-        /* See if the panel fitter is in use */
-        if ((pfit_control & PFIT_ENABLE) == 0)
-                return -1;
-        return (pfit_control >> 29) & 3;
-}
-
-static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
-                              struct drm_display_mode *mode,
-                              struct drm_display_mode *adjusted_mode,
-                              int x, int y,
-                              struct drm_framebuffer *old_fb)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int pipe = psb_intel_crtc->pipe;
-        int fp_reg = MRST_FPA0;
-        int dpll_reg = MRST_DPLL_A;
-        int dspcntr_reg = DSPACNTR;
-        int pipeconf_reg = PIPEACONF;
-        int htot_reg = HTOTAL_A;
-        int hblank_reg = HBLANK_A;
-        int hsync_reg = HSYNC_A;
-        int vtot_reg = VTOTAL_A;
-        int vblank_reg = VBLANK_A;
-        int vsync_reg = VSYNC_A;
-        int dspsize_reg = DSPASIZE; 
-        int dsppos_reg = DSPAPOS; 
-        int pipesrc_reg = PIPEASRC;
-        u32 *pipeconf = &dev_priv->pipeconf;
-        u32 *dspcntr = &dev_priv->dspcntr;
-        int refclk = 0;
-        int clk_n = 0, clk_p2 = 0, clk_byte = 1, clk = 0, m_conv = 0, clk_tmp = 0;
-        struct mdfld_intel_clock_t clock;
-        bool ok;
-        u32 dpll = 0, fp = 0;
-        bool is_crt = false, is_lvds = false, is_tv = false;
-        bool is_mipi = false, is_mipi2 = false, is_hdmi = false;
-        struct drm_mode_config *mode_config = &dev->mode_config;
-        struct psb_intel_output *psb_intel_output = NULL;
-        uint64_t scalingType = DRM_MODE_SCALE_FULLSCREEN;
-        struct drm_encoder *encoder;
-        struct drm_connector *connector;
-        int timeout = 0;
-
-        dev_dbg(dev->dev, "pipe = 0x%x \n", pipe);
-
-        switch (pipe) {
-        case 0:
-                break;
-        case 1:
-                fp_reg = FPB0;
-                dpll_reg = DPLL_B;
-                dspcntr_reg = DSPBCNTR;
-                pipeconf_reg = PIPEBCONF;
-                htot_reg = HTOTAL_B;
-                hblank_reg = HBLANK_B;
-                hsync_reg = HSYNC_B;
-                vtot_reg = VTOTAL_B;
-                vblank_reg = VBLANK_B;
-                vsync_reg = VSYNC_B;
-                dspsize_reg = DSPBSIZE; 
-                dsppos_reg = DSPBPOS; 
-                pipesrc_reg = PIPEBSRC;
-                pipeconf = &dev_priv->pipeconf1;
-                dspcntr = &dev_priv->dspcntr1;
-                fp_reg = MDFLD_DPLL_DIV0;
-                dpll_reg = MDFLD_DPLL_B;
-                break;
-        case 2:
-                dpll_reg = MRST_DPLL_A;
-                dspcntr_reg = DSPCCNTR;
-                pipeconf_reg = PIPECCONF;
-                htot_reg = HTOTAL_C;
-                hblank_reg = HBLANK_C;
-                hsync_reg = HSYNC_C;
-                vtot_reg = VTOTAL_C;
-                vblank_reg = VBLANK_C;
-                vsync_reg = VSYNC_C;
-                dspsize_reg = DSPCSIZE; 
-                dsppos_reg = DSPCPOS; 
-                pipesrc_reg = PIPECSRC;
-                pipeconf = &dev_priv->pipeconf2;
-                dspcntr = &dev_priv->dspcntr2;
-                break;
-        default:
-                DRM_ERROR("Illegal Pipe Number. \n");
-                return 0;
-        }
-
-        dev_dbg(dev->dev, "adjusted_hdisplay = %d\n",
-                 adjusted_mode->hdisplay);
-        dev_dbg(dev->dev, "adjusted_vdisplay = %d\n",
-                 adjusted_mode->vdisplay);
-        dev_dbg(dev->dev, "adjusted_hsync_start = %d\n",
-                 adjusted_mode->hsync_start);
-        dev_dbg(dev->dev, "adjusted_hsync_end = %d\n",
-                 adjusted_mode->hsync_end);
-        dev_dbg(dev->dev, "adjusted_htotal = %d\n",
-                 adjusted_mode->htotal);
-        dev_dbg(dev->dev, "adjusted_vsync_start = %d\n",
-                 adjusted_mode->vsync_start);
-        dev_dbg(dev->dev, "adjusted_vsync_end = %d\n",
-                 adjusted_mode->vsync_end);
-        dev_dbg(dev->dev, "adjusted_vtotal = %d\n",
-                 adjusted_mode->vtotal);
-        dev_dbg(dev->dev, "adjusted_clock = %d\n",
-                 adjusted_mode->clock);
-        dev_dbg(dev->dev, "hdisplay = %d\n",
-                 mode->hdisplay);
-        dev_dbg(dev->dev, "vdisplay = %d\n",
-                 mode->vdisplay);
-
-        if (!gma_power_begin(dev, true))
-                return 0;
-
-        memcpy(&psb_intel_crtc->saved_mode, mode, sizeof(struct drm_display_mode));
-        memcpy(&psb_intel_crtc->saved_adjusted_mode, adjusted_mode, sizeof(struct drm_display_mode));
-
-        list_for_each_entry(connector, &mode_config->connector_list, head) {
-                        
-                encoder = connector->encoder;
-                
-                if(!encoder)
-                        continue;
-
-                if (encoder->crtc != crtc)
-                        continue;
-
-                psb_intel_output = to_psb_intel_output(connector);
-                
-                dev_dbg(dev->dev, "output->type = 0x%x \n", psb_intel_output->type);
-
-                switch (psb_intel_output->type) {
-                case INTEL_OUTPUT_LVDS:
-                        is_lvds = true;
-                        break;
-                case INTEL_OUTPUT_TVOUT:
-                        is_tv = true;
-                        break;
-                case INTEL_OUTPUT_ANALOG:
-                        is_crt = true;
-                        break;
-                case INTEL_OUTPUT_MIPI:
-                        is_mipi = true;
-                        break;
-                case INTEL_OUTPUT_MIPI2:
-                        is_mipi2 = true;
-                        break;
-                case INTEL_OUTPUT_HDMI:
-                        is_hdmi = true;
-                        break;
-                }
-        }
-
-        /* Disable the VGA plane that we never use */
-        REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);
-
-        /* Disable the panel fitter if it was on our pipe */
-        if (mdfld_panel_fitter_pipe(dev) == pipe)
-                REG_WRITE(PFIT_CONTROL, 0);
-
-        /* pipesrc and dspsize control the size that is scaled from,
-         * which should always be the user's requested size.
-         */
-        if (pipe == 1) {
-                /* FIXME: To make HDMI display with 864x480 (TPO), 480x864 (PYR) or 480x854 (TMD), set the sprite
-                 * width/height and souce image size registers with the adjusted mode for pipe B. */
-
-                /* The defined sprite rectangle must always be completely contained within the displayable
-                 * area of the screen image (frame buffer). */
-                REG_WRITE(dspsize_reg, ((MIN(mode->crtc_vdisplay, adjusted_mode->crtc_vdisplay) - 1) << 16)
-                                | (MIN(mode->crtc_hdisplay, adjusted_mode->crtc_hdisplay) - 1));
-                /* Set the CRTC with encoder mode. */
-                REG_WRITE(pipesrc_reg, ((mode->crtc_hdisplay - 1) << 16)
-                                 | (mode->crtc_vdisplay - 1));
-        } else {
-                REG_WRITE(dspsize_reg, ((mode->crtc_vdisplay - 1) << 16) | (mode->crtc_hdisplay - 1));
-                REG_WRITE(pipesrc_reg, ((mode->crtc_hdisplay - 1) << 16) | (mode->crtc_vdisplay - 1));
-        }
-
-        REG_WRITE(dsppos_reg, 0);
-
-        if (psb_intel_output)
-                drm_connector_property_get_value(&psb_intel_output->base,
-                        dev->mode_config.scaling_mode_property, &scalingType);
-
-        if (scalingType == DRM_MODE_SCALE_NO_SCALE) {
-                /*
-                 *      Medfield doesn't have register support for centering so
-                 *      we need to mess with the h/vblank and h/vsync start and
-                 *      ends to get central
-                 */
-                int offsetX = 0, offsetY = 0;
-
-                offsetX = (adjusted_mode->crtc_hdisplay - mode->crtc_hdisplay) / 2;
-                offsetY = (adjusted_mode->crtc_vdisplay - mode->crtc_vdisplay) / 2;
-
-                REG_WRITE(htot_reg, (mode->crtc_hdisplay - 1) |
-                        ((adjusted_mode->crtc_htotal - 1) << 16));
-                REG_WRITE(vtot_reg, (mode->crtc_vdisplay - 1) |
-                        ((adjusted_mode->crtc_vtotal - 1) << 16));
-                REG_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - offsetX - 1) |
-                        ((adjusted_mode->crtc_hblank_end - offsetX - 1) << 16));
-                REG_WRITE(hsync_reg, (adjusted_mode->crtc_hsync_start - offsetX - 1) |
-                        ((adjusted_mode->crtc_hsync_end - offsetX - 1) << 16));
-                REG_WRITE(vblank_reg, (adjusted_mode->crtc_vblank_start - offsetY - 1) |
-                        ((adjusted_mode->crtc_vblank_end - offsetY - 1) << 16));
-                REG_WRITE(vsync_reg, (adjusted_mode->crtc_vsync_start - offsetY - 1) |
-                        ((adjusted_mode->crtc_vsync_end - offsetY - 1) << 16));
-        } else {
-                REG_WRITE(htot_reg, (adjusted_mode->crtc_hdisplay - 1) |
-                        ((adjusted_mode->crtc_htotal - 1) << 16));
-                REG_WRITE(vtot_reg, (adjusted_mode->crtc_vdisplay - 1) |
-                        ((adjusted_mode->crtc_vtotal - 1) << 16));
-                REG_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - 1) |
-                        ((adjusted_mode->crtc_hblank_end - 1) << 16));
-                REG_WRITE(hsync_reg, (adjusted_mode->crtc_hsync_start - 1) |
-                        ((adjusted_mode->crtc_hsync_end - 1) << 16));
-                REG_WRITE(vblank_reg, (adjusted_mode->crtc_vblank_start - 1) |
-                        ((adjusted_mode->crtc_vblank_end - 1) << 16));
-                REG_WRITE(vsync_reg, (adjusted_mode->crtc_vsync_start - 1) |
-                        ((adjusted_mode->crtc_vsync_end - 1) << 16));
-        }
-
-        /* Flush the plane changes */
-        {
-                struct drm_crtc_helper_funcs *crtc_funcs =
-                    crtc->helper_private;
-                crtc_funcs->mode_set_base(crtc, x, y, old_fb);
-        }
-
-        /* setup pipeconf */
-        *pipeconf = PIPEACONF_ENABLE; /* FIXME_JLIU7 REG_READ(pipeconf_reg); */
-
-        /* Set up the display plane register */
-        *dspcntr = REG_READ(dspcntr_reg);
-        *dspcntr |= pipe << DISPPLANE_SEL_PIPE_POS;
-        *dspcntr |= DISPLAY_PLANE_ENABLE;
-/* MDFLD_PO_JLIU7       dspcntr |= DISPPLANE_BOTTOM; */
-/* MDFLD_PO_JLIU7       dspcntr |= DISPPLANE_GAMMA_ENABLE; */
-
-        if (is_mipi2)
-        {
-                goto mrst_crtc_mode_set_exit;
-        }
-/* FIXME JLIU7 Add MDFLD HDMI supports */
-/* FIXME_MDFLD JLIU7 DSIPLL clock *= 8? */
-/* FIXME_MDFLD JLIU7 need to revist for dual MIPI supports */
-        clk = adjusted_mode->clock;
-
-        if (is_hdmi) {
-                if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19))
-                {
-                        refclk = 19200;
-
-                        if (is_mipi || is_mipi2)
-                        {
-                                clk_n = 1, clk_p2 = 8;
-                        } else if (is_hdmi) {
-                                clk_n = 1, clk_p2 = 10;
-                        }
-                } else if (ksel == KSEL_BYPASS_25) { 
-                        refclk = 25000;
-
-                        if (is_mipi || is_mipi2)
-                        {
-                                clk_n = 1, clk_p2 = 8;
-                        } else if (is_hdmi) {
-                                clk_n = 1, clk_p2 = 10;
-                        }
-                } else if ((ksel == KSEL_BYPASS_83_100) && (dev_priv->core_freq == 166)) {
-                        refclk = 83000;
-
-                        if (is_mipi || is_mipi2)
-                        {
-                                clk_n = 4, clk_p2 = 8;
-                        } else if (is_hdmi) {
-                                clk_n = 4, clk_p2 = 10;
-                        }
-                } else if ((ksel == KSEL_BYPASS_83_100) &&
-                           (dev_priv->core_freq == 100 || dev_priv->core_freq == 200)) {
-                        refclk = 100000;
-                        if (is_mipi || is_mipi2)
-                        {
-                                clk_n = 4, clk_p2 = 8;
-                        } else if (is_hdmi) {
-                                clk_n = 4, clk_p2 = 10;
-                        }
-                }
-
-                if (is_mipi)
-                        clk_byte = dev_priv->bpp / 8;
-                else if (is_mipi2)
-                        clk_byte = dev_priv->bpp2 / 8;
-        
-                clk_tmp = clk * clk_n * clk_p2 * clk_byte;
-
-                dev_dbg(dev->dev, "clk = %d, clk_n = %d, clk_p2 = %d. \n", clk, clk_n, clk_p2);
-                dev_dbg(dev->dev, "adjusted_mode->clock = %d, clk_tmp = %d. \n", adjusted_mode->clock, clk_tmp);
-
-                ok = mdfldFindBestPLL(crtc, clk_tmp, refclk, &clock);
-
-                if (!ok) {
-                        dev_err(dev->dev, 
-                           "mdfldFindBestPLL fail in mdfld_crtc_mode_set. \n");
-                } else {
-                        m_conv = mdfld_m_converts[(clock.m - MDFLD_M_MIN)];
-
-                        dev_dbg(dev->dev, "dot clock = %d,"
-                                 "m = %d, p1 = %d, m_conv = %d. \n", clock.dot, clock.m,
-                                 clock.p1, m_conv);
-                }
-
-                dpll = REG_READ(dpll_reg);
-
-                if (dpll & DPLL_VCO_ENABLE) {
-                        dpll &= ~DPLL_VCO_ENABLE;
-                        REG_WRITE(dpll_reg, dpll);
-                        REG_READ(dpll_reg);
-
-                        /* FIXME jliu7 check the DPLL lock bit PIPEACONF[29] */
-                        /* FIXME_MDFLD PO - change 500 to 1 after PO */
-                        udelay(500);
-
-                        /* reset M1, N1 & P1 */
-                        REG_WRITE(fp_reg, 0);
-                        dpll &= ~MDFLD_P1_MASK;
-                        REG_WRITE(dpll_reg, dpll);
-                        /* FIXME_MDFLD PO - change 500 to 1 after PO */
-                        udelay(500);
-                }
-
-                /* When ungating power of DPLL, needs to wait 0.5us before enable the VCO */
-                if (dpll & MDFLD_PWR_GATE_EN) {
-                        dpll &= ~MDFLD_PWR_GATE_EN;
-                        REG_WRITE(dpll_reg, dpll);
-                        /* FIXME_MDFLD PO - change 500 to 1 after PO */
-                        udelay(500);
-                }       
-
-                dpll = 0; 
-
-#if 0 /* FIXME revisit later */
-                if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19) || (ksel == KSEL_BYPASS_25)) {
-                        dpll &= ~MDFLD_INPUT_REF_SEL;   
-                } else if (ksel == KSEL_BYPASS_83_100) { 
-                        dpll |= MDFLD_INPUT_REF_SEL;    
-                }
-#endif /* FIXME revisit later */
-
-                if (is_hdmi)
-                        dpll |= MDFLD_VCO_SEL;  
-
-                fp = (clk_n / 2) << 16;
-                fp |= m_conv; 
-
-                /* compute bitmask from p1 value */
-                dpll |= (1 << (clock.p1 - 2)) << 17;
-
-#if 0 /* 1080p30 & 720p */
-                dpll = 0x00050000;
-                fp = 0x000001be;
-#endif 
-#if 0 /* 480p */
-                dpll = 0x02010000;
-                fp = 0x000000d2;
-#endif 
-        } else {
-#if 0 /*DBI_TPO_480x864*/
-                dpll = 0x00020000;
-                fp = 0x00000156; 
-#endif /* DBI_TPO_480x864 */ /* get from spec. */
-
-                dpll = 0x00800000;
-                fp = 0x000000c1;
-}
-
-        REG_WRITE(fp_reg, fp);
-        REG_WRITE(dpll_reg, dpll);
-        /* FIXME_MDFLD PO - change 500 to 1 after PO */
-        udelay(500);
-
-        dpll |= DPLL_VCO_ENABLE;
-        REG_WRITE(dpll_reg, dpll);
-        REG_READ(dpll_reg);
-
-        /* wait for DSI PLL to lock */
-        while ((timeout < 20000) && !(REG_READ(pipeconf_reg) & PIPECONF_DSIPLL_LOCK)) {
-                udelay(150);
-                timeout ++;
-        }
-
-        if (is_mipi)
-                goto mrst_crtc_mode_set_exit;
-
-        dev_dbg(dev->dev, "is_mipi = 0x%x \n", is_mipi);
-
-        REG_WRITE(pipeconf_reg, *pipeconf);
-        REG_READ(pipeconf_reg);
-
-        /* Wait for for the pipe enable to take effect. */
-//FIXME_JLIU7 HDMI      mrstWaitForPipeEnable(dev);
-
-        REG_WRITE(dspcntr_reg, *dspcntr);
-        psb_intel_wait_for_vblank(dev);
-
-mrst_crtc_mode_set_exit:
-
-        gma_power_end(dev);
-
-        return 0;
-}
-
-static void mdfld_crtc_prepare(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
-}
-
-static void mdfld_crtc_commit(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-}
-
-static bool mdfld_crtc_mode_fixup(struct drm_crtc *crtc,
-                                  struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
-const struct drm_crtc_helper_funcs mdfld_helper_funcs = {
-        .dpms = mdfld_crtc_dpms,
-        .mode_fixup = mdfld_crtc_mode_fixup,
-        .mode_set = mdfld_crtc_mode_set,
-        .mode_set_base = mdfld__intel_pipe_set_base,
-        .prepare = mdfld_crtc_prepare,
-        .commit = mdfld_crtc_commit,
-};
diff --git a/drivers/staging/gma500/mdfld_msic.h b/drivers/staging/gma500/mdfld_msic.h
deleted file mode 100644
index a7ad65472491..000000000000
--- a/drivers/staging/gma500/mdfld_msic.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *      Jim Liu <jim.liu@intel.com>
- */
-
-#define MSIC_PCI_DEVICE_ID      0x831
-
-int msic_regsiter_driver(void);
-int msic_unregister_driver(void);
-extern void hpd_notify_um(void);
diff --git a/drivers/staging/gma500/mdfld_output.c b/drivers/staging/gma500/mdfld_output.c
deleted file mode 100644
index eabf53d58f92..000000000000
--- a/drivers/staging/gma500/mdfld_output.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c)  2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicensen
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Thomas Eaton <thomas.g.eaton@intel.com>
- * Scott Rowe <scott.m.rowe@intel.com>
-*/
-
-#include <linux/init.h>
-#include <linux/moduleparam.h>
-#include "mdfld_dsi_dbi.h"
-#include "mdfld_dsi_dpi.h"
-#include "mdfld_dsi_output.h"
-#include "mdfld_output.h"
-#include "mdfld_dsi_dbi_dpu.h"
-
-#include "displays/tpo_cmd.h"
-#include "displays/tpo_vid.h"
-#include "displays/tmd_cmd.h"
-#include "displays/tmd_vid.h"
-#include "displays/pyr_cmd.h"
-#include "displays/pyr_vid.h"
-/* #include "displays/hdmi.h" */
-
-static int mdfld_dual_mipi;
-static int mdfld_hdmi;
-static int mdfld_dpu;
-
-module_param(mdfld_dual_mipi, int, 0600);
-MODULE_PARM_DESC(mdfld_dual_mipi, "Enable dual MIPI configuration");
-module_param(mdfld_hdmi, int, 0600);
-MODULE_PARM_DESC(mdfld_hdmi, "Enable Medfield HDMI");
-module_param(mdfld_dpu, int, 0600);
-MODULE_PARM_DESC(mdfld_dpu, "Enable Medfield DPU");
-
-/* For now a single type per device is all we cope with */
-int mdfld_get_panel_type(struct drm_device *dev, int pipe)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        return dev_priv->panel_id;
-}
-
-int mdfld_panel_dpi(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        switch (dev_priv->panel_id) {
-        case TMD_VID:
-        case TPO_VID:
-        case PYR_VID:
-                return true;
-        case TMD_CMD:
-        case TPO_CMD:
-        case PYR_CMD:
-        default:
-                return false;
-        }
-}
-
-static int init_panel(struct drm_device *dev, int mipi_pipe, int p_type)
-{
-        struct panel_funcs *p_cmd_funcs;
-        struct panel_funcs *p_vid_funcs;
-
-        /* Oh boy ... FIXME */
-        p_cmd_funcs = kzalloc(sizeof(struct panel_funcs), GFP_KERNEL);
-        if (p_cmd_funcs == NULL)
-                return -ENODEV;
-        p_vid_funcs = kzalloc(sizeof(struct panel_funcs), GFP_KERNEL);
-        if (p_vid_funcs == NULL) {
-                kfree(p_cmd_funcs);
-                return -ENODEV;
-        }
-
-        switch (p_type) {
-        case TPO_CMD:
-                tpo_cmd_init(dev, p_cmd_funcs);
-                mdfld_dsi_output_init(dev, mipi_pipe, NULL, p_cmd_funcs, NULL);
-                break;
-        case TPO_VID:
-                tpo_vid_init(dev, p_vid_funcs);
-                mdfld_dsi_output_init(dev, mipi_pipe, NULL, NULL, p_vid_funcs);
-                break;
-        case TMD_CMD:
-                /*tmd_cmd_init(dev, p_cmd_funcs); */
-                mdfld_dsi_output_init(dev, mipi_pipe, NULL, p_cmd_funcs, NULL);
-                break;
-        case TMD_VID:
-                tmd_vid_init(dev, p_vid_funcs);
-                mdfld_dsi_output_init(dev, mipi_pipe, NULL, NULL, p_vid_funcs);
-                break;
-        case PYR_CMD:
-                pyr_cmd_init(dev, p_cmd_funcs);
-                mdfld_dsi_output_init(dev, mipi_pipe, NULL, p_cmd_funcs, NULL);
-                break;
-        case PYR_VID:
-                mdfld_dsi_output_init(dev, mipi_pipe, NULL, NULL, p_vid_funcs);
-                break;
-        case TPO:       /* TPO panel supports both cmd & vid interfaces */
-                tpo_cmd_init(dev, p_cmd_funcs);
-                tpo_vid_init(dev, p_vid_funcs);
-                mdfld_dsi_output_init(dev, mipi_pipe, NULL, p_cmd_funcs,
-                                      p_vid_funcs);
-                break;
-        case TMD:
-                break;
-        case PYR:
-                break;
-#if 0
-        case HDMI:
-                dev_dbg(dev->dev, "Initializing HDMI");
-                mdfld_hdmi_init(dev, &dev_priv->mode_dev);
-                break;
-#endif
-        default:
-                dev_err(dev->dev, "Unsupported interface %d", p_type);
-                return -ENODEV;
-        }
-        return 0;
-}
-
-int mdfld_output_init(struct drm_device *dev)
-{
-        int type;
-
-        /* MIPI panel 1 */
-        type = mdfld_get_panel_type(dev, 0);
-        dev_info(dev->dev, "panel 1: type is %d\n", type);
-        init_panel(dev, 0, type);
-
-        if (mdfld_dual_mipi) {
-                /* MIPI panel 2 */
-                type = mdfld_get_panel_type(dev, 2);
-                dev_info(dev->dev, "panel 2: type is %d\n", type);
-                init_panel(dev, 2, type);
-        }
-        if (mdfld_hdmi)
-                /* HDMI panel */
-                init_panel(dev, 0, HDMI);
-        return 0;
-}
-
-void mdfld_output_setup(struct drm_device *dev)
-{
-        /* FIXME: this is not the right place for this stuff ! */
-        if (IS_MFLD(dev)) {
-                if (mdfld_dpu)
-                        mdfld_dbi_dpu_init(dev);
-                else
-                        mdfld_dbi_dsr_init(dev);
-        }
-}
diff --git a/drivers/staging/gma500/mdfld_output.h b/drivers/staging/gma500/mdfld_output.h
deleted file mode 100644
index daf33e7df9d5..000000000000
--- a/drivers/staging/gma500/mdfld_output.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c)  2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicensen
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Thomas Eaton <thomas.g.eaton@intel.com>
- * Scott Rowe <scott.m.rowe@intel.com>
-*/
-
-#ifndef MDFLD_OUTPUT_H
-#define MDFLD_OUTPUT_H
-
-int mdfld_output_init(struct drm_device *dev);
-int mdfld_panel_dpi(struct drm_device *dev);
-int mdfld_get_panel_type(struct drm_device *dev, int pipe);
-void mdfld_disable_crtc (struct drm_device *dev, int pipe);
-
-extern const struct drm_crtc_helper_funcs mdfld_helper_funcs;
-extern const struct drm_crtc_funcs mdfld_intel_crtc_funcs;
-
-extern void mdfld_output_setup(struct drm_device *dev);
-
-#endif
diff --git a/drivers/staging/gma500/mdfld_pyr_cmd.c b/drivers/staging/gma500/mdfld_pyr_cmd.c
deleted file mode 100644
index 523f2d8fe4f1..000000000000
--- a/drivers/staging/gma500/mdfld_pyr_cmd.c
+++ /dev/null
@@ -1,558 +0,0 @@
-/*
- * Copyright (c)  2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicensen
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Thomas Eaton <thomas.g.eaton@intel.com>
- * Scott Rowe <scott.m.rowe@intel.com>
-*/
-
-#include "mdfld_dsi_dbi.h"
-#include "mdfld_dsi_dpi.h"
-#include "mdfld_dsi_output.h"
-#include "mdfld_output.h"
-#include "mdfld_dsi_dbi_dpu.h"
-#include "mdfld_dsi_pkg_sender.h"
-
-#include "displays/pyr_cmd.h"
-
-static struct drm_display_mode *pyr_cmd_get_config_mode(struct drm_device *dev)
-{
-        struct drm_display_mode *mode;
-
-        mode = kzalloc(sizeof(*mode), GFP_KERNEL);
-        if (!mode) {
-                dev_err(dev->dev, "Out of memory\n");
-                return NULL;
-        }
-
-        dev_dbg(dev->dev, "hdisplay is %d\n", mode->hdisplay);
-        dev_dbg(dev->dev, "vdisplay is %d\n", mode->vdisplay);
-        dev_dbg(dev->dev, "HSS is %d\n", mode->hsync_start);
-        dev_dbg(dev->dev, "HSE is %d\n", mode->hsync_end);
-        dev_dbg(dev->dev, "htotal is %d\n", mode->htotal);
-        dev_dbg(dev->dev, "VSS is %d\n", mode->vsync_start);
-        dev_dbg(dev->dev, "VSE is %d\n", mode->vsync_end);
-        dev_dbg(dev->dev, "vtotal is %d\n", mode->vtotal);
-        dev_dbg(dev->dev, "clock is %d\n", mode->clock);
-
-        mode->hdisplay = 480;
-        mode->vdisplay = 864;
-        mode->hsync_start = 487;
-        mode->hsync_end = 490;
-        mode->htotal = 499;
-        mode->vsync_start = 874;
-        mode->vsync_end = 878;
-        mode->vtotal = 886;
-        mode->clock = 25777;
-
-        drm_mode_set_name(mode);
-        drm_mode_set_crtcinfo(mode, 0);
-
-        mode->type |= DRM_MODE_TYPE_PREFERRED;
-
-        return mode;
-}
-
-static bool pyr_dsi_dbi_mode_fixup(struct drm_encoder *encoder,
-                                struct drm_display_mode *mode,
-                                struct drm_display_mode *adjusted_mode)
-{
-        struct drm_device *dev = encoder->dev;
-        struct drm_display_mode *fixed_mode = pyr_cmd_get_config_mode(dev);
-
-        if (fixed_mode) {
-                adjusted_mode->hdisplay = fixed_mode->hdisplay;
-                adjusted_mode->hsync_start = fixed_mode->hsync_start;
-                adjusted_mode->hsync_end = fixed_mode->hsync_end;
-                adjusted_mode->htotal = fixed_mode->htotal;
-                adjusted_mode->vdisplay = fixed_mode->vdisplay;
-                adjusted_mode->vsync_start = fixed_mode->vsync_start;
-                adjusted_mode->vsync_end = fixed_mode->vsync_end;
-                adjusted_mode->vtotal = fixed_mode->vtotal;
-                adjusted_mode->clock = fixed_mode->clock;
-                drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
-                kfree(fixed_mode);
-        }
-        return true;
-}
-
-static void pyr_dsi_dbi_set_power(struct drm_encoder *encoder, bool on)
-{
-        int ret = 0;
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dbi_output *dbi_output =
-                                MDFLD_DSI_DBI_OUTPUT(dsi_encoder);
-        struct drm_device *dev = encoder->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 reg_offset = 0;
-        int pipe = (dbi_output->channel_num == 0) ? 0 : 2;
-
-        dev_dbg(dev->dev, "pipe %d : %s, panel on: %s\n", pipe,
-                        on ? "On" : "Off",
-                        dbi_output->dbi_panel_on ? "True" : "False");
-
-        if (pipe == 2) {
-                if (on)
-                        dev_priv->dual_mipi = true;
-                else
-                        dev_priv->dual_mipi = false;
-
-                reg_offset = MIPIC_REG_OFFSET;
-        } else {
-                if (!on)
-                        dev_priv->dual_mipi = false;
-        }
-
-        if (!gma_power_begin(dev, true)) {
-                dev_err(dev->dev, "hw begin failed\n");
-                return;
-        }
-
-
-        if (on) {
-                if (dbi_output->dbi_panel_on)
-                        goto out_err;
-
-                ret = mdfld_dsi_dbi_update_power(dbi_output, DRM_MODE_DPMS_ON);
-                if (ret) {
-                        dev_err(dev->dev, "power on error\n");
-                        goto out_err;
-                }
-
-                dbi_output->dbi_panel_on = true;
-
-                if (pipe == 2) {
-                        dev_priv->dbi_panel_on2 = true;
-                } else {
-                        dev_priv->dbi_panel_on = true;
-                        mdfld_enable_te(dev, 0);
-                }
-        } else {
-                if (!dbi_output->dbi_panel_on && !dbi_output->first_boot)
-                        goto out_err;
-
-                dbi_output->dbi_panel_on = false;
-                dbi_output->first_boot = false;
-
-                if (pipe == 2) {
-                        dev_priv->dbi_panel_on2 = false;
-                        mdfld_disable_te(dev, 2);
-                } else {
-                        dev_priv->dbi_panel_on = false;
-                        mdfld_disable_te(dev, 0);
-
-                        if (dev_priv->dbi_panel_on2)
-                                mdfld_enable_te(dev, 2);
-                }
-
-                ret = mdfld_dsi_dbi_update_power(dbi_output, DRM_MODE_DPMS_OFF);
-                if (ret) {
-                        dev_err(dev->dev, "power on error\n");
-                        goto out_err;
-                }
-        }
-
-out_err:
-        gma_power_end(dev);
-
-        if (ret)
-                dev_err(dev->dev, "failed\n");
-}
-
-static void pyr_dsi_controller_dbi_init(struct mdfld_dsi_config *dsi_config,
-                                                                int pipe)
-{
-        struct drm_device *dev = dsi_config->dev;
-        u32 reg_offset = pipe ? MIPIC_REG_OFFSET : 0;
-        int lane_count = dsi_config->lane_count;
-        u32 val = 0;
-
-        dev_dbg(dev->dev, "Init DBI interface on pipe %d...\n", pipe);
-
-        /* Un-ready device */
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset), 0x00000000);
-
-        /* Init dsi adapter before kicking off */
-        REG_WRITE((MIPIA_CONTROL_REG + reg_offset), 0x00000018);
-
-        /* TODO: figure out how to setup these registers */
-        REG_WRITE((MIPIA_DPHY_PARAM_REG + reg_offset), 0x150c600F);
-        REG_WRITE((MIPIA_CLK_LANE_SWITCH_TIME_CNT_REG + reg_offset),
-                                                                0x000a0014);
-        REG_WRITE((MIPIA_DBI_BW_CTRL_REG + reg_offset), 0x00000400);
-        REG_WRITE((MIPIA_HS_LS_DBI_ENABLE_REG + reg_offset), 0x00000000);
-
-        /* Enable all interrupts */
-        REG_WRITE((MIPIA_INTR_EN_REG + reg_offset), 0xffffffff);
-        /* Max value: 20 clock cycles of txclkesc */
-        REG_WRITE((MIPIA_TURN_AROUND_TIMEOUT_REG + reg_offset), 0x0000001f);
-        /* Min 21 txclkesc, max: ffffh */
-        REG_WRITE((MIPIA_DEVICE_RESET_TIMER_REG + reg_offset), 0x0000ffff);
-        /* Min: 7d0 max: 4e20 */
-        REG_WRITE((MIPIA_INIT_COUNT_REG + reg_offset), 0x00000fa0);
-
-        /* Set up func_prg */
-        val |= lane_count;
-        val |= (dsi_config->channel_num << DSI_DBI_VIRT_CHANNEL_OFFSET);
-        val |= DSI_DBI_COLOR_FORMAT_OPTION2;
-        REG_WRITE((MIPIA_DSI_FUNC_PRG_REG + reg_offset), val);
-
-        REG_WRITE((MIPIA_HS_TX_TIMEOUT_REG + reg_offset), 0x3fffff);
-        REG_WRITE((MIPIA_LP_RX_TIMEOUT_REG + reg_offset), 0xffff);
-
-        /* De-assert dbi_stall when half of DBI FIFO is empty */
-        /* REG_WRITE((MIPIA_DBI_FIFO_THROTTLE_REG + reg_offset), 0x00000000); */
-
-        REG_WRITE((MIPIA_HIGH_LOW_SWITCH_COUNT_REG + reg_offset), 0x46);
-        REG_WRITE((MIPIA_EOT_DISABLE_REG + reg_offset), 0x00000002);
-        REG_WRITE((MIPIA_LP_BYTECLK_REG + reg_offset), 0x00000004);
-        REG_WRITE((MIPIA_DEVICE_READY_REG + reg_offset), 0x00000001);
-}
-
-static void pyr_dsi_dbi_mode_set(struct drm_encoder *encoder,
-                                struct drm_display_mode *mode,
-                                struct drm_display_mode *adjusted_mode)
-{
-        int ret = 0;
-        struct drm_device *dev = encoder->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dbi_output *dsi_output =
-                                        MDFLD_DSI_DBI_OUTPUT(dsi_encoder);
-        struct mdfld_dsi_config *dsi_config =
-                                mdfld_dsi_encoder_get_config(dsi_encoder);
-        struct mdfld_dsi_connector *dsi_connector = dsi_config->connector;
-        int pipe = dsi_connector->pipe;
-        u8 param = 0;
-
-        /* Regs */
-        u32 mipi_reg = MIPI;
-        u32 dspcntr_reg = DSPACNTR;
-        u32 pipeconf_reg = PIPEACONF;
-        u32 reg_offset = 0;
-
-        /* Values */
-        u32 dspcntr_val = dev_priv->dspcntr;
-        u32 pipeconf_val = dev_priv->pipeconf;
-        u32 h_active_area = mode->hdisplay;
-        u32 v_active_area = mode->vdisplay;
-        u32 mipi_val = (PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX |
-                                                        TE_TRIGGER_GPIO_PIN);
-
-        dev_dbg(dev->dev, "mipi_val =0x%x\n", mipi_val);
-
-        dev_dbg(dev->dev, "type %s\n", (pipe == 2) ? "MIPI2" : "MIPI");
-        dev_dbg(dev->dev, "h %d v %d\n", mode->hdisplay, mode->vdisplay);
-
-        if (pipe == 2) {
-                mipi_reg = MIPI_C;
-                dspcntr_reg = DSPCCNTR;
-                pipeconf_reg = PIPECCONF;
-
-                reg_offset = MIPIC_REG_OFFSET;
-
-                dspcntr_val = dev_priv->dspcntr2;
-                pipeconf_val = dev_priv->pipeconf2;
-        } else {
-                mipi_val |= 0x2; /* Two lanes for port A and C respectively */
-        }
-
-        if (!gma_power_begin(dev, true)) {
-                dev_err(dev->dev, "hw begin failed\n");
-                return;
-        }
-
-        /* Set up pipe related registers */
-        REG_WRITE(mipi_reg, mipi_val);
-        REG_READ(mipi_reg);
-
-        pyr_dsi_controller_dbi_init(dsi_config, pipe);
-
-        msleep(20);
-
-        REG_WRITE(dspcntr_reg, dspcntr_val);
-        REG_READ(dspcntr_reg);
-
-        /* 20ms delay before sending exit_sleep_mode */
-        msleep(20);
-
-        /* Send exit_sleep_mode DCS */
-        ret = mdfld_dsi_dbi_send_dcs(dsi_output, exit_sleep_mode, NULL,
-                                                0, CMD_DATA_SRC_SYSTEM_MEM);
-        if (ret) {
-                dev_err(dev->dev, "sent exit_sleep_mode faild\n");
-                goto out_err;
-        }
-
-        /*send set_tear_on DCS*/
-        ret = mdfld_dsi_dbi_send_dcs(dsi_output, set_tear_on,
-                                        &param, 1, CMD_DATA_SRC_SYSTEM_MEM);
-        if (ret) {
-                dev_err(dev->dev, "%s - sent set_tear_on faild\n", __func__);
-                goto out_err;
-        }
-
-        /* Do some init stuff */
-        mdfld_dsi_brightness_init(dsi_config, pipe);
-        mdfld_dsi_gen_fifo_ready(dev, (MIPIA_GEN_FIFO_STAT_REG + reg_offset),
-                                HS_CTRL_FIFO_EMPTY | HS_DATA_FIFO_EMPTY);
-
-        REG_WRITE(pipeconf_reg, pipeconf_val | PIPEACONF_DSR);
-        REG_READ(pipeconf_reg);
-
-        /* TODO: this looks ugly, try to move it to CRTC mode setting */
-        if (pipe == 2)
-                dev_priv->pipeconf2 |= PIPEACONF_DSR;
-        else
-                dev_priv->pipeconf |= PIPEACONF_DSR;
-
-        dev_dbg(dev->dev, "pipeconf %x\n",  REG_READ(pipeconf_reg));
-
-        ret = mdfld_dsi_dbi_update_area(dsi_output, 0, 0,
-                                h_active_area - 1, v_active_area - 1);
-        if (ret) {
-                dev_err(dev->dev, "update area failed\n");
-                goto out_err;
-        }
-
-out_err:
-        gma_power_end(dev);
-
-        if (ret)
-                dev_err(dev->dev, "mode set failed\n");
-        else
-                dev_dbg(dev->dev, "mode set done successfully\n");
-}
-
-static void pyr_dsi_dbi_prepare(struct drm_encoder *encoder)
-{
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dbi_output *dbi_output =
-                                        MDFLD_DSI_DBI_OUTPUT(dsi_encoder);
-
-        dbi_output->mode_flags |= MODE_SETTING_IN_ENCODER;
-        dbi_output->mode_flags &= ~MODE_SETTING_ENCODER_DONE;
-
-        pyr_dsi_dbi_set_power(encoder, false);
-}
-
-static void pyr_dsi_dbi_commit(struct drm_encoder *encoder)
-{
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dbi_output *dbi_output =
-                                        MDFLD_DSI_DBI_OUTPUT(dsi_encoder);
-        struct drm_device *dev = dbi_output->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_drm_dpu_rect rect;
-
-        pyr_dsi_dbi_set_power(encoder, true);
-
-        dbi_output->mode_flags &= ~MODE_SETTING_IN_ENCODER;
-
-        rect.x = rect.y = 0;
-        rect.width = 864;
-        rect.height = 480;
-
-        if (dbi_output->channel_num == 1) {
-                dev_priv->dsr_fb_update |= MDFLD_DSR_2D_3D_2;
-                /* If DPU enabled report a fullscreen damage */
-                mdfld_dbi_dpu_report_damage(dev, MDFLD_PLANEC, &rect);
-        } else {
-                dev_priv->dsr_fb_update |= MDFLD_DSR_2D_3D_0;
-                mdfld_dbi_dpu_report_damage(dev, MDFLD_PLANEA, &rect);
-        }
-        dbi_output->mode_flags |= MODE_SETTING_ENCODER_DONE;
-}
-
-static void pyr_dsi_dbi_dpms(struct drm_encoder *encoder, int mode)
-{
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dbi_output *dbi_output =
-                                        MDFLD_DSI_DBI_OUTPUT(dsi_encoder);
-        struct drm_device *dev = dbi_output->dev;
-
-        dev_dbg(dev->dev, "%s\n",  (mode == DRM_MODE_DPMS_ON ? "on" : "off"));
-
-        if (mode == DRM_MODE_DPMS_ON)
-                pyr_dsi_dbi_set_power(encoder, true);
-        else
-                pyr_dsi_dbi_set_power(encoder, false);
-}
-
-/*
- * Update the DBI MIPI Panel Frame Buffer.
- */
-static void pyr_dsi_dbi_update_fb(struct mdfld_dsi_dbi_output *dbi_output,
-                                                                int pipe)
-{
-        struct mdfld_dsi_pkg_sender *sender =
-                mdfld_dsi_encoder_get_pkg_sender(&dbi_output->base);
-        struct drm_device *dev = dbi_output->dev;
-        struct drm_crtc *crtc = dbi_output->base.base.crtc;
-        struct psb_intel_crtc *psb_crtc = (crtc) ?
-                                to_psb_intel_crtc(crtc) : NULL;
-
-        u32 dpll_reg = MRST_DPLL_A;
-        u32 dspcntr_reg = DSPACNTR;
-        u32 pipeconf_reg = PIPEACONF;
-        u32 dsplinoff_reg = DSPALINOFF;
-        u32 dspsurf_reg = DSPASURF;
-        u32 hs_gen_ctrl_reg = HS_GEN_CTRL_REG;
-        u32 gen_fifo_stat_reg = GEN_FIFO_STAT_REG;
-        u32 reg_offset = 0;
-
-        u32 intr_status;
-        u32 fifo_stat_reg_val;
-        u32 dpll_reg_val;
-        u32 dspcntr_reg_val;
-        u32 pipeconf_reg_val;
-
-        /* If mode setting on-going, back off */
-        if ((dbi_output->mode_flags & MODE_SETTING_ON_GOING) ||
-                (psb_crtc && psb_crtc->mode_flags & MODE_SETTING_ON_GOING) ||
-                !(dbi_output->mode_flags & MODE_SETTING_ENCODER_DONE))
-                return;
-
-        /*
-         * Look for errors here.  In particular we're checking for whatever
-         * error status might have appeared during the last frame transmit
-         * (memory write).
-         *
-         * Normally, the bits we're testing here would be set infrequently,
-         * if at all.  However, one panel (at least) returns at least one
-         * error bit on most frames.  So we've disabled the kernel message
-         * for now.
-         *
-         * Still clear whatever error bits are set, except don't clear the
-         * ones that would make the Penwell DSI controller reset if we
-         * cleared them.
-         */
-        intr_status = REG_READ(INTR_STAT_REG);
-        if ((intr_status & 0x26FFFFFF) != 0) {
-                /* dev_err(dev->dev, "DSI status: 0x%08X\n", intr_status); */
-                intr_status &= 0x26F3FFFF;
-                REG_WRITE(INTR_STAT_REG, intr_status);
-        }
-
-        if (pipe == 2) {
-                dspcntr_reg = DSPCCNTR;
-                pipeconf_reg = PIPECCONF;
-                dsplinoff_reg = DSPCLINOFF;
-                dspsurf_reg = DSPCSURF;
-
-                hs_gen_ctrl_reg = HS_GEN_CTRL_REG + MIPIC_REG_OFFSET;
-                gen_fifo_stat_reg = GEN_FIFO_STAT_REG + MIPIC_REG_OFFSET,
-
-                reg_offset = MIPIC_REG_OFFSET;
-        }
-
-        if (!gma_power_begin(dev, true)) {
-                dev_err(dev->dev, "hw begin failed\n");
-                return;
-        }
-
-        fifo_stat_reg_val = REG_READ(MIPIA_GEN_FIFO_STAT_REG + reg_offset);
-        dpll_reg_val = REG_READ(dpll_reg);
-        dspcntr_reg_val = REG_READ(dspcntr_reg);
-        pipeconf_reg_val = REG_READ(pipeconf_reg);
-
-        if (!(fifo_stat_reg_val & (1 << 27)) ||
-                (dpll_reg_val & DPLL_VCO_ENABLE) ||
-                !(dspcntr_reg_val & DISPLAY_PLANE_ENABLE) ||
-                !(pipeconf_reg_val & DISPLAY_PLANE_ENABLE)) {
-                goto update_fb_out0;
-        }
-
-        /* Refresh plane changes */
-        REG_WRITE(dsplinoff_reg, REG_READ(dsplinoff_reg));
-        REG_WRITE(dspsurf_reg, REG_READ(dspsurf_reg));
-        REG_READ(dspsurf_reg);
-
-        mdfld_dsi_send_dcs(sender,
-                           write_mem_start,
-                           NULL,
-                           0,
-                           CMD_DATA_SRC_PIPE,
-                           MDFLD_DSI_SEND_PACKAGE);
-
-        /*
-         * The idea here is to transmit a Generic Read command after the
-         * Write Memory Start/Continue commands finish.  This asks for
-         * the panel to return an "ACK No Errors," or (if it has errors
-         * to report) an Error Report.  This allows us to monitor the
-         * panel's perception of the health of the DSI.
-         */
-        mdfld_dsi_gen_fifo_ready(dev, gen_fifo_stat_reg,
-                                HS_CTRL_FIFO_EMPTY | HS_DATA_FIFO_EMPTY);
-        REG_WRITE(hs_gen_ctrl_reg, (1 << WORD_COUNTS_POS) | GEN_READ_0);
-
-        dbi_output->dsr_fb_update_done = true;
-update_fb_out0:
-        gma_power_end(dev);
-}
-
-/*
- * TODO: will be removed later, should work out display interfaces for power
- */
-void pyr_dsi_adapter_init(struct mdfld_dsi_config *dsi_config, int pipe)
-{
-        if (!dsi_config || (pipe != 0 && pipe != 2)) {
-                WARN_ON(1);
-                return;
-        }
-        pyr_dsi_controller_dbi_init(dsi_config, pipe);
-}
-
-static int pyr_cmd_get_panel_info(struct drm_device *dev, int pipe,
-                                                        struct panel_info *pi)
-{
-        if (!dev || !pi)
-                return -EINVAL;
-
-        pi->width_mm = PYR_PANEL_WIDTH;
-        pi->height_mm = PYR_PANEL_HEIGHT;
-
-        return 0;
-}
-
-/* PYR DBI encoder helper funcs */
-static const struct drm_encoder_helper_funcs pyr_dsi_dbi_helper_funcs = {
-        .dpms = pyr_dsi_dbi_dpms,
-        .mode_fixup = pyr_dsi_dbi_mode_fixup,
-        .prepare = pyr_dsi_dbi_prepare,
-        .mode_set = pyr_dsi_dbi_mode_set,
-        .commit = pyr_dsi_dbi_commit,
-};
-
-/* PYR DBI encoder funcs */
-static const struct drm_encoder_funcs mdfld_dsi_dbi_encoder_funcs = {
-        .destroy = drm_encoder_cleanup,
-};
-
-void pyr_cmd_init(struct drm_device *dev, struct panel_funcs *p_funcs)
-{
-        p_funcs->encoder_funcs = &mdfld_dsi_dbi_encoder_funcs;
-        p_funcs->encoder_helper_funcs = &pyr_dsi_dbi_helper_funcs;
-        p_funcs->get_config_mode = &pyr_cmd_get_config_mode;
-        p_funcs->update_fb = pyr_dsi_dbi_update_fb;
-        p_funcs->get_panel_info = pyr_cmd_get_panel_info;
-}
diff --git a/drivers/staging/gma500/mdfld_tmd_vid.c b/drivers/staging/gma500/mdfld_tmd_vid.c
deleted file mode 100644
index affdc09c6769..000000000000
--- a/drivers/staging/gma500/mdfld_tmd_vid.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Jim Liu <jim.liu@intel.com>
- * Jackie Li<yaodong.li@intel.com>
- * Gideon Eaton <eaton.
- * Scott Rowe <scott.m.rowe@intel.com>
- */
-
-#include "mdfld_dsi_dbi.h"
-#include "mdfld_dsi_dpi.h"
-#include "mdfld_dsi_output.h"
-#include "mdfld_output.h"
-
-#include "mdfld_dsi_pkg_sender.h"
-
-#include "displays/tmd_vid.h"
-
-/* FIXME: static ? */
-struct drm_display_mode *tmd_vid_get_config_mode(struct drm_device *dev)
-{
-        struct drm_display_mode *mode;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_timing_info *ti = &dev_priv->gct_data.DTD;
-        bool use_gct = false; /*Disable GCT for now*/
-
-        mode = kzalloc(sizeof(*mode), GFP_KERNEL);
-        if (!mode) {
-                dev_err(dev->dev, "Out of memory\n");
-                return NULL;
-        }
-
-        if (use_gct) {
-                dev_dbg(dev->dev, "gct find MIPI panel.\n");
-
-                mode->hdisplay = (ti->hactive_hi << 8) | ti->hactive_lo;
-                mode->vdisplay = (ti->vactive_hi << 8) | ti->vactive_lo;
-                mode->hsync_start = mode->hdisplay +
-                                ((ti->hsync_offset_hi << 8) |
-                                ti->hsync_offset_lo);
-                mode->hsync_end = mode->hsync_start +
-                                ((ti->hsync_pulse_width_hi << 8) |
-                                ti->hsync_pulse_width_lo);
-                mode->htotal = mode->hdisplay + ((ti->hblank_hi << 8) |
-                                                                ti->hblank_lo);
-                mode->vsync_start = \
-                        mode->vdisplay + ((ti->vsync_offset_hi << 8) |
-                                                ti->vsync_offset_lo);
-                mode->vsync_end = \
-                        mode->vsync_start + ((ti->vsync_pulse_width_hi << 8) | \
-                                                ti->vsync_pulse_width_lo);
-                mode->vtotal = mode->vdisplay +
-                                ((ti->vblank_hi << 8) | ti->vblank_lo);
-                mode->clock = ti->pixel_clock * 10;
-
-                dev_dbg(dev->dev, "hdisplay is %d\n", mode->hdisplay);
-                dev_dbg(dev->dev, "vdisplay is %d\n", mode->vdisplay);
-                dev_dbg(dev->dev, "HSS is %d\n", mode->hsync_start);
-                dev_dbg(dev->dev, "HSE is %d\n", mode->hsync_end);
-                dev_dbg(dev->dev, "htotal is %d\n", mode->htotal);
-                dev_dbg(dev->dev, "VSS is %d\n", mode->vsync_start);
-                dev_dbg(dev->dev, "VSE is %d\n", mode->vsync_end);
-                dev_dbg(dev->dev, "vtotal is %d\n", mode->vtotal);
-                dev_dbg(dev->dev, "clock is %d\n", mode->clock);
-        } else {
-                mode->hdisplay = 480;
-                mode->vdisplay = 854;
-                mode->hsync_start = 487;
-                mode->hsync_end = 490;
-                mode->htotal = 499;
-                mode->vsync_start = 861;
-                mode->vsync_end = 865;
-                mode->vtotal = 873;
-                mode->clock = 33264;
-        }
-        drm_mode_set_name(mode);
-        drm_mode_set_crtcinfo(mode, 0);
-
-        mode->type |= DRM_MODE_TYPE_PREFERRED;
-
-        return mode;
-}
-
-static int tmd_vid_get_panel_info(struct drm_device *dev,
-                                int pipe,
-                                struct panel_info *pi)
-{
-        if (!dev || !pi)
-                return -EINVAL;
-
-        pi->width_mm = TMD_PANEL_WIDTH;
-        pi->height_mm = TMD_PANEL_HEIGHT;
-
-        return 0;
-}
-
-/*
- *      mdfld_init_TMD_MIPI     -       initialise a TMD interface
- *      @dsi_config: configuration
- *      @pipe: pipe to configure
- *
- *      This function is called only by mrst_dsi_mode_set and
- *      restore_display_registers.  since this function does not
- *      acquire the mutex, it is important that the calling function
- *      does!
- */
-
-
-static void mdfld_dsi_tmd_drv_ic_init(struct mdfld_dsi_config *dsi_config,
-                                      int pipe)
-{
-        static u32 tmd_cmd_mcap_off[] = {0x000000b2};
-        static u32 tmd_cmd_enable_lane_switch[] = {0x000101ef};
-        static u32 tmd_cmd_set_lane_num[] = {0x006360ef};
-        static u32 tmd_cmd_pushing_clock0[] = {0x00cc2fef};
-        static u32 tmd_cmd_pushing_clock1[] = {0x00dd6eef};
-        static u32 tmd_cmd_set_mode[] = {0x000000b3};
-        static u32 tmd_cmd_set_sync_pulse_mode[] = {0x000961ef};
-        static u32 tmd_cmd_set_column[] = {0x0100002a, 0x000000df};
-        static u32 tmd_cmd_set_page[] = {0x0300002b, 0x00000055};
-        static u32 tmd_cmd_set_video_mode[] = {0x00000153};
-        /*no auto_bl,need add in furture*/
-        static u32 tmd_cmd_enable_backlight[] = {0x00005ab4};
-        static u32 tmd_cmd_set_backlight_dimming[] = {0x00000ebd};
-
-        struct mdfld_dsi_pkg_sender *sender
-                        = mdfld_dsi_get_pkg_sender(dsi_config);
-
-        DRM_INFO("Enter mdfld init TMD MIPI display.\n");
-
-        if (!sender) {
-                DRM_ERROR("Cannot get sender\n");
-                return;
-        }
-
-        if (dsi_config->dvr_ic_inited)
-                return;
-
-        msleep(3);
-
-        mdfld_dsi_send_gen_long_lp(sender, tmd_cmd_mcap_off, 1, 0);
-        mdfld_dsi_send_gen_long_lp(sender, tmd_cmd_enable_lane_switch, 1, 0);
-        mdfld_dsi_send_gen_long_lp(sender, tmd_cmd_set_lane_num, 1, 0);
-        mdfld_dsi_send_gen_long_lp(sender, tmd_cmd_pushing_clock0, 1, 0);
-        mdfld_dsi_send_gen_long_lp(sender, tmd_cmd_pushing_clock1, 1, 0);
-        mdfld_dsi_send_gen_long_lp(sender, tmd_cmd_set_mode, 1, 0);
-        mdfld_dsi_send_gen_long_lp(sender, tmd_cmd_set_sync_pulse_mode, 1, 0);
-        mdfld_dsi_send_mcs_long_lp(sender, tmd_cmd_set_column, 2, 0);
-        mdfld_dsi_send_mcs_long_lp(sender, tmd_cmd_set_page, 2, 0);
-        mdfld_dsi_send_gen_long_lp(sender, tmd_cmd_set_video_mode, 1, 0);
-        mdfld_dsi_send_gen_long_lp(sender, tmd_cmd_enable_backlight, 1, 0);
-        mdfld_dsi_send_gen_long_lp(sender, tmd_cmd_set_backlight_dimming, 1, 0);
-
-        dsi_config->dvr_ic_inited = 1;
-}
-
-/* TMD DPI encoder helper funcs */
-static const struct drm_encoder_helper_funcs
-                                        mdfld_tpo_dpi_encoder_helper_funcs = {
-        .dpms = mdfld_dsi_dpi_dpms,
-        .mode_fixup = mdfld_dsi_dpi_mode_fixup,
-        .prepare = mdfld_dsi_dpi_prepare,
-        .mode_set = mdfld_dsi_dpi_mode_set,
-        .commit = mdfld_dsi_dpi_commit,
-};
-
-/* TMD DPI encoder funcs */
-static const struct drm_encoder_funcs mdfld_tpo_dpi_encoder_funcs = {
-        .destroy = drm_encoder_cleanup,
-};
-
-void tmd_vid_init(struct drm_device *dev, struct panel_funcs *p_funcs)
-{
-        if (!dev || !p_funcs) {
-                dev_err(dev->dev, "Invalid parameters\n");
-                return;
-        }
-
-        p_funcs->encoder_funcs = &mdfld_tpo_dpi_encoder_funcs;
-        p_funcs->encoder_helper_funcs = &mdfld_tpo_dpi_encoder_helper_funcs;
-        p_funcs->get_config_mode = &tmd_vid_get_config_mode;
-        p_funcs->update_fb = NULL;
-        p_funcs->get_panel_info = tmd_vid_get_panel_info;
-        p_funcs->reset = mdfld_dsi_panel_reset;
-        p_funcs->drv_ic_init = mdfld_dsi_tmd_drv_ic_init;
-}
diff --git a/drivers/staging/gma500/mdfld_tpo_cmd.c b/drivers/staging/gma500/mdfld_tpo_cmd.c
deleted file mode 100644
index c7f7c9c19bc1..000000000000
--- a/drivers/staging/gma500/mdfld_tpo_cmd.c
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * Copyright (c)  2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicensen
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Thomas Eaton <thomas.g.eaton@intel.com>
- * Scott Rowe <scott.m.rowe@intel.com>
- */
-
-#include "mdfld_dsi_dbi.h"
-#include "mdfld_dsi_dpi.h"
-#include "mdfld_dsi_output.h"
-#include "mdfld_output.h"
-#include "mdfld_dsi_dbi_dpu.h"
-#include "mdfld_dsi_pkg_sender.h"
-
-#include "displays/tpo_cmd.h"
-
-static struct drm_display_mode *tpo_cmd_get_config_mode(struct drm_device *dev)
-{
-        struct drm_display_mode *mode;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_timing_info *ti = &dev_priv->gct_data.DTD;
-        bool use_gct = false;
-
-        mode = kzalloc(sizeof(*mode), GFP_KERNEL);
-        if (!mode)
-                return NULL;
-
-        if (use_gct) {
-                dev_dbg(dev->dev, "gct find MIPI panel.\n");
-
-                mode->hdisplay = (ti->hactive_hi << 8) | ti->hactive_lo;
-                mode->vdisplay = (ti->vactive_hi << 8) | ti->vactive_lo;
-                mode->hsync_start = mode->hdisplay + \
-                                ((ti->hsync_offset_hi << 8) | \
-                                ti->hsync_offset_lo);
-                mode->hsync_end = mode->hsync_start + \
-                                ((ti->hsync_pulse_width_hi << 8) | \
-                                ti->hsync_pulse_width_lo);
-                mode->htotal = mode->hdisplay + ((ti->hblank_hi << 8) | \
-                                                                ti->hblank_lo);
-                mode->vsync_start = \
-                        mode->vdisplay + ((ti->vsync_offset_hi << 8) | \
-                                                ti->vsync_offset_lo);
-                mode->vsync_end = \
-                        mode->vsync_start + ((ti->vsync_pulse_width_hi << 8) | \
-                                                ti->vsync_pulse_width_lo);
-                mode->vtotal = mode->vdisplay + \
-                                ((ti->vblank_hi << 8) | ti->vblank_lo);
-                mode->clock = ti->pixel_clock * 10;
-
-                dev_dbg(dev->dev, "hdisplay is %d\n", mode->hdisplay);
-                dev_dbg(dev->dev, "vdisplay is %d\n", mode->vdisplay);
-                dev_dbg(dev->dev, "HSS is %d\n", mode->hsync_start);
-                dev_dbg(dev->dev, "HSE is %d\n", mode->hsync_end);
-                dev_dbg(dev->dev, "htotal is %d\n", mode->htotal);
-                dev_dbg(dev->dev, "VSS is %d\n", mode->vsync_start);
-                dev_dbg(dev->dev, "VSE is %d\n", mode->vsync_end);
-                dev_dbg(dev->dev, "vtotal is %d\n", mode->vtotal);
-                dev_dbg(dev->dev, "clock is %d\n", mode->clock);
-        } else {
-                mode->hdisplay = 864;
-                mode->vdisplay = 480;
-                mode->hsync_start = 872;
-                mode->hsync_end = 876;
-                mode->htotal = 884;
-                mode->vsync_start = 482;
-                mode->vsync_end = 494;
-                mode->vtotal = 486;
-                mode->clock = 25777;
-        }
-
-        drm_mode_set_name(mode);
-        drm_mode_set_crtcinfo(mode, 0);
-
-        mode->type |= DRM_MODE_TYPE_PREFERRED;
-
-        return mode;
-}
-
-static bool mdfld_dsi_dbi_mode_fixup(struct drm_encoder *encoder,
-                                     struct drm_display_mode *mode,
-                                     struct drm_display_mode *adjusted_mode)
-{
-        struct drm_device *dev = encoder->dev;
-        struct drm_display_mode *fixed_mode = tpo_cmd_get_config_mode(dev);
-
-        if (fixed_mode) {
-                adjusted_mode->hdisplay = fixed_mode->hdisplay;
-                adjusted_mode->hsync_start = fixed_mode->hsync_start;
-                adjusted_mode->hsync_end = fixed_mode->hsync_end;
-                adjusted_mode->htotal = fixed_mode->htotal;
-                adjusted_mode->vdisplay = fixed_mode->vdisplay;
-                adjusted_mode->vsync_start = fixed_mode->vsync_start;
-                adjusted_mode->vsync_end = fixed_mode->vsync_end;
-                adjusted_mode->vtotal = fixed_mode->vtotal;
-                adjusted_mode->clock = fixed_mode->clock;
-                drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
-                kfree(fixed_mode);
-        }
-        return true;
-}
-
-static void mdfld_dsi_dbi_set_power(struct drm_encoder *encoder, bool on)
-{
-        int ret = 0;
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dbi_output *dbi_output =
-                                MDFLD_DSI_DBI_OUTPUT(dsi_encoder);
-        struct mdfld_dsi_config *dsi_config =
-                mdfld_dsi_encoder_get_config(dsi_encoder);
-        struct mdfld_dsi_pkg_sender *sender =
-                mdfld_dsi_encoder_get_pkg_sender(dsi_encoder);
-        struct drm_device *dev = encoder->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 reg_offset = 0;
-        int pipe = (dbi_output->channel_num == 0) ? 0 : 2;
-        u32 data = 0;
-
-        dev_dbg(dev->dev, "pipe %d : %s, panel on: %s\n",
-                        pipe, on ? "On" : "Off",
-                        dbi_output->dbi_panel_on ? "True" : "False");
-
-        if (pipe == 2) {
-                if (on)
-                        dev_priv->dual_mipi = true;
-                else
-                        dev_priv->dual_mipi = false;
-                reg_offset = MIPIC_REG_OFFSET;
-        } else {
-                if (!on)
-                        dev_priv->dual_mipi = false;
-        }
-
-        if (!gma_power_begin(dev, true)) {
-                dev_err(dev->dev, "hw begin failed\n");
-                return;
-        }
-
-        if (on) {
-                if (dbi_output->dbi_panel_on)
-                        goto out_err;
-
-                ret = mdfld_dsi_dbi_update_power(dbi_output, DRM_MODE_DPMS_ON);
-                if (ret) {
-                        dev_err(dev->dev, "power on error\n");
-                        goto out_err;
-                }
-
-                dbi_output->dbi_panel_on = true;
-
-                if (pipe == 2)
-                        dev_priv->dbi_panel_on2 = true;
-                else
-                        dev_priv->dbi_panel_on = true;
-                mdfld_enable_te(dev, pipe);
-        } else {
-                if (!dbi_output->dbi_panel_on && !dbi_output->first_boot)
-                        goto out_err;
-
-                dbi_output->dbi_panel_on = false;
-                dbi_output->first_boot = false;
-
-                if (pipe == 2)
-                        dev_priv->dbi_panel_on2 = false;
-                else
-                        dev_priv->dbi_panel_on = false;
-
-                mdfld_disable_te(dev, pipe);
-
-                ret = mdfld_dsi_dbi_update_power(dbi_output, DRM_MODE_DPMS_OFF);
-                if (ret) {
-                        dev_err(dev->dev, "power on error\n");
-                        goto out_err;
-                }
-        }
-
-        /*
-         * FIXME: this is a WA for TPO panel crash on DPMS on & off around
-         * 83 times. the root cause of this issue is that Booster in
-         * drvIC crashed. Add this WA so that we can resume the driver IC
-         * once we found that booster has a fault
-         */
-        mdfld_dsi_get_power_mode(dsi_config,
-                                &data,
-                                MDFLD_DSI_HS_TRANSMISSION);
-
-        if (on && data && !(data & (1 << 7))) {
-                /* Soft reset */
-                mdfld_dsi_send_dcs(sender,
-                                   DCS_SOFT_RESET,
-                                   NULL,
-                                   0,
-                                   CMD_DATA_SRC_PIPE,
-                                   MDFLD_DSI_SEND_PACKAGE);
-
-                /* Init drvIC */
-                if (dbi_output->p_funcs->drv_ic_init)
-                        dbi_output->p_funcs->drv_ic_init(dsi_config,
-                                                         pipe);
-        }
- 
-out_err:
-        gma_power_end(dev);
-        if (ret)
-                dev_err(dev->dev, "failed\n");
-}
-
-
-static void mdfld_dsi_dbi_mode_set(struct drm_encoder *encoder,
-                                   struct drm_display_mode *mode,
-                                   struct drm_display_mode *adjusted_mode)
-{
-        int ret = 0;
-        struct drm_device *dev = encoder->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dbi_output *dsi_output =
-                                        MDFLD_DSI_DBI_OUTPUT(dsi_encoder);
-        struct mdfld_dsi_config *dsi_config =
-                                mdfld_dsi_encoder_get_config(dsi_encoder);
-        struct mdfld_dsi_connector *dsi_connector = dsi_config->connector;
-        int pipe = dsi_connector->pipe;
-        u8 param = 0;
-
-        /* Regs */
-        u32 mipi_reg = MIPI;
-        u32 dspcntr_reg = DSPACNTR;
-        u32 pipeconf_reg = PIPEACONF;
-        u32 reg_offset = 0;
-
-        /* Values */
-        u32 dspcntr_val = dev_priv->dspcntr;
-        u32 pipeconf_val = dev_priv->pipeconf;
-        u32 h_active_area = mode->hdisplay;
-        u32 v_active_area = mode->vdisplay;
-        u32 mipi_val;
-
-        mipi_val = (PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX |
-                                                TE_TRIGGER_GPIO_PIN);
-
-        dev_dbg(dev->dev, "mipi_val =0x%x\n", mipi_val);
-
-        dev_dbg(dev->dev, "type %s\n", (pipe == 2) ? "MIPI2" : "MIPI");
-        dev_dbg(dev->dev, "h %d v %d\n", mode->hdisplay, mode->vdisplay);
-
-        if (pipe == 2) {
-                mipi_reg = MIPI_C;
-                dspcntr_reg = DSPCCNTR;
-                pipeconf_reg = PIPECCONF;
-
-                reg_offset = MIPIC_REG_OFFSET;
-
-                dspcntr_val = dev_priv->dspcntr2;
-                pipeconf_val = dev_priv->pipeconf2;
-        } else {
-                mipi_val |= 0x2; /*two lanes for port A and C respectively*/
-        }
-
-        if (!gma_power_begin(dev, true)) {
-                dev_err(dev->dev, "hw begin failed\n");
-                return;
-        }
-
-        REG_WRITE(dspcntr_reg, dspcntr_val);
-        REG_READ(dspcntr_reg);
-
-        /* 20ms delay before sending exit_sleep_mode */
-        msleep(20);
-
-        /* Send exit_sleep_mode DCS */
-        ret = mdfld_dsi_dbi_send_dcs(dsi_output, DCS_EXIT_SLEEP_MODE,
-                                        NULL, 0, CMD_DATA_SRC_SYSTEM_MEM);
-        if (ret) {
-                dev_err(dev->dev, "sent exit_sleep_mode faild\n");
-                goto out_err;
-        }
-
-        /* Send set_tear_on DCS */
-        ret = mdfld_dsi_dbi_send_dcs(dsi_output, DCS_SET_TEAR_ON,
-                                        &param, 1, CMD_DATA_SRC_SYSTEM_MEM);
-        if (ret) {
-                dev_err(dev->dev, "%s - sent set_tear_on faild\n", __func__);
-                goto out_err;
-        }
-
-        /* Do some init stuff */
-        REG_WRITE(pipeconf_reg, pipeconf_val | PIPEACONF_DSR);
-        REG_READ(pipeconf_reg);
-
-        /* TODO: this looks ugly, try to move it to CRTC mode setting*/
-        if (pipe == 2)
-                dev_priv->pipeconf2 |= PIPEACONF_DSR;
-        else
-                dev_priv->pipeconf |= PIPEACONF_DSR;
-
-        dev_dbg(dev->dev, "pipeconf %x\n",  REG_READ(pipeconf_reg));
-
-        ret = mdfld_dsi_dbi_update_area(dsi_output, 0, 0,
-                                h_active_area - 1, v_active_area - 1);
-        if (ret) {
-                dev_err(dev->dev, "update area failed\n");
-                goto out_err;
-        }
-
-out_err:
-        gma_power_end(dev);
-
-        if (ret)
-                dev_err(dev->dev, "mode set failed\n");
-}
-
-static void mdfld_dsi_dbi_prepare(struct drm_encoder *encoder)
-{
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dbi_output *dbi_output
-                                = MDFLD_DSI_DBI_OUTPUT(dsi_encoder);
-
-        dbi_output->mode_flags |= MODE_SETTING_IN_ENCODER;
-        dbi_output->mode_flags &= ~MODE_SETTING_ENCODER_DONE;
-
-        mdfld_dsi_dbi_set_power(encoder, false);
-}
-
-static void mdfld_dsi_dbi_commit(struct drm_encoder *encoder)
-{
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dbi_output *dbi_output =
-                                        MDFLD_DSI_DBI_OUTPUT(dsi_encoder);
-        struct drm_device *dev = dbi_output->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_drm_dpu_rect rect;
-
-        mdfld_dsi_dbi_set_power(encoder, true);
-        dbi_output->mode_flags &= ~MODE_SETTING_IN_ENCODER;
-
-        rect.x = rect.y = 0;
-        rect.width = 864;
-        rect.height = 480;
-
-        if (dbi_output->channel_num == 1) {
-                dev_priv->dsr_fb_update |= MDFLD_DSR_2D_3D_2;
-                /*if dpu enabled report a fullscreen damage*/
-                mdfld_dbi_dpu_report_damage(dev, MDFLD_PLANEC, &rect);
-        } else {
-                dev_priv->dsr_fb_update |= MDFLD_DSR_2D_3D_0;
-                mdfld_dbi_dpu_report_damage(dev, MDFLD_PLANEA, &rect);
-        }
-        dbi_output->mode_flags |= MODE_SETTING_ENCODER_DONE;
-}
-
-static void mdfld_dsi_dbi_dpms(struct drm_encoder *encoder, int mode)
-{
-        struct mdfld_dsi_encoder *dsi_encoder = MDFLD_DSI_ENCODER(encoder);
-        struct mdfld_dsi_dbi_output *dbi_output
-                                = MDFLD_DSI_DBI_OUTPUT(dsi_encoder);
-        struct drm_device *dev = dbi_output->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        static bool bdispoff;
-
-        dev_dbg(dev->dev, "%s\n", (mode == DRM_MODE_DPMS_ON ? "on" : "off"));
-
-        if (mode == DRM_MODE_DPMS_ON) {
-                /*
-                 * FIXME: in case I am wrong!
-                 * we don't need to exit dsr here to wake up plane/pipe/pll
-                 * if everything goes right, hw_begin will resume them all
-                 * during set_power.
-                 */
-                if (bdispoff /* FIXME && gbgfxsuspended */) {
-                        mdfld_dsi_dbi_exit_dsr(dev, MDFLD_DSR_2D_3D);
-                        bdispoff = false;
-                        dev_priv->dispstatus = true;
-                }
-
-                mdfld_dsi_dbi_set_power(encoder, true);
-                /* FIXME if (gbgfxsuspended)
-                        gbgfxsuspended = false; */
-        } else {
-                /*
-                 * I am not sure whether this is the perfect place to
-                 * turn rpm on since we still have a lot of CRTC turnning
-                 * on work to do.
-                 */
-                bdispoff = true;
-                dev_priv->dispstatus = false;
-                mdfld_dsi_dbi_set_power(encoder, false);
-        }
-}
-
-
-/*
- * Update the DBI MIPI Panel Frame Buffer.
- */
-static void mdfld_dsi_dbi_update_fb(struct mdfld_dsi_dbi_output *dbi_output,
-                                                                int pipe)
-{
-        struct mdfld_dsi_pkg_sender *sender =
-                mdfld_dsi_encoder_get_pkg_sender(&dbi_output->base);
-        struct drm_device *dev = dbi_output->dev;
-        struct drm_crtc *crtc = dbi_output->base.base.crtc;
-        struct psb_intel_crtc *psb_crtc = (crtc) ?
-                                        to_psb_intel_crtc(crtc) : NULL;
-        u32 dpll_reg = MRST_DPLL_A;
-        u32 dspcntr_reg = DSPACNTR;
-        u32 pipeconf_reg = PIPEACONF;
-        u32 dsplinoff_reg = DSPALINOFF;
-        u32 dspsurf_reg = DSPASURF;
-        u32 reg_offset = 0;
-
-        /* If mode setting on-going, back off */
-        if ((dbi_output->mode_flags & MODE_SETTING_ON_GOING) ||
-                (psb_crtc && psb_crtc->mode_flags & MODE_SETTING_ON_GOING) ||
-                !(dbi_output->mode_flags & MODE_SETTING_ENCODER_DONE))
-                return;
-
-        if (pipe == 2) {
-                dspcntr_reg = DSPCCNTR;
-                pipeconf_reg = PIPECCONF;
-                dsplinoff_reg = DSPCLINOFF;
-                dspsurf_reg = DSPCSURF;
-                reg_offset = MIPIC_REG_OFFSET;
-        }
-
-        if (!gma_power_begin(dev, true)) {
-                dev_err(dev->dev, "hw begin failed\n");
-                return;
-        }
-
-        /* Check DBI FIFO status */
-        if (!(REG_READ(dpll_reg) & DPLL_VCO_ENABLE) ||
-           !(REG_READ(dspcntr_reg) & DISPLAY_PLANE_ENABLE) ||
-           !(REG_READ(pipeconf_reg) & DISPLAY_PLANE_ENABLE))
-                goto update_fb_out0;
-
-        /* Refresh plane changes */
-        REG_WRITE(dsplinoff_reg, REG_READ(dsplinoff_reg));
-        REG_WRITE(dspsurf_reg, REG_READ(dspsurf_reg));
-        REG_READ(dspsurf_reg);
-
-        mdfld_dsi_send_dcs(sender,
-                           DCS_WRITE_MEM_START,
-                           NULL,
-                           0,
-                           CMD_DATA_SRC_PIPE,
-                           MDFLD_DSI_SEND_PACKAGE);
-
-        dbi_output->dsr_fb_update_done = true;
-update_fb_out0:
-        gma_power_end(dev);
-}
-
-static int tpo_cmd_get_panel_info(struct drm_device *dev,
-                                int pipe,
-                                struct panel_info *pi)
-{
-        if (!dev || !pi)
-                return -EINVAL;
-
-        pi->width_mm = TPO_PANEL_WIDTH;
-        pi->height_mm = TPO_PANEL_HEIGHT;
-
-        return 0;
-}
-
-
-/* TPO DBI encoder helper funcs */
-static const struct drm_encoder_helper_funcs mdfld_dsi_dbi_helper_funcs = {
-        .dpms = mdfld_dsi_dbi_dpms,
-        .mode_fixup = mdfld_dsi_dbi_mode_fixup,
-        .prepare = mdfld_dsi_dbi_prepare,
-        .mode_set = mdfld_dsi_dbi_mode_set,
-        .commit = mdfld_dsi_dbi_commit,
-};
-
-/* TPO DBI encoder funcs */
-static const struct drm_encoder_funcs mdfld_dsi_dbi_encoder_funcs = {
-        .destroy = drm_encoder_cleanup,
-};
-
-void tpo_cmd_init(struct drm_device *dev, struct panel_funcs *p_funcs)
-{
-        p_funcs->encoder_funcs = &mdfld_dsi_dbi_encoder_funcs;
-        p_funcs->encoder_helper_funcs = &mdfld_dsi_dbi_helper_funcs;
-        p_funcs->get_config_mode = &tpo_cmd_get_config_mode;
-        p_funcs->update_fb = mdfld_dsi_dbi_update_fb;
-        p_funcs->get_panel_info = tpo_cmd_get_panel_info;
-        p_funcs->reset = mdfld_dsi_panel_reset;
-        p_funcs->drv_ic_init = mdfld_dsi_brightness_init;
-}
diff --git a/drivers/staging/gma500/mdfld_tpo_vid.c b/drivers/staging/gma500/mdfld_tpo_vid.c
deleted file mode 100644
index 954901751760..000000000000
--- a/drivers/staging/gma500/mdfld_tpo_vid.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * jim liu <jim.liu@intel.com>
- * Jackie Li<yaodong.li@intel.com>
- */
-
-#include "mdfld_dsi_dbi.h"
-#include "mdfld_dsi_dpi.h"
-#include "mdfld_dsi_output.h"
-#include "mdfld_output.h"
-
-#include "mdfld_dsi_pkg_sender.h"
-
-#include "displays/tpo_vid.h"
-
-static struct drm_display_mode *tpo_vid_get_config_mode(struct drm_device *dev)
-{
-        struct drm_display_mode *mode;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_timing_info *ti = &dev_priv->gct_data.DTD;
-        bool use_gct = false;
-
-        mode = kzalloc(sizeof(*mode), GFP_KERNEL);
-        if (!mode) {
-                dev_err(dev->dev, "out of memory\n");
-                return NULL;
-        }
-
-        if (use_gct) {
-                mode->hdisplay = (ti->hactive_hi << 8) | ti->hactive_lo;
-                mode->vdisplay = (ti->vactive_hi << 8) | ti->vactive_lo;
-                mode->hsync_start = mode->hdisplay + \
-                                ((ti->hsync_offset_hi << 8) | \
-                                ti->hsync_offset_lo);
-                mode->hsync_end = mode->hsync_start + \
-                                ((ti->hsync_pulse_width_hi << 8) | \
-                                ti->hsync_pulse_width_lo);
-                mode->htotal = mode->hdisplay + ((ti->hblank_hi << 8) | \
-                                                                ti->hblank_lo);
-                mode->vsync_start = \
-                        mode->vdisplay + ((ti->vsync_offset_hi << 8) | \
-                                                ti->vsync_offset_lo);
-                mode->vsync_end = \
-                        mode->vsync_start + ((ti->vsync_pulse_width_hi << 8) | \
-                                                ti->vsync_pulse_width_lo);
-                mode->vtotal = mode->vdisplay + \
-                                ((ti->vblank_hi << 8) | ti->vblank_lo);
-                mode->clock = ti->pixel_clock * 10;
-
-                dev_dbg(dev->dev, "hdisplay is %d\n", mode->hdisplay);
-                dev_dbg(dev->dev, "vdisplay is %d\n", mode->vdisplay);
-                dev_dbg(dev->dev, "HSS is %d\n", mode->hsync_start);
-                dev_dbg(dev->dev, "HSE is %d\n", mode->hsync_end);
-                dev_dbg(dev->dev, "htotal is %d\n", mode->htotal);
-                dev_dbg(dev->dev, "VSS is %d\n", mode->vsync_start);
-                dev_dbg(dev->dev, "VSE is %d\n", mode->vsync_end);
-                dev_dbg(dev->dev, "vtotal is %d\n", mode->vtotal);
-                dev_dbg(dev->dev, "clock is %d\n", mode->clock);
-        } else {
-                mode->hdisplay = 864;
-                mode->vdisplay = 480;
-                mode->hsync_start = 873;
-                mode->hsync_end = 876;
-                mode->htotal = 887;
-                mode->vsync_start = 487;
-                mode->vsync_end = 490;
-                mode->vtotal = 499;
-                mode->clock = 33264;
-        }
-
-        drm_mode_set_name(mode);
-        drm_mode_set_crtcinfo(mode, 0);
-
-        mode->type |= DRM_MODE_TYPE_PREFERRED;
-
-        return mode;
-}
-
-static int tpo_vid_get_panel_info(struct drm_device *dev,
-                                int pipe,
-                                struct panel_info *pi)
-{
-        if (!dev || !pi)
-                return -EINVAL;
-
-        pi->width_mm = TPO_PANEL_WIDTH;
-        pi->height_mm = TPO_PANEL_HEIGHT;
-
-        return 0;
-}
-
-/*TPO DPI encoder helper funcs*/
-static const struct drm_encoder_helper_funcs
-                                        mdfld_tpo_dpi_encoder_helper_funcs = {
-        .dpms = mdfld_dsi_dpi_dpms,
-        .mode_fixup = mdfld_dsi_dpi_mode_fixup,
-        .prepare = mdfld_dsi_dpi_prepare,
-        .mode_set = mdfld_dsi_dpi_mode_set,
-        .commit = mdfld_dsi_dpi_commit,
-};
-
-/*TPO DPI encoder funcs*/
-static const struct drm_encoder_funcs mdfld_tpo_dpi_encoder_funcs = {
-        .destroy = drm_encoder_cleanup,
-};
-
-void tpo_vid_init(struct drm_device *dev, struct panel_funcs *p_funcs)
-{
-        if (!dev || !p_funcs) {
-                dev_err(dev->dev, "tpo_vid_init: Invalid parameters\n");
-                return;
-        }
-
-        p_funcs->encoder_funcs = &mdfld_tpo_dpi_encoder_funcs;
-        p_funcs->encoder_helper_funcs = &mdfld_tpo_dpi_encoder_helper_funcs;
-        p_funcs->get_config_mode = &tpo_vid_get_config_mode;
-        p_funcs->update_fb = NULL;
-        p_funcs->get_panel_info = tpo_vid_get_panel_info;
-}
diff --git a/drivers/staging/gma500/medfield.h b/drivers/staging/gma500/medfield.h
deleted file mode 100644
index 09e9687431f1..000000000000
--- a/drivers/staging/gma500/medfield.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright © 2011 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-/* Medfield DSI controller registers */
-
-#define MIPIA_DEVICE_READY_REG                          0xb000
-#define MIPIA_INTR_STAT_REG                             0xb004
-#define MIPIA_INTR_EN_REG                               0xb008
-#define MIPIA_DSI_FUNC_PRG_REG                          0xb00c
-#define MIPIA_HS_TX_TIMEOUT_REG                         0xb010
-#define MIPIA_LP_RX_TIMEOUT_REG                         0xb014
-#define MIPIA_TURN_AROUND_TIMEOUT_REG                   0xb018
-#define MIPIA_DEVICE_RESET_TIMER_REG                    0xb01c
-#define MIPIA_DPI_RESOLUTION_REG                        0xb020
-#define MIPIA_DBI_FIFO_THROTTLE_REG                     0xb024
-#define MIPIA_HSYNC_COUNT_REG                           0xb028
-#define MIPIA_HBP_COUNT_REG                             0xb02c
-#define MIPIA_HFP_COUNT_REG                             0xb030
-#define MIPIA_HACTIVE_COUNT_REG                         0xb034
-#define MIPIA_VSYNC_COUNT_REG                           0xb038
-#define MIPIA_VBP_COUNT_REG                             0xb03c
-#define MIPIA_VFP_COUNT_REG                             0xb040
-#define MIPIA_HIGH_LOW_SWITCH_COUNT_REG                 0xb044
-#define MIPIA_DPI_CONTROL_REG                           0xb048
-#define MIPIA_DPI_DATA_REG                              0xb04c
-#define MIPIA_INIT_COUNT_REG                            0xb050
-#define MIPIA_MAX_RETURN_PACK_SIZE_REG                  0xb054
-#define MIPIA_VIDEO_MODE_FORMAT_REG                     0xb058
-#define MIPIA_EOT_DISABLE_REG                           0xb05c
-#define MIPIA_LP_BYTECLK_REG                            0xb060
-#define MIPIA_LP_GEN_DATA_REG                           0xb064
-#define MIPIA_HS_GEN_DATA_REG                           0xb068
-#define MIPIA_LP_GEN_CTRL_REG                           0xb06c
-#define MIPIA_HS_GEN_CTRL_REG                           0xb070
-#define MIPIA_GEN_FIFO_STAT_REG                         0xb074
-#define MIPIA_HS_LS_DBI_ENABLE_REG                      0xb078
-#define MIPIA_DPHY_PARAM_REG                            0xb080
-#define MIPIA_DBI_BW_CTRL_REG                           0xb084
-#define MIPIA_CLK_LANE_SWITCH_TIME_CNT_REG              0xb088
-
-#define DSI_DEVICE_READY                                (0x1)
-#define DSI_POWER_STATE_ULPS_ENTER                      (0x2 << 1)
-#define DSI_POWER_STATE_ULPS_EXIT                       (0x1 << 1)
-#define DSI_POWER_STATE_ULPS_OFFSET                     (0x1)
-
-
-#define DSI_ONE_DATA_LANE                               (0x1)
-#define DSI_TWO_DATA_LANE                               (0x2)
-#define DSI_THREE_DATA_LANE                             (0X3)
-#define DSI_FOUR_DATA_LANE                              (0x4)
-#define DSI_DPI_VIRT_CHANNEL_OFFSET                     (0x3)
-#define DSI_DBI_VIRT_CHANNEL_OFFSET                     (0x5)
-#define DSI_DPI_COLOR_FORMAT_RGB565                     (0x01 << 7)
-#define DSI_DPI_COLOR_FORMAT_RGB666                     (0x02 << 7)
-#define DSI_DPI_COLOR_FORMAT_RGB666_UNPACK              (0x03 << 7)
-#define DSI_DPI_COLOR_FORMAT_RGB888                     (0x04 << 7)
-#define DSI_DBI_COLOR_FORMAT_OPTION2                    (0x05 << 13)
-
-#define DSI_INTR_STATE_RXSOTERROR                       1
-
-#define DSI_INTR_STATE_SPL_PKG_SENT                     (1 << 30)
-#define DSI_INTR_STATE_TE                               (1 << 31)
-
-#define DSI_HS_TX_TIMEOUT_MASK                          (0xffffff)
-
-#define DSI_LP_RX_TIMEOUT_MASK                          (0xffffff)
-
-#define DSI_TURN_AROUND_TIMEOUT_MASK                    (0x3f)
-
-#define DSI_RESET_TIMER_MASK                            (0xffff)
-
-#define DSI_DBI_FIFO_WM_HALF                            (0x0)
-#define DSI_DBI_FIFO_WM_QUARTER                         (0x1)
-#define DSI_DBI_FIFO_WM_LOW                             (0x2)
-
-#define DSI_DPI_TIMING_MASK                             (0xffff)
-
-#define DSI_INIT_TIMER_MASK                             (0xffff)
-
-#define DSI_DBI_RETURN_PACK_SIZE_MASK                   (0x3ff)
-
-#define DSI_LP_BYTECLK_MASK                             (0x0ffff)
-
-#define DSI_HS_CTRL_GEN_SHORT_W0                        (0x03)
-#define DSI_HS_CTRL_GEN_SHORT_W1                        (0x13)
-#define DSI_HS_CTRL_GEN_SHORT_W2                        (0x23)
-#define DSI_HS_CTRL_GEN_R0                              (0x04)
-#define DSI_HS_CTRL_GEN_R1                              (0x14)
-#define DSI_HS_CTRL_GEN_R2                              (0x24)
-#define DSI_HS_CTRL_GEN_LONG_W                          (0x29)
-#define DSI_HS_CTRL_MCS_SHORT_W0                        (0x05)
-#define DSI_HS_CTRL_MCS_SHORT_W1                        (0x15)
-#define DSI_HS_CTRL_MCS_R0                              (0x06)
-#define DSI_HS_CTRL_MCS_LONG_W                          (0x39)
-#define DSI_HS_CTRL_VC_OFFSET                           (0x06)
-#define DSI_HS_CTRL_WC_OFFSET                           (0x08)
-
-#define DSI_FIFO_GEN_HS_DATA_FULL                       (1 << 0)
-#define DSI_FIFO_GEN_HS_DATA_HALF_EMPTY                 (1 << 1)
-#define DSI_FIFO_GEN_HS_DATA_EMPTY                      (1 << 2)
-#define DSI_FIFO_GEN_LP_DATA_FULL                       (1 << 8)
-#define DSI_FIFO_GEN_LP_DATA_HALF_EMPTY                 (1 << 9)
-#define DSI_FIFO_GEN_LP_DATA_EMPTY                      (1 << 10)
-#define DSI_FIFO_GEN_HS_CTRL_FULL                       (1 << 16)
-#define DSI_FIFO_GEN_HS_CTRL_HALF_EMPTY                 (1 << 17)
-#define DSI_FIFO_GEN_HS_CTRL_EMPTY                      (1 << 18)
-#define DSI_FIFO_GEN_LP_CTRL_FULL                       (1 << 24)
-#define DSI_FIFO_GEN_LP_CTRL_HALF_EMPTY                 (1 << 25)
-#define DSI_FIFO_GEN_LP_CTRL_EMPTY                      (1 << 26)
-#define DSI_FIFO_DBI_EMPTY                              (1 << 27)
-#define DSI_FIFO_DPI_EMPTY                              (1 << 28)
-
-#define DSI_DBI_HS_LP_SWITCH_MASK                       (0x1)
-
-#define DSI_HS_LP_SWITCH_COUNTER_OFFSET                 (0x0)
-#define DSI_LP_HS_SWITCH_COUNTER_OFFSET                 (0x16)
-
-#define DSI_DPI_CTRL_HS_SHUTDOWN                        (0x00000001)
-#define DSI_DPI_CTRL_HS_TURN_ON                         (0x00000002)
-
-/* Medfield DSI adapter registers */
-#define MIPIA_CONTROL_REG                               0xb104
-#define MIPIA_DATA_ADD_REG                              0xb108
-#define MIPIA_DATA_LEN_REG                              0xb10c
-#define MIPIA_CMD_ADD_REG                               0xb110
-#define MIPIA_CMD_LEN_REG                               0xb114
-
-/*dsi power modes*/
-#define DSI_POWER_MODE_DISPLAY_ON       (1 << 2)
-#define DSI_POWER_MODE_NORMAL_ON        (1 << 3)
-#define DSI_POWER_MODE_SLEEP_OUT        (1 << 4)
-#define DSI_POWER_MODE_PARTIAL_ON       (1 << 5)
-#define DSI_POWER_MODE_IDLE_ON          (1 << 6)
-
-enum {
-        MDFLD_DSI_ENCODER_DBI = 0,
-        MDFLD_DSI_ENCODER_DPI,
-};
-
-enum {
-        MDFLD_DSI_VIDEO_NON_BURST_MODE_SYNC_PULSE = 1,
-        MDFLD_DSI_VIDEO_NON_BURST_MODE_SYNC_EVENTS = 2,
-        MDFLD_DSI_VIDEO_BURST_MODE = 3,
-};
-
-#define DSI_DPI_COMPLETE_LAST_LINE                      (1 << 2)
-#define DSI_DPI_DISABLE_BTA                             (1 << 3)
-/* Panel types */
-enum {
-        TPO_CMD,
-        TPO_VID,
-        TMD_CMD,
-        TMD_VID,
-        PYR_CMD,
-        PYR_VID,
-        TPO,
-        TMD,
-        PYR,
-        HDMI,
-        GCT_DETECT
-};
-
-/* Junk that belongs elsewhere */
-#define TPO_PANEL_WIDTH         84
-#define TPO_PANEL_HEIGHT        46
-#define TMD_PANEL_WIDTH         39
-#define TMD_PANEL_HEIGHT        71
-#define PYR_PANEL_WIDTH         53
-#define PYR_PANEL_HEIGHT        95
-
-/* Panel interface */
-struct panel_info {
-        u32 width_mm;
-        u32 height_mm;
-};
-
-struct mdfld_dsi_dbi_output;
-
-struct mdfld_dsi_connector_state {
-        u32 mipi_ctrl_reg;
-};
-
-struct mdfld_dsi_encoder_state {
-
-};
-
-struct mdfld_dsi_connector {
-        /*
-         * This is ugly, but I have to use connector in it! :-(
-         * FIXME: use drm_connector instead.
-         */
-        struct psb_intel_output base;
-
-        int pipe;
-        void *private;
-        void *pkg_sender;
-
-        /* Connection status */
-        enum drm_connector_status status;
-};
-
-struct mdfld_dsi_encoder {
-        struct drm_encoder base;
-        void *private;
-};
-
-/*
- * DSI config, consists of one DSI connector, two DSI encoders.
- * DRM will pick up on DSI encoder basing on differents configs.
- */
-struct mdfld_dsi_config {
-        struct drm_device *dev;
-        struct drm_display_mode *fixed_mode;
-        struct drm_display_mode *mode;
-
-        struct mdfld_dsi_connector *connector;
-        struct mdfld_dsi_encoder *encoders[DRM_CONNECTOR_MAX_ENCODER];
-        struct mdfld_dsi_encoder *encoder;
-
-        int changed;
-
-        int bpp;
-        int type;
-        int lane_count;
-        /*Virtual channel number for this encoder*/
-        int channel_num;
-        /*video mode configure*/
-        int video_mode;
-
-        int dvr_ic_inited;
-};
-
-#define MDFLD_DSI_CONNECTOR(psb_output) \
-                (container_of(psb_output, struct mdfld_dsi_connector, base))
-
-#define MDFLD_DSI_ENCODER(encoder) \
-                (container_of(encoder, struct mdfld_dsi_encoder, base))
-
-struct panel_funcs {
-        const struct drm_encoder_funcs *encoder_funcs;
-        const struct drm_encoder_helper_funcs *encoder_helper_funcs;
-        struct drm_display_mode *(*get_config_mode) (struct drm_device *);
-        void (*update_fb) (struct mdfld_dsi_dbi_output *, int);
-        int (*get_panel_info) (struct drm_device *, int, struct panel_info *);
-        int (*reset)(int pipe);
-        void (*drv_ic_init)(struct mdfld_dsi_config *dsi_config, int pipe);
-};
-
diff --git a/drivers/staging/gma500/mid_bios.c b/drivers/staging/gma500/mid_bios.c
deleted file mode 100644
index ee3c0368e320..000000000000
--- a/drivers/staging/gma500/mid_bios.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-/* TODO
- * - Split functions by vbt type
- * - Make them all take drm_device
- * - Check ioremap failures
- */
-
-#include <linux/moduleparam.h>
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include "psb_drm.h"
-#include "psb_drv.h"
-#include "mid_bios.h"
-#include "mdfld_output.h"
-
-static int panel_id = GCT_DETECT;
-module_param_named(panel_id, panel_id, int, 0600);
-MODULE_PARM_DESC(panel_id, "Panel Identifier");
-
-
-static void mid_get_fuse_settings(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
-        uint32_t fuse_value = 0;
-        uint32_t fuse_value_tmp = 0;
-
-#define FB_REG06 0xD0810600
-#define FB_MIPI_DISABLE  (1 << 11)
-#define FB_REG09 0xD0810900
-#define FB_REG09 0xD0810900
-#define FB_SKU_MASK  0x7000
-#define FB_SKU_SHIFT 12
-#define FB_SKU_100 0
-#define FB_SKU_100L 1
-#define FB_SKU_83 2
-        pci_write_config_dword(pci_root, 0xD0, FB_REG06);
-        pci_read_config_dword(pci_root, 0xD4, &fuse_value);
-
-        /* FB_MIPI_DISABLE doesn't mean LVDS on with Medfield */
-        if (IS_MRST(dev))
-                dev_priv->iLVDS_enable = fuse_value & FB_MIPI_DISABLE;
-
-        DRM_INFO("internal display is %s\n",
-                 dev_priv->iLVDS_enable ? "LVDS display" : "MIPI display");
-
-         /* Prevent runtime suspend at start*/
-         if (dev_priv->iLVDS_enable) {
-                dev_priv->is_lvds_on = true;
-                dev_priv->is_mipi_on = false;
-        } else {
-                dev_priv->is_mipi_on = true;
-                dev_priv->is_lvds_on = false;
-        }
-
-        dev_priv->video_device_fuse = fuse_value;
-
-        pci_write_config_dword(pci_root, 0xD0, FB_REG09);
-        pci_read_config_dword(pci_root, 0xD4, &fuse_value);
-
-        dev_dbg(dev->dev, "SKU values is 0x%x.\n", fuse_value);
-        fuse_value_tmp = (fuse_value & FB_SKU_MASK) >> FB_SKU_SHIFT;
-
-        dev_priv->fuse_reg_value = fuse_value;
-
-        switch (fuse_value_tmp) {
-        case FB_SKU_100:
-                dev_priv->core_freq = 200;
-                break;
-        case FB_SKU_100L:
-                dev_priv->core_freq = 100;
-                break;
-        case FB_SKU_83:
-                dev_priv->core_freq = 166;
-                break;
-        default:
-                dev_warn(dev->dev, "Invalid SKU values, SKU value = 0x%08x\n",
-                                                                fuse_value_tmp);
-                dev_priv->core_freq = 0;
-        }
-        dev_dbg(dev->dev, "LNC core clk is %dMHz.\n", dev_priv->core_freq);
-        pci_dev_put(pci_root);
-}
-
-/*
- *      Get the revison ID, B0:D2:F0;0x08
- */
-static void mid_get_pci_revID(struct drm_psb_private *dev_priv)
-{
-        uint32_t platform_rev_id = 0;
-        struct pci_dev *pci_gfx_root = pci_get_bus_and_slot(0, PCI_DEVFN(2, 0));
-
-        pci_read_config_dword(pci_gfx_root, 0x08, &platform_rev_id);
-        dev_priv->platform_rev_id = (uint8_t) platform_rev_id;
-        pci_dev_put(pci_gfx_root);
-        dev_dbg(dev_priv->dev->dev, "platform_rev_id is %x\n",
-                                        dev_priv->platform_rev_id);
-}
-
-static void mid_get_vbt_data(struct drm_psb_private *dev_priv)
-{
-        struct drm_device *dev = dev_priv->dev;
-        struct mrst_vbt *vbt = &dev_priv->vbt_data;
-        u32 addr;
-        u16 new_size;
-        u8 *vbt_virtual;
-        u8 bpi;
-        u8 number_desc = 0;
-        struct mrst_timing_info *dp_ti = &dev_priv->gct_data.DTD;
-        struct gct_r10_timing_info ti;
-        void *pGCT;
-        struct pci_dev *pci_gfx_root = pci_get_bus_and_slot(0, PCI_DEVFN(2, 0));
-
-        /* Get the address of the platform config vbt, B0:D2:F0;0xFC */
-        pci_read_config_dword(pci_gfx_root, 0xFC, &addr);
-        pci_dev_put(pci_gfx_root);
-
-        dev_dbg(dev->dev, "drm platform config address is %x\n", addr);
-
-        /* check for platform config address == 0. */
-        /* this means fw doesn't support vbt */
-
-        if (addr == 0) {
-                vbt->size = 0;
-                return;
-        }
-
-        /* get the virtual address of the vbt */
-        vbt_virtual = ioremap(addr, sizeof(*vbt));
-
-        memcpy(vbt, vbt_virtual, sizeof(*vbt));
-        iounmap(vbt_virtual); /* Free virtual address space */
-
-        dev_dbg(dev->dev, "GCT revision is %x\n", vbt->revision);
-
-        switch (vbt->revision) {
-        case 0:
-                vbt->mrst_gct = ioremap(addr + sizeof(*vbt) - 4,
-                                        vbt->size - sizeof(*vbt) + 4);
-                pGCT = vbt->mrst_gct;
-                bpi = ((struct mrst_gct_v1 *)pGCT)->PD.BootPanelIndex;
-                dev_priv->gct_data.bpi = bpi;
-                dev_priv->gct_data.pt =
-                        ((struct mrst_gct_v1 *)pGCT)->PD.PanelType;
-                memcpy(&dev_priv->gct_data.DTD,
-                        &((struct mrst_gct_v1 *)pGCT)->panel[bpi].DTD,
-                                sizeof(struct mrst_timing_info));
-                dev_priv->gct_data.Panel_Port_Control =
-                  ((struct mrst_gct_v1 *)pGCT)->panel[bpi].Panel_Port_Control;
-                dev_priv->gct_data.Panel_MIPI_Display_Descriptor =
-                        ((struct mrst_gct_v1 *)pGCT)->panel[bpi].Panel_MIPI_Display_Descriptor;
-                break;
-        case 1:
-                vbt->mrst_gct = ioremap(addr + sizeof(*vbt) - 4,
-                                        vbt->size - sizeof(*vbt) + 4);
-                pGCT = vbt->mrst_gct;
-                bpi = ((struct mrst_gct_v2 *)pGCT)->PD.BootPanelIndex;
-                dev_priv->gct_data.bpi = bpi;
-                dev_priv->gct_data.pt =
-                        ((struct mrst_gct_v2 *)pGCT)->PD.PanelType;
-                memcpy(&dev_priv->gct_data.DTD,
-                        &((struct mrst_gct_v2 *)pGCT)->panel[bpi].DTD,
-                                sizeof(struct mrst_timing_info));
-                dev_priv->gct_data.Panel_Port_Control =
-                  ((struct mrst_gct_v2 *)pGCT)->panel[bpi].Panel_Port_Control;
-                dev_priv->gct_data.Panel_MIPI_Display_Descriptor =
-                        ((struct mrst_gct_v2 *)pGCT)->panel[bpi].Panel_MIPI_Display_Descriptor;
-                break;
-        case 0x10:
-                /*header definition changed from rev 01 (v2) to rev 10h. */
-                /*so, some values have changed location*/
-                new_size = vbt->checksum; /*checksum contains lo size byte*/
-                /*LSB of mrst_gct contains hi size byte*/
-                new_size |= ((0xff & (unsigned int)vbt->mrst_gct)) << 8;
-
-                vbt->checksum = vbt->size; /*size contains the checksum*/
-                if (new_size > 0xff)
-                        vbt->size = 0xff; /*restrict size to 255*/
-                else
-                        vbt->size = new_size;
-
-                /* number of descriptors defined in the GCT */
-                number_desc = ((0xff00 & (unsigned int)vbt->mrst_gct)) >> 8;
-                bpi = ((0xff0000 & (unsigned int)vbt->mrst_gct)) >> 16;
-                vbt->mrst_gct = ioremap(addr + GCT_R10_HEADER_SIZE,
-                                GCT_R10_DISPLAY_DESC_SIZE * number_desc);
-                pGCT = vbt->mrst_gct;
-                pGCT = (u8 *)pGCT + (bpi*GCT_R10_DISPLAY_DESC_SIZE);
-                dev_priv->gct_data.bpi = bpi; /*save boot panel id*/
-
-                /*copy the GCT display timings into a temp structure*/
-                memcpy(&ti, pGCT, sizeof(struct gct_r10_timing_info));
-
-                /*now copy the temp struct into the dev_priv->gct_data*/
-                dp_ti->pixel_clock = ti.pixel_clock;
-                dp_ti->hactive_hi = ti.hactive_hi;
-                dp_ti->hactive_lo = ti.hactive_lo;
-                dp_ti->hblank_hi = ti.hblank_hi;
-                dp_ti->hblank_lo = ti.hblank_lo;
-                dp_ti->hsync_offset_hi = ti.hsync_offset_hi;
-                dp_ti->hsync_offset_lo = ti.hsync_offset_lo;
-                dp_ti->hsync_pulse_width_hi = ti.hsync_pulse_width_hi;
-                dp_ti->hsync_pulse_width_lo = ti.hsync_pulse_width_lo;
-                dp_ti->vactive_hi = ti.vactive_hi;
-                dp_ti->vactive_lo = ti.vactive_lo;
-                dp_ti->vblank_hi = ti.vblank_hi;
-                dp_ti->vblank_lo = ti.vblank_lo;
-                dp_ti->vsync_offset_hi = ti.vsync_offset_hi;
-                dp_ti->vsync_offset_lo = ti.vsync_offset_lo;
-                dp_ti->vsync_pulse_width_hi = ti.vsync_pulse_width_hi;
-                dp_ti->vsync_pulse_width_lo = ti.vsync_pulse_width_lo;
-
-                /* Move the MIPI_Display_Descriptor data from GCT to dev priv */
-                dev_priv->gct_data.Panel_MIPI_Display_Descriptor =
-                                                        *((u8 *)pGCT + 0x0d);
-                dev_priv->gct_data.Panel_MIPI_Display_Descriptor |=
-                                                (*((u8 *)pGCT + 0x0e)) << 8;
-                break;
-        default:
-                dev_err(dev->dev, "Unknown revision of GCT!\n");
-                vbt->size = 0;
-        }
-        if (IS_MFLD(dev_priv->dev)) {
-                if (panel_id == GCT_DETECT) {
-                        if (dev_priv->gct_data.bpi == 2) {
-                                dev_info(dev->dev, "[GFX] PYR Panel Detected\n");
-                                dev_priv->panel_id = PYR_CMD;
-                                panel_id = PYR_CMD;
-                        } else if (dev_priv->gct_data.bpi == 0) {
-                                dev_info(dev->dev, "[GFX] TMD Panel Detected.\n");
-                                dev_priv->panel_id = TMD_VID;
-                                panel_id = TMD_VID;
-                        } else {
-                                dev_info(dev->dev, "[GFX] Default Panel (TPO)\n");
-                                dev_priv->panel_id = TPO_CMD;
-                                panel_id = TPO_CMD;
-                        }
-                } else {
-                        dev_info(dev->dev, "[GFX] Panel Parameter Passed in through cmd line\n");
-                        dev_priv->panel_id = panel_id;
-                }
-        }
-}
-
-int mid_chip_setup(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        mid_get_fuse_settings(dev);
-        mid_get_vbt_data(dev_priv);
-        mid_get_pci_revID(dev_priv);
-        return 0;
-}
diff --git a/drivers/staging/gma500/mid_bios.h b/drivers/staging/gma500/mid_bios.h
deleted file mode 100644
index 00e7d564b7eb..000000000000
--- a/drivers/staging/gma500/mid_bios.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-extern int mid_chip_setup(struct drm_device *dev);
-
diff --git a/drivers/staging/gma500/mmu.c b/drivers/staging/gma500/mmu.c
deleted file mode 100644
index c904d73b1de3..000000000000
--- a/drivers/staging/gma500/mmu.c
+++ /dev/null
@@ -1,858 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2007, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-#include <drm/drmP.h>
-#include "psb_drv.h"
-#include "psb_reg.h"
-
-/*
- * Code for the SGX MMU:
- */
-
-/*
- * clflush on one processor only:
- * clflush should apparently flush the cache line on all processors in an
- * SMP system.
- */
-
-/*
- * kmap atomic:
- * The usage of the slots must be completely encapsulated within a spinlock, and
- * no other functions that may be using the locks for other purposed may be
- * called from within the locked region.
- * Since the slots are per processor, this will guarantee that we are the only
- * user.
- */
-
-/*
- * TODO: Inserting ptes from an interrupt handler:
- * This may be desirable for some SGX functionality where the GPU can fault in
- * needed pages. For that, we need to make an atomic insert_pages function, that
- * may fail.
- * If it fails, the caller need to insert the page using a workqueue function,
- * but on average it should be fast.
- */
-
-struct psb_mmu_driver {
-        /* protects driver- and pd structures. Always take in read mode
-         * before taking the page table spinlock.
-         */
-        struct rw_semaphore sem;
-
-        /* protects page tables, directory tables and pt tables.
-         * and pt structures.
-         */
-        spinlock_t lock;
-
-        atomic_t needs_tlbflush;
-
-        uint8_t __iomem *register_map;
-        struct psb_mmu_pd *default_pd;
-        /*uint32_t bif_ctrl;*/
-        int has_clflush;
-        int clflush_add;
-        unsigned long clflush_mask;
-
-        struct drm_psb_private *dev_priv;
-};
-
-struct psb_mmu_pd;
-
-struct psb_mmu_pt {
-        struct psb_mmu_pd *pd;
-        uint32_t index;
-        uint32_t count;
-        struct page *p;
-        uint32_t *v;
-};
-
-struct psb_mmu_pd {
-        struct psb_mmu_driver *driver;
-        int hw_context;
-        struct psb_mmu_pt **tables;
-        struct page *p;
-        struct page *dummy_pt;
-        struct page *dummy_page;
-        uint32_t pd_mask;
-        uint32_t invalid_pde;
-        uint32_t invalid_pte;
-};
-
-static inline uint32_t psb_mmu_pt_index(uint32_t offset)
-{
-        return (offset >> PSB_PTE_SHIFT) & 0x3FF;
-}
-
-static inline uint32_t psb_mmu_pd_index(uint32_t offset)
-{
-        return offset >> PSB_PDE_SHIFT;
-}
-
-static inline void psb_clflush(void *addr)
-{
-        __asm__ __volatile__("clflush (%0)\n" : : "r"(addr) : "memory");
-}
-
-static inline void psb_mmu_clflush(struct psb_mmu_driver *driver,
-                                   void *addr)
-{
-        if (!driver->has_clflush)
-                return;
-
-        mb();
-        psb_clflush(addr);
-        mb();
-}
-
-static void psb_page_clflush(struct psb_mmu_driver *driver, struct page* page)
-{
-        uint32_t clflush_add = driver->clflush_add >> PAGE_SHIFT;
-        uint32_t clflush_count = PAGE_SIZE / clflush_add;
-        int i;
-        uint8_t *clf;
-
-        clf = kmap_atomic(page, KM_USER0);
-        mb();
-        for (i = 0; i < clflush_count; ++i) {
-                psb_clflush(clf);
-                clf += clflush_add;
-        }
-        mb();
-        kunmap_atomic(clf, KM_USER0);
-}
-
-static void psb_pages_clflush(struct psb_mmu_driver *driver,
-                                struct page *page[], unsigned long num_pages)
-{
-        int i;
-
-        if (!driver->has_clflush)
-                return ;
-
-        for (i = 0; i < num_pages; i++)
-                psb_page_clflush(driver, *page++);
-}
-
-static void psb_mmu_flush_pd_locked(struct psb_mmu_driver *driver,
-                                    int force)
-{
-        atomic_set(&driver->needs_tlbflush, 0);
-}
-
-static void psb_mmu_flush_pd(struct psb_mmu_driver *driver, int force)
-{
-        down_write(&driver->sem);
-        psb_mmu_flush_pd_locked(driver, force);
-        up_write(&driver->sem);
-}
-
-void psb_mmu_flush(struct psb_mmu_driver *driver, int rc_prot)
-{
-        if (rc_prot)
-                down_write(&driver->sem);
-        if (rc_prot)
-                up_write(&driver->sem);
-}
-
-void psb_mmu_set_pd_context(struct psb_mmu_pd *pd, int hw_context)
-{
-        /*ttm_tt_cache_flush(&pd->p, 1);*/
-        psb_pages_clflush(pd->driver, &pd->p, 1);
-        down_write(&pd->driver->sem);
-        wmb();
-        psb_mmu_flush_pd_locked(pd->driver, 1);
-        pd->hw_context = hw_context;
-        up_write(&pd->driver->sem);
-
-}
-
-static inline unsigned long psb_pd_addr_end(unsigned long addr,
-                                            unsigned long end)
-{
-
-        addr = (addr + PSB_PDE_MASK + 1) & ~PSB_PDE_MASK;
-        return (addr < end) ? addr : end;
-}
-
-static inline uint32_t psb_mmu_mask_pte(uint32_t pfn, int type)
-{
-        uint32_t mask = PSB_PTE_VALID;
-
-        if (type & PSB_MMU_CACHED_MEMORY)
-                mask |= PSB_PTE_CACHED;
-        if (type & PSB_MMU_RO_MEMORY)
-                mask |= PSB_PTE_RO;
-        if (type & PSB_MMU_WO_MEMORY)
-                mask |= PSB_PTE_WO;
-
-        return (pfn << PAGE_SHIFT) | mask;
-}
-
-struct psb_mmu_pd *psb_mmu_alloc_pd(struct psb_mmu_driver *driver,
-                                    int trap_pagefaults, int invalid_type)
-{
-        struct psb_mmu_pd *pd = kmalloc(sizeof(*pd), GFP_KERNEL);
-        uint32_t *v;
-        int i;
-
-        if (!pd)
-                return NULL;
-
-        pd->p = alloc_page(GFP_DMA32);
-        if (!pd->p)
-                goto out_err1;
-        pd->dummy_pt = alloc_page(GFP_DMA32);
-        if (!pd->dummy_pt)
-                goto out_err2;
-        pd->dummy_page = alloc_page(GFP_DMA32);
-        if (!pd->dummy_page)
-                goto out_err3;
-
-        if (!trap_pagefaults) {
-                pd->invalid_pde =
-                    psb_mmu_mask_pte(page_to_pfn(pd->dummy_pt),
-                                     invalid_type);
-                pd->invalid_pte =
-                    psb_mmu_mask_pte(page_to_pfn(pd->dummy_page),
-                                     invalid_type);
-        } else {
-                pd->invalid_pde = 0;
-                pd->invalid_pte = 0;
-        }
-
-        v = kmap(pd->dummy_pt);
-        for (i = 0; i < (PAGE_SIZE / sizeof(uint32_t)); ++i)
-                v[i] = pd->invalid_pte;
-
-        kunmap(pd->dummy_pt);
-
-        v = kmap(pd->p);
-        for (i = 0; i < (PAGE_SIZE / sizeof(uint32_t)); ++i)
-                v[i] = pd->invalid_pde;
-
-        kunmap(pd->p);
-
-        clear_page(kmap(pd->dummy_page));
-        kunmap(pd->dummy_page);
-
-        pd->tables = vmalloc_user(sizeof(struct psb_mmu_pt *) * 1024);
-        if (!pd->tables)
-                goto out_err4;
-
-        pd->hw_context = -1;
-        pd->pd_mask = PSB_PTE_VALID;
-        pd->driver = driver;
-
-        return pd;
-
-out_err4:
-        __free_page(pd->dummy_page);
-out_err3:
-        __free_page(pd->dummy_pt);
-out_err2:
-        __free_page(pd->p);
-out_err1:
-        kfree(pd);
-        return NULL;
-}
-
-void psb_mmu_free_pt(struct psb_mmu_pt *pt)
-{
-        __free_page(pt->p);
-        kfree(pt);
-}
-
-void psb_mmu_free_pagedir(struct psb_mmu_pd *pd)
-{
-        struct psb_mmu_driver *driver = pd->driver;
-        struct psb_mmu_pt *pt;
-        int i;
-
-        down_write(&driver->sem);
-        if (pd->hw_context != -1)
-                psb_mmu_flush_pd_locked(driver, 1);
-
-        /* Should take the spinlock here, but we don't need to do that
-           since we have the semaphore in write mode. */
-
-        for (i = 0; i < 1024; ++i) {
-                pt = pd->tables[i];
-                if (pt)
-                        psb_mmu_free_pt(pt);
-        }
-
-        vfree(pd->tables);
-        __free_page(pd->dummy_page);
-        __free_page(pd->dummy_pt);
-        __free_page(pd->p);
-        kfree(pd);
-        up_write(&driver->sem);
-}
-
-static struct psb_mmu_pt *psb_mmu_alloc_pt(struct psb_mmu_pd *pd)
-{
-        struct psb_mmu_pt *pt = kmalloc(sizeof(*pt), GFP_KERNEL);
-        void *v;
-        uint32_t clflush_add = pd->driver->clflush_add >> PAGE_SHIFT;
-        uint32_t clflush_count = PAGE_SIZE / clflush_add;
-        spinlock_t *lock = &pd->driver->lock;
-        uint8_t *clf;
-        uint32_t *ptes;
-        int i;
-
-        if (!pt)
-                return NULL;
-
-        pt->p = alloc_page(GFP_DMA32);
-        if (!pt->p) {
-                kfree(pt);
-                return NULL;
-        }
-
-        spin_lock(lock);
-
-        v = kmap_atomic(pt->p, KM_USER0);
-        clf = (uint8_t *) v;
-        ptes = (uint32_t *) v;
-        for (i = 0; i < (PAGE_SIZE / sizeof(uint32_t)); ++i)
-                *ptes++ = pd->invalid_pte;
-
-
-        if (pd->driver->has_clflush && pd->hw_context != -1) {
-                mb();
-                for (i = 0; i < clflush_count; ++i) {
-                        psb_clflush(clf);
-                        clf += clflush_add;
-                }
-                mb();
-        }
-
-        kunmap_atomic(v, KM_USER0);
-        spin_unlock(lock);
-
-        pt->count = 0;
-        pt->pd = pd;
-        pt->index = 0;
-
-        return pt;
-}
-
-struct psb_mmu_pt *psb_mmu_pt_alloc_map_lock(struct psb_mmu_pd *pd,
-                                             unsigned long addr)
-{
-        uint32_t index = psb_mmu_pd_index(addr);
-        struct psb_mmu_pt *pt;
-        uint32_t *v;
-        spinlock_t *lock = &pd->driver->lock;
-
-        spin_lock(lock);
-        pt = pd->tables[index];
-        while (!pt) {
-                spin_unlock(lock);
-                pt = psb_mmu_alloc_pt(pd);
-                if (!pt)
-                        return NULL;
-                spin_lock(lock);
-
-                if (pd->tables[index]) {
-                        spin_unlock(lock);
-                        psb_mmu_free_pt(pt);
-                        spin_lock(lock);
-                        pt = pd->tables[index];
-                        continue;
-                }
-
-                v = kmap_atomic(pd->p, KM_USER0);
-                pd->tables[index] = pt;
-                v[index] = (page_to_pfn(pt->p) << 12) | pd->pd_mask;
-                pt->index = index;
-                kunmap_atomic((void *) v, KM_USER0);
-
-                if (pd->hw_context != -1) {
-                        psb_mmu_clflush(pd->driver, (void *) &v[index]);
-                        atomic_set(&pd->driver->needs_tlbflush, 1);
-                }
-        }
-        pt->v = kmap_atomic(pt->p, KM_USER0);
-        return pt;
-}
-
-static struct psb_mmu_pt *psb_mmu_pt_map_lock(struct psb_mmu_pd *pd,
-                                              unsigned long addr)
-{
-        uint32_t index = psb_mmu_pd_index(addr);
-        struct psb_mmu_pt *pt;
-        spinlock_t *lock = &pd->driver->lock;
-
-        spin_lock(lock);
-        pt = pd->tables[index];
-        if (!pt) {
-                spin_unlock(lock);
-                return NULL;
-        }
-        pt->v = kmap_atomic(pt->p, KM_USER0);
-        return pt;
-}
-
-static void psb_mmu_pt_unmap_unlock(struct psb_mmu_pt *pt)
-{
-        struct psb_mmu_pd *pd = pt->pd;
-        uint32_t *v;
-
-        kunmap_atomic(pt->v, KM_USER0);
-        if (pt->count == 0) {
-                v = kmap_atomic(pd->p, KM_USER0);
-                v[pt->index] = pd->invalid_pde;
-                pd->tables[pt->index] = NULL;
-
-                if (pd->hw_context != -1) {
-                        psb_mmu_clflush(pd->driver,
-                                        (void *) &v[pt->index]);
-                        atomic_set(&pd->driver->needs_tlbflush, 1);
-                }
-                kunmap_atomic(pt->v, KM_USER0);
-                spin_unlock(&pd->driver->lock);
-                psb_mmu_free_pt(pt);
-                return;
-        }
-        spin_unlock(&pd->driver->lock);
-}
-
-static inline void psb_mmu_set_pte(struct psb_mmu_pt *pt,
-                                   unsigned long addr, uint32_t pte)
-{
-        pt->v[psb_mmu_pt_index(addr)] = pte;
-}
-
-static inline void psb_mmu_invalidate_pte(struct psb_mmu_pt *pt,
-                                          unsigned long addr)
-{
-        pt->v[psb_mmu_pt_index(addr)] = pt->pd->invalid_pte;
-}
-
-
-void psb_mmu_mirror_gtt(struct psb_mmu_pd *pd,
-                        uint32_t mmu_offset, uint32_t gtt_start,
-                        uint32_t gtt_pages)
-{
-        uint32_t *v;
-        uint32_t start = psb_mmu_pd_index(mmu_offset);
-        struct psb_mmu_driver *driver = pd->driver;
-        int num_pages = gtt_pages;
-
-        down_read(&driver->sem);
-        spin_lock(&driver->lock);
-
-        v = kmap_atomic(pd->p, KM_USER0);
-        v += start;
-
-        while (gtt_pages--) {
-                *v++ = gtt_start | pd->pd_mask;
-                gtt_start += PAGE_SIZE;
-        }
-
-        /*ttm_tt_cache_flush(&pd->p, num_pages);*/
-        psb_pages_clflush(pd->driver, &pd->p, num_pages);
-        kunmap_atomic(v, KM_USER0);
-        spin_unlock(&driver->lock);
-
-        if (pd->hw_context != -1)
-                atomic_set(&pd->driver->needs_tlbflush, 1);
-
-        up_read(&pd->driver->sem);
-        psb_mmu_flush_pd(pd->driver, 0);
-}
-
-struct psb_mmu_pd *psb_mmu_get_default_pd(struct psb_mmu_driver *driver)
-{
-        struct psb_mmu_pd *pd;
-
-        /* down_read(&driver->sem); */
-        pd = driver->default_pd;
-        /* up_read(&driver->sem); */
-
-        return pd;
-}
-
-/* Returns the physical address of the PD shared by sgx/msvdx */
-uint32_t psb_get_default_pd_addr(struct psb_mmu_driver *driver)
-{
-        struct psb_mmu_pd *pd;
-
-        pd = psb_mmu_get_default_pd(driver);
-        return page_to_pfn(pd->p) << PAGE_SHIFT;
-}
-
-void psb_mmu_driver_takedown(struct psb_mmu_driver *driver)
-{
-        psb_mmu_free_pagedir(driver->default_pd);
-        kfree(driver);
-}
-
-struct psb_mmu_driver *psb_mmu_driver_init(uint8_t __iomem * registers,
-                                        int trap_pagefaults,
-                                        int invalid_type,
-                                        struct drm_psb_private *dev_priv)
-{
-        struct psb_mmu_driver *driver;
-
-        driver = kmalloc(sizeof(*driver), GFP_KERNEL);
-
-        if (!driver)
-                return NULL;
-        driver->dev_priv = dev_priv;
-
-        driver->default_pd = psb_mmu_alloc_pd(driver, trap_pagefaults,
-                                              invalid_type);
-        if (!driver->default_pd)
-                goto out_err1;
-
-        spin_lock_init(&driver->lock);
-        init_rwsem(&driver->sem);
-        down_write(&driver->sem);
-        driver->register_map = registers;
-        atomic_set(&driver->needs_tlbflush, 1);
-
-        driver->has_clflush = 0;
-
-        if (boot_cpu_has(X86_FEATURE_CLFLSH)) {
-                uint32_t tfms, misc, cap0, cap4, clflush_size;
-
-                /*
-                 * clflush size is determined at kernel setup for x86_64
-                 *  but not for i386. We have to do it here.
-                 */
-
-                cpuid(0x00000001, &tfms, &misc, &cap0, &cap4);
-                clflush_size = ((misc >> 8) & 0xff) * 8;
-                driver->has_clflush = 1;
-                driver->clflush_add =
-                    PAGE_SIZE * clflush_size / sizeof(uint32_t);
-                driver->clflush_mask = driver->clflush_add - 1;
-                driver->clflush_mask = ~driver->clflush_mask;
-        }
-
-        up_write(&driver->sem);
-        return driver;
-
-out_err1:
-        kfree(driver);
-        return NULL;
-}
-
-static void psb_mmu_flush_ptes(struct psb_mmu_pd *pd,
-                               unsigned long address, uint32_t num_pages,
-                               uint32_t desired_tile_stride,
-                               uint32_t hw_tile_stride)
-{
-        struct psb_mmu_pt *pt;
-        uint32_t rows = 1;
-        uint32_t i;
-        unsigned long addr;
-        unsigned long end;
-        unsigned long next;
-        unsigned long add;
-        unsigned long row_add;
-        unsigned long clflush_add = pd->driver->clflush_add;
-        unsigned long clflush_mask = pd->driver->clflush_mask;
-
-        if (!pd->driver->has_clflush) {
-                /*ttm_tt_cache_flush(&pd->p, num_pages);*/
-                psb_pages_clflush(pd->driver, &pd->p, num_pages);
-                return;
-        }
-
-        if (hw_tile_stride)
-                rows = num_pages / desired_tile_stride;
-        else
-                desired_tile_stride = num_pages;
-
-        add = desired_tile_stride << PAGE_SHIFT;
-        row_add = hw_tile_stride << PAGE_SHIFT;
-        mb();
-        for (i = 0; i < rows; ++i) {
-
-                addr = address;
-                end = addr + add;
-
-                do {
-                        next = psb_pd_addr_end(addr, end);
-                        pt = psb_mmu_pt_map_lock(pd, addr);
-                        if (!pt)
-                                continue;
-                        do {
-                                psb_clflush(&pt->v
-                                            [psb_mmu_pt_index(addr)]);
-                        } while (addr +=
-                                 clflush_add,
-                                 (addr & clflush_mask) < next);
-
-                        psb_mmu_pt_unmap_unlock(pt);
-                } while (addr = next, next != end);
-                address += row_add;
-        }
-        mb();
-}
-
-void psb_mmu_remove_pfn_sequence(struct psb_mmu_pd *pd,
-                                 unsigned long address, uint32_t num_pages)
-{
-        struct psb_mmu_pt *pt;
-        unsigned long addr;
-        unsigned long end;
-        unsigned long next;
-        unsigned long f_address = address;
-
-        down_read(&pd->driver->sem);
-
-        addr = address;
-        end = addr + (num_pages << PAGE_SHIFT);
-
-        do {
-                next = psb_pd_addr_end(addr, end);
-                pt = psb_mmu_pt_alloc_map_lock(pd, addr);
-                if (!pt)
-                        goto out;
-                do {
-                        psb_mmu_invalidate_pte(pt, addr);
-                        --pt->count;
-                } while (addr += PAGE_SIZE, addr < next);
-                psb_mmu_pt_unmap_unlock(pt);
-
-        } while (addr = next, next != end);
-
-out:
-        if (pd->hw_context != -1)
-                psb_mmu_flush_ptes(pd, f_address, num_pages, 1, 1);
-
-        up_read(&pd->driver->sem);
-
-        if (pd->hw_context != -1)
-                psb_mmu_flush(pd->driver, 0);
-
-        return;
-}
-
-void psb_mmu_remove_pages(struct psb_mmu_pd *pd, unsigned long address,
-                          uint32_t num_pages, uint32_t desired_tile_stride,
-                          uint32_t hw_tile_stride)
-{
-        struct psb_mmu_pt *pt;
-        uint32_t rows = 1;
-        uint32_t i;
-        unsigned long addr;
-        unsigned long end;
-        unsigned long next;
-        unsigned long add;
-        unsigned long row_add;
-        unsigned long f_address = address;
-
-        if (hw_tile_stride)
-                rows = num_pages / desired_tile_stride;
-        else
-                desired_tile_stride = num_pages;
-
-        add = desired_tile_stride << PAGE_SHIFT;
-        row_add = hw_tile_stride << PAGE_SHIFT;
-
-        /* down_read(&pd->driver->sem); */
-
-        /* Make sure we only need to flush this processor's cache */
-
-        for (i = 0; i < rows; ++i) {
-
-                addr = address;
-                end = addr + add;
-
-                do {
-                        next = psb_pd_addr_end(addr, end);
-                        pt = psb_mmu_pt_map_lock(pd, addr);
-                        if (!pt)
-                                continue;
-                        do {
-                                psb_mmu_invalidate_pte(pt, addr);
-                                --pt->count;
-
-                        } while (addr += PAGE_SIZE, addr < next);
-                        psb_mmu_pt_unmap_unlock(pt);
-
-                } while (addr = next, next != end);
-                address += row_add;
-        }
-        if (pd->hw_context != -1)
-                psb_mmu_flush_ptes(pd, f_address, num_pages,
-                                   desired_tile_stride, hw_tile_stride);
-
-        /* up_read(&pd->driver->sem); */
-
-        if (pd->hw_context != -1)
-                psb_mmu_flush(pd->driver, 0);
-}
-
-int psb_mmu_insert_pfn_sequence(struct psb_mmu_pd *pd, uint32_t start_pfn,
-                                unsigned long address, uint32_t num_pages,
-                                int type)
-{
-        struct psb_mmu_pt *pt;
-        uint32_t pte;
-        unsigned long addr;
-        unsigned long end;
-        unsigned long next;
-        unsigned long f_address = address;
-        int ret = 0;
-
-        down_read(&pd->driver->sem);
-
-        addr = address;
-        end = addr + (num_pages << PAGE_SHIFT);
-
-        do {
-                next = psb_pd_addr_end(addr, end);
-                pt = psb_mmu_pt_alloc_map_lock(pd, addr);
-                if (!pt) {
-                        ret = -ENOMEM;
-                        goto out;
-                }
-                do {
-                        pte = psb_mmu_mask_pte(start_pfn++, type);
-                        psb_mmu_set_pte(pt, addr, pte);
-                        pt->count++;
-                } while (addr += PAGE_SIZE, addr < next);
-                psb_mmu_pt_unmap_unlock(pt);
-
-        } while (addr = next, next != end);
-
-out:
-        if (pd->hw_context != -1)
-                psb_mmu_flush_ptes(pd, f_address, num_pages, 1, 1);
-
-        up_read(&pd->driver->sem);
-
-        if (pd->hw_context != -1)
-                psb_mmu_flush(pd->driver, 1);
-
-        return ret;
-}
-
-int psb_mmu_insert_pages(struct psb_mmu_pd *pd, struct page **pages,
-                         unsigned long address, uint32_t num_pages,
-                         uint32_t desired_tile_stride,
-                         uint32_t hw_tile_stride, int type)
-{
-        struct psb_mmu_pt *pt;
-        uint32_t rows = 1;
-        uint32_t i;
-        uint32_t pte;
-        unsigned long addr;
-        unsigned long end;
-        unsigned long next;
-        unsigned long add;
-        unsigned long row_add;
-        unsigned long f_address = address;
-        int ret = 0;
-
-        if (hw_tile_stride) {
-                if (num_pages % desired_tile_stride != 0)
-                        return -EINVAL;
-                rows = num_pages / desired_tile_stride;
-        } else {
-                desired_tile_stride = num_pages;
-        }
-
-        add = desired_tile_stride << PAGE_SHIFT;
-        row_add = hw_tile_stride << PAGE_SHIFT;
-
-        down_read(&pd->driver->sem);
-
-        for (i = 0; i < rows; ++i) {
-
-                addr = address;
-                end = addr + add;
-
-                do {
-                        next = psb_pd_addr_end(addr, end);
-                        pt = psb_mmu_pt_alloc_map_lock(pd, addr);
-                        if (!pt) {
-                                ret = -ENOMEM;
-                                goto out;
-                        }
-                        do {
-                                pte =
-                                    psb_mmu_mask_pte(page_to_pfn(*pages++),
-                                                     type);
-                                psb_mmu_set_pte(pt, addr, pte);
-                                pt->count++;
-                        } while (addr += PAGE_SIZE, addr < next);
-                        psb_mmu_pt_unmap_unlock(pt);
-
-                } while (addr = next, next != end);
-
-                address += row_add;
-        }
-out:
-        if (pd->hw_context != -1)
-                psb_mmu_flush_ptes(pd, f_address, num_pages,
-                                   desired_tile_stride, hw_tile_stride);
-
-        up_read(&pd->driver->sem);
-
-        if (pd->hw_context != -1)
-                psb_mmu_flush(pd->driver, 1);
-
-        return ret;
-}
-
-int psb_mmu_virtual_to_pfn(struct psb_mmu_pd *pd, uint32_t virtual,
-                           unsigned long *pfn)
-{
-        int ret;
-        struct psb_mmu_pt *pt;
-        uint32_t tmp;
-        spinlock_t *lock = &pd->driver->lock;
-
-        down_read(&pd->driver->sem);
-        pt = psb_mmu_pt_map_lock(pd, virtual);
-        if (!pt) {
-                uint32_t *v;
-
-                spin_lock(lock);
-                v = kmap_atomic(pd->p, KM_USER0);
-                tmp = v[psb_mmu_pd_index(virtual)];
-                kunmap_atomic(v, KM_USER0);
-                spin_unlock(lock);
-
-                if (tmp != pd->invalid_pde || !(tmp & PSB_PTE_VALID) ||
-                    !(pd->invalid_pte & PSB_PTE_VALID)) {
-                        ret = -EINVAL;
-                        goto out;
-                }
-                ret = 0;
-                *pfn = pd->invalid_pte >> PAGE_SHIFT;
-                goto out;
-        }
-        tmp = pt->v[psb_mmu_pt_index(virtual)];
-        if (!(tmp & PSB_PTE_VALID)) {
-                ret = -EINVAL;
-        } else {
-                ret = 0;
-                *pfn = tmp >> PAGE_SHIFT;
-        }
-        psb_mmu_pt_unmap_unlock(pt);
-out:
-        up_read(&pd->driver->sem);
-        return ret;
-}
diff --git a/drivers/staging/gma500/mrst.h b/drivers/staging/gma500/mrst.h
deleted file mode 100644
index b563dbc73104..000000000000
--- a/drivers/staging/gma500/mrst.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2007-2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-/* MID device specific descriptors */
-
-struct mrst_vbt {
-        s8 signature[4];        /*4 bytes,"$GCT" */
-        u8 revision;
-        u8 size;
-        u8 checksum;
-        void *mrst_gct;
-} __packed;
-
-struct mrst_timing_info {
-        u16 pixel_clock;
-        u8 hactive_lo;
-        u8 hblank_lo;
-        u8 hblank_hi:4;
-        u8 hactive_hi:4;
-        u8 vactive_lo;
-        u8 vblank_lo;
-        u8 vblank_hi:4;
-        u8 vactive_hi:4;
-        u8 hsync_offset_lo;
-        u8 hsync_pulse_width_lo;
-        u8 vsync_pulse_width_lo:4;
-        u8 vsync_offset_lo:4;
-        u8 vsync_pulse_width_hi:2;
-        u8 vsync_offset_hi:2;
-        u8 hsync_pulse_width_hi:2;
-        u8 hsync_offset_hi:2;
-        u8 width_mm_lo;
-        u8 height_mm_lo;
-        u8 height_mm_hi:4;
-        u8 width_mm_hi:4;
-        u8 hborder;
-        u8 vborder;
-        u8 unknown0:1;
-        u8 hsync_positive:1;
-        u8 vsync_positive:1;
-        u8 separate_sync:2;
-        u8 stereo:1;
-        u8 unknown6:1;
-        u8 interlaced:1;
-} __packed;
-
-struct gct_r10_timing_info {
-        u16 pixel_clock;
-        u32 hactive_lo:8;
-        u32 hactive_hi:4;
-        u32 hblank_lo:8;
-        u32 hblank_hi:4;
-        u32 hsync_offset_lo:8;
-        u16 hsync_offset_hi:2;
-        u16 hsync_pulse_width_lo:8;
-        u16 hsync_pulse_width_hi:2;
-        u16 hsync_positive:1;
-        u16 rsvd_1:3;
-        u8  vactive_lo:8;
-        u16 vactive_hi:4;
-        u16 vblank_lo:8;
-        u16 vblank_hi:4;
-        u16 vsync_offset_lo:4;
-        u16 vsync_offset_hi:2;
-        u16 vsync_pulse_width_lo:4;
-        u16 vsync_pulse_width_hi:2;
-        u16 vsync_positive:1;
-        u16 rsvd_2:3;
-} __packed;
-
-struct mrst_panel_descriptor_v1 {
-        u32 Panel_Port_Control; /* 1 dword, Register 0x61180 if LVDS */
-                                /* 0x61190 if MIPI */
-        u32 Panel_Power_On_Sequencing;/*1 dword,Register 0x61208,*/
-        u32 Panel_Power_Off_Sequencing;/*1 dword,Register 0x6120C,*/
-        u32 Panel_Power_Cycle_Delay_and_Reference_Divisor;/* 1 dword */
-                                                /* Register 0x61210 */
-        struct mrst_timing_info DTD;/*18 bytes, Standard definition */
-        u16 Panel_Backlight_Inverter_Descriptor;/* 16 bits, as follows */
-                                /* Bit 0, Frequency, 15 bits,0 - 32767Hz */
-                        /* Bit 15, Polarity, 1 bit, 0: Normal, 1: Inverted */
-        u16 Panel_MIPI_Display_Descriptor;
-                        /*16 bits, Defined as follows: */
-                        /* if MIPI, 0x0000 if LVDS */
-                        /* Bit 0, Type, 2 bits, */
-                        /* 0: Type-1, */
-                        /* 1: Type-2, */
-                        /* 2: Type-3, */
-                        /* 3: Type-4 */
-                        /* Bit 2, Pixel Format, 4 bits */
-                        /* Bit0: 16bpp (not supported in LNC), */
-                        /* Bit1: 18bpp loosely packed, */
-                        /* Bit2: 18bpp packed, */
-                        /* Bit3: 24bpp */
-                        /* Bit 6, Reserved, 2 bits, 00b */
-                        /* Bit 8, Minimum Supported Frame Rate, 6 bits, 0 - 63Hz */
-                        /* Bit 14, Reserved, 2 bits, 00b */
-} __packed;
-
-struct mrst_panel_descriptor_v2 {
-        u32 Panel_Port_Control; /* 1 dword, Register 0x61180 if LVDS */
-                                /* 0x61190 if MIPI */
-        u32 Panel_Power_On_Sequencing;/*1 dword,Register 0x61208,*/
-        u32 Panel_Power_Off_Sequencing;/*1 dword,Register 0x6120C,*/
-        u8 Panel_Power_Cycle_Delay_and_Reference_Divisor;/* 1 byte */
-                                                /* Register 0x61210 */
-        struct mrst_timing_info DTD;/*18 bytes, Standard definition */
-        u16 Panel_Backlight_Inverter_Descriptor;/*16 bits, as follows*/
-                                /*Bit 0, Frequency, 16 bits, 0 - 32767Hz*/
-        u8 Panel_Initial_Brightness;/* [7:0] 0 - 100% */
-                        /*Bit 7, Polarity, 1 bit,0: Normal, 1: Inverted*/
-        u16 Panel_MIPI_Display_Descriptor;
-                        /*16 bits, Defined as follows: */
-                        /* if MIPI, 0x0000 if LVDS */
-                        /* Bit 0, Type, 2 bits, */
-                        /* 0: Type-1, */
-                        /* 1: Type-2, */
-                        /* 2: Type-3, */
-                        /* 3: Type-4 */
-                        /* Bit 2, Pixel Format, 4 bits */
-                        /* Bit0: 16bpp (not supported in LNC), */
-                        /* Bit1: 18bpp loosely packed, */
-                        /* Bit2: 18bpp packed, */
-                        /* Bit3: 24bpp */
-                        /* Bit 6, Reserved, 2 bits, 00b */
-                        /* Bit 8, Minimum Supported Frame Rate, 6 bits, 0 - 63Hz */
-                        /* Bit 14, Reserved, 2 bits, 00b */
-} __packed;
-
-union mrst_panel_rx {
-        struct {
-                u16 NumberOfLanes:2; /*Num of Lanes, 2 bits,0 = 1 lane,*/
-                        /* 1 = 2 lanes, 2 = 3 lanes, 3 = 4 lanes. */
-                u16 MaxLaneFreq:3; /* 0: 100MHz, 1: 200MHz, 2: 300MHz, */
-                /*3: 400MHz, 4: 500MHz, 5: 600MHz, 6: 700MHz, 7: 800MHz.*/
-                u16 SupportedVideoTransferMode:2; /*0: Non-burst only */
-                                        /* 1: Burst and non-burst */
-                                        /* 2/3: Reserved */
-                u16 HSClkBehavior:1; /*0: Continuous, 1: Non-continuous*/
-                u16 DuoDisplaySupport:1; /*1 bit,0: No, 1: Yes*/
-                u16 ECC_ChecksumCapabilities:1;/*1 bit,0: No, 1: Yes*/
-                u16 BidirectionalCommunication:1;/*1 bit,0: No, 1: Yes */
-                u16 Rsvd:5;/*5 bits,00000b */
-        } panelrx;
-        u16 panel_receiver;
-} __packed;
-
-struct mrst_gct_v1 {
-        union { /*8 bits,Defined as follows: */
-                struct {
-                        u8 PanelType:4; /*4 bits, Bit field for panels*/
-                                        /* 0 - 3: 0 = LVDS, 1 = MIPI*/
-                                        /*2 bits,Specifies which of the*/
-                        u8 BootPanelIndex:2;
-                                        /* 4 panels to use by default*/
-                        u8 BootMIPI_DSI_RxIndex:2;/*Specifies which of*/
-                                        /* the 4 MIPI DSI receivers to use*/
-                } PD;
-                u8 PanelDescriptor;
-        };
-        struct mrst_panel_descriptor_v1 panel[4];/*panel descrs,38 bytes each*/
-        union mrst_panel_rx panelrx[4]; /* panel receivers*/
-} __packed;
-
-struct mrst_gct_v2 {
-        union { /*8 bits,Defined as follows: */
-                struct {
-                        u8 PanelType:4; /*4 bits, Bit field for panels*/
-                                        /* 0 - 3: 0 = LVDS, 1 = MIPI*/
-                                        /*2 bits,Specifies which of the*/
-                        u8 BootPanelIndex:2;
-                                        /* 4 panels to use by default*/
-                        u8 BootMIPI_DSI_RxIndex:2;/*Specifies which of*/
-                                        /* the 4 MIPI DSI receivers to use*/
-                } PD;
-                u8 PanelDescriptor;
-        };
-        struct mrst_panel_descriptor_v2 panel[4];/*panel descrs,38 bytes each*/
-        union mrst_panel_rx panelrx[4]; /* panel receivers*/
-} __packed;
-
-struct mrst_gct_data {
-        u8 bpi; /* boot panel index, number of panel used during boot */
-        u8 pt; /* panel type, 4 bit field, 0=lvds, 1=mipi */
-        struct mrst_timing_info DTD; /* timing info for the selected panel */
-        u32 Panel_Port_Control;
-        u32 PP_On_Sequencing;/*1 dword,Register 0x61208,*/
-        u32 PP_Off_Sequencing;/*1 dword,Register 0x6120C,*/
-        u32 PP_Cycle_Delay;
-        u16 Panel_Backlight_Inverter_Descriptor;
-        u16 Panel_MIPI_Display_Descriptor;
-} __packed;
-
-#define MODE_SETTING_IN_CRTC            0x1
-#define MODE_SETTING_IN_ENCODER         0x2
-#define MODE_SETTING_ON_GOING           0x3
-#define MODE_SETTING_IN_DSR             0x4
-#define MODE_SETTING_ENCODER_DONE       0x8
-
-#define GCT_R10_HEADER_SIZE             16
-#define GCT_R10_DISPLAY_DESC_SIZE       28
-
-/*
- *      Moorestown HDMI interfaces
- */
-
-struct mrst_hdmi_dev {
-        struct pci_dev *dev;
-        void __iomem *regs;
-        unsigned int mmio, mmio_len;
-        int dpms_mode;
-        struct hdmi_i2c_dev *i2c_dev;
-
-        /* register state */
-        u32 saveDPLL_CTRL;
-        u32 saveDPLL_DIV_CTRL;
-        u32 saveDPLL_ADJUST;
-        u32 saveDPLL_UPDATE;
-        u32 saveDPLL_CLK_ENABLE;
-        u32 savePCH_HTOTAL_B;
-        u32 savePCH_HBLANK_B;
-        u32 savePCH_HSYNC_B;
-        u32 savePCH_VTOTAL_B;
-        u32 savePCH_VBLANK_B;
-        u32 savePCH_VSYNC_B;
-        u32 savePCH_PIPEBCONF;
-        u32 savePCH_PIPEBSRC;
-};
-
-extern void mrst_hdmi_setup(struct drm_device *dev);
-extern void mrst_hdmi_teardown(struct drm_device *dev);
-extern int  mrst_hdmi_i2c_init(struct pci_dev *dev);
-extern void mrst_hdmi_i2c_exit(struct pci_dev *dev);
-extern void mrst_hdmi_save(struct drm_device *dev);
-extern void mrst_hdmi_restore(struct drm_device *dev);
-extern void mrst_hdmi_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev);
diff --git a/drivers/staging/gma500/mrst_crtc.c b/drivers/staging/gma500/mrst_crtc.c
deleted file mode 100644
index 980837e37d80..000000000000
--- a/drivers/staging/gma500/mrst_crtc.c
+++ /dev/null
@@ -1,604 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <linux/i2c.h>
-#include <linux/pm_runtime.h>
-
-#include <drm/drmP.h>
-#include "framebuffer.h"
-#include "psb_drv.h"
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "psb_intel_display.h"
-#include "power.h"
-
-struct psb_intel_range_t {
-        int min, max;
-};
-
-struct mrst_limit_t {
-        struct psb_intel_range_t dot, m, p1;
-};
-
-struct mrst_clock_t {
-        /* derived values */
-        int dot;
-        int m;
-        int p1;
-};
-
-#define MRST_LIMIT_LVDS_100L        0
-#define MRST_LIMIT_LVDS_83          1
-#define MRST_LIMIT_LVDS_100         2
-
-#define MRST_DOT_MIN              19750
-#define MRST_DOT_MAX              120000
-#define MRST_M_MIN_100L             20
-#define MRST_M_MIN_100              10
-#define MRST_M_MIN_83               12
-#define MRST_M_MAX_100L             34
-#define MRST_M_MAX_100              17
-#define MRST_M_MAX_83               20
-#define MRST_P1_MIN                 2
-#define MRST_P1_MAX_0               7
-#define MRST_P1_MAX_1               8
-
-static const struct mrst_limit_t mrst_limits[] = {
-        {                       /* MRST_LIMIT_LVDS_100L */
-         .dot = {.min = MRST_DOT_MIN, .max = MRST_DOT_MAX},
-         .m = {.min = MRST_M_MIN_100L, .max = MRST_M_MAX_100L},
-         .p1 = {.min = MRST_P1_MIN, .max = MRST_P1_MAX_1},
-         },
-        {                       /* MRST_LIMIT_LVDS_83L */
-         .dot = {.min = MRST_DOT_MIN, .max = MRST_DOT_MAX},
-         .m = {.min = MRST_M_MIN_83, .max = MRST_M_MAX_83},
-         .p1 = {.min = MRST_P1_MIN, .max = MRST_P1_MAX_0},
-         },
-        {                       /* MRST_LIMIT_LVDS_100 */
-         .dot = {.min = MRST_DOT_MIN, .max = MRST_DOT_MAX},
-         .m = {.min = MRST_M_MIN_100, .max = MRST_M_MAX_100},
-         .p1 = {.min = MRST_P1_MIN, .max = MRST_P1_MAX_1},
-         },
-};
-
-#define MRST_M_MIN          10
-static const u32 mrst_m_converts[] = {
-        0x2B, 0x15, 0x2A, 0x35, 0x1A, 0x0D, 0x26, 0x33, 0x19, 0x2C,
-        0x36, 0x3B, 0x1D, 0x2E, 0x37, 0x1B, 0x2D, 0x16, 0x0B, 0x25,
-        0x12, 0x09, 0x24, 0x32, 0x39, 0x1c,
-};
-
-static const struct mrst_limit_t *mrst_limit(struct drm_crtc *crtc)
-{
-        const struct mrst_limit_t *limit = NULL;
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)
-            || psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_MIPI)) {
-                switch (dev_priv->core_freq) {
-                case 100:
-                        limit = &mrst_limits[MRST_LIMIT_LVDS_100L];
-                        break;
-                case 166:
-                        limit = &mrst_limits[MRST_LIMIT_LVDS_83];
-                        break;
-                case 200:
-                        limit = &mrst_limits[MRST_LIMIT_LVDS_100];
-                        break;
-                }
-        } else {
-                limit = NULL;
-                dev_err(dev->dev, "mrst_limit Wrong display type.\n");
-        }
-
-        return limit;
-}
-
-/** Derive the pixel clock for the given refclk and divisors for 8xx chips. */
-static void mrst_clock(int refclk, struct mrst_clock_t *clock)
-{
-        clock->dot = (refclk * clock->m) / (14 * clock->p1);
-}
-
-void mrstPrintPll(char *prefix, struct mrst_clock_t *clock)
-{
-        pr_debug("%s: dotclock = %d,  m = %d, p1 = %d.\n",
-             prefix, clock->dot, clock->m, clock->p1);
-}
-
-/**
- * Returns a set of divisors for the desired target clock with the given refclk,
- * or FALSE.  Divisor values are the actual divisors for
- */
-static bool
-mrstFindBestPLL(struct drm_crtc *crtc, int target, int refclk,
-                struct mrst_clock_t *best_clock)
-{
-        struct mrst_clock_t clock;
-        const struct mrst_limit_t *limit = mrst_limit(crtc);
-        int err = target;
-
-        memset(best_clock, 0, sizeof(*best_clock));
-
-        for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) {
-                for (clock.p1 = limit->p1.min; clock.p1 <= limit->p1.max;
-                     clock.p1++) {
-                        int this_err;
-
-                        mrst_clock(refclk, &clock);
-
-                        this_err = abs(clock.dot - target);
-                        if (this_err < err) {
-                                *best_clock = clock;
-                                err = this_err;
-                        }
-                }
-        }
-        dev_dbg(crtc->dev->dev, "mrstFindBestPLL err = %d.\n", err);
-        return err != target;
-}
-
-/**
- * Sets the power management mode of the pipe and plane.
- *
- * This code should probably grow support for turning the cursor off and back
- * on appropriately at the same time as we're turning the pipe off/on.
- */
-static void mrst_crtc_dpms(struct drm_crtc *crtc, int mode)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        int dpll_reg = (pipe == 0) ? MRST_DPLL_A : DPLL_B;
-        int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
-        int dspbase_reg = (pipe == 0) ? MRST_DSPABASE : DSPBBASE;
-        int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
-        u32 temp;
-        bool enabled;
-
-        if (!gma_power_begin(dev, true))
-                return;
-
-        /* XXX: When our outputs are all unaware of DPMS modes other than off
-         * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.
-         */
-        switch (mode) {
-        case DRM_MODE_DPMS_ON:
-        case DRM_MODE_DPMS_STANDBY:
-        case DRM_MODE_DPMS_SUSPEND:
-                /* Enable the DPLL */
-                temp = REG_READ(dpll_reg);
-                if ((temp & DPLL_VCO_ENABLE) == 0) {
-                        REG_WRITE(dpll_reg, temp);
-                        REG_READ(dpll_reg);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                        REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);
-                        REG_READ(dpll_reg);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                        REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);
-                        REG_READ(dpll_reg);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                }
-                /* Enable the pipe */
-                temp = REG_READ(pipeconf_reg);
-                if ((temp & PIPEACONF_ENABLE) == 0)
-                        REG_WRITE(pipeconf_reg, temp | PIPEACONF_ENABLE);
-                /* Enable the plane */
-                temp = REG_READ(dspcntr_reg);
-                if ((temp & DISPLAY_PLANE_ENABLE) == 0) {
-                        REG_WRITE(dspcntr_reg,
-                                  temp | DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));
-                }
-
-                psb_intel_crtc_load_lut(crtc);
-
-                /* Give the overlay scaler a chance to enable
-                   if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, true); TODO */
-                break;
-        case DRM_MODE_DPMS_OFF:
-                /* Give the overlay scaler a chance to disable
-                 * if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, FALSE); TODO */
-
-                /* Disable the VGA plane that we never use */
-                REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);
-                /* Disable display plane */
-                temp = REG_READ(dspcntr_reg);
-                if ((temp & DISPLAY_PLANE_ENABLE) != 0) {
-                        REG_WRITE(dspcntr_reg,
-                                  temp & ~DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));
-                        REG_READ(dspbase_reg);
-                }
-
-                /* Next, disable display pipes */
-                temp = REG_READ(pipeconf_reg);
-                if ((temp & PIPEACONF_ENABLE) != 0) {
-                        REG_WRITE(pipeconf_reg, temp & ~PIPEACONF_ENABLE);
-                        REG_READ(pipeconf_reg);
-                }
-                /* Wait for for the pipe disable to take effect. */
-                psb_intel_wait_for_vblank(dev);
-
-                temp = REG_READ(dpll_reg);
-                if ((temp & DPLL_VCO_ENABLE) != 0) {
-                        REG_WRITE(dpll_reg, temp & ~DPLL_VCO_ENABLE);
-                        REG_READ(dpll_reg);
-                }
-
-                /* Wait for the clocks to turn off. */
-                udelay(150);
-                break;
-        }
-
-        enabled = crtc->enabled && mode != DRM_MODE_DPMS_OFF;
-
-        /*Set FIFO Watermarks*/
-        REG_WRITE(DSPARB, 0x3FFF);
-        REG_WRITE(DSPFW1, 0x3F88080A);
-        REG_WRITE(DSPFW2, 0x0b060808);
-        REG_WRITE(DSPFW3, 0x0);
-        REG_WRITE(DSPFW4, 0x08030404);
-        REG_WRITE(DSPFW5, 0x04040404);
-        REG_WRITE(DSPFW6, 0x78);
-        REG_WRITE(0x70400, REG_READ(0x70400) | 0x4000);
-        /* Must write Bit 14 of the Chicken Bit Register */
-
-        gma_power_end(dev);
-}
-
-/**
- * Return the pipe currently connected to the panel fitter,
- * or -1 if the panel fitter is not present or not in use
- */
-static int mrst_panel_fitter_pipe(struct drm_device *dev)
-{
-        u32 pfit_control;
-
-        pfit_control = REG_READ(PFIT_CONTROL);
-
-        /* See if the panel fitter is in use */
-        if ((pfit_control & PFIT_ENABLE) == 0)
-                return -1;
-        return (pfit_control >> 29) & 3;
-}
-
-static int mrst_crtc_mode_set(struct drm_crtc *crtc,
-                              struct drm_display_mode *mode,
-                              struct drm_display_mode *adjusted_mode,
-                              int x, int y,
-                              struct drm_framebuffer *old_fb)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int pipe = psb_intel_crtc->pipe;
-        int fp_reg = (pipe == 0) ? MRST_FPA0 : FPB0;
-        int dpll_reg = (pipe == 0) ? MRST_DPLL_A : DPLL_B;
-        int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
-        int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
-        int htot_reg = (pipe == 0) ? HTOTAL_A : HTOTAL_B;
-        int hblank_reg = (pipe == 0) ? HBLANK_A : HBLANK_B;
-        int hsync_reg = (pipe == 0) ? HSYNC_A : HSYNC_B;
-        int vtot_reg = (pipe == 0) ? VTOTAL_A : VTOTAL_B;
-        int vblank_reg = (pipe == 0) ? VBLANK_A : VBLANK_B;
-        int vsync_reg = (pipe == 0) ? VSYNC_A : VSYNC_B;
-        int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
-        int refclk = 0;
-        struct mrst_clock_t clock;
-        u32 dpll = 0, fp = 0, dspcntr, pipeconf;
-        bool ok, is_sdvo = false;
-        bool is_crt = false, is_lvds = false, is_tv = false;
-        bool is_mipi = false;
-        struct drm_mode_config *mode_config = &dev->mode_config;
-        struct psb_intel_output *psb_intel_output = NULL;
-        uint64_t scalingType = DRM_MODE_SCALE_FULLSCREEN;
-        struct drm_encoder *encoder;
-
-        if (!gma_power_begin(dev, true))
-                return 0;
-
-        memcpy(&psb_intel_crtc->saved_mode,
-                mode,
-                sizeof(struct drm_display_mode));
-        memcpy(&psb_intel_crtc->saved_adjusted_mode,
-                adjusted_mode,
-                sizeof(struct drm_display_mode));
-
-        list_for_each_entry(encoder, &mode_config->encoder_list, head) {
-
-                if (encoder->crtc != crtc)
-                        continue;
-
-                psb_intel_output = enc_to_psb_intel_output(encoder);
-                switch (psb_intel_output->type) {
-                case INTEL_OUTPUT_LVDS:
-                        is_lvds = true;
-                        break;
-                case INTEL_OUTPUT_SDVO:
-                        is_sdvo = true;
-                        break;
-                case INTEL_OUTPUT_TVOUT:
-                        is_tv = true;
-                        break;
-                case INTEL_OUTPUT_ANALOG:
-                        is_crt = true;
-                        break;
-                case INTEL_OUTPUT_MIPI:
-                        is_mipi = true;
-                        break;
-                }
-        }
-
-        /* Disable the VGA plane that we never use */
-        REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);
-
-        /* Disable the panel fitter if it was on our pipe */
-        if (mrst_panel_fitter_pipe(dev) == pipe)
-                REG_WRITE(PFIT_CONTROL, 0);
-
-        REG_WRITE(pipesrc_reg,
-                  ((mode->crtc_hdisplay - 1) << 16) |
-                  (mode->crtc_vdisplay - 1));
-
-        if (psb_intel_output)
-                drm_connector_property_get_value(&psb_intel_output->base,
-                        dev->mode_config.scaling_mode_property, &scalingType);
-
-        if (scalingType == DRM_MODE_SCALE_NO_SCALE) {
-                /* Moorestown doesn't have register support for centering so
-                 * we need to mess with the h/vblank and h/vsync start and
-                 * ends to get centering */
-                int offsetX = 0, offsetY = 0;
-
-                offsetX = (adjusted_mode->crtc_hdisplay -
-                           mode->crtc_hdisplay) / 2;
-                offsetY = (adjusted_mode->crtc_vdisplay -
-                           mode->crtc_vdisplay) / 2;
-
-                REG_WRITE(htot_reg, (mode->crtc_hdisplay - 1) |
-                        ((adjusted_mode->crtc_htotal - 1) << 16));
-                REG_WRITE(vtot_reg, (mode->crtc_vdisplay - 1) |
-                        ((adjusted_mode->crtc_vtotal - 1) << 16));
-                REG_WRITE(hblank_reg,
-                        (adjusted_mode->crtc_hblank_start - offsetX - 1) |
-                        ((adjusted_mode->crtc_hblank_end - offsetX - 1) << 16));
-                REG_WRITE(hsync_reg,
-                        (adjusted_mode->crtc_hsync_start - offsetX - 1) |
-                        ((adjusted_mode->crtc_hsync_end - offsetX - 1) << 16));
-                REG_WRITE(vblank_reg,
-                        (adjusted_mode->crtc_vblank_start - offsetY - 1) |
-                        ((adjusted_mode->crtc_vblank_end - offsetY - 1) << 16));
-                REG_WRITE(vsync_reg,
-                        (adjusted_mode->crtc_vsync_start - offsetY - 1) |
-                        ((adjusted_mode->crtc_vsync_end - offsetY - 1) << 16));
-        } else {
-                REG_WRITE(htot_reg, (adjusted_mode->crtc_hdisplay - 1) |
-                        ((adjusted_mode->crtc_htotal - 1) << 16));
-                REG_WRITE(vtot_reg, (adjusted_mode->crtc_vdisplay - 1) |
-                        ((adjusted_mode->crtc_vtotal - 1) << 16));
-                REG_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - 1) |
-                        ((adjusted_mode->crtc_hblank_end - 1) << 16));
-                REG_WRITE(hsync_reg, (adjusted_mode->crtc_hsync_start - 1) |
-                        ((adjusted_mode->crtc_hsync_end - 1) << 16));
-                REG_WRITE(vblank_reg, (adjusted_mode->crtc_vblank_start - 1) |
-                        ((adjusted_mode->crtc_vblank_end - 1) << 16));
-                REG_WRITE(vsync_reg, (adjusted_mode->crtc_vsync_start - 1) |
-                        ((adjusted_mode->crtc_vsync_end - 1) << 16));
-        }
-
-        /* Flush the plane changes */
-        {
-                struct drm_crtc_helper_funcs *crtc_funcs =
-                    crtc->helper_private;
-                crtc_funcs->mode_set_base(crtc, x, y, old_fb);
-        }
-
-        /* setup pipeconf */
-        pipeconf = REG_READ(pipeconf_reg);
-
-        /* Set up the display plane register */
-        dspcntr = REG_READ(dspcntr_reg);
-        dspcntr |= DISPPLANE_GAMMA_ENABLE;
-
-        if (pipe == 0)
-                dspcntr |= DISPPLANE_SEL_PIPE_A;
-        else
-                dspcntr |= DISPPLANE_SEL_PIPE_B;
-
-        dev_priv->dspcntr = dspcntr |= DISPLAY_PLANE_ENABLE;
-        dev_priv->pipeconf = pipeconf |= PIPEACONF_ENABLE;
-
-        if (is_mipi)
-                goto mrst_crtc_mode_set_exit;
-
-        refclk = dev_priv->core_freq * 1000;
-
-        dpll = 0;               /*BIT16 = 0 for 100MHz reference */
-
-        ok = mrstFindBestPLL(crtc, adjusted_mode->clock, refclk, &clock);
-
-        if (!ok) {
-                dev_dbg(dev->dev, "mrstFindBestPLL fail in mrst_crtc_mode_set.\n");
-        } else {
-                dev_dbg(dev->dev, "mrst_crtc_mode_set pixel clock = %d,"
-                         "m = %x, p1 = %x.\n", clock.dot, clock.m,
-                         clock.p1);
-        }
-
-        fp = mrst_m_converts[(clock.m - MRST_M_MIN)] << 8;
-
-        dpll |= DPLL_VGA_MODE_DIS;
-
-
-        dpll |= DPLL_VCO_ENABLE;
-
-        if (is_lvds)
-                dpll |= DPLLA_MODE_LVDS;
-        else
-                dpll |= DPLLB_MODE_DAC_SERIAL;
-
-        if (is_sdvo) {
-                int sdvo_pixel_multiply =
-                    adjusted_mode->clock / mode->clock;
-
-                dpll |= DPLL_DVO_HIGH_SPEED;
-                dpll |=
-                    (sdvo_pixel_multiply -
-                     1) << SDVO_MULTIPLIER_SHIFT_HIRES;
-        }
-
-
-        /* compute bitmask from p1 value */
-        dpll |= (1 << (clock.p1 - 2)) << 17;
-
-        dpll |= DPLL_VCO_ENABLE;
-
-        mrstPrintPll("chosen", &clock);
-
-        if (dpll & DPLL_VCO_ENABLE) {
-                REG_WRITE(fp_reg, fp);
-                REG_WRITE(dpll_reg, dpll & ~DPLL_VCO_ENABLE);
-                REG_READ(dpll_reg);
-                /* Check the DPLLA lock bit PIPEACONF[29] */
-                udelay(150);
-        }
-
-        REG_WRITE(fp_reg, fp);
-        REG_WRITE(dpll_reg, dpll);
-        REG_READ(dpll_reg);
-        /* Wait for the clocks to stabilize. */
-        udelay(150);
-
-        /* write it again -- the BIOS does, after all */
-        REG_WRITE(dpll_reg, dpll);
-        REG_READ(dpll_reg);
-        /* Wait for the clocks to stabilize. */
-        udelay(150);
-
-        REG_WRITE(pipeconf_reg, pipeconf);
-        REG_READ(pipeconf_reg);
-        psb_intel_wait_for_vblank(dev);
-
-        REG_WRITE(dspcntr_reg, dspcntr);
-        psb_intel_wait_for_vblank(dev);
-
-mrst_crtc_mode_set_exit:
-        gma_power_end(dev);
-        return 0;
-}
-
-static bool mrst_crtc_mode_fixup(struct drm_crtc *crtc,
-                                  struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
-int mrst_pipe_set_base(struct drm_crtc *crtc,
-                            int x, int y, struct drm_framebuffer *old_fb)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
-        int pipe = psb_intel_crtc->pipe;
-        unsigned long start, offset;
-
-        int dspbase = (pipe == 0 ? DSPALINOFF : DSPBBASE);
-        int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);
-        int dspstride = (pipe == 0) ? DSPASTRIDE : DSPBSTRIDE;
-        int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
-        u32 dspcntr;
-        int ret = 0;
-
-        /* no fb bound */
-        if (!crtc->fb) {
-                dev_dbg(dev->dev, "No FB bound\n");
-                return 0;
-        }
-
-        if (!gma_power_begin(dev, true))
-                return 0;
-
-        start = psbfb->gtt->offset;
-        offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
-
-        REG_WRITE(dspstride, crtc->fb->pitches[0]);
-
-        dspcntr = REG_READ(dspcntr_reg);
-        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
-
-        switch (crtc->fb->bits_per_pixel) {
-        case 8:
-                dspcntr |= DISPPLANE_8BPP;
-                break;
-        case 16:
-                if (crtc->fb->depth == 15)
-                        dspcntr |= DISPPLANE_15_16BPP;
-                else
-                        dspcntr |= DISPPLANE_16BPP;
-                break;
-        case 24:
-        case 32:
-                dspcntr |= DISPPLANE_32BPP_NO_ALPHA;
-                break;
-        default:
-                dev_err(dev->dev, "Unknown color depth\n");
-                ret = -EINVAL;
-                goto pipe_set_base_exit;
-        }
-        REG_WRITE(dspcntr_reg, dspcntr);
-
-        REG_WRITE(dspbase, offset);
-        REG_READ(dspbase);
-        REG_WRITE(dspsurf, start);
-        REG_READ(dspsurf);
-
-pipe_set_base_exit:
-        gma_power_end(dev);
-        return ret;
-}
-
-static void mrst_crtc_prepare(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
-}
-
-static void mrst_crtc_commit(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-}
-
-const struct drm_crtc_helper_funcs mrst_helper_funcs = {
-        .dpms = mrst_crtc_dpms,
-        .mode_fixup = mrst_crtc_mode_fixup,
-        .mode_set = mrst_crtc_mode_set,
-        .mode_set_base = mrst_pipe_set_base,
-        .prepare = mrst_crtc_prepare,
-        .commit = mrst_crtc_commit,
-};
-
diff --git a/drivers/staging/gma500/mrst_device.c b/drivers/staging/gma500/mrst_device.c
deleted file mode 100644
index 6707fafbfa1e..000000000000
--- a/drivers/staging/gma500/mrst_device.c
+++ /dev/null
@@ -1,634 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-#include <linux/backlight.h>
-#include <linux/module.h>
-#include <linux/dmi.h>
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include "psb_drm.h"
-#include "psb_drv.h"
-#include "psb_reg.h"
-#include "psb_intel_reg.h"
-#include <asm/mrst.h>
-#include <asm/intel_scu_ipc.h>
-#include "mid_bios.h"
-
-static int devtype;
-
-module_param_named(type, devtype, int, 0600);
-MODULE_PARM_DESC(type, "Moorestown/Oaktrail device type");
-
-#define DEVICE_MOORESTOWN               1
-#define DEVICE_OAKTRAIL                 2
-#define DEVICE_MOORESTOWN_MM            3
-
-static int mrst_device_ident(struct drm_device *dev)
-{
-        /* User forced */
-        if (devtype)
-                return devtype;
-        if (dmi_match(DMI_PRODUCT_NAME, "OakTrail") ||
-                dmi_match(DMI_PRODUCT_NAME, "OakTrail platform"))
-                return DEVICE_OAKTRAIL;
-#if defined(CONFIG_X86_MRST)
-        if (dmi_match(DMI_PRODUCT_NAME, "MM") ||
-                dmi_match(DMI_PRODUCT_NAME, "MM 10"))
-                return DEVICE_MOORESTOWN_MM;
-        if (mrst_identify_cpu())
-                return DEVICE_MOORESTOWN;
-#endif
-        return DEVICE_OAKTRAIL;
-}
-
-
-/* IPC message and command defines used to enable/disable mipi panel voltages */
-#define IPC_MSG_PANEL_ON_OFF    0xE9
-#define IPC_CMD_PANEL_ON        1
-#define IPC_CMD_PANEL_OFF       0
-
-static int mrst_output_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        if (dev_priv->iLVDS_enable)
-                mrst_lvds_init(dev, &dev_priv->mode_dev);
-        else
-                dev_err(dev->dev, "DSI is not supported\n");
-        if (dev_priv->hdmi_priv)
-                mrst_hdmi_init(dev, &dev_priv->mode_dev);
-        return 0;
-}
-
-/*
- *      Provide the low level interfaces for the Moorestown backlight
- */
-
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-
-#define MRST_BLC_MAX_PWM_REG_FREQ           0xFFFF
-#define BLC_PWM_PRECISION_FACTOR 100    /* 10000000 */
-#define BLC_PWM_FREQ_CALC_CONSTANT 32
-#define MHz 1000000
-#define BLC_ADJUSTMENT_MAX 100
-
-static struct backlight_device *mrst_backlight_device;
-static int mrst_brightness;
-
-static int mrst_set_brightness(struct backlight_device *bd)
-{
-        struct drm_device *dev = bl_get_data(mrst_backlight_device);
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int level = bd->props.brightness;
-        u32 blc_pwm_ctl;
-        u32 max_pwm_blc;
-
-        /* Percentage 1-100% being valid */
-        if (level < 1)
-                level = 1;
-
-        if (gma_power_begin(dev, 0)) {
-                /* Calculate and set the brightness value */
-                max_pwm_blc = REG_READ(BLC_PWM_CTL) >> 16;
-                blc_pwm_ctl = level * max_pwm_blc / 100;
-
-                /* Adjust the backlight level with the percent in
-                 * dev_priv->blc_adj1;
-                 */
-                blc_pwm_ctl = blc_pwm_ctl * dev_priv->blc_adj1;
-                blc_pwm_ctl = blc_pwm_ctl / 100;
-
-                /* Adjust the backlight level with the percent in
-                 * dev_priv->blc_adj2;
-                 */
-                blc_pwm_ctl = blc_pwm_ctl * dev_priv->blc_adj2;
-                blc_pwm_ctl = blc_pwm_ctl / 100;
-
-                /* force PWM bit on */
-                REG_WRITE(BLC_PWM_CTL2, (0x80000000 | REG_READ(BLC_PWM_CTL2)));
-                REG_WRITE(BLC_PWM_CTL, (max_pwm_blc << 16) | blc_pwm_ctl);
-                gma_power_end(dev);
-        }
-        mrst_brightness = level;
-        return 0;
-}
-
-static int mrst_get_brightness(struct backlight_device *bd)
-{
-        /* return locally cached var instead of HW read (due to DPST etc.) */
-        /* FIXME: ideally return actual value in case firmware fiddled with
-           it */
-        return mrst_brightness;
-}
-
-static int device_backlight_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned long core_clock;
-        u16 bl_max_freq;
-        uint32_t value;
-        uint32_t blc_pwm_precision_factor;
-
-        dev_priv->blc_adj1 = BLC_ADJUSTMENT_MAX;
-        dev_priv->blc_adj2 = BLC_ADJUSTMENT_MAX;
-        bl_max_freq = 256;
-        /* this needs to be set elsewhere */
-        blc_pwm_precision_factor = BLC_PWM_PRECISION_FACTOR;
-
-        core_clock = dev_priv->core_freq;
-
-        value = (core_clock * MHz) / BLC_PWM_FREQ_CALC_CONSTANT;
-        value *= blc_pwm_precision_factor;
-        value /= bl_max_freq;
-        value /= blc_pwm_precision_factor;
-
-        if (value > (unsigned long long)MRST_BLC_MAX_PWM_REG_FREQ)
-                        return -ERANGE;
-
-        if (gma_power_begin(dev, false)) {
-                REG_WRITE(BLC_PWM_CTL2, (0x80000000 | REG_READ(BLC_PWM_CTL2)));
-                REG_WRITE(BLC_PWM_CTL, value | (value << 16));
-                gma_power_end(dev);
-        }
-        return 0;
-}
-
-static const struct backlight_ops mrst_ops = {
-        .get_brightness = mrst_get_brightness,
-        .update_status  = mrst_set_brightness,
-};
-
-int mrst_backlight_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int ret;
-        struct backlight_properties props;
-
-        memset(&props, 0, sizeof(struct backlight_properties));
-        props.max_brightness = 100;
-        props.type = BACKLIGHT_PLATFORM;
-
-        mrst_backlight_device = backlight_device_register("mrst-bl",
-                                        NULL, (void *)dev, &mrst_ops, &props);
-
-        if (IS_ERR(mrst_backlight_device))
-                return PTR_ERR(mrst_backlight_device);
-
-        ret = device_backlight_init(dev);
-        if (ret < 0) {
-                backlight_device_unregister(mrst_backlight_device);
-                return ret;
-        }
-        mrst_backlight_device->props.brightness = 100;
-        mrst_backlight_device->props.max_brightness = 100;
-        backlight_update_status(mrst_backlight_device);
-        dev_priv->backlight_device = mrst_backlight_device;
-        return 0;
-}
-
-#endif
-
-/*
- *      Provide the Moorestown specific chip logic and low level methods
- *      for power management
- */
-
-static void mrst_init_pm(struct drm_device *dev)
-{
-}
-
-/**
- *      mrst_save_display_registers     -       save registers lost on suspend
- *      @dev: our DRM device
- *
- *      Save the state we need in order to be able to restore the interface
- *      upon resume from suspend
- */
-static int mrst_save_display_registers(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int i;
-        u32 pp_stat;
-
-        /* Display arbitration control + watermarks */
-        dev_priv->saveDSPARB = PSB_RVDC32(DSPARB);
-        dev_priv->saveDSPFW1 = PSB_RVDC32(DSPFW1);
-        dev_priv->saveDSPFW2 = PSB_RVDC32(DSPFW2);
-        dev_priv->saveDSPFW3 = PSB_RVDC32(DSPFW3);
-        dev_priv->saveDSPFW4 = PSB_RVDC32(DSPFW4);
-        dev_priv->saveDSPFW5 = PSB_RVDC32(DSPFW5);
-        dev_priv->saveDSPFW6 = PSB_RVDC32(DSPFW6);
-        dev_priv->saveCHICKENBIT = PSB_RVDC32(DSPCHICKENBIT);
-
-        /* Pipe & plane A info */
-        dev_priv->savePIPEACONF = PSB_RVDC32(PIPEACONF);
-        dev_priv->savePIPEASRC = PSB_RVDC32(PIPEASRC);
-        dev_priv->saveFPA0 = PSB_RVDC32(MRST_FPA0);
-        dev_priv->saveFPA1 = PSB_RVDC32(MRST_FPA1);
-        dev_priv->saveDPLL_A = PSB_RVDC32(MRST_DPLL_A);
-        dev_priv->saveHTOTAL_A = PSB_RVDC32(HTOTAL_A);
-        dev_priv->saveHBLANK_A = PSB_RVDC32(HBLANK_A);
-        dev_priv->saveHSYNC_A = PSB_RVDC32(HSYNC_A);
-        dev_priv->saveVTOTAL_A = PSB_RVDC32(VTOTAL_A);
-        dev_priv->saveVBLANK_A = PSB_RVDC32(VBLANK_A);
-        dev_priv->saveVSYNC_A = PSB_RVDC32(VSYNC_A);
-        dev_priv->saveBCLRPAT_A = PSB_RVDC32(BCLRPAT_A);
-        dev_priv->saveDSPACNTR = PSB_RVDC32(DSPACNTR);
-        dev_priv->saveDSPASTRIDE = PSB_RVDC32(DSPASTRIDE);
-        dev_priv->saveDSPAADDR = PSB_RVDC32(DSPABASE);
-        dev_priv->saveDSPASURF = PSB_RVDC32(DSPASURF);
-        dev_priv->saveDSPALINOFF = PSB_RVDC32(DSPALINOFF);
-        dev_priv->saveDSPATILEOFF = PSB_RVDC32(DSPATILEOFF);
-
-        /* Save cursor regs */
-        dev_priv->saveDSPACURSOR_CTRL = PSB_RVDC32(CURACNTR);
-        dev_priv->saveDSPACURSOR_BASE = PSB_RVDC32(CURABASE);
-        dev_priv->saveDSPACURSOR_POS = PSB_RVDC32(CURAPOS);
-
-        /* Save palette (gamma) */
-        for (i = 0; i < 256; i++)
-                dev_priv->save_palette_a[i] = PSB_RVDC32(PALETTE_A + (i << 2));
-
-        if (dev_priv->hdmi_priv)
-                mrst_hdmi_save(dev);
-
-        /* Save performance state */
-        dev_priv->savePERF_MODE = PSB_RVDC32(MRST_PERF_MODE);
-
-        /* LVDS state */
-        dev_priv->savePP_CONTROL = PSB_RVDC32(PP_CONTROL);
-        dev_priv->savePFIT_PGM_RATIOS = PSB_RVDC32(PFIT_PGM_RATIOS);
-        dev_priv->savePFIT_AUTO_RATIOS = PSB_RVDC32(PFIT_AUTO_RATIOS);
-        dev_priv->saveBLC_PWM_CTL = PSB_RVDC32(BLC_PWM_CTL);
-        dev_priv->saveBLC_PWM_CTL2 = PSB_RVDC32(BLC_PWM_CTL2);
-        dev_priv->saveLVDS = PSB_RVDC32(LVDS);
-        dev_priv->savePFIT_CONTROL = PSB_RVDC32(PFIT_CONTROL);
-        dev_priv->savePP_ON_DELAYS = PSB_RVDC32(LVDSPP_ON);
-        dev_priv->savePP_OFF_DELAYS = PSB_RVDC32(LVDSPP_OFF);
-        dev_priv->savePP_DIVISOR = PSB_RVDC32(PP_CYCLE);
-
-        /* HW overlay */
-        dev_priv->saveOV_OVADD = PSB_RVDC32(OV_OVADD);
-        dev_priv->saveOV_OGAMC0 = PSB_RVDC32(OV_OGAMC0);
-        dev_priv->saveOV_OGAMC1 = PSB_RVDC32(OV_OGAMC1);
-        dev_priv->saveOV_OGAMC2 = PSB_RVDC32(OV_OGAMC2);
-        dev_priv->saveOV_OGAMC3 = PSB_RVDC32(OV_OGAMC3);
-        dev_priv->saveOV_OGAMC4 = PSB_RVDC32(OV_OGAMC4);
-        dev_priv->saveOV_OGAMC5 = PSB_RVDC32(OV_OGAMC5);
-
-        /* DPST registers */
-        dev_priv->saveHISTOGRAM_INT_CONTROL_REG =
-                                        PSB_RVDC32(HISTOGRAM_INT_CONTROL);
-        dev_priv->saveHISTOGRAM_LOGIC_CONTROL_REG =
-                                        PSB_RVDC32(HISTOGRAM_LOGIC_CONTROL);
-        dev_priv->savePWM_CONTROL_LOGIC = PSB_RVDC32(PWM_CONTROL_LOGIC);
-
-        if (dev_priv->iLVDS_enable) {
-                /* Shut down the panel */
-                PSB_WVDC32(0, PP_CONTROL);
-
-                do {
-                        pp_stat = PSB_RVDC32(PP_STATUS);
-                } while (pp_stat & 0x80000000);
-
-                /* Turn off the plane */
-                PSB_WVDC32(0x58000000, DSPACNTR);
-                /* Trigger the plane disable */
-                PSB_WVDC32(0, DSPASURF);
-
-                /* Wait ~4 ticks */
-                msleep(4);
-
-                /* Turn off pipe */
-                PSB_WVDC32(0x0, PIPEACONF);
-                /* Wait ~8 ticks */
-                msleep(8);
-
-                /* Turn off PLLs */
-                PSB_WVDC32(0, MRST_DPLL_A);
-        }
-        return 0;
-}
-
-/**
- *      mrst_restore_display_registers  -       restore lost register state
- *      @dev: our DRM device
- *
- *      Restore register state that was lost during suspend and resume.
- */
-static int mrst_restore_display_registers(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 pp_stat;
-        int i;
-
-        /* Display arbitration + watermarks */
-        PSB_WVDC32(dev_priv->saveDSPARB, DSPARB);
-        PSB_WVDC32(dev_priv->saveDSPFW1, DSPFW1);
-        PSB_WVDC32(dev_priv->saveDSPFW2, DSPFW2);
-        PSB_WVDC32(dev_priv->saveDSPFW3, DSPFW3);
-        PSB_WVDC32(dev_priv->saveDSPFW4, DSPFW4);
-        PSB_WVDC32(dev_priv->saveDSPFW5, DSPFW5);
-        PSB_WVDC32(dev_priv->saveDSPFW6, DSPFW6);
-        PSB_WVDC32(dev_priv->saveCHICKENBIT, DSPCHICKENBIT);
-
-        /* Make sure VGA plane is off. it initializes to on after reset!*/
-        PSB_WVDC32(0x80000000, VGACNTRL);
-
-        /* set the plls */
-        PSB_WVDC32(dev_priv->saveFPA0, MRST_FPA0);
-        PSB_WVDC32(dev_priv->saveFPA1, MRST_FPA1);
-
-        /* Actually enable it */
-        PSB_WVDC32(dev_priv->saveDPLL_A, MRST_DPLL_A);
-        DRM_UDELAY(150);
-
-        /* Restore mode */
-        PSB_WVDC32(dev_priv->saveHTOTAL_A, HTOTAL_A);
-        PSB_WVDC32(dev_priv->saveHBLANK_A, HBLANK_A);
-        PSB_WVDC32(dev_priv->saveHSYNC_A, HSYNC_A);
-        PSB_WVDC32(dev_priv->saveVTOTAL_A, VTOTAL_A);
-        PSB_WVDC32(dev_priv->saveVBLANK_A, VBLANK_A);
-        PSB_WVDC32(dev_priv->saveVSYNC_A, VSYNC_A);
-        PSB_WVDC32(dev_priv->savePIPEASRC, PIPEASRC);
-        PSB_WVDC32(dev_priv->saveBCLRPAT_A, BCLRPAT_A);
-
-        /* Restore performance mode*/
-        PSB_WVDC32(dev_priv->savePERF_MODE, MRST_PERF_MODE);
-
-        /* Enable the pipe*/
-        if (dev_priv->iLVDS_enable)
-                PSB_WVDC32(dev_priv->savePIPEACONF, PIPEACONF);
-
-        /* Set up the plane*/
-        PSB_WVDC32(dev_priv->saveDSPALINOFF, DSPALINOFF);
-        PSB_WVDC32(dev_priv->saveDSPASTRIDE, DSPASTRIDE);
-        PSB_WVDC32(dev_priv->saveDSPATILEOFF, DSPATILEOFF);
-
-        /* Enable the plane */
-        PSB_WVDC32(dev_priv->saveDSPACNTR, DSPACNTR);
-        PSB_WVDC32(dev_priv->saveDSPASURF, DSPASURF);
-
-        /* Enable Cursor A */
-        PSB_WVDC32(dev_priv->saveDSPACURSOR_CTRL, CURACNTR);
-        PSB_WVDC32(dev_priv->saveDSPACURSOR_POS, CURAPOS);
-        PSB_WVDC32(dev_priv->saveDSPACURSOR_BASE, CURABASE);
-
-        /* Restore palette (gamma) */
-        for (i = 0; i < 256; i++)
-                PSB_WVDC32(dev_priv->save_palette_a[i], PALETTE_A + (i << 2));
-
-        if (dev_priv->hdmi_priv)
-                mrst_hdmi_restore(dev);
-
-        if (dev_priv->iLVDS_enable) {
-                PSB_WVDC32(dev_priv->saveBLC_PWM_CTL2, BLC_PWM_CTL2);
-                PSB_WVDC32(dev_priv->saveLVDS, LVDS); /*port 61180h*/
-                PSB_WVDC32(dev_priv->savePFIT_CONTROL, PFIT_CONTROL);
-                PSB_WVDC32(dev_priv->savePFIT_PGM_RATIOS, PFIT_PGM_RATIOS);
-                PSB_WVDC32(dev_priv->savePFIT_AUTO_RATIOS, PFIT_AUTO_RATIOS);
-                PSB_WVDC32(dev_priv->saveBLC_PWM_CTL, BLC_PWM_CTL);
-                PSB_WVDC32(dev_priv->savePP_ON_DELAYS, LVDSPP_ON);
-                PSB_WVDC32(dev_priv->savePP_OFF_DELAYS, LVDSPP_OFF);
-                PSB_WVDC32(dev_priv->savePP_DIVISOR, PP_CYCLE);
-                PSB_WVDC32(dev_priv->savePP_CONTROL, PP_CONTROL);
-        }
-
-        /* Wait for cycle delay */
-        do {
-                pp_stat = PSB_RVDC32(PP_STATUS);
-        } while (pp_stat & 0x08000000);
-
-        /* Wait for panel power up */
-        do {
-                pp_stat = PSB_RVDC32(PP_STATUS);
-        } while (pp_stat & 0x10000000);
-
-        /* Restore HW overlay */
-        PSB_WVDC32(dev_priv->saveOV_OVADD, OV_OVADD);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC0, OV_OGAMC0);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC1, OV_OGAMC1);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC2, OV_OGAMC2);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC3, OV_OGAMC3);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC4, OV_OGAMC4);
-        PSB_WVDC32(dev_priv->saveOV_OGAMC5, OV_OGAMC5);
-
-        /* DPST registers */
-        PSB_WVDC32(dev_priv->saveHISTOGRAM_INT_CONTROL_REG,
-                                                HISTOGRAM_INT_CONTROL);
-        PSB_WVDC32(dev_priv->saveHISTOGRAM_LOGIC_CONTROL_REG,
-                                                HISTOGRAM_LOGIC_CONTROL);
-        PSB_WVDC32(dev_priv->savePWM_CONTROL_LOGIC, PWM_CONTROL_LOGIC);
-
-        return 0;
-}
-
-/**
- *      mrst_power_down -       power down the display island
- *      @dev: our DRM device
- *
- *      Power down the display interface of our device
- */
-static int mrst_power_down(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 pwr_mask ;
-        u32 pwr_sts;
-
-        pwr_mask = PSB_PWRGT_DISPLAY_MASK;
-        outl(pwr_mask, dev_priv->ospm_base + PSB_PM_SSC);
-
-        while (true) {
-                pwr_sts = inl(dev_priv->ospm_base + PSB_PM_SSS);
-                if ((pwr_sts & pwr_mask) == pwr_mask)
-                        break;
-                else
-                        udelay(10);
-        }
-        return 0;
-}
-
-/*
- * mrst_power_up
- *
- * Restore power to the specified island(s) (powergating)
- */
-static int mrst_power_up(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 pwr_mask = PSB_PWRGT_DISPLAY_MASK;
-        u32 pwr_sts, pwr_cnt;
-
-        pwr_cnt = inl(dev_priv->ospm_base + PSB_PM_SSC);
-        pwr_cnt &= ~pwr_mask;
-        outl(pwr_cnt, (dev_priv->ospm_base + PSB_PM_SSC));
-
-        while (true) {
-                pwr_sts = inl(dev_priv->ospm_base + PSB_PM_SSS);
-                if ((pwr_sts & pwr_mask) == 0)
-                        break;
-                else
-                        udelay(10);
-        }
-        return 0;
-}
-
-#if defined(CONFIG_X86_MRST)
-static void mrst_lvds_cache_bl(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        intel_scu_ipc_ioread8(0x28, &(dev_priv->saveBKLTCNT));
-        intel_scu_ipc_ioread8(0x29, &(dev_priv->saveBKLTREQ));
-        intel_scu_ipc_ioread8(0x2A, &(dev_priv->saveBKLTBRTL));
-}
-
-static void mrst_mm_bl_power(struct drm_device *dev, bool on)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (on) {
-                intel_scu_ipc_iowrite8(0x2A, dev_priv->saveBKLTBRTL);
-                intel_scu_ipc_iowrite8(0x28, dev_priv->saveBKLTCNT);
-                intel_scu_ipc_iowrite8(0x29, dev_priv->saveBKLTREQ);
-        } else {
-                intel_scu_ipc_iowrite8(0x2A, 0);
-                intel_scu_ipc_iowrite8(0x28, 0);
-                intel_scu_ipc_iowrite8(0x29, 0);
-        }
-}
-
-static const struct psb_ops mrst_mm_chip_ops = {
-        .name = "Moorestown MM ",
-        .accel_2d = 1,
-        .pipes = 1,
-        .crtcs = 1,
-        .sgx_offset = MRST_SGX_OFFSET,
-
-        .crtc_helper = &mrst_helper_funcs,
-        .crtc_funcs = &psb_intel_crtc_funcs,
-
-        .output_init = mrst_output_init,
-
-        .lvds_bl_power = mrst_mm_bl_power,
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-        .backlight_init = mrst_backlight_init,
-#endif
-
-        .init_pm = mrst_init_pm,
-        .save_regs = mrst_save_display_registers,
-        .restore_regs = mrst_restore_display_registers,
-        .power_down = mrst_power_down,
-        .power_up = mrst_power_up,
-
-        .i2c_bus = 0,
-};
-
-#endif
-
-static void oaktrail_teardown(struct drm_device *dev)
-{
-        mrst_hdmi_teardown(dev);
-}
-
-static const struct psb_ops oaktrail_chip_ops = {
-        .name = "Oaktrail",
-        .accel_2d = 1,
-        .pipes = 2,
-        .crtcs = 2,
-        .sgx_offset = MRST_SGX_OFFSET,
-
-        .chip_setup = mid_chip_setup,
-        .chip_teardown = oaktrail_teardown,
-        .crtc_helper = &mrst_helper_funcs,
-        .crtc_funcs = &psb_intel_crtc_funcs,
-
-        .output_init = mrst_output_init,
-
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-        .backlight_init = mrst_backlight_init,
-#endif
-
-        .init_pm = mrst_init_pm,
-        .save_regs = mrst_save_display_registers,
-        .restore_regs = mrst_restore_display_registers,
-        .power_down = mrst_power_down,
-        .power_up = mrst_power_up,
-
-        .i2c_bus = 1,
-};
-
-/**
- *      mrst_chip_setup         -       perform the initial chip init
- *      @dev: Our drm_device
- *
- *      Figure out which incarnation we are and then scan the firmware for
- *      tables and information.
- */
-static int mrst_chip_setup(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        switch (mrst_device_ident(dev)) {
-        case DEVICE_OAKTRAIL:
-                /* Dual CRTC, PC compatible, HDMI, I2C #2 */
-                dev_priv->ops = &oaktrail_chip_ops;
-                mrst_hdmi_setup(dev);
-                return mid_chip_setup(dev);
-#if defined(CONFIG_X86_MRST)
-        case DEVICE_MOORESTOWN_MM:
-                /* Single CRTC, No HDMI, I2C #0, BL control */
-                mrst_lvds_cache_bl(dev);
-                dev_priv->ops = &mrst_mm_chip_ops;
-                return mid_chip_setup(dev);
-        case DEVICE_MOORESTOWN:
-                /* Dual CRTC, No HDMI(?), I2C #1 */
-                return mid_chip_setup(dev);
-#endif
-        default:
-                dev_err(dev->dev, "unsupported device type.\n");
-                return -ENODEV;
-        }
-}
-
-const struct psb_ops mrst_chip_ops = {
-        .name = "Moorestown",
-        .accel_2d = 1,
-        .pipes = 2,
-        .crtcs = 2,
-        .sgx_offset = MRST_SGX_OFFSET,
-
-        .chip_setup = mrst_chip_setup,
-        .crtc_helper = &mrst_helper_funcs,
-        .crtc_funcs = &psb_intel_crtc_funcs,
-
-        .output_init = mrst_output_init,
-
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-        .backlight_init = mrst_backlight_init,
-#endif
-
-        .init_pm = mrst_init_pm,
-        .save_regs = mrst_save_display_registers,
-        .restore_regs = mrst_restore_display_registers,
-        .power_down = mrst_power_down,
-        .power_up = mrst_power_up,
-
-        .i2c_bus = 2,
-};
-
diff --git a/drivers/staging/gma500/mrst_hdmi.c b/drivers/staging/gma500/mrst_hdmi.c
deleted file mode 100644
index e66607eb3d3e..000000000000
--- a/drivers/staging/gma500/mrst_hdmi.c
+++ /dev/null
@@ -1,852 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *      Li Peng <peng.li@intel.com>
- */
-
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "psb_drv.h"
-
-#define HDMI_READ(reg)          readl(hdmi_dev->regs + (reg))
-#define HDMI_WRITE(reg, val)    writel(val, hdmi_dev->regs + (reg))
-
-#define HDMI_HCR        0x1000
-#define HCR_ENABLE_HDCP         (1 << 5)
-#define HCR_ENABLE_AUDIO        (1 << 2)
-#define HCR_ENABLE_PIXEL        (1 << 1)
-#define HCR_ENABLE_TMDS         (1 << 0)
-
-#define HDMI_HICR       0x1004
-#define HDMI_HSR        0x1008
-#define HDMI_HISR       0x100C
-#define HDMI_DETECT_HDP         (1 << 0)
-
-#define HDMI_VIDEO_REG  0x3000
-#define HDMI_UNIT_EN            (1 << 7)
-#define HDMI_MODE_OUTPUT        (1 << 0)
-#define HDMI_HBLANK_A   0x3100
-
-#define HDMI_AUDIO_CTRL 0x4000
-#define HDMI_ENABLE_AUDIO       (1 << 0)
-
-#define PCH_HTOTAL_B    0x3100
-#define PCH_HBLANK_B    0x3104
-#define PCH_HSYNC_B     0x3108
-#define PCH_VTOTAL_B    0x310C
-#define PCH_VBLANK_B    0x3110
-#define PCH_VSYNC_B     0x3114
-#define PCH_PIPEBSRC    0x311C
-
-#define PCH_PIPEB_DSL   0x3800
-#define PCH_PIPEB_SLC   0x3804
-#define PCH_PIPEBCONF   0x3808
-#define PCH_PIPEBSTAT   0x3824
-
-#define CDVO_DFT        0x5000
-#define CDVO_SLEWRATE   0x5004
-#define CDVO_STRENGTH   0x5008
-#define CDVO_RCOMP      0x500C
-
-#define DPLL_CTRL       0x6000
-#define DPLL_PDIV_SHIFT         16
-#define DPLL_PDIV_MASK          (0xf << 16)
-#define DPLL_PWRDN              (1 << 4)
-#define DPLL_RESET              (1 << 3)
-#define DPLL_FASTEN             (1 << 2)
-#define DPLL_ENSTAT             (1 << 1)
-#define DPLL_DITHEN             (1 << 0)
-
-#define DPLL_DIV_CTRL   0x6004
-#define DPLL_CLKF_MASK          0xffffffc0
-#define DPLL_CLKR_MASK          (0x3f)
-
-#define DPLL_CLK_ENABLE 0x6008
-#define DPLL_EN_DISP            (1 << 31)
-#define DPLL_SEL_HDMI           (1 << 8)
-#define DPLL_EN_HDMI            (1 << 1)
-#define DPLL_EN_VGA             (1 << 0)
-
-#define DPLL_ADJUST     0x600C
-#define DPLL_STATUS     0x6010
-#define DPLL_UPDATE     0x6014
-#define DPLL_DFT        0x6020
-
-struct intel_range {
-        int     min, max;
-};
-
-struct mrst_hdmi_limit {
-        struct intel_range vco, np, nr, nf;
-};
-
-struct mrst_hdmi_clock {
-        int np;
-        int nr;
-        int nf;
-        int dot;
-};
-
-#define VCO_MIN         320000
-#define VCO_MAX         1650000
-#define NP_MIN          1
-#define NP_MAX          15
-#define NR_MIN          1
-#define NR_MAX          64
-#define NF_MIN          2
-#define NF_MAX          4095
-
-static const struct mrst_hdmi_limit mrst_hdmi_limit = {
-        .vco = { .min = VCO_MIN,                .max = VCO_MAX },
-        .np  = { .min = NP_MIN,                 .max = NP_MAX  },
-        .nr  = { .min = NR_MIN,                 .max = NR_MAX  },
-        .nf  = { .min = NF_MIN,                 .max = NF_MAX  },
-};
-
-static void wait_for_vblank(struct drm_device *dev)
-{
-        /* FIXME: Can we do this as a sleep ? */
-        /* Wait for 20ms, i.e. one cycle at 50hz. */
-        mdelay(20);
-}
-
-static void scu_busy_loop(void *scu_base)
-{
-        u32 status = 0;
-        u32 loop_count = 0;
-
-        status = readl(scu_base + 0x04);
-        while (status & 1) {
-                udelay(1); /* scu processing time is in few u secods */
-                status = readl(scu_base + 0x04);
-                loop_count++;
-                /* break if scu doesn't reset busy bit after huge retry */
-                if (loop_count > 1000) {
-                        DRM_DEBUG_KMS("SCU IPC timed out");
-                        return;
-                }
-        }
-}
-
-static void mrst_hdmi_reset(struct drm_device *dev)
-{
-        void *base;
-        /* FIXME: at least make these defines */
-        unsigned int scu_ipc_mmio = 0xff11c000;
-        int scu_len = 1024;
-
-        base = ioremap((resource_size_t)scu_ipc_mmio, scu_len);
-        if (base == NULL) {
-                DRM_ERROR("failed to map SCU mmio\n");
-                return;
-        }
-
-        /* scu ipc: assert hdmi controller reset */
-        writel(0xff11d118, base + 0x0c);
-        writel(0x7fffffdf, base + 0x80);
-        writel(0x42005, base + 0x0);
-        scu_busy_loop(base);
-
-        /* scu ipc: de-assert hdmi controller reset */
-        writel(0xff11d118, base + 0x0c);
-        writel(0x7fffffff, base + 0x80);
-        writel(0x42005, base + 0x0);
-        scu_busy_loop(base);
-
-        iounmap(base);
-}
-
-static void mrst_hdmi_audio_enable(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_hdmi_dev *hdmi_dev = dev_priv->hdmi_priv;
-
-        HDMI_WRITE(HDMI_HCR, 0x67);
-        HDMI_READ(HDMI_HCR);
-
-        HDMI_WRITE(0x51a8, 0x10);
-        HDMI_READ(0x51a8);
-
-        HDMI_WRITE(HDMI_AUDIO_CTRL, 0x1);
-        HDMI_READ(HDMI_AUDIO_CTRL);
-}
-
-static void mrst_hdmi_audio_disable(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_hdmi_dev *hdmi_dev = dev_priv->hdmi_priv;
-
-        HDMI_WRITE(0x51a8, 0x0);
-        HDMI_READ(0x51a8);
-
-        HDMI_WRITE(HDMI_AUDIO_CTRL, 0x0);
-        HDMI_READ(HDMI_AUDIO_CTRL);
-
-        HDMI_WRITE(HDMI_HCR, 0x47);
-        HDMI_READ(HDMI_HCR);
-}
-
-void mrst_crtc_hdmi_dpms(struct drm_crtc *crtc, int mode)
-{
-        struct drm_device *dev = crtc->dev;
-        u32 temp;
-
-        switch (mode) {
-        case DRM_MODE_DPMS_OFF:
-                /* Disable VGACNTRL */
-                REG_WRITE(VGACNTRL, 0x80000000);
-
-                /* Disable plane */
-                temp = REG_READ(DSPBCNTR);
-                if ((temp & DISPLAY_PLANE_ENABLE) != 0) {
-                        REG_WRITE(DSPBCNTR, temp & ~DISPLAY_PLANE_ENABLE);
-                        REG_READ(DSPBCNTR);
-                        /* Flush the plane changes */
-                        REG_WRITE(DSPBSURF, REG_READ(DSPBSURF));
-                        REG_READ(DSPBSURF);
-                }
-
-                /* Disable pipe B */
-                temp = REG_READ(PIPEBCONF);
-                if ((temp & PIPEACONF_ENABLE) != 0) {
-                        REG_WRITE(PIPEBCONF, temp & ~PIPEACONF_ENABLE);
-                        REG_READ(PIPEBCONF);
-                }
-
-                /* Disable LNW Pipes, etc */
-                temp = REG_READ(PCH_PIPEBCONF);
-                if ((temp & PIPEACONF_ENABLE) != 0) {
-                        REG_WRITE(PCH_PIPEBCONF, temp & ~PIPEACONF_ENABLE);
-                        REG_READ(PCH_PIPEBCONF);
-                }
-                /* wait for pipe off */
-                udelay(150);
-                /* Disable dpll */
-                temp = REG_READ(DPLL_CTRL);
-                if ((temp & DPLL_PWRDN) == 0) {
-                        REG_WRITE(DPLL_CTRL, temp | (DPLL_PWRDN | DPLL_RESET));
-                        REG_WRITE(DPLL_STATUS, 0x1);
-                }
-                /* wait for dpll off */
-                udelay(150);
-                break;
-        case DRM_MODE_DPMS_ON:
-        case DRM_MODE_DPMS_STANDBY:
-        case DRM_MODE_DPMS_SUSPEND:
-                /* Enable dpll */
-                temp = REG_READ(DPLL_CTRL);
-                if ((temp & DPLL_PWRDN) != 0) {
-                        REG_WRITE(DPLL_CTRL, temp & ~(DPLL_PWRDN | DPLL_RESET));
-                        temp = REG_READ(DPLL_CLK_ENABLE);
-                        REG_WRITE(DPLL_CLK_ENABLE, temp | DPLL_EN_DISP | DPLL_SEL_HDMI | DPLL_EN_HDMI);
-                        REG_READ(DPLL_CLK_ENABLE);
-                }
-                /* wait for dpll warm up */
-                udelay(150);
-
-                /* Enable pipe B */
-                temp = REG_READ(PIPEBCONF);
-                if ((temp & PIPEACONF_ENABLE) == 0) {
-                        REG_WRITE(PIPEBCONF, temp | PIPEACONF_ENABLE);
-                        REG_READ(PIPEBCONF);
-                }
-
-                /* Enable LNW Pipe B */
-                temp = REG_READ(PCH_PIPEBCONF);
-                if ((temp & PIPEACONF_ENABLE) == 0) {
-                        REG_WRITE(PCH_PIPEBCONF, temp | PIPEACONF_ENABLE);
-                        REG_READ(PCH_PIPEBCONF);
-                }
-                wait_for_vblank(dev);
-
-                /* Enable plane */
-                temp = REG_READ(DSPBCNTR);
-                if ((temp & DISPLAY_PLANE_ENABLE) == 0) {
-                        REG_WRITE(DSPBCNTR, temp | DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(DSPBSURF, REG_READ(DSPBSURF));
-                        REG_READ(DSPBSURF);
-                }
-                psb_intel_crtc_load_lut(crtc);
-        }
-        /* DSPARB */
-        REG_WRITE(DSPARB, 0x00003fbf);
-        /* FW1 */
-        REG_WRITE(0x70034, 0x3f880a0a);
-        /* FW2 */
-        REG_WRITE(0x70038, 0x0b060808);
-        /* FW4 */
-        REG_WRITE(0x70050, 0x08030404);
-        /* FW5 */
-        REG_WRITE(0x70054, 0x04040404);
-        /* LNC Chicken Bits */
-        REG_WRITE(0x70400, 0x4000);
-}
-
-
-static void mrst_hdmi_dpms(struct drm_encoder *encoder, int mode)
-{
-        static int dpms_mode = -1;
-
-        struct drm_device *dev = encoder->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_hdmi_dev *hdmi_dev = dev_priv->hdmi_priv;
-        u32 temp;
-
-        if (dpms_mode == mode)
-                return;
-
-        if (mode != DRM_MODE_DPMS_ON)
-                temp = 0x0;
-        else
-                temp = 0x99;
-
-        dpms_mode = mode;
-        HDMI_WRITE(HDMI_VIDEO_REG, temp);
-}
-
-static unsigned int htotal_calculate(struct drm_display_mode *mode)
-{
-        u32 htotal, new_crtc_htotal;
-
-        htotal = (mode->crtc_hdisplay - 1) | ((mode->crtc_htotal - 1) << 16);
-
-        /*
-         * 1024 x 768  new_crtc_htotal = 0x1024;
-         * 1280 x 1024 new_crtc_htotal = 0x0c34;
-         */
-        new_crtc_htotal = (mode->crtc_htotal - 1) * 200 * 1000 / mode->clock;
-
-        return (mode->crtc_hdisplay - 1) | (new_crtc_htotal << 16);
-}
-
-static void mrst_hdmi_find_dpll(struct drm_crtc *crtc, int target,
-                                int refclk, struct mrst_hdmi_clock *best_clock)
-{
-        int np_min, np_max, nr_min, nr_max;
-        int np, nr, nf;
-
-        np_min = DIV_ROUND_UP(mrst_hdmi_limit.vco.min, target * 10);
-        np_max = mrst_hdmi_limit.vco.max / (target * 10);
-        if (np_min < mrst_hdmi_limit.np.min)
-                np_min = mrst_hdmi_limit.np.min;
-        if (np_max > mrst_hdmi_limit.np.max)
-                np_max = mrst_hdmi_limit.np.max;
-
-        nr_min = DIV_ROUND_UP((refclk * 1000), (target * 10 * np_max));
-        nr_max = DIV_ROUND_UP((refclk * 1000), (target * 10 * np_min));
-        if (nr_min < mrst_hdmi_limit.nr.min)
-                nr_min = mrst_hdmi_limit.nr.min;
-        if (nr_max > mrst_hdmi_limit.nr.max)
-                nr_max = mrst_hdmi_limit.nr.max;
-
-        np = DIV_ROUND_UP((refclk * 1000), (target * 10 * nr_max));
-        nr = DIV_ROUND_UP((refclk * 1000), (target * 10 * np));
-        nf = DIV_ROUND_CLOSEST((target * 10 * np * nr), refclk);
-        DRM_DEBUG_KMS("np, nr, nf %d %d %d\n", np, nr, nf);
-
-        /*
-         * 1024 x 768  np = 1; nr = 0x26; nf = 0x0fd8000;
-         * 1280 x 1024 np = 1; nr = 0x17; nf = 0x1034000;
-         */
-        best_clock->np = np;
-        best_clock->nr = nr - 1;
-        best_clock->nf = (nf << 14);
-}
-
-int mrst_crtc_hdmi_mode_set(struct drm_crtc *crtc,
-                            struct drm_display_mode *mode,
-                            struct drm_display_mode *adjusted_mode,
-                            int x, int y,
-                            struct drm_framebuffer *old_fb)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_hdmi_dev *hdmi_dev = dev_priv->hdmi_priv;
-        int pipe = 1;
-        int htot_reg = (pipe == 0) ? HTOTAL_A : HTOTAL_B;
-        int hblank_reg = (pipe == 0) ? HBLANK_A : HBLANK_B;
-        int hsync_reg = (pipe == 0) ? HSYNC_A : HSYNC_B;
-        int vtot_reg = (pipe == 0) ? VTOTAL_A : VTOTAL_B;
-        int vblank_reg = (pipe == 0) ? VBLANK_A : VBLANK_B;
-        int vsync_reg = (pipe == 0) ? VSYNC_A : VSYNC_B;
-        int dspsize_reg = (pipe == 0) ? DSPASIZE : DSPBSIZE;
-        int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;
-        int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
-        int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
-        int refclk;
-        struct mrst_hdmi_clock clock;
-        u32 dspcntr, pipeconf, dpll, temp;
-        int dspcntr_reg = DSPBCNTR;
-
-        /* Disable the VGA plane that we never use */
-        REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);
-
-        /* XXX: Disable the panel fitter if it was on our pipe */
-
-        /* Disable dpll if necessary */
-        dpll = REG_READ(DPLL_CTRL);
-        if ((dpll & DPLL_PWRDN) == 0) {
-                REG_WRITE(DPLL_CTRL, dpll | (DPLL_PWRDN | DPLL_RESET));
-                REG_WRITE(DPLL_DIV_CTRL, 0x00000000);
-                REG_WRITE(DPLL_STATUS, 0x1);
-        }
-        udelay(150);
-
-        /* reset controller: FIXME - can we sort out the ioremap mess ? */
-        iounmap(hdmi_dev->regs);
-        mrst_hdmi_reset(dev);
-
-        /* program and enable dpll */
-        refclk = 25000;
-        mrst_hdmi_find_dpll(crtc, adjusted_mode->clock, refclk, &clock);
-
-        /* Setting DPLL */
-        dpll = REG_READ(DPLL_CTRL);
-        dpll &= ~DPLL_PDIV_MASK;
-        dpll &= ~(DPLL_PWRDN | DPLL_RESET);
-        REG_WRITE(DPLL_CTRL, 0x00000008);
-        REG_WRITE(DPLL_DIV_CTRL, ((clock.nf << 6) | clock.nr));
-        REG_WRITE(DPLL_ADJUST, ((clock.nf >> 14) - 1));
-        REG_WRITE(DPLL_CTRL, (dpll | (clock.np << DPLL_PDIV_SHIFT) | DPLL_ENSTAT | DPLL_DITHEN));
-        REG_WRITE(DPLL_UPDATE, 0x80000000);
-        REG_WRITE(DPLL_CLK_ENABLE, 0x80050102);
-        udelay(150);
-
-        hdmi_dev->regs = ioremap(hdmi_dev->mmio, hdmi_dev->mmio_len);
-        if (hdmi_dev->regs == NULL) {
-                DRM_ERROR("failed to do hdmi mmio mapping\n");
-                return -ENOMEM;
-        }
-
-        /* configure HDMI */
-        HDMI_WRITE(0x1004, 0x1fd);
-        HDMI_WRITE(0x2000, 0x1);
-        HDMI_WRITE(0x2008, 0x0);
-        HDMI_WRITE(0x3130, 0x8);
-        HDMI_WRITE(0x101c, 0x1800810);
-
-        temp = htotal_calculate(adjusted_mode);
-        REG_WRITE(htot_reg, temp);
-        REG_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - 1) | ((adjusted_mode->crtc_hblank_end - 1) << 16));
-        REG_WRITE(hsync_reg, (adjusted_mode->crtc_hsync_start - 1) | ((adjusted_mode->crtc_hsync_end - 1) << 16));
-        REG_WRITE(vtot_reg, (adjusted_mode->crtc_vdisplay - 1) | ((adjusted_mode->crtc_vtotal - 1) << 16));
-        REG_WRITE(vblank_reg, (adjusted_mode->crtc_vblank_start - 1) | ((adjusted_mode->crtc_vblank_end - 1) << 16));
-        REG_WRITE(vsync_reg, (adjusted_mode->crtc_vsync_start - 1) | ((adjusted_mode->crtc_vsync_end - 1) << 16));
-        REG_WRITE(pipesrc_reg,
-                ((mode->crtc_hdisplay - 1) << 16) |  (mode->crtc_vdisplay - 1));
-
-        REG_WRITE(PCH_HTOTAL_B, (adjusted_mode->crtc_hdisplay - 1) | ((adjusted_mode->crtc_htotal - 1) << 16));
-        REG_WRITE(PCH_HBLANK_B, (adjusted_mode->crtc_hblank_start - 1) | ((adjusted_mode->crtc_hblank_end - 1) << 16));
-        REG_WRITE(PCH_HSYNC_B, (adjusted_mode->crtc_hsync_start - 1) | ((adjusted_mode->crtc_hsync_end - 1) << 16));
-        REG_WRITE(PCH_VTOTAL_B, (adjusted_mode->crtc_vdisplay - 1) | ((adjusted_mode->crtc_vtotal - 1) << 16));
-        REG_WRITE(PCH_VBLANK_B, (adjusted_mode->crtc_vblank_start - 1) | ((adjusted_mode->crtc_vblank_end - 1) << 16));
-        REG_WRITE(PCH_VSYNC_B, (adjusted_mode->crtc_vsync_start - 1) | ((adjusted_mode->crtc_vsync_end - 1) << 16));
-        REG_WRITE(PCH_PIPEBSRC,
-                ((mode->crtc_hdisplay - 1) << 16) |  (mode->crtc_vdisplay - 1));
-
-        temp = adjusted_mode->crtc_hblank_end - adjusted_mode->crtc_hblank_start;
-        HDMI_WRITE(HDMI_HBLANK_A, ((adjusted_mode->crtc_hdisplay - 1) << 16) |  temp);
-
-        REG_WRITE(dspsize_reg,
-                        ((mode->vdisplay - 1) << 16) | (mode->hdisplay - 1));
-        REG_WRITE(dsppos_reg, 0);
-
-        /* Flush the plane changes */
-        {
-                struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-                crtc_funcs->mode_set_base(crtc, x, y, old_fb);
-        }
-
-        /* Set up the display plane register */
-        dspcntr = REG_READ(dspcntr_reg);
-        dspcntr |= DISPPLANE_GAMMA_ENABLE;
-        dspcntr |= DISPPLANE_SEL_PIPE_B;
-        dspcntr |= DISPLAY_PLANE_ENABLE;
-
-        /* setup pipeconf */
-        pipeconf = REG_READ(pipeconf_reg);
-        pipeconf |= PIPEACONF_ENABLE;
-
-        REG_WRITE(pipeconf_reg, pipeconf);
-        REG_READ(pipeconf_reg);
-
-        REG_WRITE(PCH_PIPEBCONF, pipeconf);
-        REG_READ(PCH_PIPEBCONF);
-        wait_for_vblank(dev);
-
-        REG_WRITE(dspcntr_reg, dspcntr);
-        wait_for_vblank(dev);
-
-        return 0;
-}
-
-static int mrst_hdmi_mode_valid(struct drm_connector *connector,
-                                struct drm_display_mode *mode)
-{
-        if (mode->clock > 165000)
-                return MODE_CLOCK_HIGH;
-        if (mode->clock < 20000)
-                return MODE_CLOCK_LOW;
-
-        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return MODE_NO_DBLESCAN;
-
-        return MODE_OK;
-}
-
-static bool mrst_hdmi_mode_fixup(struct drm_encoder *encoder,
-                                 struct drm_display_mode *mode,
-                                 struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
-static enum drm_connector_status
-mrst_hdmi_detect(struct drm_connector *connector, bool force)
-{
-        enum drm_connector_status status;
-        struct drm_device *dev = connector->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_hdmi_dev *hdmi_dev = dev_priv->hdmi_priv;
-        u32 temp;
-
-        temp = HDMI_READ(HDMI_HSR);
-        DRM_DEBUG_KMS("HDMI_HSR %x\n", temp);
-
-        if ((temp & HDMI_DETECT_HDP) != 0)
-                status = connector_status_connected;
-        else
-                status = connector_status_disconnected;
-
-        return status;
-}
-
-static const unsigned char raw_edid[] = {
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x10, 0xac, 0x2f, 0xa0,
-        0x53, 0x55, 0x33, 0x30, 0x16, 0x13, 0x01, 0x03, 0x0e, 0x3a, 0x24, 0x78,
-        0xea, 0xe9, 0xf5, 0xac, 0x51, 0x30, 0xb4, 0x25, 0x11, 0x50, 0x54, 0xa5,
-        0x4b, 0x00, 0x81, 0x80, 0xa9, 0x40, 0x71, 0x4f, 0xb3, 0x00, 0x01, 0x01,
-        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x28, 0x3c, 0x80, 0xa0, 0x70, 0xb0,
-        0x23, 0x40, 0x30, 0x20, 0x36, 0x00, 0x46, 0x6c, 0x21, 0x00, 0x00, 0x1a,
-        0x00, 0x00, 0x00, 0xff, 0x00, 0x47, 0x4e, 0x37, 0x32, 0x31, 0x39, 0x35,
-        0x52, 0x30, 0x33, 0x55, 0x53, 0x0a, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x44,
-        0x45, 0x4c, 0x4c, 0x20, 0x32, 0x37, 0x30, 0x39, 0x57, 0x0a, 0x20, 0x20,
-        0x00, 0x00, 0x00, 0xfd, 0x00, 0x38, 0x4c, 0x1e, 0x53, 0x11, 0x00, 0x0a,
-        0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x8d
-};
-
-static int mrst_hdmi_get_modes(struct drm_connector *connector)
-{
-        struct drm_device *dev = connector->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct i2c_adapter *i2c_adap;
-        struct edid *edid;
-        struct drm_display_mode *mode, *t;
-        int i = 0, ret = 0;
-
-        i2c_adap = i2c_get_adapter(3);
-        if (i2c_adap == NULL) {
-                DRM_ERROR("No ddc adapter available!\n");
-                edid = (struct edid *)raw_edid;
-        } else {
-                edid = (struct edid *)raw_edid;
-                /* FIXME ? edid = drm_get_edid(connector, i2c_adap); */
-        }
-
-        if (edid) {
-                drm_mode_connector_update_edid_property(connector, edid);
-                ret = drm_add_edid_modes(connector, edid);
-                connector->display_info.raw_edid = NULL;
-        }
-
-        /*
-         * prune modes that require frame buffer bigger than stolen mem
-         */
-        list_for_each_entry_safe(mode, t, &connector->probed_modes, head) {
-                if ((mode->hdisplay * mode->vdisplay * 4) >= dev_priv->vram_stolen_size) {
-                        i++;
-                        drm_mode_remove(connector, mode);
-                }
-        }
-        return ret - i;
-}
-
-static void mrst_hdmi_mode_set(struct drm_encoder *encoder,
-                               struct drm_display_mode *mode,
-                               struct drm_display_mode *adjusted_mode)
-{
-        struct drm_device *dev = encoder->dev;
-
-        mrst_hdmi_audio_enable(dev);
-        return;
-}
-
-static void mrst_hdmi_destroy(struct drm_connector *connector)
-{
-        return;
-}
-
-static const struct drm_encoder_helper_funcs mrst_hdmi_helper_funcs = {
-        .dpms = mrst_hdmi_dpms,
-        .mode_fixup = mrst_hdmi_mode_fixup,
-        .prepare = psb_intel_encoder_prepare,
-        .mode_set = mrst_hdmi_mode_set,
-        .commit = psb_intel_encoder_commit,
-};
-
-static const struct drm_connector_helper_funcs
-                                        mrst_hdmi_connector_helper_funcs = {
-        .get_modes = mrst_hdmi_get_modes,
-        .mode_valid = mrst_hdmi_mode_valid,
-        .best_encoder = psb_intel_best_encoder,
-};
-
-static const struct drm_connector_funcs mrst_hdmi_connector_funcs = {
-        .dpms = drm_helper_connector_dpms,
-        .detect = mrst_hdmi_detect,
-        .fill_modes = drm_helper_probe_single_connector_modes,
-        .destroy = mrst_hdmi_destroy,
-};
-
-static void mrst_hdmi_enc_destroy(struct drm_encoder *encoder)
-{
-        drm_encoder_cleanup(encoder);
-}
-
-static const struct drm_encoder_funcs mrst_hdmi_enc_funcs = {
-        .destroy = mrst_hdmi_enc_destroy,
-};
-
-void mrst_hdmi_init(struct drm_device *dev,
-                                        struct psb_intel_mode_device *mode_dev)
-{
-        struct psb_intel_output *psb_intel_output;
-        struct drm_connector *connector;
-        struct drm_encoder *encoder;
-
-        psb_intel_output = kzalloc(sizeof(struct psb_intel_output), GFP_KERNEL);
-        if (!psb_intel_output)
-                return;
-
-        psb_intel_output->mode_dev = mode_dev;
-        connector = &psb_intel_output->base;
-        encoder = &psb_intel_output->enc;
-        drm_connector_init(dev, &psb_intel_output->base,
-                           &mrst_hdmi_connector_funcs,
-                           DRM_MODE_CONNECTOR_DVID);
-
-        drm_encoder_init(dev, &psb_intel_output->enc,
-                         &mrst_hdmi_enc_funcs,
-                         DRM_MODE_ENCODER_TMDS);
-
-        drm_mode_connector_attach_encoder(&psb_intel_output->base,
-                                          &psb_intel_output->enc);
-
-        psb_intel_output->type = INTEL_OUTPUT_HDMI;
-        drm_encoder_helper_add(encoder, &mrst_hdmi_helper_funcs);
-        drm_connector_helper_add(connector, &mrst_hdmi_connector_helper_funcs);
-
-        connector->display_info.subpixel_order = SubPixelHorizontalRGB;
-        connector->interlace_allowed = false;
-        connector->doublescan_allowed = false;
-        drm_sysfs_connector_add(connector);
-
-        return;
-}
-
-static DEFINE_PCI_DEVICE_TABLE(hdmi_ids) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080d) },
-        {}
-};
-
-void mrst_hdmi_setup(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct pci_dev *pdev;
-        struct mrst_hdmi_dev *hdmi_dev;
-        int ret;
-
-        pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x080d, NULL);
-        if (!pdev)
-                return;
-
-        hdmi_dev = kzalloc(sizeof(struct mrst_hdmi_dev), GFP_KERNEL);
-        if (!hdmi_dev) {
-                dev_err(dev->dev, "failed to allocate memory\n");
-                goto out;
-        }
-
-
-        ret = pci_enable_device(pdev);
-        if (ret) {
-                dev_err(dev->dev, "failed to enable hdmi controller\n");
-                goto free;
-        }
-
-        hdmi_dev->mmio = pci_resource_start(pdev, 0);
-        hdmi_dev->mmio_len = pci_resource_len(pdev, 0);
-        hdmi_dev->regs = ioremap(hdmi_dev->mmio, hdmi_dev->mmio_len);
-        if (!hdmi_dev->regs) {
-                dev_err(dev->dev, "failed to map hdmi mmio\n");
-                goto free;
-        }
-
-        hdmi_dev->dev = pdev;
-        pci_set_drvdata(pdev, hdmi_dev);
-
-        /* Initialize i2c controller */
-        ret = mrst_hdmi_i2c_init(hdmi_dev->dev);
-        if (ret)
-                dev_err(dev->dev, "HDMI I2C initialization failed\n");
-
-        dev_priv->hdmi_priv = hdmi_dev;
-        mrst_hdmi_audio_disable(dev);
-        return;
-
-free:
-        kfree(hdmi_dev);
-out:
-        return;
-}
-
-void mrst_hdmi_teardown(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_hdmi_dev *hdmi_dev = dev_priv->hdmi_priv;
-        struct pci_dev *pdev;
-
-        if (hdmi_dev) {
-                pdev = hdmi_dev->dev;
-                pci_set_drvdata(pdev, NULL);
-                mrst_hdmi_i2c_exit(pdev);
-                iounmap(hdmi_dev->regs);
-                kfree(hdmi_dev);
-                pci_dev_put(pdev);
-        }
-}
-
-/* save HDMI register state */
-void mrst_hdmi_save(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_hdmi_dev *hdmi_dev = dev_priv->hdmi_priv;
-        int i;
-
-        /* dpll */
-        hdmi_dev->saveDPLL_CTRL = PSB_RVDC32(DPLL_CTRL);
-        hdmi_dev->saveDPLL_DIV_CTRL = PSB_RVDC32(DPLL_DIV_CTRL);
-        hdmi_dev->saveDPLL_ADJUST = PSB_RVDC32(DPLL_ADJUST);
-        hdmi_dev->saveDPLL_UPDATE = PSB_RVDC32(DPLL_UPDATE);
-        hdmi_dev->saveDPLL_CLK_ENABLE = PSB_RVDC32(DPLL_CLK_ENABLE);
-
-        /* pipe B */
-        dev_priv->savePIPEBCONF = PSB_RVDC32(PIPEBCONF);
-        dev_priv->savePIPEBSRC  = PSB_RVDC32(PIPEBSRC);
-        dev_priv->saveHTOTAL_B  = PSB_RVDC32(HTOTAL_B);
-        dev_priv->saveHBLANK_B  = PSB_RVDC32(HBLANK_B);
-        dev_priv->saveHSYNC_B   = PSB_RVDC32(HSYNC_B);
-        dev_priv->saveVTOTAL_B  = PSB_RVDC32(VTOTAL_B);
-        dev_priv->saveVBLANK_B  = PSB_RVDC32(VBLANK_B);
-        dev_priv->saveVSYNC_B   = PSB_RVDC32(VSYNC_B);
-
-        hdmi_dev->savePCH_PIPEBCONF = PSB_RVDC32(PCH_PIPEBCONF);
-        hdmi_dev->savePCH_PIPEBSRC = PSB_RVDC32(PCH_PIPEBSRC);
-        hdmi_dev->savePCH_HTOTAL_B = PSB_RVDC32(PCH_HTOTAL_B);
-        hdmi_dev->savePCH_HBLANK_B = PSB_RVDC32(PCH_HBLANK_B);
-        hdmi_dev->savePCH_HSYNC_B  = PSB_RVDC32(PCH_HSYNC_B);
-        hdmi_dev->savePCH_VTOTAL_B = PSB_RVDC32(PCH_VTOTAL_B);
-        hdmi_dev->savePCH_VBLANK_B = PSB_RVDC32(PCH_VBLANK_B);
-        hdmi_dev->savePCH_VSYNC_B  = PSB_RVDC32(PCH_VSYNC_B);
-
-        /* plane */
-        dev_priv->saveDSPBCNTR = PSB_RVDC32(DSPBCNTR);
-        dev_priv->saveDSPBSTRIDE = PSB_RVDC32(DSPBSTRIDE);
-        dev_priv->saveDSPBADDR = PSB_RVDC32(DSPBBASE);
-        dev_priv->saveDSPBSURF = PSB_RVDC32(DSPBSURF);
-        dev_priv->saveDSPBLINOFF = PSB_RVDC32(DSPBLINOFF);
-        dev_priv->saveDSPBTILEOFF = PSB_RVDC32(DSPBTILEOFF);
-
-        /* cursor B */
-        dev_priv->saveDSPBCURSOR_CTRL = PSB_RVDC32(CURBCNTR);
-        dev_priv->saveDSPBCURSOR_BASE = PSB_RVDC32(CURBBASE);
-        dev_priv->saveDSPBCURSOR_POS = PSB_RVDC32(CURBPOS);
-
-        /* save palette */
-        for (i = 0; i < 256; i++)
-                dev_priv->save_palette_b[i] = PSB_RVDC32(PALETTE_B + (i << 2));
-}
-
-/* restore HDMI register state */
-void mrst_hdmi_restore(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_hdmi_dev *hdmi_dev = dev_priv->hdmi_priv;
-        int i;
-
-        /* dpll */
-        PSB_WVDC32(hdmi_dev->saveDPLL_CTRL, DPLL_CTRL);
-        PSB_WVDC32(hdmi_dev->saveDPLL_DIV_CTRL, DPLL_DIV_CTRL);
-        PSB_WVDC32(hdmi_dev->saveDPLL_ADJUST, DPLL_ADJUST);
-        PSB_WVDC32(hdmi_dev->saveDPLL_UPDATE, DPLL_UPDATE);
-        PSB_WVDC32(hdmi_dev->saveDPLL_CLK_ENABLE, DPLL_CLK_ENABLE);
-        DRM_UDELAY(150);
-
-        /* pipe */
-        PSB_WVDC32(dev_priv->savePIPEBSRC, PIPEBSRC);
-        PSB_WVDC32(dev_priv->saveHTOTAL_B, HTOTAL_B);
-        PSB_WVDC32(dev_priv->saveHBLANK_B, HBLANK_B);
-        PSB_WVDC32(dev_priv->saveHSYNC_B,  HSYNC_B);
-        PSB_WVDC32(dev_priv->saveVTOTAL_B, VTOTAL_B);
-        PSB_WVDC32(dev_priv->saveVBLANK_B, VBLANK_B);
-        PSB_WVDC32(dev_priv->saveVSYNC_B,  VSYNC_B);
-
-        PSB_WVDC32(hdmi_dev->savePCH_PIPEBSRC, PCH_PIPEBSRC);
-        PSB_WVDC32(hdmi_dev->savePCH_HTOTAL_B, PCH_HTOTAL_B);
-        PSB_WVDC32(hdmi_dev->savePCH_HBLANK_B, PCH_HBLANK_B);
-        PSB_WVDC32(hdmi_dev->savePCH_HSYNC_B,  PCH_HSYNC_B);
-        PSB_WVDC32(hdmi_dev->savePCH_VTOTAL_B, PCH_VTOTAL_B);
-        PSB_WVDC32(hdmi_dev->savePCH_VBLANK_B, PCH_VBLANK_B);
-        PSB_WVDC32(hdmi_dev->savePCH_VSYNC_B,  PCH_VSYNC_B);
-
-        PSB_WVDC32(dev_priv->savePIPEBCONF, PIPEBCONF);
-        PSB_WVDC32(hdmi_dev->savePCH_PIPEBCONF, PCH_PIPEBCONF);
-
-        /* plane */
-        PSB_WVDC32(dev_priv->saveDSPBLINOFF, DSPBLINOFF);
-        PSB_WVDC32(dev_priv->saveDSPBSTRIDE, DSPBSTRIDE);
-        PSB_WVDC32(dev_priv->saveDSPBTILEOFF, DSPBTILEOFF);
-        PSB_WVDC32(dev_priv->saveDSPBCNTR, DSPBCNTR);
-        PSB_WVDC32(dev_priv->saveDSPBSURF, DSPBSURF);
-
-        /* cursor B */
-        PSB_WVDC32(dev_priv->saveDSPBCURSOR_CTRL, CURBCNTR);
-        PSB_WVDC32(dev_priv->saveDSPBCURSOR_POS, CURBPOS);
-        PSB_WVDC32(dev_priv->saveDSPBCURSOR_BASE, CURBBASE);
-
-        /* restore palette */
-        for (i = 0; i < 256; i++)
-                PSB_WVDC32(dev_priv->save_palette_b[i], PALETTE_B + (i << 2));
-}
diff --git a/drivers/staging/gma500/mrst_hdmi_i2c.c b/drivers/staging/gma500/mrst_hdmi_i2c.c
deleted file mode 100644
index 36e7edc4d14c..000000000000
--- a/drivers/staging/gma500/mrst_hdmi_i2c.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *      Li Peng <peng.li@intel.com>
- */
-
-#include <linux/mutex.h>
-#include <linux/pci.h>
-#include <linux/i2c.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/export.h>
-#include "psb_drv.h"
-
-#define HDMI_READ(reg)          readl(hdmi_dev->regs + (reg))
-#define HDMI_WRITE(reg, val)    writel(val, hdmi_dev->regs + (reg))
-
-#define HDMI_HCR        0x1000
-#define HCR_DETECT_HDP          (1 << 6)
-#define HCR_ENABLE_HDCP         (1 << 5)
-#define HCR_ENABLE_AUDIO        (1 << 2)
-#define HCR_ENABLE_PIXEL        (1 << 1)
-#define HCR_ENABLE_TMDS         (1 << 0)
-#define HDMI_HICR       0x1004
-#define HDMI_INTR_I2C_ERROR     (1 << 4)
-#define HDMI_INTR_I2C_FULL      (1 << 3)
-#define HDMI_INTR_I2C_DONE      (1 << 2)
-#define HDMI_INTR_HPD           (1 << 0)
-#define HDMI_HSR        0x1008
-#define HDMI_HISR       0x100C
-#define HDMI_HI2CRDB0   0x1200
-#define HDMI_HI2CHCR    0x1240
-#define HI2C_HDCP_WRITE         (0 << 2)
-#define HI2C_HDCP_RI_READ       (1 << 2)
-#define HI2C_HDCP_READ          (2 << 2)
-#define HI2C_EDID_READ          (3 << 2)
-#define HI2C_READ_CONTINUE      (1 << 1)
-#define HI2C_ENABLE_TRANSACTION (1 << 0)
-
-#define HDMI_ICRH       0x1100
-#define HDMI_HI2CTDR0   0x1244
-#define HDMI_HI2CTDR1   0x1248
-
-#define I2C_STAT_INIT           0
-#define I2C_READ_DONE           1
-#define I2C_TRANSACTION_DONE    2
-
-struct hdmi_i2c_dev {
-        struct i2c_adapter *adap;
-        struct mutex i2c_lock;
-        struct completion complete;
-        int status;
-        struct i2c_msg *msg;
-        int buf_offset;
-};
-
-static void hdmi_i2c_irq_enable(struct mrst_hdmi_dev *hdmi_dev)
-{
-        u32 temp;
-
-        temp = HDMI_READ(HDMI_HICR);
-        temp |= (HDMI_INTR_I2C_ERROR | HDMI_INTR_I2C_FULL | HDMI_INTR_I2C_DONE);
-        HDMI_WRITE(HDMI_HICR, temp);
-        HDMI_READ(HDMI_HICR);
-}
-
-static void hdmi_i2c_irq_disable(struct mrst_hdmi_dev *hdmi_dev)
-{
-        HDMI_WRITE(HDMI_HICR, 0x0);
-        HDMI_READ(HDMI_HICR);
-}
-
-static int xfer_read(struct i2c_adapter *adap, struct i2c_msg *pmsg)
-{
-        struct mrst_hdmi_dev *hdmi_dev = i2c_get_adapdata(adap);
-        struct hdmi_i2c_dev *i2c_dev = hdmi_dev->i2c_dev;
-        u32 temp;
-
-        i2c_dev->status = I2C_STAT_INIT;
-        i2c_dev->msg = pmsg;
-        i2c_dev->buf_offset = 0;
-        INIT_COMPLETION(i2c_dev->complete);
-
-        /* Enable I2C transaction */
-        temp = ((pmsg->len) << 20) | HI2C_EDID_READ | HI2C_ENABLE_TRANSACTION;
-        HDMI_WRITE(HDMI_HI2CHCR, temp);
-        HDMI_READ(HDMI_HI2CHCR);
-
-        while (i2c_dev->status != I2C_TRANSACTION_DONE)
-                wait_for_completion_interruptible_timeout(&i2c_dev->complete,
-                                                                10 * HZ);
-
-        return 0;
-}
-
-static int xfer_write(struct i2c_adapter *adap, struct i2c_msg *pmsg)
-{
-        /*
-         * XXX: i2c write seems isn't useful for EDID probe, don't do anything
-         */
-        return 0;
-}
-
-static int mrst_hdmi_i2c_access(struct i2c_adapter *adap,
-                                struct i2c_msg *pmsg,
-                                int num)
-{
-        struct mrst_hdmi_dev *hdmi_dev = i2c_get_adapdata(adap);
-        struct hdmi_i2c_dev *i2c_dev = hdmi_dev->i2c_dev;
-        int i, err = 0;
-
-        mutex_lock(&i2c_dev->i2c_lock);
-
-        /* Enable i2c unit */
-        HDMI_WRITE(HDMI_ICRH, 0x00008760);
-
-        /* Enable irq */
-        hdmi_i2c_irq_enable(hdmi_dev);
-        for (i = 0; i < num; i++) {
-                if (pmsg->len && pmsg->buf) {
-                        if (pmsg->flags & I2C_M_RD)
-                                err = xfer_read(adap, pmsg);
-                        else
-                                err = xfer_write(adap, pmsg);
-                }
-                pmsg++;         /* next message */
-        }
-
-        /* Disable irq */
-        hdmi_i2c_irq_disable(hdmi_dev);
-
-        mutex_unlock(&i2c_dev->i2c_lock);
-
-        return i;
-}
-
-static u32 mrst_hdmi_i2c_func(struct i2c_adapter *adapter)
-{
-        return I2C_FUNC_I2C | I2C_FUNC_10BIT_ADDR;
-}
-
-static const struct i2c_algorithm mrst_hdmi_i2c_algorithm = {
-        .master_xfer    = mrst_hdmi_i2c_access,
-        .functionality  = mrst_hdmi_i2c_func,
-};
-
-static struct i2c_adapter mrst_hdmi_i2c_adapter = {
-        .name           = "mrst_hdmi_i2c",
-        .nr             = 3,
-        .owner          = THIS_MODULE,
-        .class          = I2C_CLASS_DDC,
-        .algo           = &mrst_hdmi_i2c_algorithm,
-};
-
-static void hdmi_i2c_read(struct mrst_hdmi_dev *hdmi_dev)
-{
-        struct hdmi_i2c_dev *i2c_dev = hdmi_dev->i2c_dev;
-        struct i2c_msg *msg = i2c_dev->msg;
-        u8 *buf = msg->buf;
-        u32 temp;
-        int i, offset;
-
-        offset = i2c_dev->buf_offset;
-        for (i = 0; i < 0x10; i++) {
-                temp = HDMI_READ(HDMI_HI2CRDB0 + (i * 4));
-                memcpy(buf + (offset + i * 4), &temp, 4);
-        }
-        i2c_dev->buf_offset += (0x10 * 4);
-
-        /* clearing read buffer full intr */
-        temp = HDMI_READ(HDMI_HISR);
-        HDMI_WRITE(HDMI_HISR, temp | HDMI_INTR_I2C_FULL);
-        HDMI_READ(HDMI_HISR);
-
-        /* continue read transaction */
-        temp = HDMI_READ(HDMI_HI2CHCR);
-        HDMI_WRITE(HDMI_HI2CHCR, temp | HI2C_READ_CONTINUE);
-        HDMI_READ(HDMI_HI2CHCR);
-
-        i2c_dev->status = I2C_READ_DONE;
-        return;
-}
-
-static void hdmi_i2c_transaction_done(struct mrst_hdmi_dev *hdmi_dev)
-{
-        struct hdmi_i2c_dev *i2c_dev = hdmi_dev->i2c_dev;
-        u32 temp;
-
-        /* clear transaction done intr */
-        temp = HDMI_READ(HDMI_HISR);
-        HDMI_WRITE(HDMI_HISR, temp | HDMI_INTR_I2C_DONE);
-        HDMI_READ(HDMI_HISR);
-
-
-        temp = HDMI_READ(HDMI_HI2CHCR);
-        HDMI_WRITE(HDMI_HI2CHCR, temp & ~HI2C_ENABLE_TRANSACTION);
-        HDMI_READ(HDMI_HI2CHCR);
-
-        i2c_dev->status = I2C_TRANSACTION_DONE;
-        return;
-}
-
-static irqreturn_t mrst_hdmi_i2c_handler(int this_irq, void *dev)
-{
-        struct mrst_hdmi_dev *hdmi_dev = dev;
-        struct hdmi_i2c_dev *i2c_dev = hdmi_dev->i2c_dev;
-        u32 stat;
-
-        stat = HDMI_READ(HDMI_HISR);
-
-        if (stat & HDMI_INTR_HPD) {
-                HDMI_WRITE(HDMI_HISR, stat | HDMI_INTR_HPD);
-                HDMI_READ(HDMI_HISR);
-        }
-
-        if (stat & HDMI_INTR_I2C_FULL)
-                hdmi_i2c_read(hdmi_dev);
-
-        if (stat & HDMI_INTR_I2C_DONE)
-                hdmi_i2c_transaction_done(hdmi_dev);
-
-        complete(&i2c_dev->complete);
-
-        return IRQ_HANDLED;
-}
-
-/*
- * choose alternate function 2 of GPIO pin 52, 53,
- * which is used by HDMI I2C logic
- */
-static void mrst_hdmi_i2c_gpio_fix(void)
-{
-        void *base;
-        unsigned int gpio_base = 0xff12c000;
-        int gpio_len = 0x1000;
-        u32 temp;
-
-        base = ioremap((resource_size_t)gpio_base, gpio_len);
-        if (base == NULL) {
-                DRM_ERROR("gpio ioremap fail\n");
-                return;
-        }
-
-        temp = readl(base + 0x44);
-        DRM_DEBUG_DRIVER("old gpio val %x\n", temp);
-        writel((temp | 0x00000a00), (base +  0x44));
-        temp = readl(base + 0x44);
-        DRM_DEBUG_DRIVER("new gpio val %x\n", temp);
-
-        iounmap(base);
-}
-
-int mrst_hdmi_i2c_init(struct pci_dev *dev)
-{
-        struct mrst_hdmi_dev *hdmi_dev;
-        struct hdmi_i2c_dev *i2c_dev;
-        int ret;
-
-        hdmi_dev = pci_get_drvdata(dev);
-
-        i2c_dev = kzalloc(sizeof(struct hdmi_i2c_dev), GFP_KERNEL);
-        if (i2c_dev == NULL) {
-                DRM_ERROR("Can't allocate interface\n");
-                ret = -ENOMEM;
-                goto exit;
-        }
-
-        i2c_dev->adap = &mrst_hdmi_i2c_adapter;
-        i2c_dev->status = I2C_STAT_INIT;
-        init_completion(&i2c_dev->complete);
-        mutex_init(&i2c_dev->i2c_lock);
-        i2c_set_adapdata(&mrst_hdmi_i2c_adapter, hdmi_dev);
-        hdmi_dev->i2c_dev = i2c_dev;
-
-        /* Enable HDMI I2C function on gpio */
-        mrst_hdmi_i2c_gpio_fix();
-
-        /* request irq */
-        ret = request_irq(dev->irq, mrst_hdmi_i2c_handler, IRQF_SHARED,
-                          mrst_hdmi_i2c_adapter.name, hdmi_dev);
-        if (ret) {
-                DRM_ERROR("Failed to request IRQ for I2C controller\n");
-                goto err;
-        }
-
-        /* Adapter registration */
-        ret = i2c_add_numbered_adapter(&mrst_hdmi_i2c_adapter);
-        return ret;
-
-err:
-        kfree(i2c_dev);
-exit:
-        return ret;
-}
-
-void mrst_hdmi_i2c_exit(struct pci_dev *dev)
-{
-        struct mrst_hdmi_dev *hdmi_dev;
-        struct hdmi_i2c_dev *i2c_dev;
-
-        hdmi_dev = pci_get_drvdata(dev);
-        if (i2c_del_adapter(&mrst_hdmi_i2c_adapter))
-                DRM_DEBUG_DRIVER("Failed to delete hdmi-i2c adapter\n");
-
-        i2c_dev = hdmi_dev->i2c_dev;
-        kfree(i2c_dev);
-        free_irq(dev->irq, hdmi_dev);
-}
diff --git a/drivers/staging/gma500/mrst_lvds.c b/drivers/staging/gma500/mrst_lvds.c
deleted file mode 100644
index e7999a2a3796..000000000000
--- a/drivers/staging/gma500/mrst_lvds.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright © 2006-2009 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *      Eric Anholt <eric@anholt.net>
- *      Dave Airlie <airlied@linux.ie>
- *      Jesse Barnes <jesse.barnes@intel.com>
- */
-
-#include <linux/i2c.h>
-#include <drm/drmP.h>
-#include <asm/mrst.h>
-
-#include "intel_bios.h"
-#include "psb_drv.h"
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "power.h"
-#include <linux/pm_runtime.h>
-
-/* The max/min PWM frequency in BPCR[31:17] - */
-/* The smallest number is 1 (not 0) that can fit in the
- * 15-bit field of the and then*/
-/* shifts to the left by one bit to get the actual 16-bit
- * value that the 15-bits correspond to.*/
-#define MRST_BLC_MAX_PWM_REG_FREQ           0xFFFF
-#define BRIGHTNESS_MAX_LEVEL 100
-
-/**
- * Sets the power state for the panel.
- */
-static void mrst_lvds_set_power(struct drm_device *dev,
-                                struct psb_intel_output *output, bool on)
-{
-        u32 pp_status;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (!gma_power_begin(dev, true))
-                return;
-
-        if (on) {
-                REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) |
-                          POWER_TARGET_ON);
-                do {
-                        pp_status = REG_READ(PP_STATUS);
-                } while ((pp_status & (PP_ON | PP_READY)) == PP_READY);
-                dev_priv->is_lvds_on = true;
-                if (dev_priv->ops->lvds_bl_power)
-                        dev_priv->ops->lvds_bl_power(dev, true);
-        } else {
-                if (dev_priv->ops->lvds_bl_power)
-                        dev_priv->ops->lvds_bl_power(dev, false);
-                REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) &
-                          ~POWER_TARGET_ON);
-                do {
-                        pp_status = REG_READ(PP_STATUS);
-                } while (pp_status & PP_ON);
-                dev_priv->is_lvds_on = false;
-                pm_request_idle(&dev->pdev->dev);
-        }
-        gma_power_end(dev);
-}
-
-static void mrst_lvds_dpms(struct drm_encoder *encoder, int mode)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *output = enc_to_psb_intel_output(encoder);
-
-        if (mode == DRM_MODE_DPMS_ON)
-                mrst_lvds_set_power(dev, output, true);
-        else
-                mrst_lvds_set_power(dev, output, false);
-
-        /* XXX: We never power down the LVDS pairs. */
-}
-
-static void mrst_lvds_mode_set(struct drm_encoder *encoder,
-                               struct drm_display_mode *mode,
-                               struct drm_display_mode *adjusted_mode)
-{
-        struct psb_intel_mode_device *mode_dev =
-                                enc_to_psb_intel_output(encoder)->mode_dev;
-        struct drm_device *dev = encoder->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 lvds_port;
-        uint64_t v = DRM_MODE_SCALE_FULLSCREEN;
-
-        if (!gma_power_begin(dev, true))
-                return;
-
-        /*
-         * The LVDS pin pair will already have been turned on in the
-         * psb_intel_crtc_mode_set since it has a large impact on the DPLL
-         * settings.
-         */
-        lvds_port = (REG_READ(LVDS) &
-                    (~LVDS_PIPEB_SELECT)) |
-                    LVDS_PORT_EN |
-                    LVDS_BORDER_EN;
-
-        /* If the firmware says dither on Moorestown, or the BIOS does
-           on Oaktrail then enable dithering */
-        if (mode_dev->panel_wants_dither || dev_priv->lvds_dither)
-                lvds_port |= MRST_PANEL_8TO6_DITHER_ENABLE;
-
-        REG_WRITE(LVDS, lvds_port);
-
-        drm_connector_property_get_value(
-                &enc_to_psb_intel_output(encoder)->base,
-                dev->mode_config.scaling_mode_property,
-                &v);
-
-        if (v == DRM_MODE_SCALE_NO_SCALE)
-                REG_WRITE(PFIT_CONTROL, 0);
-        else if (v == DRM_MODE_SCALE_ASPECT) {
-                if ((mode->vdisplay != adjusted_mode->crtc_vdisplay) ||
-                    (mode->hdisplay != adjusted_mode->crtc_hdisplay)) {
-                        if ((adjusted_mode->crtc_hdisplay * mode->vdisplay) ==
-                            (mode->hdisplay * adjusted_mode->crtc_vdisplay))
-                                REG_WRITE(PFIT_CONTROL, PFIT_ENABLE);
-                        else if ((adjusted_mode->crtc_hdisplay *
-                                mode->vdisplay) > (mode->hdisplay *
-                                adjusted_mode->crtc_vdisplay))
-                                REG_WRITE(PFIT_CONTROL, PFIT_ENABLE |
-                                          PFIT_SCALING_MODE_PILLARBOX);
-                        else
-                                REG_WRITE(PFIT_CONTROL, PFIT_ENABLE |
-                                          PFIT_SCALING_MODE_LETTERBOX);
-                } else
-                        REG_WRITE(PFIT_CONTROL, PFIT_ENABLE);
-        } else /*(v == DRM_MODE_SCALE_FULLSCREEN)*/
-                REG_WRITE(PFIT_CONTROL, PFIT_ENABLE);
-
-        gma_power_end(dev);
-}
-
-static void mrst_lvds_prepare(struct drm_encoder *encoder)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *output = enc_to_psb_intel_output(encoder);
-        struct psb_intel_mode_device *mode_dev = output->mode_dev;
-
-        if (!gma_power_begin(dev, true))
-                return;
-
-        mode_dev->saveBLC_PWM_CTL = REG_READ(BLC_PWM_CTL);
-        mode_dev->backlight_duty_cycle = (mode_dev->saveBLC_PWM_CTL &
-                                          BACKLIGHT_DUTY_CYCLE_MASK);
-        mrst_lvds_set_power(dev, output, false);
-        gma_power_end(dev);
-}
-
-static u32 mrst_lvds_get_max_backlight(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 ret;
-
-        if (gma_power_begin(dev, false)) {
-                ret = ((REG_READ(BLC_PWM_CTL) &
-                          BACKLIGHT_MODULATION_FREQ_MASK) >>
-                          BACKLIGHT_MODULATION_FREQ_SHIFT) * 2;
-
-                gma_power_end(dev);
-        } else
-                ret = ((dev_priv->saveBLC_PWM_CTL &
-                          BACKLIGHT_MODULATION_FREQ_MASK) >>
-                          BACKLIGHT_MODULATION_FREQ_SHIFT) * 2;
-
-        return ret;
-}
-
-static void mrst_lvds_commit(struct drm_encoder *encoder)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *output = enc_to_psb_intel_output(encoder);
-        struct psb_intel_mode_device *mode_dev = output->mode_dev;
-
-        if (mode_dev->backlight_duty_cycle == 0)
-                mode_dev->backlight_duty_cycle =
-                                        mrst_lvds_get_max_backlight(dev);
-        mrst_lvds_set_power(dev, output, true);
-}
-
-static const struct drm_encoder_helper_funcs mrst_lvds_helper_funcs = {
-        .dpms = mrst_lvds_dpms,
-        .mode_fixup = psb_intel_lvds_mode_fixup,
-        .prepare = mrst_lvds_prepare,
-        .mode_set = mrst_lvds_mode_set,
-        .commit = mrst_lvds_commit,
-};
-
-static struct drm_display_mode lvds_configuration_modes[] = {
-        /* hard coded fixed mode for TPO LTPS LPJ040K001A */
-        { DRM_MODE("800x480",  DRM_MODE_TYPE_DRIVER, 33264, 800, 836,
-                   846, 1056, 0, 480, 489, 491, 525, 0, 0) },
-        /* hard coded fixed mode for LVDS 800x480 */
-        { DRM_MODE("800x480",  DRM_MODE_TYPE_DRIVER, 30994, 800, 801,
-                   802, 1024, 0, 480, 481, 482, 525, 0, 0) },
-        /* hard coded fixed mode for Samsung 480wsvga LVDS 1024x600@75 */
-        { DRM_MODE("1024x600", DRM_MODE_TYPE_DRIVER, 53990, 1024, 1072,
-                   1104, 1184, 0, 600, 603, 604, 608, 0, 0) },
-        /* hard coded fixed mode for Samsung 480wsvga LVDS 1024x600@75 */
-        { DRM_MODE("1024x600", DRM_MODE_TYPE_DRIVER, 53990, 1024, 1104,
-                   1136, 1184, 0, 600, 603, 604, 608, 0, 0) },
-        /* hard coded fixed mode for Sharp wsvga LVDS 1024x600 */
-        { DRM_MODE("1024x600", DRM_MODE_TYPE_DRIVER, 48885, 1024, 1124,
-                   1204, 1312, 0, 600, 607, 610, 621, 0, 0) },
-        /* hard coded fixed mode for LVDS 1024x768 */
-        { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 65000, 1024, 1048,
-                   1184, 1344, 0, 768, 771, 777, 806, 0, 0) },
-        /* hard coded fixed mode for LVDS 1366x768 */
-        { DRM_MODE("1366x768", DRM_MODE_TYPE_DRIVER, 77500, 1366, 1430,
-                   1558, 1664, 0, 768, 769, 770, 776, 0, 0) },
-};
-
-/* Returns the panel fixed mode from configuration. */
-
-static struct drm_display_mode *
-mrst_lvds_get_configuration_mode(struct drm_device *dev)
-{
-        struct drm_display_mode *mode = NULL;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct mrst_timing_info *ti = &dev_priv->gct_data.DTD;
-
-        if (dev_priv->vbt_data.size != 0x00) { /*if non-zero, then use vbt*/
-                mode = kzalloc(sizeof(*mode), GFP_KERNEL);
-                if (!mode)
-                        return NULL;
-
-                mode->hdisplay = (ti->hactive_hi << 8) | ti->hactive_lo;
-                mode->vdisplay = (ti->vactive_hi << 8) | ti->vactive_lo;
-                mode->hsync_start = mode->hdisplay + \
-                                ((ti->hsync_offset_hi << 8) | \
-                                ti->hsync_offset_lo);
-                mode->hsync_end = mode->hsync_start + \
-                                ((ti->hsync_pulse_width_hi << 8) | \
-                                ti->hsync_pulse_width_lo);
-                mode->htotal = mode->hdisplay + ((ti->hblank_hi << 8) | \
-                                                        ti->hblank_lo);
-                mode->vsync_start = \
-                        mode->vdisplay + ((ti->vsync_offset_hi << 4) | \
-                                                ti->vsync_offset_lo);
-                mode->vsync_end = \
-                        mode->vsync_start + ((ti->vsync_pulse_width_hi << 4) | \
-                                                ti->vsync_pulse_width_lo);
-                mode->vtotal = mode->vdisplay + \
-                                ((ti->vblank_hi << 8) | ti->vblank_lo);
-                mode->clock = ti->pixel_clock * 10;
-#if 0
-                printk(KERN_INFO "hdisplay is %d\n", mode->hdisplay);
-                printk(KERN_INFO "vdisplay is %d\n", mode->vdisplay);
-                printk(KERN_INFO "HSS is %d\n", mode->hsync_start);
-                printk(KERN_INFO "HSE is %d\n", mode->hsync_end);
-                printk(KERN_INFO "htotal is %d\n", mode->htotal);
-                printk(KERN_INFO "VSS is %d\n", mode->vsync_start);
-                printk(KERN_INFO "VSE is %d\n", mode->vsync_end);
-                printk(KERN_INFO "vtotal is %d\n", mode->vtotal);
-                printk(KERN_INFO "clock is %d\n", mode->clock);
-#endif
-        } else
-                mode = drm_mode_duplicate(dev, &lvds_configuration_modes[2]);
-
-        drm_mode_set_name(mode);
-        drm_mode_set_crtcinfo(mode, 0);
-
-        return mode;
-}
-
-/**
- * mrst_lvds_init - setup LVDS connectors on this device
- * @dev: drm device
- *
- * Create the connector, register the LVDS DDC bus, and try to figure out what
- * modes we can display on the LVDS panel (if present).
- */
-void mrst_lvds_init(struct drm_device *dev,
-                    struct psb_intel_mode_device *mode_dev)
-{
-        struct psb_intel_output *psb_intel_output;
-        struct drm_connector *connector;
-        struct drm_encoder *encoder;
-        struct drm_psb_private *dev_priv =
-                                (struct drm_psb_private *) dev->dev_private;
-        struct edid *edid;
-        int ret = 0;
-        struct i2c_adapter *i2c_adap;
-        struct drm_display_mode *scan;  /* *modes, *bios_mode; */
-
-        psb_intel_output = kzalloc(sizeof(struct psb_intel_output), GFP_KERNEL);
-        if (!psb_intel_output)
-                return;
-
-        psb_intel_output->mode_dev = mode_dev;
-        connector = &psb_intel_output->base;
-        encoder = &psb_intel_output->enc;
-        dev_priv->is_lvds_on = true;
-        drm_connector_init(dev, &psb_intel_output->base,
-                           &psb_intel_lvds_connector_funcs,
-                           DRM_MODE_CONNECTOR_LVDS);
-
-        drm_encoder_init(dev, &psb_intel_output->enc, &psb_intel_lvds_enc_funcs,
-                         DRM_MODE_ENCODER_LVDS);
-
-        drm_mode_connector_attach_encoder(&psb_intel_output->base,
-                                          &psb_intel_output->enc);
-        psb_intel_output->type = INTEL_OUTPUT_LVDS;
-
-        drm_encoder_helper_add(encoder, &mrst_lvds_helper_funcs);
-        drm_connector_helper_add(connector,
-                                 &psb_intel_lvds_connector_helper_funcs);
-        connector->display_info.subpixel_order = SubPixelHorizontalRGB;
-        connector->interlace_allowed = false;
-        connector->doublescan_allowed = false;
-
-        drm_connector_attach_property(connector,
-                                        dev->mode_config.scaling_mode_property,
-                                        DRM_MODE_SCALE_FULLSCREEN);
-        drm_connector_attach_property(connector,
-                                        dev_priv->backlight_property,
-                                        BRIGHTNESS_MAX_LEVEL);
-
-        mode_dev->panel_wants_dither = false;
-        if (dev_priv->vbt_data.size != 0x00)
-                mode_dev->panel_wants_dither = (dev_priv->gct_data.
-                        Panel_Port_Control & MRST_PANEL_8TO6_DITHER_ENABLE);
-
-        /*
-         * LVDS discovery:
-         * 1) check for EDID on DDC
-         * 2) check for VBT data
-         * 3) check to see if LVDS is already on
-         *    if none of the above, no panel
-         * 4) make sure lid is open
-         *    if closed, act like it's not there for now
-         */
-
-        i2c_adap = i2c_get_adapter(dev_priv->ops->i2c_bus);
-
-        if (i2c_adap == NULL)
-                dev_err(dev->dev, "No ddc adapter available!\n");
-        /*
-         * Attempt to get the fixed panel mode from DDC.  Assume that the
-         * preferred mode is the right one.
-         */
-        if (i2c_adap) {
-                edid = drm_get_edid(connector, i2c_adap);
-                if (edid) {
-                        drm_mode_connector_update_edid_property(connector,
-                                                                        edid);
-                        ret = drm_add_edid_modes(connector, edid);
-                        kfree(edid);
-                }
-
-                list_for_each_entry(scan, &connector->probed_modes, head) {
-                        if (scan->type & DRM_MODE_TYPE_PREFERRED) {
-                                mode_dev->panel_fixed_mode =
-                                    drm_mode_duplicate(dev, scan);
-                                goto out;       /* FIXME: check for quirks */
-                        }
-                }
-        }
-        /*
-         * If we didn't get EDID, try geting panel timing
-         * from configuration data
-         */
-        mode_dev->panel_fixed_mode = mrst_lvds_get_configuration_mode(dev);
-
-        if (mode_dev->panel_fixed_mode) {
-                mode_dev->panel_fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
-                goto out;       /* FIXME: check for quirks */
-        }
-
-        /* If we still don't have a mode after all that, give up. */
-        if (!mode_dev->panel_fixed_mode) {
-                dev_err(dev->dev, "Found no modes on the lvds, ignoring the LVDS\n");
-                goto failed_find;
-        }
-
-out:
-        drm_sysfs_connector_add(connector);
-        return;
-
-failed_find:
-        dev_dbg(dev->dev, "No LVDS modes found, disabling.\n");
-        if (psb_intel_output->ddc_bus)
-                psb_intel_i2c_destroy(psb_intel_output->ddc_bus);
-
-/* failed_ddc: */
-
-        drm_encoder_cleanup(encoder);
-        drm_connector_cleanup(connector);
-        kfree(connector);
-}
-
diff --git a/drivers/staging/gma500/power.c b/drivers/staging/gma500/power.c
deleted file mode 100644
index 408257038335..000000000000
--- a/drivers/staging/gma500/power.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2009-2011, Intel Corporation.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- *    Benjamin Defnet <benjamin.r.defnet@intel.com>
- *    Rajesh Poornachandran <rajesh.poornachandran@intel.com>
- * Massively reworked
- *    Alan Cox <alan@linux.intel.com>
- */
-
-#include "power.h"
-#include "psb_drv.h"
-#include "psb_reg.h"
-#include "psb_intel_reg.h"
-#include <linux/mutex.h>
-#include <linux/pm_runtime.h>
-
-static struct mutex power_mutex;        /* Serialize power ops */
-static spinlock_t power_ctrl_lock;      /* Serialize power claim */
-
-/**
- *      gma_power_init          -       initialise power manager
- *      @dev: our device
- *
- *      Set up for power management tracking of our hardware.
- */
-void gma_power_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        /* FIXME: Move APM/OSPM base into relevant device code */
-        dev_priv->apm_base = dev_priv->apm_reg & 0xffff;
-        dev_priv->ospm_base &= 0xffff;
-
-        dev_priv->display_power = true; /* We start active */
-        dev_priv->display_count = 0;    /* Currently no users */
-        dev_priv->suspended = false;    /* And not suspended */
-        spin_lock_init(&power_ctrl_lock);
-        mutex_init(&power_mutex);
-
-        dev_priv->ops->init_pm(dev);
-}
-
-/**
- *      gma_power_uninit        -       end power manager
- *      @dev: device to end for
- *
- *      Undo the effects of gma_power_init
- */
-void gma_power_uninit(struct drm_device *dev)
-{
-        pm_runtime_disable(&dev->pdev->dev);
-        pm_runtime_set_suspended(&dev->pdev->dev);
-}
-
-/**
- *      gma_suspend_display     -       suspend the display logic
- *      @dev: our DRM device
- *
- *      Suspend the display logic of the graphics interface
- */
-static void gma_suspend_display(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (!dev_priv->display_power)
-                return;
-        dev_priv->ops->save_regs(dev);
-        dev_priv->ops->power_down(dev);
-        dev_priv->display_power = false;
-}
-
-/**
- *      gma_resume_display      -       resume display side logic
- *
- *      Resume the display hardware restoring state and enabling
- *      as necessary.
- */
-static void gma_resume_display(struct pci_dev *pdev)
-{
-        struct drm_device *dev = pci_get_drvdata(pdev);
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (dev_priv->display_power)
-                return;
-
-        /* turn on the display power island */
-        dev_priv->ops->power_up(dev);
-        dev_priv->suspended = false;
-        dev_priv->display_power = true;
-
-        PSB_WVDC32(dev_priv->pge_ctl | _PSB_PGETBL_ENABLED, PSB_PGETBL_CTL);
-        pci_write_config_word(pdev, PSB_GMCH_CTRL,
-                        dev_priv->gmch_ctrl | _PSB_GMCH_ENABLED);
-        dev_priv->ops->restore_regs(dev);
-}
-
-/**
- *      gma_suspend_pci         -       suspend PCI side
- *      @pdev: PCI device
- *
- *      Perform the suspend processing on our PCI device state
- */
-static void gma_suspend_pci(struct pci_dev *pdev)
-{
-        struct drm_device *dev = pci_get_drvdata(pdev);
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int bsm, vbt;
-
-        if (dev_priv->suspended)
-                return;
-
-        pci_save_state(pdev);
-        pci_read_config_dword(pdev, 0x5C, &bsm);
-        dev_priv->saveBSM = bsm;
-        pci_read_config_dword(pdev, 0xFC, &vbt);
-        dev_priv->saveVBT = vbt;
-        pci_read_config_dword(pdev, PSB_PCIx_MSI_ADDR_LOC, &dev_priv->msi_addr);
-        pci_read_config_dword(pdev, PSB_PCIx_MSI_DATA_LOC, &dev_priv->msi_data);
-
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, PCI_D3hot);
-
-        dev_priv->suspended = true;
-}
-
-/**
- *      gma_resume_pci          -       resume helper
- *      @dev: our PCI device
- *
- *      Perform the resume processing on our PCI device state - rewrite
- *      register state and re-enable the PCI device
- */
-static bool gma_resume_pci(struct pci_dev *pdev)
-{
-        struct drm_device *dev = pci_get_drvdata(pdev);
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int ret;
-
-        if (!dev_priv->suspended)
-                return true;
-
-        pci_set_power_state(pdev, PCI_D0);
-        pci_restore_state(pdev);
-        pci_write_config_dword(pdev, 0x5c, dev_priv->saveBSM);
-        pci_write_config_dword(pdev, 0xFC, dev_priv->saveVBT);
-        /* restoring MSI address and data in PCIx space */
-        pci_write_config_dword(pdev, PSB_PCIx_MSI_ADDR_LOC, dev_priv->msi_addr);
-        pci_write_config_dword(pdev, PSB_PCIx_MSI_DATA_LOC, dev_priv->msi_data);
-        ret = pci_enable_device(pdev);
-
-        if (ret != 0)
-                dev_err(&pdev->dev, "pci_enable failed: %d\n", ret);
-        else
-                dev_priv->suspended = false;
-        return !dev_priv->suspended;
-}
-
-/**
- *      gma_power_suspend               -       bus callback for suspend
- *      @pdev: our PCI device
- *      @state: suspend type
- *
- *      Called back by the PCI layer during a suspend of the system. We
- *      perform the necessary shut down steps and save enough state that
- *      we can undo this when resume is called.
- */
-int gma_power_suspend(struct device *_dev)
-{
-        struct pci_dev *pdev = container_of(_dev, struct pci_dev, dev);
-        struct drm_device *dev = pci_get_drvdata(pdev);
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        mutex_lock(&power_mutex);
-        if (!dev_priv->suspended) {
-                if (dev_priv->display_count) {
-                        mutex_unlock(&power_mutex);
-                        return -EBUSY;
-                }
-                psb_irq_uninstall(dev);
-                gma_suspend_display(dev);
-                gma_suspend_pci(pdev);
-        }
-        mutex_unlock(&power_mutex);
-        return 0;
-}
-
-/**
- *      gma_power_resume                -       resume power
- *      @pdev: PCI device
- *
- *      Resume the PCI side of the graphics and then the displays
- */
-int gma_power_resume(struct device *_dev)
-{
-        struct pci_dev *pdev = container_of(_dev, struct pci_dev, dev);
-        struct drm_device *dev = pci_get_drvdata(pdev);
-
-        mutex_lock(&power_mutex);
-        gma_resume_pci(pdev);
-        gma_resume_display(pdev);
-        psb_irq_preinstall(dev);
-        psb_irq_postinstall(dev);
-        mutex_unlock(&power_mutex);
-        return 0;
-}
-
-/**
- *      gma_power_is_on         -       returne true if power is on
- *      @dev: our DRM device
- *
- *      Returns true if the display island power is on at this moment
- */
-bool gma_power_is_on(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        return dev_priv->display_power;
-}
-
-/**
- *      gma_power_begin         -       begin requiring power
- *      @dev: our DRM device
- *      @force_on: true to force power on
- *
- *      Begin an action that requires the display power island is enabled.
- *      We refcount the islands.
- */
-bool gma_power_begin(struct drm_device *dev, bool force_on)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int ret;
-        unsigned long flags;
-
-        spin_lock_irqsave(&power_ctrl_lock, flags);
-        /* Power already on ? */
-        if (dev_priv->display_power) {
-                dev_priv->display_count++;
-                pm_runtime_get(&dev->pdev->dev);
-                spin_unlock_irqrestore(&power_ctrl_lock, flags);
-                return true;
-        }
-        if (force_on == false)
-                goto out_false;
-
-        /* Ok power up needed */
-        ret = gma_resume_pci(dev->pdev);
-        if (ret == 0) {
-                /* FIXME: we want to defer this for Medfield/Oaktrail */
-                gma_resume_display(dev->pdev);
-                psb_irq_preinstall(dev);
-                psb_irq_postinstall(dev);
-                pm_runtime_get(&dev->pdev->dev);
-                dev_priv->display_count++;
-                spin_unlock_irqrestore(&power_ctrl_lock, flags);
-                return true;
-        }
-out_false:
-        spin_unlock_irqrestore(&power_ctrl_lock, flags);
-        return false;
-}
-
-/**
- *      gma_power_end           -       end use of power
- *      @dev: Our DRM device
- *
- *      Indicate that one of our gma_power_begin() requested periods when
- *      the diplay island power is needed has completed.
- */
-void gma_power_end(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned long flags;
-        spin_lock_irqsave(&power_ctrl_lock, flags);
-        dev_priv->display_count--;
-        WARN_ON(dev_priv->display_count < 0);
-        spin_unlock_irqrestore(&power_ctrl_lock, flags);
-        pm_runtime_put(&dev->pdev->dev);
-}
-
-int psb_runtime_suspend(struct device *dev)
-{
-        return gma_power_suspend(dev);
-}
-
-int psb_runtime_resume(struct device *dev)
-{
-        return gma_power_resume(dev);;
-}
-
-int psb_runtime_idle(struct device *dev)
-{
-        struct drm_device *drmdev = pci_get_drvdata(to_pci_dev(dev));
-        struct drm_psb_private *dev_priv = drmdev->dev_private;
-        if (dev_priv->display_count)
-                return 0;
-        else
-                return 1;
-}
diff --git a/drivers/staging/gma500/power.h b/drivers/staging/gma500/power.h
deleted file mode 100644
index 1969d2ecb328..000000000000
--- a/drivers/staging/gma500/power.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2009-2011, Intel Corporation.
- * All Rights Reserved.
-
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors:
- *    Benjamin Defnet <benjamin.r.defnet@intel.com>
- *    Rajesh Poornachandran <rajesh.poornachandran@intel.com>
- * Massively reworked
- *    Alan Cox <alan@linux.intel.com>
- */
-#ifndef _PSB_POWERMGMT_H_
-#define _PSB_POWERMGMT_H_
-
-#include <linux/pci.h>
-#include <drm/drmP.h>
-
-void gma_power_init(struct drm_device *dev);
-void gma_power_uninit(struct drm_device *dev);
-
-/*
- * The kernel bus power management  will call these functions
- */
-int gma_power_suspend(struct device *dev);
-int gma_power_resume(struct device *dev);
-
-/*
- * These are the functions the driver should use to wrap all hw access
- * (i.e. register reads and writes)
- */
-bool gma_power_begin(struct drm_device *dev, bool force);
-void gma_power_end(struct drm_device *dev);
-
-/*
- * Use this function to do an instantaneous check for if the hw is on.
- * Only use this in cases where you know the mutex is already held such
- * as in irq install/uninstall and you need to
- * prevent a deadlock situation.  Otherwise use gma_power_begin().
- */
-bool gma_power_is_on(struct drm_device *dev);
-
-/*
- * GFX-Runtime PM callbacks
- */
-int psb_runtime_suspend(struct device *dev);
-int psb_runtime_resume(struct device *dev);
-int psb_runtime_idle(struct device *dev);
-
-#endif /*_PSB_POWERMGMT_H_*/
diff --git a/drivers/staging/gma500/psb_device.c b/drivers/staging/gma500/psb_device.c
deleted file mode 100644
index b97aa78519f2..000000000000
--- a/drivers/staging/gma500/psb_device.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-#include <linux/backlight.h>
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include "psb_drm.h"
-#include "psb_drv.h"
-#include "psb_reg.h"
-#include "psb_intel_reg.h"
-#include "intel_bios.h"
-
-
-static int psb_output_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        psb_intel_lvds_init(dev, &dev_priv->mode_dev);
-        psb_intel_sdvo_init(dev, SDVOB);
-        return 0;
-}
-
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-
-/*
- *      Poulsbo Backlight Interfaces
- */
-
-#define BLC_PWM_PRECISION_FACTOR 100    /* 10000000 */
-#define BLC_PWM_FREQ_CALC_CONSTANT 32
-#define MHz 1000000
-
-#define PSB_BLC_PWM_PRECISION_FACTOR    10
-#define PSB_BLC_MAX_PWM_REG_FREQ        0xFFFE
-#define PSB_BLC_MIN_PWM_REG_FREQ        0x2
-
-#define PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR (0xFFFE)
-#define PSB_BACKLIGHT_PWM_CTL_SHIFT     (16)
-
-static int psb_brightness;
-static struct backlight_device *psb_backlight_device;
-
-static int psb_get_brightness(struct backlight_device *bd)
-{
-        /* return locally cached var instead of HW read (due to DPST etc.) */
-        /* FIXME: ideally return actual value in case firmware fiddled with
-           it */
-        return psb_brightness;
-}
-
-
-static int psb_backlight_setup(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned long core_clock;
-        /* u32 bl_max_freq; */
-        /* unsigned long value; */
-        u16 bl_max_freq;
-        uint32_t value;
-        uint32_t blc_pwm_precision_factor;
-
-        /* get bl_max_freq and pol from dev_priv*/
-        if (!dev_priv->lvds_bl) {
-                dev_err(dev->dev, "Has no valid LVDS backlight info\n");
-                return -ENOENT;
-        }
-        bl_max_freq = dev_priv->lvds_bl->freq;
-        blc_pwm_precision_factor = PSB_BLC_PWM_PRECISION_FACTOR;
-
-        core_clock = dev_priv->core_freq;
-
-        value = (core_clock * MHz) / BLC_PWM_FREQ_CALC_CONSTANT;
-        value *= blc_pwm_precision_factor;
-        value /= bl_max_freq;
-        value /= blc_pwm_precision_factor;
-
-        if (value > (unsigned long long)PSB_BLC_MAX_PWM_REG_FREQ ||
-                 value < (unsigned long long)PSB_BLC_MIN_PWM_REG_FREQ)
-                                return -ERANGE;
-        else {
-                value &= PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR;
-                REG_WRITE(BLC_PWM_CTL,
-                        (value << PSB_BACKLIGHT_PWM_CTL_SHIFT) | (value));
-        }
-        return 0;
-}
-
-static int psb_set_brightness(struct backlight_device *bd)
-{
-        struct drm_device *dev = bl_get_data(psb_backlight_device);
-        int level = bd->props.brightness;
-
-        /* Percentage 1-100% being valid */
-        if (level < 1)
-                level = 1;
-
-        psb_intel_lvds_set_brightness(dev, level);
-        psb_brightness = level;
-        return 0;
-}
-
-static const struct backlight_ops psb_ops = {
-        .get_brightness = psb_get_brightness,
-        .update_status  = psb_set_brightness,
-};
-
-static int psb_backlight_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        int ret;
-        struct backlight_properties props;
-
-        memset(&props, 0, sizeof(struct backlight_properties));
-        props.max_brightness = 100;
-        props.type = BACKLIGHT_PLATFORM;
-
-        psb_backlight_device = backlight_device_register("psb-bl",
-                                        NULL, (void *)dev, &psb_ops, &props);
-        if (IS_ERR(psb_backlight_device))
-                return PTR_ERR(psb_backlight_device);
-
-        ret = psb_backlight_setup(dev);
-        if (ret < 0) {
-                backlight_device_unregister(psb_backlight_device);
-                psb_backlight_device = NULL;
-                return ret;
-        }
-        psb_backlight_device->props.brightness = 100;
-        psb_backlight_device->props.max_brightness = 100;
-        backlight_update_status(psb_backlight_device);
-        dev_priv->backlight_device = psb_backlight_device;
-        return 0;
-}
-
-#endif
-
-/*
- *      Provide the Poulsbo specific chip logic and low level methods
- *      for power management
- */
-
-static void psb_init_pm(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        u32 gating = PSB_RSGX32(PSB_CR_CLKGATECTL);
-        gating &= ~3;   /* Disable 2D clock gating */
-        gating |= 1;
-        PSB_WSGX32(gating, PSB_CR_CLKGATECTL);
-        PSB_RSGX32(PSB_CR_CLKGATECTL);
-}
-
-/**
- *      psb_save_display_registers      -       save registers lost on suspend
- *      @dev: our DRM device
- *
- *      Save the state we need in order to be able to restore the interface
- *      upon resume from suspend
- */
-static int psb_save_display_registers(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct drm_crtc *crtc;
-        struct drm_connector *connector;
-
-        /* Display arbitration control + watermarks */
-        dev_priv->saveDSPARB = PSB_RVDC32(DSPARB);
-        dev_priv->saveDSPFW1 = PSB_RVDC32(DSPFW1);
-        dev_priv->saveDSPFW2 = PSB_RVDC32(DSPFW2);
-        dev_priv->saveDSPFW3 = PSB_RVDC32(DSPFW3);
-        dev_priv->saveDSPFW4 = PSB_RVDC32(DSPFW4);
-        dev_priv->saveDSPFW5 = PSB_RVDC32(DSPFW5);
-        dev_priv->saveDSPFW6 = PSB_RVDC32(DSPFW6);
-        dev_priv->saveCHICKENBIT = PSB_RVDC32(DSPCHICKENBIT);
-
-        /* Save crtc and output state */
-        mutex_lock(&dev->mode_config.mutex);
-        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-                if (drm_helper_crtc_in_use(crtc))
-                        crtc->funcs->save(crtc);
-        }
-
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head)
-                connector->funcs->save(connector);
-
-        mutex_unlock(&dev->mode_config.mutex);
-        return 0;
-}
-
-/**
- *      psb_restore_display_registers   -       restore lost register state
- *      @dev: our DRM device
- *
- *      Restore register state that was lost during suspend and resume.
- */
-static int psb_restore_display_registers(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct drm_crtc *crtc;
-        struct drm_connector *connector;
-
-        /* Display arbitration + watermarks */
-        PSB_WVDC32(dev_priv->saveDSPARB, DSPARB);
-        PSB_WVDC32(dev_priv->saveDSPFW1, DSPFW1);
-        PSB_WVDC32(dev_priv->saveDSPFW2, DSPFW2);
-        PSB_WVDC32(dev_priv->saveDSPFW3, DSPFW3);
-        PSB_WVDC32(dev_priv->saveDSPFW4, DSPFW4);
-        PSB_WVDC32(dev_priv->saveDSPFW5, DSPFW5);
-        PSB_WVDC32(dev_priv->saveDSPFW6, DSPFW6);
-        PSB_WVDC32(dev_priv->saveCHICKENBIT, DSPCHICKENBIT);
-
-        /*make sure VGA plane is off. it initializes to on after reset!*/
-        PSB_WVDC32(0x80000000, VGACNTRL);
-
-        mutex_lock(&dev->mode_config.mutex);
-        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
-                if (drm_helper_crtc_in_use(crtc))
-                        crtc->funcs->restore(crtc);
-
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head)
-                connector->funcs->restore(connector);
-
-        mutex_unlock(&dev->mode_config.mutex);
-        return 0;
-}
-
-static int psb_power_down(struct drm_device *dev)
-{
-        return 0;
-}
-
-static int psb_power_up(struct drm_device *dev)
-{
-        return 0;
-}
-
-static void psb_get_core_freq(struct drm_device *dev)
-{
-        uint32_t clock;
-        struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        /*pci_write_config_dword(pci_root, 0xD4, 0x00C32004);*/
-        /*pci_write_config_dword(pci_root, 0xD0, 0xE0033000);*/
-
-        pci_write_config_dword(pci_root, 0xD0, 0xD0050300);
-        pci_read_config_dword(pci_root, 0xD4, &clock);
-        pci_dev_put(pci_root);
-
-        switch (clock & 0x07) {
-        case 0:
-                dev_priv->core_freq = 100;
-                break;
-        case 1:
-                dev_priv->core_freq = 133;
-                break;
-        case 2:
-                dev_priv->core_freq = 150;
-                break;
-        case 3:
-                dev_priv->core_freq = 178;
-                break;
-        case 4:
-                dev_priv->core_freq = 200;
-                break;
-        case 5:
-        case 6:
-        case 7:
-                dev_priv->core_freq = 266;
-        default:
-                dev_priv->core_freq = 0;
-        }
-}
-
-static int psb_chip_setup(struct drm_device *dev)
-{
-        psb_get_core_freq(dev);
-        gma_intel_opregion_init(dev);
-        psb_intel_init_bios(dev);
-        return 0;
-}
-
-const struct psb_ops psb_chip_ops = {
-        .name = "Poulsbo",
-        .accel_2d = 1,
-        .pipes = 2,
-        .crtcs = 2,
-        .sgx_offset = PSB_SGX_OFFSET,
-        .chip_setup = psb_chip_setup,
-
-        .crtc_helper = &psb_intel_helper_funcs,
-        .crtc_funcs = &psb_intel_crtc_funcs,
-
-        .output_init = psb_output_init,
-
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-        .backlight_init = psb_backlight_init,
-#endif
-
-        .init_pm = psb_init_pm,
-        .save_regs = psb_save_display_registers,
-        .restore_regs = psb_restore_display_registers,
-        .power_down = psb_power_down,
-        .power_up = psb_power_up,
-};
-
diff --git a/drivers/staging/gma500/psb_drm.h b/drivers/staging/gma500/psb_drm.h
deleted file mode 100644
index 0da846835688..000000000000
--- a/drivers/staging/gma500/psb_drm.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2007-2011, Intel Corporation.
- * All Rights Reserved.
- * Copyright (c) 2008, Tungsten Graphics Inc.  Cedar Park, TX., USA.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-#ifndef _PSB_DRM_H_
-#define _PSB_DRM_H_
-
-#define PSB_NUM_PIPE 3
-
-#define PSB_GPU_ACCESS_READ         (1ULL << 32)
-#define PSB_GPU_ACCESS_WRITE        (1ULL << 33)
-#define PSB_GPU_ACCESS_MASK         (PSB_GPU_ACCESS_READ | PSB_GPU_ACCESS_WRITE)
-
-#define PSB_BO_FLAG_COMMAND         (1ULL << 52)
-
-/*
- * Feedback components:
- */
-
-struct drm_psb_sizes_arg {
-        u32 ta_mem_size;
-        u32 mmu_size;
-        u32 pds_size;
-        u32 rastgeom_size;
-        u32 tt_size;
-        u32 vram_size;
-};
-
-struct drm_psb_dpst_lut_arg {
-        uint8_t lut[256];
-        int output_id;
-};
-
-#define PSB_DC_CRTC_SAVE 0x01
-#define PSB_DC_CRTC_RESTORE 0x02
-#define PSB_DC_OUTPUT_SAVE 0x04
-#define PSB_DC_OUTPUT_RESTORE 0x08
-#define PSB_DC_CRTC_MASK 0x03
-#define PSB_DC_OUTPUT_MASK 0x0C
-
-struct drm_psb_dc_state_arg {
-        u32 flags;
-        u32 obj_id;
-};
-
-struct drm_psb_mode_operation_arg {
-        u32 obj_id;
-        u16 operation;
-        struct drm_mode_modeinfo mode;
-        void *data;
-};
-
-struct drm_psb_stolen_memory_arg {
-        u32 base;
-        u32 size;
-};
-
-/*Display Register Bits*/
-#define REGRWBITS_PFIT_CONTROLS                 (1 << 0)
-#define REGRWBITS_PFIT_AUTOSCALE_RATIOS         (1 << 1)
-#define REGRWBITS_PFIT_PROGRAMMED_SCALE_RATIOS  (1 << 2)
-#define REGRWBITS_PIPEASRC                      (1 << 3)
-#define REGRWBITS_PIPEBSRC                      (1 << 4)
-#define REGRWBITS_VTOTAL_A                      (1 << 5)
-#define REGRWBITS_VTOTAL_B                      (1 << 6)
-#define REGRWBITS_DSPACNTR      (1 << 8)
-#define REGRWBITS_DSPBCNTR      (1 << 9)
-#define REGRWBITS_DSPCCNTR      (1 << 10)
-
-/*Overlay Register Bits*/
-#define OV_REGRWBITS_OVADD                      (1 << 0)
-#define OV_REGRWBITS_OGAM_ALL                   (1 << 1)
-
-#define OVC_REGRWBITS_OVADD                  (1 << 2)
-#define OVC_REGRWBITS_OGAM_ALL                  (1 << 3)
-
-struct drm_psb_register_rw_arg {
-        u32 b_force_hw_on;
-
-        u32 display_read_mask;
-        u32 display_write_mask;
-
-        struct {
-                u32 pfit_controls;
-                u32 pfit_autoscale_ratios;
-                u32 pfit_programmed_scale_ratios;
-                u32 pipeasrc;
-                u32 pipebsrc;
-                u32 vtotal_a;
-                u32 vtotal_b;
-        } display;
-
-        u32 overlay_read_mask;
-        u32 overlay_write_mask;
-
-        struct {
-                u32 OVADD;
-                u32 OGAMC0;
-                u32 OGAMC1;
-                u32 OGAMC2;
-                u32 OGAMC3;
-                u32 OGAMC4;
-                u32 OGAMC5;
-                u32 IEP_ENABLED;
-                u32 IEP_BLE_MINMAX;
-                u32 IEP_BSSCC_CONTROL;
-                u32 b_wait_vblank;
-        } overlay;
-
-        u32 sprite_enable_mask;
-        u32 sprite_disable_mask;
-
-        struct {
-                u32 dspa_control;
-                u32 dspa_key_value;
-                u32 dspa_key_mask;
-                u32 dspc_control;
-                u32 dspc_stride;
-                u32 dspc_position;
-                u32 dspc_linear_offset;
-                u32 dspc_size;
-                u32 dspc_surface;
-        } sprite;
-
-        u32 subpicture_enable_mask;
-        u32 subpicture_disable_mask;
-};
-
-/* Controlling the kernel modesetting buffers */
-
-#define DRM_PSB_SIZES           0x07
-#define DRM_PSB_FUSE_REG        0x08
-#define DRM_PSB_DC_STATE        0x0A
-#define DRM_PSB_ADB             0x0B
-#define DRM_PSB_MODE_OPERATION  0x0C
-#define DRM_PSB_STOLEN_MEMORY   0x0D
-#define DRM_PSB_REGISTER_RW     0x0E
-
-/*
- * NOTE: Add new commands here, but increment
- * the values below and increment their
- * corresponding defines where they're
- * defined elsewhere.
- */
-
-#define DRM_PSB_GEM_CREATE      0x10
-#define DRM_PSB_2D_OP           0x11
-#define DRM_PSB_GEM_MMAP        0x12
-#define DRM_PSB_DPST            0x1B
-#define DRM_PSB_GAMMA           0x1C
-#define DRM_PSB_DPST_BL         0x1D
-#define DRM_PSB_GET_PIPE_FROM_CRTC_ID 0x1F
-
-#define PSB_MODE_OPERATION_MODE_VALID   0x01
-#define PSB_MODE_OPERATION_SET_DC_BASE  0x02
-
-struct drm_psb_get_pipe_from_crtc_id_arg {
-        /** ID of CRTC being requested **/
-        u32 crtc_id;
-
-        /** pipe of requested CRTC **/
-        u32 pipe;
-};
-
-/* FIXME: move this into a medfield header once we are sure it isn't needed for an
-   ioctl  */
-struct psb_drm_dpu_rect {  
-        int x, y;             
-        int width, height;    
-};  
-
-struct drm_psb_gem_create {
-        __u64 size;
-        __u32 handle;
-        __u32 flags;
-#define PSB_GEM_CREATE_STOLEN           1       /* Stolen memory can be used */
-};
-
-#define PSB_2D_OP_BUFLEN                16
-
-struct drm_psb_2d_op {
-        __u32 src;              /* Handles, only src supported right now */
-        __u32 dst;
-        __u32 mask;
-        __u32 pat;
-        __u32 size;             /* In dwords of command */
-        __u32 spare;            /* And bumps array to u64 align */
-        __u32 cmd[PSB_2D_OP_BUFLEN];
-};
-
-struct drm_psb_gem_mmap {
-        __u32 handle;
-        __u32 pad;
-        /**
-         * Fake offset to use for subsequent mmap call
-         *
-         * This is a fixed-size type for 32/64 compatibility.
-         */
-        __u64 offset;
-};
-
-#endif
diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c
deleted file mode 100644
index 95816808f867..000000000000
--- a/drivers/staging/gma500/psb_drv.c
+++ /dev/null
@@ -1,1230 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2007-2011, Intel Corporation.
- * All Rights Reserved.
- * Copyright (c) 2008, Tungsten Graphics, Inc. Cedar Park, TX., USA.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-#include <drm/drmP.h>
-#include <drm/drm.h>
-#include "psb_drm.h"
-#include "psb_drv.h"
-#include "framebuffer.h"
-#include "psb_reg.h"
-#include "psb_intel_reg.h"
-#include "intel_bios.h"
-#include "mid_bios.h"
-#include "mdfld_dsi_dbi.h"
-#include <drm/drm_pciids.h>
-#include "power.h"
-#include <linux/cpu.h>
-#include <linux/notifier.h>
-#include <linux/spinlock.h>
-#include <linux/pm_runtime.h>
-#include <linux/module.h>
-#include <acpi/video.h>
-
-static int drm_psb_trap_pagefaults;
-
-int drm_psb_no_fb;
-
-static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
-
-MODULE_PARM_DESC(no_fb, "Disable FBdev");
-MODULE_PARM_DESC(trap_pagefaults, "Error and reset on MMU pagefaults");
-module_param_named(no_fb, drm_psb_no_fb, int, 0600);
-module_param_named(trap_pagefaults, drm_psb_trap_pagefaults, int, 0600);
-
-
-static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {
-        { 0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
-        { 0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },
-#if defined(CONFIG_DRM_PSB_MRST)
-        { 0x8086, 0x4100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
-        { 0x8086, 0x4101, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
-        { 0x8086, 0x4102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
-        { 0x8086, 0x4103, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
-        { 0x8086, 0x4104, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
-        { 0x8086, 0x4105, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
-        { 0x8086, 0x4106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
-        { 0x8086, 0x4107, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mrst_chip_ops},
-#endif
-#if defined(CONFIG_DRM_PSB_MFLD)
-        { 0x8086, 0x0130, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
-        { 0x8086, 0x0131, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
-        { 0x8086, 0x0132, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
-        { 0x8086, 0x0133, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
-        { 0x8086, 0x0134, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
-        { 0x8086, 0x0135, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
-        { 0x8086, 0x0136, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
-        { 0x8086, 0x0137, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &mdfld_chip_ops},
-#endif
-#if defined(CONFIG_DRM_PSB_CDV)
-        { 0x8086, 0x0be0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
-        { 0x8086, 0x0be1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
-        { 0x8086, 0x0be2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
-        { 0x8086, 0x0be3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
-        { 0x8086, 0x0be4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
-        { 0x8086, 0x0be5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
-        { 0x8086, 0x0be6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
-        { 0x8086, 0x0be7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &cdv_chip_ops},
-#endif
-        { 0, 0, 0}
-};
-MODULE_DEVICE_TABLE(pci, pciidlist);
-
-/*
- * Standard IOCTLs.
- */
-
-#define DRM_IOCTL_PSB_SIZES     \
-                DRM_IOR(DRM_PSB_SIZES + DRM_COMMAND_BASE, \
-                        struct drm_psb_sizes_arg)
-#define DRM_IOCTL_PSB_FUSE_REG  \
-                DRM_IOWR(DRM_PSB_FUSE_REG + DRM_COMMAND_BASE, uint32_t)
-#define DRM_IOCTL_PSB_DC_STATE  \
-                DRM_IOW(DRM_PSB_DC_STATE + DRM_COMMAND_BASE, \
-                        struct drm_psb_dc_state_arg)
-#define DRM_IOCTL_PSB_ADB       \
-                DRM_IOWR(DRM_PSB_ADB + DRM_COMMAND_BASE, uint32_t)
-#define DRM_IOCTL_PSB_MODE_OPERATION    \
-                DRM_IOWR(DRM_PSB_MODE_OPERATION + DRM_COMMAND_BASE, \
-                         struct drm_psb_mode_operation_arg)
-#define DRM_IOCTL_PSB_STOLEN_MEMORY     \
-                DRM_IOWR(DRM_PSB_STOLEN_MEMORY + DRM_COMMAND_BASE, \
-                         struct drm_psb_stolen_memory_arg)
-#define DRM_IOCTL_PSB_REGISTER_RW       \
-                DRM_IOWR(DRM_PSB_REGISTER_RW + DRM_COMMAND_BASE, \
-                         struct drm_psb_register_rw_arg)
-#define DRM_IOCTL_PSB_DPST      \
-                DRM_IOWR(DRM_PSB_DPST + DRM_COMMAND_BASE, \
-                         uint32_t)
-#define DRM_IOCTL_PSB_GAMMA     \
-                DRM_IOWR(DRM_PSB_GAMMA + DRM_COMMAND_BASE, \
-                         struct drm_psb_dpst_lut_arg)
-#define DRM_IOCTL_PSB_DPST_BL   \
-                DRM_IOWR(DRM_PSB_DPST_BL + DRM_COMMAND_BASE, \
-                         uint32_t)
-#define DRM_IOCTL_PSB_GET_PIPE_FROM_CRTC_ID     \
-                DRM_IOWR(DRM_PSB_GET_PIPE_FROM_CRTC_ID + DRM_COMMAND_BASE, \
-                         struct drm_psb_get_pipe_from_crtc_id_arg)
-#define DRM_IOCTL_PSB_GEM_CREATE        \
-                DRM_IOWR(DRM_PSB_GEM_CREATE + DRM_COMMAND_BASE, \
-                         struct drm_psb_gem_create)
-#define DRM_IOCTL_PSB_2D_OP     \
-                DRM_IOW(DRM_PSB_2D_OP + DRM_COMMAND_BASE, \
-                         struct drm_psb_2d_op)
-#define DRM_IOCTL_PSB_GEM_MMAP  \
-                DRM_IOWR(DRM_PSB_GEM_MMAP + DRM_COMMAND_BASE, \
-                         struct drm_psb_gem_mmap)
-
-static int psb_sizes_ioctl(struct drm_device *dev, void *data,
-                           struct drm_file *file_priv);
-static int psb_dc_state_ioctl(struct drm_device *dev, void * data,
-                              struct drm_file *file_priv);
-static int psb_adb_ioctl(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv);
-static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,
-                                    struct drm_file *file_priv);
-static int psb_stolen_memory_ioctl(struct drm_device *dev, void *data,
-                                   struct drm_file *file_priv);
-static int psb_register_rw_ioctl(struct drm_device *dev, void *data,
-                                 struct drm_file *file_priv);
-static int psb_dpst_ioctl(struct drm_device *dev, void *data,
-                          struct drm_file *file_priv);
-static int psb_gamma_ioctl(struct drm_device *dev, void *data,
-                           struct drm_file *file_priv);
-static int psb_dpst_bl_ioctl(struct drm_device *dev, void *data,
-                             struct drm_file *file_priv);
-
-#define PSB_IOCTL_DEF(ioctl, func, flags) \
-        [DRM_IOCTL_NR(ioctl) - DRM_COMMAND_BASE] = {ioctl, flags, func}
-
-static struct drm_ioctl_desc psb_ioctls[] = {
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_SIZES, psb_sizes_ioctl, DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_DC_STATE, psb_dc_state_ioctl, DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_ADB, psb_adb_ioctl, DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_MODE_OPERATION, psb_mode_operation_ioctl,
-                      DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_STOLEN_MEMORY, psb_stolen_memory_ioctl,
-                      DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_REGISTER_RW, psb_register_rw_ioctl,
-                      DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_DPST, psb_dpst_ioctl, DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_GAMMA, psb_gamma_ioctl, DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_DPST_BL, psb_dpst_bl_ioctl, DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_GET_PIPE_FROM_CRTC_ID,
-                                        psb_intel_get_pipe_from_crtc_id, 0),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_GEM_CREATE, psb_gem_create_ioctl,
-                                                DRM_UNLOCKED | DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_2D_OP, psb_accel_ioctl,
-                                                DRM_UNLOCKED| DRM_AUTH),
-        PSB_IOCTL_DEF(DRM_IOCTL_PSB_GEM_MMAP, psb_gem_mmap_ioctl,
-                                                DRM_UNLOCKED | DRM_AUTH),
-};
-
-static void psb_lastclose(struct drm_device *dev)
-{
-        return;
-}
-
-static void psb_do_takedown(struct drm_device *dev)
-{
-}
-
-static int psb_do_init(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_gtt *pg = &dev_priv->gtt;
-
-        uint32_t stolen_gtt;
-
-        int ret = -ENOMEM;
-
-        if (pg->mmu_gatt_start & 0x0FFFFFFF) {
-                dev_err(dev->dev, "Gatt must be 256M aligned. This is a bug.\n");
-                ret = -EINVAL;
-                goto out_err;
-        }
-
-
-        stolen_gtt = (pg->stolen_size >> PAGE_SHIFT) * 4;
-        stolen_gtt = (stolen_gtt + PAGE_SIZE - 1) >> PAGE_SHIFT;
-        stolen_gtt =
-            (stolen_gtt < pg->gtt_pages) ? stolen_gtt : pg->gtt_pages;
-
-        dev_priv->gatt_free_offset = pg->mmu_gatt_start +
-            (stolen_gtt << PAGE_SHIFT) * 1024;
-
-        if (1 || drm_debug) {
-                uint32_t core_id = PSB_RSGX32(PSB_CR_CORE_ID);
-                uint32_t core_rev = PSB_RSGX32(PSB_CR_CORE_REVISION);
-                DRM_INFO("SGX core id = 0x%08x\n", core_id);
-                DRM_INFO("SGX core rev major = 0x%02x, minor = 0x%02x\n",
-                         (core_rev & _PSB_CC_REVISION_MAJOR_MASK) >>
-                         _PSB_CC_REVISION_MAJOR_SHIFT,
-                         (core_rev & _PSB_CC_REVISION_MINOR_MASK) >>
-                         _PSB_CC_REVISION_MINOR_SHIFT);
-                DRM_INFO
-                    ("SGX core rev maintenance = 0x%02x, designer = 0x%02x\n",
-                     (core_rev & _PSB_CC_REVISION_MAINTENANCE_MASK) >>
-                     _PSB_CC_REVISION_MAINTENANCE_SHIFT,
-                     (core_rev & _PSB_CC_REVISION_DESIGNER_MASK) >>
-                     _PSB_CC_REVISION_DESIGNER_SHIFT);
-        }
-
-
-        spin_lock_init(&dev_priv->irqmask_lock);
-        spin_lock_init(&dev_priv->lock_2d);
-
-        PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK0);
-        PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK1);
-        PSB_RSGX32(PSB_CR_BIF_BANK1);
-        PSB_WSGX32(PSB_RSGX32(PSB_CR_BIF_CTRL) | _PSB_MMU_ER_MASK,
-                                                        PSB_CR_BIF_CTRL);
-        psb_spank(dev_priv);
-
-        /* mmu_gatt ?? */
-        PSB_WSGX32(pg->gatt_start, PSB_CR_BIF_TWOD_REQ_BASE);
-        return 0;
-out_err:
-        psb_do_takedown(dev);
-        return ret;
-}
-
-static int psb_driver_unload(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        /* Kill vblank etc here */
-
-        gma_backlight_exit(dev);
-
-        if (drm_psb_no_fb == 0)
-                psb_modeset_cleanup(dev);
-
-        if (dev_priv) {
-                psb_lid_timer_takedown(dev_priv);
-                gma_intel_opregion_exit(dev);
-
-                if (dev_priv->ops->chip_teardown)
-                        dev_priv->ops->chip_teardown(dev);
-                psb_do_takedown(dev);
-
-
-                if (dev_priv->pf_pd) {
-                        psb_mmu_free_pagedir(dev_priv->pf_pd);
-                        dev_priv->pf_pd = NULL;
-                }
-                if (dev_priv->mmu) {
-                        struct psb_gtt *pg = &dev_priv->gtt;
-
-                        down_read(&pg->sem);
-                        psb_mmu_remove_pfn_sequence(
-                                psb_mmu_get_default_pd
-                                (dev_priv->mmu),
-                                pg->mmu_gatt_start,
-                                dev_priv->vram_stolen_size >> PAGE_SHIFT);
-                        up_read(&pg->sem);
-                        psb_mmu_driver_takedown(dev_priv->mmu);
-                        dev_priv->mmu = NULL;
-                }
-                psb_gtt_takedown(dev);
-                if (dev_priv->scratch_page) {
-                        __free_page(dev_priv->scratch_page);
-                        dev_priv->scratch_page = NULL;
-                }
-                if (dev_priv->vdc_reg) {
-                        iounmap(dev_priv->vdc_reg);
-                        dev_priv->vdc_reg = NULL;
-                }
-                if (dev_priv->sgx_reg) {
-                        iounmap(dev_priv->sgx_reg);
-                        dev_priv->sgx_reg = NULL;
-                }
-
-                kfree(dev_priv);
-                dev->dev_private = NULL;
-
-                /*destroy VBT data*/
-                psb_intel_destroy_bios(dev);
-        }
-
-        gma_power_uninit(dev);
-
-        return 0;
-}
-
-
-static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
-{
-        struct drm_psb_private *dev_priv;
-        unsigned long resource_start;
-        struct psb_gtt *pg;
-        unsigned long irqflags;
-        int ret = -ENOMEM;
-        uint32_t tt_pages;
-        struct drm_connector *connector;
-        struct psb_intel_output *psb_intel_output;
-
-        dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
-        if (dev_priv == NULL)
-                return -ENOMEM;
-
-        dev_priv->ops = (struct psb_ops *)chipset;
-        dev_priv->dev = dev;
-        dev->dev_private = (void *) dev_priv;
-
-        if (!IS_PSB(dev)) {
-                if (pci_enable_msi(dev->pdev))
-                        dev_warn(dev->dev, "Enabling MSI failed!\n");
-        }
-
-        dev_priv->num_pipe = dev_priv->ops->pipes;
-
-        resource_start = pci_resource_start(dev->pdev, PSB_MMIO_RESOURCE);
-
-        dev_priv->vdc_reg =
-            ioremap(resource_start + PSB_VDC_OFFSET, PSB_VDC_SIZE);
-        if (!dev_priv->vdc_reg)
-                goto out_err;
-
-        dev_priv->sgx_reg = ioremap(resource_start + dev_priv->ops->sgx_offset,
-                                                        PSB_SGX_SIZE);
-        if (!dev_priv->sgx_reg)
-                goto out_err;
-
-        ret = dev_priv->ops->chip_setup(dev);
-        if (ret)
-                goto out_err;
-
-        /* Init OSPM support */
-        gma_power_init(dev);
-
-        ret = -ENOMEM;
-
-        dev_priv->scratch_page = alloc_page(GFP_DMA32 | __GFP_ZERO);
-        if (!dev_priv->scratch_page)
-                goto out_err;
-
-        set_pages_uc(dev_priv->scratch_page, 1);
-
-        ret = psb_gtt_init(dev, 0);
-        if (ret)
-                goto out_err;
-
-        dev_priv->mmu = psb_mmu_driver_init((void *)0,
-                                        drm_psb_trap_pagefaults, 0,
-                                        dev_priv);
-        if (!dev_priv->mmu)
-                goto out_err;
-
-        pg = &dev_priv->gtt;
-
-        tt_pages = (pg->gatt_pages < PSB_TT_PRIV0_PLIMIT) ?
-                (pg->gatt_pages) : PSB_TT_PRIV0_PLIMIT;
-
-
-        dev_priv->pf_pd = psb_mmu_alloc_pd(dev_priv->mmu, 1, 0);
-        if (!dev_priv->pf_pd)
-                goto out_err;
-
-        psb_mmu_set_pd_context(psb_mmu_get_default_pd(dev_priv->mmu), 0);
-        psb_mmu_set_pd_context(dev_priv->pf_pd, 1);
-
-        ret = psb_do_init(dev);
-        if (ret)
-                return ret;
-
-        PSB_WSGX32(0x20000000, PSB_CR_PDS_EXEC_BASE);
-        PSB_WSGX32(0x30000000, PSB_CR_BIF_3D_REQ_BASE);
-
-/*      igd_opregion_init(&dev_priv->opregion_dev); */
-        acpi_video_register();
-        if (dev_priv->lid_state)
-                psb_lid_timer_init(dev_priv);
-
-        ret = drm_vblank_init(dev, dev_priv->num_pipe);
-        if (ret)
-                goto out_err;
-
-        /*
-         * Install interrupt handlers prior to powering off SGX or else we will
-         * crash.
-         */
-        dev_priv->vdc_irq_mask = 0;
-        dev_priv->pipestat[0] = 0;
-        dev_priv->pipestat[1] = 0;
-        dev_priv->pipestat[2] = 0;
-        spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
-        PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);
-        PSB_WVDC32(0x00000000, PSB_INT_ENABLE_R);
-        PSB_WVDC32(0xFFFFFFFF, PSB_INT_MASK_R);
-        spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);
-        if (IS_PSB(dev) && drm_core_check_feature(dev, DRIVER_MODESET))
-                drm_irq_install(dev);
-
-        dev->vblank_disable_allowed = 1;
-
-        dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
-
-        dev->driver->get_vblank_counter = psb_get_vblank_counter;
-
-#if defined(CONFIG_DRM_PSB_MFLD)
-        /* FIXME: this is not the right place for this stuff ! */
-        mdfld_output_setup(dev);
-#endif
-        if (drm_psb_no_fb == 0) {
-                psb_modeset_init(dev);
-                psb_fbdev_init(dev);
-                drm_kms_helper_poll_init(dev);
-        }
-
-        /* Only add backlight support if we have LVDS output */
-        list_for_each_entry(connector, &dev->mode_config.connector_list,
-                            head) {
-                psb_intel_output = to_psb_intel_output(connector);
-
-                switch (psb_intel_output->type) {
-                case INTEL_OUTPUT_LVDS:
-                case INTEL_OUTPUT_MIPI:
-                        ret = gma_backlight_init(dev);
-                        break;
-                }
-        }
-
-        if (ret)
-                return ret;
-
-        /* Enable runtime pm at last */
-        pm_runtime_set_active(&dev->pdev->dev);
-        return 0;
-out_err:
-        psb_driver_unload(dev);
-        return ret;
-}
-
-int psb_driver_device_is_agp(struct drm_device *dev)
-{
-        return 0;
-}
-
-
-static int psb_sizes_ioctl(struct drm_device *dev, void *data,
-                           struct drm_file *file_priv)
-{
-        struct drm_psb_private *dev_priv = psb_priv(dev);
-        struct drm_psb_sizes_arg *arg = data;
-
-        *arg = dev_priv->sizes;
-        return 0;
-}
-
-static int psb_dc_state_ioctl(struct drm_device *dev, void *data,
-                                struct drm_file *file_priv)
-{
-        uint32_t flags;
-        uint32_t obj_id;
-        struct drm_mode_object *obj;
-        struct drm_connector *connector;
-        struct drm_crtc *crtc;
-        struct drm_psb_dc_state_arg *arg = data;
-
-
-        /* Double check MRST case */
-        if (IS_MRST(dev) || IS_MFLD(dev))
-                return -EOPNOTSUPP;
-
-        flags = arg->flags;
-        obj_id = arg->obj_id;
-
-        if (flags & PSB_DC_CRTC_MASK) {
-                obj = drm_mode_object_find(dev, obj_id,
-                                DRM_MODE_OBJECT_CRTC);
-                if (!obj) {
-                        dev_dbg(dev->dev, "Invalid CRTC object.\n");
-                        return -EINVAL;
-                }
-
-                crtc = obj_to_crtc(obj);
-
-                mutex_lock(&dev->mode_config.mutex);
-                if (drm_helper_crtc_in_use(crtc)) {
-                        if (flags & PSB_DC_CRTC_SAVE)
-                                crtc->funcs->save(crtc);
-                        else
-                                crtc->funcs->restore(crtc);
-                }
-                mutex_unlock(&dev->mode_config.mutex);
-
-                return 0;
-        } else if (flags & PSB_DC_OUTPUT_MASK) {
-                obj = drm_mode_object_find(dev, obj_id,
-                                DRM_MODE_OBJECT_CONNECTOR);
-                if (!obj) {
-                        dev_dbg(dev->dev, "Invalid connector id.\n");
-                        return -EINVAL;
-                }
-
-                connector = obj_to_connector(obj);
-                if (flags & PSB_DC_OUTPUT_SAVE)
-                        connector->funcs->save(connector);
-                else
-                        connector->funcs->restore(connector);
-
-                return 0;
-        }
-        return -EINVAL;
-}
-
-static inline void get_brightness(struct backlight_device *bd)
-{
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-        if (bd) {
-                bd->props.brightness = bd->ops->get_brightness(bd);
-                backlight_update_status(bd);
-        }
-#endif
-}
-
-static int psb_dpst_bl_ioctl(struct drm_device *dev, void *data,
-                       struct drm_file *file_priv)
-{
-        struct drm_psb_private *dev_priv = psb_priv(dev);
-        uint32_t *arg = data;
-
-        dev_priv->blc_adj2 = *arg;
-        get_brightness(dev_priv->backlight_device);
-        return 0;
-}
-
-static int psb_adb_ioctl(struct drm_device *dev, void *data,
-                        struct drm_file *file_priv)
-{
-        struct drm_psb_private *dev_priv = psb_priv(dev);
-        uint32_t *arg = data;
-
-        dev_priv->blc_adj1 = *arg;
-        get_brightness(dev_priv->backlight_device);
-        return 0;
-}
-
-/* return the current mode to the dpst module */
-static int psb_dpst_ioctl(struct drm_device *dev, void *data,
-                          struct drm_file *file_priv)
-{
-        struct drm_psb_private *dev_priv = psb_priv(dev);
-        uint32_t *arg = data;
-        uint32_t x;
-        uint32_t y;
-        uint32_t reg;
-
-        if (!gma_power_begin(dev, 0))
-                return -EIO;
-
-        reg = PSB_RVDC32(PIPEASRC);
-
-        gma_power_end(dev);
-
-        /* horizontal is the left 16 bits */
-        x = reg >> 16;
-        /* vertical is the right 16 bits */
-        y = reg & 0x0000ffff;
-
-        /* the values are the image size minus one */
-        x++;
-        y++;
-
-        *arg = (x << 16) | y;
-
-        return 0;
-}
-static int psb_gamma_ioctl(struct drm_device *dev, void *data,
-                           struct drm_file *file_priv)
-{
-        struct drm_psb_dpst_lut_arg *lut_arg = data;
-        struct drm_mode_object *obj;
-        struct drm_crtc *crtc;
-        struct drm_connector *connector;
-        struct psb_intel_crtc *psb_intel_crtc;
-        int i = 0;
-        int32_t obj_id;
-
-        obj_id = lut_arg->output_id;
-        obj = drm_mode_object_find(dev, obj_id, DRM_MODE_OBJECT_CONNECTOR);
-        if (!obj) {
-                dev_dbg(dev->dev, "Invalid Connector object.\n");
-                return -EINVAL;
-        }
-
-        connector = obj_to_connector(obj);
-        crtc = connector->encoder->crtc;
-        psb_intel_crtc = to_psb_intel_crtc(crtc);
-
-        for (i = 0; i < 256; i++)
-                psb_intel_crtc->lut_adj[i] = lut_arg->lut[i];
-
-        psb_intel_crtc_load_lut(crtc);
-
-        return 0;
-}
-
-static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,
-                                struct drm_file *file_priv)
-{
-        uint32_t obj_id;
-        uint16_t op;
-        struct drm_mode_modeinfo *umode;
-        struct drm_display_mode *mode = NULL;
-        struct drm_psb_mode_operation_arg *arg;
-        struct drm_mode_object *obj;
-        struct drm_connector *connector;
-        struct drm_framebuffer *drm_fb;
-        struct psb_framebuffer *psb_fb;
-        struct drm_connector_helper_funcs *connector_funcs;
-        int ret = 0;
-        int resp = MODE_OK;
-        struct drm_psb_private *dev_priv = psb_priv(dev);
-
-        arg = (struct drm_psb_mode_operation_arg *)data;
-        obj_id = arg->obj_id;
-        op = arg->operation;
-
-        switch (op) {
-        case PSB_MODE_OPERATION_SET_DC_BASE:
-                obj = drm_mode_object_find(dev, obj_id, DRM_MODE_OBJECT_FB);
-                if (!obj) {
-                        dev_dbg(dev->dev, "Invalid FB id %d\n", obj_id);
-                        return -EINVAL;
-                }
-
-                drm_fb = obj_to_fb(obj);
-                psb_fb = to_psb_fb(drm_fb);
-
-                if (gma_power_begin(dev, 0)) {
-                        REG_WRITE(DSPASURF, psb_fb->gtt->offset);
-                        REG_READ(DSPASURF);
-                        gma_power_end(dev);
-                } else {
-                        dev_priv->saveDSPASURF = psb_fb->gtt->offset;
-                }
-
-                return 0;
-        case PSB_MODE_OPERATION_MODE_VALID:
-                umode = &arg->mode;
-
-                mutex_lock(&dev->mode_config.mutex);
-
-                obj = drm_mode_object_find(dev, obj_id,
-                                        DRM_MODE_OBJECT_CONNECTOR);
-                if (!obj) {
-                        ret = -EINVAL;
-                        goto mode_op_out;
-                }
-
-                connector = obj_to_connector(obj);
-
-                mode = drm_mode_create(dev);
-                if (!mode) {
-                        ret = -ENOMEM;
-                        goto mode_op_out;
-                }
-
-                /* drm_crtc_convert_umode(mode, umode); */
-                {
-                        mode->clock = umode->clock;
-                        mode->hdisplay = umode->hdisplay;
-                        mode->hsync_start = umode->hsync_start;
-                        mode->hsync_end = umode->hsync_end;
-                        mode->htotal = umode->htotal;
-                        mode->hskew = umode->hskew;
-                        mode->vdisplay = umode->vdisplay;
-                        mode->vsync_start = umode->vsync_start;
-                        mode->vsync_end = umode->vsync_end;
-                        mode->vtotal = umode->vtotal;
-                        mode->vscan = umode->vscan;
-                        mode->vrefresh = umode->vrefresh;
-                        mode->flags = umode->flags;
-                        mode->type = umode->type;
-                        strncpy(mode->name, umode->name, DRM_DISPLAY_MODE_LEN);
-                        mode->name[DRM_DISPLAY_MODE_LEN-1] = 0;
-                }
-
-                connector_funcs = (struct drm_connector_helper_funcs *)
-                                   connector->helper_private;
-
-                if (connector_funcs->mode_valid) {
-                        resp = connector_funcs->mode_valid(connector, mode);
-                        arg->data = (void *)resp;
-                }
-
-                /*do some clean up work*/
-                if (mode)
-                        drm_mode_destroy(dev, mode);
-mode_op_out:
-                mutex_unlock(&dev->mode_config.mutex);
-                return ret;
-
-        default:
-                dev_dbg(dev->dev, "Unsupported psb mode operation\n");
-                return -EOPNOTSUPP;
-        }
-
-        return 0;
-}
-
-static int psb_stolen_memory_ioctl(struct drm_device *dev, void *data,
-                                   struct drm_file *file_priv)
-{
-        struct drm_psb_private *dev_priv = psb_priv(dev);
-        struct drm_psb_stolen_memory_arg *arg = data;
-
-        arg->base = dev_priv->stolen_base;
-        arg->size = dev_priv->vram_stolen_size;
-
-        return 0;
-}
-
-/* FIXME: needs Medfield changes */
-static int psb_register_rw_ioctl(struct drm_device *dev, void *data,
-                                 struct drm_file *file_priv)
-{
-        struct drm_psb_private *dev_priv = psb_priv(dev);
-        struct drm_psb_register_rw_arg *arg = data;
-        bool usage = arg->b_force_hw_on ? true : false;
-
-        if (arg->display_write_mask != 0) {
-                if (gma_power_begin(dev, usage)) {
-                        if (arg->display_write_mask & REGRWBITS_PFIT_CONTROLS)
-                                PSB_WVDC32(arg->display.pfit_controls,
-                                           PFIT_CONTROL);
-                        if (arg->display_write_mask &
-                            REGRWBITS_PFIT_AUTOSCALE_RATIOS)
-                                PSB_WVDC32(arg->display.pfit_autoscale_ratios,
-                                           PFIT_AUTO_RATIOS);
-                        if (arg->display_write_mask &
-                            REGRWBITS_PFIT_PROGRAMMED_SCALE_RATIOS)
-                                PSB_WVDC32(
-                                   arg->display.pfit_programmed_scale_ratios,
-                                   PFIT_PGM_RATIOS);
-                        if (arg->display_write_mask & REGRWBITS_PIPEASRC)
-                                PSB_WVDC32(arg->display.pipeasrc,
-                                           PIPEASRC);
-                        if (arg->display_write_mask & REGRWBITS_PIPEBSRC)
-                                PSB_WVDC32(arg->display.pipebsrc,
-                                           PIPEBSRC);
-                        if (arg->display_write_mask & REGRWBITS_VTOTAL_A)
-                                PSB_WVDC32(arg->display.vtotal_a,
-                                           VTOTAL_A);
-                        if (arg->display_write_mask & REGRWBITS_VTOTAL_B)
-                                PSB_WVDC32(arg->display.vtotal_b,
-                                           VTOTAL_B);
-                        gma_power_end(dev);
-                } else {
-                        if (arg->display_write_mask & REGRWBITS_PFIT_CONTROLS)
-                                dev_priv->savePFIT_CONTROL =
-                                                arg->display.pfit_controls;
-                        if (arg->display_write_mask &
-                            REGRWBITS_PFIT_AUTOSCALE_RATIOS)
-                                dev_priv->savePFIT_AUTO_RATIOS =
-                                        arg->display.pfit_autoscale_ratios;
-                        if (arg->display_write_mask &
-                            REGRWBITS_PFIT_PROGRAMMED_SCALE_RATIOS)
-                                dev_priv->savePFIT_PGM_RATIOS =
-                                   arg->display.pfit_programmed_scale_ratios;
-                        if (arg->display_write_mask & REGRWBITS_PIPEASRC)
-                                dev_priv->savePIPEASRC = arg->display.pipeasrc;
-                        if (arg->display_write_mask & REGRWBITS_PIPEBSRC)
-                                dev_priv->savePIPEBSRC = arg->display.pipebsrc;
-                        if (arg->display_write_mask & REGRWBITS_VTOTAL_A)
-                                dev_priv->saveVTOTAL_A = arg->display.vtotal_a;
-                        if (arg->display_write_mask & REGRWBITS_VTOTAL_B)
-                                dev_priv->saveVTOTAL_B = arg->display.vtotal_b;
-                }
-        }
-
-        if (arg->display_read_mask != 0) {
-                if (gma_power_begin(dev, usage)) {
-                        if (arg->display_read_mask &
-                            REGRWBITS_PFIT_CONTROLS)
-                                arg->display.pfit_controls =
-                                                PSB_RVDC32(PFIT_CONTROL);
-                        if (arg->display_read_mask &
-                            REGRWBITS_PFIT_AUTOSCALE_RATIOS)
-                                arg->display.pfit_autoscale_ratios =
-                                                PSB_RVDC32(PFIT_AUTO_RATIOS);
-                        if (arg->display_read_mask &
-                            REGRWBITS_PFIT_PROGRAMMED_SCALE_RATIOS)
-                                arg->display.pfit_programmed_scale_ratios =
-                                                PSB_RVDC32(PFIT_PGM_RATIOS);
-                        if (arg->display_read_mask & REGRWBITS_PIPEASRC)
-                                arg->display.pipeasrc = PSB_RVDC32(PIPEASRC);
-                        if (arg->display_read_mask & REGRWBITS_PIPEBSRC)
-                                arg->display.pipebsrc = PSB_RVDC32(PIPEBSRC);
-                        if (arg->display_read_mask & REGRWBITS_VTOTAL_A)
-                                arg->display.vtotal_a = PSB_RVDC32(VTOTAL_A);
-                        if (arg->display_read_mask & REGRWBITS_VTOTAL_B)
-                                arg->display.vtotal_b = PSB_RVDC32(VTOTAL_B);
-                        gma_power_end(dev);
-                } else {
-                        if (arg->display_read_mask &
-                            REGRWBITS_PFIT_CONTROLS)
-                                arg->display.pfit_controls =
-                                                dev_priv->savePFIT_CONTROL;
-                        if (arg->display_read_mask &
-                            REGRWBITS_PFIT_AUTOSCALE_RATIOS)
-                                arg->display.pfit_autoscale_ratios =
-                                                dev_priv->savePFIT_AUTO_RATIOS;
-                        if (arg->display_read_mask &
-                            REGRWBITS_PFIT_PROGRAMMED_SCALE_RATIOS)
-                                arg->display.pfit_programmed_scale_ratios =
-                                                dev_priv->savePFIT_PGM_RATIOS;
-                        if (arg->display_read_mask & REGRWBITS_PIPEASRC)
-                                arg->display.pipeasrc = dev_priv->savePIPEASRC;
-                        if (arg->display_read_mask & REGRWBITS_PIPEBSRC)
-                                arg->display.pipebsrc = dev_priv->savePIPEBSRC;
-                        if (arg->display_read_mask & REGRWBITS_VTOTAL_A)
-                                arg->display.vtotal_a = dev_priv->saveVTOTAL_A;
-                        if (arg->display_read_mask & REGRWBITS_VTOTAL_B)
-                                arg->display.vtotal_b = dev_priv->saveVTOTAL_B;
-                }
-        }
-
-        if (arg->overlay_write_mask != 0) {
-                if (gma_power_begin(dev, usage)) {
-                        if (arg->overlay_write_mask & OV_REGRWBITS_OGAM_ALL) {
-                                PSB_WVDC32(arg->overlay.OGAMC5, OV_OGAMC5);
-                                PSB_WVDC32(arg->overlay.OGAMC4, OV_OGAMC4);
-                                PSB_WVDC32(arg->overlay.OGAMC3, OV_OGAMC3);
-                                PSB_WVDC32(arg->overlay.OGAMC2, OV_OGAMC2);
-                                PSB_WVDC32(arg->overlay.OGAMC1, OV_OGAMC1);
-                                PSB_WVDC32(arg->overlay.OGAMC0, OV_OGAMC0);
-                        }
-                        if (arg->overlay_write_mask & OVC_REGRWBITS_OGAM_ALL) {
-                                PSB_WVDC32(arg->overlay.OGAMC5, OVC_OGAMC5);
-                                PSB_WVDC32(arg->overlay.OGAMC4, OVC_OGAMC4);
-                                PSB_WVDC32(arg->overlay.OGAMC3, OVC_OGAMC3);
-                                PSB_WVDC32(arg->overlay.OGAMC2, OVC_OGAMC2);
-                                PSB_WVDC32(arg->overlay.OGAMC1, OVC_OGAMC1);
-                                PSB_WVDC32(arg->overlay.OGAMC0, OVC_OGAMC0);
-                        }
-
-                        if (arg->overlay_write_mask & OV_REGRWBITS_OVADD) {
-                                PSB_WVDC32(arg->overlay.OVADD, OV_OVADD);
-
-                                if (arg->overlay.b_wait_vblank) {
-                                        /* Wait for 20ms.*/
-                                        unsigned long vblank_timeout = jiffies
-                                                                + HZ/50;
-                                        uint32_t temp;
-                                        while (time_before_eq(jiffies,
-                                                        vblank_timeout)) {
-                                                temp = PSB_RVDC32(OV_DOVASTA);
-                                                if ((temp & (0x1 << 31)) != 0)
-                                                        break;
-                                                cpu_relax();
-                                        }
-                                }
-                        }
-                        if (arg->overlay_write_mask & OVC_REGRWBITS_OVADD) {
-                                PSB_WVDC32(arg->overlay.OVADD, OVC_OVADD);
-                                if (arg->overlay.b_wait_vblank) {
-                                        /* Wait for 20ms.*/
-                                        unsigned long vblank_timeout =
-                                                        jiffies + HZ/50;
-                                        uint32_t temp;
-                                        while (time_before_eq(jiffies,
-                                                        vblank_timeout)) {
-                                                temp = PSB_RVDC32(OVC_DOVCSTA);
-                                                if ((temp & (0x1 << 31)) != 0)
-                                                        break;
-                                                cpu_relax();
-                                        }
-                                }
-                        }
-                        gma_power_end(dev);
-                } else {
-                        if (arg->overlay_write_mask & OV_REGRWBITS_OGAM_ALL) {
-                                dev_priv->saveOV_OGAMC5 = arg->overlay.OGAMC5;
-                                dev_priv->saveOV_OGAMC4 = arg->overlay.OGAMC4;
-                                dev_priv->saveOV_OGAMC3 = arg->overlay.OGAMC3;
-                                dev_priv->saveOV_OGAMC2 = arg->overlay.OGAMC2;
-                                dev_priv->saveOV_OGAMC1 = arg->overlay.OGAMC1;
-                                dev_priv->saveOV_OGAMC0 = arg->overlay.OGAMC0;
-                        }
-                        if (arg->overlay_write_mask & OVC_REGRWBITS_OGAM_ALL) {
-                                dev_priv->saveOVC_OGAMC5 = arg->overlay.OGAMC5;
-                                dev_priv->saveOVC_OGAMC4 = arg->overlay.OGAMC4;
-                                dev_priv->saveOVC_OGAMC3 = arg->overlay.OGAMC3;
-                                dev_priv->saveOVC_OGAMC2 = arg->overlay.OGAMC2;
-                                dev_priv->saveOVC_OGAMC1 = arg->overlay.OGAMC1;
-                                dev_priv->saveOVC_OGAMC0 = arg->overlay.OGAMC0;
-                        }
-                        if (arg->overlay_write_mask & OV_REGRWBITS_OVADD)
-                                dev_priv->saveOV_OVADD = arg->overlay.OVADD;
-                        if (arg->overlay_write_mask & OVC_REGRWBITS_OVADD)
-                                dev_priv->saveOVC_OVADD = arg->overlay.OVADD;
-                }
-        }
-
-        if (arg->overlay_read_mask != 0) {
-                if (gma_power_begin(dev, usage)) {
-                        if (arg->overlay_read_mask & OV_REGRWBITS_OGAM_ALL) {
-                                arg->overlay.OGAMC5 = PSB_RVDC32(OV_OGAMC5);
-                                arg->overlay.OGAMC4 = PSB_RVDC32(OV_OGAMC4);
-                                arg->overlay.OGAMC3 = PSB_RVDC32(OV_OGAMC3);
-                                arg->overlay.OGAMC2 = PSB_RVDC32(OV_OGAMC2);
-                                arg->overlay.OGAMC1 = PSB_RVDC32(OV_OGAMC1);
-                                arg->overlay.OGAMC0 = PSB_RVDC32(OV_OGAMC0);
-                        }
-                        if (arg->overlay_read_mask & OVC_REGRWBITS_OGAM_ALL) {
-                                arg->overlay.OGAMC5 = PSB_RVDC32(OVC_OGAMC5);
-                                arg->overlay.OGAMC4 = PSB_RVDC32(OVC_OGAMC4);
-                                arg->overlay.OGAMC3 = PSB_RVDC32(OVC_OGAMC3);
-                                arg->overlay.OGAMC2 = PSB_RVDC32(OVC_OGAMC2);
-                                arg->overlay.OGAMC1 = PSB_RVDC32(OVC_OGAMC1);
-                                arg->overlay.OGAMC0 = PSB_RVDC32(OVC_OGAMC0);
-                        }
-                        if (arg->overlay_read_mask & OV_REGRWBITS_OVADD)
-                                arg->overlay.OVADD = PSB_RVDC32(OV_OVADD);
-                        if (arg->overlay_read_mask & OVC_REGRWBITS_OVADD)
-                                arg->overlay.OVADD = PSB_RVDC32(OVC_OVADD);
-                        gma_power_end(dev);
-                } else {
-                        if (arg->overlay_read_mask & OV_REGRWBITS_OGAM_ALL) {
-                                arg->overlay.OGAMC5 = dev_priv->saveOV_OGAMC5;
-                                arg->overlay.OGAMC4 = dev_priv->saveOV_OGAMC4;
-                                arg->overlay.OGAMC3 = dev_priv->saveOV_OGAMC3;
-                                arg->overlay.OGAMC2 = dev_priv->saveOV_OGAMC2;
-                                arg->overlay.OGAMC1 = dev_priv->saveOV_OGAMC1;
-                                arg->overlay.OGAMC0 = dev_priv->saveOV_OGAMC0;
-                        }
-                        if (arg->overlay_read_mask & OVC_REGRWBITS_OGAM_ALL) {
-                                arg->overlay.OGAMC5 = dev_priv->saveOVC_OGAMC5;
-                                arg->overlay.OGAMC4 = dev_priv->saveOVC_OGAMC4;
-                                arg->overlay.OGAMC3 = dev_priv->saveOVC_OGAMC3;
-                                arg->overlay.OGAMC2 = dev_priv->saveOVC_OGAMC2;
-                                arg->overlay.OGAMC1 = dev_priv->saveOVC_OGAMC1;
-                                arg->overlay.OGAMC0 = dev_priv->saveOVC_OGAMC0;
-                        }
-                        if (arg->overlay_read_mask & OV_REGRWBITS_OVADD)
-                                arg->overlay.OVADD = dev_priv->saveOV_OVADD;
-                        if (arg->overlay_read_mask & OVC_REGRWBITS_OVADD)
-                                arg->overlay.OVADD = dev_priv->saveOVC_OVADD;
-                }
-        }
-
-        if (arg->sprite_enable_mask != 0) {
-                if (gma_power_begin(dev, usage)) {
-                        PSB_WVDC32(0x1F3E, DSPARB);
-                        PSB_WVDC32(arg->sprite.dspa_control
-                                        | PSB_RVDC32(DSPACNTR), DSPACNTR);
-                        PSB_WVDC32(arg->sprite.dspa_key_value, DSPAKEYVAL);
-                        PSB_WVDC32(arg->sprite.dspa_key_mask, DSPAKEYMASK);
-                        PSB_WVDC32(PSB_RVDC32(DSPASURF), DSPASURF);
-                        PSB_RVDC32(DSPASURF);
-                        PSB_WVDC32(arg->sprite.dspc_control, DSPCCNTR);
-                        PSB_WVDC32(arg->sprite.dspc_stride, DSPCSTRIDE);
-                        PSB_WVDC32(arg->sprite.dspc_position, DSPCPOS);
-                        PSB_WVDC32(arg->sprite.dspc_linear_offset, DSPCLINOFF);
-                        PSB_WVDC32(arg->sprite.dspc_size, DSPCSIZE);
-                        PSB_WVDC32(arg->sprite.dspc_surface, DSPCSURF);
-                        PSB_RVDC32(DSPCSURF);
-                        gma_power_end(dev);
-                }
-        }
-
-        if (arg->sprite_disable_mask != 0) {
-                if (gma_power_begin(dev, usage)) {
-                        PSB_WVDC32(0x3F3E, DSPARB);
-                        PSB_WVDC32(0x0, DSPCCNTR);
-                        PSB_WVDC32(arg->sprite.dspc_surface, DSPCSURF);
-                        PSB_RVDC32(DSPCSURF);
-                        gma_power_end(dev);
-                }
-        }
-
-        if (arg->subpicture_enable_mask != 0) {
-                if (gma_power_begin(dev, usage)) {
-                        uint32_t temp;
-                        if (arg->subpicture_enable_mask & REGRWBITS_DSPACNTR) {
-                                temp =  PSB_RVDC32(DSPACNTR);
-                                temp &= ~DISPPLANE_PIXFORMAT_MASK;
-                                temp &= ~DISPPLANE_BOTTOM;
-                                temp |= DISPPLANE_32BPP;
-                                PSB_WVDC32(temp, DSPACNTR);
-
-                                temp =  PSB_RVDC32(DSPABASE);
-                                PSB_WVDC32(temp, DSPABASE);
-                                PSB_RVDC32(DSPABASE);
-                                temp =  PSB_RVDC32(DSPASURF);
-                                PSB_WVDC32(temp, DSPASURF);
-                                PSB_RVDC32(DSPASURF);
-                        }
-                        if (arg->subpicture_enable_mask & REGRWBITS_DSPBCNTR) {
-                                temp =  PSB_RVDC32(DSPBCNTR);
-                                temp &= ~DISPPLANE_PIXFORMAT_MASK;
-                                temp &= ~DISPPLANE_BOTTOM;
-                                temp |= DISPPLANE_32BPP;
-                                PSB_WVDC32(temp, DSPBCNTR);
-
-                                temp =  PSB_RVDC32(DSPBBASE);
-                                PSB_WVDC32(temp, DSPBBASE);
-                                PSB_RVDC32(DSPBBASE);
-                                temp =  PSB_RVDC32(DSPBSURF);
-                                PSB_WVDC32(temp, DSPBSURF);
-                                PSB_RVDC32(DSPBSURF);
-                        }
-                        if (arg->subpicture_enable_mask & REGRWBITS_DSPCCNTR) {
-                                temp =  PSB_RVDC32(DSPCCNTR);
-                                temp &= ~DISPPLANE_PIXFORMAT_MASK;
-                                temp &= ~DISPPLANE_BOTTOM;
-                                temp |= DISPPLANE_32BPP;
-                                PSB_WVDC32(temp, DSPCCNTR);
-
-                                temp =  PSB_RVDC32(DSPCBASE);
-                                PSB_WVDC32(temp, DSPCBASE);
-                                PSB_RVDC32(DSPCBASE);
-                                temp =  PSB_RVDC32(DSPCSURF);
-                                PSB_WVDC32(temp, DSPCSURF);
-                                PSB_RVDC32(DSPCSURF);
-                        }
-                        gma_power_end(dev);
-                }
-        }
-
-        if (arg->subpicture_disable_mask != 0) {
-                if (gma_power_begin(dev, usage)) {
-                        uint32_t temp;
-                        if (arg->subpicture_disable_mask & REGRWBITS_DSPACNTR) {
-                                temp =  PSB_RVDC32(DSPACNTR);
-                                temp &= ~DISPPLANE_PIXFORMAT_MASK;
-                                temp |= DISPPLANE_32BPP_NO_ALPHA;
-                                PSB_WVDC32(temp, DSPACNTR);
-
-                                temp =  PSB_RVDC32(DSPABASE);
-                                PSB_WVDC32(temp, DSPABASE);
-                                PSB_RVDC32(DSPABASE);
-                                temp =  PSB_RVDC32(DSPASURF);
-                                PSB_WVDC32(temp, DSPASURF);
-                                PSB_RVDC32(DSPASURF);
-                        }
-                        if (arg->subpicture_disable_mask & REGRWBITS_DSPBCNTR) {
-                                temp =  PSB_RVDC32(DSPBCNTR);
-                                temp &= ~DISPPLANE_PIXFORMAT_MASK;
-                                temp |= DISPPLANE_32BPP_NO_ALPHA;
-                                PSB_WVDC32(temp, DSPBCNTR);
-
-                                temp =  PSB_RVDC32(DSPBBASE);
-                                PSB_WVDC32(temp, DSPBBASE);
-                                PSB_RVDC32(DSPBBASE);
-                                temp =  PSB_RVDC32(DSPBSURF);
-                                PSB_WVDC32(temp, DSPBSURF);
-                                PSB_RVDC32(DSPBSURF);
-                        }
-                        if (arg->subpicture_disable_mask & REGRWBITS_DSPCCNTR) {
-                                temp =  PSB_RVDC32(DSPCCNTR);
-                                temp &= ~DISPPLANE_PIXFORMAT_MASK;
-                                temp |= DISPPLANE_32BPP_NO_ALPHA;
-                                PSB_WVDC32(temp, DSPCCNTR);
-
-                                temp =  PSB_RVDC32(DSPCBASE);
-                                PSB_WVDC32(temp, DSPCBASE);
-                                PSB_RVDC32(DSPCBASE);
-                                temp =  PSB_RVDC32(DSPCSURF);
-                                PSB_WVDC32(temp, DSPCSURF);
-                                PSB_RVDC32(DSPCSURF);
-                        }
-                        gma_power_end(dev);
-                }
-        }
-
-        return 0;
-}
-
-static int psb_driver_open(struct drm_device *dev, struct drm_file *priv)
-{
-        return 0;
-}
-
-static void psb_driver_close(struct drm_device *dev, struct drm_file *priv)
-{
-}
-
-static long psb_unlocked_ioctl(struct file *filp, unsigned int cmd,
-                               unsigned long arg)
-{
-        struct drm_file *file_priv = filp->private_data;
-        struct drm_device *dev = file_priv->minor->dev;
-        int ret;
-        
-        pm_runtime_forbid(dev->dev);
-        ret = drm_ioctl(filp, cmd, arg);
-        pm_runtime_allow(dev->dev);
-        return ret;
-        /* FIXME: do we need to wrap the other side of this */
-}
-
-
-/* When a client dies:
- *    - Check for and clean up flipped page state
- */
-void psb_driver_preclose(struct drm_device *dev, struct drm_file *priv)
-{
-}
-
-static void psb_remove(struct pci_dev *pdev)
-{
-        struct drm_device *dev = pci_get_drvdata(pdev);
-        drm_put_dev(dev);
-}
-
-static const struct dev_pm_ops psb_pm_ops = {
-        .suspend = gma_power_suspend,
-        .resume = gma_power_resume,
-        .freeze = gma_power_suspend,
-        .thaw = gma_power_resume,
-        .poweroff = gma_power_suspend,
-        .restore = gma_power_resume,
-        .runtime_suspend = psb_runtime_suspend,
-        .runtime_resume = psb_runtime_resume,
-        .runtime_idle = psb_runtime_idle,
-};
-
-static struct vm_operations_struct psb_gem_vm_ops = {
-        .fault = psb_gem_fault,
-        .open = drm_gem_vm_open,
-        .close = drm_gem_vm_close,
-};
-
-static const struct file_operations gma500_driver_fops = {
-        .owner = THIS_MODULE,
-        .open = drm_open,
-        .release = drm_release,
-        .unlocked_ioctl = psb_unlocked_ioctl,
-        .mmap = drm_gem_mmap,
-        .poll = drm_poll,
-        .fasync = drm_fasync,
-        .read = drm_read,
-};
-
-static struct drm_driver driver = {
-        .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | \
-                           DRIVER_IRQ_VBL | DRIVER_MODESET | DRIVER_GEM ,
-        .load = psb_driver_load,
-        .unload = psb_driver_unload,
-
-        .ioctls = psb_ioctls,
-        .num_ioctls = DRM_ARRAY_SIZE(psb_ioctls),
-        .device_is_agp = psb_driver_device_is_agp,
-        .irq_preinstall = psb_irq_preinstall,
-        .irq_postinstall = psb_irq_postinstall,
-        .irq_uninstall = psb_irq_uninstall,
-        .irq_handler = psb_irq_handler,
-        .enable_vblank = psb_enable_vblank,
-        .disable_vblank = psb_disable_vblank,
-        .get_vblank_counter = psb_get_vblank_counter,
-        .lastclose = psb_lastclose,
-        .open = psb_driver_open,
-        .preclose = psb_driver_preclose,
-        .postclose = psb_driver_close,
-        .reclaim_buffers = drm_core_reclaim_buffers,
-
-        .gem_init_object = psb_gem_init_object,
-        .gem_free_object = psb_gem_free_object,
-        .gem_vm_ops = &psb_gem_vm_ops,
-        .dumb_create = psb_gem_dumb_create,
-        .dumb_map_offset = psb_gem_dumb_map_gtt,
-        .dumb_destroy = psb_gem_dumb_destroy,
-        .fops = &gma500_driver_fops,
-        .name = DRIVER_NAME,
-        .desc = DRIVER_DESC,
-        .date = PSB_DRM_DRIVER_DATE,
-        .major = PSB_DRM_DRIVER_MAJOR,
-        .minor = PSB_DRM_DRIVER_MINOR,
-        .patchlevel = PSB_DRM_DRIVER_PATCHLEVEL
-};
-
-static struct pci_driver psb_pci_driver = {
-        .name = DRIVER_NAME,
-        .id_table = pciidlist,
-        .probe = psb_probe,
-        .remove = psb_remove,
-        .driver.pm = &psb_pm_ops,
-};
-
-static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-        return drm_get_pci_dev(pdev, ent, &driver);
-}
-
-static int __init psb_init(void)
-{
-        return drm_pci_init(&driver, &psb_pci_driver);
-}
-
-static void __exit psb_exit(void)
-{
-        drm_pci_exit(&driver, &psb_pci_driver);
-}
-
-late_initcall(psb_init);
-module_exit(psb_exit);
-
-MODULE_AUTHOR("Alan Cox <alan@linux.intel.com> and others");
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
diff --git a/drivers/staging/gma500/psb_drv.h b/drivers/staging/gma500/psb_drv.h
deleted file mode 100644
index 11d963a055be..000000000000
--- a/drivers/staging/gma500/psb_drv.h
+++ /dev/null
@@ -1,952 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2007-2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- **************************************************************************/
-
-#ifndef _PSB_DRV_H_
-#define _PSB_DRV_H_
-
-#include <linux/kref.h>
-
-#include <drm/drmP.h>
-#include "drm_global.h"
-#include "gem_glue.h"
-#include "psb_drm.h"
-#include "psb_reg.h"
-#include "psb_intel_drv.h"
-#include "gtt.h"
-#include "power.h"
-#include "mrst.h"
-#include "medfield.h"
-
-/* Append new drm mode definition here, align with libdrm definition */
-#define DRM_MODE_SCALE_NO_SCALE         2
-
-enum {
-        CHIP_PSB_8108 = 0,              /* Poulsbo */
-        CHIP_PSB_8109 = 1,              /* Poulsbo */
-        CHIP_MRST_4100 = 2,             /* Moorestown/Oaktrail */
-        CHIP_MFLD_0130 = 3,             /* Medfield */
-};
-
-#define IS_PSB(dev) (((dev)->pci_device & 0xfffe) == 0x8108)
-#define IS_MRST(dev) (((dev)->pci_device & 0xfffc) == 0x4100)
-#define IS_MFLD(dev) (((dev)->pci_device & 0xfff8) == 0x0130)
-
-/*
- * Driver definitions
- */
-
-#define DRIVER_NAME "gma500"
-#define DRIVER_DESC "DRM driver for the Intel GMA500"
-
-#define PSB_DRM_DRIVER_DATE "2011-06-06"
-#define PSB_DRM_DRIVER_MAJOR 1
-#define PSB_DRM_DRIVER_MINOR 0
-#define PSB_DRM_DRIVER_PATCHLEVEL 0
-
-/*
- *      Hardware offsets
- */
-#define PSB_VDC_OFFSET           0x00000000
-#define PSB_VDC_SIZE             0x000080000
-#define MRST_MMIO_SIZE           0x0000C0000
-#define MDFLD_MMIO_SIZE          0x000100000
-#define PSB_SGX_SIZE             0x8000
-#define PSB_SGX_OFFSET           0x00040000
-#define MRST_SGX_OFFSET          0x00080000
-/*
- *      PCI resource identifiers
- */
-#define PSB_MMIO_RESOURCE        0
-#define PSB_GATT_RESOURCE        2
-#define PSB_GTT_RESOURCE         3
-/*
- *      PCI configuration
- */
-#define PSB_GMCH_CTRL            0x52
-#define PSB_BSM                  0x5C
-#define _PSB_GMCH_ENABLED        0x4
-#define PSB_PGETBL_CTL           0x2020
-#define _PSB_PGETBL_ENABLED      0x00000001
-#define PSB_SGX_2D_SLAVE_PORT    0x4000
-
-/* To get rid of */
-#define PSB_TT_PRIV0_LIMIT       (256*1024*1024)
-#define PSB_TT_PRIV0_PLIMIT      (PSB_TT_PRIV0_LIMIT >> PAGE_SHIFT)
-
-/*
- *      SGX side MMU definitions (these can probably go)
- */
-
-/*
- *      Flags for external memory type field.
- */
-#define PSB_MMU_CACHED_MEMORY     0x0001        /* Bind to MMU only */
-#define PSB_MMU_RO_MEMORY         0x0002        /* MMU RO memory */
-#define PSB_MMU_WO_MEMORY         0x0004        /* MMU WO memory */
-/*
- *      PTE's and PDE's
- */
-#define PSB_PDE_MASK              0x003FFFFF
-#define PSB_PDE_SHIFT             22
-#define PSB_PTE_SHIFT             12
-/*
- *      Cache control
- */
-#define PSB_PTE_VALID             0x0001        /* PTE / PDE valid */
-#define PSB_PTE_WO                0x0002        /* Write only */
-#define PSB_PTE_RO                0x0004        /* Read only */
-#define PSB_PTE_CACHED            0x0008        /* CPU cache coherent */
-
-/*
- *      VDC registers and bits
- */
-#define PSB_MSVDX_CLOCKGATING     0x2064
-#define PSB_TOPAZ_CLOCKGATING     0x2068
-#define PSB_HWSTAM                0x2098
-#define PSB_INSTPM                0x20C0
-#define PSB_INT_IDENTITY_R        0x20A4
-#define _MDFLD_PIPEC_EVENT_FLAG   (1<<2)
-#define _MDFLD_PIPEC_VBLANK_FLAG  (1<<3)
-#define _PSB_DPST_PIPEB_FLAG      (1<<4)
-#define _MDFLD_PIPEB_EVENT_FLAG   (1<<4)
-#define _PSB_VSYNC_PIPEB_FLAG     (1<<5)
-#define _PSB_DPST_PIPEA_FLAG      (1<<6)
-#define _PSB_PIPEA_EVENT_FLAG     (1<<6)
-#define _PSB_VSYNC_PIPEA_FLAG     (1<<7)
-#define _MDFLD_MIPIA_FLAG         (1<<16)
-#define _MDFLD_MIPIC_FLAG         (1<<17)
-#define _PSB_IRQ_SGX_FLAG         (1<<18)
-#define _PSB_IRQ_MSVDX_FLAG       (1<<19)
-#define _LNC_IRQ_TOPAZ_FLAG       (1<<20)
-
-#define _PSB_PIPE_EVENT_FLAG    (_PSB_VSYNC_PIPEA_FLAG | \
-                                 _PSB_VSYNC_PIPEB_FLAG)
-
-/* This flag includes all the display IRQ bits excepts the vblank irqs. */
-#define _MDFLD_DISP_ALL_IRQ_FLAG (_MDFLD_PIPEC_EVENT_FLAG | \
-                                  _MDFLD_PIPEB_EVENT_FLAG | \
-                                  _PSB_PIPEA_EVENT_FLAG | \
-                                  _PSB_VSYNC_PIPEA_FLAG | \
-                                  _MDFLD_MIPIA_FLAG | \
-                                  _MDFLD_MIPIC_FLAG)
-#define PSB_INT_IDENTITY_R        0x20A4
-#define PSB_INT_MASK_R            0x20A8
-#define PSB_INT_ENABLE_R          0x20A0
-
-#define _PSB_MMU_ER_MASK      0x0001FF00
-#define _PSB_MMU_ER_HOST      (1 << 16)
-#define GPIOA                   0x5010
-#define GPIOB                   0x5014
-#define GPIOC                   0x5018
-#define GPIOD                   0x501c
-#define GPIOE                   0x5020
-#define GPIOF                   0x5024
-#define GPIOG                   0x5028
-#define GPIOH                   0x502c
-#define GPIO_CLOCK_DIR_MASK             (1 << 0)
-#define GPIO_CLOCK_DIR_IN               (0 << 1)
-#define GPIO_CLOCK_DIR_OUT              (1 << 1)
-#define GPIO_CLOCK_VAL_MASK             (1 << 2)
-#define GPIO_CLOCK_VAL_OUT              (1 << 3)
-#define GPIO_CLOCK_VAL_IN               (1 << 4)
-#define GPIO_CLOCK_PULLUP_DISABLE       (1 << 5)
-#define GPIO_DATA_DIR_MASK              (1 << 8)
-#define GPIO_DATA_DIR_IN                (0 << 9)
-#define GPIO_DATA_DIR_OUT               (1 << 9)
-#define GPIO_DATA_VAL_MASK              (1 << 10)
-#define GPIO_DATA_VAL_OUT               (1 << 11)
-#define GPIO_DATA_VAL_IN                (1 << 12)
-#define GPIO_DATA_PULLUP_DISABLE        (1 << 13)
-
-#define VCLK_DIVISOR_VGA0   0x6000
-#define VCLK_DIVISOR_VGA1   0x6004
-#define VCLK_POST_DIV       0x6010
-
-#define PSB_COMM_2D (PSB_ENGINE_2D << 4)
-#define PSB_COMM_3D (PSB_ENGINE_3D << 4)
-#define PSB_COMM_TA (PSB_ENGINE_TA << 4)
-#define PSB_COMM_HP (PSB_ENGINE_HP << 4)
-#define PSB_COMM_USER_IRQ (1024 >> 2)
-#define PSB_COMM_USER_IRQ_LOST (PSB_COMM_USER_IRQ + 1)
-#define PSB_COMM_FW (2048 >> 2)
-
-#define PSB_UIRQ_VISTEST               1
-#define PSB_UIRQ_OOM_REPLY             2
-#define PSB_UIRQ_FIRE_TA_REPLY         3
-#define PSB_UIRQ_FIRE_RASTER_REPLY     4
-
-#define PSB_2D_SIZE (256*1024*1024)
-#define PSB_MAX_RELOC_PAGES 1024
-
-#define PSB_LOW_REG_OFFS 0x0204
-#define PSB_HIGH_REG_OFFS 0x0600
-
-#define PSB_NUM_VBLANKS 2
-
-
-#define PSB_2D_SIZE (256*1024*1024)
-#define PSB_MAX_RELOC_PAGES 1024
-
-#define PSB_LOW_REG_OFFS 0x0204
-#define PSB_HIGH_REG_OFFS 0x0600
-
-#define PSB_NUM_VBLANKS 2
-#define PSB_WATCHDOG_DELAY (DRM_HZ * 2)
-#define PSB_LID_DELAY (DRM_HZ / 10)
-
-#define MDFLD_PNW_B0 0x04
-#define MDFLD_PNW_C0 0x08
-
-#define MDFLD_DSR_2D_3D_0       (1 << 0)
-#define MDFLD_DSR_2D_3D_2       (1 << 1)
-#define MDFLD_DSR_CURSOR_0      (1 << 2)
-#define MDFLD_DSR_CURSOR_2      (1 << 3)
-#define MDFLD_DSR_OVERLAY_0     (1 << 4)
-#define MDFLD_DSR_OVERLAY_2     (1 << 5)
-#define MDFLD_DSR_MIPI_CONTROL  (1 << 6)
-#define MDFLD_DSR_DAMAGE_MASK_0 ((1 << 0) | (1 << 2) | (1 << 4))
-#define MDFLD_DSR_DAMAGE_MASK_2 ((1 << 1) | (1 << 3) | (1 << 5))
-#define MDFLD_DSR_2D_3D         (MDFLD_DSR_2D_3D_0 | MDFLD_DSR_2D_3D_2)
-
-#define MDFLD_DSR_RR            45
-#define MDFLD_DPU_ENABLE        (1 << 31)
-#define MDFLD_DSR_FULLSCREEN    (1 << 30)
-#define MDFLD_DSR_DELAY         (DRM_HZ / MDFLD_DSR_RR)
-
-#define PSB_PWR_STATE_ON                1
-#define PSB_PWR_STATE_OFF               2
-
-#define PSB_PMPOLICY_NOPM               0
-#define PSB_PMPOLICY_CLOCKGATING        1
-#define PSB_PMPOLICY_POWERDOWN          2
-
-#define PSB_PMSTATE_POWERUP             0
-#define PSB_PMSTATE_CLOCKGATED          1
-#define PSB_PMSTATE_POWERDOWN           2
-#define PSB_PCIx_MSI_ADDR_LOC           0x94
-#define PSB_PCIx_MSI_DATA_LOC           0x98
-
-/* Medfield crystal settings */
-#define KSEL_CRYSTAL_19 1
-#define KSEL_BYPASS_19 5
-#define KSEL_BYPASS_25 6
-#define KSEL_BYPASS_83_100 7
-
-struct opregion_header;
-struct opregion_acpi;
-struct opregion_swsci;
-struct opregion_asle;
-
-struct psb_intel_opregion {
-        struct opregion_header *header;
-        struct opregion_acpi *acpi;
-        struct opregion_swsci *swsci;
-        struct opregion_asle *asle;
-        int enabled;
-};
-
-struct psb_ops;
-
-struct drm_psb_private {
-        struct drm_device *dev;
-        const struct psb_ops *ops;
-
-        struct psb_gtt gtt;
-
-        /* GTT Memory manager */
-        struct psb_gtt_mm *gtt_mm;
-        struct page *scratch_page;
-        u32 *gtt_map;
-        uint32_t stolen_base;
-        void *vram_addr;
-        unsigned long vram_stolen_size;
-        int gtt_initialized;
-        u16 gmch_ctrl;          /* Saved GTT setup */
-        u32 pge_ctl;
-
-        struct mutex gtt_mutex;
-        struct resource *gtt_mem;       /* Our PCI resource */
-
-        struct psb_mmu_driver *mmu;
-        struct psb_mmu_pd *pf_pd;
-
-        /*
-         * Register base
-         */
-
-        uint8_t *sgx_reg;
-        uint8_t *vdc_reg;
-        uint32_t gatt_free_offset;
-
-        /*
-         * Fencing / irq.
-         */
-
-        uint32_t vdc_irq_mask;
-        uint32_t pipestat[PSB_NUM_PIPE];
-
-        spinlock_t irqmask_lock;
-
-        /*
-         * Power
-         */
-
-        bool suspended;
-        bool display_power;
-        int display_count;
-
-        /*
-         * Modesetting
-         */
-        struct psb_intel_mode_device mode_dev;
-
-        struct drm_crtc *plane_to_crtc_mapping[PSB_NUM_PIPE];
-        struct drm_crtc *pipe_to_crtc_mapping[PSB_NUM_PIPE];
-        uint32_t num_pipe;
-
-        /*
-         * OSPM info (Power management base) (can go ?)
-         */
-        uint32_t ospm_base;
-
-        /*
-         * Sizes info
-         */
-
-        struct drm_psb_sizes_arg sizes;
-
-        u32 fuse_reg_value;
-        u32 video_device_fuse;
-
-        /* PCI revision ID for B0:D2:F0 */
-        uint8_t platform_rev_id;
-
-        /*
-         * LVDS info
-         */
-        int backlight_duty_cycle;       /* restore backlight to this value */
-        bool panel_wants_dither;
-        struct drm_display_mode *panel_fixed_mode;
-        struct drm_display_mode *lfp_lvds_vbt_mode;
-        struct drm_display_mode *sdvo_lvds_vbt_mode;
-
-        struct bdb_lvds_backlight *lvds_bl; /* LVDS backlight info from VBT */
-        struct psb_intel_i2c_chan *lvds_i2c_bus;
-
-        /* Feature bits from the VBIOS */
-        unsigned int int_tv_support:1;
-        unsigned int lvds_dither:1;
-        unsigned int lvds_vbt:1;
-        unsigned int int_crt_support:1;
-        unsigned int lvds_use_ssc:1;
-        int lvds_ssc_freq;
-        bool is_lvds_on;
-        bool is_mipi_on;
-        u32 mipi_ctrl_display;
-
-        unsigned int core_freq;
-        uint32_t iLVDS_enable;
-
-        /* Runtime PM state */
-        int rpm_enabled;
-
-        /* MID specific */
-        struct mrst_vbt vbt_data;
-        struct mrst_gct_data gct_data;
-
-        /* MIPI Panel type etc */
-        int panel_id;
-        bool dual_mipi;         /* dual display - DPI & DBI */
-        bool dpi_panel_on;      /* The DPI panel power is on */
-        bool dpi_panel_on2;     /* The DPI panel power is on */
-        bool dbi_panel_on;      /* The DBI panel power is on */
-        bool dbi_panel_on2;     /* The DBI panel power is on */
-        u32 dsr_fb_update;      /* DSR FB update counter */
-
-        /* Moorestown HDMI state */
-        struct mrst_hdmi_dev *hdmi_priv;
-
-        /* Moorestown pipe config register value cache */
-        uint32_t pipeconf;
-        uint32_t pipeconf1;
-        uint32_t pipeconf2;
-
-        /* Moorestown plane control register value cache */
-        uint32_t dspcntr;
-        uint32_t dspcntr1;
-        uint32_t dspcntr2;
-
-        /* Moorestown MM backlight cache */
-        uint8_t saveBKLTCNT;
-        uint8_t saveBKLTREQ;
-        uint8_t saveBKLTBRTL;
-
-        /*
-         * Register state
-         */
-        uint32_t saveDSPACNTR;
-        uint32_t saveDSPBCNTR;
-        uint32_t savePIPEACONF;
-        uint32_t savePIPEBCONF;
-        uint32_t savePIPEASRC;
-        uint32_t savePIPEBSRC;
-        uint32_t saveFPA0;
-        uint32_t saveFPA1;
-        uint32_t saveDPLL_A;
-        uint32_t saveDPLL_A_MD;
-        uint32_t saveHTOTAL_A;
-        uint32_t saveHBLANK_A;
-        uint32_t saveHSYNC_A;
-        uint32_t saveVTOTAL_A;
-        uint32_t saveVBLANK_A;
-        uint32_t saveVSYNC_A;
-        uint32_t saveDSPASTRIDE;
-        uint32_t saveDSPASIZE;
-        uint32_t saveDSPAPOS;
-        uint32_t saveDSPABASE;
-        uint32_t saveDSPASURF;
-        uint32_t saveDSPASTATUS;
-        uint32_t saveFPB0;
-        uint32_t saveFPB1;
-        uint32_t saveDPLL_B;
-        uint32_t saveDPLL_B_MD;
-        uint32_t saveHTOTAL_B;
-        uint32_t saveHBLANK_B;
-        uint32_t saveHSYNC_B;
-        uint32_t saveVTOTAL_B;
-        uint32_t saveVBLANK_B;
-        uint32_t saveVSYNC_B;
-        uint32_t saveDSPBSTRIDE;
-        uint32_t saveDSPBSIZE;
-        uint32_t saveDSPBPOS;
-        uint32_t saveDSPBBASE;
-        uint32_t saveDSPBSURF;
-        uint32_t saveDSPBSTATUS;
-        uint32_t saveVCLK_DIVISOR_VGA0;
-        uint32_t saveVCLK_DIVISOR_VGA1;
-        uint32_t saveVCLK_POST_DIV;
-        uint32_t saveVGACNTRL;
-        uint32_t saveADPA;
-        uint32_t saveLVDS;
-        uint32_t saveDVOA;
-        uint32_t saveDVOB;
-        uint32_t saveDVOC;
-        uint32_t savePP_ON;
-        uint32_t savePP_OFF;
-        uint32_t savePP_CONTROL;
-        uint32_t savePP_CYCLE;
-        uint32_t savePFIT_CONTROL;
-        uint32_t savePaletteA[256];
-        uint32_t savePaletteB[256];
-        uint32_t saveBLC_PWM_CTL2;
-        uint32_t saveBLC_PWM_CTL;
-        uint32_t saveCLOCKGATING;
-        uint32_t saveDSPARB;
-        uint32_t saveDSPATILEOFF;
-        uint32_t saveDSPBTILEOFF;
-        uint32_t saveDSPAADDR;
-        uint32_t saveDSPBADDR;
-        uint32_t savePFIT_AUTO_RATIOS;
-        uint32_t savePFIT_PGM_RATIOS;
-        uint32_t savePP_ON_DELAYS;
-        uint32_t savePP_OFF_DELAYS;
-        uint32_t savePP_DIVISOR;
-        uint32_t saveBSM;
-        uint32_t saveVBT;
-        uint32_t saveBCLRPAT_A;
-        uint32_t saveBCLRPAT_B;
-        uint32_t saveDSPALINOFF;
-        uint32_t saveDSPBLINOFF;
-        uint32_t savePERF_MODE;
-        uint32_t saveDSPFW1;
-        uint32_t saveDSPFW2;
-        uint32_t saveDSPFW3;
-        uint32_t saveDSPFW4;
-        uint32_t saveDSPFW5;
-        uint32_t saveDSPFW6;
-        uint32_t saveCHICKENBIT;
-        uint32_t saveDSPACURSOR_CTRL;
-        uint32_t saveDSPBCURSOR_CTRL;
-        uint32_t saveDSPACURSOR_BASE;
-        uint32_t saveDSPBCURSOR_BASE;
-        uint32_t saveDSPACURSOR_POS;
-        uint32_t saveDSPBCURSOR_POS;
-        uint32_t save_palette_a[256];
-        uint32_t save_palette_b[256];
-        uint32_t saveOV_OVADD;
-        uint32_t saveOV_OGAMC0;
-        uint32_t saveOV_OGAMC1;
-        uint32_t saveOV_OGAMC2;
-        uint32_t saveOV_OGAMC3;
-        uint32_t saveOV_OGAMC4;
-        uint32_t saveOV_OGAMC5;
-        uint32_t saveOVC_OVADD;
-        uint32_t saveOVC_OGAMC0;
-        uint32_t saveOVC_OGAMC1;
-        uint32_t saveOVC_OGAMC2;
-        uint32_t saveOVC_OGAMC3;
-        uint32_t saveOVC_OGAMC4;
-        uint32_t saveOVC_OGAMC5;
-
-        /* MSI reg save */
-        uint32_t msi_addr;
-        uint32_t msi_data;
-
-        /* Medfield specific register save state */
-        uint32_t saveHDMIPHYMISCCTL;
-        uint32_t saveHDMIB_CONTROL;
-        uint32_t saveDSPCCNTR;
-        uint32_t savePIPECCONF;
-        uint32_t savePIPECSRC;
-        uint32_t saveHTOTAL_C;
-        uint32_t saveHBLANK_C;
-        uint32_t saveHSYNC_C;
-        uint32_t saveVTOTAL_C;
-        uint32_t saveVBLANK_C;
-        uint32_t saveVSYNC_C;
-        uint32_t saveDSPCSTRIDE;
-        uint32_t saveDSPCSIZE;
-        uint32_t saveDSPCPOS;
-        uint32_t saveDSPCSURF;
-        uint32_t saveDSPCSTATUS;
-        uint32_t saveDSPCLINOFF;
-        uint32_t saveDSPCTILEOFF;
-        uint32_t saveDSPCCURSOR_CTRL;
-        uint32_t saveDSPCCURSOR_BASE;
-        uint32_t saveDSPCCURSOR_POS;
-        uint32_t save_palette_c[256];
-        uint32_t saveOV_OVADD_C;
-        uint32_t saveOV_OGAMC0_C;
-        uint32_t saveOV_OGAMC1_C;
-        uint32_t saveOV_OGAMC2_C;
-        uint32_t saveOV_OGAMC3_C;
-        uint32_t saveOV_OGAMC4_C;
-        uint32_t saveOV_OGAMC5_C;
-
-        /* DSI register save */
-        uint32_t saveDEVICE_READY_REG;
-        uint32_t saveINTR_EN_REG;
-        uint32_t saveDSI_FUNC_PRG_REG;
-        uint32_t saveHS_TX_TIMEOUT_REG;
-        uint32_t saveLP_RX_TIMEOUT_REG;
-        uint32_t saveTURN_AROUND_TIMEOUT_REG;
-        uint32_t saveDEVICE_RESET_REG;
-        uint32_t saveDPI_RESOLUTION_REG;
-        uint32_t saveHORIZ_SYNC_PAD_COUNT_REG;
-        uint32_t saveHORIZ_BACK_PORCH_COUNT_REG;
-        uint32_t saveHORIZ_FRONT_PORCH_COUNT_REG;
-        uint32_t saveHORIZ_ACTIVE_AREA_COUNT_REG;
-        uint32_t saveVERT_SYNC_PAD_COUNT_REG;
-        uint32_t saveVERT_BACK_PORCH_COUNT_REG;
-        uint32_t saveVERT_FRONT_PORCH_COUNT_REG;
-        uint32_t saveHIGH_LOW_SWITCH_COUNT_REG;
-        uint32_t saveINIT_COUNT_REG;
-        uint32_t saveMAX_RET_PAK_REG;
-        uint32_t saveVIDEO_FMT_REG;
-        uint32_t saveEOT_DISABLE_REG;
-        uint32_t saveLP_BYTECLK_REG;
-        uint32_t saveHS_LS_DBI_ENABLE_REG;
-        uint32_t saveTXCLKESC_REG;
-        uint32_t saveDPHY_PARAM_REG;
-        uint32_t saveMIPI_CONTROL_REG;
-        uint32_t saveMIPI;
-        uint32_t saveMIPI_C;
-
-        /* DPST register save */
-        uint32_t saveHISTOGRAM_INT_CONTROL_REG;
-        uint32_t saveHISTOGRAM_LOGIC_CONTROL_REG;
-        uint32_t savePWM_CONTROL_LOGIC;
-
-        /*
-         * DSI info. 
-         */
-        void * dbi_dsr_info;    
-        void * dbi_dpu_info;
-        void * dsi_configs[2];
-        /*
-         * LID-Switch
-         */
-        spinlock_t lid_lock;
-        struct timer_list lid_timer;
-        struct psb_intel_opregion opregion;
-        u32 *lid_state;
-        u32 lid_last_state;
-
-        /*
-         * Watchdog
-         */
-
-        uint32_t apm_reg;
-        uint16_t apm_base;
-
-        /*
-         * Used for modifying backlight from
-         * xrandr -- consider removing and using HAL instead
-         */
-        struct backlight_device *backlight_device;
-        struct drm_property *backlight_property;
-        uint32_t blc_adj1;
-        uint32_t blc_adj2;
-
-        void *fbdev;
-        /* DPST state */
-        uint32_t dsr_idle_count;
-        bool is_in_idle;
-        bool dsr_enable;
-        void (*exit_idle)(struct drm_device *dev, u32 update_src);
-
-        /* 2D acceleration */
-        spinlock_t lock_2d;
-
-        /* FIXME: Arrays anyone ? */
-        struct mdfld_dsi_encoder *encoder0;     
-        struct mdfld_dsi_encoder *encoder2;     
-        struct mdfld_dsi_dbi_output * dbi_output;
-        struct mdfld_dsi_dbi_output * dbi_output2;
-        u32 bpp;
-        u32 bpp2;
-        
-        bool dispstatus;
-};
-
-
-/*
- *      Operations for each board type
- */
- 
-struct psb_ops {
-        const char *name;
-        unsigned int accel_2d:1;
-        int pipes;              /* Number of output pipes */
-        int crtcs;              /* Number of CRTCs */
-        int sgx_offset;         /* Base offset of SGX device */
-
-        /* Sub functions */
-        struct drm_crtc_helper_funcs const *crtc_helper;
-        struct drm_crtc_funcs const *crtc_funcs;
-
-        /* Setup hooks */
-        int (*chip_setup)(struct drm_device *dev);
-        void (*chip_teardown)(struct drm_device *dev);
-
-        /* Display management hooks */
-        int (*output_init)(struct drm_device *dev);
-        /* Power management hooks */
-        void (*init_pm)(struct drm_device *dev);
-        int (*save_regs)(struct drm_device *dev);
-        int (*restore_regs)(struct drm_device *dev);
-        int (*power_up)(struct drm_device *dev);
-        int (*power_down)(struct drm_device *dev);
-
-        void (*lvds_bl_power)(struct drm_device *dev, bool on);
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-        /* Backlight */
-        int (*backlight_init)(struct drm_device *dev);
-#endif
-        int i2c_bus;            /* I2C bus identifier for Moorestown */
-};
-
-
-
-struct psb_mmu_driver;
-
-extern int drm_crtc_probe_output_modes(struct drm_device *dev, int, int);
-extern int drm_pick_crtcs(struct drm_device *dev);
-
-static inline struct drm_psb_private *psb_priv(struct drm_device *dev)
-{
-        return (struct drm_psb_private *) dev->dev_private;
-}
-
-/*
- * MMU stuff.
- */
-
-extern struct psb_mmu_driver *psb_mmu_driver_init(uint8_t __iomem * registers,
-                                        int trap_pagefaults,
-                                        int invalid_type,
-                                        struct drm_psb_private *dev_priv);
-extern void psb_mmu_driver_takedown(struct psb_mmu_driver *driver);
-extern struct psb_mmu_pd *psb_mmu_get_default_pd(struct psb_mmu_driver
-                                                 *driver);
-extern void psb_mmu_mirror_gtt(struct psb_mmu_pd *pd, uint32_t mmu_offset,
-                               uint32_t gtt_start, uint32_t gtt_pages);
-extern struct psb_mmu_pd *psb_mmu_alloc_pd(struct psb_mmu_driver *driver,
-                                           int trap_pagefaults,
-                                           int invalid_type);
-extern void psb_mmu_free_pagedir(struct psb_mmu_pd *pd);
-extern void psb_mmu_flush(struct psb_mmu_driver *driver, int rc_prot);
-extern void psb_mmu_remove_pfn_sequence(struct psb_mmu_pd *pd,
-                                        unsigned long address,
-                                        uint32_t num_pages);
-extern int psb_mmu_insert_pfn_sequence(struct psb_mmu_pd *pd,
-                                       uint32_t start_pfn,
-                                       unsigned long address,
-                                       uint32_t num_pages, int type);
-extern int psb_mmu_virtual_to_pfn(struct psb_mmu_pd *pd, uint32_t virtual,
-                                  unsigned long *pfn);
-
-/*
- * Enable / disable MMU for different requestors.
- */
-
-
-extern void psb_mmu_set_pd_context(struct psb_mmu_pd *pd, int hw_context);
-extern int psb_mmu_insert_pages(struct psb_mmu_pd *pd, struct page **pages,
-                                unsigned long address, uint32_t num_pages,
-                                uint32_t desired_tile_stride,
-                                uint32_t hw_tile_stride, int type);
-extern void psb_mmu_remove_pages(struct psb_mmu_pd *pd,
-                                 unsigned long address, uint32_t num_pages,
-                                 uint32_t desired_tile_stride,
-                                 uint32_t hw_tile_stride);
-/*
- *psb_irq.c
- */
-
-extern irqreturn_t psb_irq_handler(DRM_IRQ_ARGS);
-extern int psb_irq_enable_dpst(struct drm_device *dev);
-extern int psb_irq_disable_dpst(struct drm_device *dev);
-extern void psb_irq_preinstall(struct drm_device *dev);
-extern int psb_irq_postinstall(struct drm_device *dev);
-extern void psb_irq_uninstall(struct drm_device *dev);
-extern void psb_irq_turn_on_dpst(struct drm_device *dev);
-extern void psb_irq_turn_off_dpst(struct drm_device *dev);
-
-extern void psb_irq_uninstall_islands(struct drm_device *dev, int hw_islands);
-extern int psb_vblank_wait2(struct drm_device *dev, unsigned int *sequence);
-extern int psb_vblank_wait(struct drm_device *dev, unsigned int *sequence);
-extern int psb_enable_vblank(struct drm_device *dev, int crtc);
-extern void psb_disable_vblank(struct drm_device *dev, int crtc);
-void
-psb_enable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);
-
-void
-psb_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);
-
-extern u32 psb_get_vblank_counter(struct drm_device *dev, int crtc);
-
-extern int mdfld_enable_te(struct drm_device *dev, int pipe);
-extern void mdfld_disable_te(struct drm_device *dev, int pipe);
-
-/*
- * intel_opregion.c
- */
-extern int gma_intel_opregion_init(struct drm_device *dev);
-extern int gma_intel_opregion_exit(struct drm_device *dev);
-
-/*
- * framebuffer.c
- */
-extern int psbfb_probed(struct drm_device *dev);
-extern int psbfb_remove(struct drm_device *dev,
-                        struct drm_framebuffer *fb);
-/*
- * accel_2d.c
- */
-extern void psbfb_copyarea(struct fb_info *info,
-                                        const struct fb_copyarea *region);
-extern int psbfb_sync(struct fb_info *info);
-extern void psb_spank(struct drm_psb_private *dev_priv);
-extern int psb_accel_ioctl(struct drm_device *dev, void *data,
-                                                        struct drm_file *file);
-
-/*
- * psb_reset.c
- */
-
-extern void psb_lid_timer_init(struct drm_psb_private *dev_priv);
-extern void psb_lid_timer_takedown(struct drm_psb_private *dev_priv);
-extern void psb_print_pagefault(struct drm_psb_private *dev_priv);
-
-/* modesetting */
-extern void psb_modeset_init(struct drm_device *dev);
-extern void psb_modeset_cleanup(struct drm_device *dev);
-extern int psb_fbdev_init(struct drm_device *dev);
-
-/* backlight.c */
-int gma_backlight_init(struct drm_device *dev);
-void gma_backlight_exit(struct drm_device *dev);
-
-/* mrst_crtc.c */
-extern const struct drm_crtc_helper_funcs mrst_helper_funcs;
-
-/* mrst_lvds.c */
-extern void mrst_lvds_init(struct drm_device *dev,
-                    struct psb_intel_mode_device *mode_dev);
-
-/* psb_intel_display.c */
-extern const struct drm_crtc_helper_funcs psb_intel_helper_funcs;
-extern const struct drm_crtc_funcs psb_intel_crtc_funcs;
-
-/* psb_intel_lvds.c */
-extern const struct drm_connector_helper_funcs
-                                        psb_intel_lvds_connector_helper_funcs;
-extern const struct drm_connector_funcs psb_intel_lvds_connector_funcs;
-
-/* gem.c */
-extern int psb_gem_init_object(struct drm_gem_object *obj);
-extern void psb_gem_free_object(struct drm_gem_object *obj);
-extern int psb_gem_get_aperture(struct drm_device *dev, void *data,
-                        struct drm_file *file);
-extern int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
-                        struct drm_mode_create_dumb *args);
-extern int psb_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
-                        uint32_t handle);
-extern int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev,
-                        uint32_t handle, uint64_t *offset);
-extern int psb_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
-extern int psb_gem_create_ioctl(struct drm_device *dev, void *data,
-                        struct drm_file *file);
-extern int psb_gem_mmap_ioctl(struct drm_device *dev, void *data,
-                                        struct drm_file *file);
-
-/* psb_device.c */
-extern const struct psb_ops psb_chip_ops;
-
-/* mrst_device.c */
-extern const struct psb_ops mrst_chip_ops;
-
-/* mdfld_device.c */
-extern const struct psb_ops mdfld_chip_ops;
-
-/* cdv_device.c */
-extern const struct psb_ops cdv_chip_ops;
-
-/*
- * Debug print bits setting
- */
-#define PSB_D_GENERAL (1 << 0)
-#define PSB_D_INIT    (1 << 1)
-#define PSB_D_IRQ     (1 << 2)
-#define PSB_D_ENTRY   (1 << 3)
-/* debug the get H/V BP/FP count */
-#define PSB_D_HV      (1 << 4)
-#define PSB_D_DBI_BF  (1 << 5)
-#define PSB_D_PM      (1 << 6)
-#define PSB_D_RENDER  (1 << 7)
-#define PSB_D_REG     (1 << 8)
-#define PSB_D_MSVDX   (1 << 9)
-#define PSB_D_TOPAZ   (1 << 10)
-
-extern int drm_psb_no_fb;
-extern int drm_idle_check_interval;
-
-/*
- *      Utilities
- */
-
-static inline u32 MRST_MSG_READ32(uint port, uint offset)
-{
-        int mcr = (0xD0<<24) | (port << 16) | (offset << 8);
-        uint32_t ret_val = 0;
-        struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
-        pci_write_config_dword(pci_root, 0xD0, mcr);
-        pci_read_config_dword(pci_root, 0xD4, &ret_val);
-        pci_dev_put(pci_root);
-        return ret_val;
-}
-static inline void MRST_MSG_WRITE32(uint port, uint offset, u32 value)
-{
-        int mcr = (0xE0<<24) | (port << 16) | (offset << 8) | 0xF0;
-        struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
-        pci_write_config_dword(pci_root, 0xD4, value);
-        pci_write_config_dword(pci_root, 0xD0, mcr);
-        pci_dev_put(pci_root);
-}
-static inline u32 MDFLD_MSG_READ32(uint port, uint offset)
-{
-        int mcr = (0x10<<24) | (port << 16) | (offset << 8);
-        uint32_t ret_val = 0;
-        struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
-        pci_write_config_dword(pci_root, 0xD0, mcr);
-        pci_read_config_dword(pci_root, 0xD4, &ret_val);
-        pci_dev_put(pci_root);
-        return ret_val;
-}
-static inline void MDFLD_MSG_WRITE32(uint port, uint offset, u32 value)
-{
-        int mcr = (0x11<<24) | (port << 16) | (offset << 8) | 0xF0;
-        struct pci_dev *pci_root = pci_get_bus_and_slot(0, 0);
-        pci_write_config_dword(pci_root, 0xD4, value);
-        pci_write_config_dword(pci_root, 0xD0, mcr);
-        pci_dev_put(pci_root);
-}
-
-static inline uint32_t REGISTER_READ(struct drm_device *dev, uint32_t reg)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        return ioread32(dev_priv->vdc_reg + reg);
-}
-
-#define REG_READ(reg)          REGISTER_READ(dev, (reg))
-
-static inline void REGISTER_WRITE(struct drm_device *dev, uint32_t reg,
-                                      uint32_t val)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        iowrite32((val), dev_priv->vdc_reg + (reg));
-}
-
-#define REG_WRITE(reg, val)     REGISTER_WRITE(dev, (reg), (val))
-
-static inline void REGISTER_WRITE16(struct drm_device *dev,
-                                        uint32_t reg, uint32_t val)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        iowrite16((val), dev_priv->vdc_reg + (reg));
-}
-
-#define REG_WRITE16(reg, val)     REGISTER_WRITE16(dev, (reg), (val))
-
-static inline void REGISTER_WRITE8(struct drm_device *dev,
-                                       uint32_t reg, uint32_t val)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        iowrite8((val), dev_priv->vdc_reg + (reg));
-}
-
-#define REG_WRITE8(reg, val)            REGISTER_WRITE8(dev, (reg), (val))
-
-#define PSB_WVDC32(_val, _offs)         iowrite32(_val, dev_priv->vdc_reg + (_offs))
-#define PSB_RVDC32(_offs)               ioread32(dev_priv->vdc_reg + (_offs))
-
-/* #define TRAP_SGX_PM_FAULT 1 */
-#ifdef TRAP_SGX_PM_FAULT
-#define PSB_RSGX32(_offs)                                               \
-({                                                                      \
-        if (inl(dev_priv->apm_base + PSB_APM_STS) & 0x3) {              \
-                printk(KERN_ERR                                         \
-                        "access sgx when it's off!! (READ) %s, %d\n",   \
-               __FILE__, __LINE__);                                     \
-                melay(1000);                                            \
-        }                                                               \
-        ioread32(dev_priv->sgx_reg + (_offs));                          \
-})
-#else
-#define PSB_RSGX32(_offs)               ioread32(dev_priv->sgx_reg + (_offs))
-#endif
-#define PSB_WSGX32(_val, _offs)         iowrite32(_val, dev_priv->sgx_reg + (_offs))
-
-#define MSVDX_REG_DUMP 0
-
-#define PSB_WMSVDX32(_val, _offs)       iowrite32(_val, dev_priv->msvdx_reg + (_offs))
-#define PSB_RMSVDX32(_offs)             ioread32(dev_priv->msvdx_reg + (_offs))
-
-#endif
diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c
deleted file mode 100644
index 85659613ae62..000000000000
--- a/drivers/staging/gma500/psb_intel_display.c
+++ /dev/null
@@ -1,1429 +0,0 @@
-/*
- * Copyright © 2006-2011 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *      Eric Anholt <eric@anholt.net>
- */
-
-#include <linux/i2c.h>
-#include <linux/pm_runtime.h>
-
-#include <drm/drmP.h>
-#include "framebuffer.h"
-#include "psb_drv.h"
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "psb_intel_display.h"
-#include "power.h"
-
-#include "mdfld_output.h"
-
-struct psb_intel_clock_t {
-        /* given values */
-        int n;
-        int m1, m2;
-        int p1, p2;
-        /* derived values */
-        int dot;
-        int vco;
-        int m;
-        int p;
-};
-
-struct psb_intel_range_t {
-        int min, max;
-};
-
-struct psb_intel_p2_t {
-        int dot_limit;
-        int p2_slow, p2_fast;
-};
-
-#define INTEL_P2_NUM                  2
-
-struct psb_intel_limit_t {
-        struct psb_intel_range_t dot, vco, n, m, m1, m2, p, p1;
-        struct psb_intel_p2_t p2;
-};
-
-#define I8XX_DOT_MIN              25000
-#define I8XX_DOT_MAX             350000
-#define I8XX_VCO_MIN             930000
-#define I8XX_VCO_MAX            1400000
-#define I8XX_N_MIN                    3
-#define I8XX_N_MAX                   16
-#define I8XX_M_MIN                   96
-#define I8XX_M_MAX                  140
-#define I8XX_M1_MIN                  18
-#define I8XX_M1_MAX                  26
-#define I8XX_M2_MIN                   6
-#define I8XX_M2_MAX                  16
-#define I8XX_P_MIN                    4
-#define I8XX_P_MAX                  128
-#define I8XX_P1_MIN                   2
-#define I8XX_P1_MAX                  33
-#define I8XX_P1_LVDS_MIN              1
-#define I8XX_P1_LVDS_MAX              6
-#define I8XX_P2_SLOW                  4
-#define I8XX_P2_FAST                  2
-#define I8XX_P2_LVDS_SLOW             14
-#define I8XX_P2_LVDS_FAST             14        /* No fast option */
-#define I8XX_P2_SLOW_LIMIT       165000
-
-#define I9XX_DOT_MIN              20000
-#define I9XX_DOT_MAX             400000
-#define I9XX_VCO_MIN            1400000
-#define I9XX_VCO_MAX            2800000
-#define I9XX_N_MIN                    3
-#define I9XX_N_MAX                    8
-#define I9XX_M_MIN                   70
-#define I9XX_M_MAX                  120
-#define I9XX_M1_MIN                  10
-#define I9XX_M1_MAX                  20
-#define I9XX_M2_MIN                   5
-#define I9XX_M2_MAX                   9
-#define I9XX_P_SDVO_DAC_MIN           5
-#define I9XX_P_SDVO_DAC_MAX          80
-#define I9XX_P_LVDS_MIN               7
-#define I9XX_P_LVDS_MAX              98
-#define I9XX_P1_MIN                   1
-#define I9XX_P1_MAX                   8
-#define I9XX_P2_SDVO_DAC_SLOW                10
-#define I9XX_P2_SDVO_DAC_FAST                 5
-#define I9XX_P2_SDVO_DAC_SLOW_LIMIT      200000
-#define I9XX_P2_LVDS_SLOW                    14
-#define I9XX_P2_LVDS_FAST                     7
-#define I9XX_P2_LVDS_SLOW_LIMIT          112000
-
-#define INTEL_LIMIT_I8XX_DVO_DAC    0
-#define INTEL_LIMIT_I8XX_LVDS       1
-#define INTEL_LIMIT_I9XX_SDVO_DAC   2
-#define INTEL_LIMIT_I9XX_LVDS       3
-
-static const struct psb_intel_limit_t psb_intel_limits[] = {
-        {                       /* INTEL_LIMIT_I8XX_DVO_DAC */
-         .dot = {.min = I8XX_DOT_MIN, .max = I8XX_DOT_MAX},
-         .vco = {.min = I8XX_VCO_MIN, .max = I8XX_VCO_MAX},
-         .n = {.min = I8XX_N_MIN, .max = I8XX_N_MAX},
-         .m = {.min = I8XX_M_MIN, .max = I8XX_M_MAX},
-         .m1 = {.min = I8XX_M1_MIN, .max = I8XX_M1_MAX},
-         .m2 = {.min = I8XX_M2_MIN, .max = I8XX_M2_MAX},
-         .p = {.min = I8XX_P_MIN, .max = I8XX_P_MAX},
-         .p1 = {.min = I8XX_P1_MIN, .max = I8XX_P1_MAX},
-         .p2 = {.dot_limit = I8XX_P2_SLOW_LIMIT,
-                .p2_slow = I8XX_P2_SLOW, .p2_fast = I8XX_P2_FAST},
-         },
-        {                       /* INTEL_LIMIT_I8XX_LVDS */
-         .dot = {.min = I8XX_DOT_MIN, .max = I8XX_DOT_MAX},
-         .vco = {.min = I8XX_VCO_MIN, .max = I8XX_VCO_MAX},
-         .n = {.min = I8XX_N_MIN, .max = I8XX_N_MAX},
-         .m = {.min = I8XX_M_MIN, .max = I8XX_M_MAX},
-         .m1 = {.min = I8XX_M1_MIN, .max = I8XX_M1_MAX},
-         .m2 = {.min = I8XX_M2_MIN, .max = I8XX_M2_MAX},
-         .p = {.min = I8XX_P_MIN, .max = I8XX_P_MAX},
-         .p1 = {.min = I8XX_P1_LVDS_MIN, .max = I8XX_P1_LVDS_MAX},
-         .p2 = {.dot_limit = I8XX_P2_SLOW_LIMIT,
-                .p2_slow = I8XX_P2_LVDS_SLOW, .p2_fast = I8XX_P2_LVDS_FAST},
-         },
-        {                       /* INTEL_LIMIT_I9XX_SDVO_DAC */
-         .dot = {.min = I9XX_DOT_MIN, .max = I9XX_DOT_MAX},
-         .vco = {.min = I9XX_VCO_MIN, .max = I9XX_VCO_MAX},
-         .n = {.min = I9XX_N_MIN, .max = I9XX_N_MAX},
-         .m = {.min = I9XX_M_MIN, .max = I9XX_M_MAX},
-         .m1 = {.min = I9XX_M1_MIN, .max = I9XX_M1_MAX},
-         .m2 = {.min = I9XX_M2_MIN, .max = I9XX_M2_MAX},
-         .p = {.min = I9XX_P_SDVO_DAC_MIN, .max = I9XX_P_SDVO_DAC_MAX},
-         .p1 = {.min = I9XX_P1_MIN, .max = I9XX_P1_MAX},
-         .p2 = {.dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,
-                .p2_slow = I9XX_P2_SDVO_DAC_SLOW, .p2_fast =
-                I9XX_P2_SDVO_DAC_FAST},
-         },
-        {                       /* INTEL_LIMIT_I9XX_LVDS */
-         .dot = {.min = I9XX_DOT_MIN, .max = I9XX_DOT_MAX},
-         .vco = {.min = I9XX_VCO_MIN, .max = I9XX_VCO_MAX},
-         .n = {.min = I9XX_N_MIN, .max = I9XX_N_MAX},
-         .m = {.min = I9XX_M_MIN, .max = I9XX_M_MAX},
-         .m1 = {.min = I9XX_M1_MIN, .max = I9XX_M1_MAX},
-         .m2 = {.min = I9XX_M2_MIN, .max = I9XX_M2_MAX},
-         .p = {.min = I9XX_P_LVDS_MIN, .max = I9XX_P_LVDS_MAX},
-         .p1 = {.min = I9XX_P1_MIN, .max = I9XX_P1_MAX},
-         /* The single-channel range is 25-112Mhz, and dual-channel
-          * is 80-224Mhz.  Prefer single channel as much as possible.
-          */
-         .p2 = {.dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,
-                .p2_slow = I9XX_P2_LVDS_SLOW, .p2_fast = I9XX_P2_LVDS_FAST},
-         },
-};
-
-static const struct psb_intel_limit_t *psb_intel_limit(struct drm_crtc *crtc)
-{
-        const struct psb_intel_limit_t *limit;
-
-        if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS))
-                limit = &psb_intel_limits[INTEL_LIMIT_I9XX_LVDS];
-        else
-                limit = &psb_intel_limits[INTEL_LIMIT_I9XX_SDVO_DAC];
-        return limit;
-}
-
-/** Derive the pixel clock for the given refclk and divisors for 8xx chips. */
-
-static void i8xx_clock(int refclk, struct psb_intel_clock_t *clock)
-{
-        clock->m = 5 * (clock->m1 + 2) + (clock->m2 + 2);
-        clock->p = clock->p1 * clock->p2;
-        clock->vco = refclk * clock->m / (clock->n + 2);
-        clock->dot = clock->vco / clock->p;
-}
-
-/** Derive the pixel clock for the given refclk and divisors for 9xx chips. */
-
-static void i9xx_clock(int refclk, struct psb_intel_clock_t *clock)
-{
-        clock->m = 5 * (clock->m1 + 2) + (clock->m2 + 2);
-        clock->p = clock->p1 * clock->p2;
-        clock->vco = refclk * clock->m / (clock->n + 2);
-        clock->dot = clock->vco / clock->p;
-}
-
-static void psb_intel_clock(struct drm_device *dev, int refclk,
-                        struct psb_intel_clock_t *clock)
-{
-        return i9xx_clock(refclk, clock);
-}
-
-/**
- * Returns whether any output on the specified pipe is of the specified type
- */
-bool psb_intel_pipe_has_type(struct drm_crtc *crtc, int type)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_mode_config *mode_config = &dev->mode_config;
-        struct drm_connector *l_entry;
-
-        list_for_each_entry(l_entry, &mode_config->connector_list, head) {
-                if (l_entry->encoder && l_entry->encoder->crtc == crtc) {
-                        struct psb_intel_output *psb_intel_output =
-                            to_psb_intel_output(l_entry);
-                        if (psb_intel_output->type == type)
-                                return true;
-                }
-        }
-        return false;
-}
-
-#define INTELPllInvalid(s)   { /* ErrorF (s) */; return false; }
-/**
- * Returns whether the given set of divisors are valid for a given refclk with
- * the given connectors.
- */
-
-static bool psb_intel_PLL_is_valid(struct drm_crtc *crtc,
-                               struct psb_intel_clock_t *clock)
-{
-        const struct psb_intel_limit_t *limit = psb_intel_limit(crtc);
-
-        if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1)
-                INTELPllInvalid("p1 out of range\n");
-        if (clock->p < limit->p.min || limit->p.max < clock->p)
-                INTELPllInvalid("p out of range\n");
-        if (clock->m2 < limit->m2.min || limit->m2.max < clock->m2)
-                INTELPllInvalid("m2 out of range\n");
-        if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1)
-                INTELPllInvalid("m1 out of range\n");
-        if (clock->m1 <= clock->m2)
-                INTELPllInvalid("m1 <= m2\n");
-        if (clock->m < limit->m.min || limit->m.max < clock->m)
-                INTELPllInvalid("m out of range\n");
-        if (clock->n < limit->n.min || limit->n.max < clock->n)
-                INTELPllInvalid("n out of range\n");
-        if (clock->vco < limit->vco.min || limit->vco.max < clock->vco)
-                INTELPllInvalid("vco out of range\n");
-        /* XXX: We may need to be checking "Dot clock"
-         * depending on the multiplier, connector, etc.,
-         * rather than just a single range.
-         */
-        if (clock->dot < limit->dot.min || limit->dot.max < clock->dot)
-                INTELPllInvalid("dot out of range\n");
-
-        return true;
-}
-
-/**
- * Returns a set of divisors for the desired target clock with the given
- * refclk, or FALSE.  The returned values represent the clock equation:
- * reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2.
- */
-static bool psb_intel_find_best_PLL(struct drm_crtc *crtc, int target,
-                                int refclk,
-                                struct psb_intel_clock_t *best_clock)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_clock_t clock;
-        const struct psb_intel_limit_t *limit = psb_intel_limit(crtc);
-        int err = target;
-
-        if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
-            (REG_READ(LVDS) & LVDS_PORT_EN) != 0) {
-                /*
-                 * For LVDS, if the panel is on, just rely on its current
-                 * settings for dual-channel.  We haven't figured out how to
-                 * reliably set up different single/dual channel state, if we
-                 * even can.
-                 */
-                if ((REG_READ(LVDS) & LVDS_CLKB_POWER_MASK) ==
-                    LVDS_CLKB_POWER_UP)
-                        clock.p2 = limit->p2.p2_fast;
-                else
-                        clock.p2 = limit->p2.p2_slow;
-        } else {
-                if (target < limit->p2.dot_limit)
-                        clock.p2 = limit->p2.p2_slow;
-                else
-                        clock.p2 = limit->p2.p2_fast;
-        }
-
-        memset(best_clock, 0, sizeof(*best_clock));
-
-        for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max;
-             clock.m1++) {
-                for (clock.m2 = limit->m2.min;
-                     clock.m2 < clock.m1 && clock.m2 <= limit->m2.max;
-                     clock.m2++) {
-                        for (clock.n = limit->n.min;
-                             clock.n <= limit->n.max; clock.n++) {
-                                for (clock.p1 = limit->p1.min;
-                                     clock.p1 <= limit->p1.max;
-                                     clock.p1++) {
-                                        int this_err;
-
-                                        psb_intel_clock(dev, refclk, &clock);
-
-                                        if (!psb_intel_PLL_is_valid
-                                            (crtc, &clock))
-                                                continue;
-
-                                        this_err = abs(clock.dot - target);
-                                        if (this_err < err) {
-                                                *best_clock = clock;
-                                                err = this_err;
-                                        }
-                                }
-                        }
-                }
-        }
-
-        return err != target;
-}
-
-void psb_intel_wait_for_vblank(struct drm_device *dev)
-{
-        /* Wait for 20ms, i.e. one cycle at 50hz. */
-        mdelay(20);
-}
-
-int psb_intel_pipe_set_base(struct drm_crtc *crtc,
-                            int x, int y, struct drm_framebuffer *old_fb)
-{
-        struct drm_device *dev = crtc->dev;
-        /* struct drm_i915_master_private *master_priv; */
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
-        int pipe = psb_intel_crtc->pipe;
-        unsigned long start, offset;
-        int dspbase = (pipe == 0 ? DSPABASE : DSPBBASE);
-        int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);
-        int dspstride = (pipe == 0) ? DSPASTRIDE : DSPBSTRIDE;
-        int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
-        u32 dspcntr;
-        int ret = 0;
-
-        if (!gma_power_begin(dev, true))
-                return 0;
-
-        /* no fb bound */
-        if (!crtc->fb) {
-                dev_dbg(dev->dev, "No FB bound\n");
-                goto psb_intel_pipe_cleaner;
-        }
-
-        /* We are displaying this buffer, make sure it is actually loaded
-           into the GTT */
-        ret = psb_gtt_pin(psbfb->gtt);
-        if (ret < 0)
-                goto psb_intel_pipe_set_base_exit;
-        start = psbfb->gtt->offset;
-
-        offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
-
-        REG_WRITE(dspstride, crtc->fb->pitches[0]);
-
-        dspcntr = REG_READ(dspcntr_reg);
-        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
-
-        switch (crtc->fb->bits_per_pixel) {
-        case 8:
-                dspcntr |= DISPPLANE_8BPP;
-                break;
-        case 16:
-                if (crtc->fb->depth == 15)
-                        dspcntr |= DISPPLANE_15_16BPP;
-                else
-                        dspcntr |= DISPPLANE_16BPP;
-                break;
-        case 24:
-        case 32:
-                dspcntr |= DISPPLANE_32BPP_NO_ALPHA;
-                break;
-        default:
-                dev_err(dev->dev, "Unknown color depth\n");
-                ret = -EINVAL;
-                psb_gtt_unpin(psbfb->gtt);
-                goto psb_intel_pipe_set_base_exit;
-        }
-        REG_WRITE(dspcntr_reg, dspcntr);
-
-
-        if (0 /* FIXMEAC - check what PSB needs */) {
-                REG_WRITE(dspbase, offset);
-                REG_READ(dspbase);
-                REG_WRITE(dspsurf, start);
-                REG_READ(dspsurf);
-        } else {
-                REG_WRITE(dspbase, start + offset);
-                REG_READ(dspbase);
-        }
-
-psb_intel_pipe_cleaner:
-        /* If there was a previous display we can now unpin it */
-        if (old_fb)
-                psb_gtt_unpin(to_psb_fb(old_fb)->gtt);
-
-psb_intel_pipe_set_base_exit:
-        gma_power_end(dev);
-        return ret;
-}
-
-/**
- * Sets the power management mode of the pipe and plane.
- *
- * This code should probably grow support for turning the cursor off and back
- * on appropriately at the same time as we're turning the pipe off/on.
- */
-static void psb_intel_crtc_dpms(struct drm_crtc *crtc, int mode)
-{
-        struct drm_device *dev = crtc->dev;
-        /* struct drm_i915_master_private *master_priv; */
-        /* struct drm_i915_private *dev_priv = dev->dev_private; */
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
-        int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
-        int dspbase_reg = (pipe == 0) ? DSPABASE : DSPBBASE;
-        int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
-        u32 temp;
-        bool enabled;
-
-        /* XXX: When our outputs are all unaware of DPMS modes other than off
-         * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.
-         */
-        switch (mode) {
-        case DRM_MODE_DPMS_ON:
-        case DRM_MODE_DPMS_STANDBY:
-        case DRM_MODE_DPMS_SUSPEND:
-                /* Enable the DPLL */
-                temp = REG_READ(dpll_reg);
-                if ((temp & DPLL_VCO_ENABLE) == 0) {
-                        REG_WRITE(dpll_reg, temp);
-                        REG_READ(dpll_reg);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                        REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);
-                        REG_READ(dpll_reg);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                        REG_WRITE(dpll_reg, temp | DPLL_VCO_ENABLE);
-                        REG_READ(dpll_reg);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                }
-
-                /* Enable the pipe */
-                temp = REG_READ(pipeconf_reg);
-                if ((temp & PIPEACONF_ENABLE) == 0)
-                        REG_WRITE(pipeconf_reg, temp | PIPEACONF_ENABLE);
-
-                /* Enable the plane */
-                temp = REG_READ(dspcntr_reg);
-                if ((temp & DISPLAY_PLANE_ENABLE) == 0) {
-                        REG_WRITE(dspcntr_reg,
-                                  temp | DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));
-                }
-
-                psb_intel_crtc_load_lut(crtc);
-
-                /* Give the overlay scaler a chance to enable
-                 * if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, true); TODO */
-                break;
-        case DRM_MODE_DPMS_OFF:
-                /* Give the overlay scaler a chance to disable
-                 * if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, FALSE); TODO */
-
-                /* Disable the VGA plane that we never use */
-                REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);
-
-                /* Disable display plane */
-                temp = REG_READ(dspcntr_reg);
-                if ((temp & DISPLAY_PLANE_ENABLE) != 0) {
-                        REG_WRITE(dspcntr_reg,
-                                  temp & ~DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(dspbase_reg, REG_READ(dspbase_reg));
-                        REG_READ(dspbase_reg);
-                }
-
-                /* Next, disable display pipes */
-                temp = REG_READ(pipeconf_reg);
-                if ((temp & PIPEACONF_ENABLE) != 0) {
-                        REG_WRITE(pipeconf_reg, temp & ~PIPEACONF_ENABLE);
-                        REG_READ(pipeconf_reg);
-                }
-
-                /* Wait for vblank for the disable to take effect. */
-                psb_intel_wait_for_vblank(dev);
-
-                temp = REG_READ(dpll_reg);
-                if ((temp & DPLL_VCO_ENABLE) != 0) {
-                        REG_WRITE(dpll_reg, temp & ~DPLL_VCO_ENABLE);
-                        REG_READ(dpll_reg);
-                }
-
-                /* Wait for the clocks to turn off. */
-                udelay(150);
-                break;
-        }
-
-        enabled = crtc->enabled && mode != DRM_MODE_DPMS_OFF;
-
-        /*Set FIFO Watermarks*/
-        REG_WRITE(DSPARB, 0x3F3E);
-}
-
-static void psb_intel_crtc_prepare(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
-}
-
-static void psb_intel_crtc_commit(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-}
-
-void psb_intel_encoder_prepare(struct drm_encoder *encoder)
-{
-        struct drm_encoder_helper_funcs *encoder_funcs =
-            encoder->helper_private;
-        /* lvds has its own version of prepare see psb_intel_lvds_prepare */
-        encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF);
-}
-
-void psb_intel_encoder_commit(struct drm_encoder *encoder)
-{
-        struct drm_encoder_helper_funcs *encoder_funcs =
-            encoder->helper_private;
-        /* lvds has its own version of commit see psb_intel_lvds_commit */
-        encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
-}
-
-static bool psb_intel_crtc_mode_fixup(struct drm_crtc *crtc,
-                                  struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
-
-/**
- * Return the pipe currently connected to the panel fitter,
- * or -1 if the panel fitter is not present or not in use
- */
-static int psb_intel_panel_fitter_pipe(struct drm_device *dev)
-{
-        u32 pfit_control;
-
-        pfit_control = REG_READ(PFIT_CONTROL);
-
-        /* See if the panel fitter is in use */
-        if ((pfit_control & PFIT_ENABLE) == 0)
-                return -1;
-        /* Must be on PIPE 1 for PSB */
-        return 1;
-}
-
-static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,
-                               struct drm_display_mode *mode,
-                               struct drm_display_mode *adjusted_mode,
-                               int x, int y,
-                               struct drm_framebuffer *old_fb)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        int pipe = psb_intel_crtc->pipe;
-        int fp_reg = (pipe == 0) ? FPA0 : FPB0;
-        int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
-        int dspcntr_reg = (pipe == 0) ? DSPACNTR : DSPBCNTR;
-        int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
-        int htot_reg = (pipe == 0) ? HTOTAL_A : HTOTAL_B;
-        int hblank_reg = (pipe == 0) ? HBLANK_A : HBLANK_B;
-        int hsync_reg = (pipe == 0) ? HSYNC_A : HSYNC_B;
-        int vtot_reg = (pipe == 0) ? VTOTAL_A : VTOTAL_B;
-        int vblank_reg = (pipe == 0) ? VBLANK_A : VBLANK_B;
-        int vsync_reg = (pipe == 0) ? VSYNC_A : VSYNC_B;
-        int dspsize_reg = (pipe == 0) ? DSPASIZE : DSPBSIZE;
-        int dsppos_reg = (pipe == 0) ? DSPAPOS : DSPBPOS;
-        int pipesrc_reg = (pipe == 0) ? PIPEASRC : PIPEBSRC;
-        int refclk;
-        struct psb_intel_clock_t clock;
-        u32 dpll = 0, fp = 0, dspcntr, pipeconf;
-        bool ok, is_sdvo = false, is_dvo = false;
-        bool is_crt = false, is_lvds = false, is_tv = false;
-        struct drm_mode_config *mode_config = &dev->mode_config;
-        struct drm_connector *connector;
-
-        /* No scan out no play */
-        if (crtc->fb == NULL) {
-                crtc_funcs->mode_set_base(crtc, x, y, old_fb);
-                return 0;
-        }
-
-        list_for_each_entry(connector, &mode_config->connector_list, head) {
-                struct psb_intel_output *psb_intel_output =
-                    to_psb_intel_output(connector);
-
-                if (!connector->encoder
-                    || connector->encoder->crtc != crtc)
-                        continue;
-
-                switch (psb_intel_output->type) {
-                case INTEL_OUTPUT_LVDS:
-                        is_lvds = true;
-                        break;
-                case INTEL_OUTPUT_SDVO:
-                        is_sdvo = true;
-                        break;
-                case INTEL_OUTPUT_DVO:
-                        is_dvo = true;
-                        break;
-                case INTEL_OUTPUT_TVOUT:
-                        is_tv = true;
-                        break;
-                case INTEL_OUTPUT_ANALOG:
-                        is_crt = true;
-                        break;
-                }
-        }
-
-        refclk = 96000;
-
-        ok = psb_intel_find_best_PLL(crtc, adjusted_mode->clock, refclk,
-                                 &clock);
-        if (!ok) {
-                dev_err(dev->dev, "Couldn't find PLL settings for mode!\n");
-                return 0;
-        }
-
-        fp = clock.n << 16 | clock.m1 << 8 | clock.m2;
-
-        dpll = DPLL_VGA_MODE_DIS;
-        if (is_lvds) {
-                dpll |= DPLLB_MODE_LVDS;
-                dpll |= DPLL_DVO_HIGH_SPEED;
-        } else
-                dpll |= DPLLB_MODE_DAC_SERIAL;
-        if (is_sdvo) {
-                int sdvo_pixel_multiply =
-                            adjusted_mode->clock / mode->clock;
-                dpll |= DPLL_DVO_HIGH_SPEED;
-                dpll |=
-                    (sdvo_pixel_multiply - 1) << SDVO_MULTIPLIER_SHIFT_HIRES;
-        }
-
-        /* compute bitmask from p1 value */
-        dpll |= (1 << (clock.p1 - 1)) << 16;
-        switch (clock.p2) {
-        case 5:
-                dpll |= DPLL_DAC_SERIAL_P2_CLOCK_DIV_5;
-                break;
-        case 7:
-                dpll |= DPLLB_LVDS_P2_CLOCK_DIV_7;
-                break;
-        case 10:
-                dpll |= DPLL_DAC_SERIAL_P2_CLOCK_DIV_10;
-                break;
-        case 14:
-                dpll |= DPLLB_LVDS_P2_CLOCK_DIV_14;
-                break;
-        }
-
-        if (is_tv) {
-                /* XXX: just matching BIOS for now */
-/*      dpll |= PLL_REF_INPUT_TVCLKINBC; */
-                dpll |= 3;
-        }
-        dpll |= PLL_REF_INPUT_DREFCLK;
-
-        /* setup pipeconf */
-        pipeconf = REG_READ(pipeconf_reg);
-
-        /* Set up the display plane register */
-        dspcntr = DISPPLANE_GAMMA_ENABLE;
-
-        if (pipe == 0)
-                dspcntr |= DISPPLANE_SEL_PIPE_A;
-        else
-                dspcntr |= DISPPLANE_SEL_PIPE_B;
-
-        dspcntr |= DISPLAY_PLANE_ENABLE;
-        pipeconf |= PIPEACONF_ENABLE;
-        dpll |= DPLL_VCO_ENABLE;
-
-
-        /* Disable the panel fitter if it was on our pipe */
-        if (psb_intel_panel_fitter_pipe(dev) == pipe)
-                REG_WRITE(PFIT_CONTROL, 0);
-
-        drm_mode_debug_printmodeline(mode);
-
-        if (dpll & DPLL_VCO_ENABLE) {
-                REG_WRITE(fp_reg, fp);
-                REG_WRITE(dpll_reg, dpll & ~DPLL_VCO_ENABLE);
-                REG_READ(dpll_reg);
-                udelay(150);
-        }
-
-        /* The LVDS pin pair needs to be on before the DPLLs are enabled.
-         * This is an exception to the general rule that mode_set doesn't turn
-         * things on.
-         */
-        if (is_lvds) {
-                u32 lvds = REG_READ(LVDS);
-
-                lvds &= ~LVDS_PIPEB_SELECT;
-                if (pipe == 1)
-                        lvds |= LVDS_PIPEB_SELECT;
-
-                lvds |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP;
-                /* Set the B0-B3 data pairs corresponding to
-                 * whether we're going to
-                 * set the DPLLs for dual-channel mode or not.
-                 */
-                lvds &= ~(LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP);
-                if (clock.p2 == 7)
-                        lvds |= LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP;
-
-                /* It would be nice to set 24 vs 18-bit mode (LVDS_A3_POWER_UP)
-                 * appropriately here, but we need to look more
-                 * thoroughly into how panels behave in the two modes.
-                 */
-
-                REG_WRITE(LVDS, lvds);
-                REG_READ(LVDS);
-        }
-
-        REG_WRITE(fp_reg, fp);
-        REG_WRITE(dpll_reg, dpll);
-        REG_READ(dpll_reg);
-        /* Wait for the clocks to stabilize. */
-        udelay(150);
-
-        /* write it again -- the BIOS does, after all */
-        REG_WRITE(dpll_reg, dpll);
-
-        REG_READ(dpll_reg);
-        /* Wait for the clocks to stabilize. */
-        udelay(150);
-
-        REG_WRITE(htot_reg, (adjusted_mode->crtc_hdisplay - 1) |
-                  ((adjusted_mode->crtc_htotal - 1) << 16));
-        REG_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - 1) |
-                  ((adjusted_mode->crtc_hblank_end - 1) << 16));
-        REG_WRITE(hsync_reg, (adjusted_mode->crtc_hsync_start - 1) |
-                  ((adjusted_mode->crtc_hsync_end - 1) << 16));
-        REG_WRITE(vtot_reg, (adjusted_mode->crtc_vdisplay - 1) |
-                  ((adjusted_mode->crtc_vtotal - 1) << 16));
-        REG_WRITE(vblank_reg, (adjusted_mode->crtc_vblank_start - 1) |
-                  ((adjusted_mode->crtc_vblank_end - 1) << 16));
-        REG_WRITE(vsync_reg, (adjusted_mode->crtc_vsync_start - 1) |
-                  ((adjusted_mode->crtc_vsync_end - 1) << 16));
-        /* pipesrc and dspsize control the size that is scaled from,
-         * which should always be the user's requested size.
-         */
-        REG_WRITE(dspsize_reg,
-                  ((mode->vdisplay - 1) << 16) | (mode->hdisplay - 1));
-        REG_WRITE(dsppos_reg, 0);
-        REG_WRITE(pipesrc_reg,
-                  ((mode->hdisplay - 1) << 16) | (mode->vdisplay - 1));
-        REG_WRITE(pipeconf_reg, pipeconf);
-        REG_READ(pipeconf_reg);
-
-        psb_intel_wait_for_vblank(dev);
-
-        REG_WRITE(dspcntr_reg, dspcntr);
-
-        /* Flush the plane changes */
-        crtc_funcs->mode_set_base(crtc, x, y, old_fb);
-
-        psb_intel_wait_for_vblank(dev);
-
-        return 0;
-}
-
-/** Loads the palette/gamma unit for the CRTC with the prepared values */
-void psb_intel_crtc_load_lut(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv =
-                                (struct drm_psb_private *)dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int palreg = PALETTE_A;
-        int i;
-
-        /* The clocks have to be on to load the palette. */
-        if (!crtc->enabled)
-                return;
-
-        switch (psb_intel_crtc->pipe) {
-        case 0:
-                break;
-        case 1:
-                palreg = PALETTE_B;
-                break;
-        case 2:
-                palreg = PALETTE_C;
-                break;
-        default:
-                dev_err(dev->dev, "Illegal Pipe Number.\n");
-                return;
-        }
-
-        if (gma_power_begin(dev, false)) {
-                for (i = 0; i < 256; i++) {
-                        REG_WRITE(palreg + 4 * i,
-                                  ((psb_intel_crtc->lut_r[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 16) |
-                                  ((psb_intel_crtc->lut_g[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 8) |
-                                  (psb_intel_crtc->lut_b[i] +
-                                  psb_intel_crtc->lut_adj[i]));
-                }
-                gma_power_end(dev);
-        } else {
-                for (i = 0; i < 256; i++) {
-                        dev_priv->save_palette_a[i] =
-                                  ((psb_intel_crtc->lut_r[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 16) |
-                                  ((psb_intel_crtc->lut_g[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 8) |
-                                  (psb_intel_crtc->lut_b[i] +
-                                  psb_intel_crtc->lut_adj[i]);
-                }
-
-        }
-}
-
-/**
- * Save HW states of giving crtc
- */
-static void psb_intel_crtc_save(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        /* struct drm_psb_private *dev_priv =
-                        (struct drm_psb_private *)dev->dev_private; */
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct psb_intel_crtc_state *crtc_state = psb_intel_crtc->crtc_state;
-        int pipeA = (psb_intel_crtc->pipe == 0);
-        uint32_t paletteReg;
-        int i;
-
-        if (!crtc_state) {
-                dev_err(dev->dev, "No CRTC state found\n");
-                return;
-        }
-
-        crtc_state->saveDSPCNTR = REG_READ(pipeA ? DSPACNTR : DSPBCNTR);
-        crtc_state->savePIPECONF = REG_READ(pipeA ? PIPEACONF : PIPEBCONF);
-        crtc_state->savePIPESRC = REG_READ(pipeA ? PIPEASRC : PIPEBSRC);
-        crtc_state->saveFP0 = REG_READ(pipeA ? FPA0 : FPB0);
-        crtc_state->saveFP1 = REG_READ(pipeA ? FPA1 : FPB1);
-        crtc_state->saveDPLL = REG_READ(pipeA ? DPLL_A : DPLL_B);
-        crtc_state->saveHTOTAL = REG_READ(pipeA ? HTOTAL_A : HTOTAL_B);
-        crtc_state->saveHBLANK = REG_READ(pipeA ? HBLANK_A : HBLANK_B);
-        crtc_state->saveHSYNC = REG_READ(pipeA ? HSYNC_A : HSYNC_B);
-        crtc_state->saveVTOTAL = REG_READ(pipeA ? VTOTAL_A : VTOTAL_B);
-        crtc_state->saveVBLANK = REG_READ(pipeA ? VBLANK_A : VBLANK_B);
-        crtc_state->saveVSYNC = REG_READ(pipeA ? VSYNC_A : VSYNC_B);
-        crtc_state->saveDSPSTRIDE = REG_READ(pipeA ? DSPASTRIDE : DSPBSTRIDE);
-
-        /*NOTE: DSPSIZE DSPPOS only for psb*/
-        crtc_state->saveDSPSIZE = REG_READ(pipeA ? DSPASIZE : DSPBSIZE);
-        crtc_state->saveDSPPOS = REG_READ(pipeA ? DSPAPOS : DSPBPOS);
-
-        crtc_state->saveDSPBASE = REG_READ(pipeA ? DSPABASE : DSPBBASE);
-
-        paletteReg = pipeA ? PALETTE_A : PALETTE_B;
-        for (i = 0; i < 256; ++i)
-                crtc_state->savePalette[i] = REG_READ(paletteReg + (i << 2));
-}
-
-/**
- * Restore HW states of giving crtc
- */
-static void psb_intel_crtc_restore(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        /* struct drm_psb_private * dev_priv =
-                                (struct drm_psb_private *)dev->dev_private; */
-        struct psb_intel_crtc *psb_intel_crtc =  to_psb_intel_crtc(crtc);
-        struct psb_intel_crtc_state *crtc_state = psb_intel_crtc->crtc_state;
-        /* struct drm_crtc_helper_funcs * crtc_funcs = crtc->helper_private; */
-        int pipeA = (psb_intel_crtc->pipe == 0);
-        uint32_t paletteReg;
-        int i;
-
-        if (!crtc_state) {
-                dev_err(dev->dev, "No crtc state\n");
-                return;
-        }
-
-        if (crtc_state->saveDPLL & DPLL_VCO_ENABLE) {
-                REG_WRITE(pipeA ? DPLL_A : DPLL_B,
-                        crtc_state->saveDPLL & ~DPLL_VCO_ENABLE);
-                REG_READ(pipeA ? DPLL_A : DPLL_B);
-                udelay(150);
-        }
-
-        REG_WRITE(pipeA ? FPA0 : FPB0, crtc_state->saveFP0);
-        REG_READ(pipeA ? FPA0 : FPB0);
-
-        REG_WRITE(pipeA ? FPA1 : FPB1, crtc_state->saveFP1);
-        REG_READ(pipeA ? FPA1 : FPB1);
-
-        REG_WRITE(pipeA ? DPLL_A : DPLL_B, crtc_state->saveDPLL);
-        REG_READ(pipeA ? DPLL_A : DPLL_B);
-        udelay(150);
-
-        REG_WRITE(pipeA ? HTOTAL_A : HTOTAL_B, crtc_state->saveHTOTAL);
-        REG_WRITE(pipeA ? HBLANK_A : HBLANK_B, crtc_state->saveHBLANK);
-        REG_WRITE(pipeA ? HSYNC_A : HSYNC_B, crtc_state->saveHSYNC);
-        REG_WRITE(pipeA ? VTOTAL_A : VTOTAL_B, crtc_state->saveVTOTAL);
-        REG_WRITE(pipeA ? VBLANK_A : VBLANK_B, crtc_state->saveVBLANK);
-        REG_WRITE(pipeA ? VSYNC_A : VSYNC_B, crtc_state->saveVSYNC);
-        REG_WRITE(pipeA ? DSPASTRIDE : DSPBSTRIDE, crtc_state->saveDSPSTRIDE);
-
-        REG_WRITE(pipeA ? DSPASIZE : DSPBSIZE, crtc_state->saveDSPSIZE);
-        REG_WRITE(pipeA ? DSPAPOS : DSPBPOS, crtc_state->saveDSPPOS);
-
-        REG_WRITE(pipeA ? PIPEASRC : PIPEBSRC, crtc_state->savePIPESRC);
-        REG_WRITE(pipeA ? DSPABASE : DSPBBASE, crtc_state->saveDSPBASE);
-        REG_WRITE(pipeA ? PIPEACONF : PIPEBCONF, crtc_state->savePIPECONF);
-
-        psb_intel_wait_for_vblank(dev);
-
-        REG_WRITE(pipeA ? DSPACNTR : DSPBCNTR, crtc_state->saveDSPCNTR);
-        REG_WRITE(pipeA ? DSPABASE : DSPBBASE, crtc_state->saveDSPBASE);
-
-        psb_intel_wait_for_vblank(dev);
-
-        paletteReg = pipeA ? PALETTE_A : PALETTE_B;
-        for (i = 0; i < 256; ++i)
-                REG_WRITE(paletteReg + (i << 2), crtc_state->savePalette[i]);
-}
-
-static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
-                                 struct drm_file *file_priv,
-                                 uint32_t handle,
-                                 uint32_t width, uint32_t height)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;
-        uint32_t base = (pipe == 0) ? CURABASE : CURBBASE;
-        uint32_t temp;
-        size_t addr = 0;
-        struct gtt_range *gt;
-        struct drm_gem_object *obj;
-        int ret;
-
-        /* if we want to turn of the cursor ignore width and height */
-        if (!handle) {
-                /* turn off the cursor */
-                temp = CURSOR_MODE_DISABLE;
-
-                if (gma_power_begin(dev, false)) {
-                        REG_WRITE(control, temp);
-                        REG_WRITE(base, 0);
-                        gma_power_end(dev);
-                }
-
-                /* Unpin the old GEM object */
-                if (psb_intel_crtc->cursor_obj) {
-                        gt = container_of(psb_intel_crtc->cursor_obj,
-                                                        struct gtt_range, gem);
-                        psb_gtt_unpin(gt);
-                        drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-                        psb_intel_crtc->cursor_obj = NULL;
-                }
-
-                return 0;
-        }
-
-        /* Currently we only support 64x64 cursors */
-        if (width != 64 || height != 64) {
-                dev_dbg(dev->dev, "we currently only support 64x64 cursors\n");
-                return -EINVAL;
-        }
-
-        obj = drm_gem_object_lookup(dev, file_priv, handle);
-        if (!obj)
-                return -ENOENT;
-
-        if (obj->size < width * height * 4) {
-                dev_dbg(dev->dev, "buffer is to small\n");
-                return -ENOMEM;
-        }
-
-        gt = container_of(obj, struct gtt_range, gem);
-
-        /* Pin the memory into the GTT */
-        ret = psb_gtt_pin(gt);
-        if (ret) {
-                dev_err(dev->dev, "Can not pin down handle 0x%x\n", handle);
-                return ret;
-        }
-
-
-        addr = gt->offset;      /* Or resource.start ??? */
-
-        psb_intel_crtc->cursor_addr = addr;
-
-        temp = 0;
-        /* set the pipe for the cursor */
-        temp |= (pipe << 28);
-        temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
-
-        if (gma_power_begin(dev, false)) {
-                REG_WRITE(control, temp);
-                REG_WRITE(base, addr);
-                gma_power_end(dev);
-        }
-
-        /* unpin the old bo */
-        if (psb_intel_crtc->cursor_obj) {
-                gt = container_of(psb_intel_crtc->cursor_obj,
-                                                        struct gtt_range, gem);
-                psb_gtt_unpin(gt);
-                drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-                psb_intel_crtc->cursor_obj = obj;
-        }
-        return 0;
-}
-
-static int psb_intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        uint32_t temp = 0;
-        uint32_t addr;
-
-
-        if (x < 0) {
-                temp |= (CURSOR_POS_SIGN << CURSOR_X_SHIFT);
-                x = -x;
-        }
-        if (y < 0) {
-                temp |= (CURSOR_POS_SIGN << CURSOR_Y_SHIFT);
-                y = -y;
-        }
-
-        temp |= ((x & CURSOR_POS_MASK) << CURSOR_X_SHIFT);
-        temp |= ((y & CURSOR_POS_MASK) << CURSOR_Y_SHIFT);
-
-        addr = psb_intel_crtc->cursor_addr;
-
-        if (gma_power_begin(dev, false)) {
-                REG_WRITE((pipe == 0) ? CURAPOS : CURBPOS, temp);
-                REG_WRITE((pipe == 0) ? CURABASE : CURBBASE, addr);
-                gma_power_end(dev);
-        }
-        return 0;
-}
-
-void psb_intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,
-                         u16 *green, u16 *blue, uint32_t type, uint32_t size)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int i;
-
-        if (size != 256)
-                return;
-
-        for (i = 0; i < 256; i++) {
-                psb_intel_crtc->lut_r[i] = red[i] >> 8;
-                psb_intel_crtc->lut_g[i] = green[i] >> 8;
-                psb_intel_crtc->lut_b[i] = blue[i] >> 8;
-        }
-
-        psb_intel_crtc_load_lut(crtc);
-}
-
-static int psb_crtc_set_config(struct drm_mode_set *set)
-{
-        int ret;
-        struct drm_device *dev = set->crtc->dev;
-
-        pm_runtime_forbid(&dev->pdev->dev);
-        ret = drm_crtc_helper_set_config(set);
-        pm_runtime_allow(&dev->pdev->dev);
-        return ret;
-}
-
-/* Returns the clock of the currently programmed mode of the given pipe. */
-static int psb_intel_crtc_clock_get(struct drm_device *dev,
-                                struct drm_crtc *crtc)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        u32 dpll;
-        u32 fp;
-        struct psb_intel_clock_t clock;
-        bool is_lvds;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (gma_power_begin(dev, false)) {
-                dpll = REG_READ((pipe == 0) ? DPLL_A : DPLL_B);
-                if ((dpll & DISPLAY_RATE_SELECT_FPA1) == 0)
-                        fp = REG_READ((pipe == 0) ? FPA0 : FPB0);
-                else
-                        fp = REG_READ((pipe == 0) ? FPA1 : FPB1);
-                is_lvds = (pipe == 1) && (REG_READ(LVDS) & LVDS_PORT_EN);
-                gma_power_end(dev);
-        } else {
-                dpll = (pipe == 0) ?
-                        dev_priv->saveDPLL_A : dev_priv->saveDPLL_B;
-
-                if ((dpll & DISPLAY_RATE_SELECT_FPA1) == 0)
-                        fp = (pipe == 0) ?
-                                dev_priv->saveFPA0 :
-                                dev_priv->saveFPB0;
-                else
-                        fp = (pipe == 0) ?
-                                dev_priv->saveFPA1 :
-                                dev_priv->saveFPB1;
-
-                is_lvds = (pipe == 1) && (dev_priv->saveLVDS & LVDS_PORT_EN);
-        }
-
-        clock.m1 = (fp & FP_M1_DIV_MASK) >> FP_M1_DIV_SHIFT;
-        clock.m2 = (fp & FP_M2_DIV_MASK) >> FP_M2_DIV_SHIFT;
-        clock.n = (fp & FP_N_DIV_MASK) >> FP_N_DIV_SHIFT;
-
-        if (is_lvds) {
-                clock.p1 =
-                    ffs((dpll &
-                         DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS) >>
-                        DPLL_FPA01_P1_POST_DIV_SHIFT);
-                clock.p2 = 14;
-
-                if ((dpll & PLL_REF_INPUT_MASK) ==
-                    PLLB_REF_INPUT_SPREADSPECTRUMIN) {
-                        /* XXX: might not be 66MHz */
-                        i8xx_clock(66000, &clock);
-                } else
-                        i8xx_clock(48000, &clock);
-        } else {
-                if (dpll & PLL_P1_DIVIDE_BY_TWO)
-                        clock.p1 = 2;
-                else {
-                        clock.p1 =
-                            ((dpll &
-                              DPLL_FPA01_P1_POST_DIV_MASK_I830) >>
-                             DPLL_FPA01_P1_POST_DIV_SHIFT) + 2;
-                }
-                if (dpll & PLL_P2_DIVIDE_BY_4)
-                        clock.p2 = 4;
-                else
-                        clock.p2 = 2;
-
-                i8xx_clock(48000, &clock);
-        }
-
-        /* XXX: It would be nice to validate the clocks, but we can't reuse
-         * i830PllIsValid() because it relies on the xf86_config connector
-         * configuration being accurate, which it isn't necessarily.
-         */
-
-        return clock.dot;
-}
-
-/** Returns the currently programmed mode of the given pipe. */
-struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,
-                                             struct drm_crtc *crtc)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        struct drm_display_mode *mode;
-        int htot;
-        int hsync;
-        int vtot;
-        int vsync;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (gma_power_begin(dev, false)) {
-                htot = REG_READ((pipe == 0) ? HTOTAL_A : HTOTAL_B);
-                hsync = REG_READ((pipe == 0) ? HSYNC_A : HSYNC_B);
-                vtot = REG_READ((pipe == 0) ? VTOTAL_A : VTOTAL_B);
-                vsync = REG_READ((pipe == 0) ? VSYNC_A : VSYNC_B);
-                gma_power_end(dev);
-        } else {
-                htot = (pipe == 0) ?
-                        dev_priv->saveHTOTAL_A : dev_priv->saveHTOTAL_B;
-                hsync = (pipe == 0) ?
-                        dev_priv->saveHSYNC_A : dev_priv->saveHSYNC_B;
-                vtot = (pipe == 0) ?
-                        dev_priv->saveVTOTAL_A : dev_priv->saveVTOTAL_B;
-                vsync = (pipe == 0) ?
-                        dev_priv->saveVSYNC_A : dev_priv->saveVSYNC_B;
-        }
-
-        mode = kzalloc(sizeof(*mode), GFP_KERNEL);
-        if (!mode)
-                return NULL;
-
-        mode->clock = psb_intel_crtc_clock_get(dev, crtc);
-        mode->hdisplay = (htot & 0xffff) + 1;
-        mode->htotal = ((htot & 0xffff0000) >> 16) + 1;
-        mode->hsync_start = (hsync & 0xffff) + 1;
-        mode->hsync_end = ((hsync & 0xffff0000) >> 16) + 1;
-        mode->vdisplay = (vtot & 0xffff) + 1;
-        mode->vtotal = ((vtot & 0xffff0000) >> 16) + 1;
-        mode->vsync_start = (vsync & 0xffff) + 1;
-        mode->vsync_end = ((vsync & 0xffff0000) >> 16) + 1;
-
-        drm_mode_set_name(mode);
-        drm_mode_set_crtcinfo(mode, 0);
-
-        return mode;
-}
-
-void psb_intel_crtc_destroy(struct drm_crtc *crtc)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct gtt_range *gt;
-
-        /* Unpin the old GEM object */
-        if (psb_intel_crtc->cursor_obj) {
-                gt = container_of(psb_intel_crtc->cursor_obj,
-                                                struct gtt_range, gem);
-                psb_gtt_unpin(gt);
-                drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-                psb_intel_crtc->cursor_obj = NULL;
-        }
-        kfree(psb_intel_crtc->crtc_state);
-        drm_crtc_cleanup(crtc);
-        kfree(psb_intel_crtc);
-}
-
-const struct drm_crtc_helper_funcs psb_intel_helper_funcs = {
-        .dpms = psb_intel_crtc_dpms,
-        .mode_fixup = psb_intel_crtc_mode_fixup,
-        .mode_set = psb_intel_crtc_mode_set,
-        .mode_set_base = psb_intel_pipe_set_base,
-        .prepare = psb_intel_crtc_prepare,
-        .commit = psb_intel_crtc_commit,
-};
-
-const struct drm_crtc_funcs psb_intel_crtc_funcs = {
-        .save = psb_intel_crtc_save,
-        .restore = psb_intel_crtc_restore,
-        .cursor_set = psb_intel_crtc_cursor_set,
-        .cursor_move = psb_intel_crtc_cursor_move,
-        .gamma_set = psb_intel_crtc_gamma_set,
-        .set_config = psb_crtc_set_config,
-        .destroy = psb_intel_crtc_destroy,
-};
-
-/*
- * Set the default value of cursor control and base register
- * to zero. This is a workaround for h/w defect on Oaktrail
- */
-static void psb_intel_cursor_init(struct drm_device *dev, int pipe)
-{
-        u32 control[3] = { CURACNTR, CURBCNTR, CURCCNTR };
-        u32 base[3] = { CURABASE, CURBBASE, CURCBASE };
-
-        REG_WRITE(control[pipe], 0);
-        REG_WRITE(base[pipe], 0);
-}
-
-void psb_intel_crtc_init(struct drm_device *dev, int pipe,
-                     struct psb_intel_mode_device *mode_dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc;
-        int i;
-        uint16_t *r_base, *g_base, *b_base;
-
-        /* We allocate a extra array of drm_connector pointers
-         * for fbdev after the crtc */
-        psb_intel_crtc =
-            kzalloc(sizeof(struct psb_intel_crtc) +
-                    (INTELFB_CONN_LIMIT * sizeof(struct drm_connector *)),
-                    GFP_KERNEL);
-        if (psb_intel_crtc == NULL)
-                return;
-
-        psb_intel_crtc->crtc_state =
-                kzalloc(sizeof(struct psb_intel_crtc_state), GFP_KERNEL);
-        if (!psb_intel_crtc->crtc_state) {
-                dev_err(dev->dev, "Crtc state error: No memory\n");
-                kfree(psb_intel_crtc);
-                return;
-        }
-
-        /* Set the CRTC operations from the chip specific data */
-        drm_crtc_init(dev, &psb_intel_crtc->base, dev_priv->ops->crtc_funcs);
-
-        drm_mode_crtc_set_gamma_size(&psb_intel_crtc->base, 256);
-        psb_intel_crtc->pipe = pipe;
-        psb_intel_crtc->plane = pipe;
-
-        r_base = psb_intel_crtc->base.gamma_store;
-        g_base = r_base + 256;
-        b_base = g_base + 256;
-        for (i = 0; i < 256; i++) {
-                psb_intel_crtc->lut_r[i] = i;
-                psb_intel_crtc->lut_g[i] = i;
-                psb_intel_crtc->lut_b[i] = i;
-                r_base[i] = i << 8;
-                g_base[i] = i << 8;
-                b_base[i] = i << 8;
-
-                psb_intel_crtc->lut_adj[i] = 0;
-        }
-
-        psb_intel_crtc->mode_dev = mode_dev;
-        psb_intel_crtc->cursor_addr = 0;
-
-        drm_crtc_helper_add(&psb_intel_crtc->base,
-                                                dev_priv->ops->crtc_helper);
-
-        /* Setup the array of drm_connector pointer array */
-        psb_intel_crtc->mode_set.crtc = &psb_intel_crtc->base;
-        BUG_ON(pipe >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) ||
-               dev_priv->plane_to_crtc_mapping[psb_intel_crtc->plane] != NULL);
-        dev_priv->plane_to_crtc_mapping[psb_intel_crtc->plane] =
-                                                        &psb_intel_crtc->base;
-        dev_priv->pipe_to_crtc_mapping[psb_intel_crtc->pipe] =
-                                                        &psb_intel_crtc->base;
-        psb_intel_crtc->mode_set.connectors =
-            (struct drm_connector **) (psb_intel_crtc + 1);
-        psb_intel_crtc->mode_set.num_connectors = 0;
-        psb_intel_cursor_init(dev, pipe);
-}
-
-int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
-                                struct drm_file *file_priv)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct drm_psb_get_pipe_from_crtc_id_arg *pipe_from_crtc_id = data;
-        struct drm_mode_object *drmmode_obj;
-        struct psb_intel_crtc *crtc;
-
-        if (!dev_priv) {
-                dev_err(dev->dev, "called with no initialization\n");
-                return -EINVAL;
-        }
-
-        drmmode_obj = drm_mode_object_find(dev, pipe_from_crtc_id->crtc_id,
-                        DRM_MODE_OBJECT_CRTC);
-
-        if (!drmmode_obj) {
-                dev_err(dev->dev, "no such CRTC id\n");
-                return -EINVAL;
-        }
-
-        crtc = to_psb_intel_crtc(obj_to_crtc(drmmode_obj));
-        pipe_from_crtc_id->pipe = crtc->pipe;
-
-        return 0;
-}
-
-struct drm_crtc *psb_intel_get_crtc_from_pipe(struct drm_device *dev, int pipe)
-{
-        struct drm_crtc *crtc = NULL;
-
-        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-                struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-                if (psb_intel_crtc->pipe == pipe)
-                        break;
-        }
-        return crtc;
-}
-
-int psb_intel_connector_clones(struct drm_device *dev, int type_mask)
-{
-        int index_mask = 0;
-        struct drm_connector *connector;
-        int entry = 0;
-
-        list_for_each_entry(connector, &dev->mode_config.connector_list,
-                            head) {
-                struct psb_intel_output *psb_intel_output =
-                    to_psb_intel_output(connector);
-                if (type_mask & (1 << psb_intel_output->type))
-                        index_mask |= (1 << entry);
-                entry++;
-        }
-        return index_mask;
-}
-
-
-void psb_intel_modeset_cleanup(struct drm_device *dev)
-{
-        drm_mode_config_cleanup(dev);
-}
-
-
-/* current intel driver doesn't take advantage of encoders
-   always give back the encoder for the connector
-*/
-struct drm_encoder *psb_intel_best_encoder(struct drm_connector *connector)
-{
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-
-        return &psb_intel_output->enc;
-}
-
diff --git a/drivers/staging/gma500/psb_intel_display.h b/drivers/staging/gma500/psb_intel_display.h
deleted file mode 100644
index 535b49a5e409..000000000000
--- a/drivers/staging/gma500/psb_intel_display.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* copyright (c) 2008, Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- * Eric Anholt <eric@anholt.net>
- */
-
-#ifndef _INTEL_DISPLAY_H_
-#define _INTEL_DISPLAY_H_
-
-bool psb_intel_pipe_has_type(struct drm_crtc *crtc, int type);
-void psb_intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,
-                         u16 *green, u16 *blue, uint32_t type, uint32_t size);
-void psb_intel_crtc_destroy(struct drm_crtc *crtc);
-
-#endif
diff --git a/drivers/staging/gma500/psb_intel_drv.h b/drivers/staging/gma500/psb_intel_drv.h
deleted file mode 100644
index 36b554b5c335..000000000000
--- a/drivers/staging/gma500/psb_intel_drv.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2009-2011, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef __INTEL_DRV_H__
-#define __INTEL_DRV_H__
-
-#include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_crtc_helper.h>
-#include <linux/gpio.h>
-
-/*
- * Display related stuff
- */
-
-/* store information about an Ixxx DVO */
-/* The i830->i865 use multiple DVOs with multiple i2cs */
-/* the i915, i945 have a single sDVO i2c bus - which is different */
-#define MAX_OUTPUTS 6
-/* maximum connectors per crtcs in the mode set */
-#define INTELFB_CONN_LIMIT 4
-
-#define INTEL_I2C_BUS_DVO 1
-#define INTEL_I2C_BUS_SDVO 2
-
-/* these are outputs from the chip - integrated only
- * external chips are via DVO or SDVO output */
-#define INTEL_OUTPUT_UNUSED 0
-#define INTEL_OUTPUT_ANALOG 1
-#define INTEL_OUTPUT_DVO 2
-#define INTEL_OUTPUT_SDVO 3
-#define INTEL_OUTPUT_LVDS 4
-#define INTEL_OUTPUT_TVOUT 5
-#define INTEL_OUTPUT_HDMI 6
-#define INTEL_OUTPUT_MIPI 7
-#define INTEL_OUTPUT_MIPI2 8
-
-#define INTEL_DVO_CHIP_NONE 0
-#define INTEL_DVO_CHIP_LVDS 1
-#define INTEL_DVO_CHIP_TMDS 2
-#define INTEL_DVO_CHIP_TVOUT 4
-
-/*
- * Hold information useally put on the device driver privates here,
- * since it needs to be shared across multiple of devices drivers privates.
- */
-struct psb_intel_mode_device {
-
-        /*
-         * Abstracted memory manager operations
-         */
-         size_t(*bo_offset) (struct drm_device *dev, void *bo);
-
-        /*
-         * Cursor (Can go ?)
-         */
-        int cursor_needs_physical;
-
-        /*
-         * LVDS info
-         */
-        int backlight_duty_cycle;       /* restore backlight to this value */
-        bool panel_wants_dither;
-        struct drm_display_mode *panel_fixed_mode;
-        struct drm_display_mode *panel_fixed_mode2;
-        struct drm_display_mode *vbt_mode;      /* if any */
-
-        uint32_t saveBLC_PWM_CTL;
-};
-
-struct psb_intel_i2c_chan {
-        /* for getting at dev. private (mmio etc.) */
-        struct drm_device *drm_dev;
-        u32 reg;                /* GPIO reg */
-        struct i2c_adapter adapter;
-        struct i2c_algo_bit_data algo;
-        u8 slave_addr;
-};
-
-struct psb_intel_output {
-        struct drm_connector base;
-
-        struct drm_encoder enc;
-        int type;
-
-        struct psb_intel_i2c_chan *i2c_bus;     /* for control functions */
-        struct psb_intel_i2c_chan *ddc_bus;     /* for DDC only stuff */
-        bool load_detect_temp;
-        void *dev_priv;
-
-        struct psb_intel_mode_device *mode_dev;
-        struct i2c_adapter *hdmi_i2c_adapter;   /* for control functions */
-};
-
-struct psb_intel_crtc_state {
-        uint32_t saveDSPCNTR;
-        uint32_t savePIPECONF;
-        uint32_t savePIPESRC;
-        uint32_t saveDPLL;
-        uint32_t saveFP0;
-        uint32_t saveFP1;
-        uint32_t saveHTOTAL;
-        uint32_t saveHBLANK;
-        uint32_t saveHSYNC;
-        uint32_t saveVTOTAL;
-        uint32_t saveVBLANK;
-        uint32_t saveVSYNC;
-        uint32_t saveDSPSTRIDE;
-        uint32_t saveDSPSIZE;
-        uint32_t saveDSPPOS;
-        uint32_t saveDSPBASE;
-        uint32_t savePalette[256];
-};
-
-struct psb_intel_crtc {
-        struct drm_crtc base;
-        int pipe;
-        int plane;
-        uint32_t cursor_addr;
-        u8 lut_r[256], lut_g[256], lut_b[256];
-        u8 lut_adj[256];
-        struct psb_intel_framebuffer *fbdev_fb;
-        /* a mode_set for fbdev users on this crtc */
-        struct drm_mode_set mode_set;
-
-        /* GEM object that holds our cursor */
-        struct drm_gem_object *cursor_obj;
-
-        struct drm_display_mode saved_mode;
-        struct drm_display_mode saved_adjusted_mode;
-
-        struct psb_intel_mode_device *mode_dev;
-
-        /*crtc mode setting flags*/
-        u32 mode_flags;
-
-        /* Saved Crtc HW states */
-        struct psb_intel_crtc_state *crtc_state;
-};
-
-#define to_psb_intel_crtc(x)    \
-                container_of(x, struct psb_intel_crtc, base)
-#define to_psb_intel_output(x)  \
-                container_of(x, struct psb_intel_output, base)
-#define enc_to_psb_intel_output(x)      \
-                container_of(x, struct psb_intel_output, enc)
-#define to_psb_intel_framebuffer(x)     \
-                container_of(x, struct psb_intel_framebuffer, base)
-
-struct psb_intel_i2c_chan *psb_intel_i2c_create(struct drm_device *dev,
-                                        const u32 reg, const char *name);
-void psb_intel_i2c_destroy(struct psb_intel_i2c_chan *chan);
-int psb_intel_ddc_get_modes(struct psb_intel_output *psb_intel_output);
-extern bool psb_intel_ddc_probe(struct psb_intel_output *psb_intel_output);
-
-extern void psb_intel_crtc_init(struct drm_device *dev, int pipe,
-                            struct psb_intel_mode_device *mode_dev);
-extern void psb_intel_crt_init(struct drm_device *dev);
-extern void psb_intel_sdvo_init(struct drm_device *dev, int output_device);
-extern void psb_intel_dvo_init(struct drm_device *dev);
-extern void psb_intel_tv_init(struct drm_device *dev);
-extern void psb_intel_lvds_init(struct drm_device *dev,
-                            struct psb_intel_mode_device *mode_dev);
-extern void psb_intel_lvds_set_brightness(struct drm_device *dev, int level);
-extern void mrst_lvds_init(struct drm_device *dev,
-                           struct psb_intel_mode_device *mode_dev);
-extern void mrst_wait_for_INTR_PKT_SENT(struct drm_device *dev);
-extern void mrst_dsi_init(struct drm_device *dev,
-                           struct psb_intel_mode_device *mode_dev);
-extern void mid_dsi_init(struct drm_device *dev,
-                    struct psb_intel_mode_device *mode_dev, int dsi_num);
-
-extern void psb_intel_crtc_load_lut(struct drm_crtc *crtc);
-extern void psb_intel_encoder_prepare(struct drm_encoder *encoder);
-extern void psb_intel_encoder_commit(struct drm_encoder *encoder);
-
-extern struct drm_encoder *psb_intel_best_encoder(struct drm_connector
-                                              *connector);
-
-extern struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,
-                                                    struct drm_crtc *crtc);
-extern void psb_intel_wait_for_vblank(struct drm_device *dev);
-extern int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
-                                struct drm_file *file_priv);
-extern struct drm_crtc *psb_intel_get_crtc_from_pipe(struct drm_device *dev,
-                                                 int pipe);
-extern struct drm_connector *psb_intel_sdvo_find(struct drm_device *dev,
-                                             int sdvoB);
-extern int psb_intel_sdvo_supports_hotplug(struct drm_connector *connector);
-extern void psb_intel_sdvo_set_hotplug(struct drm_connector *connector,
-                                   int enable);
-extern int intelfb_probe(struct drm_device *dev);
-extern int intelfb_remove(struct drm_device *dev,
-                          struct drm_framebuffer *fb);
-extern struct drm_framebuffer *psb_intel_framebuffer_create(struct drm_device
-                                                        *dev, struct
-                                                        drm_mode_fb_cmd
-                                                        *mode_cmd,
-                                                        void *mm_private);
-extern bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder,
-                                      struct drm_display_mode *mode,
-                                      struct drm_display_mode *adjusted_mode);
-extern int psb_intel_lvds_mode_valid(struct drm_connector *connector,
-                                     struct drm_display_mode *mode);
-extern int psb_intel_lvds_set_property(struct drm_connector *connector,
-                                        struct drm_property *property,
-                                        uint64_t value);
-extern void psb_intel_lvds_destroy(struct drm_connector *connector);
-extern const struct drm_encoder_funcs psb_intel_lvds_enc_funcs;
-
-extern void mdfldWaitForPipeDisable(struct drm_device *dev, int pipe);
-extern void mdfldWaitForPipeEnable(struct drm_device *dev, int pipe);
-
-#endif                          /* __INTEL_DRV_H__ */
diff --git a/drivers/staging/gma500/psb_intel_lvds.c b/drivers/staging/gma500/psb_intel_lvds.c
deleted file mode 100644
index 21022e1a977a..000000000000
--- a/drivers/staging/gma500/psb_intel_lvds.c
+++ /dev/null
@@ -1,854 +0,0 @@
-/*
- * Copyright © 2006-2007 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *      Eric Anholt <eric@anholt.net>
- *      Dave Airlie <airlied@linux.ie>
- *      Jesse Barnes <jesse.barnes@intel.com>
- */
-
-#include <linux/i2c.h>
-#include <drm/drmP.h>
-
-#include "intel_bios.h"
-#include "psb_drv.h"
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "power.h"
-#include <linux/pm_runtime.h>
-
-/*
- * LVDS I2C backlight control macros
- */
-#define BRIGHTNESS_MAX_LEVEL 100
-#define BRIGHTNESS_MASK 0xFF
-#define BLC_I2C_TYPE    0x01
-#define BLC_PWM_TYPT    0x02
-
-#define BLC_POLARITY_NORMAL 0
-#define BLC_POLARITY_INVERSE 1
-
-#define PSB_BLC_MAX_PWM_REG_FREQ       (0xFFFE)
-#define PSB_BLC_MIN_PWM_REG_FREQ        (0x2)
-#define PSB_BLC_PWM_PRECISION_FACTOR    (10)
-#define PSB_BACKLIGHT_PWM_CTL_SHIFT     (16)
-#define PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR (0xFFFE)
-
-struct psb_intel_lvds_priv {
-        /*
-         * Saved LVDO output states
-         */
-        uint32_t savePP_ON;
-        uint32_t savePP_OFF;
-        uint32_t saveLVDS;
-        uint32_t savePP_CONTROL;
-        uint32_t savePP_CYCLE;
-        uint32_t savePFIT_CONTROL;
-        uint32_t savePFIT_PGM_RATIOS;
-        uint32_t saveBLC_PWM_CTL;
-};
-
-
-/*
- * Returns the maximum level of the backlight duty cycle field.
- */
-static u32 psb_intel_lvds_get_max_backlight(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 ret;
-
-        if (gma_power_begin(dev, false)) {
-                ret = REG_READ(BLC_PWM_CTL);
-                gma_power_end(dev);
-        } else /* Powered off, use the saved value */
-                ret = dev_priv->saveBLC_PWM_CTL;
-
-        /* Top 15bits hold the frequency mask */
-        ret = (ret &  BACKLIGHT_MODULATION_FREQ_MASK) >>
-                                        BACKLIGHT_MODULATION_FREQ_SHIFT;
-
-        ret *= 2;       /* Return a 16bit range as needed for setting */
-        if (ret == 0)
-                dev_err(dev->dev, "BL bug: Reg %08x save %08X\n",
-                        REG_READ(BLC_PWM_CTL), dev_priv->saveBLC_PWM_CTL);
-        return ret;
-}
-
-/*
- * Set LVDS backlight level by I2C command
- *
- * FIXME: at some point we need to both track this for PM and also
- * disable runtime pm on MRST if the brightness is nil (ie blanked)
- */
-static int psb_lvds_i2c_set_brightness(struct drm_device *dev,
-                                        unsigned int level)
-{
-        struct drm_psb_private *dev_priv =
-                (struct drm_psb_private *)dev->dev_private;
-
-        struct psb_intel_i2c_chan *lvds_i2c_bus = dev_priv->lvds_i2c_bus;
-        u8 out_buf[2];
-        unsigned int blc_i2c_brightness;
-
-        struct i2c_msg msgs[] = {
-                {
-                        .addr = lvds_i2c_bus->slave_addr,
-                        .flags = 0,
-                        .len = 2,
-                        .buf = out_buf,
-                }
-        };
-
-        blc_i2c_brightness = BRIGHTNESS_MASK & ((unsigned int)level *
-                             BRIGHTNESS_MASK /
-                             BRIGHTNESS_MAX_LEVEL);
-
-        if (dev_priv->lvds_bl->pol == BLC_POLARITY_INVERSE)
-                blc_i2c_brightness = BRIGHTNESS_MASK - blc_i2c_brightness;
-
-        out_buf[0] = dev_priv->lvds_bl->brightnesscmd;
-        out_buf[1] = (u8)blc_i2c_brightness;
-
-        if (i2c_transfer(&lvds_i2c_bus->adapter, msgs, 1) == 1) {
-                dev_dbg(dev->dev, "I2C set brightness.(command, value) (%d, %d)\n",
-                        dev_priv->lvds_bl->brightnesscmd,
-                        blc_i2c_brightness);
-                return 0;
-        }
-
-        dev_err(dev->dev, "I2C transfer error\n");
-        return -1;
-}
-
-
-static int psb_lvds_pwm_set_brightness(struct drm_device *dev, int level)
-{
-        struct drm_psb_private *dev_priv =
-                        (struct drm_psb_private *)dev->dev_private;
-
-        u32 max_pwm_blc;
-        u32 blc_pwm_duty_cycle;
-
-        max_pwm_blc = psb_intel_lvds_get_max_backlight(dev);
-
-        /*BLC_PWM_CTL Should be initiated while backlight device init*/
-        BUG_ON(max_pwm_blc == 0);
-
-        blc_pwm_duty_cycle = level * max_pwm_blc / BRIGHTNESS_MAX_LEVEL;
-
-        if (dev_priv->lvds_bl->pol == BLC_POLARITY_INVERSE)
-                blc_pwm_duty_cycle = max_pwm_blc - blc_pwm_duty_cycle;
-
-        blc_pwm_duty_cycle &= PSB_BACKLIGHT_PWM_POLARITY_BIT_CLEAR;
-        REG_WRITE(BLC_PWM_CTL,
-                  (max_pwm_blc << PSB_BACKLIGHT_PWM_CTL_SHIFT) |
-                  (blc_pwm_duty_cycle));
-
-        dev_info(dev->dev, "Backlight lvds set brightness %08x\n",
-                  (max_pwm_blc << PSB_BACKLIGHT_PWM_CTL_SHIFT) |
-                  (blc_pwm_duty_cycle));
-
-        return 0;
-}
-
-/*
- * Set LVDS backlight level either by I2C or PWM
- */
-void psb_intel_lvds_set_brightness(struct drm_device *dev, int level)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        dev_dbg(dev->dev, "backlight level is %d\n", level);
-
-        if (!dev_priv->lvds_bl) {
-                dev_err(dev->dev, "NO LVDS backlight info\n");
-                return;
-        }
-
-        if (dev_priv->lvds_bl->type == BLC_I2C_TYPE)
-                psb_lvds_i2c_set_brightness(dev, level);
-        else
-                psb_lvds_pwm_set_brightness(dev, level);
-}
-
-/*
- * Sets the backlight level.
- *
- * level: backlight level, from 0 to psb_intel_lvds_get_max_backlight().
- */
-static void psb_intel_lvds_set_backlight(struct drm_device *dev, int level)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 blc_pwm_ctl;
-
-        if (gma_power_begin(dev, false)) {
-                blc_pwm_ctl = REG_READ(BLC_PWM_CTL);
-                blc_pwm_ctl &= ~BACKLIGHT_DUTY_CYCLE_MASK;
-                REG_WRITE(BLC_PWM_CTL,
-                                (blc_pwm_ctl |
-                                (level << BACKLIGHT_DUTY_CYCLE_SHIFT)));
-                dev_priv->saveBLC_PWM_CTL = (blc_pwm_ctl |
-                                        (level << BACKLIGHT_DUTY_CYCLE_SHIFT));
-                gma_power_end(dev);
-        } else {
-                blc_pwm_ctl = dev_priv->saveBLC_PWM_CTL &
-                                ~BACKLIGHT_DUTY_CYCLE_MASK;
-                dev_priv->saveBLC_PWM_CTL = (blc_pwm_ctl |
-                                        (level << BACKLIGHT_DUTY_CYCLE_SHIFT));
-        }
-}
-
-/*
- * Sets the power state for the panel.
- */
-static void psb_intel_lvds_set_power(struct drm_device *dev,
-                                 struct psb_intel_output *output, bool on)
-{
-        u32 pp_status;
-
-        if (!gma_power_begin(dev, true)) {
-                dev_err(dev->dev, "set power, chip off!\n");
-                return;
-        }
-        
-        if (on) {
-                REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) |
-                          POWER_TARGET_ON);
-                do {
-                        pp_status = REG_READ(PP_STATUS);
-                } while ((pp_status & PP_ON) == 0);
-
-                psb_intel_lvds_set_backlight(dev,
-                                         output->
-                                         mode_dev->backlight_duty_cycle);
-        } else {
-                psb_intel_lvds_set_backlight(dev, 0);
-
-                REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) &
-                          ~POWER_TARGET_ON);
-                do {
-                        pp_status = REG_READ(PP_STATUS);
-                } while (pp_status & PP_ON);
-        }
-
-        gma_power_end(dev);
-}
-
-static void psb_intel_lvds_encoder_dpms(struct drm_encoder *encoder, int mode)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *output = enc_to_psb_intel_output(encoder);
-
-        if (mode == DRM_MODE_DPMS_ON)
-                psb_intel_lvds_set_power(dev, output, true);
-        else
-                psb_intel_lvds_set_power(dev, output, false);
-
-        /* XXX: We never power down the LVDS pairs. */
-}
-
-static void psb_intel_lvds_save(struct drm_connector *connector)
-{
-        struct drm_device *dev = connector->dev;
-        struct drm_psb_private *dev_priv =
-                (struct drm_psb_private *)dev->dev_private;
-        struct psb_intel_output *psb_intel_output =
-                to_psb_intel_output(connector);
-        struct psb_intel_lvds_priv *lvds_priv =
-                (struct psb_intel_lvds_priv *)psb_intel_output->dev_priv;
-
-        lvds_priv->savePP_ON = REG_READ(LVDSPP_ON);
-        lvds_priv->savePP_OFF = REG_READ(LVDSPP_OFF);
-        lvds_priv->saveLVDS = REG_READ(LVDS);
-        lvds_priv->savePP_CONTROL = REG_READ(PP_CONTROL);
-        lvds_priv->savePP_CYCLE = REG_READ(PP_CYCLE);
-        /*lvds_priv->savePP_DIVISOR = REG_READ(PP_DIVISOR);*/
-        lvds_priv->saveBLC_PWM_CTL = REG_READ(BLC_PWM_CTL);
-        lvds_priv->savePFIT_CONTROL = REG_READ(PFIT_CONTROL);
-        lvds_priv->savePFIT_PGM_RATIOS = REG_READ(PFIT_PGM_RATIOS);
-
-        /*TODO: move backlight_duty_cycle to psb_intel_lvds_priv*/
-        dev_priv->backlight_duty_cycle = (dev_priv->saveBLC_PWM_CTL &
-                                                BACKLIGHT_DUTY_CYCLE_MASK);
-
-        /*
-         * If the light is off at server startup,
-         * just make it full brightness
-         */
-        if (dev_priv->backlight_duty_cycle == 0)
-                dev_priv->backlight_duty_cycle =
-                psb_intel_lvds_get_max_backlight(dev);
-
-        dev_dbg(dev->dev, "(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x)\n",
-                        lvds_priv->savePP_ON,
-                        lvds_priv->savePP_OFF,
-                        lvds_priv->saveLVDS,
-                        lvds_priv->savePP_CONTROL,
-                        lvds_priv->savePP_CYCLE,
-                        lvds_priv->saveBLC_PWM_CTL);
-}
-
-static void psb_intel_lvds_restore(struct drm_connector *connector)
-{
-        struct drm_device *dev = connector->dev;
-        u32 pp_status;
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-        struct psb_intel_lvds_priv *lvds_priv =
-                (struct psb_intel_lvds_priv *)psb_intel_output->dev_priv;
-
-        dev_dbg(dev->dev, "(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x)\n",
-                        lvds_priv->savePP_ON,
-                        lvds_priv->savePP_OFF,
-                        lvds_priv->saveLVDS,
-                        lvds_priv->savePP_CONTROL,
-                        lvds_priv->savePP_CYCLE,
-                        lvds_priv->saveBLC_PWM_CTL);
-
-        REG_WRITE(BLC_PWM_CTL, lvds_priv->saveBLC_PWM_CTL);
-        REG_WRITE(PFIT_CONTROL, lvds_priv->savePFIT_CONTROL);
-        REG_WRITE(PFIT_PGM_RATIOS, lvds_priv->savePFIT_PGM_RATIOS);
-        REG_WRITE(LVDSPP_ON, lvds_priv->savePP_ON);
-        REG_WRITE(LVDSPP_OFF, lvds_priv->savePP_OFF);
-        /*REG_WRITE(PP_DIVISOR, lvds_priv->savePP_DIVISOR);*/
-        REG_WRITE(PP_CYCLE, lvds_priv->savePP_CYCLE);
-        REG_WRITE(PP_CONTROL, lvds_priv->savePP_CONTROL);
-        REG_WRITE(LVDS, lvds_priv->saveLVDS);
-
-        if (lvds_priv->savePP_CONTROL & POWER_TARGET_ON) {
-                REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) |
-                        POWER_TARGET_ON);
-                do {
-                        pp_status = REG_READ(PP_STATUS);
-                } while ((pp_status & PP_ON) == 0);
-        } else {
-                REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) &
-                        ~POWER_TARGET_ON);
-                do {
-                        pp_status = REG_READ(PP_STATUS);
-                } while (pp_status & PP_ON);
-        }
-}
-
-int psb_intel_lvds_mode_valid(struct drm_connector *connector,
-                                 struct drm_display_mode *mode)
-{
-        struct psb_intel_output *psb_intel_output =
-                                to_psb_intel_output(connector);
-        struct drm_display_mode *fixed_mode =
-            psb_intel_output->mode_dev->panel_fixed_mode;
-
-        if (psb_intel_output->type == INTEL_OUTPUT_MIPI2)
-                fixed_mode = psb_intel_output->mode_dev->panel_fixed_mode2;
-
-        /* just in case */
-        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return MODE_NO_DBLESCAN;
-
-        /* just in case */
-        if (mode->flags & DRM_MODE_FLAG_INTERLACE)
-                return MODE_NO_INTERLACE;
-
-        if (fixed_mode) {
-                if (mode->hdisplay > fixed_mode->hdisplay)
-                        return MODE_PANEL;
-                if (mode->vdisplay > fixed_mode->vdisplay)
-                        return MODE_PANEL;
-        }
-        return MODE_OK;
-}
-
-bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder,
-                                  struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        struct psb_intel_mode_device *mode_dev =
-            enc_to_psb_intel_output(encoder)->mode_dev;
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_crtc *psb_intel_crtc =
-                                to_psb_intel_crtc(encoder->crtc);
-        struct drm_encoder *tmp_encoder;
-        struct drm_display_mode *panel_fixed_mode = mode_dev->panel_fixed_mode;
-        struct psb_intel_output *psb_intel_output =
-                                        enc_to_psb_intel_output(encoder);
-
-        if (psb_intel_output->type == INTEL_OUTPUT_MIPI2)
-                panel_fixed_mode = mode_dev->panel_fixed_mode2;
-
-        /* PSB requires the LVDS is on pipe B, MRST has only one pipe anyway */
-        if (!IS_MRST(dev) && psb_intel_crtc->pipe == 0) {
-                printk(KERN_ERR "Can't support LVDS on pipe A\n");
-                return false;
-        }
-        if (IS_MRST(dev) && psb_intel_crtc->pipe != 0) {
-                printk(KERN_ERR "Must use PIPE A\n");
-                return false;
-        }
-        /* Should never happen!! */
-        list_for_each_entry(tmp_encoder, &dev->mode_config.encoder_list,
-                            head) {
-                if (tmp_encoder != encoder
-                    && tmp_encoder->crtc == encoder->crtc) {
-                        printk(KERN_ERR "Can't enable LVDS and another "
-                               "encoder on the same pipe\n");
-                        return false;
-                }
-        }
-
-        /*
-         * If we have timings from the BIOS for the panel, put them in
-         * to the adjusted mode.  The CRTC will be set up for this mode,
-         * with the panel scaling set up to source from the H/VDisplay
-         * of the original mode.
-         */
-        if (panel_fixed_mode != NULL) {
-                adjusted_mode->hdisplay = panel_fixed_mode->hdisplay;
-                adjusted_mode->hsync_start = panel_fixed_mode->hsync_start;
-                adjusted_mode->hsync_end = panel_fixed_mode->hsync_end;
-                adjusted_mode->htotal = panel_fixed_mode->htotal;
-                adjusted_mode->vdisplay = panel_fixed_mode->vdisplay;
-                adjusted_mode->vsync_start = panel_fixed_mode->vsync_start;
-                adjusted_mode->vsync_end = panel_fixed_mode->vsync_end;
-                adjusted_mode->vtotal = panel_fixed_mode->vtotal;
-                adjusted_mode->clock = panel_fixed_mode->clock;
-                drm_mode_set_crtcinfo(adjusted_mode,
-                                      CRTC_INTERLACE_HALVE_V);
-        }
-
-        /*
-         * XXX: It would be nice to support lower refresh rates on the
-         * panels to reduce power consumption, and perhaps match the
-         * user's requested refresh rate.
-         */
-
-        return true;
-}
-
-static void psb_intel_lvds_prepare(struct drm_encoder *encoder)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *output = enc_to_psb_intel_output(encoder);
-        struct psb_intel_mode_device *mode_dev = output->mode_dev;
-
-        if (!gma_power_begin(dev, true))
-                return;
-
-        mode_dev->saveBLC_PWM_CTL = REG_READ(BLC_PWM_CTL);
-        mode_dev->backlight_duty_cycle = (mode_dev->saveBLC_PWM_CTL &
-                                          BACKLIGHT_DUTY_CYCLE_MASK);
-
-        psb_intel_lvds_set_power(dev, output, false);
-
-        gma_power_end(dev);
-}
-
-static void psb_intel_lvds_commit(struct drm_encoder *encoder)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *output = enc_to_psb_intel_output(encoder);
-        struct psb_intel_mode_device *mode_dev = output->mode_dev;
-
-        if (mode_dev->backlight_duty_cycle == 0)
-                mode_dev->backlight_duty_cycle =
-                    psb_intel_lvds_get_max_backlight(dev);
-
-        psb_intel_lvds_set_power(dev, output, true);
-}
-
-static void psb_intel_lvds_mode_set(struct drm_encoder *encoder,
-                                struct drm_display_mode *mode,
-                                struct drm_display_mode *adjusted_mode)
-{
-        struct drm_device *dev = encoder->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 pfit_control;
-
-        /*
-         * The LVDS pin pair will already have been turned on in the
-         * psb_intel_crtc_mode_set since it has a large impact on the DPLL
-         * settings.
-         */
-
-        /*
-         * Enable automatic panel scaling so that non-native modes fill the
-         * screen.  Should be enabled before the pipe is enabled, according to
-         * register description and PRM.
-         */
-        if (mode->hdisplay != adjusted_mode->hdisplay ||
-            mode->vdisplay != adjusted_mode->vdisplay)
-                pfit_control = (PFIT_ENABLE | VERT_AUTO_SCALE |
-                                HORIZ_AUTO_SCALE | VERT_INTERP_BILINEAR |
-                                HORIZ_INTERP_BILINEAR);
-        else
-                pfit_control = 0;
-
-        if (dev_priv->lvds_dither)
-                pfit_control |= PANEL_8TO6_DITHER_ENABLE;
-
-        REG_WRITE(PFIT_CONTROL, pfit_control);
-}
-
-/*
- * Detect the LVDS connection.
- *
- * This always returns CONNECTOR_STATUS_CONNECTED.
- * This connector should only have
- * been set up if the LVDS was actually connected anyway.
- */
-static enum drm_connector_status psb_intel_lvds_detect(struct drm_connector
-                                                   *connector, bool force)
-{
-        return connector_status_connected;
-}
-
-/*
- * Return the list of DDC modes if available, or the BIOS fixed mode otherwise.
- */
-static int psb_intel_lvds_get_modes(struct drm_connector *connector)
-{
-        struct drm_device *dev = connector->dev;
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-        struct psb_intel_mode_device *mode_dev =
-                                        psb_intel_output->mode_dev;
-        int ret = 0;
-
-        if (!IS_MRST(dev))
-                ret = psb_intel_ddc_get_modes(psb_intel_output);
-
-        if (ret)
-                return ret;
-
-        /* Didn't get an EDID, so
-         * Set wide sync ranges so we get all modes
-         * handed to valid_mode for checking
-         */
-        connector->display_info.min_vfreq = 0;
-        connector->display_info.max_vfreq = 200;
-        connector->display_info.min_hfreq = 0;
-        connector->display_info.max_hfreq = 200;
-
-        if (mode_dev->panel_fixed_mode != NULL) {
-                struct drm_display_mode *mode =
-                    drm_mode_duplicate(dev, mode_dev->panel_fixed_mode);
-                drm_mode_probed_add(connector, mode);
-                return 1;
-        }
-
-        return 0;
-}
-
-/**
- * psb_intel_lvds_destroy - unregister and free LVDS structures
- * @connector: connector to free
- *
- * Unregister the DDC bus for this connector then free the driver private
- * structure.
- */
-void psb_intel_lvds_destroy(struct drm_connector *connector)
-{
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-
-        if (psb_intel_output->ddc_bus)
-                psb_intel_i2c_destroy(psb_intel_output->ddc_bus);
-        drm_sysfs_connector_remove(connector);
-        drm_connector_cleanup(connector);
-        kfree(connector);
-}
-
-int psb_intel_lvds_set_property(struct drm_connector *connector,
-                                       struct drm_property *property,
-                                       uint64_t value)
-{
-        struct drm_encoder *encoder = connector->encoder;
-
-        if (!encoder)
-                return -1;
-
-        if (!strcmp(property->name, "scaling mode")) {
-                struct psb_intel_crtc *crtc =
-                                        to_psb_intel_crtc(encoder->crtc);
-                uint64_t curval;
-
-                if (!crtc)
-                        goto set_prop_error;
-
-                switch (value) {
-                case DRM_MODE_SCALE_FULLSCREEN:
-                        break;
-                case DRM_MODE_SCALE_NO_SCALE:
-                        break;
-                case DRM_MODE_SCALE_ASPECT:
-                        break;
-                default:
-                        goto set_prop_error;
-                }
-
-                if (drm_connector_property_get_value(connector,
-                                                     property,
-                                                     &curval))
-                        goto set_prop_error;
-
-                if (curval == value)
-                        goto set_prop_done;
-
-                if (drm_connector_property_set_value(connector,
-                                                        property,
-                                                        value))
-                        goto set_prop_error;
-
-                if (crtc->saved_mode.hdisplay != 0 &&
-                    crtc->saved_mode.vdisplay != 0) {
-                        if (!drm_crtc_helper_set_mode(encoder->crtc,
-                                                      &crtc->saved_mode,
-                                                      encoder->crtc->x,
-                                                      encoder->crtc->y,
-                                                      encoder->crtc->fb))
-                                goto set_prop_error;
-                }
-        } else if (!strcmp(property->name, "backlight")) {
-                if (drm_connector_property_set_value(connector,
-                                                        property,
-                                                        value))
-                        goto set_prop_error;
-                else {
-#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
-                        struct drm_psb_private *devp =
-                                                encoder->dev->dev_private;
-                        struct backlight_device *bd = devp->backlight_device;
-                        if (bd) {
-                                bd->props.brightness = value;
-                                backlight_update_status(bd);
-                        }
-#endif
-                }
-        } else if (!strcmp(property->name, "DPMS")) {
-                struct drm_encoder_helper_funcs *hfuncs
-                                                = encoder->helper_private;
-                hfuncs->dpms(encoder, value);
-        }
-
-set_prop_done:
-        return 0;
-set_prop_error:
-        return -1;
-}
-
-static const struct drm_encoder_helper_funcs psb_intel_lvds_helper_funcs = {
-        .dpms = psb_intel_lvds_encoder_dpms,
-        .mode_fixup = psb_intel_lvds_mode_fixup,
-        .prepare = psb_intel_lvds_prepare,
-        .mode_set = psb_intel_lvds_mode_set,
-        .commit = psb_intel_lvds_commit,
-};
-
-const struct drm_connector_helper_funcs
-                                psb_intel_lvds_connector_helper_funcs = {
-        .get_modes = psb_intel_lvds_get_modes,
-        .mode_valid = psb_intel_lvds_mode_valid,
-        .best_encoder = psb_intel_best_encoder,
-};
-
-const struct drm_connector_funcs psb_intel_lvds_connector_funcs = {
-        .dpms = drm_helper_connector_dpms,
-        .save = psb_intel_lvds_save,
-        .restore = psb_intel_lvds_restore,
-        .detect = psb_intel_lvds_detect,
-        .fill_modes = drm_helper_probe_single_connector_modes,
-        .set_property = psb_intel_lvds_set_property,
-        .destroy = psb_intel_lvds_destroy,
-};
-
-
-static void psb_intel_lvds_enc_destroy(struct drm_encoder *encoder)
-{
-        drm_encoder_cleanup(encoder);
-}
-
-const struct drm_encoder_funcs psb_intel_lvds_enc_funcs = {
-        .destroy = psb_intel_lvds_enc_destroy,
-};
-
-
-
-/**
- * psb_intel_lvds_init - setup LVDS connectors on this device
- * @dev: drm device
- *
- * Create the connector, register the LVDS DDC bus, and try to figure out what
- * modes we can display on the LVDS panel (if present).
- */
-void psb_intel_lvds_init(struct drm_device *dev,
-                     struct psb_intel_mode_device *mode_dev)
-{
-        struct psb_intel_output *psb_intel_output;
-        struct psb_intel_lvds_priv *lvds_priv;
-        struct drm_connector *connector;
-        struct drm_encoder *encoder;
-        struct drm_display_mode *scan;  /* *modes, *bios_mode; */
-        struct drm_crtc *crtc;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 lvds;
-        int pipe;
-
-        psb_intel_output = kzalloc(sizeof(struct psb_intel_output), GFP_KERNEL);
-        if (!psb_intel_output)
-                return;
-
-        lvds_priv = kzalloc(sizeof(struct psb_intel_lvds_priv), GFP_KERNEL);
-        if (!lvds_priv) {
-                kfree(psb_intel_output);
-                dev_err(dev->dev, "LVDS private allocation error\n");
-                return;
-        }
-
-        psb_intel_output->dev_priv = lvds_priv;
-        psb_intel_output->mode_dev = mode_dev;
-
-        connector = &psb_intel_output->base;
-        encoder = &psb_intel_output->enc;
-        drm_connector_init(dev, &psb_intel_output->base,
-                           &psb_intel_lvds_connector_funcs,
-                           DRM_MODE_CONNECTOR_LVDS);
-
-        drm_encoder_init(dev, &psb_intel_output->enc,
-                         &psb_intel_lvds_enc_funcs,
-                         DRM_MODE_ENCODER_LVDS);
-
-        drm_mode_connector_attach_encoder(&psb_intel_output->base,
-                                          &psb_intel_output->enc);
-        psb_intel_output->type = INTEL_OUTPUT_LVDS;
-
-        drm_encoder_helper_add(encoder, &psb_intel_lvds_helper_funcs);
-        drm_connector_helper_add(connector,
-                                 &psb_intel_lvds_connector_helper_funcs);
-        connector->display_info.subpixel_order = SubPixelHorizontalRGB;
-        connector->interlace_allowed = false;
-        connector->doublescan_allowed = false;
-
-        /*Attach connector properties*/
-        drm_connector_attach_property(connector,
-                                      dev->mode_config.scaling_mode_property,
-                                      DRM_MODE_SCALE_FULLSCREEN);
-        drm_connector_attach_property(connector,
-                                      dev_priv->backlight_property,
-                                      BRIGHTNESS_MAX_LEVEL);
-
-        /*
-         * Set up I2C bus
-         * FIXME: distroy i2c_bus when exit
-         */
-        psb_intel_output->i2c_bus = psb_intel_i2c_create(dev,
-                                                         GPIOB,
-                                                         "LVDSBLC_B");
-        if (!psb_intel_output->i2c_bus) {
-                dev_printk(KERN_ERR,
-                        &dev->pdev->dev, "I2C bus registration failed.\n");
-                goto failed_blc_i2c;
-        }
-        psb_intel_output->i2c_bus->slave_addr = 0x2C;
-        dev_priv->lvds_i2c_bus =  psb_intel_output->i2c_bus;
-
-        /*
-         * LVDS discovery:
-         * 1) check for EDID on DDC
-         * 2) check for VBT data
-         * 3) check to see if LVDS is already on
-         *    if none of the above, no panel
-         * 4) make sure lid is open
-         *    if closed, act like it's not there for now
-         */
-
-        /* Set up the DDC bus. */
-        psb_intel_output->ddc_bus = psb_intel_i2c_create(dev,
-                                                         GPIOC,
-                                                         "LVDSDDC_C");
-        if (!psb_intel_output->ddc_bus) {
-                dev_printk(KERN_ERR, &dev->pdev->dev,
-                           "DDC bus registration " "failed.\n");
-                goto failed_ddc;
-        }
-
-        /*
-         * Attempt to get the fixed panel mode from DDC.  Assume that the
-         * preferred mode is the right one.
-         */
-        psb_intel_ddc_get_modes(psb_intel_output);
-        list_for_each_entry(scan, &connector->probed_modes, head) {
-                if (scan->type & DRM_MODE_TYPE_PREFERRED) {
-                        mode_dev->panel_fixed_mode =
-                            drm_mode_duplicate(dev, scan);
-                        goto out;       /* FIXME: check for quirks */
-                }
-        }
-
-        /* Failed to get EDID, what about VBT? do we need this? */
-        if (mode_dev->vbt_mode)
-                mode_dev->panel_fixed_mode =
-                    drm_mode_duplicate(dev, mode_dev->vbt_mode);
-
-        if (!mode_dev->panel_fixed_mode)
-                if (dev_priv->lfp_lvds_vbt_mode)
-                        mode_dev->panel_fixed_mode =
-                                drm_mode_duplicate(dev,
-                                        dev_priv->lfp_lvds_vbt_mode);
-
-        /*
-         * If we didn't get EDID, try checking if the panel is already turned
-         * on.  If so, assume that whatever is currently programmed is the
-         * correct mode.
-         */
-        lvds = REG_READ(LVDS);
-        pipe = (lvds & LVDS_PIPEB_SELECT) ? 1 : 0;
-        crtc = psb_intel_get_crtc_from_pipe(dev, pipe);
-
-        if (crtc && (lvds & LVDS_PORT_EN)) {
-                mode_dev->panel_fixed_mode =
-                    psb_intel_crtc_mode_get(dev, crtc);
-                if (mode_dev->panel_fixed_mode) {
-                        mode_dev->panel_fixed_mode->type |=
-                            DRM_MODE_TYPE_PREFERRED;
-                        goto out;       /* FIXME: check for quirks */
-                }
-        }
-
-        /* If we still don't have a mode after all that, give up. */
-        if (!mode_dev->panel_fixed_mode) {
-                dev_err(dev->dev, "Found no modes on the lvds, ignoring the LVDS\n");
-                goto failed_find;
-        }
-
-        /*
-         * Blacklist machines with BIOSes that list an LVDS panel without
-         * actually having one.
-         */
-out:
-        drm_sysfs_connector_add(connector);
-        return;
-
-failed_find:
-        if (psb_intel_output->ddc_bus)
-                psb_intel_i2c_destroy(psb_intel_output->ddc_bus);
-failed_ddc:
-        if (psb_intel_output->i2c_bus)
-                psb_intel_i2c_destroy(psb_intel_output->i2c_bus);
-failed_blc_i2c:
-        drm_encoder_cleanup(encoder);
-        drm_connector_cleanup(connector);
-        kfree(connector);
-}
-
diff --git a/drivers/staging/gma500/psb_intel_modes.c b/drivers/staging/gma500/psb_intel_modes.c
deleted file mode 100644
index bde1aff96190..000000000000
--- a/drivers/staging/gma500/psb_intel_modes.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2007 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authers: Jesse Barnes <jesse.barnes@intel.com>
- */
-
-#include <linux/i2c.h>
-#include <linux/fb.h>
-#include <drm/drmP.h>
-#include "psb_intel_drv.h"
-
-/**
- * psb_intel_ddc_probe
- *
- */
-bool psb_intel_ddc_probe(struct psb_intel_output *psb_intel_output)
-{
-        u8 out_buf[] = { 0x0, 0x0 };
-        u8 buf[2];
-        int ret;
-        struct i2c_msg msgs[] = {
-                {
-                 .addr = 0x50,
-                 .flags = 0,
-                 .len = 1,
-                 .buf = out_buf,
-                 },
-                {
-                 .addr = 0x50,
-                 .flags = I2C_M_RD,
-                 .len = 1,
-                 .buf = buf,
-                 }
-        };
-
-        ret = i2c_transfer(&psb_intel_output->ddc_bus->adapter, msgs, 2);
-        if (ret == 2)
-                return true;
-
-        return false;
-}
-
-/**
- * psb_intel_ddc_get_modes - get modelist from monitor
- * @connector: DRM connector device to use
- *
- * Fetch the EDID information from @connector using the DDC bus.
- */
-int psb_intel_ddc_get_modes(struct psb_intel_output *psb_intel_output)
-{
-        struct edid *edid;
-        int ret = 0;
-
-        edid =
-            drm_get_edid(&psb_intel_output->base,
-                         &psb_intel_output->ddc_bus->adapter);
-        if (edid) {
-                drm_mode_connector_update_edid_property(&psb_intel_output->
-                                                        base, edid);
-                ret = drm_add_edid_modes(&psb_intel_output->base, edid);
-                kfree(edid);
-        }
-        return ret;
-}
diff --git a/drivers/staging/gma500/psb_intel_reg.h b/drivers/staging/gma500/psb_intel_reg.h
deleted file mode 100644
index 1ac16aa791c9..000000000000
--- a/drivers/staging/gma500/psb_intel_reg.h
+++ /dev/null
@@ -1,1235 +0,0 @@
-/*
- * Copyright (c) 2009, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef __PSB_INTEL_REG_H__
-#define __PSB_INTEL_REG_H__
-
-#define BLC_PWM_CTL             0x61254
-#define BLC_PWM_CTL2            0x61250
-#define BLC_PWM_CTL_C           0x62254
-#define BLC_PWM_CTL2_C          0x62250
-#define BACKLIGHT_MODULATION_FREQ_SHIFT         (17)
-/*
- * This is the most significant 15 bits of the number of backlight cycles in a
- * complete cycle of the modulated backlight control.
- *
- * The actual value is this field multiplied by two.
- */
-#define BACKLIGHT_MODULATION_FREQ_MASK  (0x7fff << 17)
-#define BLM_LEGACY_MODE                 (1 << 16)
-/*
- * This is the number of cycles out of the backlight modulation cycle for which
- * the backlight is on.
- *
- * This field must be no greater than the number of cycles in the complete
- * backlight modulation cycle.
- */
-#define BACKLIGHT_DUTY_CYCLE_SHIFT      (0)
-#define BACKLIGHT_DUTY_CYCLE_MASK       (0xffff)
-
-#define I915_GCFGC                      0xf0
-#define I915_LOW_FREQUENCY_ENABLE       (1 << 7)
-#define I915_DISPLAY_CLOCK_190_200_MHZ  (0 << 4)
-#define I915_DISPLAY_CLOCK_333_MHZ      (4 << 4)
-#define I915_DISPLAY_CLOCK_MASK         (7 << 4)
-
-#define I855_HPLLCC                     0xc0
-#define I855_CLOCK_CONTROL_MASK         (3 << 0)
-#define I855_CLOCK_133_200              (0 << 0)
-#define I855_CLOCK_100_200              (1 << 0)
-#define I855_CLOCK_100_133              (2 << 0)
-#define I855_CLOCK_166_250              (3 << 0)
-
-/* I830 CRTC registers */
-#define HTOTAL_A                0x60000
-#define HBLANK_A                0x60004
-#define HSYNC_A                 0x60008
-#define VTOTAL_A                0x6000c
-#define VBLANK_A                0x60010
-#define VSYNC_A                 0x60014
-#define PIPEASRC                0x6001c
-#define BCLRPAT_A               0x60020
-#define VSYNCSHIFT_A            0x60028
-
-#define HTOTAL_B                0x61000
-#define HBLANK_B                0x61004
-#define HSYNC_B                 0x61008
-#define VTOTAL_B                0x6100c
-#define VBLANK_B                0x61010
-#define VSYNC_B                 0x61014
-#define PIPEBSRC                0x6101c
-#define BCLRPAT_B               0x61020
-#define VSYNCSHIFT_B            0x61028
-
-#define HTOTAL_C                0x62000
-#define HBLANK_C                0x62004
-#define HSYNC_C                 0x62008
-#define VTOTAL_C                0x6200c
-#define VBLANK_C                0x62010
-#define VSYNC_C                 0x62014
-#define PIPECSRC                0x6201c
-#define BCLRPAT_C               0x62020
-#define VSYNCSHIFT_C            0x62028
-
-#define PP_STATUS               0x61200
-# define PP_ON                          (1 << 31)
-/*
- * Indicates that all dependencies of the panel are on:
- *
- * - PLL enabled
- * - pipe enabled
- * - LVDS/DVOB/DVOC on
- */
-#define PP_READY                        (1 << 30)
-#define PP_SEQUENCE_NONE                (0 << 28)
-#define PP_SEQUENCE_ON                  (1 << 28)
-#define PP_SEQUENCE_OFF                 (2 << 28)
-#define PP_SEQUENCE_MASK                0x30000000
-#define PP_CONTROL              0x61204
-#define POWER_TARGET_ON                 (1 << 0)
-
-#define LVDSPP_ON               0x61208
-#define LVDSPP_OFF              0x6120c
-#define PP_CYCLE                0x61210
-
-#define PFIT_CONTROL            0x61230
-#define PFIT_ENABLE                     (1 << 31)
-#define PFIT_PIPE_MASK                  (3 << 29)
-#define PFIT_PIPE_SHIFT                 29
-#define PFIT_SCALING_MODE_PILLARBOX     (1 << 27)
-#define PFIT_SCALING_MODE_LETTERBOX     (3 << 26)
-#define VERT_INTERP_DISABLE             (0 << 10)
-#define VERT_INTERP_BILINEAR            (1 << 10)
-#define VERT_INTERP_MASK                (3 << 10)
-#define VERT_AUTO_SCALE                 (1 << 9)
-#define HORIZ_INTERP_DISABLE            (0 << 6)
-#define HORIZ_INTERP_BILINEAR           (1 << 6)
-#define HORIZ_INTERP_MASK               (3 << 6)
-#define HORIZ_AUTO_SCALE                (1 << 5)
-#define PANEL_8TO6_DITHER_ENABLE        (1 << 3)
-
-#define PFIT_PGM_RATIOS         0x61234
-#define PFIT_VERT_SCALE_MASK                    0xfff00000
-#define PFIT_HORIZ_SCALE_MASK                   0x0000fff0
-
-#define PFIT_AUTO_RATIOS        0x61238
-
-#define DPLL_A                  0x06014
-#define DPLL_B                  0x06018
-#define DPLL_VCO_ENABLE                 (1 << 31)
-#define DPLL_DVO_HIGH_SPEED             (1 << 30)
-#define DPLL_SYNCLOCK_ENABLE            (1 << 29)
-#define DPLL_VGA_MODE_DIS               (1 << 28)
-#define DPLLB_MODE_DAC_SERIAL           (1 << 26)       /* i915 */
-#define DPLLB_MODE_LVDS                 (2 << 26)       /* i915 */
-#define DPLL_MODE_MASK                  (3 << 26)
-#define DPLL_DAC_SERIAL_P2_CLOCK_DIV_10 (0 << 24)       /* i915 */
-#define DPLL_DAC_SERIAL_P2_CLOCK_DIV_5  (1 << 24)       /* i915 */
-#define DPLLB_LVDS_P2_CLOCK_DIV_14      (0 << 24)       /* i915 */
-#define DPLLB_LVDS_P2_CLOCK_DIV_7       (1 << 24)       /* i915 */
-#define DPLL_P2_CLOCK_DIV_MASK          0x03000000      /* i915 */
-#define DPLL_FPA01_P1_POST_DIV_MASK     0x00ff0000      /* i915 */
-#define DPLL_LOCK                       (1 << 15)       /* CDV */
-
-/*
- *  The i830 generation, in DAC/serial mode, defines p1 as two plus this
- * bitfield, or just 2 if PLL_P1_DIVIDE_BY_TWO is set.
- */
-# define DPLL_FPA01_P1_POST_DIV_MASK_I830       0x001f0000
-/*
- * The i830 generation, in LVDS mode, defines P1 as the bit number set within
- * this field (only one bit may be set).
- */
-#define DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS   0x003f0000
-#define DPLL_FPA01_P1_POST_DIV_SHIFT    16
-#define PLL_P2_DIVIDE_BY_4              (1 << 23)       /* i830, required
-                                                         * in DVO non-gang */
-# define PLL_P1_DIVIDE_BY_TWO           (1 << 21)       /* i830 */
-#define PLL_REF_INPUT_DREFCLK           (0 << 13)
-#define PLL_REF_INPUT_TVCLKINA          (1 << 13)       /* i830 */
-#define PLL_REF_INPUT_TVCLKINBC         (2 << 13)       /* SDVO
-                                                                 * TVCLKIN */
-#define PLLB_REF_INPUT_SPREADSPECTRUMIN (3 << 13)
-#define PLL_REF_INPUT_MASK              (3 << 13)
-#define PLL_LOAD_PULSE_PHASE_SHIFT      9
-/*
- * Parallel to Serial Load Pulse phase selection.
- * Selects the phase for the 10X DPLL clock for the PCIe
- * digital display port. The range is 4 to 13; 10 or more
- * is just a flip delay. The default is 6
- */
-#define PLL_LOAD_PULSE_PHASE_MASK       (0xf << PLL_LOAD_PULSE_PHASE_SHIFT)
-#define DISPLAY_RATE_SELECT_FPA1        (1 << 8)
-
-/*
- * SDVO multiplier for 945G/GM. Not used on 965.
- *
- * DPLL_MD_UDI_MULTIPLIER_MASK
- */
-#define SDVO_MULTIPLIER_MASK            0x000000ff
-#define SDVO_MULTIPLIER_SHIFT_HIRES     4
-#define SDVO_MULTIPLIER_SHIFT_VGA       0
-
-/*
- * PLL_MD
- */
-/* Pipe A SDVO/UDI clock multiplier/divider register for G965. */
-#define DPLL_A_MD               0x0601c
-/* Pipe B SDVO/UDI clock multiplier/divider register for G965. */
-#define DPLL_B_MD               0x06020
-/*
- * UDI pixel divider, controlling how many pixels are stuffed into a packet.
- *
- * Value is pixels minus 1.  Must be set to 1 pixel for SDVO.
- */
-#define DPLL_MD_UDI_DIVIDER_MASK        0x3f000000
-#define DPLL_MD_UDI_DIVIDER_SHIFT       24
-/* UDI pixel divider for VGA, same as DPLL_MD_UDI_DIVIDER_MASK. */
-#define DPLL_MD_VGA_UDI_DIVIDER_MASK    0x003f0000
-#define DPLL_MD_VGA_UDI_DIVIDER_SHIFT   16
-/*
- * SDVO/UDI pixel multiplier.
- *
- * SDVO requires that the bus clock rate be between 1 and 2 Ghz, and the bus
- * clock rate is 10 times the DPLL clock.  At low resolution/refresh rate
- * modes, the bus rate would be below the limits, so SDVO allows for stuffing
- * dummy bytes in the datastream at an increased clock rate, with both sides of
- * the link knowing how many bytes are fill.
- *
- * So, for a mode with a dotclock of 65Mhz, we would want to double the clock
- * rate to 130Mhz to get a bus rate of 1.30Ghz.  The DPLL clock rate would be
- * set to 130Mhz, and the SDVO multiplier set to 2x in this register and
- * through an SDVO command.
- *
- * This register field has values of multiplication factor minus 1, with
- * a maximum multiplier of 5 for SDVO.
- */
-#define DPLL_MD_UDI_MULTIPLIER_MASK     0x00003f00
-#define DPLL_MD_UDI_MULTIPLIER_SHIFT    8
-/*
- * SDVO/UDI pixel multiplier for VGA, same as DPLL_MD_UDI_MULTIPLIER_MASK.
- * This best be set to the default value (3) or the CRT won't work. No,
- * I don't entirely understand what this does...
- */
-#define DPLL_MD_VGA_UDI_MULTIPLIER_MASK 0x0000003f
-#define DPLL_MD_VGA_UDI_MULTIPLIER_SHIFT 0
-
-#define DPLL_TEST               0x606c
-#define DPLLB_TEST_SDVO_DIV_1           (0 << 22)
-#define DPLLB_TEST_SDVO_DIV_2           (1 << 22)
-#define DPLLB_TEST_SDVO_DIV_4           (2 << 22)
-#define DPLLB_TEST_SDVO_DIV_MASK        (3 << 22)
-#define DPLLB_TEST_N_BYPASS             (1 << 19)
-#define DPLLB_TEST_M_BYPASS             (1 << 18)
-#define DPLLB_INPUT_BUFFER_ENABLE       (1 << 16)
-#define DPLLA_TEST_N_BYPASS             (1 << 3)
-#define DPLLA_TEST_M_BYPASS             (1 << 2)
-#define DPLLA_INPUT_BUFFER_ENABLE       (1 << 0)
-
-#define ADPA                    0x61100
-#define ADPA_DAC_ENABLE                 (1 << 31)
-#define ADPA_DAC_DISABLE                0
-#define ADPA_PIPE_SELECT_MASK           (1 << 30)
-#define ADPA_PIPE_A_SELECT              0
-#define ADPA_PIPE_B_SELECT              (1 << 30)
-#define ADPA_USE_VGA_HVPOLARITY         (1 << 15)
-#define ADPA_SETS_HVPOLARITY            0
-#define ADPA_VSYNC_CNTL_DISABLE         (1 << 11)
-#define ADPA_VSYNC_CNTL_ENABLE          0
-#define ADPA_HSYNC_CNTL_DISABLE         (1 << 10)
-#define ADPA_HSYNC_CNTL_ENABLE          0
-#define ADPA_VSYNC_ACTIVE_HIGH          (1 << 4)
-#define ADPA_VSYNC_ACTIVE_LOW           0
-#define ADPA_HSYNC_ACTIVE_HIGH          (1 << 3)
-#define ADPA_HSYNC_ACTIVE_LOW           0
-
-#define FPA0                    0x06040
-#define FPA1                    0x06044
-#define FPB0                    0x06048
-#define FPB1                    0x0604c
-#define FP_N_DIV_MASK                   0x003f0000
-#define FP_N_DIV_SHIFT                  16
-#define FP_M1_DIV_MASK                  0x00003f00
-#define FP_M1_DIV_SHIFT                 8
-#define FP_M2_DIV_MASK                  0x0000003f
-#define FP_M2_DIV_SHIFT                 0
-
-#define PORT_HOTPLUG_EN         0x61110
-#define SDVOB_HOTPLUG_INT_EN            (1 << 26)
-#define SDVOC_HOTPLUG_INT_EN            (1 << 25)
-#define TV_HOTPLUG_INT_EN               (1 << 18)
-#define CRT_HOTPLUG_INT_EN              (1 << 9)
-#define CRT_HOTPLUG_FORCE_DETECT        (1 << 3)
-/* CDV.. */
-#define CRT_HOTPLUG_ACTIVATION_PERIOD_64        (1 << 8)
-#define CRT_HOTPLUG_DAC_ON_TIME_2M              (0 << 7)
-#define CRT_HOTPLUG_DAC_ON_TIME_4M              (1 << 7)
-#define CRT_HOTPLUG_VOLTAGE_COMPARE_40          (0 << 5)
-#define CRT_HOTPLUG_VOLTAGE_COMPARE_50          (1 << 5)
-#define CRT_HOTPLUG_VOLTAGE_COMPARE_60          (2 << 5)
-#define CRT_HOTPLUG_VOLTAGE_COMPARE_70          (3 << 5)
-#define CRT_HOTPLUG_VOLTAGE_COMPARE_MASK        (3 << 5)
-#define CRT_HOTPLUG_DETECT_DELAY_1G             (0 << 4)
-#define CRT_HOTPLUG_DETECT_DELAY_2G             (1 << 4)
-#define CRT_HOTPLUG_DETECT_VOLTAGE_325MV        (0 << 2)
-#define CRT_HOTPLUG_DETECT_VOLTAGE_475MV        (1 << 2)
-#define CRT_HOTPLUG_DETECT_MASK                 0x000000F8
-
-#define PORT_HOTPLUG_STAT       0x61114
-#define CRT_HOTPLUG_INT_STATUS          (1 << 11)
-#define TV_HOTPLUG_INT_STATUS           (1 << 10)
-#define CRT_HOTPLUG_MONITOR_MASK        (3 << 8)
-#define CRT_HOTPLUG_MONITOR_COLOR       (3 << 8)
-#define CRT_HOTPLUG_MONITOR_MONO        (2 << 8)
-#define CRT_HOTPLUG_MONITOR_NONE        (0 << 8)
-#define SDVOC_HOTPLUG_INT_STATUS        (1 << 7)
-#define SDVOB_HOTPLUG_INT_STATUS        (1 << 6)
-
-#define SDVOB                   0x61140
-#define SDVOC                   0x61160
-#define SDVO_ENABLE                     (1 << 31)
-#define SDVO_PIPE_B_SELECT              (1 << 30)
-#define SDVO_STALL_SELECT               (1 << 29)
-#define SDVO_INTERRUPT_ENABLE           (1 << 26)
-
-/**
- * 915G/GM SDVO pixel multiplier.
- *
- * Programmed value is multiplier - 1, up to 5x.
- *
- * DPLL_MD_UDI_MULTIPLIER_MASK
- */
-#define SDVO_PORT_MULTIPLY_MASK         (7 << 23)
-#define SDVO_PORT_MULTIPLY_SHIFT        23
-#define SDVO_PHASE_SELECT_MASK          (15 << 19)
-#define SDVO_PHASE_SELECT_DEFAULT       (6 << 19)
-#define SDVO_CLOCK_OUTPUT_INVERT        (1 << 18)
-#define SDVOC_GANG_MODE                 (1 << 16)
-#define SDVO_BORDER_ENABLE              (1 << 7)
-#define SDVOB_PCIE_CONCURRENCY          (1 << 3)
-#define SDVO_DETECTED                   (1 << 2)
-/* Bits to be preserved when writing */
-#define SDVOB_PRESERVE_MASK             ((1 << 17) | (1 << 16) | (1 << 14))
-#define SDVOC_PRESERVE_MASK             (1 << 17)
-
-/*
- * This register controls the LVDS output enable, pipe selection, and data
- * format selection.
- *
- * All of the clock/data pairs are force powered down by power sequencing.
- */
-#define LVDS                    0x61180
-/*
- * Enables the LVDS port.  This bit must be set before DPLLs are enabled, as
- * the DPLL semantics change when the LVDS is assigned to that pipe.
- */
-#define LVDS_PORT_EN                    (1 << 31)
-/* Selects pipe B for LVDS data.  Must be set on pre-965. */
-#define LVDS_PIPEB_SELECT               (1 << 30)
-
-/* Turns on border drawing to allow centered display. */
-#define LVDS_BORDER_EN                  (1 << 15)
-
-/*
- * Enables the A0-A2 data pairs and CLKA, containing 18 bits of color data per
- * pixel.
- */
-#define LVDS_A0A2_CLKA_POWER_MASK       (3 << 8)
-#define LVDS_A0A2_CLKA_POWER_DOWN       (0 << 8)
-#define LVDS_A0A2_CLKA_POWER_UP         (3 << 8)
-/*
- * Controls the A3 data pair, which contains the additional LSBs for 24 bit
- * mode.  Only enabled if LVDS_A0A2_CLKA_POWER_UP also indicates it should be
- * on.
- */
-#define LVDS_A3_POWER_MASK              (3 << 6)
-#define LVDS_A3_POWER_DOWN              (0 << 6)
-#define LVDS_A3_POWER_UP                (3 << 6)
-/*
- * Controls the CLKB pair.  This should only be set when LVDS_B0B3_POWER_UP
- * is set.
- */
-#define LVDS_CLKB_POWER_MASK            (3 << 4)
-#define LVDS_CLKB_POWER_DOWN            (0 << 4)
-#define LVDS_CLKB_POWER_UP              (3 << 4)
-/*
- * Controls the B0-B3 data pairs.  This must be set to match the DPLL p2
- * setting for whether we are in dual-channel mode.  The B3 pair will
- * additionally only be powered up when LVDS_A3_POWER_UP is set.
- */
-#define LVDS_B0B3_POWER_MASK            (3 << 2)
-#define LVDS_B0B3_POWER_DOWN            (0 << 2)
-#define LVDS_B0B3_POWER_UP              (3 << 2)
-
-#define PIPEACONF               0x70008
-#define PIPEACONF_ENABLE                (1 << 31)
-#define PIPEACONF_DISABLE               0
-#define PIPEACONF_DOUBLE_WIDE           (1 << 30)
-#define PIPECONF_ACTIVE                 (1 << 30)
-#define I965_PIPECONF_ACTIVE            (1 << 30)
-#define PIPECONF_DSIPLL_LOCK            (1 << 29)
-#define PIPEACONF_SINGLE_WIDE           0
-#define PIPEACONF_PIPE_UNLOCKED         0
-#define PIPEACONF_DSR                   (1 << 26)
-#define PIPEACONF_PIPE_LOCKED           (1 << 25)
-#define PIPEACONF_PALETTE               0
-#define PIPECONF_FORCE_BORDER           (1 << 25)
-#define PIPEACONF_GAMMA                 (1 << 24)
-#define PIPECONF_PROGRESSIVE            (0 << 21)
-#define PIPECONF_INTERLACE_W_FIELD_INDICATION   (6 << 21)
-#define PIPECONF_INTERLACE_FIELD_0_ONLY         (7 << 21)
-#define PIPECONF_PLANE_OFF              (1 << 19)
-#define PIPECONF_CURSOR_OFF             (1 << 18)
-
-#define PIPEBCONF               0x71008
-#define PIPEBCONF_ENABLE                (1 << 31)
-#define PIPEBCONF_DISABLE               0
-#define PIPEBCONF_DOUBLE_WIDE           (1 << 30)
-#define PIPEBCONF_DISABLE               0
-#define PIPEBCONF_GAMMA                 (1 << 24)
-#define PIPEBCONF_PALETTE               0
-
-#define PIPECCONF               0x72008
-
-#define PIPEBGCMAXRED           0x71010
-#define PIPEBGCMAXGREEN         0x71014
-#define PIPEBGCMAXBLUE          0x71018
-
-#define PIPEASTAT               0x70024
-#define PIPEBSTAT               0x71024
-#define PIPECSTAT               0x72024
-#define PIPE_VBLANK_INTERRUPT_STATUS            (1UL << 1)
-#define PIPE_START_VBLANK_INTERRUPT_STATUS      (1UL << 2)
-#define PIPE_VBLANK_CLEAR                       (1 << 1)
-#define PIPE_VBLANK_STATUS                      (1 << 1)
-#define PIPE_TE_STATUS                          (1UL << 6)
-#define PIPE_DPST_EVENT_STATUS                  (1UL << 7)
-#define PIPE_VSYNC_CLEAR                        (1UL << 9)
-#define PIPE_VSYNC_STATUS                       (1UL << 9)
-#define PIPE_HDMI_AUDIO_UNDERRUN_STATUS         (1UL << 10)
-#define PIPE_HDMI_AUDIO_BUFFER_DONE_STATUS      (1UL << 11)
-#define PIPE_VBLANK_INTERRUPT_ENABLE            (1UL << 17)
-#define PIPE_START_VBLANK_INTERRUPT_ENABLE      (1UL << 18)
-#define PIPE_TE_ENABLE                          (1UL << 22)
-#define PIPE_DPST_EVENT_ENABLE                  (1UL << 23)
-#define PIPE_VSYNC_ENABL                        (1UL << 25)
-#define PIPE_HDMI_AUDIO_UNDERRUN                (1UL << 26)
-#define PIPE_HDMI_AUDIO_BUFFER_DONE             (1UL << 27)
-#define PIPE_HDMI_AUDIO_INT_MASK                (PIPE_HDMI_AUDIO_UNDERRUN | \
-                                                PIPE_HDMI_AUDIO_BUFFER_DONE)
-#define PIPE_EVENT_MASK ((1 << 29)|(1 << 28)|(1 << 27)|(1 << 26)|(1 << 24)|(1 << 23)|(1 << 22)|(1 << 21)|(1 << 20)|(1 << 16))
-#define PIPE_VBLANK_MASK ((1 << 25)|(1 << 24)|(1 << 18)|(1 << 17))
-#define HISTOGRAM_INT_CONTROL           0x61268
-#define HISTOGRAM_BIN_DATA              0X61264
-#define HISTOGRAM_LOGIC_CONTROL         0x61260
-#define PWM_CONTROL_LOGIC               0x61250
-#define PIPE_HOTPLUG_INTERRUPT_STATUS           (1UL << 10)
-#define HISTOGRAM_INTERRUPT_ENABLE              (1UL << 31)
-#define HISTOGRAM_LOGIC_ENABLE                  (1UL << 31)
-#define PWM_LOGIC_ENABLE                        (1UL << 31)
-#define PWM_PHASEIN_ENABLE                      (1UL << 25)
-#define PWM_PHASEIN_INT_ENABLE                  (1UL << 24)
-#define PWM_PHASEIN_VB_COUNT                    0x00001f00
-#define PWM_PHASEIN_INC                         0x0000001f
-#define HISTOGRAM_INT_CTRL_CLEAR                (1UL << 30)
-#define DPST_YUV_LUMA_MODE                      0
-
-struct dpst_ie_histogram_control {
-        union {
-                uint32_t data;
-                struct {
-                        uint32_t bin_reg_index:7;
-                        uint32_t reserved:4;
-                        uint32_t bin_reg_func_select:1;
-                        uint32_t sync_to_phase_in:1;
-                        uint32_t alt_enhancement_mode:2;
-                        uint32_t reserved1:1;
-                        uint32_t sync_to_phase_in_count:8;
-                        uint32_t histogram_mode_select:1;
-                        uint32_t reserved2:4;
-                        uint32_t ie_pipe_assignment:1;
-                        uint32_t ie_mode_table_enabled:1;
-                        uint32_t ie_histogram_enable:1;
-                };
-        };
-};
-
-struct dpst_guardband {
-        union {
-                uint32_t data;
-                struct {
-                        uint32_t guardband:22;
-                        uint32_t guardband_interrupt_delay:8;
-                        uint32_t interrupt_status:1;
-                        uint32_t interrupt_enable:1;
-                };
-        };
-};
-
-#define PIPEAFRAMEHIGH          0x70040
-#define PIPEAFRAMEPIXEL         0x70044
-#define PIPEBFRAMEHIGH          0x71040
-#define PIPEBFRAMEPIXEL         0x71044
-#define PIPECFRAMEHIGH          0x72040
-#define PIPECFRAMEPIXEL         0x72044
-#define PIPE_FRAME_HIGH_MASK    0x0000ffff
-#define PIPE_FRAME_HIGH_SHIFT   0
-#define PIPE_FRAME_LOW_MASK     0xff000000
-#define PIPE_FRAME_LOW_SHIFT    24
-#define PIPE_PIXEL_MASK         0x00ffffff
-#define PIPE_PIXEL_SHIFT        0
-
-#define DSPARB                  0x70030
-#define DSPFW1                  0x70034
-#define DSPFW2                  0x70038
-#define DSPFW3                  0x7003c
-#define DSPFW4                  0x70050
-#define DSPFW5                  0x70054
-#define DSPFW6                  0x70058
-#define DSPCHICKENBIT           0x70400
-#define DSPACNTR                0x70180
-#define DSPBCNTR                0x71180
-#define DSPCCNTR                0x72180
-#define DISPLAY_PLANE_ENABLE                    (1 << 31)
-#define DISPLAY_PLANE_DISABLE                   0
-#define DISPPLANE_GAMMA_ENABLE                  (1 << 30)
-#define DISPPLANE_GAMMA_DISABLE                 0
-#define DISPPLANE_PIXFORMAT_MASK                (0xf << 26)
-#define DISPPLANE_8BPP                          (0x2 << 26)
-#define DISPPLANE_15_16BPP                      (0x4 << 26)
-#define DISPPLANE_16BPP                         (0x5 << 26)
-#define DISPPLANE_32BPP_NO_ALPHA                (0x6 << 26)
-#define DISPPLANE_32BPP                         (0x7 << 26)
-#define DISPPLANE_STEREO_ENABLE                 (1 << 25)
-#define DISPPLANE_STEREO_DISABLE                0
-#define DISPPLANE_SEL_PIPE_MASK                 (1 << 24)
-#define DISPPLANE_SEL_PIPE_POS                  24
-#define DISPPLANE_SEL_PIPE_A                    0
-#define DISPPLANE_SEL_PIPE_B                    (1 << 24)
-#define DISPPLANE_SRC_KEY_ENABLE                (1 << 22)
-#define DISPPLANE_SRC_KEY_DISABLE               0
-#define DISPPLANE_LINE_DOUBLE                   (1 << 20)
-#define DISPPLANE_NO_LINE_DOUBLE                0
-#define DISPPLANE_STEREO_POLARITY_FIRST         0
-#define DISPPLANE_STEREO_POLARITY_SECOND        (1 << 18)
-/* plane B only */
-#define DISPPLANE_ALPHA_TRANS_ENABLE            (1 << 15)
-#define DISPPLANE_ALPHA_TRANS_DISABLE           0
-#define DISPPLANE_SPRITE_ABOVE_DISPLAYA         0
-#define DISPPLANE_SPRITE_ABOVE_OVERLAY          (1)
-#define DISPPLANE_BOTTOM                        (4)
-
-#define DSPABASE                0x70184
-#define DSPALINOFF              0x70184
-#define DSPASTRIDE              0x70188
-
-#define DSPBBASE                0x71184
-#define DSPBLINOFF              0X71184
-#define DSPBADDR                DSPBBASE
-#define DSPBSTRIDE              0x71188
-
-#define DSPCBASE                0x72184
-#define DSPCLINOFF              0x72184
-#define DSPCSTRIDE              0x72188
-
-#define DSPAKEYVAL              0x70194
-#define DSPAKEYMASK             0x70198
-
-#define DSPAPOS                 0x7018C /* reserved */
-#define DSPASIZE                0x70190
-#define DSPBPOS                 0x7118C
-#define DSPBSIZE                0x71190
-#define DSPCPOS                 0x7218C
-#define DSPCSIZE                0x72190
-
-#define DSPASURF                0x7019C
-#define DSPATILEOFF             0x701A4
-
-#define DSPBSURF                0x7119C
-#define DSPBTILEOFF             0x711A4
-
-#define DSPCSURF                0x7219C
-#define DSPCTILEOFF             0x721A4
-#define DSPCKEYMAXVAL           0x721A0
-#define DSPCKEYMINVAL           0x72194
-#define DSPCKEYMSK              0x72198
-
-#define VGACNTRL                0x71400
-#define VGA_DISP_DISABLE                (1 << 31)
-#define VGA_2X_MODE                     (1 << 30)
-#define VGA_PIPE_B_SELECT               (1 << 29)
-
-/*
- * Overlay registers
- */
-#define OV_C_OFFSET             0x08000
-#define OV_OVADD                0x30000
-#define OV_DOVASTA              0x30008
-# define OV_PIPE_SELECT                 ((1 << 6)|(1 << 7))
-# define OV_PIPE_SELECT_POS             6
-# define OV_PIPE_A                      0
-# define OV_PIPE_C                      1
-#define OV_OGAMC5               0x30010
-#define OV_OGAMC4               0x30014
-#define OV_OGAMC3               0x30018
-#define OV_OGAMC2               0x3001C
-#define OV_OGAMC1               0x30020
-#define OV_OGAMC0               0x30024
-#define OVC_OVADD               0x38000
-#define OVC_DOVCSTA             0x38008
-#define OVC_OGAMC5              0x38010
-#define OVC_OGAMC4              0x38014
-#define OVC_OGAMC3              0x38018
-#define OVC_OGAMC2              0x3801C
-#define OVC_OGAMC1              0x38020
-#define OVC_OGAMC0              0x38024
-
-/*
- * Some BIOS scratch area registers.  The 845 (and 830?) store the amount
- * of video memory available to the BIOS in SWF1.
- */
-#define SWF0                    0x71410
-#define SWF1                    0x71414
-#define SWF2                    0x71418
-#define SWF3                    0x7141c
-#define SWF4                    0x71420
-#define SWF5                    0x71424
-#define SWF6                    0x71428
-
-/*
- * 855 scratch registers.
- */
-#define SWF00                   0x70410
-#define SWF01                   0x70414
-#define SWF02                   0x70418
-#define SWF03                   0x7041c
-#define SWF04                   0x70420
-#define SWF05                   0x70424
-#define SWF06                   0x70428
-
-#define SWF10                   SWF0
-#define SWF11                   SWF1
-#define SWF12                   SWF2
-#define SWF13                   SWF3
-#define SWF14                   SWF4
-#define SWF15                   SWF5
-#define SWF16                   SWF6
-
-#define SWF30                   0x72414
-#define SWF31                   0x72418
-#define SWF32                   0x7241c
-
-
-/*
- * Palette registers
- */
-#define PALETTE_A               0x0a000
-#define PALETTE_B               0x0a800
-#define PALETTE_C               0x0ac00
-
-/* Cursor A & B regs */
-#define CURACNTR                0x70080
-#define CURSOR_MODE_DISABLE             0x00
-#define CURSOR_MODE_64_32B_AX           0x07
-#define CURSOR_MODE_64_ARGB_AX          ((1 << 5) | CURSOR_MODE_64_32B_AX)
-#define MCURSOR_GAMMA_ENABLE            (1 << 26)
-#define CURABASE                0x70084
-#define CURAPOS                 0x70088
-#define CURSOR_POS_MASK                 0x007FF
-#define CURSOR_POS_SIGN                 0x8000
-#define CURSOR_X_SHIFT                  0
-#define CURSOR_Y_SHIFT                  16
-#define CURBCNTR                0x700c0
-#define CURBBASE                0x700c4
-#define CURBPOS                 0x700c8
-#define CURCCNTR                0x700e0
-#define CURCBASE                0x700e4
-#define CURCPOS                 0x700e8
-
-/*
- * Interrupt Registers
- */
-#define IER                     0x020a0
-#define IIR                     0x020a4
-#define IMR                     0x020a8
-#define ISR                     0x020ac
-
-/*
- * MOORESTOWN delta registers
- */
-#define MRST_DPLL_A             0x0f014
-#define MDFLD_DPLL_B            0x0f018
-#define MDFLD_INPUT_REF_SEL             (1 << 14)
-#define MDFLD_VCO_SEL                   (1 << 16)
-#define DPLLA_MODE_LVDS                 (2 << 26)       /* mrst */
-#define MDFLD_PLL_LATCHEN               (1 << 28)
-#define MDFLD_PWR_GATE_EN               (1 << 30)
-#define MDFLD_P1_MASK                   (0x1FF << 17)
-#define MRST_FPA0               0x0f040
-#define MRST_FPA1               0x0f044
-#define MDFLD_DPLL_DIV0         0x0f048
-#define MDFLD_DPLL_DIV1         0x0f04c
-#define MRST_PERF_MODE          0x020f4
-
-/*
- * MEDFIELD HDMI registers
- */
-#define HDMIPHYMISCCTL          0x61134
-#define HDMI_PHY_POWER_DOWN             0x7f
-#define HDMIB_CONTROL           0x61140
-#define HDMIB_PORT_EN                   (1 << 31)
-#define HDMIB_PIPE_B_SELECT             (1 << 30)
-#define HDMIB_NULL_PACKET               (1 << 9)
-#define HDMIB_HDCP_PORT                 (1 << 5)
-
-/* #define LVDS                 0x61180 */
-#define MRST_PANEL_8TO6_DITHER_ENABLE   (1 << 25)
-#define MRST_PANEL_24_DOT_1_FORMAT      (1 << 24)
-#define LVDS_A3_POWER_UP_0_OUTPUT       (1 << 6)
-
-#define MIPI                    0x61190
-#define MIPI_C                  0x62190
-#define MIPI_PORT_EN                    (1 << 31)
-/* Turns on border drawing to allow centered display. */
-#define SEL_FLOPPED_HSTX                (1 << 23)
-#define PASS_FROM_SPHY_TO_AFE           (1 << 16)
-#define MIPI_BORDER_EN                  (1 << 15)
-#define MIPIA_3LANE_MIPIC_1LANE         0x1
-#define MIPIA_2LANE_MIPIC_2LANE         0x2
-#define TE_TRIGGER_DSI_PROTOCOL         (1 << 2)
-#define TE_TRIGGER_GPIO_PIN             (1 << 3)
-#define MIPI_TE_COUNT           0x61194
-
-/* #define PP_CONTROL   0x61204 */
-#define POWER_DOWN_ON_RESET             (1 << 1)
-
-/* #define PFIT_CONTROL 0x61230 */
-#define PFIT_PIPE_SELECT                (3 << 29)
-#define PFIT_PIPE_SELECT_SHIFT          (29)
-
-/* #define BLC_PWM_CTL          0x61254 */
-#define MRST_BACKLIGHT_MODULATION_FREQ_SHIFT    (16)
-#define MRST_BACKLIGHT_MODULATION_FREQ_MASK     (0xffff << 16)
-
-/* #define PIPEACONF 0x70008 */
-#define PIPEACONF_PIPE_STATE            (1 << 30)
-/* #define DSPACNTR             0x70180 */
-
-#define MRST_DSPABASE           0x7019c
-#define MRST_DSPBBASE           0x7119c
-#define MDFLD_DSPCBASE          0x7219c
-
-/*
- * Moorestown registers.
- */
-
-/*
- *      MIPI IP registers
- */
-#define MIPIC_REG_OFFSET                0x800
-
-#define DEVICE_READY_REG                0xb000
-#define LP_OUTPUT_HOLD                          (1 << 16)
-#define EXIT_ULPS_DEV_READY                     0x3
-#define LP_OUTPUT_HOLD_RELEASE                  0x810000
-# define ENTERING_ULPS                          (2 << 1)
-# define EXITING_ULPS                           (1 << 1)
-# define ULPS_MASK                              (3 << 1)
-# define BUS_POSSESSION                         (1 << 3)
-#define INTR_STAT_REG                   0xb004
-#define RX_SOT_ERROR                            (1 << 0)
-#define RX_SOT_SYNC_ERROR                       (1 << 1)
-#define RX_ESCAPE_MODE_ENTRY_ERROR              (1 << 3)
-#define RX_LP_TX_SYNC_ERROR                     (1 << 4)
-#define RX_HS_RECEIVE_TIMEOUT_ERROR             (1 << 5)
-#define RX_FALSE_CONTROL_ERROR                  (1 << 6)
-#define RX_ECC_SINGLE_BIT_ERROR                 (1 << 7)
-#define RX_ECC_MULTI_BIT_ERROR                  (1 << 8)
-#define RX_CHECKSUM_ERROR                       (1 << 9)
-#define RX_DSI_DATA_TYPE_NOT_RECOGNIZED         (1 << 10)
-#define RX_DSI_VC_ID_INVALID                    (1 << 11)
-#define TX_FALSE_CONTROL_ERROR                  (1 << 12)
-#define TX_ECC_SINGLE_BIT_ERROR                 (1 << 13)
-#define TX_ECC_MULTI_BIT_ERROR                  (1 << 14)
-#define TX_CHECKSUM_ERROR                       (1 << 15)
-#define TX_DSI_DATA_TYPE_NOT_RECOGNIZED         (1 << 16)
-#define TX_DSI_VC_ID_INVALID                    (1 << 17)
-#define HIGH_CONTENTION                         (1 << 18)
-#define LOW_CONTENTION                          (1 << 19)
-#define DPI_FIFO_UNDER_RUN                      (1 << 20)
-#define HS_TX_TIMEOUT                           (1 << 21)
-#define LP_RX_TIMEOUT                           (1 << 22)
-#define TURN_AROUND_ACK_TIMEOUT                 (1 << 23)
-#define ACK_WITH_NO_ERROR                       (1 << 24)
-#define HS_GENERIC_WR_FIFO_FULL                 (1 << 27)
-#define LP_GENERIC_WR_FIFO_FULL                 (1 << 28)
-#define SPL_PKT_SENT                            (1 << 30)
-#define INTR_EN_REG                     0xb008
-#define DSI_FUNC_PRG_REG                0xb00c
-#define DPI_CHANNEL_NUMBER_POS                  0x03
-#define DBI_CHANNEL_NUMBER_POS                  0x05
-#define FMT_DPI_POS                             0x07
-#define FMT_DBI_POS                             0x0A
-#define DBI_DATA_WIDTH_POS                      0x0D
-
-/* DPI PIXEL FORMATS */
-#define RGB_565_FMT                             0x01    /* RGB 565 FORMAT */
-#define RGB_666_FMT                             0x02    /* RGB 666 FORMAT */
-#define LRGB_666_FMT                            0x03    /* RGB LOOSELY PACKED
-                                                         * 666 FORMAT
-                                                         */
-#define RGB_888_FMT                             0x04    /* RGB 888 FORMAT */
-#define VIRTUAL_CHANNEL_NUMBER_0                0x00    /* Virtual channel 0 */
-#define VIRTUAL_CHANNEL_NUMBER_1                0x01    /* Virtual channel 1 */
-#define VIRTUAL_CHANNEL_NUMBER_2                0x02    /* Virtual channel 2 */
-#define VIRTUAL_CHANNEL_NUMBER_3                0x03    /* Virtual channel 3 */
-
-#define DBI_NOT_SUPPORTED                       0x00    /* command mode
-                                                         * is not supported
-                                                         */
-#define DBI_DATA_WIDTH_16BIT                    0x01    /* 16 bit data */
-#define DBI_DATA_WIDTH_9BIT                     0x02    /* 9 bit data */
-#define DBI_DATA_WIDTH_8BIT                     0x03    /* 8 bit data */
-#define DBI_DATA_WIDTH_OPT1                     0x04    /* option 1 */
-#define DBI_DATA_WIDTH_OPT2                     0x05    /* option 2 */
-
-#define HS_TX_TIMEOUT_REG               0xb010
-#define LP_RX_TIMEOUT_REG               0xb014
-#define TURN_AROUND_TIMEOUT_REG         0xb018
-#define DEVICE_RESET_REG                0xb01C
-#define DPI_RESOLUTION_REG              0xb020
-#define RES_V_POS                               0x10
-#define DBI_RESOLUTION_REG              0xb024 /* Reserved for MDFLD */
-#define HORIZ_SYNC_PAD_COUNT_REG        0xb028
-#define HORIZ_BACK_PORCH_COUNT_REG      0xb02C
-#define HORIZ_FRONT_PORCH_COUNT_REG     0xb030
-#define HORIZ_ACTIVE_AREA_COUNT_REG     0xb034
-#define VERT_SYNC_PAD_COUNT_REG         0xb038
-#define VERT_BACK_PORCH_COUNT_REG       0xb03c
-#define VERT_FRONT_PORCH_COUNT_REG      0xb040
-#define HIGH_LOW_SWITCH_COUNT_REG       0xb044
-#define DPI_CONTROL_REG                 0xb048
-#define DPI_SHUT_DOWN                           (1 << 0)
-#define DPI_TURN_ON                             (1 << 1)
-#define DPI_COLOR_MODE_ON                       (1 << 2)
-#define DPI_COLOR_MODE_OFF                      (1 << 3)
-#define DPI_BACK_LIGHT_ON                       (1 << 4)
-#define DPI_BACK_LIGHT_OFF                      (1 << 5)
-#define DPI_LP                                  (1 << 6)
-#define DPI_DATA_REG                    0xb04c
-#define DPI_BACK_LIGHT_ON_DATA                  0x07
-#define DPI_BACK_LIGHT_OFF_DATA                 0x17
-#define INIT_COUNT_REG                  0xb050
-#define MAX_RET_PAK_REG                 0xb054
-#define VIDEO_FMT_REG                   0xb058
-#define COMPLETE_LAST_PCKT                      (1 << 2)
-#define EOT_DISABLE_REG                 0xb05c
-#define ENABLE_CLOCK_STOPPING                   (1 << 1)
-#define LP_BYTECLK_REG                  0xb060
-#define LP_GEN_DATA_REG                 0xb064
-#define HS_GEN_DATA_REG                 0xb068
-#define LP_GEN_CTRL_REG                 0xb06C
-#define HS_GEN_CTRL_REG                 0xb070
-#define DCS_CHANNEL_NUMBER_POS          0x6
-#define MCS_COMMANDS_POS                0x8
-#define WORD_COUNTS_POS                 0x8
-#define MCS_PARAMETER_POS                       0x10
-#define GEN_FIFO_STAT_REG               0xb074
-#define HS_DATA_FIFO_FULL                       (1 << 0)
-#define HS_DATA_FIFO_HALF_EMPTY                 (1 << 1)
-#define HS_DATA_FIFO_EMPTY                      (1 << 2)
-#define LP_DATA_FIFO_FULL                       (1 << 8)
-#define LP_DATA_FIFO_HALF_EMPTY                 (1 << 9)
-#define LP_DATA_FIFO_EMPTY                      (1 << 10)
-#define HS_CTRL_FIFO_FULL                       (1 << 16)
-#define HS_CTRL_FIFO_HALF_EMPTY                 (1 << 17)
-#define HS_CTRL_FIFO_EMPTY                      (1 << 18)
-#define LP_CTRL_FIFO_FULL                       (1 << 24)
-#define LP_CTRL_FIFO_HALF_EMPTY                 (1 << 25)
-#define LP_CTRL_FIFO_EMPTY                      (1 << 26)
-#define DBI_FIFO_EMPTY                          (1 << 27)
-#define DPI_FIFO_EMPTY                          (1 << 28)
-#define HS_LS_DBI_ENABLE_REG            0xb078
-#define TXCLKESC_REG                    0xb07c
-#define DPHY_PARAM_REG                  0xb080
-#define DBI_BW_CTRL_REG                 0xb084
-#define CLK_LANE_SWT_REG                0xb088
-
-/*
- * MIPI Adapter registers
- */
-#define MIPI_CONTROL_REG                0xb104
-#define MIPI_2X_CLOCK_BITS                      ((1 << 0) | (1 << 1))
-#define MIPI_DATA_ADDRESS_REG           0xb108
-#define MIPI_DATA_LENGTH_REG            0xb10C
-#define MIPI_COMMAND_ADDRESS_REG        0xb110
-#define MIPI_COMMAND_LENGTH_REG         0xb114
-#define MIPI_READ_DATA_RETURN_REG0      0xb118
-#define MIPI_READ_DATA_RETURN_REG1      0xb11C
-#define MIPI_READ_DATA_RETURN_REG2      0xb120
-#define MIPI_READ_DATA_RETURN_REG3      0xb124
-#define MIPI_READ_DATA_RETURN_REG4      0xb128
-#define MIPI_READ_DATA_RETURN_REG5      0xb12C
-#define MIPI_READ_DATA_RETURN_REG6      0xb130
-#define MIPI_READ_DATA_RETURN_REG7      0xb134
-#define MIPI_READ_DATA_VALID_REG        0xb138
-
-/* DBI COMMANDS */
-#define soft_reset                      0x01
-/*
- *      The display module performs a software reset.
- *      Registers are written with their SW Reset default values.
- */
-#define get_power_mode                  0x0a
-/*
- *      The display module returns the current power mode
- */
-#define get_address_mode                0x0b
-/*
- *      The display module returns the current status.
- */
-#define get_pixel_format                0x0c
-/*
- *      This command gets the pixel format for the RGB image data
- *      used by the interface.
- */
-#define get_display_mode                0x0d
-/*
- *      The display module returns the Display Image Mode status.
- */
-#define get_signal_mode                 0x0e
-/*
- *      The display module returns the Display Signal Mode.
- */
-#define get_diagnostic_result           0x0f
-/*
- *      The display module returns the self-diagnostic results following
- *      a Sleep Out command.
- */
-#define enter_sleep_mode                0x10
-/*
- *      This command causes the display module to enter the Sleep mode.
- *      In this mode, all unnecessary blocks inside the display module are
- *      disabled except interface communication. This is the lowest power
- *      mode the display module supports.
- */
-#define exit_sleep_mode                 0x11
-/*
- *      This command causes the display module to exit Sleep mode.
- *      All blocks inside the display module are enabled.
- */
-#define enter_partial_mode              0x12
-/*
- *      This command causes the display module to enter the Partial Display
- *      Mode. The Partial Display Mode window is described by the
- *      set_partial_area command.
- */
-#define enter_normal_mode               0x13
-/*
- *      This command causes the display module to enter the Normal mode.
- *      Normal Mode is defined as Partial Display mode and Scroll mode are off
- */
-#define exit_invert_mode                0x20
-/*
- *      This command causes the display module to stop inverting the image
- *      data on the display device. The frame memory contents remain unchanged.
- *      No status bits are changed.
- */
-#define enter_invert_mode               0x21
-/*
- *      This command causes the display module to invert the image data only on
- *      the display device. The frame memory contents remain unchanged.
- *      No status bits are changed.
- */
-#define set_gamma_curve                 0x26
-/*
- *      This command selects the desired gamma curve for the display device.
- *      Four fixed gamma curves are defined in section DCS spec.
- */
-#define set_display_off                 0x28
-/* ************************************************************************* *\
-This command causes the display module to stop displaying the image data
-on the display device. The frame memory contents remain unchanged.
-No status bits are changed.
-\* ************************************************************************* */
-#define set_display_on                  0x29
-/* ************************************************************************* *\
-This command causes the display module to start displaying the image data
-on the display device. The frame memory contents remain unchanged.
-No status bits are changed.
-\* ************************************************************************* */
-#define set_column_address              0x2a
-/*
- *      This command defines the column extent of the frame memory accessed by
- *      the hostprocessor with the read_memory_continue and
- *      write_memory_continue commands.
- *      No status bits are changed.
- */
-#define set_page_addr                   0x2b
-/*
- *      This command defines the page extent of the frame memory accessed by
- *      the host processor with the write_memory_continue and
- *      read_memory_continue command.
- *      No status bits are changed.
- */
-#define write_mem_start                 0x2c
-/*
- *      This command transfers image data from the host processor to the
- *      display modules frame memory starting at the pixel location specified
- *      by preceding set_column_address and set_page_address commands.
- */
-#define set_partial_area                0x30
-/*
- *      This command defines the Partial Display mode s display area.
- *      There are two parameters associated with this command, the first
- *      defines the Start Row (SR) and the second the End Row (ER). SR and ER
- *      refer to the Frame Memory Line Pointer.
- */
-#define set_scroll_area                 0x33
-/*
- *      This command defines the display modules Vertical Scrolling Area.
- */
-#define set_tear_off                    0x34
-/*
- *      This command turns off the display modules Tearing Effect output
- *      signal on the TE signal line.
- */
-#define set_tear_on                     0x35
-/*
- *      This command turns on the display modules Tearing Effect output signal
- *      on the TE signal line.
- */
-#define set_address_mode                0x36
-/*
- *      This command sets the data order for transfers from the host processor
- *      to display modules frame memory,bits B[7:5] and B3, and from the
- *      display modules frame memory to the display device, bits B[2:0] and B4.
- */
-#define set_scroll_start                0x37
-/*
- *      This command sets the start of the vertical scrolling area in the frame
- *      memory. The vertical scrolling area is fully defined when this command
- *      is used with the set_scroll_area command The set_scroll_start command
- *      has one parameter, the Vertical Scroll Pointer. The VSP defines the
- *      line in the frame memory that is written to the display device as the
- *      first line of the vertical scroll area.
- */
-#define exit_idle_mode                  0x38
-/*
- *      This command causes the display module to exit Idle mode.
- */
-#define enter_idle_mode                 0x39
-/*
- *      This command causes the display module to enter Idle Mode.
- *      In Idle Mode, color expression is reduced. Colors are shown on the
- *      display device using the MSB of each of the R, G and B color
- *      components in the frame memory
- */
-#define set_pixel_format                0x3a
-/*
- *      This command sets the pixel format for the RGB image data used by the
- *      interface.
- *      Bits D[6:4]  DPI Pixel Format Definition
- *      Bits D[2:0]  DBI Pixel Format Definition
- *      Bits D7 and D3 are not used.
- */
-#define DCS_PIXEL_FORMAT_3bpp           0x1
-#define DCS_PIXEL_FORMAT_8bpp           0x2
-#define DCS_PIXEL_FORMAT_12bpp          0x3
-#define DCS_PIXEL_FORMAT_16bpp          0x5
-#define DCS_PIXEL_FORMAT_18bpp          0x6
-#define DCS_PIXEL_FORMAT_24bpp          0x7
-
-#define write_mem_cont                  0x3c
-
-/*
- *      This command transfers image data from the host processor to the
- *      display module's frame memory continuing from the pixel location
- *      following the previous write_memory_continue or write_memory_start
- *      command.
- */
-#define set_tear_scanline               0x44
-/*
- *      This command turns on the display modules Tearing Effect output signal
- *      on the TE signal line when the display module reaches line N.
- */
-#define get_scanline                    0x45
-/*
- *      The display module returns the current scanline, N, used to update the
- *       display device. The total number of scanlines on a display device is
- *      defined as VSYNC + VBP + VACT + VFP.The first scanline is defined as
- *      the first line of V Sync and is denoted as Line 0.
- *      When in Sleep Mode, the value returned by get_scanline is undefined.
- */
-
-/* MCS or Generic COMMANDS */
-/* MCS/generic data type */
-#define GEN_SHORT_WRITE_0       0x03  /* generic short write, no parameters */
-#define GEN_SHORT_WRITE_1       0x13  /* generic short write, 1 parameters */
-#define GEN_SHORT_WRITE_2       0x23  /* generic short write, 2 parameters */
-#define GEN_READ_0              0x04  /* generic read, no parameters */
-#define GEN_READ_1              0x14  /* generic read, 1 parameters */
-#define GEN_READ_2              0x24  /* generic read, 2 parameters */
-#define GEN_LONG_WRITE          0x29  /* generic long write */
-#define MCS_SHORT_WRITE_0       0x05  /* MCS short write, no parameters */
-#define MCS_SHORT_WRITE_1       0x15  /* MCS short write, 1 parameters */
-#define MCS_READ                0x06  /* MCS read, no parameters */
-#define MCS_LONG_WRITE          0x39  /* MCS long write */
-/* MCS/generic commands */
-/* TPO MCS */
-#define write_display_profile           0x50
-#define write_display_brightness        0x51
-#define write_ctrl_display              0x53
-#define write_ctrl_cabc                 0x55
-  #define UI_IMAGE              0x01
-  #define STILL_IMAGE           0x02
-  #define MOVING_IMAGE          0x03
-#define write_hysteresis                0x57
-#define write_gamma_setting             0x58
-#define write_cabc_min_bright           0x5e
-#define write_kbbc_profile              0x60
-/* TMD MCS */
-#define tmd_write_display_brightness 0x8c
-
-/*
- *      This command is used to control ambient light, panel backlight
- *      brightness and gamma settings.
- */
-#define BRIGHT_CNTL_BLOCK_ON    (1 << 5)
-#define AMBIENT_LIGHT_SENSE_ON  (1 << 4)
-#define DISPLAY_DIMMING_ON      (1 << 3)
-#define BACKLIGHT_ON            (1 << 2)
-#define DISPLAY_BRIGHTNESS_AUTO (1 << 1)
-#define GAMMA_AUTO              (1 << 0)
-
-/* DCS Interface Pixel Formats */
-#define DCS_PIXEL_FORMAT_3BPP   0x1
-#define DCS_PIXEL_FORMAT_8BPP   0x2
-#define DCS_PIXEL_FORMAT_12BPP  0x3
-#define DCS_PIXEL_FORMAT_16BPP  0x5
-#define DCS_PIXEL_FORMAT_18BPP  0x6
-#define DCS_PIXEL_FORMAT_24BPP  0x7
-/* ONE PARAMETER READ DATA */
-#define addr_mode_data          0xfc
-#define diag_res_data           0x00
-#define disp_mode_data          0x23
-#define pxl_fmt_data            0x77
-#define pwr_mode_data           0x74
-#define sig_mode_data           0x00
-/* TWO PARAMETERS READ DATA */
-#define scanline_data1          0xff
-#define scanline_data2          0xff
-#define NON_BURST_MODE_SYNC_PULSE       0x01    /* Non Burst Mode
-                                                 * with Sync Pulse
-                                                 */
-#define NON_BURST_MODE_SYNC_EVENTS      0x02    /* Non Burst Mode
-                                                 * with Sync events
-                                                 */
-#define BURST_MODE                      0x03    /* Burst Mode */
-#define DBI_COMMAND_BUFFER_SIZE         0x240   /* 0x32 */    /* 0x120 */
-                                                /* Allocate at least
-                                                 * 0x100 Byte with 32
-                                                 * byte alignment
-                                                 */
-#define DBI_DATA_BUFFER_SIZE            0x120   /* Allocate at least
-                                                 * 0x100 Byte with 32
-                                                 * byte alignment
-                                                 */
-#define DBI_CB_TIME_OUT                 0xFFFF
-
-#define GEN_FB_TIME_OUT                 2000
-
-#define SKU_83                          0x01
-#define SKU_100                         0x02
-#define SKU_100L                        0x04
-#define SKU_BYPASS                      0x08
-
-/* Some handy macros for playing with bitfields. */
-#define PSB_MASK(high, low) (((1<<((high)-(low)+1))-1)<<(low))
-#define SET_FIELD(value, field) (((value) << field ## _SHIFT) & field ## _MASK)
-#define GET_FIELD(word, field) (((word)  & field ## _MASK) >> field ## _SHIFT)
-
-#define _PIPE(pipe, a, b) ((a) + (pipe)*((b)-(a)))
-
-/* PCI config space */
-
-#define SB_PCKT         0x02100 /* cedarview */
-# define SB_OPCODE_MASK                         PSB_MASK(31, 16)
-# define SB_OPCODE_SHIFT                        16
-# define SB_OPCODE_READ                         0
-# define SB_OPCODE_WRITE                        1
-# define SB_DEST_MASK                           PSB_MASK(15, 8)
-# define SB_DEST_SHIFT                          8
-# define SB_DEST_DPLL                           0x88
-# define SB_BYTE_ENABLE_MASK                    PSB_MASK(7, 4)
-# define SB_BYTE_ENABLE_SHIFT                   4
-# define SB_BUSY                                (1 << 0)
-
-
-/* 32-bit value read/written from the DPIO reg. */
-#define SB_DATA         0x02104 /* cedarview */
-/* 32-bit address of the DPIO reg to be read/written. */
-#define SB_ADDR         0x02108 /* cedarview */
-#define DPIO_CFG        0x02110 /* cedarview */
-# define DPIO_MODE_SELECT_1                     (1 << 3)
-# define DPIO_MODE_SELECT_0                     (1 << 2)
-# define DPIO_SFR_BYPASS                        (1 << 1)
-/* reset is active low */
-# define DPIO_CMN_RESET_N                       (1 << 0)
-
-/* Cedarview sideband registers */
-#define _SB_M_A                 0x8008
-#define _SB_M_B                 0x8028
-#define SB_M(pipe) _PIPE(pipe, _SB_M_A, _SB_M_B)
-# define SB_M_DIVIDER_MASK                      (0xFF << 24)
-# define SB_M_DIVIDER_SHIFT                     24
-
-#define _SB_N_VCO_A             0x8014
-#define _SB_N_VCO_B             0x8034
-#define SB_N_VCO(pipe) _PIPE(pipe, _SB_N_VCO_A, _SB_N_VCO_B)
-#define SB_N_VCO_SEL_MASK                       PSB_MASK(31, 30)
-#define SB_N_VCO_SEL_SHIFT                      30
-#define SB_N_DIVIDER_MASK                       PSB_MASK(29, 26)
-#define SB_N_DIVIDER_SHIFT                      26
-#define SB_N_CB_TUNE_MASK                       PSB_MASK(25, 24)
-#define SB_N_CB_TUNE_SHIFT                      24
-
-#define _SB_REF_A               0x8018
-#define _SB_REF_B               0x8038
-#define SB_REF_SFR(pipe)        _PIPE(pipe, _SB_REF_A, _SB_REF_B)
-
-#define _SB_P_A                 0x801c
-#define _SB_P_B                 0x803c
-#define SB_P(pipe) _PIPE(pipe, _SB_P_A, _SB_P_B)
-#define SB_P2_DIVIDER_MASK                      PSB_MASK(31, 30)
-#define SB_P2_DIVIDER_SHIFT                     30
-#define SB_P2_10                                0 /* HDMI, DP, DAC */
-#define SB_P2_5                         1 /* DAC */
-#define SB_P2_14                                2 /* LVDS single */
-#define SB_P2_7                         3 /* LVDS double */
-#define SB_P1_DIVIDER_MASK                      PSB_MASK(15, 12)
-#define SB_P1_DIVIDER_SHIFT                     12
-
-#define PSB_LANE0               0x120
-#define PSB_LANE1               0x220
-#define PSB_LANE2               0x2320
-#define PSB_LANE3               0x2420
-
-#define LANE_PLL_MASK           (0x7 << 20)
-#define LANE_PLL_ENABLE         (0x3 << 20)
-
-
-#endif
diff --git a/drivers/staging/gma500/psb_intel_sdvo.c b/drivers/staging/gma500/psb_intel_sdvo.c
deleted file mode 100644
index a4bad1af4b7c..000000000000
--- a/drivers/staging/gma500/psb_intel_sdvo.c
+++ /dev/null
@@ -1,1293 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *      Eric Anholt <eric@anholt.net>
- */
-
-#include <linux/i2c.h>
-#include <linux/delay.h>
-/* #include <drm/drm_crtc.h> */
-#include <drm/drmP.h>
-#include "psb_drv.h"
-#include "psb_intel_drv.h"
-#include "psb_intel_reg.h"
-#include "psb_intel_sdvo_regs.h"
-
-struct psb_intel_sdvo_priv {
-        struct psb_intel_i2c_chan *i2c_bus;
-        int slaveaddr;
-        int output_device;
-
-        u16 active_outputs;
-
-        struct psb_intel_sdvo_caps caps;
-        int pixel_clock_min, pixel_clock_max;
-
-        int save_sdvo_mult;
-        u16 save_active_outputs;
-        struct psb_intel_sdvo_dtd save_input_dtd_1, save_input_dtd_2;
-        struct psb_intel_sdvo_dtd save_output_dtd[16];
-        u32 save_SDVOX;
-        u8 in_out_map[4];
-
-        u8 by_input_wiring;
-        u32 active_device;
-};
-
-/**
- * Writes the SDVOB or SDVOC with the given value, but always writes both
- * SDVOB and SDVOC to work around apparent hardware issues (according to
- * comments in the BIOS).
- */
-void psb_intel_sdvo_write_sdvox(struct psb_intel_output *psb_intel_output,
-                                u32 val)
-{
-        struct drm_device *dev = psb_intel_output->base.dev;
-        struct psb_intel_sdvo_priv *sdvo_priv = psb_intel_output->dev_priv;
-        u32 bval = val, cval = val;
-        int i;
-
-        if (sdvo_priv->output_device == SDVOB)
-                cval = REG_READ(SDVOC);
-        else
-                bval = REG_READ(SDVOB);
-        /*
-         * Write the registers twice for luck. Sometimes,
-         * writing them only once doesn't appear to 'stick'.
-         * The BIOS does this too. Yay, magic
-         */
-        for (i = 0; i < 2; i++) {
-                REG_WRITE(SDVOB, bval);
-                REG_READ(SDVOB);
-                REG_WRITE(SDVOC, cval);
-                REG_READ(SDVOC);
-        }
-}
-
-static bool psb_intel_sdvo_read_byte(
-                                struct psb_intel_output *psb_intel_output,
-                                u8 addr, u8 *ch)
-{
-        struct psb_intel_sdvo_priv *sdvo_priv = psb_intel_output->dev_priv;
-        u8 out_buf[2];
-        u8 buf[2];
-        int ret;
-
-        struct i2c_msg msgs[] = {
-                {
-                 .addr = sdvo_priv->i2c_bus->slave_addr,
-                 .flags = 0,
-                 .len = 1,
-                 .buf = out_buf,
-                 },
-                {
-                 .addr = sdvo_priv->i2c_bus->slave_addr,
-                 .flags = I2C_M_RD,
-                 .len = 1,
-                 .buf = buf,
-                 }
-        };
-
-        out_buf[0] = addr;
-        out_buf[1] = 0;
-
-        ret = i2c_transfer(&sdvo_priv->i2c_bus->adapter, msgs, 2);
-        if (ret == 2) {
-                *ch = buf[0];
-                return true;
-        }
-
-        return false;
-}
-
-static bool psb_intel_sdvo_write_byte(
-                        struct psb_intel_output *psb_intel_output,
-                        int addr, u8 ch)
-{
-        u8 out_buf[2];
-        struct i2c_msg msgs[] = {
-                {
-                 .addr = psb_intel_output->i2c_bus->slave_addr,
-                 .flags = 0,
-                 .len = 2,
-                 .buf = out_buf,
-                 }
-        };
-
-        out_buf[0] = addr;
-        out_buf[1] = ch;
-
-        if (i2c_transfer(&psb_intel_output->i2c_bus->adapter, msgs, 1) == 1)
-                return true;
-        return false;
-}
-
-#define SDVO_CMD_NAME_ENTRY(cmd) {cmd, #cmd}
-/** Mapping of command numbers to names, for debug output */
-static const struct _sdvo_cmd_name {
-        u8 cmd;
-        char *name;
-} sdvo_cmd_names[] = {
-SDVO_CMD_NAME_ENTRY(SDVO_CMD_RESET),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_DEVICE_CAPS),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_FIRMWARE_REV),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TRAINED_INPUTS),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ACTIVE_OUTPUTS),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ACTIVE_OUTPUTS),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_IN_OUT_MAP),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_IN_OUT_MAP),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ATTACHED_DISPLAYS),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HOT_PLUG_SUPPORT),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_ACTIVE_HOT_PLUG),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_ACTIVE_HOT_PLUG),
-            SDVO_CMD_NAME_ENTRY
-            (SDVO_CMD_GET_INTERRUPT_EVENT_SOURCE),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TARGET_INPUT),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TARGET_OUTPUT),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INPUT_TIMINGS_PART1),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_INPUT_TIMINGS_PART2),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_INPUT_TIMINGS_PART1),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_INPUT_TIMINGS_PART2),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_INPUT_TIMINGS_PART1),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OUTPUT_TIMINGS_PART1),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_OUTPUT_TIMINGS_PART2),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OUTPUT_TIMINGS_PART1),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_OUTPUT_TIMINGS_PART2),
-            SDVO_CMD_NAME_ENTRY
-            (SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING),
-            SDVO_CMD_NAME_ENTRY
-            (SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART1),
-            SDVO_CMD_NAME_ENTRY
-            (SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART2),
-            SDVO_CMD_NAME_ENTRY
-            (SDVO_CMD_GET_INPUT_PIXEL_CLOCK_RANGE),
-            SDVO_CMD_NAME_ENTRY
-            (SDVO_CMD_GET_OUTPUT_PIXEL_CLOCK_RANGE),
-            SDVO_CMD_NAME_ENTRY
-            (SDVO_CMD_GET_SUPPORTED_CLOCK_RATE_MULTS),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_CLOCK_RATE_MULT),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CLOCK_RATE_MULT),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_SUPPORTED_TV_FORMATS),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_TV_FORMAT),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_TV_FORMAT),
-            SDVO_CMD_NAME_ENTRY
-            (SDVO_CMD_SET_TV_RESOLUTION_SUPPORT),
-            SDVO_CMD_NAME_ENTRY(SDVO_CMD_SET_CONTROL_BUS_SWITCH),};
-
-#define SDVO_NAME(dev_priv) \
-                 ((dev_priv)->output_device == SDVOB ? "SDVOB" : "SDVOC")
-#define SDVO_PRIV(output)   ((struct psb_intel_sdvo_priv *) (output)->dev_priv)
-
-static void psb_intel_sdvo_write_cmd(struct psb_intel_output *psb_intel_output,
-                                     u8 cmd,
-                                     void *args,
-                                     int args_len)
-{
-        struct psb_intel_sdvo_priv *sdvo_priv = psb_intel_output->dev_priv;
-        int i;
-
-        if (0) {
-                printk(KERN_DEBUG "%s: W: %02X ", SDVO_NAME(sdvo_priv), cmd);
-                for (i = 0; i < args_len; i++)
-                        printk(KERN_CONT "%02X ", ((u8 *) args)[i]);
-                for (; i < 8; i++)
-                        printk(KERN_CONT "   ");
-                for (i = 0;
-                     i <
-                     sizeof(sdvo_cmd_names) / sizeof(sdvo_cmd_names[0]);
-                     i++) {
-                        if (cmd == sdvo_cmd_names[i].cmd) {
-                                printk(KERN_CONT
-                                        "(%s)", sdvo_cmd_names[i].name);
-                                break;
-                        }
-                }
-                if (i ==
-                    sizeof(sdvo_cmd_names) / sizeof(sdvo_cmd_names[0]))
-                        printk(KERN_CONT "(%02X)", cmd);
-                printk(KERN_CONT "\n");
-        }
-
-        for (i = 0; i < args_len; i++) {
-                psb_intel_sdvo_write_byte(psb_intel_output,
-                                        SDVO_I2C_ARG_0 - i,
-                                        ((u8 *) args)[i]);
-        }
-
-        psb_intel_sdvo_write_byte(psb_intel_output, SDVO_I2C_OPCODE, cmd);
-}
-
-static const char *const cmd_status_names[] = {
-        "Power on",
-        "Success",
-        "Not supported",
-        "Invalid arg",
-        "Pending",
-        "Target not specified",
-        "Scaling not supported"
-};
-
-static u8 psb_intel_sdvo_read_response(
-                                struct psb_intel_output *psb_intel_output,
-                                void *response, int response_len)
-{
-        struct psb_intel_sdvo_priv *sdvo_priv = psb_intel_output->dev_priv;
-        int i;
-        u8 status;
-        u8 retry = 50;
-
-        while (retry--) {
-                /* Read the command response */
-                for (i = 0; i < response_len; i++) {
-                        psb_intel_sdvo_read_byte(psb_intel_output,
-                                             SDVO_I2C_RETURN_0 + i,
-                                             &((u8 *) response)[i]);
-                }
-
-                /* read the return status */
-                psb_intel_sdvo_read_byte(psb_intel_output,
-                                         SDVO_I2C_CMD_STATUS,
-                                         &status);
-
-                if (0) {
-                        pr_debug("%s: R: ", SDVO_NAME(sdvo_priv));
-                        for (i = 0; i < response_len; i++)
-                                printk(KERN_CONT "%02X ", ((u8 *) response)[i]);
-                        for (; i < 8; i++)
-                                printk("   ");
-                        if (status <= SDVO_CMD_STATUS_SCALING_NOT_SUPP)
-                                printk(KERN_CONT "(%s)",
-                                         cmd_status_names[status]);
-                        else
-                                printk(KERN_CONT "(??? %d)", status);
-                        printk(KERN_CONT "\n");
-                }
-
-                if (status != SDVO_CMD_STATUS_PENDING)
-                        return status;
-
-                mdelay(50);
-        }
-
-        return status;
-}
-
-int psb_intel_sdvo_get_pixel_multiplier(struct drm_display_mode *mode)
-{
-        if (mode->clock >= 100000)
-                return 1;
-        else if (mode->clock >= 50000)
-                return 2;
-        else
-                return 4;
-}
-
-/**
- * Don't check status code from this as it switches the bus back to the
- * SDVO chips which defeats the purpose of doing a bus switch in the first
- * place.
- */
-void psb_intel_sdvo_set_control_bus_switch(
-                                struct psb_intel_output *psb_intel_output,
-                                u8 target)
-{
-        psb_intel_sdvo_write_cmd(psb_intel_output,
-                                 SDVO_CMD_SET_CONTROL_BUS_SWITCH,
-                                 &target,
-                                 1);
-}
-
-static bool psb_intel_sdvo_set_target_input(
-                                struct psb_intel_output *psb_intel_output,
-                                bool target_0, bool target_1)
-{
-        struct psb_intel_sdvo_set_target_input_args targets = { 0 };
-        u8 status;
-
-        if (target_0 && target_1)
-                return SDVO_CMD_STATUS_NOTSUPP;
-
-        if (target_1)
-                targets.target_1 = 1;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output, SDVO_CMD_SET_TARGET_INPUT,
-                             &targets, sizeof(targets));
-
-        status = psb_intel_sdvo_read_response(psb_intel_output, NULL, 0);
-
-        return status == SDVO_CMD_STATUS_SUCCESS;
-}
-
-/**
- * Return whether each input is trained.
- *
- * This function is making an assumption about the layout of the response,
- * which should be checked against the docs.
- */
-static bool psb_intel_sdvo_get_trained_inputs(struct psb_intel_output
-                                          *psb_intel_output, bool *input_1,
-                                          bool *input_2)
-{
-        struct psb_intel_sdvo_get_trained_inputs_response response;
-        u8 status;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output, SDVO_CMD_GET_TRAINED_INPUTS,
-                             NULL, 0);
-        status =
-            psb_intel_sdvo_read_response(psb_intel_output, &response,
-                                     sizeof(response));
-        if (status != SDVO_CMD_STATUS_SUCCESS)
-                return false;
-
-        *input_1 = response.input0_trained;
-        *input_2 = response.input1_trained;
-        return true;
-}
-
-static bool psb_intel_sdvo_get_active_outputs(struct psb_intel_output
-                                          *psb_intel_output, u16 *outputs)
-{
-        u8 status;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output, SDVO_CMD_GET_ACTIVE_OUTPUTS,
-                             NULL, 0);
-        status =
-            psb_intel_sdvo_read_response(psb_intel_output, outputs,
-                                     sizeof(*outputs));
-
-        return status == SDVO_CMD_STATUS_SUCCESS;
-}
-
-static bool psb_intel_sdvo_set_active_outputs(struct psb_intel_output
-                                          *psb_intel_output, u16 outputs)
-{
-        u8 status;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output, SDVO_CMD_SET_ACTIVE_OUTPUTS,
-                             &outputs, sizeof(outputs));
-        status = psb_intel_sdvo_read_response(psb_intel_output, NULL, 0);
-        return status == SDVO_CMD_STATUS_SUCCESS;
-}
-
-static bool psb_intel_sdvo_set_encoder_power_state(struct psb_intel_output
-                                               *psb_intel_output, int mode)
-{
-        u8 status, state = SDVO_ENCODER_STATE_ON;
-
-        switch (mode) {
-        case DRM_MODE_DPMS_ON:
-                state = SDVO_ENCODER_STATE_ON;
-                break;
-        case DRM_MODE_DPMS_STANDBY:
-                state = SDVO_ENCODER_STATE_STANDBY;
-                break;
-        case DRM_MODE_DPMS_SUSPEND:
-                state = SDVO_ENCODER_STATE_SUSPEND;
-                break;
-        case DRM_MODE_DPMS_OFF:
-                state = SDVO_ENCODER_STATE_OFF;
-                break;
-        }
-
-        psb_intel_sdvo_write_cmd(psb_intel_output,
-                             SDVO_CMD_SET_ENCODER_POWER_STATE, &state,
-                             sizeof(state));
-        status = psb_intel_sdvo_read_response(psb_intel_output, NULL, 0);
-
-        return status == SDVO_CMD_STATUS_SUCCESS;
-}
-
-static bool psb_intel_sdvo_get_input_pixel_clock_range(struct psb_intel_output
-                                                   *psb_intel_output,
-                                                   int *clock_min,
-                                                   int *clock_max)
-{
-        struct psb_intel_sdvo_pixel_clock_range clocks;
-        u8 status;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output,
-                             SDVO_CMD_GET_INPUT_PIXEL_CLOCK_RANGE, NULL,
-                             0);
-
-        status =
-            psb_intel_sdvo_read_response(psb_intel_output, &clocks,
-                                     sizeof(clocks));
-
-        if (status != SDVO_CMD_STATUS_SUCCESS)
-                return false;
-
-        /* Convert the values from units of 10 kHz to kHz. */
-        *clock_min = clocks.min * 10;
-        *clock_max = clocks.max * 10;
-
-        return true;
-}
-
-static bool psb_intel_sdvo_set_target_output(
-                                struct psb_intel_output *psb_intel_output,
-                                u16 outputs)
-{
-        u8 status;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output, SDVO_CMD_SET_TARGET_OUTPUT,
-                             &outputs, sizeof(outputs));
-
-        status = psb_intel_sdvo_read_response(psb_intel_output, NULL, 0);
-        return status == SDVO_CMD_STATUS_SUCCESS;
-}
-
-static bool psb_intel_sdvo_get_timing(struct psb_intel_output *psb_intel_output,
-                                  u8 cmd, struct psb_intel_sdvo_dtd *dtd)
-{
-        u8 status;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output, cmd, NULL, 0);
-        status = psb_intel_sdvo_read_response(psb_intel_output, &dtd->part1,
-                                          sizeof(dtd->part1));
-        if (status != SDVO_CMD_STATUS_SUCCESS)
-                return false;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output, cmd + 1, NULL, 0);
-        status = psb_intel_sdvo_read_response(psb_intel_output, &dtd->part2,
-                                          sizeof(dtd->part2));
-        if (status != SDVO_CMD_STATUS_SUCCESS)
-                return false;
-
-        return true;
-}
-
-static bool psb_intel_sdvo_get_input_timing(
-                                struct psb_intel_output *psb_intel_output,
-                                struct psb_intel_sdvo_dtd *dtd)
-{
-        return psb_intel_sdvo_get_timing(psb_intel_output,
-                                     SDVO_CMD_GET_INPUT_TIMINGS_PART1,
-                                     dtd);
-}
-
-static bool psb_intel_sdvo_set_timing(
-                                struct psb_intel_output *psb_intel_output,
-                                u8 cmd,
-                                struct psb_intel_sdvo_dtd *dtd)
-{
-        u8 status;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output, cmd, &dtd->part1,
-                             sizeof(dtd->part1));
-        status = psb_intel_sdvo_read_response(psb_intel_output, NULL, 0);
-        if (status != SDVO_CMD_STATUS_SUCCESS)
-                return false;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output, cmd + 1, &dtd->part2,
-                             sizeof(dtd->part2));
-        status = psb_intel_sdvo_read_response(psb_intel_output, NULL, 0);
-        if (status != SDVO_CMD_STATUS_SUCCESS)
-                return false;
-
-        return true;
-}
-
-static bool psb_intel_sdvo_set_input_timing(
-                                struct psb_intel_output *psb_intel_output,
-                                struct psb_intel_sdvo_dtd *dtd)
-{
-        return psb_intel_sdvo_set_timing(psb_intel_output,
-                                     SDVO_CMD_SET_INPUT_TIMINGS_PART1,
-                                     dtd);
-}
-
-static bool psb_intel_sdvo_set_output_timing(
-                                struct psb_intel_output *psb_intel_output,
-                                struct psb_intel_sdvo_dtd *dtd)
-{
-        return psb_intel_sdvo_set_timing(psb_intel_output,
-                                     SDVO_CMD_SET_OUTPUT_TIMINGS_PART1,
-                                     dtd);
-}
-
-static int psb_intel_sdvo_get_clock_rate_mult(struct psb_intel_output
-                                                *psb_intel_output)
-{
-        u8 response, status;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output,
-                                 SDVO_CMD_GET_CLOCK_RATE_MULT,
-                                 NULL,
-                                 0);
-
-        status = psb_intel_sdvo_read_response(psb_intel_output, &response, 1);
-
-        if (status != SDVO_CMD_STATUS_SUCCESS) {
-                DRM_DEBUG("Couldn't get SDVO clock rate multiplier\n");
-                return SDVO_CLOCK_RATE_MULT_1X;
-        } else {
-                DRM_DEBUG("Current clock rate multiplier: %d\n", response);
-        }
-
-        return response;
-}
-
-static bool psb_intel_sdvo_set_clock_rate_mult(struct psb_intel_output
-                                                *psb_intel_output, u8 val)
-{
-        u8 status;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output,
-                                SDVO_CMD_SET_CLOCK_RATE_MULT,
-                                &val,
-                                1);
-
-        status = psb_intel_sdvo_read_response(psb_intel_output, NULL, 0);
-        if (status != SDVO_CMD_STATUS_SUCCESS)
-                return false;
-
-        return true;
-}
-
-static bool psb_sdvo_set_current_inoutmap(struct psb_intel_output *output,
-                                          u32 in0outputmask,
-                                          u32 in1outputmask)
-{
-        u8 byArgs[4];
-        u8 status;
-        int i;
-        struct psb_intel_sdvo_priv *sdvo_priv = output->dev_priv;
-
-        /* Make all fields of the  args/ret to zero */
-        memset(byArgs, 0, sizeof(byArgs));
-
-        /* Fill up the argument values; */
-        byArgs[0] = (u8) (in0outputmask & 0xFF);
-        byArgs[1] = (u8) ((in0outputmask >> 8) & 0xFF);
-        byArgs[2] = (u8) (in1outputmask & 0xFF);
-        byArgs[3] = (u8) ((in1outputmask >> 8) & 0xFF);
-
-
-        /*save inoutmap arg here*/
-        for (i = 0; i < 4; i++)
-                sdvo_priv->in_out_map[i] = byArgs[0];
-
-        psb_intel_sdvo_write_cmd(output, SDVO_CMD_SET_IN_OUT_MAP, byArgs, 4);
-        status = psb_intel_sdvo_read_response(output, NULL, 0);
-
-        if (status != SDVO_CMD_STATUS_SUCCESS)
-                return false;
-        return true;
-}
-
-
-static void psb_intel_sdvo_set_iomap(struct psb_intel_output *output)
-{
-        u32 dwCurrentSDVOIn0 = 0;
-        u32 dwCurrentSDVOIn1 = 0;
-        u32 dwDevMask = 0;
-
-
-        struct psb_intel_sdvo_priv *sdvo_priv = output->dev_priv;
-
-        /* Please DO NOT change the following code. */
-        /* SDVOB_IN0 or SDVOB_IN1 ==> sdvo_in0 */
-        /* SDVOC_IN0 or SDVOC_IN1 ==> sdvo_in1 */
-        if (sdvo_priv->by_input_wiring & (SDVOB_IN0 | SDVOC_IN0)) {
-                switch (sdvo_priv->active_device) {
-                case SDVO_DEVICE_LVDS:
-                        dwDevMask = SDVO_OUTPUT_LVDS0 | SDVO_OUTPUT_LVDS1;
-                        break;
-                case SDVO_DEVICE_TMDS:
-                        dwDevMask = SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1;
-                        break;
-                case SDVO_DEVICE_TV:
-                        dwDevMask =
-                        SDVO_OUTPUT_YPRPB0 | SDVO_OUTPUT_SVID0 |
-                        SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_YPRPB1 |
-                        SDVO_OUTPUT_SVID1 | SDVO_OUTPUT_CVBS1 |
-                        SDVO_OUTPUT_SCART0 | SDVO_OUTPUT_SCART1;
-                        break;
-                case SDVO_DEVICE_CRT:
-                        dwDevMask = SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1;
-                        break;
-                }
-                dwCurrentSDVOIn0 = (sdvo_priv->active_outputs & dwDevMask);
-        } else if (sdvo_priv->by_input_wiring & (SDVOB_IN1 | SDVOC_IN1)) {
-                switch (sdvo_priv->active_device) {
-                case SDVO_DEVICE_LVDS:
-                        dwDevMask = SDVO_OUTPUT_LVDS0 | SDVO_OUTPUT_LVDS1;
-                        break;
-                case SDVO_DEVICE_TMDS:
-                        dwDevMask = SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1;
-                        break;
-                case SDVO_DEVICE_TV:
-                        dwDevMask =
-                        SDVO_OUTPUT_YPRPB0 | SDVO_OUTPUT_SVID0 |
-                        SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_YPRPB1 |
-                        SDVO_OUTPUT_SVID1 | SDVO_OUTPUT_CVBS1 |
-                        SDVO_OUTPUT_SCART0 | SDVO_OUTPUT_SCART1;
-                        break;
-                case SDVO_DEVICE_CRT:
-                        dwDevMask = SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1;
-                        break;
-                }
-                dwCurrentSDVOIn1 = (sdvo_priv->active_outputs & dwDevMask);
-        }
-
-        psb_sdvo_set_current_inoutmap(output, dwCurrentSDVOIn0,
-                                          dwCurrentSDVOIn1);
-}
-
-
-static bool psb_intel_sdvo_mode_fixup(struct drm_encoder *encoder,
-                                  struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        /* Make the CRTC code factor in the SDVO pixel multiplier.  The SDVO
-         * device will be told of the multiplier during mode_set.
-         */
-        adjusted_mode->clock *= psb_intel_sdvo_get_pixel_multiplier(mode);
-        return true;
-}
-
-static void psb_intel_sdvo_mode_set(struct drm_encoder *encoder,
-                                struct drm_display_mode *mode,
-                                struct drm_display_mode *adjusted_mode)
-{
-        struct drm_device *dev = encoder->dev;
-        struct drm_crtc *crtc = encoder->crtc;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct psb_intel_output *psb_intel_output =
-                                        enc_to_psb_intel_output(encoder);
-        struct psb_intel_sdvo_priv *sdvo_priv = psb_intel_output->dev_priv;
-        u16 width, height;
-        u16 h_blank_len, h_sync_len, v_blank_len, v_sync_len;
-        u16 h_sync_offset, v_sync_offset;
-        u32 sdvox;
-        struct psb_intel_sdvo_dtd output_dtd;
-        int sdvo_pixel_multiply;
-
-        if (!mode)
-                return;
-
-        psb_intel_sdvo_set_target_output(psb_intel_output, 0);
-
-        width = mode->crtc_hdisplay;
-        height = mode->crtc_vdisplay;
-
-        /* do some mode translations */
-        h_blank_len = mode->crtc_hblank_end - mode->crtc_hblank_start;
-        h_sync_len = mode->crtc_hsync_end - mode->crtc_hsync_start;
-
-        v_blank_len = mode->crtc_vblank_end - mode->crtc_vblank_start;
-        v_sync_len = mode->crtc_vsync_end - mode->crtc_vsync_start;
-
-        h_sync_offset = mode->crtc_hsync_start - mode->crtc_hblank_start;
-        v_sync_offset = mode->crtc_vsync_start - mode->crtc_vblank_start;
-
-        output_dtd.part1.clock = mode->clock / 10;
-        output_dtd.part1.h_active = width & 0xff;
-        output_dtd.part1.h_blank = h_blank_len & 0xff;
-        output_dtd.part1.h_high = (((width >> 8) & 0xf) << 4) |
-            ((h_blank_len >> 8) & 0xf);
-        output_dtd.part1.v_active = height & 0xff;
-        output_dtd.part1.v_blank = v_blank_len & 0xff;
-        output_dtd.part1.v_high = (((height >> 8) & 0xf) << 4) |
-            ((v_blank_len >> 8) & 0xf);
-
-        output_dtd.part2.h_sync_off = h_sync_offset;
-        output_dtd.part2.h_sync_width = h_sync_len & 0xff;
-        output_dtd.part2.v_sync_off_width = (v_sync_offset & 0xf) << 4 |
-            (v_sync_len & 0xf);
-        output_dtd.part2.sync_off_width_high =
-            ((h_sync_offset & 0x300) >> 2) | ((h_sync_len & 0x300) >> 4) |
-            ((v_sync_offset & 0x30) >> 2) | ((v_sync_len & 0x30) >> 4);
-
-        output_dtd.part2.dtd_flags = 0x18;
-        if (mode->flags & DRM_MODE_FLAG_PHSYNC)
-                output_dtd.part2.dtd_flags |= 0x2;
-        if (mode->flags & DRM_MODE_FLAG_PVSYNC)
-                output_dtd.part2.dtd_flags |= 0x4;
-
-        output_dtd.part2.sdvo_flags = 0;
-        output_dtd.part2.v_sync_off_high = v_sync_offset & 0xc0;
-        output_dtd.part2.reserved = 0;
-
-        /* Set the output timing to the screen */
-        psb_intel_sdvo_set_target_output(psb_intel_output,
-                                     sdvo_priv->active_outputs);
-
-        /* Set the input timing to the screen. Assume always input 0. */
-        psb_intel_sdvo_set_target_input(psb_intel_output, true, false);
-
-        psb_intel_sdvo_set_output_timing(psb_intel_output, &output_dtd);
-
-        /* We would like to use i830_sdvo_create_preferred_input_timing() to
-         * provide the device with a timing it can support, if it supports that
-         * feature.  However, presumably we would need to adjust the CRTC to
-         * output the preferred timing, and we don't support that currently.
-         */
-        psb_intel_sdvo_set_input_timing(psb_intel_output, &output_dtd);
-
-        switch (psb_intel_sdvo_get_pixel_multiplier(mode)) {
-        case 1:
-                psb_intel_sdvo_set_clock_rate_mult(psb_intel_output,
-                                               SDVO_CLOCK_RATE_MULT_1X);
-                break;
-        case 2:
-                psb_intel_sdvo_set_clock_rate_mult(psb_intel_output,
-                                               SDVO_CLOCK_RATE_MULT_2X);
-                break;
-        case 4:
-                psb_intel_sdvo_set_clock_rate_mult(psb_intel_output,
-                                               SDVO_CLOCK_RATE_MULT_4X);
-                break;
-        }
-
-        /* Set the SDVO control regs. */
-        sdvox = REG_READ(sdvo_priv->output_device);
-        switch (sdvo_priv->output_device) {
-        case SDVOB:
-                sdvox &= SDVOB_PRESERVE_MASK;
-                break;
-        case SDVOC:
-                sdvox &= SDVOC_PRESERVE_MASK;
-                break;
-        }
-        sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;
-        if (psb_intel_crtc->pipe == 1)
-                sdvox |= SDVO_PIPE_B_SELECT;
-
-        sdvo_pixel_multiply = psb_intel_sdvo_get_pixel_multiplier(mode);
-
-        psb_intel_sdvo_write_sdvox(psb_intel_output, sdvox);
-
-         psb_intel_sdvo_set_iomap(psb_intel_output);
-}
-
-static void psb_intel_sdvo_dpms(struct drm_encoder *encoder, int mode)
-{
-        struct drm_device *dev = encoder->dev;
-        struct psb_intel_output *psb_intel_output =
-                                        enc_to_psb_intel_output(encoder);
-        struct psb_intel_sdvo_priv *sdvo_priv = psb_intel_output->dev_priv;
-        u32 temp;
-
-        if (mode != DRM_MODE_DPMS_ON) {
-                psb_intel_sdvo_set_active_outputs(psb_intel_output, 0);
-                if (0)
-                        psb_intel_sdvo_set_encoder_power_state(
-                                                        psb_intel_output,
-                                                        mode);
-
-                if (mode == DRM_MODE_DPMS_OFF) {
-                        temp = REG_READ(sdvo_priv->output_device);
-                        if ((temp & SDVO_ENABLE) != 0) {
-                                psb_intel_sdvo_write_sdvox(psb_intel_output,
-                                                       temp &
-                                                       ~SDVO_ENABLE);
-                        }
-                }
-        } else {
-                bool input1, input2;
-                int i;
-                u8 status;
-
-                temp = REG_READ(sdvo_priv->output_device);
-                if ((temp & SDVO_ENABLE) == 0)
-                        psb_intel_sdvo_write_sdvox(psb_intel_output,
-                                               temp | SDVO_ENABLE);
-                for (i = 0; i < 2; i++)
-                        psb_intel_wait_for_vblank(dev);
-
-                status =
-                    psb_intel_sdvo_get_trained_inputs(psb_intel_output,
-                                                        &input1,
-                                                        &input2);
-
-
-                /* Warn if the device reported failure to sync.
-                 * A lot of SDVO devices fail to notify of sync, but it's
-                 * a given it the status is a success, we succeeded.
-                 */
-                if (status == SDVO_CMD_STATUS_SUCCESS && !input1) {
-                        DRM_DEBUG
-                            ("First %s output reported failure to sync\n",
-                             SDVO_NAME(sdvo_priv));
-                }
-
-                if (0)
-                        psb_intel_sdvo_set_encoder_power_state(
-                                                        psb_intel_output,
-                                                        mode);
-                psb_intel_sdvo_set_active_outputs(psb_intel_output,
-                                              sdvo_priv->active_outputs);
-        }
-        return;
-}
-
-static void psb_intel_sdvo_save(struct drm_connector *connector)
-{
-        struct drm_device *dev = connector->dev;
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-        struct psb_intel_sdvo_priv *sdvo_priv = psb_intel_output->dev_priv;
-        /*int o;*/
-
-        sdvo_priv->save_sdvo_mult =
-            psb_intel_sdvo_get_clock_rate_mult(psb_intel_output);
-        psb_intel_sdvo_get_active_outputs(psb_intel_output,
-                                      &sdvo_priv->save_active_outputs);
-
-        if (sdvo_priv->caps.sdvo_inputs_mask & 0x1) {
-                psb_intel_sdvo_set_target_input(psb_intel_output,
-                                                true,
-                                                false);
-                psb_intel_sdvo_get_input_timing(psb_intel_output,
-                                            &sdvo_priv->save_input_dtd_1);
-        }
-
-        if (sdvo_priv->caps.sdvo_inputs_mask & 0x2) {
-                psb_intel_sdvo_set_target_input(psb_intel_output,
-                                                false,
-                                                true);
-                psb_intel_sdvo_get_input_timing(psb_intel_output,
-                                            &sdvo_priv->save_input_dtd_2);
-        }
-        sdvo_priv->save_SDVOX = REG_READ(sdvo_priv->output_device);
-
-        /*TODO: save the in_out_map state*/
-}
-
-static void psb_intel_sdvo_restore(struct drm_connector *connector)
-{
-        struct drm_device *dev = connector->dev;
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-        struct psb_intel_sdvo_priv *sdvo_priv = psb_intel_output->dev_priv;
-        /*int o;*/
-        int i;
-        bool input1, input2;
-        u8 status;
-
-        psb_intel_sdvo_set_active_outputs(psb_intel_output, 0);
-
-        if (sdvo_priv->caps.sdvo_inputs_mask & 0x1) {
-                psb_intel_sdvo_set_target_input(psb_intel_output, true, false);
-                psb_intel_sdvo_set_input_timing(psb_intel_output,
-                                            &sdvo_priv->save_input_dtd_1);
-        }
-
-        if (sdvo_priv->caps.sdvo_inputs_mask & 0x2) {
-                psb_intel_sdvo_set_target_input(psb_intel_output, false, true);
-                psb_intel_sdvo_set_input_timing(psb_intel_output,
-                                            &sdvo_priv->save_input_dtd_2);
-        }
-
-        psb_intel_sdvo_set_clock_rate_mult(psb_intel_output,
-                                       sdvo_priv->save_sdvo_mult);
-
-        REG_WRITE(sdvo_priv->output_device, sdvo_priv->save_SDVOX);
-
-        if (sdvo_priv->save_SDVOX & SDVO_ENABLE) {
-                for (i = 0; i < 2; i++)
-                        psb_intel_wait_for_vblank(dev);
-                status =
-                    psb_intel_sdvo_get_trained_inputs(psb_intel_output,
-                                                        &input1,
-                                                        &input2);
-                if (status == SDVO_CMD_STATUS_SUCCESS && !input1)
-                        DRM_DEBUG
-                            ("First %s output reported failure to sync\n",
-                             SDVO_NAME(sdvo_priv));
-        }
-
-        psb_intel_sdvo_set_active_outputs(psb_intel_output,
-                                      sdvo_priv->save_active_outputs);
-
-        /*TODO: restore in_out_map*/
-        psb_intel_sdvo_write_cmd(psb_intel_output,
-                                 SDVO_CMD_SET_IN_OUT_MAP,
-                                 sdvo_priv->in_out_map,
-                                 4);
-
-        psb_intel_sdvo_read_response(psb_intel_output, NULL, 0);
-}
-
-static int psb_intel_sdvo_mode_valid(struct drm_connector *connector,
-                                 struct drm_display_mode *mode)
-{
-        struct psb_intel_output *psb_intel_output =
-                                to_psb_intel_output(connector);
-        struct psb_intel_sdvo_priv *sdvo_priv = psb_intel_output->dev_priv;
-
-        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
-                return MODE_NO_DBLESCAN;
-
-        if (sdvo_priv->pixel_clock_min > mode->clock)
-                return MODE_CLOCK_LOW;
-
-        if (sdvo_priv->pixel_clock_max < mode->clock)
-                return MODE_CLOCK_HIGH;
-
-        return MODE_OK;
-}
-
-static bool psb_intel_sdvo_get_capabilities(
-                                struct psb_intel_output *psb_intel_output,
-                                struct psb_intel_sdvo_caps *caps)
-{
-        u8 status;
-
-        psb_intel_sdvo_write_cmd(psb_intel_output,
-                                 SDVO_CMD_GET_DEVICE_CAPS,
-                                 NULL,
-                                 0);
-        status = psb_intel_sdvo_read_response(psb_intel_output,
-                                                caps,
-                                                sizeof(*caps));
-        if (status != SDVO_CMD_STATUS_SUCCESS)
-                return false;
-
-        return true;
-}
-
-struct drm_connector *psb_intel_sdvo_find(struct drm_device *dev, int sdvoB)
-{
-        struct drm_connector *connector = NULL;
-        struct psb_intel_output *iout = NULL;
-        struct psb_intel_sdvo_priv *sdvo;
-
-        /* find the sdvo connector */
-        list_for_each_entry(connector, &dev->mode_config.connector_list,
-                            head) {
-                iout = to_psb_intel_output(connector);
-
-                if (iout->type != INTEL_OUTPUT_SDVO)
-                        continue;
-
-                sdvo = iout->dev_priv;
-
-                if (sdvo->output_device == SDVOB && sdvoB)
-                        return connector;
-
-                if (sdvo->output_device == SDVOC && !sdvoB)
-                        return connector;
-
-        }
-
-        return NULL;
-}
-
-int psb_intel_sdvo_supports_hotplug(struct drm_connector *connector)
-{
-        u8 response[2];
-        u8 status;
-        struct psb_intel_output *psb_intel_output;
-
-        if (!connector)
-                return 0;
-
-        psb_intel_output = to_psb_intel_output(connector);
-
-        psb_intel_sdvo_write_cmd(psb_intel_output,
-                                 SDVO_CMD_GET_HOT_PLUG_SUPPORT,
-                                 NULL,
-                                 0);
-        status = psb_intel_sdvo_read_response(psb_intel_output,
-                                                &response,
-                                                2);
-
-        if (response[0] != 0)
-                return 1;
-
-        return 0;
-}
-
-void psb_intel_sdvo_set_hotplug(struct drm_connector *connector, int on)
-{
-        u8 response[2];
-        u8 status;
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-
-        psb_intel_sdvo_write_cmd(psb_intel_output,
-                                 SDVO_CMD_GET_ACTIVE_HOT_PLUG,
-                                 NULL,
-                                 0);
-        psb_intel_sdvo_read_response(psb_intel_output, &response, 2);
-
-        if (on) {
-                psb_intel_sdvo_write_cmd(psb_intel_output,
-                                     SDVO_CMD_GET_HOT_PLUG_SUPPORT, NULL,
-                                     0);
-                status = psb_intel_sdvo_read_response(psb_intel_output,
-                                                      &response,
-                                                      2);
-
-                psb_intel_sdvo_write_cmd(psb_intel_output,
-                                     SDVO_CMD_SET_ACTIVE_HOT_PLUG,
-                                     &response, 2);
-        } else {
-                response[0] = 0;
-                response[1] = 0;
-                psb_intel_sdvo_write_cmd(psb_intel_output,
-                                     SDVO_CMD_SET_ACTIVE_HOT_PLUG,
-                                     &response, 2);
-        }
-
-        psb_intel_sdvo_write_cmd(psb_intel_output,
-                                 SDVO_CMD_GET_ACTIVE_HOT_PLUG,
-                                 NULL,
-                                 0);
-        psb_intel_sdvo_read_response(psb_intel_output, &response, 2);
-}
-
-static enum drm_connector_status psb_intel_sdvo_detect(struct drm_connector
-                                                   *connector, bool force)
-{
-        u8 response[2];
-        u8 status;
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-
-        psb_intel_sdvo_write_cmd(psb_intel_output,
-                                 SDVO_CMD_GET_ATTACHED_DISPLAYS,
-                                 NULL,
-                                 0);
-        status = psb_intel_sdvo_read_response(psb_intel_output, &response, 2);
-
-        DRM_DEBUG("SDVO response %d %d\n", response[0], response[1]);
-        if ((response[0] != 0) || (response[1] != 0))
-                return connector_status_connected;
-        else
-                return connector_status_disconnected;
-}
-
-static int psb_intel_sdvo_get_modes(struct drm_connector *connector)
-{
-        struct psb_intel_output *psb_intel_output =
-                                        to_psb_intel_output(connector);
-
-        /* set the bus switch and get the modes */
-        psb_intel_sdvo_set_control_bus_switch(psb_intel_output,
-                                          SDVO_CONTROL_BUS_DDC2);
-        psb_intel_ddc_get_modes(psb_intel_output);
-
-        if (list_empty(&connector->probed_modes))
-                return 0;
-        return 1;
-}
-
-static void psb_intel_sdvo_destroy(struct drm_connector *connector)
-{
-        struct psb_intel_output *psb_intel_output =
-                                to_psb_intel_output(connector);
-
-        if (psb_intel_output->i2c_bus)
-                psb_intel_i2c_destroy(psb_intel_output->i2c_bus);
-        drm_sysfs_connector_remove(connector);
-        drm_connector_cleanup(connector);
-        kfree(psb_intel_output);
-}
-
-static const struct drm_encoder_helper_funcs psb_intel_sdvo_helper_funcs = {
-        .dpms = psb_intel_sdvo_dpms,
-        .mode_fixup = psb_intel_sdvo_mode_fixup,
-        .prepare = psb_intel_encoder_prepare,
-        .mode_set = psb_intel_sdvo_mode_set,
-        .commit = psb_intel_encoder_commit,
-};
-
-static const struct drm_connector_funcs psb_intel_sdvo_connector_funcs = {
-        .dpms = drm_helper_connector_dpms,
-        .save = psb_intel_sdvo_save,
-        .restore = psb_intel_sdvo_restore,
-        .detect = psb_intel_sdvo_detect,
-        .fill_modes = drm_helper_probe_single_connector_modes,
-        .destroy = psb_intel_sdvo_destroy,
-};
-
-static const struct drm_connector_helper_funcs
-                                psb_intel_sdvo_connector_helper_funcs = {
-        .get_modes = psb_intel_sdvo_get_modes,
-        .mode_valid = psb_intel_sdvo_mode_valid,
-        .best_encoder = psb_intel_best_encoder,
-};
-
-void psb_intel_sdvo_enc_destroy(struct drm_encoder *encoder)
-{
-        drm_encoder_cleanup(encoder);
-}
-
-static const struct drm_encoder_funcs psb_intel_sdvo_enc_funcs = {
-        .destroy = psb_intel_sdvo_enc_destroy,
-};
-
-
-void psb_intel_sdvo_init(struct drm_device *dev, int output_device)
-{
-        struct drm_connector *connector;
-        struct psb_intel_output *psb_intel_output;
-        struct psb_intel_sdvo_priv *sdvo_priv;
-        struct psb_intel_i2c_chan *i2cbus = NULL;
-        int connector_type;
-        u8 ch[0x40];
-        int i;
-        int encoder_type, output_id;
-
-        psb_intel_output =
-            kcalloc(sizeof(struct psb_intel_output) +
-                    sizeof(struct psb_intel_sdvo_priv), 1, GFP_KERNEL);
-        if (!psb_intel_output)
-                return;
-
-        connector = &psb_intel_output->base;
-
-        drm_connector_init(dev, connector, &psb_intel_sdvo_connector_funcs,
-                           DRM_MODE_CONNECTOR_Unknown);
-        drm_connector_helper_add(connector,
-                                 &psb_intel_sdvo_connector_helper_funcs);
-        sdvo_priv = (struct psb_intel_sdvo_priv *) (psb_intel_output + 1);
-        psb_intel_output->type = INTEL_OUTPUT_SDVO;
-
-        connector->interlace_allowed = 0;
-        connector->doublescan_allowed = 0;
-
-        /* setup the DDC bus. */
-        if (output_device == SDVOB)
-                i2cbus =
-                    psb_intel_i2c_create(dev, GPIOE, "SDVOCTRL_E for SDVOB");
-        else
-                i2cbus =
-                    psb_intel_i2c_create(dev, GPIOE, "SDVOCTRL_E for SDVOC");
-
-        if (!i2cbus)
-                goto err_connector;
-
-        sdvo_priv->i2c_bus = i2cbus;
-
-        if (output_device == SDVOB) {
-                output_id = 1;
-                sdvo_priv->by_input_wiring = SDVOB_IN0;
-                sdvo_priv->i2c_bus->slave_addr = 0x38;
-        } else {
-                output_id = 2;
-                sdvo_priv->i2c_bus->slave_addr = 0x39;
-        }
-
-        sdvo_priv->output_device = output_device;
-        psb_intel_output->i2c_bus = i2cbus;
-        psb_intel_output->dev_priv = sdvo_priv;
-
-
-        /* Read the regs to test if we can talk to the device */
-        for (i = 0; i < 0x40; i++) {
-                if (!psb_intel_sdvo_read_byte(psb_intel_output, i, &ch[i])) {
-                        dev_dbg(dev->dev, "No SDVO device found on SDVO%c\n",
-                                  output_device == SDVOB ? 'B' : 'C');
-                        goto err_i2c;
-                }
-        }
-
-        psb_intel_sdvo_get_capabilities(psb_intel_output, &sdvo_priv->caps);
-
-        memset(&sdvo_priv->active_outputs, 0,
-               sizeof(sdvo_priv->active_outputs));
-
-        /* TODO, CVBS, SVID, YPRPB & SCART outputs. */
-        if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB0) {
-                sdvo_priv->active_outputs = SDVO_OUTPUT_RGB0;
-                sdvo_priv->active_device = SDVO_DEVICE_CRT;
-                connector->display_info.subpixel_order =
-                    SubPixelHorizontalRGB;
-                encoder_type = DRM_MODE_ENCODER_DAC;
-                connector_type = DRM_MODE_CONNECTOR_VGA;
-        } else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_RGB1) {
-                sdvo_priv->active_outputs = SDVO_OUTPUT_RGB1;
-                sdvo_priv->active_outputs = SDVO_DEVICE_CRT;
-                connector->display_info.subpixel_order =
-                    SubPixelHorizontalRGB;
-                encoder_type = DRM_MODE_ENCODER_DAC;
-                connector_type = DRM_MODE_CONNECTOR_VGA;
-        } else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_TMDS0) {
-                sdvo_priv->active_outputs = SDVO_OUTPUT_TMDS0;
-                sdvo_priv->active_device = SDVO_DEVICE_TMDS;
-                connector->display_info.subpixel_order =
-                    SubPixelHorizontalRGB;
-                encoder_type = DRM_MODE_ENCODER_TMDS;
-                connector_type = DRM_MODE_CONNECTOR_DVID;
-        } else if (sdvo_priv->caps.output_flags & SDVO_OUTPUT_TMDS1) {
-                sdvo_priv->active_outputs = SDVO_OUTPUT_TMDS1;
-                sdvo_priv->active_device = SDVO_DEVICE_TMDS;
-                connector->display_info.subpixel_order =
-                    SubPixelHorizontalRGB;
-                encoder_type = DRM_MODE_ENCODER_TMDS;
-                connector_type = DRM_MODE_CONNECTOR_DVID;
-        } else {
-                unsigned char bytes[2];
-
-                memcpy(bytes, &sdvo_priv->caps.output_flags, 2);
-                dev_dbg(dev->dev, "%s: No active RGB or TMDS outputs (0x%02x%02x)\n",
-                     SDVO_NAME(sdvo_priv), bytes[0], bytes[1]);
-                goto err_i2c;
-        }
-
-        drm_encoder_init(dev, &psb_intel_output->enc, &psb_intel_sdvo_enc_funcs,
-                         encoder_type);
-        drm_encoder_helper_add(&psb_intel_output->enc,
-                               &psb_intel_sdvo_helper_funcs);
-        connector->connector_type = connector_type;
-
-        drm_mode_connector_attach_encoder(&psb_intel_output->base,
-                                          &psb_intel_output->enc);
-        drm_sysfs_connector_add(connector);
-
-        /* Set the input timing to the screen. Assume always input 0. */
-        psb_intel_sdvo_set_target_input(psb_intel_output, true, false);
-
-        psb_intel_sdvo_get_input_pixel_clock_range(psb_intel_output,
-                                               &sdvo_priv->pixel_clock_min,
-                                               &sdvo_priv->
-                                               pixel_clock_max);
-
-
-        dev_dbg(dev->dev, "%s device VID/DID: %02X:%02X.%02X, "
-                  "clock range %dMHz - %dMHz, "
-                  "input 1: %c, input 2: %c, "
-                  "output 1: %c, output 2: %c\n",
-                  SDVO_NAME(sdvo_priv),
-                  sdvo_priv->caps.vendor_id, sdvo_priv->caps.device_id,
-                  sdvo_priv->caps.device_rev_id,
-                  sdvo_priv->pixel_clock_min / 1000,
-                  sdvo_priv->pixel_clock_max / 1000,
-                  (sdvo_priv->caps.sdvo_inputs_mask & 0x1) ? 'Y' : 'N',
-                  (sdvo_priv->caps.sdvo_inputs_mask & 0x2) ? 'Y' : 'N',
-                  /* check currently supported outputs */
-                  sdvo_priv->caps.output_flags &
-                  (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_RGB0) ? 'Y' : 'N',
-                  sdvo_priv->caps.output_flags &
-                  (SDVO_OUTPUT_TMDS1 | SDVO_OUTPUT_RGB1) ? 'Y' : 'N');
-
-        psb_intel_output->ddc_bus = i2cbus;
-
-        return;
-
-err_i2c:
-        psb_intel_i2c_destroy(psb_intel_output->i2c_bus);
-err_connector:
-        drm_connector_cleanup(connector);
-        kfree(psb_intel_output);
-
-        return;
-}
diff --git a/drivers/staging/gma500/psb_intel_sdvo_regs.h b/drivers/staging/gma500/psb_intel_sdvo_regs.h
deleted file mode 100644
index 96862ea65aba..000000000000
--- a/drivers/staging/gma500/psb_intel_sdvo_regs.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * SDVO command definitions and structures.
- *
- * Copyright (c) 2008, Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *      Eric Anholt <eric@anholt.net>
- */
-
-#define SDVO_OUTPUT_FIRST   (0)
-#define SDVO_OUTPUT_TMDS0   (1 << 0)
-#define SDVO_OUTPUT_RGB0    (1 << 1)
-#define SDVO_OUTPUT_CVBS0   (1 << 2)
-#define SDVO_OUTPUT_SVID0   (1 << 3)
-#define SDVO_OUTPUT_YPRPB0  (1 << 4)
-#define SDVO_OUTPUT_SCART0  (1 << 5)
-#define SDVO_OUTPUT_LVDS0   (1 << 6)
-#define SDVO_OUTPUT_TMDS1   (1 << 8)
-#define SDVO_OUTPUT_RGB1    (1 << 9)
-#define SDVO_OUTPUT_CVBS1   (1 << 10)
-#define SDVO_OUTPUT_SVID1   (1 << 11)
-#define SDVO_OUTPUT_YPRPB1  (1 << 12)
-#define SDVO_OUTPUT_SCART1  (1 << 13)
-#define SDVO_OUTPUT_LVDS1   (1 << 14)
-#define SDVO_OUTPUT_LAST    (14)
-
-struct psb_intel_sdvo_caps {
-        u8 vendor_id;
-        u8 device_id;
-        u8 device_rev_id;
-        u8 sdvo_version_major;
-        u8 sdvo_version_minor;
-        unsigned int sdvo_inputs_mask:2;
-        unsigned int smooth_scaling:1;
-        unsigned int sharp_scaling:1;
-        unsigned int up_scaling:1;
-        unsigned int down_scaling:1;
-        unsigned int stall_support:1;
-        unsigned int pad:1;
-        u16 output_flags;
-} __packed;
-
-/** This matches the EDID DTD structure, more or less */
-struct psb_intel_sdvo_dtd {
-        struct {
-                u16 clock;      /**< pixel clock, in 10kHz units */
-                u8 h_active;    /**< lower 8 bits (pixels) */
-                u8 h_blank;     /**< lower 8 bits (pixels) */
-                u8 h_high;      /**< upper 4 bits each h_active, h_blank */
-                u8 v_active;    /**< lower 8 bits (lines) */
-                u8 v_blank;     /**< lower 8 bits (lines) */
-                u8 v_high;      /**< upper 4 bits each v_active, v_blank */
-        } part1;
-
-        struct {
-                u8 h_sync_off;
-                        /**< lower 8 bits, from hblank start */
-                u8 h_sync_width;/**< lower 8 bits (pixels) */
-        /** lower 4 bits each vsync offset, vsync width */
-                u8 v_sync_off_width;
-        /**
-         * 2 high bits of hsync offset, 2 high bits of hsync width,
-         * bits 4-5 of vsync offset, and 2 high bits of vsync width.
-         */
-                u8 sync_off_width_high;
-                u8 dtd_flags;
-                u8 sdvo_flags;
-        /** bits 6-7 of vsync offset at bits 6-7 */
-                u8 v_sync_off_high;
-                u8 reserved;
-        } part2;
-} __packed;
-
-struct psb_intel_sdvo_pixel_clock_range {
-        u16 min;                /**< pixel clock, in 10kHz units */
-        u16 max;                /**< pixel clock, in 10kHz units */
-} __packed;
-
-struct psb_intel_sdvo_preferred_input_timing_args {
-        u16 clock;
-        u16 width;
-        u16 height;
-} __packed;
-
-/* I2C registers for SDVO */
-#define SDVO_I2C_ARG_0                          0x07
-#define SDVO_I2C_ARG_1                          0x06
-#define SDVO_I2C_ARG_2                          0x05
-#define SDVO_I2C_ARG_3                          0x04
-#define SDVO_I2C_ARG_4                          0x03
-#define SDVO_I2C_ARG_5                          0x02
-#define SDVO_I2C_ARG_6                          0x01
-#define SDVO_I2C_ARG_7                          0x00
-#define SDVO_I2C_OPCODE                         0x08
-#define SDVO_I2C_CMD_STATUS                     0x09
-#define SDVO_I2C_RETURN_0                       0x0a
-#define SDVO_I2C_RETURN_1                       0x0b
-#define SDVO_I2C_RETURN_2                       0x0c
-#define SDVO_I2C_RETURN_3                       0x0d
-#define SDVO_I2C_RETURN_4                       0x0e
-#define SDVO_I2C_RETURN_5                       0x0f
-#define SDVO_I2C_RETURN_6                       0x10
-#define SDVO_I2C_RETURN_7                       0x11
-#define SDVO_I2C_VENDOR_BEGIN                   0x20
-
-/* Status results */
-#define SDVO_CMD_STATUS_POWER_ON                0x0
-#define SDVO_CMD_STATUS_SUCCESS                 0x1
-#define SDVO_CMD_STATUS_NOTSUPP                 0x2
-#define SDVO_CMD_STATUS_INVALID_ARG             0x3
-#define SDVO_CMD_STATUS_PENDING                 0x4
-#define SDVO_CMD_STATUS_TARGET_NOT_SPECIFIED    0x5
-#define SDVO_CMD_STATUS_SCALING_NOT_SUPP        0x6
-
-/* SDVO commands, argument/result registers */
-
-#define SDVO_CMD_RESET                                  0x01
-
-/** Returns a struct psb_intel_sdvo_caps */
-#define SDVO_CMD_GET_DEVICE_CAPS                        0x02
-
-#define SDVO_CMD_GET_FIRMWARE_REV                       0x86
-# define SDVO_DEVICE_FIRMWARE_MINOR                     SDVO_I2C_RETURN_0
-# define SDVO_DEVICE_FIRMWARE_MAJOR                     SDVO_I2C_RETURN_1
-# define SDVO_DEVICE_FIRMWARE_PATCH                     SDVO_I2C_RETURN_2
-
-/**
- * Reports which inputs are trained (managed to sync).
- *
- * Devices must have trained within 2 vsyncs of a mode change.
- */
-#define SDVO_CMD_GET_TRAINED_INPUTS                     0x03
-struct psb_intel_sdvo_get_trained_inputs_response {
-        unsigned int input0_trained:1;
-        unsigned int input1_trained:1;
-        unsigned int pad:6;
-} __packed;
-
-/** Returns a struct psb_intel_sdvo_output_flags of active outputs. */
-#define SDVO_CMD_GET_ACTIVE_OUTPUTS                     0x04
-
-/**
- * Sets the current set of active outputs.
- *
- * Takes a struct psb_intel_sdvo_output_flags.
- * Must be preceded by a SET_IN_OUT_MAP
- * on multi-output devices.
- */
-#define SDVO_CMD_SET_ACTIVE_OUTPUTS                     0x05
-
-/**
- * Returns the current mapping of SDVO inputs to outputs on the device.
- *
- * Returns two struct psb_intel_sdvo_output_flags structures.
- */
-#define SDVO_CMD_GET_IN_OUT_MAP                         0x06
-
-/**
- * Sets the current mapping of SDVO inputs to outputs on the device.
- *
- * Takes two struct i380_sdvo_output_flags structures.
- */
-#define SDVO_CMD_SET_IN_OUT_MAP                         0x07
-
-/**
- * Returns a struct psb_intel_sdvo_output_flags of attached displays.
- */
-#define SDVO_CMD_GET_ATTACHED_DISPLAYS                  0x0b
-
-/**
- * Returns a struct psb_intel_sdvo_ouptut_flags of displays supporting hot plugging.
- */
-#define SDVO_CMD_GET_HOT_PLUG_SUPPORT                   0x0c
-
-/**
- * Takes a struct psb_intel_sdvo_output_flags.
- */
-#define SDVO_CMD_SET_ACTIVE_HOT_PLUG                    0x0d
-
-/**
- * Returns a struct psb_intel_sdvo_output_flags of displays with hot plug
- * interrupts enabled.
- */
-#define SDVO_CMD_GET_ACTIVE_HOT_PLUG                    0x0e
-
-#define SDVO_CMD_GET_INTERRUPT_EVENT_SOURCE             0x0f
-struct psb_intel_sdvo_get_interrupt_event_source_response {
-        u16 interrupt_status;
-        unsigned int ambient_light_interrupt:1;
-        unsigned int pad:7;
-} __packed;
-
-/**
- * Selects which input is affected by future input commands.
- *
- * Commands affected include SET_INPUT_TIMINGS_PART[12],
- * GET_INPUT_TIMINGS_PART[12], GET_PREFERRED_INPUT_TIMINGS_PART[12],
- * GET_INPUT_PIXEL_CLOCK_RANGE, and CREATE_PREFERRED_INPUT_TIMINGS.
- */
-#define SDVO_CMD_SET_TARGET_INPUT                       0x10
-struct psb_intel_sdvo_set_target_input_args {
-        unsigned int target_1:1;
-        unsigned int pad:7;
-} __packed;
-
-/**
- * Takes a struct psb_intel_sdvo_output_flags of which outputs are targeted by
- * future output commands.
- *
- * Affected commands inclue SET_OUTPUT_TIMINGS_PART[12],
- * GET_OUTPUT_TIMINGS_PART[12], and GET_OUTPUT_PIXEL_CLOCK_RANGE.
- */
-#define SDVO_CMD_SET_TARGET_OUTPUT                      0x11
-
-#define SDVO_CMD_GET_INPUT_TIMINGS_PART1                0x12
-#define SDVO_CMD_GET_INPUT_TIMINGS_PART2                0x13
-#define SDVO_CMD_SET_INPUT_TIMINGS_PART1                0x14
-#define SDVO_CMD_SET_INPUT_TIMINGS_PART2                0x15
-#define SDVO_CMD_SET_OUTPUT_TIMINGS_PART1               0x16
-#define SDVO_CMD_SET_OUTPUT_TIMINGS_PART2               0x17
-#define SDVO_CMD_GET_OUTPUT_TIMINGS_PART1               0x18
-#define SDVO_CMD_GET_OUTPUT_TIMINGS_PART2               0x19
-/* Part 1 */
-# define SDVO_DTD_CLOCK_LOW                             SDVO_I2C_ARG_0
-# define SDVO_DTD_CLOCK_HIGH                            SDVO_I2C_ARG_1
-# define SDVO_DTD_H_ACTIVE                              SDVO_I2C_ARG_2
-# define SDVO_DTD_H_BLANK                               SDVO_I2C_ARG_3
-# define SDVO_DTD_H_HIGH                                SDVO_I2C_ARG_4
-# define SDVO_DTD_V_ACTIVE                              SDVO_I2C_ARG_5
-# define SDVO_DTD_V_BLANK                               SDVO_I2C_ARG_6
-# define SDVO_DTD_V_HIGH                                SDVO_I2C_ARG_7
-/* Part 2 */
-# define SDVO_DTD_HSYNC_OFF                             SDVO_I2C_ARG_0
-# define SDVO_DTD_HSYNC_WIDTH                           SDVO_I2C_ARG_1
-# define SDVO_DTD_VSYNC_OFF_WIDTH                       SDVO_I2C_ARG_2
-# define SDVO_DTD_SYNC_OFF_WIDTH_HIGH                   SDVO_I2C_ARG_3
-# define SDVO_DTD_DTD_FLAGS                             SDVO_I2C_ARG_4
-# define SDVO_DTD_DTD_FLAG_INTERLACED                           (1 << 7)
-# define SDVO_DTD_DTD_FLAG_STEREO_MASK                          (3 << 5)
-# define SDVO_DTD_DTD_FLAG_INPUT_MASK                           (3 << 3)
-# define SDVO_DTD_DTD_FLAG_SYNC_MASK                            (3 << 1)
-# define SDVO_DTD_SDVO_FLAS                             SDVO_I2C_ARG_5
-# define SDVO_DTD_SDVO_FLAG_STALL                               (1 << 7)
-# define SDVO_DTD_SDVO_FLAG_CENTERED                            (0 << 6)
-# define SDVO_DTD_SDVO_FLAG_UPPER_LEFT                          (1 << 6)
-# define SDVO_DTD_SDVO_FLAG_SCALING_MASK                        (3 << 4)
-# define SDVO_DTD_SDVO_FLAG_SCALING_NONE                        (0 << 4)
-# define SDVO_DTD_SDVO_FLAG_SCALING_SHARP                       (1 << 4)
-# define SDVO_DTD_SDVO_FLAG_SCALING_SMOOTH                      (2 << 4)
-# define SDVO_DTD_VSYNC_OFF_HIGH                        SDVO_I2C_ARG_6
-
-/**
- * Generates a DTD based on the given width, height, and flags.
- *
- * This will be supported by any device supporting scaling or interlaced
- * modes.
- */
-#define SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING          0x1a
-# define SDVO_PREFERRED_INPUT_TIMING_CLOCK_LOW          SDVO_I2C_ARG_0
-# define SDVO_PREFERRED_INPUT_TIMING_CLOCK_HIGH         SDVO_I2C_ARG_1
-# define SDVO_PREFERRED_INPUT_TIMING_WIDTH_LOW          SDVO_I2C_ARG_2
-# define SDVO_PREFERRED_INPUT_TIMING_WIDTH_HIGH         SDVO_I2C_ARG_3
-# define SDVO_PREFERRED_INPUT_TIMING_HEIGHT_LOW         SDVO_I2C_ARG_4
-# define SDVO_PREFERRED_INPUT_TIMING_HEIGHT_HIGH        SDVO_I2C_ARG_5
-# define SDVO_PREFERRED_INPUT_TIMING_FLAGS              SDVO_I2C_ARG_6
-# define SDVO_PREFERRED_INPUT_TIMING_FLAGS_INTERLACED           (1 << 0)
-# define SDVO_PREFERRED_INPUT_TIMING_FLAGS_SCALED               (1 << 1)
-
-#define SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART1       0x1b
-#define SDVO_CMD_GET_PREFERRED_INPUT_TIMING_PART2       0x1c
-
-/** Returns a struct psb_intel_sdvo_pixel_clock_range */
-#define SDVO_CMD_GET_INPUT_PIXEL_CLOCK_RANGE            0x1d
-/** Returns a struct psb_intel_sdvo_pixel_clock_range */
-#define SDVO_CMD_GET_OUTPUT_PIXEL_CLOCK_RANGE           0x1e
-
-/** Returns a byte bitfield containing SDVO_CLOCK_RATE_MULT_* flags */
-#define SDVO_CMD_GET_SUPPORTED_CLOCK_RATE_MULTS         0x1f
-
-/** Returns a byte containing a SDVO_CLOCK_RATE_MULT_* flag */
-#define SDVO_CMD_GET_CLOCK_RATE_MULT                    0x20
-/** Takes a byte containing a SDVO_CLOCK_RATE_MULT_* flag */
-#define SDVO_CMD_SET_CLOCK_RATE_MULT                    0x21
-# define SDVO_CLOCK_RATE_MULT_1X                                (1 << 0)
-# define SDVO_CLOCK_RATE_MULT_2X                                (1 << 1)
-# define SDVO_CLOCK_RATE_MULT_4X                                (1 << 3)
-
-#define SDVO_CMD_GET_SUPPORTED_TV_FORMATS               0x27
-
-#define SDVO_CMD_GET_TV_FORMAT                          0x28
-
-#define SDVO_CMD_SET_TV_FORMAT                          0x29
-
-#define SDVO_CMD_GET_SUPPORTED_POWER_STATES             0x2a
-#define SDVO_CMD_GET_ENCODER_POWER_STATE                0x2b
-#define SDVO_CMD_SET_ENCODER_POWER_STATE                0x2c
-# define SDVO_ENCODER_STATE_ON                                  (1 << 0)
-# define SDVO_ENCODER_STATE_STANDBY                             (1 << 1)
-# define SDVO_ENCODER_STATE_SUSPEND                             (1 << 2)
-# define SDVO_ENCODER_STATE_OFF                                 (1 << 3)
-
-#define SDVO_CMD_SET_TV_RESOLUTION_SUPPORT              0x93
-
-#define SDVO_CMD_SET_CONTROL_BUS_SWITCH                 0x7a
-# define SDVO_CONTROL_BUS_PROM                          0x0
-# define SDVO_CONTROL_BUS_DDC1                          0x1
-# define SDVO_CONTROL_BUS_DDC2                          0x2
-# define SDVO_CONTROL_BUS_DDC3                          0x3
-
-/* SDVO Bus & SDVO Inputs wiring details*/
-/* Bit 0: Is SDVOB connected to In0 (1 = yes, 0 = no*/
-/* Bit 1: Is SDVOB connected to In1 (1 = yes, 0 = no*/
-/* Bit 2: Is SDVOC connected to In0 (1 = yes, 0 = no*/
-/* Bit 3: Is SDVOC connected to In1 (1 = yes, 0 = no*/
-#define SDVOB_IN0 0x01
-#define SDVOB_IN1 0x02
-#define SDVOC_IN0 0x04
-#define SDVOC_IN1 0x08
-
-#define SDVO_DEVICE_NONE 0x00
-#define        SDVO_DEVICE_CRT 0x01
-#define        SDVO_DEVICE_TV 0x02
-#define        SDVO_DEVICE_LVDS 0x04
-#define        SDVO_DEVICE_TMDS 0x08
-
diff --git a/drivers/staging/gma500/psb_irq.c b/drivers/staging/gma500/psb_irq.c
deleted file mode 100644
index 36dd63044b06..000000000000
--- a/drivers/staging/gma500/psb_irq.c
+++ /dev/null
@@ -1,627 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2007, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
- * develop this driver.
- *
- **************************************************************************/
-/*
- */
-
-#include <drm/drmP.h>
-#include "psb_drv.h"
-#include "psb_reg.h"
-#include "psb_intel_reg.h"
-#include "power.h"
-#include "mdfld_output.h"
-
-/*
- * inline functions
- */
-
-static inline u32
-psb_pipestat(int pipe)
-{
-        if (pipe == 0)
-                return PIPEASTAT;
-        if (pipe == 1)
-                return PIPEBSTAT;
-        if (pipe == 2)
-                return PIPECSTAT;
-        BUG();
-}
-
-static inline u32
-mid_pipe_event(int pipe)
-{
-        if (pipe == 0)
-                return _PSB_PIPEA_EVENT_FLAG;
-        if (pipe == 1)
-                return _MDFLD_PIPEB_EVENT_FLAG;
-        if (pipe == 2)
-                return _MDFLD_PIPEC_EVENT_FLAG;
-        BUG();
-}
-
-static inline u32
-mid_pipe_vsync(int pipe)
-{
-        if (pipe == 0)
-                return _PSB_VSYNC_PIPEA_FLAG;
-        if (pipe == 1)
-                return _PSB_VSYNC_PIPEB_FLAG;
-        if (pipe == 2)
-                return _MDFLD_PIPEC_VBLANK_FLAG;
-        BUG();
-}
-
-static inline u32
-mid_pipeconf(int pipe)
-{
-        if (pipe == 0)
-                return PIPEACONF;
-        if (pipe == 1)
-                return PIPEBCONF;
-        if (pipe == 2)
-                return PIPECCONF;
-        BUG();
-}
-
-void
-psb_enable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask)
-{
-        if ((dev_priv->pipestat[pipe] & mask) != mask) {
-                u32 reg = psb_pipestat(pipe);
-                dev_priv->pipestat[pipe] |= mask;
-                /* Enable the interrupt, clear any pending status */
-                if (gma_power_begin(dev_priv->dev, false)) {
-                        u32 writeVal = PSB_RVDC32(reg);
-                        writeVal |= (mask | (mask >> 16));
-                        PSB_WVDC32(writeVal, reg);
-                        (void) PSB_RVDC32(reg);
-                        gma_power_end(dev_priv->dev);
-                }
-        }
-}
-
-void
-psb_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask)
-{
-        if ((dev_priv->pipestat[pipe] & mask) != 0) {
-                u32 reg = psb_pipestat(pipe);
-                dev_priv->pipestat[pipe] &= ~mask;
-                if (gma_power_begin(dev_priv->dev, false)) {
-                        u32 writeVal = PSB_RVDC32(reg);
-                        writeVal &= ~mask;
-                        PSB_WVDC32(writeVal, reg);
-                        (void) PSB_RVDC32(reg);
-                        gma_power_end(dev_priv->dev);
-                }
-        }
-}
-
-void mid_enable_pipe_event(struct drm_psb_private *dev_priv, int pipe)
-{
-        if (gma_power_begin(dev_priv->dev, false)) {
-                u32 pipe_event = mid_pipe_event(pipe);
-                dev_priv->vdc_irq_mask |= pipe_event;
-                PSB_WVDC32(~dev_priv->vdc_irq_mask, PSB_INT_MASK_R);
-                PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R);
-                gma_power_end(dev_priv->dev);
-        }
-}
-
-void mid_disable_pipe_event(struct drm_psb_private *dev_priv, int pipe)
-{
-        if (dev_priv->pipestat[pipe] == 0) {
-                if (gma_power_begin(dev_priv->dev, false)) {
-                        u32 pipe_event = mid_pipe_event(pipe);
-                        dev_priv->vdc_irq_mask &= ~pipe_event;
-                        PSB_WVDC32(~dev_priv->vdc_irq_mask, PSB_INT_MASK_R);
-                        PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R);
-                        gma_power_end(dev_priv->dev);
-                }
-        }
-}
-
-/**
- * Display controller interrupt handler for pipe event.
- *
- */
-static void mid_pipe_event_handler(struct drm_device *dev, int pipe)
-{
-        struct drm_psb_private *dev_priv =
-            (struct drm_psb_private *) dev->dev_private;
-
-        uint32_t pipe_stat_val = 0;
-        uint32_t pipe_stat_reg = psb_pipestat(pipe);
-        uint32_t pipe_enable = dev_priv->pipestat[pipe];
-        uint32_t pipe_status = dev_priv->pipestat[pipe] >> 16;
-        uint32_t pipe_clear;
-        uint32_t i = 0;
-
-        spin_lock(&dev_priv->irqmask_lock);
-
-        pipe_stat_val = PSB_RVDC32(pipe_stat_reg);
-        pipe_stat_val &= pipe_enable | pipe_status;
-        pipe_stat_val &= pipe_stat_val >> 16;
-
-        spin_unlock(&dev_priv->irqmask_lock);
-
-        /* Clear the 2nd level interrupt status bits
-         * Sometimes the bits are very sticky so we repeat until they unstick */
-        for (i = 0; i < 0xffff; i++) {
-                PSB_WVDC32(PSB_RVDC32(pipe_stat_reg), pipe_stat_reg);
-                pipe_clear = PSB_RVDC32(pipe_stat_reg) & pipe_status;
-
-                if (pipe_clear == 0)
-                        break;
-        }
-
-        if (pipe_clear)
-                dev_err(dev->dev,
-                "%s, can't clear status bits for pipe %d, its value = 0x%x.\n",
-                __func__, pipe, PSB_RVDC32(pipe_stat_reg));
-
-        if (pipe_stat_val & PIPE_VBLANK_STATUS)
-                drm_handle_vblank(dev, pipe);
-
-        if (pipe_stat_val & PIPE_TE_STATUS)
-                drm_handle_vblank(dev, pipe);
-}
-
-/*
- * Display controller interrupt handler.
- */
-static void psb_vdc_interrupt(struct drm_device *dev, uint32_t vdc_stat)
-{
-        if (vdc_stat & _PSB_VSYNC_PIPEA_FLAG)
-                mid_pipe_event_handler(dev, 0);
-
-        if (vdc_stat & _PSB_VSYNC_PIPEB_FLAG)
-                mid_pipe_event_handler(dev, 1);
-}
-
-irqreturn_t psb_irq_handler(DRM_IRQ_ARGS)
-{
-        struct drm_device *dev = (struct drm_device *) arg;
-        struct drm_psb_private *dev_priv =
-            (struct drm_psb_private *) dev->dev_private;
-
-        uint32_t vdc_stat, dsp_int = 0, sgx_int = 0;
-        int handled = 0;
-
-        spin_lock(&dev_priv->irqmask_lock);
-
-        vdc_stat = PSB_RVDC32(PSB_INT_IDENTITY_R);
-
-        if (vdc_stat & _PSB_PIPE_EVENT_FLAG)
-                dsp_int = 1;
-
-        /* FIXME: Handle Medfield
-        if (vdc_stat & _MDFLD_DISP_ALL_IRQ_FLAG)
-                dsp_int = 1;
-        */
-
-        if (vdc_stat & _PSB_IRQ_SGX_FLAG)
-                sgx_int = 1;
-
-        vdc_stat &= dev_priv->vdc_irq_mask;
-        spin_unlock(&dev_priv->irqmask_lock);
-
-        if (dsp_int && gma_power_is_on(dev)) {
-                psb_vdc_interrupt(dev, vdc_stat);
-                handled = 1;
-        }
-
-        if (sgx_int) {
-                /* Not expected - we have it masked, shut it up */
-                u32 s, s2;
-                s = PSB_RSGX32(PSB_CR_EVENT_STATUS);
-                s2 = PSB_RSGX32(PSB_CR_EVENT_STATUS2);
-                PSB_WSGX32(s, PSB_CR_EVENT_HOST_CLEAR);
-                PSB_WSGX32(s2, PSB_CR_EVENT_HOST_CLEAR2);
-                /* if s & _PSB_CE_TWOD_COMPLETE we have 2D done but
-                   we may as well poll even if we add that ! */
-                handled = 1;
-        }
-
-        PSB_WVDC32(vdc_stat, PSB_INT_IDENTITY_R);
-        (void) PSB_RVDC32(PSB_INT_IDENTITY_R);
-        DRM_READMEMORYBARRIER();
-
-        if (!handled)
-                return IRQ_NONE;
-
-        return IRQ_HANDLED;
-}
-
-void psb_irq_preinstall(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv =
-            (struct drm_psb_private *) dev->dev_private;
-        unsigned long irqflags;
-
-        spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
-
-        if (gma_power_is_on(dev))
-                PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);
-        if (dev->vblank_enabled[0])
-                dev_priv->vdc_irq_mask |= _PSB_VSYNC_PIPEA_FLAG;
-        if (dev->vblank_enabled[1])
-                dev_priv->vdc_irq_mask |= _PSB_VSYNC_PIPEB_FLAG;
-
-        /* FIXME: Handle Medfield irq mask
-        if (dev->vblank_enabled[1])
-                dev_priv->vdc_irq_mask |= _MDFLD_PIPEB_EVENT_FLAG;
-        if (dev->vblank_enabled[2])
-                dev_priv->vdc_irq_mask |= _MDFLD_PIPEC_EVENT_FLAG;
-        */
-
-        /* This register is safe even if display island is off */
-        PSB_WVDC32(~dev_priv->vdc_irq_mask, PSB_INT_MASK_R);
-        spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);
-}
-
-int psb_irq_postinstall(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv =
-            (struct drm_psb_private *) dev->dev_private;
-        unsigned long irqflags;
-
-        spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
-
-        /* This register is safe even if display island is off */
-        PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R);
-        PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);
-
-        if (dev->vblank_enabled[0])
-                psb_enable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);
-        else
-                psb_disable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);
-
-        if (dev->vblank_enabled[1])
-                psb_enable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);
-        else
-                psb_disable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);
-
-        if (dev->vblank_enabled[2])
-                psb_enable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);
-        else
-                psb_disable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);
-
-        spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);
-        return 0;
-}
-
-void psb_irq_uninstall(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv =
-            (struct drm_psb_private *) dev->dev_private;
-        unsigned long irqflags;
-
-        spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
-
-        PSB_WVDC32(0xFFFFFFFF, PSB_HWSTAM);
-
-        if (dev->vblank_enabled[0])
-                psb_disable_pipestat(dev_priv, 0, PIPE_VBLANK_INTERRUPT_ENABLE);
-
-        if (dev->vblank_enabled[1])
-                psb_disable_pipestat(dev_priv, 1, PIPE_VBLANK_INTERRUPT_ENABLE);
-
-        if (dev->vblank_enabled[2])
-                psb_disable_pipestat(dev_priv, 2, PIPE_VBLANK_INTERRUPT_ENABLE);
-
-        dev_priv->vdc_irq_mask &= _PSB_IRQ_SGX_FLAG |
-                                  _PSB_IRQ_MSVDX_FLAG |
-                                  _LNC_IRQ_TOPAZ_FLAG;
-
-        /* These two registers are safe even if display island is off */
-        PSB_WVDC32(~dev_priv->vdc_irq_mask, PSB_INT_MASK_R);
-        PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R);
-
-        wmb();
-
-        /* This register is safe even if display island is off */
-        PSB_WVDC32(PSB_RVDC32(PSB_INT_IDENTITY_R), PSB_INT_IDENTITY_R);
-        spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);
-}
-
-void psb_irq_turn_on_dpst(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv =
-                (struct drm_psb_private *) dev->dev_private;
-        u32 hist_reg;
-        u32 pwm_reg;
-
-        if (gma_power_begin(dev, false)) {
-                PSB_WVDC32(1 << 31, HISTOGRAM_LOGIC_CONTROL);
-                hist_reg = PSB_RVDC32(HISTOGRAM_LOGIC_CONTROL);
-                PSB_WVDC32(1 << 31, HISTOGRAM_INT_CONTROL);
-                hist_reg = PSB_RVDC32(HISTOGRAM_INT_CONTROL);
-
-                PSB_WVDC32(0x80010100, PWM_CONTROL_LOGIC);
-                pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC);
-                PSB_WVDC32(pwm_reg | PWM_PHASEIN_ENABLE
-                                                | PWM_PHASEIN_INT_ENABLE,
-                                                           PWM_CONTROL_LOGIC);
-                pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC);
-
-                psb_enable_pipestat(dev_priv, 0, PIPE_DPST_EVENT_ENABLE);
-
-                hist_reg = PSB_RVDC32(HISTOGRAM_INT_CONTROL);
-                PSB_WVDC32(hist_reg | HISTOGRAM_INT_CTRL_CLEAR,
-                                                        HISTOGRAM_INT_CONTROL);
-                pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC);
-                PSB_WVDC32(pwm_reg | 0x80010100 | PWM_PHASEIN_ENABLE,
-                                                        PWM_CONTROL_LOGIC);
-
-                gma_power_end(dev);
-        }
-}
-
-int psb_irq_enable_dpst(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv =
-                (struct drm_psb_private *) dev->dev_private;
-        unsigned long irqflags;
-
-        spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
-
-        /* enable DPST */
-        mid_enable_pipe_event(dev_priv, 0);
-        psb_irq_turn_on_dpst(dev);
-
-        spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);
-        return 0;
-}
-
-void psb_irq_turn_off_dpst(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv =
-            (struct drm_psb_private *) dev->dev_private;
-        u32 hist_reg;
-        u32 pwm_reg;
-
-        if (gma_power_begin(dev, false)) {
-                PSB_WVDC32(0x00000000, HISTOGRAM_INT_CONTROL);
-                hist_reg = PSB_RVDC32(HISTOGRAM_INT_CONTROL);
-
-                psb_disable_pipestat(dev_priv, 0, PIPE_DPST_EVENT_ENABLE);
-
-                pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC);
-                PSB_WVDC32(pwm_reg & !(PWM_PHASEIN_INT_ENABLE),
-                                                        PWM_CONTROL_LOGIC);
-                pwm_reg = PSB_RVDC32(PWM_CONTROL_LOGIC);
-
-                gma_power_end(dev);
-        }
-}
-
-int psb_irq_disable_dpst(struct drm_device *dev)
-{
-        struct drm_psb_private *dev_priv =
-            (struct drm_psb_private *) dev->dev_private;
-        unsigned long irqflags;
-
-        spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
-
-        mid_disable_pipe_event(dev_priv, 0);
-        psb_irq_turn_off_dpst(dev);
-
-        spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);
-
-        return 0;
-}
-
-#ifdef PSB_FIXME
-static int psb_vblank_do_wait(struct drm_device *dev,
-                              unsigned int *sequence, atomic_t *counter)
-{
-        unsigned int cur_vblank;
-        int ret = 0;
-        DRM_WAIT_ON(ret, dev->vbl_queue, 3 * DRM_HZ,
-                    (((cur_vblank = atomic_read(counter))
-                      - *sequence) <= (1 << 23)));
-        *sequence = cur_vblank;
-
-        return ret;
-}
-#endif
-
-/*
- * It is used to enable VBLANK interrupt
- */
-int psb_enable_vblank(struct drm_device *dev, int pipe)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned long irqflags;
-        uint32_t reg_val = 0;
-        uint32_t pipeconf_reg = mid_pipeconf(pipe);
-
-#if defined(CONFIG_DRM_PSB_MFLD)
-        /* Medfield is different - we should perhaps extract out vblank
-           and blacklight etc ops */
-        if (IS_MFLD(dev) && !mdfld_panel_dpi(dev))
-                return mdfld_enable_te(dev, pipe);
-#endif
-        if (gma_power_begin(dev, false)) {
-                reg_val = REG_READ(pipeconf_reg);
-                gma_power_end(dev);
-        }
-
-        if (!(reg_val & PIPEACONF_ENABLE))
-                return -EINVAL;
-
-        spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
-
-        if (pipe == 0)
-                dev_priv->vdc_irq_mask |= _PSB_VSYNC_PIPEA_FLAG;
-        else if (pipe == 1)
-                dev_priv->vdc_irq_mask |= _PSB_VSYNC_PIPEB_FLAG;
-
-        PSB_WVDC32(~dev_priv->vdc_irq_mask, PSB_INT_MASK_R);
-        PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R);
-        psb_enable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_ENABLE);
-
-        spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);
-
-        return 0;
-}
-
-/*
- * It is used to disable VBLANK interrupt
- */
-void psb_disable_vblank(struct drm_device *dev, int pipe)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned long irqflags;
-
-#if defined(CONFIG_DRM_PSB_MFLD)
-        if (IS_MFLD(dev) && !mdfld_panel_dpi(dev))
-                mdfld_disable_te(dev, pipe);
-#endif
-        spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);
-
-        if (pipe == 0)
-                dev_priv->vdc_irq_mask &= ~_PSB_VSYNC_PIPEA_FLAG;
-        else if (pipe == 1)
-                dev_priv->vdc_irq_mask &= ~_PSB_VSYNC_PIPEB_FLAG;
-
-        PSB_WVDC32(~dev_priv->vdc_irq_mask, PSB_INT_MASK_R);
-        PSB_WVDC32(dev_priv->vdc_irq_mask, PSB_INT_ENABLE_R);
-        psb_disable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_ENABLE);
-
-        spin_unlock_irqrestore(&dev_priv->irqmask_lock, irqflags);
-}
-
-/**
- *      mdfld_enable_te         -       enable TE events
- *      @dev: our DRM device
- *      @pipe: which pipe to work on
- *
- *      Enable TE events on a Medfield display pipe. Medfield specific.
- */
-int mdfld_enable_te(struct drm_device *dev, int pipe)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned long flags;
-        uint32_t reg_val = 0;
-        uint32_t pipeconf_reg = mid_pipeconf(pipe);
-
-        if (gma_power_begin(dev, false)) {
-                reg_val = REG_READ(pipeconf_reg);
-                gma_power_end(dev);
-        }
-
-        if (!(reg_val & PIPEACONF_ENABLE))
-                return -EINVAL;
-
-        spin_lock_irqsave(&dev_priv->irqmask_lock, flags);
-
-        mid_enable_pipe_event(dev_priv, pipe);
-        psb_enable_pipestat(dev_priv, pipe, PIPE_TE_ENABLE);
-
-        spin_unlock_irqrestore(&dev_priv->irqmask_lock, flags);
-
-        return 0;
-}
-
-/**
- *      mdfld_disable_te                -       disable TE events
- *      @dev: our DRM device
- *      @pipe: which pipe to work on
- *
- *      Disable TE events on a Medfield display pipe. Medfield specific.
- */
-void mdfld_disable_te(struct drm_device *dev, int pipe)
-{
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        unsigned long flags;
-
-        spin_lock_irqsave(&dev_priv->irqmask_lock, flags);
-
-        mid_disable_pipe_event(dev_priv, pipe);
-        psb_disable_pipestat(dev_priv, pipe, PIPE_TE_ENABLE);
-
-        spin_unlock_irqrestore(&dev_priv->irqmask_lock, flags);
-}
-
-/* Called from drm generic code, passed a 'crtc', which
- * we use as a pipe index
- */
-u32 psb_get_vblank_counter(struct drm_device *dev, int pipe)
-{
-        uint32_t high_frame = PIPEAFRAMEHIGH;
-        uint32_t low_frame = PIPEAFRAMEPIXEL;
-        uint32_t pipeconf_reg = PIPEACONF;
-        uint32_t reg_val = 0;
-        uint32_t high1 = 0, high2 = 0, low = 0, count = 0;
-
-        switch (pipe) {
-        case 0:
-                break;
-        case 1:
-                high_frame = PIPEBFRAMEHIGH;
-                low_frame = PIPEBFRAMEPIXEL;
-                pipeconf_reg = PIPEBCONF;
-                break;
-        case 2:
-                high_frame = PIPECFRAMEHIGH;
-                low_frame = PIPECFRAMEPIXEL;
-                pipeconf_reg = PIPECCONF;
-                break;
-        default:
-                dev_err(dev->dev, "%s, invalid pipe.\n", __func__);
-                return 0;
-        }
-
-        if (!gma_power_begin(dev, false))
-                return 0;
-
-        reg_val = REG_READ(pipeconf_reg);
-
-        if (!(reg_val & PIPEACONF_ENABLE)) {
-                dev_err(dev->dev, "trying to get vblank count for disabled pipe %d\n",
-                                                                pipe);
-                goto psb_get_vblank_counter_exit;
-        }
-
-        /*
-         * High & low register fields aren't synchronized, so make sure
-         * we get a low value that's stable across two reads of the high
-         * register.
-         */
-        do {
-                high1 = ((REG_READ(high_frame) & PIPE_FRAME_HIGH_MASK) >>
-                         PIPE_FRAME_HIGH_SHIFT);
-                low =  ((REG_READ(low_frame) & PIPE_FRAME_LOW_MASK) >>
-                        PIPE_FRAME_LOW_SHIFT);
-                high2 = ((REG_READ(high_frame) & PIPE_FRAME_HIGH_MASK) >>
-                         PIPE_FRAME_HIGH_SHIFT);
-        } while (high1 != high2);
-
-        count = (high1 << 8) | low;
-
-psb_get_vblank_counter_exit:
-
-        gma_power_end(dev);
-
-        return count;
-}
-
diff --git a/drivers/staging/gma500/psb_irq.h b/drivers/staging/gma500/psb_irq.h
deleted file mode 100644
index 216fda38b57d..000000000000
--- a/drivers/staging/gma500/psb_irq.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2009-2011, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- *    Benjamin Defnet <benjamin.r.defnet@intel.com>
- *    Rajesh Poornachandran <rajesh.poornachandran@intel.com>
- *
- **************************************************************************/
-
-#ifndef _SYSIRQ_H_
-#define _SYSIRQ_H_
-
-#include <drm/drmP.h>
-
-bool sysirq_init(struct drm_device *dev);
-void sysirq_uninit(struct drm_device *dev);
-
-void psb_irq_preinstall(struct drm_device *dev);
-int  psb_irq_postinstall(struct drm_device *dev);
-void psb_irq_uninstall(struct drm_device *dev);
-irqreturn_t psb_irq_handler(DRM_IRQ_ARGS);
-
-int psb_irq_enable_dpst(struct drm_device *dev);
-int psb_irq_disable_dpst(struct drm_device *dev);
-void psb_irq_turn_on_dpst(struct drm_device *dev);
-void psb_irq_turn_off_dpst(struct drm_device *dev);
-int  psb_enable_vblank(struct drm_device *dev, int pipe);
-void psb_disable_vblank(struct drm_device *dev, int pipe);
-u32  psb_get_vblank_counter(struct drm_device *dev, int pipe);
-
-#endif /* _SYSIRQ_H_ */
diff --git a/drivers/staging/gma500/psb_lid.c b/drivers/staging/gma500/psb_lid.c
deleted file mode 100644
index b867aabe6bf3..000000000000
--- a/drivers/staging/gma500/psb_lid.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/**************************************************************************
- * Copyright (c) 2007, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
- **************************************************************************/
-
-#include <drm/drmP.h>
-#include "psb_drv.h"
-#include "psb_reg.h"
-#include "psb_intel_reg.h"
-#include <linux/spinlock.h>
-
-static void psb_lid_timer_func(unsigned long data)
-{
-        struct drm_psb_private * dev_priv = (struct drm_psb_private *)data;
-        struct drm_device *dev = (struct drm_device *)dev_priv->dev;
-        struct timer_list *lid_timer = &dev_priv->lid_timer;
-        unsigned long irq_flags;
-        u32 *lid_state = dev_priv->lid_state;
-        u32 pp_status;
-
-        if (readl(lid_state) == dev_priv->lid_last_state)
-                goto lid_timer_schedule;
-
-        if ((readl(lid_state)) & 0x01) {
-                /*lid state is open*/
-                REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) | POWER_TARGET_ON);
-                do {
-                        pp_status = REG_READ(PP_STATUS);
-                } while ((pp_status & PP_ON) == 0);
-
-                /*FIXME: should be backlight level before*/
-                psb_intel_lvds_set_brightness(dev, 100);
-        } else {
-                psb_intel_lvds_set_brightness(dev, 0);
-
-                REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) & ~POWER_TARGET_ON);
-                do {
-                        pp_status = REG_READ(PP_STATUS);
-                } while ((pp_status & PP_ON) == 0);
-        }
-        dev_priv->lid_last_state =  readl(lid_state);
-
-lid_timer_schedule:
-        spin_lock_irqsave(&dev_priv->lid_lock, irq_flags);
-        if (!timer_pending(lid_timer)) {
-                lid_timer->expires = jiffies + PSB_LID_DELAY;
-                add_timer(lid_timer);
-        }
-        spin_unlock_irqrestore(&dev_priv->lid_lock, irq_flags);
-}
-
-void psb_lid_timer_init(struct drm_psb_private *dev_priv)
-{
-        struct timer_list *lid_timer = &dev_priv->lid_timer;
-        unsigned long irq_flags;
-
-        spin_lock_init(&dev_priv->lid_lock);
-        spin_lock_irqsave(&dev_priv->lid_lock, irq_flags);
-
-        init_timer(lid_timer);
-
-        lid_timer->data = (unsigned long)dev_priv;
-        lid_timer->function = psb_lid_timer_func;
-        lid_timer->expires = jiffies + PSB_LID_DELAY;
-
-        add_timer(lid_timer);
-        spin_unlock_irqrestore(&dev_priv->lid_lock, irq_flags);
-}
-
-void psb_lid_timer_takedown(struct drm_psb_private *dev_priv)
-{
-        del_timer_sync(&dev_priv->lid_timer);
-}
-
diff --git a/drivers/staging/gma500/psb_reg.h b/drivers/staging/gma500/psb_reg.h
deleted file mode 100644
index b81c7c1e9c2d..000000000000
--- a/drivers/staging/gma500/psb_reg.h
+++ /dev/null
@@ -1,582 +0,0 @@
-/**************************************************************************
- *
- * Copyright (c) (2005-2007) Imagination Technologies Limited.
- * Copyright (c) 2007, Intel Corporation.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA..
- *
- **************************************************************************/
-
-#ifndef _PSB_REG_H_
-#define _PSB_REG_H_
-
-#define PSB_CR_CLKGATECTL               0x0000
-#define _PSB_C_CLKGATECTL_AUTO_MAN_REG          (1 << 24)
-#define _PSB_C_CLKGATECTL_USE_CLKG_SHIFT        (20)
-#define _PSB_C_CLKGATECTL_USE_CLKG_MASK         (0x3 << 20)
-#define _PSB_C_CLKGATECTL_DPM_CLKG_SHIFT        (16)
-#define _PSB_C_CLKGATECTL_DPM_CLKG_MASK         (0x3 << 16)
-#define _PSB_C_CLKGATECTL_TA_CLKG_SHIFT         (12)
-#define _PSB_C_CLKGATECTL_TA_CLKG_MASK          (0x3 << 12)
-#define _PSB_C_CLKGATECTL_TSP_CLKG_SHIFT        (8)
-#define _PSB_C_CLKGATECTL_TSP_CLKG_MASK         (0x3 << 8)
-#define _PSB_C_CLKGATECTL_ISP_CLKG_SHIFT        (4)
-#define _PSB_C_CLKGATECTL_ISP_CLKG_MASK         (0x3 << 4)
-#define _PSB_C_CLKGATECTL_2D_CLKG_SHIFT         (0)
-#define _PSB_C_CLKGATECTL_2D_CLKG_MASK          (0x3 << 0)
-#define _PSB_C_CLKGATECTL_CLKG_ENABLED          (0)
-#define _PSB_C_CLKGATECTL_CLKG_DISABLED         (1)
-#define _PSB_C_CLKGATECTL_CLKG_AUTO             (2)
-
-#define PSB_CR_CORE_ID                  0x0010
-#define _PSB_CC_ID_ID_SHIFT                     (16)
-#define _PSB_CC_ID_ID_MASK                      (0xFFFF << 16)
-#define _PSB_CC_ID_CONFIG_SHIFT                 (0)
-#define _PSB_CC_ID_CONFIG_MASK                  (0xFFFF << 0)
-
-#define PSB_CR_CORE_REVISION            0x0014
-#define _PSB_CC_REVISION_DESIGNER_SHIFT         (24)
-#define _PSB_CC_REVISION_DESIGNER_MASK          (0xFF << 24)
-#define _PSB_CC_REVISION_MAJOR_SHIFT            (16)
-#define _PSB_CC_REVISION_MAJOR_MASK             (0xFF << 16)
-#define _PSB_CC_REVISION_MINOR_SHIFT            (8)
-#define _PSB_CC_REVISION_MINOR_MASK             (0xFF << 8)
-#define _PSB_CC_REVISION_MAINTENANCE_SHIFT      (0)
-#define _PSB_CC_REVISION_MAINTENANCE_MASK       (0xFF << 0)
-
-#define PSB_CR_DESIGNER_REV_FIELD1      0x0018
-
-#define PSB_CR_SOFT_RESET               0x0080
-#define _PSB_CS_RESET_TSP_RESET         (1 << 6)
-#define _PSB_CS_RESET_ISP_RESET         (1 << 5)
-#define _PSB_CS_RESET_USE_RESET         (1 << 4)
-#define _PSB_CS_RESET_TA_RESET          (1 << 3)
-#define _PSB_CS_RESET_DPM_RESET         (1 << 2)
-#define _PSB_CS_RESET_TWOD_RESET        (1 << 1)
-#define _PSB_CS_RESET_BIF_RESET                 (1 << 0)
-
-#define PSB_CR_DESIGNER_REV_FIELD2      0x001C
-
-#define PSB_CR_EVENT_HOST_ENABLE2       0x0110
-
-#define PSB_CR_EVENT_STATUS2            0x0118
-
-#define PSB_CR_EVENT_HOST_CLEAR2        0x0114
-#define _PSB_CE2_BIF_REQUESTER_FAULT            (1 << 4)
-
-#define PSB_CR_EVENT_STATUS             0x012C
-
-#define PSB_CR_EVENT_HOST_ENABLE        0x0130
-
-#define PSB_CR_EVENT_HOST_CLEAR         0x0134
-#define _PSB_CE_MASTER_INTERRUPT                (1 << 31)
-#define _PSB_CE_TA_DPM_FAULT                    (1 << 28)
-#define _PSB_CE_TWOD_COMPLETE                   (1 << 27)
-#define _PSB_CE_DPM_OUT_OF_MEMORY_ZLS           (1 << 25)
-#define _PSB_CE_DPM_TA_MEM_FREE                 (1 << 24)
-#define _PSB_CE_PIXELBE_END_RENDER              (1 << 18)
-#define _PSB_CE_SW_EVENT                        (1 << 14)
-#define _PSB_CE_TA_FINISHED                     (1 << 13)
-#define _PSB_CE_TA_TERMINATE                    (1 << 12)
-#define _PSB_CE_DPM_REACHED_MEM_THRESH          (1 << 3)
-#define _PSB_CE_DPM_OUT_OF_MEMORY_GBL           (1 << 2)
-#define _PSB_CE_DPM_OUT_OF_MEMORY_MT            (1 << 1)
-#define _PSB_CE_DPM_3D_MEM_FREE                 (1 << 0)
-
-
-#define PSB_USE_OFFSET_MASK             0x0007FFFF
-#define PSB_USE_OFFSET_SIZE             (PSB_USE_OFFSET_MASK + 1)
-#define PSB_CR_USE_CODE_BASE0           0x0A0C
-#define PSB_CR_USE_CODE_BASE1           0x0A10
-#define PSB_CR_USE_CODE_BASE2           0x0A14
-#define PSB_CR_USE_CODE_BASE3           0x0A18
-#define PSB_CR_USE_CODE_BASE4           0x0A1C
-#define PSB_CR_USE_CODE_BASE5           0x0A20
-#define PSB_CR_USE_CODE_BASE6           0x0A24
-#define PSB_CR_USE_CODE_BASE7           0x0A28
-#define PSB_CR_USE_CODE_BASE8           0x0A2C
-#define PSB_CR_USE_CODE_BASE9           0x0A30
-#define PSB_CR_USE_CODE_BASE10          0x0A34
-#define PSB_CR_USE_CODE_BASE11          0x0A38
-#define PSB_CR_USE_CODE_BASE12          0x0A3C
-#define PSB_CR_USE_CODE_BASE13          0x0A40
-#define PSB_CR_USE_CODE_BASE14          0x0A44
-#define PSB_CR_USE_CODE_BASE15          0x0A48
-#define PSB_CR_USE_CODE_BASE(_i)        (0x0A0C + ((_i) << 2))
-#define _PSB_CUC_BASE_DM_SHIFT                  (25)
-#define _PSB_CUC_BASE_DM_MASK                   (0x3 << 25)
-#define _PSB_CUC_BASE_ADDR_SHIFT                (0)     /* 1024-bit aligned address? */
-#define _PSB_CUC_BASE_ADDR_ALIGNSHIFT           (7)
-#define _PSB_CUC_BASE_ADDR_MASK                 (0x1FFFFFF << 0)
-#define _PSB_CUC_DM_VERTEX                      (0)
-#define _PSB_CUC_DM_PIXEL                       (1)
-#define _PSB_CUC_DM_RESERVED                    (2)
-#define _PSB_CUC_DM_EDM                         (3)
-
-#define PSB_CR_PDS_EXEC_BASE            0x0AB8
-#define _PSB_CR_PDS_EXEC_BASE_ADDR_SHIFT        (20)    /* 1MB aligned address */
-#define _PSB_CR_PDS_EXEC_BASE_ADDR_ALIGNSHIFT   (20)
-
-#define PSB_CR_EVENT_KICKER             0x0AC4
-#define _PSB_CE_KICKER_ADDRESS_SHIFT            (4)     /* 128-bit aligned address */
-
-#define PSB_CR_EVENT_KICK               0x0AC8
-#define _PSB_CE_KICK_NOW                        (1 << 0)
-
-#define PSB_CR_BIF_DIR_LIST_BASE1       0x0C38
-
-#define PSB_CR_BIF_CTRL                 0x0C00
-#define _PSB_CB_CTRL_CLEAR_FAULT                (1 << 4)
-#define _PSB_CB_CTRL_INVALDC                    (1 << 3)
-#define _PSB_CB_CTRL_FLUSH                      (1 << 2)
-
-#define PSB_CR_BIF_INT_STAT             0x0C04
-
-#define PSB_CR_BIF_FAULT                0x0C08
-#define _PSB_CBI_STAT_PF_N_RW                   (1 << 14)
-#define _PSB_CBI_STAT_FAULT_SHIFT               (0)
-#define _PSB_CBI_STAT_FAULT_MASK                (0x3FFF << 0)
-#define _PSB_CBI_STAT_FAULT_CACHE               (1 << 1)
-#define _PSB_CBI_STAT_FAULT_TA                  (1 << 2)
-#define _PSB_CBI_STAT_FAULT_VDM                 (1 << 3)
-#define _PSB_CBI_STAT_FAULT_2D                  (1 << 4)
-#define _PSB_CBI_STAT_FAULT_PBE                 (1 << 5)
-#define _PSB_CBI_STAT_FAULT_TSP                 (1 << 6)
-#define _PSB_CBI_STAT_FAULT_ISP                 (1 << 7)
-#define _PSB_CBI_STAT_FAULT_USSEPDS             (1 << 8)
-#define _PSB_CBI_STAT_FAULT_HOST                (1 << 9)
-
-#define PSB_CR_BIF_BANK0                0x0C78
-#define PSB_CR_BIF_BANK1                0x0C7C
-#define PSB_CR_BIF_DIR_LIST_BASE0       0x0C84
-#define PSB_CR_BIF_TWOD_REQ_BASE        0x0C88
-#define PSB_CR_BIF_3D_REQ_BASE          0x0CAC
-
-#define PSB_CR_2D_SOCIF                 0x0E18
-#define _PSB_C2_SOCIF_FREESPACE_SHIFT           (0)
-#define _PSB_C2_SOCIF_FREESPACE_MASK            (0xFF << 0)
-#define _PSB_C2_SOCIF_EMPTY                     (0x80 << 0)
-
-#define PSB_CR_2D_BLIT_STATUS           0x0E04
-#define _PSB_C2B_STATUS_BUSY                    (1 << 24)
-#define _PSB_C2B_STATUS_COMPLETE_SHIFT          (0)
-#define _PSB_C2B_STATUS_COMPLETE_MASK           (0xFFFFFF << 0)
-
-/*
- * 2D defs.
- */
-
-/*
- * 2D Slave Port Data : Block Header's Object Type
- */
-
-#define PSB_2D_CLIP_BH                  (0x00000000)
-#define PSB_2D_PAT_BH                   (0x10000000)
-#define PSB_2D_CTRL_BH                  (0x20000000)
-#define PSB_2D_SRC_OFF_BH               (0x30000000)
-#define PSB_2D_MASK_OFF_BH              (0x40000000)
-#define PSB_2D_RESERVED1_BH             (0x50000000)
-#define PSB_2D_RESERVED2_BH             (0x60000000)
-#define PSB_2D_FENCE_BH                 (0x70000000)
-#define PSB_2D_BLIT_BH                  (0x80000000)
-#define PSB_2D_SRC_SURF_BH              (0x90000000)
-#define PSB_2D_DST_SURF_BH              (0xA0000000)
-#define PSB_2D_PAT_SURF_BH              (0xB0000000)
-#define PSB_2D_SRC_PAL_BH               (0xC0000000)
-#define PSB_2D_PAT_PAL_BH               (0xD0000000)
-#define PSB_2D_MASK_SURF_BH             (0xE0000000)
-#define PSB_2D_FLUSH_BH                 (0xF0000000)
-
-/*
- * Clip Definition block (PSB_2D_CLIP_BH)
- */
-#define PSB_2D_CLIPCOUNT_MAX            (1)
-#define PSB_2D_CLIPCOUNT_MASK           (0x00000000)
-#define PSB_2D_CLIPCOUNT_CLRMASK        (0xFFFFFFFF)
-#define PSB_2D_CLIPCOUNT_SHIFT          (0)
-/* clip rectangle min & max */
-#define PSB_2D_CLIP_XMAX_MASK           (0x00FFF000)
-#define PSB_2D_CLIP_XMAX_CLRMASK        (0xFF000FFF)
-#define PSB_2D_CLIP_XMAX_SHIFT          (12)
-#define PSB_2D_CLIP_XMIN_MASK           (0x00000FFF)
-#define PSB_2D_CLIP_XMIN_CLRMASK        (0x00FFF000)
-#define PSB_2D_CLIP_XMIN_SHIFT          (0)
-/* clip rectangle offset */
-#define PSB_2D_CLIP_YMAX_MASK           (0x00FFF000)
-#define PSB_2D_CLIP_YMAX_CLRMASK        (0xFF000FFF)
-#define PSB_2D_CLIP_YMAX_SHIFT          (12)
-#define PSB_2D_CLIP_YMIN_MASK           (0x00000FFF)
-#define PSB_2D_CLIP_YMIN_CLRMASK        (0x00FFF000)
-#define PSB_2D_CLIP_YMIN_SHIFT          (0)
-
-/*
- * Pattern Control (PSB_2D_PAT_BH)
- */
-#define PSB_2D_PAT_HEIGHT_MASK          (0x0000001F)
-#define PSB_2D_PAT_HEIGHT_SHIFT         (0)
-#define PSB_2D_PAT_WIDTH_MASK           (0x000003E0)
-#define PSB_2D_PAT_WIDTH_SHIFT          (5)
-#define PSB_2D_PAT_YSTART_MASK          (0x00007C00)
-#define PSB_2D_PAT_YSTART_SHIFT         (10)
-#define PSB_2D_PAT_XSTART_MASK          (0x000F8000)
-#define PSB_2D_PAT_XSTART_SHIFT         (15)
-
-/*
- * 2D Control block (PSB_2D_CTRL_BH)
- */
-/* Present Flags */
-#define PSB_2D_SRCCK_CTRL               (0x00000001)
-#define PSB_2D_DSTCK_CTRL               (0x00000002)
-#define PSB_2D_ALPHA_CTRL               (0x00000004)
-/* Colour Key Colour (SRC/DST)*/
-#define PSB_2D_CK_COL_MASK              (0xFFFFFFFF)
-#define PSB_2D_CK_COL_CLRMASK           (0x00000000)
-#define PSB_2D_CK_COL_SHIFT             (0)
-/* Colour Key Mask (SRC/DST)*/
-#define PSB_2D_CK_MASK_MASK             (0xFFFFFFFF)
-#define PSB_2D_CK_MASK_CLRMASK          (0x00000000)
-#define PSB_2D_CK_MASK_SHIFT            (0)
-/* Alpha Control (Alpha/RGB)*/
-#define PSB_2D_GBLALPHA_MASK            (0x000FF000)
-#define PSB_2D_GBLALPHA_CLRMASK         (0xFFF00FFF)
-#define PSB_2D_GBLALPHA_SHIFT           (12)
-#define PSB_2D_SRCALPHA_OP_MASK         (0x00700000)
-#define PSB_2D_SRCALPHA_OP_CLRMASK      (0xFF8FFFFF)
-#define PSB_2D_SRCALPHA_OP_SHIFT        (20)
-#define PSB_2D_SRCALPHA_OP_ONE          (0x00000000)
-#define PSB_2D_SRCALPHA_OP_SRC          (0x00100000)
-#define PSB_2D_SRCALPHA_OP_DST          (0x00200000)
-#define PSB_2D_SRCALPHA_OP_SG           (0x00300000)
-#define PSB_2D_SRCALPHA_OP_DG           (0x00400000)
-#define PSB_2D_SRCALPHA_OP_GBL          (0x00500000)
-#define PSB_2D_SRCALPHA_OP_ZERO         (0x00600000)
-#define PSB_2D_SRCALPHA_INVERT          (0x00800000)
-#define PSB_2D_SRCALPHA_INVERT_CLR      (0xFF7FFFFF)
-#define PSB_2D_DSTALPHA_OP_MASK         (0x07000000)
-#define PSB_2D_DSTALPHA_OP_CLRMASK      (0xF8FFFFFF)
-#define PSB_2D_DSTALPHA_OP_SHIFT        (24)
-#define PSB_2D_DSTALPHA_OP_ONE          (0x00000000)
-#define PSB_2D_DSTALPHA_OP_SRC          (0x01000000)
-#define PSB_2D_DSTALPHA_OP_DST          (0x02000000)
-#define PSB_2D_DSTALPHA_OP_SG           (0x03000000)
-#define PSB_2D_DSTALPHA_OP_DG           (0x04000000)
-#define PSB_2D_DSTALPHA_OP_GBL          (0x05000000)
-#define PSB_2D_DSTALPHA_OP_ZERO         (0x06000000)
-#define PSB_2D_DSTALPHA_INVERT          (0x08000000)
-#define PSB_2D_DSTALPHA_INVERT_CLR      (0xF7FFFFFF)
-
-#define PSB_2D_PRE_MULTIPLICATION_ENABLE        (0x10000000)
-#define PSB_2D_PRE_MULTIPLICATION_CLRMASK       (0xEFFFFFFF)
-#define PSB_2D_ZERO_SOURCE_ALPHA_ENABLE         (0x20000000)
-#define PSB_2D_ZERO_SOURCE_ALPHA_CLRMASK        (0xDFFFFFFF)
-
-/*
- *Source Offset (PSB_2D_SRC_OFF_BH)
- */
-#define PSB_2D_SRCOFF_XSTART_MASK       ((0x00000FFF) << 12)
-#define PSB_2D_SRCOFF_XSTART_SHIFT      (12)
-#define PSB_2D_SRCOFF_YSTART_MASK       (0x00000FFF)
-#define PSB_2D_SRCOFF_YSTART_SHIFT      (0)
-
-/*
- * Mask Offset (PSB_2D_MASK_OFF_BH)
- */
-#define PSB_2D_MASKOFF_XSTART_MASK      ((0x00000FFF) << 12)
-#define PSB_2D_MASKOFF_XSTART_SHIFT     (12)
-#define PSB_2D_MASKOFF_YSTART_MASK      (0x00000FFF)
-#define PSB_2D_MASKOFF_YSTART_SHIFT     (0)
-
-/*
- * 2D Fence (see PSB_2D_FENCE_BH): bits 0:27 are ignored
- */
-
-/*
- *Blit Rectangle (PSB_2D_BLIT_BH)
- */
-
-#define PSB_2D_ROT_MASK                 (3 << 25)
-#define PSB_2D_ROT_CLRMASK              (~PSB_2D_ROT_MASK)
-#define PSB_2D_ROT_NONE                 (0 << 25)
-#define PSB_2D_ROT_90DEGS               (1 << 25)
-#define PSB_2D_ROT_180DEGS              (2 << 25)
-#define PSB_2D_ROT_270DEGS              (3 << 25)
-
-#define PSB_2D_COPYORDER_MASK           (3 << 23)
-#define PSB_2D_COPYORDER_CLRMASK        (~PSB_2D_COPYORDER_MASK)
-#define PSB_2D_COPYORDER_TL2BR          (0 << 23)
-#define PSB_2D_COPYORDER_BR2TL          (1 << 23)
-#define PSB_2D_COPYORDER_TR2BL          (2 << 23)
-#define PSB_2D_COPYORDER_BL2TR          (3 << 23)
-
-#define PSB_2D_DSTCK_CLRMASK            (0xFF9FFFFF)
-#define PSB_2D_DSTCK_DISABLE            (0x00000000)
-#define PSB_2D_DSTCK_PASS               (0x00200000)
-#define PSB_2D_DSTCK_REJECT             (0x00400000)
-
-#define PSB_2D_SRCCK_CLRMASK            (0xFFE7FFFF)
-#define PSB_2D_SRCCK_DISABLE            (0x00000000)
-#define PSB_2D_SRCCK_PASS               (0x00080000)
-#define PSB_2D_SRCCK_REJECT             (0x00100000)
-
-#define PSB_2D_CLIP_ENABLE              (0x00040000)
-
-#define PSB_2D_ALPHA_ENABLE             (0x00020000)
-
-#define PSB_2D_PAT_CLRMASK              (0xFFFEFFFF)
-#define PSB_2D_PAT_MASK                 (0x00010000)
-#define PSB_2D_USE_PAT                  (0x00010000)
-#define PSB_2D_USE_FILL                 (0x00000000)
-/*
- * Tungsten Graphics note on rop codes: If rop A and rop B are
- * identical, the mask surface will not be read and need not be
- * set up.
- */
-
-#define PSB_2D_ROP3B_MASK               (0x0000FF00)
-#define PSB_2D_ROP3B_CLRMASK            (0xFFFF00FF)
-#define PSB_2D_ROP3B_SHIFT              (8)
-/* rop code A */
-#define PSB_2D_ROP3A_MASK               (0x000000FF)
-#define PSB_2D_ROP3A_CLRMASK            (0xFFFFFF00)
-#define PSB_2D_ROP3A_SHIFT              (0)
-
-#define PSB_2D_ROP4_MASK                (0x0000FFFF)
-/*
- *      DWORD0: (Only pass if Pattern control == Use Fill Colour)
- *      Fill Colour RGBA8888
- */
-#define PSB_2D_FILLCOLOUR_MASK          (0xFFFFFFFF)
-#define PSB_2D_FILLCOLOUR_SHIFT         (0)
-/*
- *      DWORD1: (Always Present)
- *      X Start (Dest)
- *      Y Start (Dest)
- */
-#define PSB_2D_DST_XSTART_MASK          (0x00FFF000)
-#define PSB_2D_DST_XSTART_CLRMASK       (0xFF000FFF)
-#define PSB_2D_DST_XSTART_SHIFT         (12)
-#define PSB_2D_DST_YSTART_MASK          (0x00000FFF)
-#define PSB_2D_DST_YSTART_CLRMASK       (0xFFFFF000)
-#define PSB_2D_DST_YSTART_SHIFT         (0)
-/*
- *      DWORD2: (Always Present)
- *      X Size (Dest)
- *      Y Size (Dest)
- */
-#define PSB_2D_DST_XSIZE_MASK           (0x00FFF000)
-#define PSB_2D_DST_XSIZE_CLRMASK        (0xFF000FFF)
-#define PSB_2D_DST_XSIZE_SHIFT          (12)
-#define PSB_2D_DST_YSIZE_MASK           (0x00000FFF)
-#define PSB_2D_DST_YSIZE_CLRMASK        (0xFFFFF000)
-#define PSB_2D_DST_YSIZE_SHIFT          (0)
-
-/*
- * Source Surface (PSB_2D_SRC_SURF_BH)
- */
-/*
- * WORD 0
- */
-
-#define PSB_2D_SRC_FORMAT_MASK          (0x00078000)
-#define PSB_2D_SRC_1_PAL                (0x00000000)
-#define PSB_2D_SRC_2_PAL                (0x00008000)
-#define PSB_2D_SRC_4_PAL                (0x00010000)
-#define PSB_2D_SRC_8_PAL                (0x00018000)
-#define PSB_2D_SRC_8_ALPHA              (0x00020000)
-#define PSB_2D_SRC_4_ALPHA              (0x00028000)
-#define PSB_2D_SRC_332RGB               (0x00030000)
-#define PSB_2D_SRC_4444ARGB             (0x00038000)
-#define PSB_2D_SRC_555RGB               (0x00040000)
-#define PSB_2D_SRC_1555ARGB             (0x00048000)
-#define PSB_2D_SRC_565RGB               (0x00050000)
-#define PSB_2D_SRC_0888ARGB             (0x00058000)
-#define PSB_2D_SRC_8888ARGB             (0x00060000)
-#define PSB_2D_SRC_8888UYVY             (0x00068000)
-#define PSB_2D_SRC_RESERVED             (0x00070000)
-#define PSB_2D_SRC_1555ARGB_LOOKUP      (0x00078000)
-
-
-#define PSB_2D_SRC_STRIDE_MASK          (0x00007FFF)
-#define PSB_2D_SRC_STRIDE_CLRMASK       (0xFFFF8000)
-#define PSB_2D_SRC_STRIDE_SHIFT         (0)
-/*
- *  WORD 1 - Base Address
- */
-#define PSB_2D_SRC_ADDR_MASK            (0x0FFFFFFC)
-#define PSB_2D_SRC_ADDR_CLRMASK         (0x00000003)
-#define PSB_2D_SRC_ADDR_SHIFT           (2)
-#define PSB_2D_SRC_ADDR_ALIGNSHIFT      (2)
-
-/*
- * Pattern Surface (PSB_2D_PAT_SURF_BH)
- */
-/*
- *  WORD 0
- */
-
-#define PSB_2D_PAT_FORMAT_MASK          (0x00078000)
-#define PSB_2D_PAT_1_PAL                (0x00000000)
-#define PSB_2D_PAT_2_PAL                (0x00008000)
-#define PSB_2D_PAT_4_PAL                (0x00010000)
-#define PSB_2D_PAT_8_PAL                (0x00018000)
-#define PSB_2D_PAT_8_ALPHA              (0x00020000)
-#define PSB_2D_PAT_4_ALPHA              (0x00028000)
-#define PSB_2D_PAT_332RGB               (0x00030000)
-#define PSB_2D_PAT_4444ARGB             (0x00038000)
-#define PSB_2D_PAT_555RGB               (0x00040000)
-#define PSB_2D_PAT_1555ARGB             (0x00048000)
-#define PSB_2D_PAT_565RGB               (0x00050000)
-#define PSB_2D_PAT_0888ARGB             (0x00058000)
-#define PSB_2D_PAT_8888ARGB             (0x00060000)
-
-#define PSB_2D_PAT_STRIDE_MASK          (0x00007FFF)
-#define PSB_2D_PAT_STRIDE_CLRMASK       (0xFFFF8000)
-#define PSB_2D_PAT_STRIDE_SHIFT         (0)
-/*
- *  WORD 1 - Base Address
- */
-#define PSB_2D_PAT_ADDR_MASK            (0x0FFFFFFC)
-#define PSB_2D_PAT_ADDR_CLRMASK         (0x00000003)
-#define PSB_2D_PAT_ADDR_SHIFT           (2)
-#define PSB_2D_PAT_ADDR_ALIGNSHIFT      (2)
-
-/*
- * Destination Surface (PSB_2D_DST_SURF_BH)
- */
-/*
- * WORD 0
- */
-
-#define PSB_2D_DST_FORMAT_MASK          (0x00078000)
-#define PSB_2D_DST_332RGB               (0x00030000)
-#define PSB_2D_DST_4444ARGB             (0x00038000)
-#define PSB_2D_DST_555RGB               (0x00040000)
-#define PSB_2D_DST_1555ARGB             (0x00048000)
-#define PSB_2D_DST_565RGB               (0x00050000)
-#define PSB_2D_DST_0888ARGB             (0x00058000)
-#define PSB_2D_DST_8888ARGB             (0x00060000)
-#define PSB_2D_DST_8888AYUV             (0x00070000)
-
-#define PSB_2D_DST_STRIDE_MASK          (0x00007FFF)
-#define PSB_2D_DST_STRIDE_CLRMASK       (0xFFFF8000)
-#define PSB_2D_DST_STRIDE_SHIFT         (0)
-/*
- * WORD 1 - Base Address
- */
-#define PSB_2D_DST_ADDR_MASK            (0x0FFFFFFC)
-#define PSB_2D_DST_ADDR_CLRMASK         (0x00000003)
-#define PSB_2D_DST_ADDR_SHIFT           (2)
-#define PSB_2D_DST_ADDR_ALIGNSHIFT      (2)
-
-/*
- * Mask Surface (PSB_2D_MASK_SURF_BH)
- */
-/*
- * WORD 0
- */
-#define PSB_2D_MASK_STRIDE_MASK         (0x00007FFF)
-#define PSB_2D_MASK_STRIDE_CLRMASK      (0xFFFF8000)
-#define PSB_2D_MASK_STRIDE_SHIFT        (0)
-/*
- *  WORD 1 - Base Address
- */
-#define PSB_2D_MASK_ADDR_MASK           (0x0FFFFFFC)
-#define PSB_2D_MASK_ADDR_CLRMASK        (0x00000003)
-#define PSB_2D_MASK_ADDR_SHIFT          (2)
-#define PSB_2D_MASK_ADDR_ALIGNSHIFT     (2)
-
-/*
- * Source Palette (PSB_2D_SRC_PAL_BH)
- */
-
-#define PSB_2D_SRCPAL_ADDR_SHIFT        (0)
-#define PSB_2D_SRCPAL_ADDR_CLRMASK      (0xF0000007)
-#define PSB_2D_SRCPAL_ADDR_MASK         (0x0FFFFFF8)
-#define PSB_2D_SRCPAL_BYTEALIGN         (1024)
-
-/*
- * Pattern Palette (PSB_2D_PAT_PAL_BH)
- */
-
-#define PSB_2D_PATPAL_ADDR_SHIFT        (0)
-#define PSB_2D_PATPAL_ADDR_CLRMASK      (0xF0000007)
-#define PSB_2D_PATPAL_ADDR_MASK         (0x0FFFFFF8)
-#define PSB_2D_PATPAL_BYTEALIGN         (1024)
-
-/*
- * Rop3 Codes (2 LS bytes)
- */
-
-#define PSB_2D_ROP3_SRCCOPY             (0xCCCC)
-#define PSB_2D_ROP3_PATCOPY             (0xF0F0)
-#define PSB_2D_ROP3_WHITENESS           (0xFFFF)
-#define PSB_2D_ROP3_BLACKNESS           (0x0000)
-#define PSB_2D_ROP3_SRC                 (0xCC)
-#define PSB_2D_ROP3_PAT                 (0xF0)
-#define PSB_2D_ROP3_DST                 (0xAA)
-
-/*
- * Sizes.
- */
-
-#define PSB_SCENE_HW_COOKIE_SIZE        16
-#define PSB_TA_MEM_HW_COOKIE_SIZE       16
-
-/*
- * Scene stuff.
- */
-
-#define PSB_NUM_HW_SCENES               2
-
-/*
- * Scheduler completion actions.
- */
-
-#define PSB_RASTER_BLOCK                0
-#define PSB_RASTER                      1
-#define PSB_RETURN                      2
-#define PSB_TA                          3
-
-/* Power management */
-#define PSB_PUNIT_PORT                  0x04
-#define PSB_OSPMBA                      0x78
-#define PSB_APMBA                       0x7a
-#define PSB_APM_CMD                     0x0
-#define PSB_APM_STS                     0x04
-#define PSB_PWRGT_VID_ENC_MASK          0x30
-#define PSB_PWRGT_VID_DEC_MASK          0xc
-#define PSB_PWRGT_GL3_MASK              0xc0
-
-#define PSB_PM_SSC                      0x20
-#define PSB_PM_SSS                      0x30
-#define PSB_PWRGT_DISPLAY_MASK          0xc /*on a different BA than video/gfx*/
-#define MDFLD_PWRGT_DISPLAY_A_CNTR      0x0000000c
-#define MDFLD_PWRGT_DISPLAY_B_CNTR      0x0000c000
-#define MDFLD_PWRGT_DISPLAY_C_CNTR      0x00030000
-#define MDFLD_PWRGT_DISP_MIPI_CNTR      0x000c0000
-#define MDFLD_PWRGT_DISPLAY_CNTR    (MDFLD_PWRGT_DISPLAY_A_CNTR | MDFLD_PWRGT_DISPLAY_B_CNTR | MDFLD_PWRGT_DISPLAY_C_CNTR | MDFLD_PWRGT_DISP_MIPI_CNTR) /* 0x000fc00c */
-/* Display SSS register bits are different in A0 vs. B0 */
-#define PSB_PWRGT_GFX_MASK              0x3
-#define MDFLD_PWRGT_DISPLAY_A_STS       0x000000c0
-#define MDFLD_PWRGT_DISPLAY_B_STS       0x00000300
-#define MDFLD_PWRGT_DISPLAY_C_STS       0x00000c00
-#define PSB_PWRGT_GFX_MASK_B0           0xc3
-#define MDFLD_PWRGT_DISPLAY_A_STS_B0    0x0000000c
-#define MDFLD_PWRGT_DISPLAY_B_STS_B0    0x0000c000
-#define MDFLD_PWRGT_DISPLAY_C_STS_B0    0x00030000
-#define MDFLD_PWRGT_DISP_MIPI_STS       0x000c0000
-#define MDFLD_PWRGT_DISPLAY_STS_A0    (MDFLD_PWRGT_DISPLAY_A_STS | MDFLD_PWRGT_DISPLAY_B_STS | MDFLD_PWRGT_DISPLAY_C_STS | MDFLD_PWRGT_DISP_MIPI_STS) /* 0x000fc00c */
-#define MDFLD_PWRGT_DISPLAY_STS_B0    (MDFLD_PWRGT_DISPLAY_A_STS_B0 | MDFLD_PWRGT_DISPLAY_B_STS_B0 | MDFLD_PWRGT_DISPLAY_C_STS_B0 | MDFLD_PWRGT_DISP_MIPI_STS) /* 0x000fc00c */
-#endif
diff --git a/drivers/staging/media/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c
index 70e006b50f29..5443e25086e9 100644
--- a/drivers/staging/media/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
@@ -1279,3 +1279,4 @@ static struct usb_driver go7007_usb_driver = {
 };
 
 module_usb_driver(go7007_usb_driver);
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/omapdrm/Makefile b/drivers/staging/omapdrm/Makefile
index 592cf69020cd..d9cdc120d122 100644
--- a/drivers/staging/omapdrm/Makefile
+++ b/drivers/staging/omapdrm/Makefile
@@ -7,6 +7,7 @@ ccflags-y := -Iinclude/drm -Werror
 omapdrm-y := omap_drv.o \
         omap_debugfs.o \
         omap_crtc.o \
+        omap_plane.o \
         omap_encoder.o \
         omap_connector.o \
         omap_fb.o \
diff --git a/drivers/staging/omapdrm/omap_crtc.c b/drivers/staging/omapdrm/omap_crtc.c
index cffdf5e12394..17ca163e5896 100644
--- a/drivers/staging/omapdrm/omap_crtc.c
+++ b/drivers/staging/omapdrm/omap_crtc.c
@@ -27,196 +27,95 @@
 
 struct omap_crtc {
         struct drm_crtc base;
-        struct omap_overlay *ovl;
-        struct omap_overlay_info info;
+        struct drm_plane *plane;
+        const char *name;
         int id;
 
-        /* if there is a pending flip, this will be non-null: */
+        /* if there is a pending flip, these will be non-null: */
         struct drm_pending_vblank_event *event;
+        struct drm_framebuffer *old_fb;
 };
 
-/* push changes down to dss2 */
-static int commit(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-        struct omap_overlay *ovl = omap_crtc->ovl;
-        struct omap_overlay_info *info = &omap_crtc->info;
-        int ret;
-
-        DBG("%s", omap_crtc->ovl->name);
-        DBG("%dx%d -> %dx%d (%d)", info->width, info->height, info->out_width,
-                        info->out_height, info->screen_width);
-        DBG("%d,%d %08x", info->pos_x, info->pos_y, info->paddr);
-
-        /* NOTE: do we want to do this at all here, or just wait
-         * for dpms(ON) since other CRTC's may not have their mode
-         * set yet, so fb dimensions may still change..
-         */
-        ret = ovl->set_overlay_info(ovl, info);
-        if (ret) {
-                dev_err(dev->dev, "could not set overlay info\n");
-                return ret;
-        }
-
-        /* our encoder doesn't necessarily get a commit() after this, in
-         * particular in the dpms() and mode_set_base() cases, so force the
-         * manager to update:
-         *
-         * could this be in the encoder somehow?
-         */
-        if (ovl->manager) {
-                ret = ovl->manager->apply(ovl->manager);
-                if (ret) {
-                        dev_err(dev->dev, "could not apply settings\n");
-                        return ret;
-                }
-        }
-
-        if (info->enabled) {
-                omap_framebuffer_flush(crtc->fb, crtc->x, crtc->y,
-                                crtc->fb->width, crtc->fb->height);
-        }
-
-        return 0;
-}
-
-/* update parameters that are dependent on the framebuffer dimensions and
- * position within the fb that this crtc scans out from. This is called
- * when framebuffer dimensions or x,y base may have changed, either due
- * to our mode, or a change in another crtc that is scanning out of the
- * same fb.
- */
-static void update_scanout(struct drm_crtc *crtc)
-{
-        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-        dma_addr_t paddr;
-        unsigned int screen_width;
-
-        omap_framebuffer_get_buffer(crtc->fb, crtc->x, crtc->y,
-                        NULL, &paddr, &screen_width);
-
-        DBG("%s: %d,%d: %08x (%d)", omap_crtc->ovl->name,
-                        crtc->x, crtc->y, (u32)paddr, screen_width);
-
-        omap_crtc->info.paddr = paddr;
-        omap_crtc->info.screen_width = screen_width;
-}
-
 static void omap_crtc_gamma_set(struct drm_crtc *crtc,
                 u16 *red, u16 *green, u16 *blue, uint32_t start, uint32_t size)
 {
-        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-        DBG("%s", omap_crtc->ovl->name);
+        /* not supported.. at least not yet */
 }
 
 static void omap_crtc_destroy(struct drm_crtc *crtc)
 {
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-        DBG("%s", omap_crtc->ovl->name);
+        omap_crtc->plane->funcs->destroy(omap_crtc->plane);
         drm_crtc_cleanup(crtc);
         kfree(omap_crtc);
 }
 
 static void omap_crtc_dpms(struct drm_crtc *crtc, int mode)
 {
+        struct omap_drm_private *priv = crtc->dev->dev_private;
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
+        int i;
 
-        DBG("%s: %d", omap_crtc->ovl->name, mode);
+        WARN_ON(omap_plane_dpms(omap_crtc->plane, mode));
 
-        if (mode == DRM_MODE_DPMS_ON) {
-                update_scanout(crtc);
-                omap_crtc->info.enabled = true;
-        } else {
-                omap_crtc->info.enabled = false;
+        for (i = 0; i < priv->num_planes; i++) {
+                struct drm_plane *plane = priv->planes[i];
+                if (plane->crtc == crtc)
+                        WARN_ON(omap_plane_dpms(plane, mode));
         }
-
-        WARN_ON(commit(crtc));
 }
 
 static bool omap_crtc_mode_fixup(struct drm_crtc *crtc,
-                                  struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
+                struct drm_display_mode *mode,
+                struct drm_display_mode *adjusted_mode)
 {
-        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-        DBG("%s", omap_crtc->ovl->name);
         return true;
 }
 
 static int omap_crtc_mode_set(struct drm_crtc *crtc,
-                               struct drm_display_mode *mode,
-                               struct drm_display_mode *adjusted_mode,
-                               int x, int y,
-                               struct drm_framebuffer *old_fb)
+                struct drm_display_mode *mode,
+                struct drm_display_mode *adjusted_mode,
+                int x, int y,
+                struct drm_framebuffer *old_fb)
 {
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
+        struct drm_plane *plane = omap_crtc->plane;
 
-        DBG("%s: %d,%d: %dx%d", omap_crtc->ovl->name, x, y,
-                        mode->hdisplay, mode->vdisplay);
-
-        /* just use adjusted mode */
-        mode = adjusted_mode;
-
-        omap_crtc->info.width = mode->hdisplay;
-        omap_crtc->info.height = mode->vdisplay;
-        omap_crtc->info.out_width = mode->hdisplay;
-        omap_crtc->info.out_height = mode->vdisplay;
-        omap_crtc->info.color_mode = OMAP_DSS_COLOR_RGB24U;
-        omap_crtc->info.rotation_type = OMAP_DSS_ROT_DMA;
-        omap_crtc->info.rotation = OMAP_DSS_ROT_0;
-        omap_crtc->info.global_alpha = 0xff;
-        omap_crtc->info.mirror = 0;
-        omap_crtc->info.mirror = 0;
-        omap_crtc->info.pos_x = 0;
-        omap_crtc->info.pos_y = 0;
-#if 0 /* re-enable when these are available in DSS2 driver */
-        omap_crtc->info.zorder = 3;        /* GUI in the front, video behind */
-        omap_crtc->info.min_x_decim = 1;
-        omap_crtc->info.max_x_decim = 1;
-        omap_crtc->info.min_y_decim = 1;
-        omap_crtc->info.max_y_decim = 1;
-#endif
-
-        update_scanout(crtc);
-
-        return 0;
+        return omap_plane_mode_set(plane, crtc, crtc->fb,
+                        0, 0, mode->hdisplay, mode->vdisplay,
+                        x << 16, y << 16,
+                        mode->hdisplay << 16, mode->vdisplay << 16);
 }
 
 static void omap_crtc_prepare(struct drm_crtc *crtc)
 {
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-        struct omap_overlay *ovl = omap_crtc->ovl;
-
-        DBG("%s", omap_crtc->ovl->name);
-
-        ovl->get_overlay_info(ovl, &omap_crtc->info);
-
+        DBG("%s", omap_crtc->name);
         omap_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
 }
 
 static void omap_crtc_commit(struct drm_crtc *crtc)
 {
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-        DBG("%s", omap_crtc->ovl->name);
+        DBG("%s", omap_crtc->name);
         omap_crtc_dpms(crtc, DRM_MODE_DPMS_ON);
 }
 
 static int omap_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
-                    struct drm_framebuffer *old_fb)
+                struct drm_framebuffer *old_fb)
 {
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
+        struct drm_plane *plane = omap_crtc->plane;
+        struct drm_display_mode *mode = &crtc->mode;
 
-        DBG("%s %d,%d: fb=%p", omap_crtc->ovl->name, x, y, old_fb);
-
-        update_scanout(crtc);
-
-        return commit(crtc);
+        return plane->funcs->update_plane(plane, crtc, crtc->fb,
+                        0, 0, mode->hdisplay, mode->vdisplay,
+                        x << 16, y << 16,
+                        mode->hdisplay << 16, mode->vdisplay << 16);
 }
 
 static void omap_crtc_load_lut(struct drm_crtc *crtc)
 {
-        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-        DBG("%s", omap_crtc->ovl->name);
 }
 
 static void page_flip_cb(void *arg)
@@ -225,15 +124,16 @@ static void page_flip_cb(void *arg)
         struct drm_device *dev = crtc->dev;
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
         struct drm_pending_vblank_event *event = omap_crtc->event;
+        struct drm_framebuffer *old_fb = omap_crtc->old_fb;
         struct timeval now;
         unsigned long flags;
 
         WARN_ON(!event);
 
         omap_crtc->event = NULL;
+        omap_crtc->old_fb = NULL;
 
-        update_scanout(crtc);
-        WARN_ON(commit(crtc));
+        omap_crtc_mode_set_base(crtc, crtc->x, crtc->y, old_fb);
 
         /* wakeup userspace */
         /* TODO: this should happen *after* flip in vsync IRQ handler */
@@ -264,10 +164,11 @@ static int omap_crtc_page_flip_locked(struct drm_crtc *crtc,
                 return -EINVAL;
         }
 
-        crtc->fb = fb;
+        omap_crtc->old_fb = crtc->fb;
         omap_crtc->event = event;
+        crtc->fb = fb;
 
-        omap_gem_op_async(omap_framebuffer_bo(fb), OMAP_GEM_READ,
+        omap_gem_op_async(omap_framebuffer_bo(fb, 0), OMAP_GEM_READ,
                         page_flip_cb, crtc);
 
         return 0;
@@ -290,12 +191,6 @@ static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = {
         .load_lut = omap_crtc_load_lut,
 };
 
-struct omap_overlay *omap_crtc_get_overlay(struct drm_crtc *crtc)
-{
-        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-        return omap_crtc->ovl;
-}
-
 /* initialize crtc */
 struct drm_crtc *omap_crtc_init(struct drm_device *dev,
                 struct omap_overlay *ovl, int id)
@@ -310,9 +205,13 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
                 goto fail;
         }
 
-        omap_crtc->ovl = ovl;
-        omap_crtc->id = id;
         crtc = &omap_crtc->base;
+
+        omap_crtc->plane = omap_plane_init(dev, ovl, (1 << id), true);
+        omap_crtc->plane->crtc = crtc;
+        omap_crtc->name = ovl->name;
+        omap_crtc->id = id;
+
         drm_crtc_init(dev, crtc, &omap_crtc_funcs);
         drm_crtc_helper_add(crtc, &omap_crtc_helper_funcs);
 
diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c
index 602aa2dd49c8..3bbea9aac404 100644
--- a/drivers/staging/omapdrm/omap_drv.c
+++ b/drivers/staging/omapdrm/omap_drv.c
@@ -204,12 +204,6 @@ static int create_crtc(struct drm_device *dev, struct omap_overlay *ovl,
         struct omap_overlay_manager *mgr = NULL;
         struct drm_crtc *crtc;
 
-        if (ovl->manager) {
-                DBG("disconnecting %s from %s", ovl->name,
-                                        ovl->manager->name);
-                ovl->unset_manager(ovl);
-        }
-
         /* find next best connector, ones with detected connection first
          */
         while (*j < priv->num_connectors && !mgr) {
@@ -245,11 +239,6 @@ static int create_crtc(struct drm_device *dev, struct omap_overlay *ovl,
                 (*j)++;
         }
 
-        if (mgr) {
-                DBG("connecting %s to %s", ovl->name, mgr->name);
-                ovl->set_manager(ovl, mgr);
-        }
-
         crtc = omap_crtc_init(dev, ovl, priv->num_crtcs);
 
         if (!crtc) {
@@ -265,6 +254,26 @@ static int create_crtc(struct drm_device *dev, struct omap_overlay *ovl,
         return 0;
 }
 
+static int create_plane(struct drm_device *dev, struct omap_overlay *ovl,
+                unsigned int possible_crtcs)
+{
+        struct omap_drm_private *priv = dev->dev_private;
+        struct drm_plane *plane =
+                        omap_plane_init(dev, ovl, possible_crtcs, false);
+
+        if (!plane) {
+                dev_err(dev->dev, "could not create plane: %s\n",
+                                ovl->name);
+                return -ENOMEM;
+        }
+
+        BUG_ON(priv->num_planes >= ARRAY_SIZE(priv->planes));
+
+        priv->planes[priv->num_planes++] = plane;
+
+        return 0;
+}
+
 static int match_dev_name(struct omap_dss_device *dssdev, void *data)
 {
         return !strcmp(dssdev->name, data);
@@ -332,6 +341,12 @@ static int omap_modeset_init(struct drm_device *dev)
                                 omap_dss_get_overlay(kms_pdata->ovl_ids[i]);
                         create_crtc(dev, ovl, &j, connected_connectors);
                 }
+
+                for (i = 0; i < kms_pdata->pln_cnt; i++) {
+                        struct omap_overlay *ovl =
+                                omap_dss_get_overlay(kms_pdata->pln_ids[i]);
+                        create_plane(dev, ovl, (1 << priv->num_crtcs) - 1);
+                }
         } else {
                 /* otherwise just grab up to CONFIG_DRM_OMAP_NUM_CRTCS and try
                  * to make educated guesses about everything else
@@ -353,6 +368,12 @@ static int omap_modeset_init(struct drm_device *dev)
                         create_crtc(dev, omap_dss_get_overlay(i),
                                         &j, connected_connectors);
                 }
+
+                /* use any remaining overlays as drm planes */
+                for (; i < omap_dss_get_num_overlays(); i++) {
+                        struct omap_overlay *ovl = omap_dss_get_overlay(i);
+                        create_plane(dev, ovl, (1 << priv->num_crtcs) - 1);
+                }
         }
 
         /* for now keep the mapping of CRTCs and encoders static.. */
@@ -361,15 +382,7 @@ static int omap_modeset_init(struct drm_device *dev)
                 struct omap_overlay_manager *mgr =
                                 omap_encoder_get_manager(encoder);
 
-                encoder->possible_crtcs = 0;
-
-                for (j = 0; j < priv->num_crtcs; j++) {
-                        struct omap_overlay *ovl =
-                                        omap_crtc_get_overlay(priv->crtcs[j]);
-                        if (ovl->manager == mgr) {
-                                encoder->possible_crtcs |= (1 << j);
-                        }
-                }
+                encoder->possible_crtcs = (1 << priv->num_crtcs) - 1;
 
                 DBG("%s: possible_crtcs=%08x", mgr->name,
                                         encoder->possible_crtcs);
@@ -377,8 +390,8 @@ static int omap_modeset_init(struct drm_device *dev)
 
         dump_video_chains();
 
-        dev->mode_config.min_width = 256;
-        dev->mode_config.min_height = 256;
+        dev->mode_config.min_width = 32;
+        dev->mode_config.min_height = 32;
 
         /* note: eventually will need some cpu_is_omapXYZ() type stuff here
          * to fill in these limits properly on different OMAP generations..
@@ -708,6 +721,18 @@ static struct vm_operations_struct omap_gem_vm_ops = {
         .close = drm_gem_vm_close,
 };
 
+static const struct file_operations omapdriver_fops = {
+                .owner = THIS_MODULE,
+                .open = drm_open,
+                .unlocked_ioctl = drm_ioctl,
+                .release = drm_release,
+                .mmap = omap_gem_mmap,
+                .poll = drm_poll,
+                .fasync = drm_fasync,
+                .read = drm_read,
+                .llseek = noop_llseek,
+};
+
 static struct drm_driver omap_drm_driver = {
                 .driver_features =
                                 DRIVER_HAVE_IRQ | DRIVER_MODESET | DRIVER_GEM,
@@ -738,17 +763,7 @@ static struct drm_driver omap_drm_driver = {
                 .dumb_destroy = omap_gem_dumb_destroy,
                 .ioctls = ioctls,
                 .num_ioctls = DRM_OMAP_NUM_IOCTLS,
-                .fops = {
-                                .owner = THIS_MODULE,
-                                .open = drm_open,
-                                .unlocked_ioctl = drm_ioctl,
-                                .release = drm_release,
-                                .mmap = omap_gem_mmap,
-                                .poll = drm_poll,
-                                .fasync = drm_fasync,
-                                .read = drm_read,
-                                .llseek = noop_llseek,
-                },
+                .fops = &omapdriver_fops,
                 .name = DRIVER_NAME,
                 .desc = DRIVER_DESC,
                 .date = DRIVER_DATE,
diff --git a/drivers/staging/omapdrm/omap_drv.h b/drivers/staging/omapdrm/omap_drv.h
index 76c42515ecc5..61fe022dda5b 100644
--- a/drivers/staging/omapdrm/omap_drv.h
+++ b/drivers/staging/omapdrm/omap_drv.h
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <drm/drmP.h>
+#include <drm/drm_crtc_helper.h>
 #include "omap_drm.h"
 #include "omap_priv.h"
 
@@ -41,6 +42,8 @@
 struct omap_drm_private {
         unsigned int num_crtcs;
         struct drm_crtc *crtcs[8];
+        unsigned int num_planes;
+        struct drm_plane *planes[8];
         unsigned int num_encoders;
         struct drm_encoder *encoders[8];
         unsigned int num_connectors;
@@ -61,7 +64,17 @@ void omap_fbdev_free(struct drm_device *dev);
 
 struct drm_crtc *omap_crtc_init(struct drm_device *dev,
                 struct omap_overlay *ovl, int id);
-struct omap_overlay *omap_crtc_get_overlay(struct drm_crtc *crtc);
+
+struct drm_plane *omap_plane_init(struct drm_device *dev,
+                struct omap_overlay *ovl, unsigned int possible_crtcs,
+                bool priv);
+int omap_plane_dpms(struct drm_plane *plane, int mode);
+int omap_plane_mode_set(struct drm_plane *plane,
+                struct drm_crtc *crtc, struct drm_framebuffer *fb,
+                int crtc_x, int crtc_y,
+                unsigned int crtc_w, unsigned int crtc_h,
+                uint32_t src_x, uint32_t src_y,
+                uint32_t src_w, uint32_t src_h);
 
 struct drm_encoder *omap_encoder_init(struct drm_device *dev,
                 struct omap_overlay_manager *mgr);
@@ -80,12 +93,14 @@ void omap_connector_flush(struct drm_connector *connector,
                 int x, int y, int w, int h);
 
 struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
-                struct drm_file *file, struct drm_mode_fb_cmd *mode_cmd);
+                struct drm_file *file, struct drm_mode_fb_cmd2 *mode_cmd);
 struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
-                struct drm_mode_fb_cmd *mode_cmd, struct drm_gem_object *bo);
-struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb);
-int omap_framebuffer_get_buffer(struct drm_framebuffer *fb, int x, int y,
-                void **vaddr, dma_addr_t *paddr, unsigned int *screen_width);
+                struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos);
+struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p);
+int omap_framebuffer_pin(struct drm_framebuffer *fb);
+void omap_framebuffer_unpin(struct drm_framebuffer *fb);
+void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, int x, int y,
+                struct omap_overlay_info *info);
 struct drm_connector *omap_framebuffer_get_next_connector(
                 struct drm_framebuffer *fb, struct drm_connector *from);
 void omap_framebuffer_flush(struct drm_framebuffer *fb,
@@ -132,4 +147,29 @@ static inline int align_pitch(int pitch, int width, int bpp)
         return ALIGN(pitch, 8 * bytespp);
 }
 
+/* should these be made into common util helpers?
+ */
+
+static inline int objects_lookup(struct drm_device *dev,
+                struct drm_file *filp, uint32_t pixel_format,
+                struct drm_gem_object **bos, uint32_t *handles)
+{
+        int i, n = drm_format_num_planes(pixel_format);
+
+        for (i = 0; i < n; i++) {
+                bos[i] = drm_gem_object_lookup(dev, filp, handles[i]);
+                if (!bos[i]) {
+                        goto fail;
+                }
+        }
+
+        return 0;
+
+fail:
+        while (--i > 0) {
+                drm_gem_object_unreference_unlocked(bos[i]);
+        }
+        return -ENOENT;
+}
+
 #endif /* __OMAP_DRV_H__ */
diff --git a/drivers/staging/omapdrm/omap_fb.c b/drivers/staging/omapdrm/omap_fb.c
index 0b50c5b3b564..d021a7ec58df 100644
--- a/drivers/staging/omapdrm/omap_fb.c
+++ b/drivers/staging/omapdrm/omap_fb.c
@@ -22,18 +22,57 @@
 #include "drm_crtc.h"
 #include "drm_crtc_helper.h"
 
-
 /*
  * framebuffer funcs
  */
 
+/* per-format info: */
+struct format {
+        enum omap_color_mode dss_format;
+        uint32_t pixel_format;
+        struct {
+                int stride_bpp;           /* this times width is stride */
+                int sub_y;                /* sub-sample in y dimension */
+        } planes[4];
+        bool yuv;
+};
+
+static const struct format formats[] = {
+        /* 16bpp [A]RGB: */
+        { OMAP_DSS_COLOR_RGB16,       DRM_FORMAT_RGB565,   {{2, 1}}, false }, /* RGB16-565 */
+        { OMAP_DSS_COLOR_RGB12U,      DRM_FORMAT_RGBX4444, {{2, 1}}, false }, /* RGB12x-4444 */
+        { OMAP_DSS_COLOR_RGBX16,      DRM_FORMAT_XRGB4444, {{2, 1}}, false }, /* xRGB12-4444 */
+        { OMAP_DSS_COLOR_RGBA16,      DRM_FORMAT_RGBA4444, {{2, 1}}, false }, /* RGBA12-4444 */
+        { OMAP_DSS_COLOR_ARGB16,      DRM_FORMAT_ARGB4444, {{2, 1}}, false }, /* ARGB16-4444 */
+        { OMAP_DSS_COLOR_XRGB16_1555, DRM_FORMAT_XRGB1555, {{2, 1}}, false }, /* xRGB15-1555 */
+        { OMAP_DSS_COLOR_ARGB16_1555, DRM_FORMAT_ARGB1555, {{2, 1}}, false }, /* ARGB16-1555 */
+        /* 24bpp RGB: */
+        { OMAP_DSS_COLOR_RGB24P,      DRM_FORMAT_RGB888,   {{3, 1}}, false }, /* RGB24-888 */
+        /* 32bpp [A]RGB: */
+        { OMAP_DSS_COLOR_RGBX32,      DRM_FORMAT_RGBX8888, {{4, 1}}, false }, /* RGBx24-8888 */
+        { OMAP_DSS_COLOR_RGB24U,      DRM_FORMAT_XRGB8888, {{4, 1}}, false }, /* xRGB24-8888 */
+        { OMAP_DSS_COLOR_RGBA32,      DRM_FORMAT_RGBA8888, {{4, 1}}, false }, /* RGBA32-8888 */
+        { OMAP_DSS_COLOR_ARGB32,      DRM_FORMAT_ARGB8888, {{4, 1}}, false }, /* ARGB32-8888 */
+        /* YUV: */
+        { OMAP_DSS_COLOR_NV12,        DRM_FORMAT_NV12,     {{1, 1}, {1, 2}}, true },
+        { OMAP_DSS_COLOR_YUV2,        DRM_FORMAT_YUYV,     {{2, 1}}, true },
+        { OMAP_DSS_COLOR_UYVY,        DRM_FORMAT_UYVY,     {{2, 1}}, true },
+};
+
+/* per-plane info for the fb: */
+struct plane {
+        struct drm_gem_object *bo;
+        uint32_t pitch;
+        uint32_t offset;
+        dma_addr_t paddr;
+};
+
 #define to_omap_framebuffer(x) container_of(x, struct omap_framebuffer, base)
 
 struct omap_framebuffer {
         struct drm_framebuffer base;
-        struct drm_gem_object *bo;
-        int size;
-        dma_addr_t paddr;
+        const struct format *format;
+        struct plane planes[4];
 };
 
 static int omap_framebuffer_create_handle(struct drm_framebuffer *fb,
@@ -41,22 +80,23 @@ static int omap_framebuffer_create_handle(struct drm_framebuffer *fb,
                 unsigned int *handle)
 {
         struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
-    return drm_gem_handle_create(file_priv, omap_fb->bo, handle);
+        return drm_gem_handle_create(file_priv,
+                        omap_fb->planes[0].bo, handle);
 }
 
 static void omap_framebuffer_destroy(struct drm_framebuffer *fb)
 {
-        struct drm_device *dev = fb->dev;
         struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
+        int i, n = drm_format_num_planes(omap_fb->format->pixel_format);
 
         DBG("destroy: FB ID: %d (%p)", fb->base.id, fb);
 
         drm_framebuffer_cleanup(fb);
 
-        if (omap_fb->bo) {
-                if (omap_fb->paddr && omap_gem_put_paddr(omap_fb->bo))
-                        dev_err(dev->dev, "could not unmap!\n");
-                drm_gem_object_unreference_unlocked(omap_fb->bo);
+        for (i = 0; i < n; i++) {
+                struct plane *plane = &omap_fb->planes[i];
+                if (plane->bo)
+                        drm_gem_object_unreference_unlocked(plane->bo);
         }
 
         kfree(omap_fb);
@@ -83,37 +123,76 @@ static const struct drm_framebuffer_funcs omap_framebuffer_funcs = {
         .dirty = omap_framebuffer_dirty,
 };
 
-/* returns the buffer size */
-int omap_framebuffer_get_buffer(struct drm_framebuffer *fb, int x, int y,
-                void **vaddr, dma_addr_t *paddr, unsigned int *screen_width)
+/* pins buffer in preparation for scanout */
+int omap_framebuffer_pin(struct drm_framebuffer *fb)
 {
         struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
-        int bpp = fb->bits_per_pixel / 8;
-        unsigned long offset;
+        int ret, i, n = drm_format_num_planes(omap_fb->format->pixel_format);
 
-        offset = (x * bpp) + (y * fb->pitch);
+        for (i = 0; i < n; i++) {
+                struct plane *plane = &omap_fb->planes[i];
+                ret = omap_gem_get_paddr(plane->bo, &plane->paddr, true);
+                if (ret)
+                        goto fail;
+        }
 
-        if (vaddr) {
-                void *bo_vaddr = omap_gem_vaddr(omap_fb->bo);
-                /* note: we can only count on having a vaddr for buffers that
-                 * are allocated physically contiguously to begin with (ie.
-                 * dma_alloc_coherent()).  But this should be ok because it
-                 * is only used by legacy fbdev
-                 */
-                BUG_ON(IS_ERR_OR_NULL(bo_vaddr));
-                *vaddr = bo_vaddr + offset;
+        return 0;
+
+fail:
+        while (--i > 0) {
+                struct plane *plane = &omap_fb->planes[i];
+                omap_gem_put_paddr(plane->bo);
         }
+        return ret;
+}
 
-        *paddr = omap_fb->paddr + offset;
-        *screen_width = fb->pitch / bpp;
+/* releases buffer when done with scanout */
+void omap_framebuffer_unpin(struct drm_framebuffer *fb)
+{
+        struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
+        int i, n = drm_format_num_planes(omap_fb->format->pixel_format);
 
-        return omap_fb->size - offset;
+        for (i = 0; i < n; i++) {
+                struct plane *plane = &omap_fb->planes[i];
+                omap_gem_put_paddr(plane->bo);
+        }
 }
 
-struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb)
+/* update ovl info for scanout, handles cases of multi-planar fb's, etc.
+ */
+void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, int x, int y,
+                struct omap_overlay_info *info)
 {
         struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
-        return omap_fb->bo;
+        const struct format *format = omap_fb->format;
+        struct plane *plane = &omap_fb->planes[0];
+        unsigned int offset;
+
+        offset = plane->offset +
+                        (x * format->planes[0].stride_bpp) +
+                        (y * plane->pitch / format->planes[0].sub_y);
+
+        info->color_mode   = format->dss_format;
+        info->paddr        = plane->paddr + offset;
+        info->screen_width = plane->pitch / format->planes[0].stride_bpp;
+
+        if (format->dss_format == OMAP_DSS_COLOR_NV12) {
+                plane = &omap_fb->planes[1];
+                offset = plane->offset +
+                                (x * format->planes[1].stride_bpp) +
+                                (y * plane->pitch / format->planes[1].sub_y);
+                info->p_uv_addr = plane->paddr + offset;
+        } else {
+                info->p_uv_addr = 0;
+        }
+}
+
+struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p)
+{
+        struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
+        if (p >= drm_format_num_planes(omap_fb->format->pixel_format))
+                return NULL;
+        return omap_fb->planes[p].bo;
 }
 
 /* iterate thru all the connectors, returning ones that are attached
@@ -171,39 +250,57 @@ void omap_framebuffer_flush(struct drm_framebuffer *fb,
 }
 
 struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
-                struct drm_file *file, struct drm_mode_fb_cmd *mode_cmd)
+                struct drm_file *file, struct drm_mode_fb_cmd2 *mode_cmd)
 {
-        struct drm_gem_object *bo;
+        struct drm_gem_object *bos[4];
         struct drm_framebuffer *fb;
-        bo = drm_gem_object_lookup(dev, file, mode_cmd->handle);
-        if (!bo) {
-                return ERR_PTR(-ENOENT);
-        }
-        fb = omap_framebuffer_init(dev, mode_cmd, bo);
-        if (!fb) {
-                return ERR_PTR(-ENOMEM);
+        int ret;
+
+        ret = objects_lookup(dev, file, mode_cmd->pixel_format,
+                        bos, mode_cmd->handles);
+        if (ret)
+                return ERR_PTR(ret);
+
+        fb = omap_framebuffer_init(dev, mode_cmd, bos);
+        if (IS_ERR(fb)) {
+                int i, n = drm_format_num_planes(mode_cmd->pixel_format);
+                for (i = 0; i < n; i++)
+                        drm_gem_object_unreference_unlocked(bos[i]);
+                return fb;
         }
         return fb;
 }
 
 struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
-                struct drm_mode_fb_cmd *mode_cmd, struct drm_gem_object *bo)
+                struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos)
 {
         struct omap_framebuffer *omap_fb;
         struct drm_framebuffer *fb = NULL;
-        int size, ret;
+        const struct format *format = NULL;
+        int ret, i, n = drm_format_num_planes(mode_cmd->pixel_format);
 
-        DBG("create framebuffer: dev=%p, mode_cmd=%p (%dx%d@%d)",
+        DBG("create framebuffer: dev=%p, mode_cmd=%p (%dx%d@%4.4s)",
                         dev, mode_cmd, mode_cmd->width, mode_cmd->height,
-                        mode_cmd->bpp);
+                        (char *)&mode_cmd->pixel_format);
+
+        for (i = 0; i < ARRAY_SIZE(formats); i++) {
+                if (formats[i].pixel_format == mode_cmd->pixel_format) {
+                        format = &formats[i];
+                        break;
+                }
+        }
 
-        /* in case someone tries to feed us a completely bogus stride: */
-        mode_cmd->pitch = align_pitch(mode_cmd->pitch,
-                        mode_cmd->width, mode_cmd->bpp);
+        if (!format) {
+                dev_err(dev->dev, "unsupported pixel format: %4.4s\n",
+                                (char *)&mode_cmd->pixel_format);
+                ret = -EINVAL;
+                goto fail;
+        }
 
         omap_fb = kzalloc(sizeof(*omap_fb), GFP_KERNEL);
         if (!omap_fb) {
                 dev_err(dev->dev, "could not allocate fb\n");
+                ret = -ENOMEM;
                 goto fail;
         }
 
@@ -216,19 +313,32 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
 
         DBG("create: FB ID: %d (%p)", fb->base.id, fb);
 
-        size = PAGE_ALIGN(mode_cmd->pitch * mode_cmd->height);
+        omap_fb->format = format;
 
-        if (size > bo->size) {
-                dev_err(dev->dev, "provided buffer object is too small!\n");
-                goto fail;
-        }
+        for (i = 0; i < n; i++) {
+                struct plane *plane = &omap_fb->planes[i];
+                int size, pitch = mode_cmd->pitches[i];
+
+                if (pitch < (mode_cmd->width * format->planes[i].stride_bpp)) {
+                        dev_err(dev->dev, "provided buffer pitch is too small! %d < %d\n",
+                                        pitch, mode_cmd->width * format->planes[i].stride_bpp);
+                        ret = -EINVAL;
+                        goto fail;
+                }
 
-        omap_fb->bo = bo;
-        omap_fb->size = size;
+                size = pitch * mode_cmd->height / format->planes[i].sub_y;
 
-        if (omap_gem_get_paddr(bo, &omap_fb->paddr, true)) {
-                dev_err(dev->dev, "could not map (paddr)!\n");
-                goto fail;
+                if (size > (bos[i]->size - mode_cmd->offsets[i])) {
+                        dev_err(dev->dev, "provided buffer object is too small! %d < %d\n",
+                                        bos[i]->size - mode_cmd->offsets[i], size);
+                        ret = -EINVAL;
+                        goto fail;
+                }
+
+                plane->bo     = bos[i];
+                plane->offset = mode_cmd->offsets[i];
+                plane->pitch  = mode_cmd->pitches[i];
+                plane->paddr  = pitch;
         }
 
         drm_helper_mode_fill_fb_struct(fb, mode_cmd);
@@ -239,5 +349,5 @@ fail:
         if (fb) {
                 omap_framebuffer_destroy(fb);
         }
-        return NULL;
+        return ERR_PTR(ret);
 }
diff --git a/drivers/staging/omapdrm/omap_fbdev.c b/drivers/staging/omapdrm/omap_fbdev.c
index 093ae2f87b20..96940bbfc6f4 100644
--- a/drivers/staging/omapdrm/omap_fbdev.c
+++ b/drivers/staging/omapdrm/omap_fbdev.c
@@ -129,10 +129,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
         struct drm_framebuffer *fb = NULL;
         union omap_gem_size gsize;
         struct fb_info *fbi = NULL;
-        struct drm_mode_fb_cmd mode_cmd = {0};
+        struct drm_mode_fb_cmd2 mode_cmd = {0};
         dma_addr_t paddr;
-        void __iomem *vaddr;
-        int size, screen_width;
         int ret;
 
         /* only doing ARGB32 since this is what is needed to alpha-blend
@@ -145,36 +143,56 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
                         sizes->surface_height, sizes->surface_bpp,
                         sizes->fb_width, sizes->fb_height);
 
+        mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
+                        sizes->surface_depth);
+
         mode_cmd.width = sizes->surface_width;
         mode_cmd.height = sizes->surface_height;
 
-        mode_cmd.bpp = sizes->surface_bpp;
-        mode_cmd.depth = sizes->surface_depth;
-
-        mode_cmd.pitch = align_pitch(
-                        mode_cmd.width * ((mode_cmd.bpp + 7) / 8),
-                        mode_cmd.width, mode_cmd.bpp);
+        mode_cmd.pitches[0] = align_pitch(
+                        mode_cmd.width * ((sizes->surface_bpp + 7) / 8),
+                        mode_cmd.width, sizes->surface_bpp);
 
         fbdev->ywrap_enabled = priv->has_dmm && ywrap_enabled;
         if (fbdev->ywrap_enabled) {
                 /* need to align pitch to page size if using DMM scrolling */
-                mode_cmd.pitch = ALIGN(mode_cmd.pitch, PAGE_SIZE);
+                mode_cmd.pitches[0] = ALIGN(mode_cmd.pitches[0], PAGE_SIZE);
         }
 
         /* allocate backing bo */
         gsize = (union omap_gem_size){
-                .bytes = PAGE_ALIGN(mode_cmd.pitch * mode_cmd.height),
+                .bytes = PAGE_ALIGN(mode_cmd.pitches[0] * mode_cmd.height),
         };
         DBG("allocating %d bytes for fb %d", gsize.bytes, dev->primary->index);
         fbdev->bo = omap_gem_new(dev, gsize, OMAP_BO_SCANOUT | OMAP_BO_WC);
         if (!fbdev->bo) {
                 dev_err(dev->dev, "failed to allocate buffer object\n");
+                ret = -ENOMEM;
                 goto fail;
         }
 
-        fb = omap_framebuffer_init(dev, &mode_cmd, fbdev->bo);
-        if (!fb) {
+        fb = omap_framebuffer_init(dev, &mode_cmd, &fbdev->bo);
+        if (IS_ERR(fb)) {
                 dev_err(dev->dev, "failed to allocate fb\n");
+                /* note: if fb creation failed, we can't rely on fb destroy
+                 * to unref the bo:
+                 */
+                drm_gem_object_unreference(fbdev->bo);
+                ret = PTR_ERR(fb);
+                goto fail;
+        }
+
+        /* note: this keeps the bo pinned.. which is perhaps not ideal,
+         * but is needed as long as we use fb_mmap() to mmap to userspace
+         * (since this happens using fix.smem_start).  Possibly we could
+         * implement our own mmap using GEM mmap support to avoid this
+         * (non-tiled buffer doesn't need to be pinned for fbcon to write
+         * to it).  Then we just need to be sure that we are able to re-
+         * pin it in case of an opps.
+         */
+        ret = omap_gem_get_paddr(fbdev->bo, &paddr, true);
+        if (ret) {
+                dev_err(dev->dev, "could not map (paddr)!\n");
                 ret = -ENOMEM;
                 goto fail;
         }
@@ -206,18 +224,15 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
                 goto fail_unlock;
         }
 
-        drm_fb_helper_fill_fix(fbi, fb->pitch, fb->depth);
+        drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->depth);
         drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height);
 
-        size = omap_framebuffer_get_buffer(fb, 0, 0,
-                        &vaddr, &paddr, &screen_width);
-
         dev->mode_config.fb_base = paddr;
 
-        fbi->screen_base = vaddr;
-        fbi->screen_size = size;
+        fbi->screen_base = omap_gem_vaddr(fbdev->bo);
+        fbi->screen_size = fbdev->bo->size;
         fbi->fix.smem_start = paddr;
-        fbi->fix.smem_len = size;
+        fbi->fix.smem_len = fbdev->bo->size;
 
         /* if we have DMM, then we can use it for scrolling by just
          * shuffling pages around in DMM rather than doing sw blit.
@@ -362,11 +377,11 @@ void omap_fbdev_free(struct drm_device *dev)
 
         fbdev = to_omap_fbdev(priv->fbdev);
 
-        kfree(fbdev);
-
         /* this will free the backing object */
         if (fbdev->fb)
                 fbdev->fb->funcs->destroy(fbdev->fb);
 
+        kfree(fbdev);
+
         priv->fbdev = NULL;
 }
diff --git a/drivers/staging/omapdrm/omap_gem.c b/drivers/staging/omapdrm/omap_gem.c
index e0ebd1d139f6..b7d6f886c5cf 100644
--- a/drivers/staging/omapdrm/omap_gem.c
+++ b/drivers/staging/omapdrm/omap_gem.c
@@ -116,6 +116,9 @@ struct omap_gem_object {
         } *sync;
 };
 
+static int get_pages(struct drm_gem_object *obj, struct page ***pages);
+static uint64_t mmap_offset(struct drm_gem_object *obj);
+
 /* To deal with userspace mmap'ings of 2d tiled buffers, which (a) are
  * not necessarily pinned in TILER all the time, and (b) when they are
  * they are not necessarily page aligned, we reserve one or more small
@@ -149,7 +152,7 @@ static void evict_entry(struct drm_gem_object *obj,
 {
         if (obj->dev->dev_mapping) {
                 size_t size = PAGE_SIZE * usergart[fmt].height;
-                loff_t off = omap_gem_mmap_offset(obj) +
+                loff_t off = mmap_offset(obj) +
                                 (entry->obj_pgoff << PAGE_SHIFT);
                 unmap_mapping_range(obj->dev->dev_mapping, off, size, 1);
         }
@@ -189,8 +192,6 @@ static inline bool is_shmem(struct drm_gem_object *obj)
         return obj->filp != NULL;
 }
 
-static int get_pages(struct drm_gem_object *obj, struct page ***pages);
-
 static DEFINE_SPINLOCK(sync_lock);
 
 /** ensure backing pages are allocated */
@@ -251,7 +252,7 @@ static void omap_gem_detach_pages(struct drm_gem_object *obj)
 }
 
 /** get mmap offset */
-uint64_t omap_gem_mmap_offset(struct drm_gem_object *obj)
+static uint64_t mmap_offset(struct drm_gem_object *obj)
 {
         if (!obj->map_list.map) {
                 /* Make it mmapable */
@@ -267,6 +268,15 @@ uint64_t omap_gem_mmap_offset(struct drm_gem_object *obj)
         return (uint64_t)obj->map_list.hash.key << PAGE_SHIFT;
 }
 
+uint64_t omap_gem_mmap_offset(struct drm_gem_object *obj)
+{
+        uint64_t offset;
+        mutex_lock(&obj->dev->struct_mutex);
+        offset = mmap_offset(obj);
+        mutex_unlock(&obj->dev->struct_mutex);
+        return offset;
+}
+
 /** get mmap size */
 size_t omap_gem_mmap_size(struct drm_gem_object *obj)
 {
@@ -1034,6 +1044,11 @@ void omap_gem_free_object(struct drm_gem_object *obj)
                 drm_gem_free_mmap_offset(obj);
         }
 
+        /* this means the object is still pinned.. which really should
+         * not happen.  I think..
+         */
+        WARN_ON(omap_obj->paddr_cnt > 0);
+
         /* don't free externally allocated backing memory */
         if (!(omap_obj->flags & OMAP_BO_EXT_MEM)) {
                 if (omap_obj->pages) {
diff --git a/drivers/staging/omapdrm/omap_plane.c b/drivers/staging/omapdrm/omap_plane.c
new file mode 100644
index 000000000000..97909124a1fe
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_plane.c
@@ -0,0 +1,344 @@
+/*
+ * drivers/staging/omapdrm/omap_plane.c
+ *
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Rob Clark <rob.clark@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "omap_drv.h"
+
+/* some hackery because omapdss has an 'enum omap_plane' (which would be
+ * better named omap_plane_id).. and compiler seems unhappy about having
+ * both a 'struct omap_plane' and 'enum omap_plane'
+ */
+#define omap_plane _omap_plane
+
+/*
+ * plane funcs
+ */
+
+#define to_omap_plane(x) container_of(x, struct omap_plane, base)
+
+struct omap_plane {
+        struct drm_plane base;
+        struct omap_overlay *ovl;
+        struct omap_overlay_info info;
+
+        /* Source values, converted to integers because we don't support
+         * fractional positions:
+         */
+        unsigned int src_x, src_y;
+
+        /* last fb that we pinned: */
+        struct drm_framebuffer *pinned_fb;
+};
+
+
+/* push changes down to dss2 */
+static int commit(struct drm_plane *plane)
+{
+        struct drm_device *dev = plane->dev;
+        struct omap_plane *omap_plane = to_omap_plane(plane);
+        struct omap_overlay *ovl = omap_plane->ovl;
+        struct omap_overlay_info *info = &omap_plane->info;
+        int ret;
+
+        DBG("%s", ovl->name);
+        DBG("%dx%d -> %dx%d (%d)", info->width, info->height, info->out_width,
+                        info->out_height, info->screen_width);
+        DBG("%d,%d %08x %08x", info->pos_x, info->pos_y,
+                        info->paddr, info->p_uv_addr);
+
+        /* NOTE: do we want to do this at all here, or just wait
+         * for dpms(ON) since other CRTC's may not have their mode
+         * set yet, so fb dimensions may still change..
+         */
+        ret = ovl->set_overlay_info(ovl, info);
+        if (ret) {
+                dev_err(dev->dev, "could not set overlay info\n");
+                return ret;
+        }
+
+        /* our encoder doesn't necessarily get a commit() after this, in
+         * particular in the dpms() and mode_set_base() cases, so force the
+         * manager to update:
+         *
+         * could this be in the encoder somehow?
+         */
+        if (ovl->manager) {
+                ret = ovl->manager->apply(ovl->manager);
+                if (ret) {
+                        dev_err(dev->dev, "could not apply settings\n");
+                        return ret;
+                }
+        }
+
+        if (ovl->is_enabled(ovl)) {
+                omap_framebuffer_flush(plane->fb, info->pos_x, info->pos_y,
+                                info->out_width, info->out_height);
+        }
+
+        return 0;
+}
+
+/* when CRTC that we are attached to has potentially changed, this checks
+ * if we are attached to proper manager, and if necessary updates.
+ */
+static void update_manager(struct drm_plane *plane)
+{
+        struct omap_drm_private *priv = plane->dev->dev_private;
+        struct omap_plane *omap_plane = to_omap_plane(plane);
+        struct omap_overlay *ovl = omap_plane->ovl;
+        struct omap_overlay_manager *mgr = NULL;
+        int i;
+
+        if (plane->crtc) {
+                for (i = 0; i < priv->num_encoders; i++) {
+                        struct drm_encoder *encoder = priv->encoders[i];
+                        if (encoder->crtc == plane->crtc) {
+                                mgr = omap_encoder_get_manager(encoder);
+                                break;
+                        }
+                }
+        }
+
+        if (ovl->manager != mgr) {
+                bool enabled = ovl->is_enabled(ovl);
+
+                /* don't switch things around with enabled overlays: */
+                if (enabled)
+                        omap_plane_dpms(plane, DRM_MODE_DPMS_OFF);
+
+                if (ovl->manager) {
+                        DBG("disconnecting %s from %s", ovl->name,
+                                        ovl->manager->name);
+                        ovl->unset_manager(ovl);
+                }
+
+                if (mgr) {
+                        DBG("connecting %s to %s", ovl->name, mgr->name);
+                        ovl->set_manager(ovl, mgr);
+                }
+
+                if (enabled && mgr)
+                        omap_plane_dpms(plane, DRM_MODE_DPMS_ON);
+        }
+}
+
+/* update which fb (if any) is pinned for scanout */
+static int update_pin(struct drm_plane *plane, struct drm_framebuffer *fb)
+{
+        struct omap_plane *omap_plane = to_omap_plane(plane);
+        int ret = 0;
+
+        if (omap_plane->pinned_fb != fb) {
+                if (omap_plane->pinned_fb)
+                        omap_framebuffer_unpin(omap_plane->pinned_fb);
+                omap_plane->pinned_fb = fb;
+                if (fb)
+                        ret = omap_framebuffer_pin(fb);
+        }
+
+        return ret;
+}
+
+/* update parameters that are dependent on the framebuffer dimensions and
+ * position within the fb that this plane scans out from. This is called
+ * when framebuffer or x,y base may have changed.
+ */
+static void update_scanout(struct drm_plane *plane)
+{
+        struct omap_plane *omap_plane = to_omap_plane(plane);
+        struct omap_overlay_info *info = &omap_plane->info;
+        int ret;
+
+        ret = update_pin(plane, plane->fb);
+        if (ret) {
+                dev_err(plane->dev->dev,
+                        "could not pin fb: %d\n", ret);
+                omap_plane_dpms(plane, DRM_MODE_DPMS_OFF);
+                return;
+        }
+
+        omap_framebuffer_update_scanout(plane->fb,
+                        omap_plane->src_x, omap_plane->src_y, info);
+
+        DBG("%s: %d,%d: %08x %08x (%d)", omap_plane->ovl->name,
+                        omap_plane->src_x, omap_plane->src_y,
+                        (u32)info->paddr, (u32)info->p_uv_addr,
+                        info->screen_width);
+}
+
+int omap_plane_mode_set(struct drm_plane *plane,
+                struct drm_crtc *crtc, struct drm_framebuffer *fb,
+                int crtc_x, int crtc_y,
+                unsigned int crtc_w, unsigned int crtc_h,
+                uint32_t src_x, uint32_t src_y,
+                uint32_t src_w, uint32_t src_h)
+{
+        struct omap_plane *omap_plane = to_omap_plane(plane);
+
+        /* src values are in Q16 fixed point, convert to integer: */
+        src_x = src_x >> 16;
+        src_y = src_y >> 16;
+        src_w = src_w >> 16;
+        src_h = src_h >> 16;
+
+        omap_plane->info.pos_x = crtc_x;
+        omap_plane->info.pos_y = crtc_y;
+        omap_plane->info.out_width = crtc_w;
+        omap_plane->info.out_height = crtc_h;
+        omap_plane->info.width = src_w;
+        omap_plane->info.height = src_h;
+        omap_plane->src_x = src_x;
+        omap_plane->src_y = src_y;
+
+        /* note: this is done after this fxn returns.. but if we need
+         * to do a commit/update_scanout, etc before this returns we
+         * need the current value.
+         */
+        plane->fb = fb;
+        plane->crtc = crtc;
+
+        update_scanout(plane);
+        update_manager(plane);
+
+        return 0;
+}
+
+static int omap_plane_update(struct drm_plane *plane,
+                struct drm_crtc *crtc, struct drm_framebuffer *fb,
+                int crtc_x, int crtc_y,
+                unsigned int crtc_w, unsigned int crtc_h,
+                uint32_t src_x, uint32_t src_y,
+                uint32_t src_w, uint32_t src_h)
+{
+        omap_plane_mode_set(plane, crtc, fb, crtc_x, crtc_y, crtc_w, crtc_h,
+                        src_x, src_y, src_w, src_h);
+        return omap_plane_dpms(plane, DRM_MODE_DPMS_ON);
+}
+
+static int omap_plane_disable(struct drm_plane *plane)
+{
+        return omap_plane_dpms(plane, DRM_MODE_DPMS_OFF);
+}
+
+static void omap_plane_destroy(struct drm_plane *plane)
+{
+        struct omap_plane *omap_plane = to_omap_plane(plane);
+        DBG("%s", omap_plane->ovl->name);
+        omap_plane_disable(plane);
+        drm_plane_cleanup(plane);
+        kfree(omap_plane);
+}
+
+int omap_plane_dpms(struct drm_plane *plane, int mode)
+{
+        struct omap_plane *omap_plane = to_omap_plane(plane);
+        struct omap_overlay *ovl = omap_plane->ovl;
+        int r;
+
+        DBG("%s: %d", omap_plane->ovl->name, mode);
+
+        if (mode == DRM_MODE_DPMS_ON) {
+                update_scanout(plane);
+                r = commit(plane);
+                if (!r)
+                        r = ovl->enable(ovl);
+        } else {
+                r = ovl->disable(ovl);
+                update_pin(plane, NULL);
+        }
+
+        return r;
+}
+
+static const struct drm_plane_funcs omap_plane_funcs = {
+                .update_plane = omap_plane_update,
+                .disable_plane = omap_plane_disable,
+                .destroy = omap_plane_destroy,
+};
+
+static const uint32_t formats[] = {
+                DRM_FORMAT_RGB565,
+                DRM_FORMAT_RGBX4444,
+                DRM_FORMAT_XRGB4444,
+                DRM_FORMAT_RGBA4444,
+                DRM_FORMAT_ABGR4444,
+                DRM_FORMAT_XRGB1555,
+                DRM_FORMAT_ARGB1555,
+                DRM_FORMAT_RGB888,
+                DRM_FORMAT_RGBX8888,
+                DRM_FORMAT_XRGB8888,
+                DRM_FORMAT_RGBA8888,
+                DRM_FORMAT_ARGB8888,
+                DRM_FORMAT_NV12,
+                DRM_FORMAT_YUYV,
+                DRM_FORMAT_UYVY,
+};
+
+/* initialize plane */
+struct drm_plane *omap_plane_init(struct drm_device *dev,
+                struct omap_overlay *ovl, unsigned int possible_crtcs,
+                bool priv)
+{
+        struct drm_plane *plane = NULL;
+        struct omap_plane *omap_plane;
+
+        DBG("%s: possible_crtcs=%08x, priv=%d", ovl->name,
+                        possible_crtcs, priv);
+
+        omap_plane = kzalloc(sizeof(*omap_plane), GFP_KERNEL);
+        if (!omap_plane) {
+                dev_err(dev->dev, "could not allocate plane\n");
+                goto fail;
+        }
+
+        omap_plane->ovl = ovl;
+        plane = &omap_plane->base;
+
+        drm_plane_init(dev, plane, possible_crtcs, &omap_plane_funcs,
+                        formats, ARRAY_SIZE(formats), priv);
+
+        /* get our starting configuration, set defaults for parameters
+         * we don't currently use, etc:
+         */
+        ovl->get_overlay_info(ovl, &omap_plane->info);
+        omap_plane->info.rotation_type = OMAP_DSS_ROT_DMA;
+        omap_plane->info.rotation = OMAP_DSS_ROT_0;
+        omap_plane->info.global_alpha = 0xff;
+        omap_plane->info.mirror = 0;
+        omap_plane->info.mirror = 0;
+
+        /* Set defaults depending on whether we are a CRTC or overlay
+         * layer.
+         * TODO add ioctl to give userspace an API to change this.. this
+         * will come in a subsequent patch.
+         */
+        if (priv)
+                omap_plane->info.zorder = 0;
+        else
+                omap_plane->info.zorder = 1;
+
+        update_manager(plane);
+
+        return plane;
+
+fail:
+        if (plane) {
+                omap_plane_destroy(plane);
+        }
+        return NULL;
+}
diff --git a/drivers/staging/omapdrm/omap_priv.h b/drivers/staging/omapdrm/omap_priv.h
index c324709aa9a1..ef6441447147 100644
--- a/drivers/staging/omapdrm/omap_priv.h
+++ b/drivers/staging/omapdrm/omap_priv.h
@@ -27,14 +27,22 @@
  * pipes/overlays/CRTCs are used.. if this is not provided, then instead the
  * first CONFIG_DRM_OMAP_NUM_CRTCS are used, and they are each connected to
  * one manager, with priority given to managers that are connected to
- * detected devices.  This should be a good default behavior for most cases,
- * but yet there still might be times when you wish to do something different.
+ * detected devices.  Remaining overlays are used as video planes.  This
+ * should be a good default behavior for most cases, but yet there still
+ * might be times when you wish to do something different.
  */
 struct omap_kms_platform_data {
+        /* overlays to use as CRTCs: */
         int ovl_cnt;
         const int *ovl_ids;
+
+        /* overlays to use as video planes: */
+        int pln_cnt;
+        const int *pln_ids;
+
         int mgr_cnt;
         const int *mgr_ids;
+
         int dev_cnt;
         const char **dev_names;
 };
diff --git a/drivers/staging/pohmelfs/Kconfig b/drivers/staging/pohmelfs/Kconfig
deleted file mode 100644
index 8d53b1a1e715..000000000000
--- a/drivers/staging/pohmelfs/Kconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-config POHMELFS
-        tristate "POHMELFS filesystem support"
-        depends on NET
-        select CONNECTOR
-        select CRYPTO
-        select CRYPTO_BLKCIPHER
-        select CRYPTO_HMAC
-        help
-          POHMELFS stands for Parallel Optimized Host Message Exchange Layered
-          File System.  This is a network filesystem which supports coherent
-          caching of data and metadata on clients.
-
-config POHMELFS_DEBUG
-        bool "POHMELFS debugging"
-        depends on POHMELFS
-        default n
-        help
-          Turns on excessive POHMELFS debugging facilities.
-          You usually do not want to slow things down noticeably and get really
-          lots of kernel messages in syslog.
diff --git a/drivers/staging/pohmelfs/Makefile b/drivers/staging/pohmelfs/Makefile
deleted file mode 100644
index 196561ca26bc..000000000000
--- a/drivers/staging/pohmelfs/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_POHMELFS)  += pohmelfs.o
-
-pohmelfs-y := inode.o config.o dir.o net.o path_entry.o trans.o crypto.o lock.o mcache.o
diff --git a/drivers/staging/pohmelfs/config.c b/drivers/staging/pohmelfs/config.c
deleted file mode 100644
index b6c42cb0d1c6..000000000000
--- a/drivers/staging/pohmelfs/config.c
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
- * 2007+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
- * All rights reserved.
- *
- * 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/connector.h>
-#include <linux/crypto.h>
-#include <linux/list.h>
-#include <linux/mutex.h>
-#include <linux/string.h>
-#include <linux/in.h>
-#include <linux/slab.h>
-
-#include "netfs.h"
-
-/*
- * Global configuration list.
- * Each client can be asked to get one of them.
- *
- * Allows to provide remote server address (ipv4/v6/whatever), port
- * and so on via kernel connector.
- */
-
-static struct cb_id pohmelfs_cn_id = {.idx = POHMELFS_CN_IDX, .val = POHMELFS_CN_VAL};
-static LIST_HEAD(pohmelfs_config_list);
-static DEFINE_MUTEX(pohmelfs_config_lock);
-
-static inline int pohmelfs_config_eql(struct pohmelfs_ctl *sc, struct pohmelfs_ctl *ctl)
-{
-        if (sc->idx == ctl->idx && sc->type == ctl->type &&
-                        sc->proto == ctl->proto &&
-                        sc->addrlen == ctl->addrlen &&
-                        !memcmp(&sc->addr, &ctl->addr, ctl->addrlen))
-                return 1;
-
-        return 0;
-}
-
-static struct pohmelfs_config_group *pohmelfs_find_config_group(unsigned int idx)
-{
-        struct pohmelfs_config_group *g, *group = NULL;
-
-        list_for_each_entry(g, &pohmelfs_config_list, group_entry) {
-                if (g->idx == idx) {
-                        group = g;
-                        break;
-                }
-        }
-
-        return group;
-}
-
-static struct pohmelfs_config_group *pohmelfs_find_create_config_group(unsigned int idx)
-{
-        struct pohmelfs_config_group *g;
-
-        g = pohmelfs_find_config_group(idx);
-        if (g)
-                return g;
-
-        g = kzalloc(sizeof(struct pohmelfs_config_group), GFP_KERNEL);
-        if (!g)
-                return NULL;
-
-        INIT_LIST_HEAD(&g->config_list);
-        g->idx = idx;
-        g->num_entry = 0;
-
-        list_add_tail(&g->group_entry, &pohmelfs_config_list);
-
-        return g;
-}
-
-static inline void pohmelfs_insert_config_entry(struct pohmelfs_sb *psb, struct pohmelfs_config *dst)
-{
-        struct pohmelfs_config *tmp;
-
-        INIT_LIST_HEAD(&dst->config_entry);
-
-        list_for_each_entry(tmp, &psb->state_list, config_entry) {
-                if (dst->state.ctl.prio > tmp->state.ctl.prio)
-                        list_add_tail(&dst->config_entry, &tmp->config_entry);
-        }
-        if (list_empty(&dst->config_entry))
-                list_add_tail(&dst->config_entry, &psb->state_list);
-}
-
-static int pohmelfs_move_config_entry(struct pohmelfs_sb *psb,
-                struct pohmelfs_config *dst, struct pohmelfs_config *new)
-{
-        if ((dst->state.ctl.prio == new->state.ctl.prio) &&
-                (dst->state.ctl.perm == new->state.ctl.perm))
-                return 0;
-
-        dprintk("%s: dst: prio: %d, perm: %x, new: prio: %d, perm: %d.\n",
-                        __func__, dst->state.ctl.prio, dst->state.ctl.perm,
-                        new->state.ctl.prio, new->state.ctl.perm);
-        dst->state.ctl.prio = new->state.ctl.prio;
-        dst->state.ctl.perm = new->state.ctl.perm;
-
-        list_del_init(&dst->config_entry);
-        pohmelfs_insert_config_entry(psb, dst);
-        return 0;
-}
-
-/*
- * pohmelfs_copy_config() is used to copy new state configs from the
- * config group (controlled by the netlink messages) into the superblock.
- * This happens either at startup time where no transactions can access
- * the list of the configs (and thus list of the network states), or at
- * run-time, where it is protected by the psb->state_lock.
- */
-int pohmelfs_copy_config(struct pohmelfs_sb *psb)
-{
-        struct pohmelfs_config_group *g;
-        struct pohmelfs_config *c, *dst;
-        int err = -ENODEV;
-
-        mutex_lock(&pohmelfs_config_lock);
-
-        g = pohmelfs_find_config_group(psb->idx);
-        if (!g)
-                goto out_unlock;
-
-        /*
-         * Run over all entries in given config group and try to create and
-         * initialize those, which do not exist in superblock list.
-         * Skip all existing entries.
-         */
-
-        list_for_each_entry(c, &g->config_list, config_entry) {
-                err = 0;
-                list_for_each_entry(dst, &psb->state_list, config_entry) {
-                        if (pohmelfs_config_eql(&dst->state.ctl, &c->state.ctl)) {
-                                err = pohmelfs_move_config_entry(psb, dst, c);
-                                if (!err)
-                                        err = -EEXIST;
-                                break;
-                        }
-                }
-
-                if (err)
-                        continue;
-
-                dst = kzalloc(sizeof(struct pohmelfs_config), GFP_KERNEL);
-                if (!dst) {
-                        err = -ENOMEM;
-                        break;
-                }
-
-                memcpy(&dst->state.ctl, &c->state.ctl, sizeof(struct pohmelfs_ctl));
-
-                pohmelfs_insert_config_entry(psb, dst);
-
-                err = pohmelfs_state_init_one(psb, dst);
-                if (err) {
-                        list_del(&dst->config_entry);
-                        kfree(dst);
-                }
-
-                err = 0;
-        }
-
-out_unlock:
-        mutex_unlock(&pohmelfs_config_lock);
-
-        return err;
-}
-
-int pohmelfs_copy_crypto(struct pohmelfs_sb *psb)
-{
-        struct pohmelfs_config_group *g;
-        int err = -ENOENT;
-
-        mutex_lock(&pohmelfs_config_lock);
-        g = pohmelfs_find_config_group(psb->idx);
-        if (!g)
-                goto err_out_exit;
-
-        if (g->hash_string) {
-                err = -ENOMEM;
-                psb->hash_string = kstrdup(g->hash_string, GFP_KERNEL);
-                if (!psb->hash_string)
-                        goto err_out_exit;
-                psb->hash_strlen = g->hash_strlen;
-        }
-
-        if (g->cipher_string) {
-                psb->cipher_string = kstrdup(g->cipher_string, GFP_KERNEL);
-                if (!psb->cipher_string)
-                        goto err_out_free_hash_string;
-                psb->cipher_strlen = g->cipher_strlen;
-        }
-
-        if (g->hash_keysize) {
-                psb->hash_key = kmemdup(g->hash_key, g->hash_keysize,
-                                        GFP_KERNEL);
-                if (!psb->hash_key)
-                        goto err_out_free_cipher_string;
-                psb->hash_keysize = g->hash_keysize;
-        }
-
-        if (g->cipher_keysize) {
-                psb->cipher_key = kmemdup(g->cipher_key, g->cipher_keysize,
-                                          GFP_KERNEL);
-                if (!psb->cipher_key)
-                        goto err_out_free_hash;
-                psb->cipher_keysize = g->cipher_keysize;
-        }
-
-        mutex_unlock(&pohmelfs_config_lock);
-
-        return 0;
-
-err_out_free_hash:
-        kfree(psb->hash_key);
-err_out_free_cipher_string:
-        kfree(psb->cipher_string);
-err_out_free_hash_string:
-        kfree(psb->hash_string);
-err_out_exit:
-        mutex_unlock(&pohmelfs_config_lock);
-        return err;
-}
-
-static int pohmelfs_send_reply(int err, int msg_num, int action, struct cn_msg *msg, struct pohmelfs_ctl *ctl)
-{
-        struct pohmelfs_cn_ack *ack;
-
-        ack = kzalloc(sizeof(struct pohmelfs_cn_ack), GFP_KERNEL);
-        if (!ack)
-                return -ENOMEM;
-
-        memcpy(&ack->msg, msg, sizeof(struct cn_msg));
-
-        if (action == POHMELFS_CTLINFO_ACK)
-                memcpy(&ack->ctl, ctl, sizeof(struct pohmelfs_ctl));
-
-        ack->msg.len = sizeof(struct pohmelfs_cn_ack) - sizeof(struct cn_msg);
-        ack->msg.ack = msg->ack + 1;
-        ack->error = err;
-        ack->msg_num = msg_num;
-
-        cn_netlink_send(&ack->msg, 0, GFP_KERNEL);
-        kfree(ack);
-        return 0;
-}
-
-static int pohmelfs_cn_disp(struct cn_msg *msg)
-{
-        struct pohmelfs_config_group *g;
-        struct pohmelfs_ctl *ctl = (struct pohmelfs_ctl *)msg->data;
-        struct pohmelfs_config *c, *tmp;
-        int err = 0, i = 1;
-
-        if (msg->len != sizeof(struct pohmelfs_ctl))
-                return -EBADMSG;
-
-        mutex_lock(&pohmelfs_config_lock);
-
-        g = pohmelfs_find_config_group(ctl->idx);
-        if (!g) {
-                pohmelfs_send_reply(err, 0, POHMELFS_NOINFO_ACK, msg, NULL);
-                goto out_unlock;
-        }
-
-        list_for_each_entry_safe(c, tmp, &g->config_list, config_entry) {
-                struct pohmelfs_ctl *sc = &c->state.ctl;
-                if (pohmelfs_send_reply(err, g->num_entry - i, POHMELFS_CTLINFO_ACK, msg, sc)) {
-                        err = -ENOMEM;
-                        goto out_unlock;
-                }
-                i += 1;
-        }
-
- out_unlock:
-        mutex_unlock(&pohmelfs_config_lock);
-        return err;
-}
-
-static int pohmelfs_cn_dump(struct cn_msg *msg)
-{
-        struct pohmelfs_config_group *g;
-        struct pohmelfs_config *c, *tmp;
-        int err = 0, i = 1;
-        int total_msg = 0;
-
-        if (msg->len != sizeof(struct pohmelfs_ctl))
-                return -EBADMSG;
-
-        mutex_lock(&pohmelfs_config_lock);
-
-        list_for_each_entry(g, &pohmelfs_config_list, group_entry)
-                total_msg += g->num_entry;
-        if (total_msg == 0) {
-                if (pohmelfs_send_reply(err, 0, POHMELFS_NOINFO_ACK, msg, NULL))
-                        err = -ENOMEM;
-                goto out_unlock;
-        }
-
-        list_for_each_entry(g, &pohmelfs_config_list, group_entry) {
-                list_for_each_entry_safe(c, tmp, &g->config_list,
-                                         config_entry) {
-                        struct pohmelfs_ctl *sc = &c->state.ctl;
-                        if (pohmelfs_send_reply(err, total_msg - i,
-                                                POHMELFS_CTLINFO_ACK, msg,
-                                                sc)) {
-                                err = -ENOMEM;
-                                goto out_unlock;
-                        }
-                        i += 1;
-                }
-        }
-
-out_unlock:
-        mutex_unlock(&pohmelfs_config_lock);
-        return err;
-}
-
-static int pohmelfs_cn_flush(struct cn_msg *msg)
-{
-        struct pohmelfs_config_group *g;
-        struct pohmelfs_ctl *ctl = (struct pohmelfs_ctl *)msg->data;
-        struct pohmelfs_config *c, *tmp;
-        int err = 0;
-
-        if (msg->len != sizeof(struct pohmelfs_ctl))
-                return -EBADMSG;
-
-        mutex_lock(&pohmelfs_config_lock);
-
-        if (ctl->idx != POHMELFS_NULL_IDX) {
-                g = pohmelfs_find_config_group(ctl->idx);
-
-                if (!g)
-                        goto out_unlock;
-
-                list_for_each_entry_safe(c, tmp, &g->config_list, config_entry) {
-                        list_del(&c->config_entry);
-                        g->num_entry--;
-                        kfree(c);
-                }
-        } else {
-                list_for_each_entry(g, &pohmelfs_config_list, group_entry) {
-                        list_for_each_entry_safe(c, tmp, &g->config_list,
-                                                 config_entry) {
-                                list_del(&c->config_entry);
-                                g->num_entry--;
-                                kfree(c);
-                        }
-                }
-        }
-
-out_unlock:
-        mutex_unlock(&pohmelfs_config_lock);
-        pohmelfs_cn_dump(msg);
-
-        return err;
-}
-
-static int pohmelfs_modify_config(struct pohmelfs_ctl *old, struct pohmelfs_ctl *new)
-{
-        old->perm = new->perm;
-        old->prio = new->prio;
-        return 0;
-}
-
-static int pohmelfs_cn_ctl(struct cn_msg *msg, int action)
-{
-        struct pohmelfs_config_group *g;
-        struct pohmelfs_ctl *ctl = (struct pohmelfs_ctl *)msg->data;
-        struct pohmelfs_config *c, *tmp;
-        int err = 0;
-
-        if (msg->len != sizeof(struct pohmelfs_ctl))
-                return -EBADMSG;
-
-        mutex_lock(&pohmelfs_config_lock);
-
-        g = pohmelfs_find_create_config_group(ctl->idx);
-        if (!g) {
-                err = -ENOMEM;
-                goto out_unlock;
-        }
-
-        list_for_each_entry_safe(c, tmp, &g->config_list, config_entry) {
-                struct pohmelfs_ctl *sc = &c->state.ctl;
-
-                if (pohmelfs_config_eql(sc, ctl)) {
-                        if (action == POHMELFS_FLAGS_ADD) {
-                                err = -EEXIST;
-                                goto out_unlock;
-                        } else if (action == POHMELFS_FLAGS_DEL) {
-                                list_del(&c->config_entry);
-                                g->num_entry--;
-                                kfree(c);
-                                goto out_unlock;
-                        } else if (action == POHMELFS_FLAGS_MODIFY) {
-                                err = pohmelfs_modify_config(sc, ctl);
-                                goto out_unlock;
-                        } else {
-                                err = -EEXIST;
-                                goto out_unlock;
-                        }
-                }
-        }
-        if (action == POHMELFS_FLAGS_DEL) {
-                err = -EBADMSG;
-                goto out_unlock;
-        }
-
-        c = kzalloc(sizeof(struct pohmelfs_config), GFP_KERNEL);
-        if (!c) {
-                err = -ENOMEM;
-                goto out_unlock;
-        }
-        memcpy(&c->state.ctl, ctl, sizeof(struct pohmelfs_ctl));
-        g->num_entry++;
-
-        list_add_tail(&c->config_entry, &g->config_list);
-
- out_unlock:
-        mutex_unlock(&pohmelfs_config_lock);
-        if (pohmelfs_send_reply(err, 0, POHMELFS_NOINFO_ACK, msg, NULL))
-                err = -ENOMEM;
-
-        return err;
-}
-
-static int pohmelfs_crypto_hash_init(struct pohmelfs_config_group *g, struct pohmelfs_crypto *c)
-{
-        char *algo = (char *)c->data;
-        u8 *key = (u8 *)(algo + c->strlen);
-
-        if (g->hash_string)
-                return -EEXIST;
-
-        g->hash_string = kstrdup(algo, GFP_KERNEL);
-        if (!g->hash_string)
-                return -ENOMEM;
-        g->hash_strlen = c->strlen;
-        g->hash_keysize = c->keysize;
-
-        g->hash_key = kmemdup(key, c->keysize, GFP_KERNEL);
-        if (!g->hash_key) {
-                kfree(g->hash_string);
-                return -ENOMEM;
-        }
-
-        return 0;
-}
-
-static int pohmelfs_crypto_cipher_init(struct pohmelfs_config_group *g, struct pohmelfs_crypto *c)
-{
-        char *algo = (char *)c->data;
-        u8 *key = (u8 *)(algo + c->strlen);
-
-        if (g->cipher_string)
-                return -EEXIST;
-
-        g->cipher_string = kstrdup(algo, GFP_KERNEL);
-        if (!g->cipher_string)
-                return -ENOMEM;
-        g->cipher_strlen = c->strlen;
-        g->cipher_keysize = c->keysize;
-
-        g->cipher_key = kmemdup(key, c->keysize, GFP_KERNEL);
-        if (!g->cipher_key) {
-                kfree(g->cipher_string);
-                return -ENOMEM;
-        }
-
-        return 0;
-}
-
-static int pohmelfs_cn_crypto(struct cn_msg *msg)
-{
-        struct pohmelfs_crypto *crypto = (struct pohmelfs_crypto *)msg->data;
-        struct pohmelfs_config_group *g;
-        int err = 0;
-
-        dprintk("%s: idx: %u, strlen: %u, type: %u, keysize: %u, algo: %s.\n",
-                        __func__, crypto->idx, crypto->strlen, crypto->type,
-                        crypto->keysize, (char *)crypto->data);
-
-        mutex_lock(&pohmelfs_config_lock);
-        g = pohmelfs_find_create_config_group(crypto->idx);
-        if (!g) {
-                err = -ENOMEM;
-                goto out_unlock;
-        }
-
-        switch (crypto->type) {
-        case POHMELFS_CRYPTO_HASH:
-                        err = pohmelfs_crypto_hash_init(g, crypto);
-                        break;
-        case POHMELFS_CRYPTO_CIPHER:
-                        err = pohmelfs_crypto_cipher_init(g, crypto);
-                        break;
-        default:
-                        err = -ENOTSUPP;
-                        break;
-        }
-
-out_unlock:
-        mutex_unlock(&pohmelfs_config_lock);
-        if (pohmelfs_send_reply(err, 0, POHMELFS_NOINFO_ACK, msg, NULL))
-                err = -ENOMEM;
-
-        return err;
-}
-
-static void pohmelfs_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)
-{
-        int err;
-
-        if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
-                return;
-
-        switch (msg->flags) {
-        case POHMELFS_FLAGS_ADD:
-        case POHMELFS_FLAGS_DEL:
-        case POHMELFS_FLAGS_MODIFY:
-                        err = pohmelfs_cn_ctl(msg, msg->flags);
-                        break;
-        case POHMELFS_FLAGS_FLUSH:
-                        err = pohmelfs_cn_flush(msg);
-                        break;
-        case POHMELFS_FLAGS_SHOW:
-                        err = pohmelfs_cn_disp(msg);
-                        break;
-        case POHMELFS_FLAGS_DUMP:
-                        err = pohmelfs_cn_dump(msg);
-                        break;
-        case POHMELFS_FLAGS_CRYPTO:
-                        err = pohmelfs_cn_crypto(msg);
-                        break;
-        default:
-                        err = -ENOSYS;
-                        break;
-        }
-}
-
-int pohmelfs_config_check(struct pohmelfs_config *config, int idx)
-{
-        struct pohmelfs_ctl *ctl = &config->state.ctl;
-        struct pohmelfs_config *tmp;
-        int err = -ENOENT;
-        struct pohmelfs_ctl *sc;
-        struct pohmelfs_config_group *g;
-
-        mutex_lock(&pohmelfs_config_lock);
-
-        g = pohmelfs_find_config_group(ctl->idx);
-        if (g) {
-                list_for_each_entry(tmp, &g->config_list, config_entry) {
-                        sc = &tmp->state.ctl;
-
-                        if (pohmelfs_config_eql(sc, ctl)) {
-                                err = 0;
-                                break;
-                        }
-                }
-        }
-
-        mutex_unlock(&pohmelfs_config_lock);
-
-        return err;
-}
-
-int __init pohmelfs_config_init(void)
-{
-        /* XXX remove (void *) cast when vanilla connector got synced */
-        return cn_add_callback(&pohmelfs_cn_id, "pohmelfs", (void *)pohmelfs_cn_callback);
-}
-
-void pohmelfs_config_exit(void)
-{
-        struct pohmelfs_config *c, *tmp;
-        struct pohmelfs_config_group *g, *gtmp;
-
-        cn_del_callback(&pohmelfs_cn_id);
-
-        mutex_lock(&pohmelfs_config_lock);
-        list_for_each_entry_safe(g, gtmp, &pohmelfs_config_list, group_entry) {
-                list_for_each_entry_safe(c, tmp, &g->config_list, config_entry) {
-                        list_del(&c->config_entry);
-                        kfree(c);
-                }
-
-                list_del(&g->group_entry);
-
-                kfree(g->hash_string);
-
-                kfree(g->cipher_string);
-
-                kfree(g);
-        }
-        mutex_unlock(&pohmelfs_config_lock);
-}
diff --git a/drivers/staging/pohmelfs/crypto.c b/drivers/staging/pohmelfs/crypto.c
deleted file mode 100644
index ad92771dce57..000000000000
--- a/drivers/staging/pohmelfs/crypto.c
+++ /dev/null
@@ -1,878 +0,0 @@
-/*
- * 2007+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
- * All rights reserved.
- *
- * 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.
- */
-
-#include <linux/crypto.h>
-#include <linux/highmem.h>
-#include <linux/kthread.h>
-#include <linux/pagemap.h>
-#include <linux/scatterlist.h>
-#include <linux/slab.h>
-
-#include "netfs.h"
-
-static struct crypto_hash *pohmelfs_init_hash(struct pohmelfs_sb *psb)
-{
-        int err;
-        struct crypto_hash *hash;
-
-        hash = crypto_alloc_hash(psb->hash_string, 0, CRYPTO_ALG_ASYNC);
-        if (IS_ERR(hash)) {
-                err = PTR_ERR(hash);
-                dprintk("%s: idx: %u: failed to allocate hash '%s', err: %d.\n",
-                                __func__, psb->idx, psb->hash_string, err);
-                goto err_out_exit;
-        }
-
-        psb->crypto_attached_size = crypto_hash_digestsize(hash);
-
-        if (!psb->hash_keysize)
-                return hash;
-
-        err = crypto_hash_setkey(hash, psb->hash_key, psb->hash_keysize);
-        if (err) {
-                dprintk("%s: idx: %u: failed to set key for hash '%s', err: %d.\n",
-                                __func__, psb->idx, psb->hash_string, err);
-                goto err_out_free;
-        }
-
-        return hash;
-
-err_out_free:
-        crypto_free_hash(hash);
-err_out_exit:
-        return ERR_PTR(err);
-}
-
-static struct crypto_ablkcipher *pohmelfs_init_cipher(struct pohmelfs_sb *psb)
-{
-        int err = -EINVAL;
-        struct crypto_ablkcipher *cipher;
-
-        if (!psb->cipher_keysize)
-                goto err_out_exit;
-
-        cipher = crypto_alloc_ablkcipher(psb->cipher_string, 0, 0);
-        if (IS_ERR(cipher)) {
-                err = PTR_ERR(cipher);
-                dprintk("%s: idx: %u: failed to allocate cipher '%s', err: %d.\n",
-                                __func__, psb->idx, psb->cipher_string, err);
-                goto err_out_exit;
-        }
-
-        crypto_ablkcipher_clear_flags(cipher, ~0);
-
-        err = crypto_ablkcipher_setkey(cipher, psb->cipher_key, psb->cipher_keysize);
-        if (err) {
-                dprintk("%s: idx: %u: failed to set key for cipher '%s', err: %d.\n",
-                                __func__, psb->idx, psb->cipher_string, err);
-                goto err_out_free;
-        }
-
-        return cipher;
-
-err_out_free:
-        crypto_free_ablkcipher(cipher);
-err_out_exit:
-        return ERR_PTR(err);
-}
-
-int pohmelfs_crypto_engine_init(struct pohmelfs_crypto_engine *e, struct pohmelfs_sb *psb)
-{
-        int err;
-
-        e->page_num = 0;
-
-        e->size = PAGE_SIZE;
-        e->data = kmalloc(e->size, GFP_KERNEL);
-        if (!e->data) {
-                err = -ENOMEM;
-                goto err_out_exit;
-        }
-
-        if (psb->hash_string) {
-                e->hash = pohmelfs_init_hash(psb);
-                if (IS_ERR(e->hash)) {
-                        err = PTR_ERR(e->hash);
-                        e->hash = NULL;
-                        goto err_out_free;
-                }
-        }
-
-        if (psb->cipher_string) {
-                e->cipher = pohmelfs_init_cipher(psb);
-                if (IS_ERR(e->cipher)) {
-                        err = PTR_ERR(e->cipher);
-                        e->cipher = NULL;
-                        goto err_out_free_hash;
-                }
-        }
-
-        return 0;
-
-err_out_free_hash:
-        crypto_free_hash(e->hash);
-err_out_free:
-        kfree(e->data);
-err_out_exit:
-        return err;
-}
-
-void pohmelfs_crypto_engine_exit(struct pohmelfs_crypto_engine *e)
-{
-        crypto_free_hash(e->hash);
-        crypto_free_ablkcipher(e->cipher);
-        kfree(e->data);
-}
-
-static void pohmelfs_crypto_complete(struct crypto_async_request *req, int err)
-{
-        struct pohmelfs_crypto_completion *c = req->data;
-
-        if (err == -EINPROGRESS)
-                return;
-
-        dprintk("%s: req: %p, err: %d.\n", __func__, req, err);
-        c->error = err;
-        complete(&c->complete);
-}
-
-static int pohmelfs_crypto_process(struct ablkcipher_request *req,
-                struct scatterlist *sg_dst, struct scatterlist *sg_src,
-                void *iv, int enc, unsigned long timeout)
-{
-        struct pohmelfs_crypto_completion complete;
-        int err;
-
-        init_completion(&complete.complete);
-        complete.error = -EINPROGRESS;
-
-        ablkcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
-                                        pohmelfs_crypto_complete, &complete);
-
-        ablkcipher_request_set_crypt(req, sg_src, sg_dst, sg_src->length, iv);
-
-        if (enc)
-                err = crypto_ablkcipher_encrypt(req);
-        else
-                err = crypto_ablkcipher_decrypt(req);
-
-        switch (err) {
-        case -EINPROGRESS:
-        case -EBUSY:
-                err = wait_for_completion_interruptible_timeout(&complete.complete,
-                                        timeout);
-                if (!err)
-                        err = -ETIMEDOUT;
-                else if (err > 0)
-                        err = complete.error;
-                break;
-        default:
-                break;
-        }
-
-        return err;
-}
-
-int pohmelfs_crypto_process_input_data(struct pohmelfs_crypto_engine *e, u64 cmd_iv,
-                void *data, struct page *page, unsigned int size)
-{
-        int err;
-        struct scatterlist sg;
-
-        if (!e->cipher && !e->hash)
-                return 0;
-
-        dprintk("%s: eng: %p, iv: %llx, data: %p, page: %p/%lu, size: %u.\n",
-                __func__, e, cmd_iv, data, page, (page) ? page->index : 0, size);
-
-        if (data) {
-                sg_init_one(&sg, data, size);
-        } else {
-                sg_init_table(&sg, 1);
-                sg_set_page(&sg, page, size, 0);
-        }
-
-        if (e->cipher) {
-                struct ablkcipher_request *req = e->data + crypto_hash_digestsize(e->hash);
-                u8 iv[32];
-
-                memset(iv, 0, sizeof(iv));
-                memcpy(iv, &cmd_iv, sizeof(cmd_iv));
-
-                ablkcipher_request_set_tfm(req, e->cipher);
-
-                err = pohmelfs_crypto_process(req, &sg, &sg, iv, 0, e->timeout);
-                if (err)
-                        goto err_out_exit;
-        }
-
-        if (e->hash) {
-                struct hash_desc desc;
-                void *dst = e->data + e->size/2;
-
-                desc.tfm = e->hash;
-                desc.flags = 0;
-
-                err = crypto_hash_init(&desc);
-                if (err)
-                        goto err_out_exit;
-
-                err = crypto_hash_update(&desc, &sg, size);
-                if (err)
-                        goto err_out_exit;
-
-                err = crypto_hash_final(&desc, dst);
-                if (err)
-                        goto err_out_exit;
-
-                err = !!memcmp(dst, e->data, crypto_hash_digestsize(e->hash));
-
-                if (err) {
-#ifdef CONFIG_POHMELFS_DEBUG
-                        unsigned int i;
-                        unsigned char *recv = e->data, *calc = dst;
-
-                        dprintk("%s: eng: %p, hash: %p, cipher: %p: iv : %llx, hash mismatch (recv/calc): ",
-                                        __func__, e, e->hash, e->cipher, cmd_iv);
-                        for (i = 0; i < crypto_hash_digestsize(e->hash); ++i) {
-#if 0
-                                dprintka("%02x ", recv[i]);
-                                if (recv[i] != calc[i]) {
-                                        dprintka("| calc byte: %02x.\n", calc[i]);
-                                        break;
-                                }
-#else
-                                dprintka("%02x/%02x ", recv[i], calc[i]);
-#endif
-                        }
-                        dprintk("\n");
-#endif
-                        goto err_out_exit;
-                } else {
-                        dprintk("%s: eng: %p, hash: %p, cipher: %p: hashes matched.\n",
-                                        __func__, e, e->hash, e->cipher);
-                }
-        }
-
-        dprintk("%s: eng: %p, size: %u, hash: %p, cipher: %p: completed.\n",
-                        __func__, e, e->size, e->hash, e->cipher);
-
-        return 0;
-
-err_out_exit:
-        dprintk("%s: eng: %p, hash: %p, cipher: %p: err: %d.\n",
-                        __func__, e, e->hash, e->cipher, err);
-        return err;
-}
-
-static int pohmelfs_trans_iter(struct netfs_trans *t, struct pohmelfs_crypto_engine *e,
-                int (*iterator) (struct pohmelfs_crypto_engine *e,
-                                  struct scatterlist *dst,
-                                  struct scatterlist *src))
-{
-        void *data = t->iovec.iov_base + sizeof(struct netfs_cmd) + t->psb->crypto_attached_size;
-        unsigned int size = t->iovec.iov_len - sizeof(struct netfs_cmd) - t->psb->crypto_attached_size;
-        struct netfs_cmd *cmd = data;
-        unsigned int sz, pages = t->attached_pages, i, csize, cmd_cmd, dpage_idx;
-        struct scatterlist sg_src, sg_dst;
-        int err;
-
-        while (size) {
-                cmd = data;
-                cmd_cmd = __be16_to_cpu(cmd->cmd);
-                csize = __be32_to_cpu(cmd->size);
-                cmd->iv = __cpu_to_be64(e->iv);
-
-                if (cmd_cmd == NETFS_READ_PAGES || cmd_cmd == NETFS_READ_PAGE)
-                        csize = __be16_to_cpu(cmd->ext);
-
-                sz = csize + __be16_to_cpu(cmd->cpad) + sizeof(struct netfs_cmd);
-
-                dprintk("%s: size: %u, sz: %u, cmd_size: %u, cmd_cpad: %u.\n",
-                                __func__, size, sz, __be32_to_cpu(cmd->size), __be16_to_cpu(cmd->cpad));
-
-                data += sz;
-                size -= sz;
-
-                sg_init_one(&sg_src, cmd->data, sz - sizeof(struct netfs_cmd));
-                sg_init_one(&sg_dst, cmd->data, sz - sizeof(struct netfs_cmd));
-
-                err = iterator(e, &sg_dst, &sg_src);
-                if (err)
-                        return err;
-        }
-
-        if (!pages)
-                return 0;
-
-        dpage_idx = 0;
-        for (i = 0; i < t->page_num; ++i) {
-                struct page *page = t->pages[i];
-                struct page *dpage = e->pages[dpage_idx];
-
-                if (!page)
-                        continue;
-
-                sg_init_table(&sg_src, 1);
-                sg_init_table(&sg_dst, 1);
-                sg_set_page(&sg_src, page, page_private(page), 0);
-                sg_set_page(&sg_dst, dpage, page_private(page), 0);
-
-                err = iterator(e, &sg_dst, &sg_src);
-                if (err)
-                        return err;
-
-                pages--;
-                if (!pages)
-                        break;
-                dpage_idx++;
-        }
-
-        return 0;
-}
-
-static int pohmelfs_encrypt_iterator(struct pohmelfs_crypto_engine *e,
-                struct scatterlist *sg_dst, struct scatterlist *sg_src)
-{
-        struct ablkcipher_request *req = e->data;
-        u8 iv[32];
-
-        memset(iv, 0, sizeof(iv));
-
-        memcpy(iv, &e->iv, sizeof(e->iv));
-
-        return pohmelfs_crypto_process(req, sg_dst, sg_src, iv, 1, e->timeout);
-}
-
-static int pohmelfs_encrypt(struct pohmelfs_crypto_thread *tc)
-{
-        struct netfs_trans *t = tc->trans;
-        struct pohmelfs_crypto_engine *e = &tc->eng;
-        struct ablkcipher_request *req = e->data;
-
-        memset(req, 0, sizeof(struct ablkcipher_request));
-        ablkcipher_request_set_tfm(req, e->cipher);
-
-        e->iv = pohmelfs_gen_iv(t);
-
-        return pohmelfs_trans_iter(t, e, pohmelfs_encrypt_iterator);
-}
-
-static int pohmelfs_hash_iterator(struct pohmelfs_crypto_engine *e,
-                struct scatterlist *sg_dst, struct scatterlist *sg_src)
-{
-        return crypto_hash_update(e->data, sg_src, sg_src->length);
-}
-
-static int pohmelfs_hash(struct pohmelfs_crypto_thread *tc)
-{
-        struct pohmelfs_crypto_engine *e = &tc->eng;
-        struct hash_desc *desc = e->data;
-        unsigned char *dst = tc->trans->iovec.iov_base + sizeof(struct netfs_cmd);
-        int err;
-
-        desc->tfm = e->hash;
-        desc->flags = 0;
-
-        err = crypto_hash_init(desc);
-        if (err)
-                return err;
-
-        err = pohmelfs_trans_iter(tc->trans, e, pohmelfs_hash_iterator);
-        if (err)
-                return err;
-
-        err = crypto_hash_final(desc, dst);
-        if (err)
-                return err;
-
-        {
-                unsigned int i;
-                dprintk("%s: ", __func__);
-                for (i = 0; i < tc->psb->crypto_attached_size; ++i)
-                        dprintka("%02x ", dst[i]);
-                dprintka("\n");
-        }
-
-        return 0;
-}
-
-static void pohmelfs_crypto_pages_free(struct pohmelfs_crypto_engine *e)
-{
-        unsigned int i;
-
-        for (i = 0; i < e->page_num; ++i)
-                __free_page(e->pages[i]);
-        kfree(e->pages);
-}
-
-static int pohmelfs_crypto_pages_alloc(struct pohmelfs_crypto_engine *e, struct pohmelfs_sb *psb)
-{
-        unsigned int i;
-
-        e->pages = kmalloc(psb->trans_max_pages * sizeof(struct page *), GFP_KERNEL);
-        if (!e->pages)
-                return -ENOMEM;
-
-        for (i = 0; i < psb->trans_max_pages; ++i) {
-                e->pages[i] = alloc_page(GFP_KERNEL);
-                if (!e->pages[i])
-                        break;
-        }
-
-        e->page_num = i;
-        if (!e->page_num)
-                goto err_out_free;
-
-        return 0;
-
-err_out_free:
-        kfree(e->pages);
-        return -ENOMEM;
-}
-
-static void pohmelfs_sys_crypto_exit_one(struct pohmelfs_crypto_thread *t)
-{
-        struct pohmelfs_sb *psb = t->psb;
-
-        if (t->thread)
-                kthread_stop(t->thread);
-
-        mutex_lock(&psb->crypto_thread_lock);
-        list_del(&t->thread_entry);
-        psb->crypto_thread_num--;
-        mutex_unlock(&psb->crypto_thread_lock);
-
-        pohmelfs_crypto_engine_exit(&t->eng);
-        pohmelfs_crypto_pages_free(&t->eng);
-        kfree(t);
-}
-
-static int pohmelfs_crypto_finish(struct netfs_trans *t, struct pohmelfs_sb *psb, int err)
-{
-        struct netfs_cmd *cmd = t->iovec.iov_base;
-        netfs_convert_cmd(cmd);
-
-        if (likely(!err))
-                err = netfs_trans_finish_send(t, psb);
-
-        t->result = err;
-        netfs_trans_put(t);
-
-        return err;
-}
-
-void pohmelfs_crypto_thread_make_ready(struct pohmelfs_crypto_thread *th)
-{
-        struct pohmelfs_sb *psb = th->psb;
-
-        th->page = NULL;
-        th->trans = NULL;
-
-        mutex_lock(&psb->crypto_thread_lock);
-        list_move_tail(&th->thread_entry, &psb->crypto_ready_list);
-        mutex_unlock(&psb->crypto_thread_lock);
-        wake_up(&psb->wait);
-}
-
-static int pohmelfs_crypto_thread_trans(struct pohmelfs_crypto_thread *t)
-{
-        struct netfs_trans *trans;
-        int err = 0;
-
-        trans = t->trans;
-        trans->eng = NULL;
-
-        if (t->eng.hash) {
-                err = pohmelfs_hash(t);
-                if (err)
-                        goto out_complete;
-        }
-
-        if (t->eng.cipher) {
-                err = pohmelfs_encrypt(t);
-                if (err)
-                        goto out_complete;
-                trans->eng = &t->eng;
-        }
-
-out_complete:
-        t->page = NULL;
-        t->trans = NULL;
-
-        if (!trans->eng)
-                pohmelfs_crypto_thread_make_ready(t);
-
-        pohmelfs_crypto_finish(trans, t->psb, err);
-        return err;
-}
-
-static int pohmelfs_crypto_thread_page(struct pohmelfs_crypto_thread *t)
-{
-        struct pohmelfs_crypto_engine *e = &t->eng;
-        struct page *page = t->page;
-        int err;
-
-        WARN_ON(!PageChecked(page));
-
-        err = pohmelfs_crypto_process_input_data(e, e->iv, NULL, page, t->size);
-        if (!err)
-                SetPageUptodate(page);
-        else
-                SetPageError(page);
-        unlock_page(page);
-        page_cache_release(page);
-
-        pohmelfs_crypto_thread_make_ready(t);
-
-        return err;
-}
-
-static int pohmelfs_crypto_thread_func(void *data)
-{
-        struct pohmelfs_crypto_thread *t = data;
-
-        while (!kthread_should_stop()) {
-                wait_event_interruptible(t->wait, kthread_should_stop() ||
-                                t->trans || t->page);
-
-                if (kthread_should_stop())
-                        break;
-
-                if (!t->trans && !t->page)
-                        continue;
-
-                dprintk("%s: thread: %p, trans: %p, page: %p.\n",
-                                __func__, t, t->trans, t->page);
-
-                if (t->trans)
-                        pohmelfs_crypto_thread_trans(t);
-                else if (t->page)
-                        pohmelfs_crypto_thread_page(t);
-        }
-
-        return 0;
-}
-
-static void pohmelfs_crypto_flush(struct pohmelfs_sb *psb, struct list_head *head)
-{
-        while (!list_empty(head)) {
-                struct pohmelfs_crypto_thread *t = NULL;
-
-                mutex_lock(&psb->crypto_thread_lock);
-                if (!list_empty(head)) {
-                        t = list_first_entry(head, struct pohmelfs_crypto_thread, thread_entry);
-                        list_del_init(&t->thread_entry);
-                }
-                mutex_unlock(&psb->crypto_thread_lock);
-
-                if (t)
-                        pohmelfs_sys_crypto_exit_one(t);
-        }
-}
-
-static void pohmelfs_sys_crypto_exit(struct pohmelfs_sb *psb)
-{
-        while (!list_empty(&psb->crypto_active_list) || !list_empty(&psb->crypto_ready_list)) {
-                dprintk("%s: crypto_thread_num: %u.\n", __func__, psb->crypto_thread_num);
-                pohmelfs_crypto_flush(psb, &psb->crypto_active_list);
-                pohmelfs_crypto_flush(psb, &psb->crypto_ready_list);
-        }
-}
-
-static int pohmelfs_sys_crypto_init(struct pohmelfs_sb *psb)
-{
-        unsigned int i;
-        struct pohmelfs_crypto_thread *t;
-        struct pohmelfs_config *c;
-        struct netfs_state *st;
-        int err;
-
-        list_for_each_entry(c, &psb->state_list, config_entry) {
-                st = &c->state;
-
-                err = pohmelfs_crypto_engine_init(&st->eng, psb);
-                if (err)
-                        goto err_out_exit;
-
-                dprintk("%s: st: %p, eng: %p, hash: %p, cipher: %p.\n",
-                                __func__, st, &st->eng, &st->eng.hash, &st->eng.cipher);
-        }
-
-        for (i = 0; i < psb->crypto_thread_num; ++i) {
-                err = -ENOMEM;
-                t = kzalloc(sizeof(struct pohmelfs_crypto_thread), GFP_KERNEL);
-                if (!t)
-                        goto err_out_free_state_engines;
-
-                init_waitqueue_head(&t->wait);
-
-                t->psb = psb;
-                t->trans = NULL;
-                t->eng.thread = t;
-
-                err = pohmelfs_crypto_engine_init(&t->eng, psb);
-                if (err)
-                        goto err_out_free_state_engines;
-
-                err = pohmelfs_crypto_pages_alloc(&t->eng, psb);
-                if (err)
-                        goto err_out_free;
-
-                t->thread = kthread_run(pohmelfs_crypto_thread_func, t,
-                                "pohmelfs-crypto-%d-%d", psb->idx, i);
-                if (IS_ERR(t->thread)) {
-                        err = PTR_ERR(t->thread);
-                        t->thread = NULL;
-                        goto err_out_free;
-                }
-
-                if (t->eng.cipher)
-                        psb->crypto_align_size = crypto_ablkcipher_blocksize(t->eng.cipher);
-
-                mutex_lock(&psb->crypto_thread_lock);
-                list_add_tail(&t->thread_entry, &psb->crypto_ready_list);
-                mutex_unlock(&psb->crypto_thread_lock);
-        }
-
-        psb->crypto_thread_num = i;
-        return 0;
-
-err_out_free:
-        pohmelfs_sys_crypto_exit_one(t);
-err_out_free_state_engines:
-        list_for_each_entry(c, &psb->state_list, config_entry) {
-                st = &c->state;
-                pohmelfs_crypto_engine_exit(&st->eng);
-        }
-err_out_exit:
-        pohmelfs_sys_crypto_exit(psb);
-        return err;
-}
-
-void pohmelfs_crypto_exit(struct pohmelfs_sb *psb)
-{
-        pohmelfs_sys_crypto_exit(psb);
-
-        kfree(psb->hash_string);
-        kfree(psb->cipher_string);
-}
-
-static int pohmelfs_crypt_init_complete(struct page **pages, unsigned int page_num,
-                void *private, int err)
-{
-        struct pohmelfs_sb *psb = private;
-
-        psb->flags = -err;
-        dprintk("%s: err: %d.\n", __func__, err);
-
-        wake_up(&psb->wait);
-
-        return err;
-}
-
-static int pohmelfs_crypto_init_handshake(struct pohmelfs_sb *psb)
-{
-        struct netfs_trans *t;
-        struct netfs_crypto_capabilities *cap;
-        struct netfs_cmd *cmd;
-        char *str;
-        int err = -ENOMEM, size;
-
-        size = sizeof(struct netfs_crypto_capabilities) +
-                psb->cipher_strlen + psb->hash_strlen + 2; /* 0 bytes */
-
-        t = netfs_trans_alloc(psb, size, 0, 0);
-        if (!t)
-                goto err_out_exit;
-
-        t->complete = pohmelfs_crypt_init_complete;
-        t->private = psb;
-
-        cmd = netfs_trans_current(t);
-        cap = (struct netfs_crypto_capabilities *)(cmd + 1);
-        str = (char *)(cap + 1);
-
-        cmd->cmd = NETFS_CAPABILITIES;
-        cmd->id = POHMELFS_CRYPTO_CAPABILITIES;
-        cmd->size = size;
-        cmd->start = 0;
-        cmd->ext = 0;
-        cmd->csize = 0;
-
-        netfs_convert_cmd(cmd);
-        netfs_trans_update(cmd, t, size);
-
-        cap->hash_strlen = psb->hash_strlen;
-        if (cap->hash_strlen) {
-                sprintf(str, "%s", psb->hash_string);
-                str += cap->hash_strlen;
-        }
-
-        cap->cipher_strlen = psb->cipher_strlen;
-        cap->cipher_keysize = psb->cipher_keysize;
-        if (cap->cipher_strlen)
-                sprintf(str, "%s", psb->cipher_string);
-
-        netfs_convert_crypto_capabilities(cap);
-
-        psb->flags = ~0;
-        err = netfs_trans_finish(t, psb);
-        if (err)
-                goto err_out_exit;
-
-        err = wait_event_interruptible_timeout(psb->wait, (psb->flags != ~0),
-                        psb->wait_on_page_timeout);
-        if (!err)
-                err = -ETIMEDOUT;
-        else if (err > 0)
-                err = -psb->flags;
-
-        if (!err)
-                psb->perform_crypto = 1;
-        psb->flags = 0;
-
-        /*
-         * At this point NETFS_CAPABILITIES response command
-         * should setup superblock in a way, which is acceptable
-         * for both client and server, so if server refuses connection,
-         * it will send error in transaction response.
-         */
-
-        if (err)
-                goto err_out_exit;
-
-        return 0;
-
-err_out_exit:
-        return err;
-}
-
-int pohmelfs_crypto_init(struct pohmelfs_sb *psb)
-{
-        int err;
-
-        if (!psb->cipher_string && !psb->hash_string)
-                return 0;
-
-        err = pohmelfs_crypto_init_handshake(psb);
-        if (err)
-                return err;
-
-        err = pohmelfs_sys_crypto_init(psb);
-        if (err)
-                return err;
-
-        return 0;
-}
-
-static int pohmelfs_crypto_thread_get(struct pohmelfs_sb *psb,
-                int (*action)(struct pohmelfs_crypto_thread *t, void *data), void *data)
-{
-        struct pohmelfs_crypto_thread *t = NULL;
-        int err;
-
-        while (!t) {
-                err = wait_event_interruptible_timeout(psb->wait,
-                                !list_empty(&psb->crypto_ready_list),
-                                psb->wait_on_page_timeout);
-
-                t = NULL;
-                err = 0;
-                mutex_lock(&psb->crypto_thread_lock);
-                if (!list_empty(&psb->crypto_ready_list)) {
-                        t = list_entry(psb->crypto_ready_list.prev,
-                                        struct pohmelfs_crypto_thread,
-                                        thread_entry);
-
-                        list_move_tail(&t->thread_entry,
-                                        &psb->crypto_active_list);
-
-                        action(t, data);
-                        wake_up(&t->wait);
-
-                }
-                mutex_unlock(&psb->crypto_thread_lock);
-        }
-
-        return err;
-}
-
-static int pohmelfs_trans_crypt_action(struct pohmelfs_crypto_thread *t, void *data)
-{
-        struct netfs_trans *trans = data;
-
-        netfs_trans_get(trans);
-        t->trans = trans;
-
-        dprintk("%s: t: %p, gen: %u, thread: %p.\n", __func__, trans, trans->gen, t);
-        return 0;
-}
-
-int pohmelfs_trans_crypt(struct netfs_trans *trans, struct pohmelfs_sb *psb)
-{
-        if ((!psb->hash_string && !psb->cipher_string) || !psb->perform_crypto) {
-                netfs_trans_get(trans);
-                return pohmelfs_crypto_finish(trans, psb, 0);
-        }
-
-        return pohmelfs_crypto_thread_get(psb, pohmelfs_trans_crypt_action, trans);
-}
-
-struct pohmelfs_crypto_input_action_data {
-        struct page                     *page;
-        struct pohmelfs_crypto_engine   *e;
-        u64                             iv;
-        unsigned int                    size;
-};
-
-static int pohmelfs_crypt_input_page_action(struct pohmelfs_crypto_thread *t, void *data)
-{
-        struct pohmelfs_crypto_input_action_data *act = data;
-
-        memcpy(t->eng.data, act->e->data, t->psb->crypto_attached_size);
-
-        t->size = act->size;
-        t->eng.iv = act->iv;
-
-        t->page = act->page;
-        return 0;
-}
-
-int pohmelfs_crypto_process_input_page(struct pohmelfs_crypto_engine *e,
-                struct page *page, unsigned int size, u64 iv)
-{
-        struct inode *inode = page->mapping->host;
-        struct pohmelfs_crypto_input_action_data act;
-        int err = -ENOENT;
-
-        act.page = page;
-        act.e = e;
-        act.size = size;
-        act.iv = iv;
-
-        err = pohmelfs_crypto_thread_get(POHMELFS_SB(inode->i_sb),
-                        pohmelfs_crypt_input_page_action, &act);
-        if (err)
-                goto err_out_exit;
-
-        return 0;
-
-err_out_exit:
-        SetPageUptodate(page);
-        page_cache_release(page);
-
-        return err;
-}
diff --git a/drivers/staging/pohmelfs/dir.c b/drivers/staging/pohmelfs/dir.c
deleted file mode 100644
index 2ee4491b7136..000000000000
--- a/drivers/staging/pohmelfs/dir.c
+++ /dev/null
@@ -1,1102 +0,0 @@
-/*
- * 2007+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
- * All rights reserved.
- *
- * 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/jhash.h>
-#include <linux/namei.h>
-#include <linux/slab.h>
-#include <linux/pagemap.h>
-
-#include "netfs.h"
-
-static int pohmelfs_cmp_hash(struct pohmelfs_name *n, u32 hash)
-{
-        if (n->hash > hash)
-                return -1;
-        if (n->hash < hash)
-                return 1;
-
-        return 0;
-}
-
-static struct pohmelfs_name *pohmelfs_search_hash_unprecise(struct pohmelfs_inode *pi, u32 hash)
-{
-        struct rb_node *n = pi->hash_root.rb_node;
-        struct pohmelfs_name *tmp = NULL;
-        int cmp;
-
-        while (n) {
-                tmp = rb_entry(n, struct pohmelfs_name, hash_node);
-
-                cmp = pohmelfs_cmp_hash(tmp, hash);
-                if (cmp < 0)
-                        n = n->rb_left;
-                else if (cmp > 0)
-                        n = n->rb_right;
-                else
-                        break;
-
-        }
-
-        return tmp;
-}
-
-struct pohmelfs_name *pohmelfs_search_hash(struct pohmelfs_inode *pi, u32 hash)
-{
-        struct pohmelfs_name *tmp;
-
-        tmp = pohmelfs_search_hash_unprecise(pi, hash);
-        if (tmp && (tmp->hash == hash))
-                return tmp;
-
-        return NULL;
-}
-
-static void __pohmelfs_name_del(struct pohmelfs_inode *parent, struct pohmelfs_name *node)
-{
-        rb_erase(&node->hash_node, &parent->hash_root);
-}
-
-/*
- * Remove name cache entry from its caches and free it.
- */
-static void pohmelfs_name_free(struct pohmelfs_inode *parent, struct pohmelfs_name *node)
-{
-        __pohmelfs_name_del(parent, node);
-        list_del(&node->sync_create_entry);
-        kfree(node);
-}
-
-static struct pohmelfs_name *pohmelfs_insert_hash(struct pohmelfs_inode *pi,
-                struct pohmelfs_name *new)
-{
-        struct rb_node **n = &pi->hash_root.rb_node, *parent = NULL;
-        struct pohmelfs_name *ret = NULL, *tmp;
-        int cmp;
-
-        while (*n) {
-                parent = *n;
-
-                tmp = rb_entry(parent, struct pohmelfs_name, hash_node);
-
-                cmp = pohmelfs_cmp_hash(tmp, new->hash);
-                if (cmp < 0)
-                        n = &parent->rb_left;
-                else if (cmp > 0)
-                        n = &parent->rb_right;
-                else {
-                        ret = tmp;
-                        break;
-                }
-        }
-
-        if (ret) {
-                printk("%s: exist: parent: %llu, ino: %llu, hash: %x, len: %u, data: '%s', "
-                                        "new: ino: %llu, hash: %x, len: %u, data: '%s'.\n",
-                                __func__, pi->ino,
-                                ret->ino, ret->hash, ret->len, ret->data,
-                                new->ino, new->hash, new->len, new->data);
-                ret->ino = new->ino;
-                return ret;
-        }
-
-        rb_link_node(&new->hash_node, parent, n);
-        rb_insert_color(&new->hash_node, &pi->hash_root);
-
-        return NULL;
-}
-
-/*
- * Free name cache for given inode.
- */
-void pohmelfs_free_names(struct pohmelfs_inode *parent)
-{
-        struct rb_node *rb_node;
-        struct pohmelfs_name *n;
-
-        for (rb_node = rb_first(&parent->hash_root); rb_node;) {
-                n = rb_entry(rb_node, struct pohmelfs_name, hash_node);
-                rb_node = rb_next(rb_node);
-
-                pohmelfs_name_free(parent, n);
-        }
-}
-
-static void pohmelfs_fix_offset(struct pohmelfs_inode *parent, struct pohmelfs_name *node)
-{
-        parent->total_len -= node->len;
-}
-
-/*
- * Free name cache entry helper.
- */
-void pohmelfs_name_del(struct pohmelfs_inode *parent, struct pohmelfs_name *node)
-{
-        pohmelfs_fix_offset(parent, node);
-        pohmelfs_name_free(parent, node);
-}
-
-/*
- * Insert new name cache entry into all hash cache.
- */
-static int pohmelfs_insert_name(struct pohmelfs_inode *parent, struct pohmelfs_name *n)
-{
-        struct pohmelfs_name *name;
-
-        name = pohmelfs_insert_hash(parent, n);
-        if (name)
-                return -EEXIST;
-
-        parent->total_len += n->len;
-        list_add_tail(&n->sync_create_entry, &parent->sync_create_list);
-
-        return 0;
-}
-
-/*
- * Allocate new name cache entry.
- */
-static struct pohmelfs_name *pohmelfs_name_alloc(unsigned int len)
-{
-        struct pohmelfs_name *n;
-
-        n = kzalloc(sizeof(struct pohmelfs_name) + len, GFP_KERNEL);
-        if (!n)
-                return NULL;
-
-        INIT_LIST_HEAD(&n->sync_create_entry);
-
-        n->data = (char *)(n+1);
-
-        return n;
-}
-
-/*
- * Add new name entry into directory's cache.
- */
-static int pohmelfs_add_dir(struct pohmelfs_sb *psb, struct pohmelfs_inode *parent,
-                struct pohmelfs_inode *npi, struct qstr *str, unsigned int mode, int link)
-{
-        int err = -ENOMEM;
-        struct pohmelfs_name *n;
-
-        n = pohmelfs_name_alloc(str->len + 1);
-        if (!n)
-                goto err_out_exit;
-
-        n->ino = npi->ino;
-        n->mode = mode;
-        n->len = str->len;
-        n->hash = str->hash;
-        sprintf(n->data, "%s", str->name);
-
-        mutex_lock(&parent->offset_lock);
-        err = pohmelfs_insert_name(parent, n);
-        mutex_unlock(&parent->offset_lock);
-
-        if (err) {
-                if (err != -EEXIST)
-                        goto err_out_free;
-                kfree(n);
-        }
-
-        return 0;
-
-err_out_free:
-        kfree(n);
-err_out_exit:
-        return err;
-}
-
-/*
- * Create new inode for given parameters (name, inode info, parent).
- * This does not create object on the server, it will be synced there during writeback.
- */
-struct pohmelfs_inode *pohmelfs_new_inode(struct pohmelfs_sb *psb,
-                struct pohmelfs_inode *parent, struct qstr *str,
-                struct netfs_inode_info *info, int link)
-{
-        struct inode *new = NULL;
-        struct pohmelfs_inode *npi;
-        int err = -EEXIST;
-
-        dprintk("%s: creating inode: parent: %llu, ino: %llu, str: %p.\n",
-                        __func__, (parent) ? parent->ino : 0, info->ino, str);
-
-        err = -ENOMEM;
-        new = iget_locked(psb->sb, info->ino);
-        if (!new)
-                goto err_out_exit;
-
-        npi = POHMELFS_I(new);
-        npi->ino = info->ino;
-        err = 0;
-
-        if (new->i_state & I_NEW) {
-                dprintk("%s: filling VFS inode: %lu/%llu.\n",
-                                __func__, new->i_ino, info->ino);
-                pohmelfs_fill_inode(new, info);
-
-                if (S_ISDIR(info->mode)) {
-                        struct qstr s;
-
-                        s.name = ".";
-                        s.len = 1;
-                        s.hash = jhash(s.name, s.len, 0);
-
-                        err = pohmelfs_add_dir(psb, npi, npi, &s, info->mode, 0);
-                        if (err)
-                                goto err_out_put;
-
-                        s.name = "..";
-                        s.len = 2;
-                        s.hash = jhash(s.name, s.len, 0);
-
-                        err = pohmelfs_add_dir(psb, npi, (parent) ? parent : npi, &s,
-                                        (parent) ? parent->vfs_inode.i_mode : npi->vfs_inode.i_mode, 0);
-                        if (err)
-                                goto err_out_put;
-                }
-        }
-
-        if (str) {
-                if (parent) {
-                        err = pohmelfs_add_dir(psb, parent, npi, str, info->mode, link);
-
-                        dprintk("%s: %s inserted name: '%s', new_offset: %llu, ino: %llu, parent: %llu.\n",
-                                        __func__, (err) ? "unsuccessfully" : "successfully",
-                                        str->name, parent->total_len, info->ino, parent->ino);
-
-                        if (err && err != -EEXIST)
-                                goto err_out_put;
-                }
-        }
-
-        if (new->i_state & I_NEW) {
-                if (parent)
-                        mark_inode_dirty(&parent->vfs_inode);
-                mark_inode_dirty(new);
-        }
-
-        set_bit(NETFS_INODE_OWNED, &npi->state);
-        npi->lock_type = POHMELFS_WRITE_LOCK;
-        unlock_new_inode(new);
-
-        return npi;
-
-err_out_put:
-        printk("%s: putting inode: %p, npi: %p, error: %d.\n", __func__, new, npi, err);
-        iput(new);
-err_out_exit:
-        return ERR_PTR(err);
-}
-
-static int pohmelfs_remote_sync_complete(struct page **pages, unsigned int page_num,
-                void *private, int err)
-{
-        struct pohmelfs_inode *pi = private;
-        struct pohmelfs_sb *psb = POHMELFS_SB(pi->vfs_inode.i_sb);
-
-        dprintk("%s: ino: %llu, err: %d.\n", __func__, pi->ino, err);
-
-        if (err)
-                pi->error = err;
-        wake_up(&psb->wait);
-        pohmelfs_put_inode(pi);
-
-        return err;
-}
-
-/*
- * Receive directory content from the server.
- * This should be only done for objects, which were not created locally,
- * and which were not synced previously.
- */
-static int pohmelfs_sync_remote_dir(struct pohmelfs_inode *pi)
-{
-        struct inode *inode = &pi->vfs_inode;
-        struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb);
-        long ret = psb->wait_on_page_timeout;
-        int err;
-
-        dprintk("%s: dir: %llu, state: %lx: remote_synced: %d.\n",
-                __func__, pi->ino, pi->state, test_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state));
-
-        if (test_bit(NETFS_INODE_REMOTE_DIR_SYNCED, &pi->state))
-                return 0;
-
-        if (!igrab(inode)) {
-                err = -ENOENT;
-                goto err_out_exit;
-        }
-
-        err = pohmelfs_meta_command(pi, NETFS_READDIR, NETFS_TRANS_SINGLE_DST,
-                        pohmelfs_remote_sync_complete, pi, 0);
-        if (err)
-                goto err_out_exit;
-
-        pi->error = 0;
-        ret = wait_event_interruptible_timeout(psb->wait,
-                        test_bit(NETFS_INODE_REMOTE_DIR_SYNCED, &pi->state) || pi->error, ret);
-        dprintk("%s: awake dir: %llu, ret: %ld, err: %d.\n", __func__, pi->ino, ret, pi->error);
-        if (ret <= 0) {
-                err = ret;
-                if (!err)
-                        err = -ETIMEDOUT;
-                goto err_out_exit;
-        }
-
-        if (pi->error)
-                return pi->error;
-
-        return 0;
-
-err_out_exit:
-        clear_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state);
-
-        return err;
-}
-
-static int pohmelfs_dir_open(struct inode *inode, struct file *file)
-{
-        file->private_data = NULL;
-        return 0;
-}
-
-/*
- * VFS readdir callback. Syncs directory content from server if needed,
- * and provides direntry info to the userspace.
- */
-static int pohmelfs_readdir(struct file *file, void *dirent, filldir_t filldir)
-{
-        struct inode *inode = file->f_path.dentry->d_inode;
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-        struct pohmelfs_name *n;
-        struct rb_node *rb_node;
-        int err = 0, mode;
-        u64 len;
-
-        dprintk("%s: parent: %llu, fpos: %llu, hash: %08lx.\n",
-                        __func__, pi->ino, (u64)file->f_pos,
-                        (unsigned long)file->private_data);
-#if 0
-        err = pohmelfs_data_lock(pi, 0, ~0, POHMELFS_READ_LOCK);
-        if (err)
-                return err;
-#endif
-        err = pohmelfs_sync_remote_dir(pi);
-        if (err)
-                return err;
-
-        if (file->private_data && (file->private_data == (void *)(unsigned long)file->f_pos))
-                return 0;
-
-        mutex_lock(&pi->offset_lock);
-        n = pohmelfs_search_hash_unprecise(pi, (unsigned long)file->private_data);
-
-        while (n) {
-                mode = (n->mode >> 12) & 15;
-
-                dprintk("%s: offset: %llu, parent ino: %llu, name: '%s', len: %u, ino: %llu, "
-                                "mode: %o/%o, fpos: %llu, hash: %08x.\n",
-                                __func__, file->f_pos, pi->ino, n->data, n->len,
-                                n->ino, n->mode, mode, file->f_pos, n->hash);
-
-                file->private_data = (void *)(unsigned long)n->hash;
-
-                len = n->len;
-                err = filldir(dirent, n->data, n->len, file->f_pos, n->ino, mode);
-
-                if (err < 0) {
-                        dprintk("%s: err: %d.\n", __func__, err);
-                        err = 0;
-                        break;
-                }
-
-                file->f_pos += len;
-
-                rb_node = rb_next(&n->hash_node);
-
-                if (!rb_node || (rb_node == &n->hash_node)) {
-                        file->private_data = (void *)(unsigned long)file->f_pos;
-                        break;
-                }
-
-                n = rb_entry(rb_node, struct pohmelfs_name, hash_node);
-        }
-        mutex_unlock(&pi->offset_lock);
-
-        return err;
-}
-
-static loff_t pohmelfs_dir_lseek(struct file *file, loff_t offset, int origin)
-{
-        file->f_pos = offset;
-        file->private_data = NULL;
-        return offset;
-}
-
-const struct file_operations pohmelfs_dir_fops = {
-        .open = pohmelfs_dir_open,
-        .read = generic_read_dir,
-        .llseek = pohmelfs_dir_lseek,
-        .readdir = pohmelfs_readdir,
-};
-
-/*
- * Lookup single object on server.
- */
-static int pohmelfs_lookup_single(struct pohmelfs_inode *parent,
-                struct qstr *str, u64 ino)
-{
-        struct pohmelfs_sb *psb = POHMELFS_SB(parent->vfs_inode.i_sb);
-        long ret = msecs_to_jiffies(5000);
-        int err;
-
-        set_bit(NETFS_COMMAND_PENDING, &parent->state);
-        err = pohmelfs_meta_command_data(parent, parent->ino, NETFS_LOOKUP,
-                        (char *)str->name, NETFS_TRANS_SINGLE_DST, NULL, NULL, ino);
-        if (err)
-                goto err_out_exit;
-
-        err = 0;
-        ret = wait_event_interruptible_timeout(psb->wait,
-                        !test_bit(NETFS_COMMAND_PENDING, &parent->state), ret);
-        if (ret <= 0) {
-                err = ret;
-                if (!err)
-                        err = -ETIMEDOUT;
-        }
-
-        if (err)
-                goto err_out_exit;
-
-        return 0;
-
-err_out_exit:
-        clear_bit(NETFS_COMMAND_PENDING, &parent->state);
-
-        printk("%s: failed: parent: %llu, ino: %llu, name: '%s', err: %d.\n",
-                        __func__, parent->ino, ino, str->name, err);
-
-        return err;
-}
-
-/*
- * VFS lookup callback.
- * We first try to get inode number from local name cache, if we have one,
- * then inode can be found in inode cache. If there is no inode or no object in
- * local cache, try to lookup it on server. This only should be done for directories,
- * which were not created locally, otherwise remote server does not know about dir at all,
- * so no need to try to know that.
- */
-struct dentry *pohmelfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
-{
-        struct pohmelfs_inode *parent = POHMELFS_I(dir);
-        struct pohmelfs_name *n;
-        struct inode *inode = NULL;
-        unsigned long ino = 0;
-        int err, lock_type = POHMELFS_READ_LOCK, need_lock = 1;
-        struct qstr str = dentry->d_name;
-
-        if ((nd->intent.open.flags & O_ACCMODE) != O_RDONLY)
-                lock_type = POHMELFS_WRITE_LOCK;
-
-        if (test_bit(NETFS_INODE_OWNED, &parent->state)) {
-                if (lock_type == parent->lock_type)
-                        need_lock = 0;
-                if ((lock_type == POHMELFS_READ_LOCK) && (parent->lock_type == POHMELFS_WRITE_LOCK))
-                        need_lock = 0;
-        }
-
-        if ((lock_type == POHMELFS_READ_LOCK) && !test_bit(NETFS_INODE_REMOTE_DIR_SYNCED, &parent->state))
-                need_lock = 1;
-
-        str.hash = jhash(dentry->d_name.name, dentry->d_name.len, 0);
-
-        mutex_lock(&parent->offset_lock);
-        n = pohmelfs_search_hash(parent, str.hash);
-        if (n)
-                ino = n->ino;
-        mutex_unlock(&parent->offset_lock);
-
-        dprintk("%s: start ino: %lu, inode: %p, name: '%s', hash: %x, parent_state: %lx, need_lock: %d.\n",
-                        __func__, ino, inode, str.name, str.hash, parent->state, need_lock);
-
-        if (ino) {
-                inode = ilookup(dir->i_sb, ino);
-                if (inode)
-                        goto out;
-        }
-
-        dprintk("%s: no inode dir: %p, dir_ino: %llu, name: '%s', len: %u, dir_state: %lx, ino: %lu.\n",
-                        __func__, dir, parent->ino,
-                        str.name, str.len, parent->state, ino);
-
-        if (!ino) {
-                if (!need_lock)
-                        goto out;
-        }
-
-        err = pohmelfs_data_lock(parent, 0, ~0, lock_type);
-        if (err)
-                goto out;
-
-        err = pohmelfs_lookup_single(parent, &str, ino);
-        if (err)
-                goto out;
-
-        if (!ino) {
-                mutex_lock(&parent->offset_lock);
-                n = pohmelfs_search_hash(parent, str.hash);
-                if (n)
-                        ino = n->ino;
-                mutex_unlock(&parent->offset_lock);
-        }
-
-        if (ino) {
-                inode = ilookup(dir->i_sb, ino);
-                dprintk("%s: second lookup ino: %lu, inode: %p, name: '%s', hash: %x.\n",
-                                __func__, ino, inode, str.name, str.hash);
-                if (!inode) {
-                        dprintk("%s: No inode for ino: %lu, name: '%s', hash: %x.\n",
-                                __func__, ino, str.name, str.hash);
-                        /* return NULL; */
-                        return ERR_PTR(-EACCES);
-                }
-        } else {
-                printk("%s: No inode number : name: '%s', hash: %x.\n",
-                        __func__, str.name, str.hash);
-        }
-out:
-        return d_splice_alias(inode, dentry);
-}
-
-/*
- * Create new object in local cache. Object will be synced to server
- * during writeback for given inode.
- */
-struct pohmelfs_inode *pohmelfs_create_entry_local(struct pohmelfs_sb *psb,
-        struct pohmelfs_inode *parent, struct qstr *str, u64 start, umode_t mode)
-{
-        struct pohmelfs_inode *npi;
-        int err = -ENOMEM;
-        struct netfs_inode_info info;
-
-        dprintk("%s: name: '%s', mode: %ho, start: %llu.\n",
-                        __func__, str->name, mode, start);
-
-        info.mode = mode;
-        info.ino = start;
-
-        if (!start)
-                info.ino = pohmelfs_new_ino(psb);
-
-        info.nlink = S_ISDIR(mode) ? 2 : 1;
-        info.uid = current_fsuid();
-        info.gid = current_fsgid();
-        info.size = 0;
-        info.blocksize = 512;
-        info.blocks = 0;
-        info.rdev = 0;
-        info.version = 0;
-
-        npi = pohmelfs_new_inode(psb, parent, str, &info, !!start);
-        if (IS_ERR(npi)) {
-                err = PTR_ERR(npi);
-                goto err_out_unlock;
-        }
-
-        return npi;
-
-err_out_unlock:
-        dprintk("%s: err: %d.\n", __func__, err);
-        return ERR_PTR(err);
-}
-
-/*
- * Create local object and bind it to dentry.
- */
-static int pohmelfs_create_entry(struct inode *dir, struct dentry *dentry,
-                                 u64 start, umode_t mode)
-{
-        struct pohmelfs_sb *psb = POHMELFS_SB(dir->i_sb);
-        struct pohmelfs_inode *npi, *parent;
-        struct qstr str = dentry->d_name;
-        int err;
-
-        parent = POHMELFS_I(dir);
-
-        err = pohmelfs_data_lock(parent, 0, ~0, POHMELFS_WRITE_LOCK);
-        if (err)
-                return err;
-
-        str.hash = jhash(dentry->d_name.name, dentry->d_name.len, 0);
-
-        npi = pohmelfs_create_entry_local(psb, parent, &str, start, mode);
-        if (IS_ERR(npi))
-                return PTR_ERR(npi);
-
-        d_instantiate(dentry, &npi->vfs_inode);
-
-        dprintk("%s: parent: %llu, inode: %llu, name: '%s', parent_nlink: %d, nlink: %d.\n",
-                        __func__, parent->ino, npi->ino, dentry->d_name.name,
-                        (signed)dir->i_nlink, (signed)npi->vfs_inode.i_nlink);
-
-        return 0;
-}
-
-/*
- * VFS create and mkdir callbacks.
- */
-static int pohmelfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
-                struct nameidata *nd)
-{
-        return pohmelfs_create_entry(dir, dentry, 0, mode);
-}
-
-static int pohmelfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
-{
-        int err;
-
-        inode_inc_link_count(dir);
-        err = pohmelfs_create_entry(dir, dentry, 0, mode | S_IFDIR);
-        if (err)
-                inode_dec_link_count(dir);
-
-        return err;
-}
-
-static int pohmelfs_remove_entry(struct inode *dir, struct dentry *dentry)
-{
-        struct pohmelfs_sb *psb = POHMELFS_SB(dir->i_sb);
-        struct inode *inode = dentry->d_inode;
-        struct pohmelfs_inode *parent = POHMELFS_I(dir), *pi = POHMELFS_I(inode);
-        struct pohmelfs_name *n;
-        int err = -ENOENT;
-        struct qstr str = dentry->d_name;
-
-        err = pohmelfs_data_lock(parent, 0, ~0, POHMELFS_WRITE_LOCK);
-        if (err)
-                return err;
-
-        str.hash = jhash(dentry->d_name.name, dentry->d_name.len, 0);
-
-        dprintk("%s: dir_ino: %llu, inode: %llu, name: '%s', nlink: %d.\n",
-                        __func__, parent->ino, pi->ino,
-                        str.name, (signed)inode->i_nlink);
-
-        BUG_ON(!inode);
-
-        mutex_lock(&parent->offset_lock);
-        n = pohmelfs_search_hash(parent, str.hash);
-        if (n) {
-                pohmelfs_fix_offset(parent, n);
-                if (test_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state))
-                        pohmelfs_remove_child(pi, n);
-
-                pohmelfs_name_free(parent, n);
-                err = 0;
-        }
-        mutex_unlock(&parent->offset_lock);
-
-        if (!err) {
-                psb->avail_size += inode->i_size;
-
-                pohmelfs_inode_del_inode(psb, pi);
-
-                mark_inode_dirty(dir);
-
-                inode->i_ctime = dir->i_ctime;
-                if (inode->i_nlink)
-                        inode_dec_link_count(inode);
-        }
-
-        return err;
-}
-
-/*
- * Unlink and rmdir VFS callbacks.
- */
-static int pohmelfs_unlink(struct inode *dir, struct dentry *dentry)
-{
-        return pohmelfs_remove_entry(dir, dentry);
-}
-
-static int pohmelfs_rmdir(struct inode *dir, struct dentry *dentry)
-{
-        int err;
-        struct inode *inode = dentry->d_inode;
-
-        dprintk("%s: parent: %llu, inode: %llu, name: '%s', parent_nlink: %d, nlink: %d.\n",
-                        __func__, POHMELFS_I(dir)->ino, POHMELFS_I(inode)->ino,
-                        dentry->d_name.name, (signed)dir->i_nlink, (signed)inode->i_nlink);
-
-        err = pohmelfs_remove_entry(dir, dentry);
-        if (!err) {
-                inode_dec_link_count(dir);
-                inode_dec_link_count(inode);
-        }
-
-        return err;
-}
-
-/*
- * Link creation is synchronous.
- * I'm lazy.
- * Earth is somewhat round.
- */
-static int pohmelfs_create_link(struct pohmelfs_inode *parent, struct qstr *obj,
-                struct pohmelfs_inode *target, struct qstr *tstr)
-{
-        struct super_block *sb = parent->vfs_inode.i_sb;
-        struct pohmelfs_sb *psb = POHMELFS_SB(sb);
-        struct netfs_cmd *cmd;
-        struct netfs_trans *t;
-        void *data;
-        int err, parent_len, target_len = 0, cur_len, path_size = 0;
-
-        err = pohmelfs_data_lock(parent, 0, ~0, POHMELFS_WRITE_LOCK);
-        if (err)
-                return err;
-
-        err = sb->s_op->write_inode(&parent->vfs_inode, 0);
-        if (err)
-                goto err_out_exit;
-
-        if (tstr)
-                target_len = tstr->len;
-
-        parent_len = pohmelfs_path_length(parent);
-        if (target)
-                target_len += pohmelfs_path_length(target);
-
-        if (parent_len < 0) {
-                err = parent_len;
-                goto err_out_exit;
-        }
-
-        if (target_len < 0) {
-                err = target_len;
-                goto err_out_exit;
-        }
-
-        t = netfs_trans_alloc(psb, parent_len + target_len + obj->len + 2, 0, 0);
-        if (!t) {
-                err = -ENOMEM;
-                goto err_out_exit;
-        }
-        cur_len = netfs_trans_cur_len(t);
-
-        cmd = netfs_trans_current(t);
-        if (IS_ERR(cmd)) {
-                err = PTR_ERR(cmd);
-                goto err_out_free;
-        }
-
-        data = (void *)(cmd + 1);
-        cur_len -= sizeof(struct netfs_cmd);
-
-        err = pohmelfs_construct_path_string(parent, data, parent_len);
-        if (err > 0) {
-                /* Do not place null-byte before the slash */
-                path_size = err - 1;
-                cur_len -= path_size;
-
-                err = snprintf(data + path_size, cur_len, "/%s|", obj->name);
-
-                path_size += err;
-                cur_len -= err;
-
-                cmd->ext = path_size - 1; /* No | symbol */
-
-                if (target) {
-                        err = pohmelfs_construct_path_string(target, data + path_size, target_len);
-                        if (err > 0) {
-                                path_size += err;
-                                cur_len -= err;
-                        }
-                }
-        }
-
-        if (err < 0)
-                goto err_out_free;
-
-        cmd->start = 0;
-
-        if (!target && tstr) {
-                if (tstr->len > cur_len - 1) {
-                        err = -ENAMETOOLONG;
-                        goto err_out_free;
-                }
-
-                err = snprintf(data + path_size, cur_len, "%s", tstr->name) + 1; /* 0-byte */
-                path_size += err;
-                cur_len -= err;
-                cmd->start = 1;
-        }
-
-        dprintk("%s: parent: %llu, obj: '%s', target_inode: %llu, target_str: '%s', full: '%s'.\n",
-                        __func__, parent->ino, obj->name, (target) ? target->ino : 0, (tstr) ? tstr->name : NULL,
-                        (char *)data);
-
-        cmd->cmd = NETFS_LINK;
-        cmd->size = path_size;
-        cmd->id = parent->ino;
-
-        netfs_convert_cmd(cmd);
-
-        netfs_trans_update(cmd, t, path_size);
-
-        err = netfs_trans_finish(t, psb);
-        if (err)
-                goto err_out_exit;
-
-        return 0;
-
-err_out_free:
-        t->result = err;
-        netfs_trans_put(t);
-err_out_exit:
-        return err;
-}
-
-/*
- *  VFS hard and soft link callbacks.
- */
-static int pohmelfs_link(struct dentry *old_dentry, struct inode *dir,
-        struct dentry *dentry)
-{
-        struct inode *inode = old_dentry->d_inode;
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-        int err;
-        struct qstr str = dentry->d_name;
-
-        str.hash = jhash(dentry->d_name.name, dentry->d_name.len, 0);
-
-        err = inode->i_sb->s_op->write_inode(inode, 0);
-        if (err)
-                return err;
-
-        err = pohmelfs_create_link(POHMELFS_I(dir), &str, pi, NULL);
-        if (err)
-                return err;
-
-        return pohmelfs_create_entry(dir, dentry, pi->ino, inode->i_mode);
-}
-
-static int pohmelfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
-{
-        struct qstr sym_str;
-        struct qstr str = dentry->d_name;
-        struct inode *inode;
-        int err;
-
-        str.hash = jhash(dentry->d_name.name, dentry->d_name.len, 0);
-
-        sym_str.name = symname;
-        sym_str.len = strlen(symname);
-
-        err = pohmelfs_create_link(POHMELFS_I(dir), &str, NULL, &sym_str);
-        if (err)
-                goto err_out_exit;
-
-        err = pohmelfs_create_entry(dir, dentry, 0, S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO);
-        if (err)
-                goto err_out_exit;
-
-        inode = dentry->d_inode;
-
-        err = page_symlink(inode, symname, sym_str.len + 1);
-        if (err)
-                goto err_out_put;
-
-        return 0;
-
-err_out_put:
-        iput(inode);
-err_out_exit:
-        return err;
-}
-
-static int pohmelfs_send_rename(struct pohmelfs_inode *pi, struct pohmelfs_inode *parent,
-                struct qstr *str)
-{
-        int path_len, err, total_len = 0, inode_len, parent_len;
-        char *path;
-        struct netfs_trans *t;
-        struct netfs_cmd *cmd;
-        struct pohmelfs_sb *psb = POHMELFS_SB(pi->vfs_inode.i_sb);
-
-        parent_len = pohmelfs_path_length(parent);
-        inode_len = pohmelfs_path_length(pi);
-
-        if (parent_len < 0 || inode_len < 0)
-                return -EINVAL;
-
-        path_len = parent_len + inode_len + str->len + 3;
-
-        t = netfs_trans_alloc(psb, path_len, 0, 0);
-        if (!t)
-                return -ENOMEM;
-
-        cmd = netfs_trans_current(t);
-        path = (char *)(cmd + 1);
-
-        err = pohmelfs_construct_path_string(pi, path, inode_len);
-        if (err < 0)
-                goto err_out_unlock;
-
-        cmd->ext = err;
-
-        path += err;
-        total_len += err;
-        path_len -= err;
-
-        *path = '|';
-        path++;
-        total_len++;
-        path_len--;
-
-        err = pohmelfs_construct_path_string(parent, path, parent_len);
-        if (err < 0)
-                goto err_out_unlock;
-
-        /*
-         * Do not place a null-byte before the final slash and the name.
-         */
-        err--;
-        path += err;
-        total_len += err;
-        path_len -= err;
-
-        err = snprintf(path, path_len - 1, "/%s", str->name);
-
-        total_len += err + 1; /* 0 symbol */
-        path_len -= err + 1;
-
-        cmd->cmd = NETFS_RENAME;
-        cmd->id = pi->ino;
-        cmd->start = parent->ino;
-        cmd->size = total_len;
-
-        netfs_convert_cmd(cmd);
-
-        netfs_trans_update(cmd, t, total_len);
-
-        return netfs_trans_finish(t, psb);
-
-err_out_unlock:
-        netfs_trans_free(t);
-        return err;
-}
-
-static int pohmelfs_rename(struct inode *old_dir, struct dentry *old_dentry,
-                        struct inode *new_dir, struct dentry *new_dentry)
-{
-        struct inode *inode = old_dentry->d_inode;
-        struct pohmelfs_inode *old_parent, *pi, *new_parent;
-        struct qstr str = new_dentry->d_name;
-        struct pohmelfs_name *n;
-        unsigned int old_hash;
-        int err = -ENOENT;
-
-        pi = POHMELFS_I(inode);
-        old_parent = POHMELFS_I(old_dir);
-
-        if (new_dir)
-                new_dir->i_sb->s_op->write_inode(new_dir, 0);
-
-        old_hash = jhash(old_dentry->d_name.name, old_dentry->d_name.len, 0);
-        str.hash = jhash(new_dentry->d_name.name, new_dentry->d_name.len, 0);
-
-        str.len = new_dentry->d_name.len;
-        str.name = new_dentry->d_name.name;
-        str.hash = jhash(new_dentry->d_name.name, new_dentry->d_name.len, 0);
-
-        if (new_dir) {
-                new_parent = POHMELFS_I(new_dir);
-                err = -ENOTEMPTY;
-
-                if (S_ISDIR(inode->i_mode) &&
-                                new_parent->total_len <= 3)
-                        goto err_out_exit;
-        } else {
-                new_parent = old_parent;
-        }
-
-        dprintk("%s: ino: %llu, parent: %llu, name: '%s' -> parent: %llu, name: '%s', i_size: %llu.\n",
-                        __func__, pi->ino, old_parent->ino, old_dentry->d_name.name,
-                        new_parent->ino, new_dentry->d_name.name, inode->i_size);
-
-        if (test_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state) &&
-                        test_bit(NETFS_INODE_OWNED, &pi->state)) {
-                err = pohmelfs_send_rename(pi, new_parent, &str);
-                if (err)
-                        goto err_out_exit;
-        }
-
-        n = pohmelfs_name_alloc(str.len + 1);
-        if (!n)
-                goto err_out_exit;
-
-        mutex_lock(&new_parent->offset_lock);
-        n->ino = pi->ino;
-        n->mode = inode->i_mode;
-        n->len = str.len;
-        n->hash = str.hash;
-        sprintf(n->data, "%s", str.name);
-
-        err = pohmelfs_insert_name(new_parent, n);
-        mutex_unlock(&new_parent->offset_lock);
-
-        if (err)
-                goto err_out_exit;
-
-        mutex_lock(&old_parent->offset_lock);
-        n = pohmelfs_search_hash(old_parent, old_hash);
-        if (n)
-                pohmelfs_name_del(old_parent, n);
-        mutex_unlock(&old_parent->offset_lock);
-
-        mark_inode_dirty(inode);
-        mark_inode_dirty(&new_parent->vfs_inode);
-
-        WARN_ON_ONCE(list_empty(&inode->i_dentry));
-
-        return 0;
-
-err_out_exit:
-
-        clear_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state);
-
-        return err;
-}
-
-/*
- * POHMELFS directory inode operations.
- */
-const struct inode_operations pohmelfs_dir_inode_ops = {
-        .link           = pohmelfs_link,
-        .symlink        = pohmelfs_symlink,
-        .unlink         = pohmelfs_unlink,
-        .mkdir          = pohmelfs_mkdir,
-        .rmdir          = pohmelfs_rmdir,
-        .create         = pohmelfs_create,
-        .lookup         = pohmelfs_lookup,
-        .setattr        = pohmelfs_setattr,
-        .rename         = pohmelfs_rename,
-};
diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
deleted file mode 100644
index 807e3f324113..000000000000
--- a/drivers/staging/pohmelfs/inode.c
+++ /dev/null
@@ -1,2055 +0,0 @@
-/*
- * 2007+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
- * All rights reserved.
- *
- * 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.
- */
-
-#include <linux/module.h>
-#include <linux/backing-dev.h>
-#include <linux/crypto.h>
-#include <linux/fs.h>
-#include <linux/jhash.h>
-#include <linux/hash.h>
-#include <linux/ktime.h>
-#include <linux/mm.h>
-#include <linux/mount.h>
-#include <linux/pagemap.h>
-#include <linux/pagevec.h>
-#include <linux/parser.h>
-#include <linux/swap.h>
-#include <linux/slab.h>
-#include <linux/statfs.h>
-#include <linux/writeback.h>
-#include <linux/prefetch.h>
-
-#include "netfs.h"
-
-#define POHMELFS_MAGIC_NUM      0x504f482e
-
-static struct kmem_cache *pohmelfs_inode_cache;
-static atomic_t psb_bdi_num = ATOMIC_INIT(0);
-
-/*
- * Removes inode from all trees, drops local name cache and removes all queued
- * requests for object removal.
- */
-void pohmelfs_inode_del_inode(struct pohmelfs_sb *psb, struct pohmelfs_inode *pi)
-{
-        mutex_lock(&pi->offset_lock);
-        pohmelfs_free_names(pi);
-        mutex_unlock(&pi->offset_lock);
-
-        dprintk("%s: deleted stuff in ino: %llu.\n", __func__, pi->ino);
-}
-
-/*
- * Sync inode to server.
- * Returns zero in success and negative error value otherwise.
- * It will gather path to root directory into structures containing
- * creation mode, permissions and names, so that the whole path
- * to given inode could be created using only single network command.
- */
-int pohmelfs_write_inode_create(struct inode *inode, struct netfs_trans *trans)
-{
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-        int err = -ENOMEM, size;
-        struct netfs_cmd *cmd;
-        void *data;
-        int cur_len = netfs_trans_cur_len(trans);
-
-        if (unlikely(cur_len < 0))
-                return -ETOOSMALL;
-
-        cmd = netfs_trans_current(trans);
-        cur_len -= sizeof(struct netfs_cmd);
-
-        data = (void *)(cmd + 1);
-
-        err = pohmelfs_construct_path_string(pi, data, cur_len);
-        if (err < 0)
-                goto err_out_exit;
-
-        size = err;
-
-        cmd->start = i_size_read(inode);
-        cmd->cmd = NETFS_CREATE;
-        cmd->size = size;
-        cmd->id = pi->ino;
-        cmd->ext = inode->i_mode;
-
-        netfs_convert_cmd(cmd);
-
-        netfs_trans_update(cmd, trans, size);
-
-        return 0;
-
-err_out_exit:
-        printk("%s: completed ino: %llu, err: %d.\n", __func__, pi->ino, err);
-        return err;
-}
-
-static int pohmelfs_write_trans_complete(struct page **pages, unsigned int page_num,
-                void *private, int err)
-{
-        unsigned i;
-
-        dprintk("%s: pages: %lu-%lu, page_num: %u, err: %d.\n",
-                        __func__, pages[0]->index, pages[page_num-1]->index,
-                        page_num, err);
-
-        for (i = 0; i < page_num; i++) {
-                struct page *page = pages[i];
-
-                if (!page)
-                        continue;
-
-                end_page_writeback(page);
-
-                if (err < 0) {
-                        SetPageError(page);
-                        set_page_dirty(page);
-                }
-
-                unlock_page(page);
-                page_cache_release(page);
-
-                /* dprintk("%s: %3u/%u: page: %p.\n", __func__, i, page_num, page); */
-        }
-        return err;
-}
-
-static int pohmelfs_inode_has_dirty_pages(struct address_space *mapping, pgoff_t index)
-{
-        int ret;
-        struct page *page;
-
-        rcu_read_lock();
-        ret = radix_tree_gang_lookup_tag(&mapping->page_tree,
-                                (void **)&page, index, 1, PAGECACHE_TAG_DIRTY);
-        rcu_read_unlock();
-        return ret;
-}
-
-static int pohmelfs_writepages(struct address_space *mapping, struct writeback_control *wbc)
-{
-        struct inode *inode = mapping->host;
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-        struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb);
-        int err = 0;
-        int done = 0;
-        int nr_pages;
-        pgoff_t index;
-        pgoff_t end;            /* Inclusive */
-        int scanned = 0;
-        int range_whole = 0;
-
-        if (wbc->range_cyclic) {
-                index = mapping->writeback_index; /* Start from prev offset */
-                end = -1;
-        } else {
-                index = wbc->range_start >> PAGE_CACHE_SHIFT;
-                end = wbc->range_end >> PAGE_CACHE_SHIFT;
-                if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
-                        range_whole = 1;
-                scanned = 1;
-        }
-retry:
-        while (!done && (index <= end)) {
-                unsigned int i = min(end - index, (pgoff_t)psb->trans_max_pages);
-                int path_len;
-                struct netfs_trans *trans;
-
-                err = pohmelfs_inode_has_dirty_pages(mapping, index);
-                if (!err)
-                        break;
-
-                err = pohmelfs_path_length(pi);
-                if (err < 0)
-                        break;
-
-                path_len = err;
-
-                if (path_len <= 2) {
-                        err = -ENOENT;
-                        break;
-                }
-
-                trans = netfs_trans_alloc(psb, path_len, 0, i);
-                if (!trans) {
-                        err = -ENOMEM;
-                        break;
-                }
-                trans->complete = &pohmelfs_write_trans_complete;
-
-                trans->page_num = nr_pages = find_get_pages_tag(mapping, &index,
-                                PAGECACHE_TAG_DIRTY, trans->page_num,
-                                trans->pages);
-
-                dprintk("%s: t: %p, nr_pages: %u, end: %lu, index: %lu, max: %u.\n",
-                                __func__, trans, nr_pages, end, index, trans->page_num);
-
-                if (!nr_pages)
-                        goto err_out_reset;
-
-                err = pohmelfs_write_inode_create(inode, trans);
-                if (err)
-                        goto err_out_reset;
-
-                err = 0;
-                scanned = 1;
-
-                for (i = 0; i < trans->page_num; i++) {
-                        struct page *page = trans->pages[i];
-
-                        lock_page(page);
-
-                        if (unlikely(page->mapping != mapping))
-                                goto out_continue;
-
-                        if (!wbc->range_cyclic && page->index > end) {
-                                done = 1;
-                                goto out_continue;
-                        }
-
-                        if (wbc->sync_mode != WB_SYNC_NONE)
-                                wait_on_page_writeback(page);
-
-                        if (PageWriteback(page) ||
-                            !clear_page_dirty_for_io(page)) {
-                                dprintk("%s: not clear for io page: %p, writeback: %d.\n",
-                                                __func__, page, PageWriteback(page));
-                                goto out_continue;
-                        }
-
-                        set_page_writeback(page);
-
-                        trans->attached_size += page_private(page);
-                        trans->attached_pages++;
-#if 0
-                        dprintk("%s: %u/%u added trans: %p, gen: %u, page: %p, [High: %d], size: %lu, idx: %lu.\n",
-                                        __func__, i, trans->page_num, trans, trans->gen, page,
-                                        !!PageHighMem(page), page_private(page), page->index);
-#endif
-                        wbc->nr_to_write--;
-
-                        if (wbc->nr_to_write <= 0)
-                                done = 1;
-
-                        continue;
-out_continue:
-                        unlock_page(page);
-                        trans->pages[i] = NULL;
-                }
-
-                err = netfs_trans_finish(trans, psb);
-                if (err)
-                        break;
-
-                continue;
-
-err_out_reset:
-                trans->result = err;
-                netfs_trans_reset(trans);
-                netfs_trans_put(trans);
-                break;
-        }
-
-        if (!scanned && !done) {
-                /*
-                 * We hit the last page and there is more work to be done: wrap
-                 * back to the start of the file
-                 */
-                scanned = 1;
-                index = 0;
-                goto retry;
-        }
-
-        if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))
-                mapping->writeback_index = index;
-
-        return err;
-}
-
-/*
- * Inode writeback creation completion callback.
- * Only invoked for just created inodes, which do not have pages attached,
- * like dirs and empty files.
- */
-static int pohmelfs_write_inode_complete(struct page **pages, unsigned int page_num,
-                void *private, int err)
-{
-        struct inode *inode = private;
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-
-        if (inode) {
-                if (err) {
-                        mark_inode_dirty(inode);
-                        clear_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state);
-                } else {
-                        set_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state);
-                }
-
-                pohmelfs_put_inode(pi);
-        }
-
-        return err;
-}
-
-int pohmelfs_write_create_inode(struct pohmelfs_inode *pi)
-{
-        struct netfs_trans *t;
-        struct inode *inode = &pi->vfs_inode;
-        struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb);
-        int err;
-
-        if (test_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state))
-                return 0;
-
-        dprintk("%s: started ino: %llu.\n", __func__, pi->ino);
-
-        err = pohmelfs_path_length(pi);
-        if (err < 0)
-                goto err_out_exit;
-
-        t = netfs_trans_alloc(psb, err + 1, 0, 0);
-        if (!t) {
-                err = -ENOMEM;
-                goto err_out_exit;
-        }
-        t->complete = pohmelfs_write_inode_complete;
-        t->private = igrab(inode);
-        if (!t->private) {
-                err = -ENOENT;
-                goto err_out_put;
-        }
-
-        err = pohmelfs_write_inode_create(inode, t);
-        if (err)
-                goto err_out_put;
-
-        netfs_trans_finish(t, POHMELFS_SB(inode->i_sb));
-
-        return 0;
-
-err_out_put:
-        t->result = err;
-        netfs_trans_put(t);
-err_out_exit:
-        return err;
-}
-
-/*
- * Sync all not-yet-created children in given directory to the server.
- */
-static int pohmelfs_write_inode_create_children(struct inode *inode)
-{
-        struct pohmelfs_inode *parent = POHMELFS_I(inode);
-        struct super_block *sb = inode->i_sb;
-        struct pohmelfs_name *n;
-
-        while (!list_empty(&parent->sync_create_list)) {
-                n = NULL;
-                mutex_lock(&parent->offset_lock);
-                if (!list_empty(&parent->sync_create_list)) {
-                        n = list_first_entry(&parent->sync_create_list,
-                                struct pohmelfs_name, sync_create_entry);
-                        list_del_init(&n->sync_create_entry);
-                }
-                mutex_unlock(&parent->offset_lock);
-
-                if (!n)
-                        break;
-
-                inode = ilookup(sb, n->ino);
-
-                dprintk("%s: parent: %llu, ino: %llu, inode: %p.\n",
-                                __func__, parent->ino, n->ino, inode);
-
-                if (inode && (inode->i_state & I_DIRTY)) {
-                        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-                        pohmelfs_write_create_inode(pi);
-                        /* pohmelfs_meta_command(pi, NETFS_INODE_INFO, 0, NULL, NULL, 0); */
-                        iput(inode);
-                }
-        }
-
-        return 0;
-}
-
-/*
- * Removes given child from given inode on server.
- */
-int pohmelfs_remove_child(struct pohmelfs_inode *pi, struct pohmelfs_name *n)
-{
-        return pohmelfs_meta_command_data(pi, pi->ino, NETFS_REMOVE, NULL, 0, NULL, NULL, 0);
-}
-
-/*
- * Writeback for given inode.
- */
-static int pohmelfs_write_inode(struct inode *inode,
-                                struct writeback_control *wbc)
-{
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-
-        pohmelfs_write_create_inode(pi);
-        pohmelfs_write_inode_create_children(inode);
-
-        return 0;
-}
-
-/*
- * It is not exported, sorry...
- */
-static inline wait_queue_head_t *page_waitqueue(struct page *page)
-{
-        const struct zone *zone = page_zone(page);
-
-        return &zone->wait_table[hash_ptr(page, zone->wait_table_bits)];
-}
-
-static int pohmelfs_wait_on_page_locked(struct page *page)
-{
-        struct pohmelfs_sb *psb = POHMELFS_SB(page->mapping->host->i_sb);
-        long ret = psb->wait_on_page_timeout;
-        DEFINE_WAIT_BIT(wait, &page->flags, PG_locked);
-        int err = 0;
-
-        if (!PageLocked(page))
-                return 0;
-
-        for (;;) {
-                prepare_to_wait(page_waitqueue(page),
-                                &wait.wait, TASK_INTERRUPTIBLE);
-
-                dprintk("%s: page: %p, locked: %d, uptodate: %d, error: %d, flags: %lx.\n",
-                                __func__, page, PageLocked(page), PageUptodate(page),
-                                PageError(page), page->flags);
-
-                if (!PageLocked(page))
-                        break;
-
-                if (!signal_pending(current)) {
-                        ret = schedule_timeout(ret);
-                        if (!ret)
-                                break;
-                        continue;
-                }
-                ret = -ERESTARTSYS;
-                break;
-        }
-        finish_wait(page_waitqueue(page), &wait.wait);
-
-        if (!ret)
-                err = -ETIMEDOUT;
-
-
-        if (!err)
-                SetPageUptodate(page);
-
-        if (err)
-                printk("%s: page: %p, uptodate: %d, locked: %d, err: %d.\n",
-                        __func__, page, PageUptodate(page), PageLocked(page), err);
-
-        return err;
-}
-
-static int pohmelfs_read_page_complete(struct page **pages, unsigned int page_num,
-                void *private, int err)
-{
-        struct page *page = private;
-
-        if (PageChecked(page))
-                return err;
-
-        if (err < 0) {
-                dprintk("%s: page: %p, err: %d.\n", __func__, page, err);
-                SetPageError(page);
-        }
-
-        unlock_page(page);
-
-        return err;
-}
-
-/*
- * Read a page from remote server.
- * Function will wait until page is unlocked.
- */
-static int pohmelfs_readpage(struct file *file, struct page *page)
-{
-        struct inode *inode = page->mapping->host;
-        struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb);
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-        struct netfs_trans *t;
-        struct netfs_cmd *cmd;
-        int err, path_len;
-        void *data;
-        u64 isize;
-
-        err = pohmelfs_data_lock(pi, page->index << PAGE_CACHE_SHIFT,
-                        PAGE_SIZE, POHMELFS_READ_LOCK);
-        if (err)
-                goto err_out_exit;
-
-        isize = i_size_read(inode);
-        if (isize <= page->index << PAGE_CACHE_SHIFT) {
-                SetPageUptodate(page);
-                unlock_page(page);
-                return 0;
-        }
-
-        path_len = pohmelfs_path_length(pi);
-        if (path_len < 0) {
-                err = path_len;
-                goto err_out_exit;
-        }
-
-        t = netfs_trans_alloc(psb, path_len, NETFS_TRANS_SINGLE_DST, 0);
-        if (!t) {
-                err = -ENOMEM;
-                goto err_out_exit;
-        }
-
-        t->complete = pohmelfs_read_page_complete;
-        t->private = page;
-
-        cmd = netfs_trans_current(t);
-        data = (void *)(cmd + 1);
-
-        err = pohmelfs_construct_path_string(pi, data, path_len);
-        if (err < 0)
-                goto err_out_free;
-
-        path_len = err;
-
-        cmd->id = pi->ino;
-        cmd->start = page->index;
-        cmd->start <<= PAGE_CACHE_SHIFT;
-        cmd->size = PAGE_CACHE_SIZE + path_len;
-        cmd->cmd = NETFS_READ_PAGE;
-        cmd->ext = path_len;
-
-        dprintk("%s: path: '%s', page: %p, ino: %llu, start: %llu, size: %lu.\n",
-                        __func__, (char *)data, page, pi->ino, cmd->start, PAGE_CACHE_SIZE);
-
-        netfs_convert_cmd(cmd);
-        netfs_trans_update(cmd, t, path_len);
-
-        err = netfs_trans_finish(t, psb);
-        if (err)
-                goto err_out_return;
-
-        return pohmelfs_wait_on_page_locked(page);
-
-err_out_free:
-        t->result = err;
-        netfs_trans_put(t);
-err_out_exit:
-        SetPageError(page);
-        if (PageLocked(page))
-                unlock_page(page);
-err_out_return:
-        printk("%s: page: %p, start: %lu, size: %lu, err: %d.\n",
-                __func__, page, page->index << PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE, err);
-
-        return err;
-}
-
-/*
- * Write begin/end magic.
- * Allocates a page and writes inode if it was not synced to server before.
- */
-static int pohmelfs_write_begin(struct file *file, struct address_space *mapping,
-                loff_t pos, unsigned len, unsigned flags,
-                struct page **pagep, void **fsdata)
-{
-        struct inode *inode = mapping->host;
-        struct page *page;
-        pgoff_t index;
-        unsigned start, end;
-        int err;
-
-        *pagep = NULL;
-
-        index = pos >> PAGE_CACHE_SHIFT;
-        start = pos & (PAGE_CACHE_SIZE - 1);
-        end = start + len;
-
-        page = grab_cache_page(mapping, index);
-#if 0
-        dprintk("%s: page: %p pos: %llu, len: %u, index: %lu, start: %u, end: %u, uptodate: %d.\n",
-                        __func__, page, pos, len, index, start, end, PageUptodate(page));
-#endif
-        if (!page) {
-                err = -ENOMEM;
-                goto err_out_exit;
-        }
-
-        while (!PageUptodate(page)) {
-                if (start && test_bit(NETFS_INODE_REMOTE_SYNCED, &POHMELFS_I(inode)->state)) {
-                        err = pohmelfs_readpage(file, page);
-                        if (err)
-                                goto err_out_exit;
-
-                        lock_page(page);
-                        continue;
-                }
-
-                if (len != PAGE_CACHE_SIZE) {
-                        void *kaddr = kmap_atomic(page, KM_USER0);
-
-                        memset(kaddr + start, 0, PAGE_CACHE_SIZE - start);
-                        flush_dcache_page(page);
-                        kunmap_atomic(kaddr, KM_USER0);
-                }
-                SetPageUptodate(page);
-        }
-
-        set_page_private(page, end);
-
-        *pagep = page;
-
-        return 0;
-
-err_out_exit:
-        page_cache_release(page);
-        *pagep = NULL;
-
-        return err;
-}
-
-static int pohmelfs_write_end(struct file *file, struct address_space *mapping,
-                        loff_t pos, unsigned len, unsigned copied,
-                        struct page *page, void *fsdata)
-{
-        struct inode *inode = mapping->host;
-
-        if (copied != len) {
-                unsigned from = pos & (PAGE_CACHE_SIZE - 1);
-                void *kaddr = kmap_atomic(page, KM_USER0);
-
-                memset(kaddr + from + copied, 0, len - copied);
-                flush_dcache_page(page);
-                kunmap_atomic(kaddr, KM_USER0);
-        }
-
-        SetPageUptodate(page);
-        set_page_dirty(page);
-#if 0
-        dprintk("%s: page: %p [U: %d, D: %d, L: %d], pos: %llu, len: %u, copied: %u.\n",
-                        __func__, page,
-                        PageUptodate(page), PageDirty(page), PageLocked(page),
-                        pos, len, copied);
-#endif
-        flush_dcache_page(page);
-
-        unlock_page(page);
-        page_cache_release(page);
-
-        if (pos + copied > inode->i_size) {
-                struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb);
-
-                psb->avail_size -= pos + copied - inode->i_size;
-
-                i_size_write(inode, pos + copied);
-        }
-
-        return copied;
-}
-
-static int pohmelfs_readpages_trans_complete(struct page **__pages, unsigned int page_num,
-                void *private, int err)
-{
-        struct pohmelfs_inode *pi = private;
-        unsigned int i, num;
-        struct page **pages, *page = (struct page *)__pages;
-        loff_t index = page->index;
-
-        pages = kzalloc(sizeof(void *) * page_num, GFP_NOIO);
-        if (!pages)
-                return -ENOMEM;
-
-        num = find_get_pages_contig(pi->vfs_inode.i_mapping, index, page_num, pages);
-        if (num <= 0) {
-                err = num;
-                goto err_out_free;
-        }
-
-        for (i = 0; i < num; ++i) {
-                page = pages[i];
-
-                if (err)
-                        printk("%s: %u/%u: page: %p, index: %lu, uptodate: %d, locked: %d, err: %d.\n",
-                                __func__, i, num, page, page->index,
-                                PageUptodate(page), PageLocked(page), err);
-
-                if (!PageChecked(page)) {
-                        if (err < 0)
-                                SetPageError(page);
-                        unlock_page(page);
-                }
-                page_cache_release(page);
-                page_cache_release(page);
-        }
-
-err_out_free:
-        kfree(pages);
-        return err;
-}
-
-static int pohmelfs_send_readpages(struct pohmelfs_inode *pi, struct page *first, unsigned int num)
-{
-        struct netfs_trans *t;
-        struct netfs_cmd *cmd;
-        struct pohmelfs_sb *psb = POHMELFS_SB(pi->vfs_inode.i_sb);
-        int err, path_len;
-        void *data;
-
-        err = pohmelfs_data_lock(pi, first->index << PAGE_CACHE_SHIFT,
-                        num * PAGE_SIZE, POHMELFS_READ_LOCK);
-        if (err)
-                goto err_out_exit;
-
-        path_len = pohmelfs_path_length(pi);
-        if (path_len < 0) {
-                err = path_len;
-                goto err_out_exit;
-        }
-
-        t = netfs_trans_alloc(psb, path_len, NETFS_TRANS_SINGLE_DST, 0);
-        if (!t) {
-                err = -ENOMEM;
-                goto err_out_exit;
-        }
-
-        cmd = netfs_trans_current(t);
-        data = (void *)(cmd + 1);
-
-        t->complete = pohmelfs_readpages_trans_complete;
-        t->private = pi;
-        t->page_num = num;
-        t->pages = (struct page **)first;
-
-        err = pohmelfs_construct_path_string(pi, data, path_len);
-        if (err < 0)
-                goto err_out_put;
-
-        path_len = err;
-
-        cmd->cmd = NETFS_READ_PAGES;
-        cmd->start = first->index;
-        cmd->start <<= PAGE_CACHE_SHIFT;
-        cmd->size = (num << 8 | PAGE_CACHE_SHIFT);
-        cmd->id = pi->ino;
-        cmd->ext = path_len;
-
-        dprintk("%s: t: %p, gen: %u, path: '%s', path_len: %u, "
-                        "start: %lu, num: %u.\n",
-                        __func__, t, t->gen, (char *)data, path_len,
-                        first->index, num);
-
-        netfs_convert_cmd(cmd);
-        netfs_trans_update(cmd, t, path_len);
-
-        return netfs_trans_finish(t, psb);
-
-err_out_put:
-        netfs_trans_free(t);
-err_out_exit:
-        pohmelfs_readpages_trans_complete((struct page **)first, num, pi, err);
-        return err;
-}
-
-#define list_to_page(head) (list_entry((head)->prev, struct page, lru))
-
-static int pohmelfs_readpages(struct file *file, struct address_space *mapping,
-                        struct list_head *pages, unsigned nr_pages)
-{
-        unsigned int page_idx, num = 0;
-        struct page *page = NULL, *first = NULL;
-
-        for (page_idx = 0; page_idx < nr_pages; page_idx++) {
-                page = list_to_page(pages);
-
-                prefetchw(&page->flags);
-                list_del(&page->lru);
-
-                if (!add_to_page_cache_lru(page, mapping,
-                                        page->index, GFP_KERNEL)) {
-
-                        if (!num) {
-                                num = 1;
-                                first = page;
-                                continue;
-                        }
-
-                        dprintk("%s: added to lru page: %p, page_index: %lu, first_index: %lu.\n",
-                                        __func__, page, page->index, first->index);
-
-                        if (unlikely(first->index + num != page->index) || (num > 500)) {
-                                pohmelfs_send_readpages(POHMELFS_I(mapping->host),
-                                                first, num);
-                                first = page;
-                                num = 0;
-                        }
-
-                        num++;
-                }
-        }
-        pohmelfs_send_readpages(POHMELFS_I(mapping->host), first, num);
-
-        /*
-         * This will be sync read, so when last page is processed,
-         * all previous are alerady unlocked and ready to be used.
-         */
-        return 0;
-}
-
-/*
- * Small address space operations for POHMELFS.
- */
-const struct address_space_operations pohmelfs_aops = {
-        .readpage               = pohmelfs_readpage,
-        .readpages              = pohmelfs_readpages,
-        .writepages             = pohmelfs_writepages,
-        .write_begin            = pohmelfs_write_begin,
-        .write_end              = pohmelfs_write_end,
-        .set_page_dirty         = __set_page_dirty_nobuffers,
-};
-
-static void pohmelfs_i_callback(struct rcu_head *head)
-{
-        struct inode *inode = container_of(head, struct inode, i_rcu);
-        kmem_cache_free(pohmelfs_inode_cache, POHMELFS_I(inode));
-}
-
-/*
- * ->destroy_inode() callback. Deletes inode from the caches
- *  and frees private data.
- */
-static void pohmelfs_destroy_inode(struct inode *inode)
-{
-        struct super_block *sb = inode->i_sb;
-        struct pohmelfs_sb *psb = POHMELFS_SB(sb);
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-
-        /* pohmelfs_data_unlock(pi, 0, inode->i_size, POHMELFS_READ_LOCK); */
-
-        pohmelfs_inode_del_inode(psb, pi);
-
-        dprintk("%s: pi: %p, inode: %p, ino: %llu.\n",
-                __func__, pi, &pi->vfs_inode, pi->ino);
-        atomic_long_dec(&psb->total_inodes);
-        call_rcu(&inode->i_rcu, pohmelfs_i_callback);
-}
-
-/*
- * ->alloc_inode() callback. Allocates inode and initializes private data.
- */
-static struct inode *pohmelfs_alloc_inode(struct super_block *sb)
-{
-        struct pohmelfs_inode *pi;
-
-        pi = kmem_cache_alloc(pohmelfs_inode_cache, GFP_NOIO);
-        if (!pi)
-                return NULL;
-
-        pi->hash_root = RB_ROOT;
-        mutex_init(&pi->offset_lock);
-
-        INIT_LIST_HEAD(&pi->sync_create_list);
-
-        INIT_LIST_HEAD(&pi->inode_entry);
-
-        pi->lock_type = 0;
-        pi->state = 0;
-        pi->total_len = 0;
-        pi->drop_count = 0;
-
-        dprintk("%s: pi: %p, inode: %p.\n", __func__, pi, &pi->vfs_inode);
-
-        atomic_long_inc(&POHMELFS_SB(sb)->total_inodes);
-
-        return &pi->vfs_inode;
-}
-
-/*
- * We want fsync() to work on POHMELFS.
- */
-static int pohmelfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
-{
-        struct inode *inode = file->f_mapping->host;
-        int err = filemap_write_and_wait_range(inode->i_mapping, start, end);
-        if (!err) {
-                mutex_lock(&inode->i_mutex);
-                err = sync_inode_metadata(inode, 1);
-                mutex_unlock(&inode->i_mutex);
-        }
-        return err;
-}
-
-ssize_t pohmelfs_write(struct file *file, const char __user *buf,
-                size_t len, loff_t *ppos)
-{
-        struct address_space *mapping = file->f_mapping;
-        struct inode *inode = mapping->host;
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-        struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = len };
-        struct kiocb kiocb;
-        ssize_t ret;
-        loff_t pos = *ppos;
-
-        init_sync_kiocb(&kiocb, file);
-        kiocb.ki_pos = pos;
-        kiocb.ki_left = len;
-
-        dprintk("%s: len: %zu, pos: %llu.\n", __func__, len, pos);
-
-        mutex_lock(&inode->i_mutex);
-        ret = pohmelfs_data_lock(pi, pos, len, POHMELFS_WRITE_LOCK);
-        if (ret)
-                goto err_out_unlock;
-
-        ret = __generic_file_aio_write(&kiocb, &iov, 1, &kiocb.ki_pos);
-        *ppos = kiocb.ki_pos;
-
-        mutex_unlock(&inode->i_mutex);
-        WARN_ON(ret < 0);
-
-        if (ret > 0) {
-                ssize_t err;
-
-                err = generic_write_sync(file, pos, ret);
-                if (err < 0)
-                        ret = err;
-                WARN_ON(ret < 0);
-        }
-
-        return ret;
-
-err_out_unlock:
-        mutex_unlock(&inode->i_mutex);
-        return ret;
-}
-
-static const struct file_operations pohmelfs_file_ops = {
-        .open           = generic_file_open,
-        .fsync          = pohmelfs_fsync,
-
-        .llseek         = generic_file_llseek,
-
-        .read           = do_sync_read,
-        .aio_read       = generic_file_aio_read,
-
-        .mmap           = generic_file_mmap,
-
-        .splice_read    = generic_file_splice_read,
-        .splice_write   = generic_file_splice_write,
-
-        .write          = pohmelfs_write,
-        .aio_write      = generic_file_aio_write,
-};
-
-const struct inode_operations pohmelfs_symlink_inode_operations = {
-        .readlink       = generic_readlink,
-        .follow_link    = page_follow_link_light,
-        .put_link       = page_put_link,
-};
-
-int pohmelfs_setattr_raw(struct inode *inode, struct iattr *attr)
-{
-        int err;
-
-        err = inode_change_ok(inode, attr);
-        if (err) {
-                dprintk("%s: ino: %llu, inode changes are not allowed.\n", __func__, POHMELFS_I(inode)->ino);
-                goto err_out_exit;
-        }
-
-        if ((attr->ia_valid & ATTR_SIZE) &&
-            attr->ia_size != i_size_read(inode)) {
-                err = vmtruncate(inode, attr->ia_size);
-                if (err) {
-                        dprintk("%s: ino: %llu, failed to set the attributes.\n", __func__, POHMELFS_I(inode)->ino);
-                        goto err_out_exit;
-                }
-        }
-
-        setattr_copy(inode, attr);
-        mark_inode_dirty(inode);
-
-        dprintk("%s: ino: %llu, mode: %o -> %o, uid: %u -> %u, gid: %u -> %u, size: %llu -> %llu.\n",
-                        __func__, POHMELFS_I(inode)->ino, inode->i_mode, attr->ia_mode,
-                        inode->i_uid, attr->ia_uid, inode->i_gid, attr->ia_gid, inode->i_size, attr->ia_size);
-
-        return 0;
-
-err_out_exit:
-        return err;
-}
-
-int pohmelfs_setattr(struct dentry *dentry, struct iattr *attr)
-{
-        struct inode *inode = dentry->d_inode;
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-        int err;
-
-        err = pohmelfs_data_lock(pi, 0, ~0, POHMELFS_WRITE_LOCK);
-        if (err)
-                goto err_out_exit;
-
-        err = security_inode_setattr(dentry, attr);
-        if (err)
-                goto err_out_exit;
-
-        err = pohmelfs_setattr_raw(inode, attr);
-        if (err)
-                goto err_out_exit;
-
-        return 0;
-
-err_out_exit:
-        return err;
-}
-
-static int pohmelfs_send_xattr_req(struct pohmelfs_inode *pi, u64 id, u64 start,
-                const char *name, const void *value, size_t attrsize, int command)
-{
-        struct pohmelfs_sb *psb = POHMELFS_SB(pi->vfs_inode.i_sb);
-        int err, path_len, namelen = strlen(name) + 1; /* 0-byte */
-        struct netfs_trans *t;
-        struct netfs_cmd *cmd;
-        void *data;
-
-        dprintk("%s: id: %llu, start: %llu, name: '%s', attrsize: %zu, cmd: %d.\n",
-                        __func__, id, start, name, attrsize, command);
-
-        path_len = pohmelfs_path_length(pi);
-        if (path_len < 0) {
-                err = path_len;
-                goto err_out_exit;
-        }
-
-        t = netfs_trans_alloc(psb, namelen + path_len + attrsize, 0, 0);
-        if (!t) {
-                err = -ENOMEM;
-                goto err_out_exit;
-        }
-
-        cmd = netfs_trans_current(t);
-        data = cmd + 1;
-
-        path_len = pohmelfs_construct_path_string(pi, data, path_len);
-        if (path_len < 0) {
-                err = path_len;
-                goto err_out_put;
-        }
-        data += path_len;
-
-        /*
-         * 'name' is a NUL-terminated string already and
-         * 'namelen' includes 0-byte.
-         */
-        memcpy(data, name, namelen);
-        data += namelen;
-
-        memcpy(data, value, attrsize);
-
-        cmd->cmd = command;
-        cmd->id = id;
-        cmd->start = start;
-        cmd->size = attrsize + namelen + path_len;
-        cmd->ext = path_len;
-        cmd->csize = 0;
-        cmd->cpad = 0;
-
-        netfs_convert_cmd(cmd);
-        netfs_trans_update(cmd, t, namelen + path_len + attrsize);
-
-        return netfs_trans_finish(t, psb);
-
-err_out_put:
-        t->result = err;
-        netfs_trans_put(t);
-err_out_exit:
-        return err;
-}
-
-static int pohmelfs_setxattr(struct dentry *dentry, const char *name,
-                const void *value, size_t attrsize, int flags)
-{
-        struct inode *inode = dentry->d_inode;
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-        struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb);
-
-        if (!(psb->state_flags & POHMELFS_FLAGS_XATTR))
-                return -EOPNOTSUPP;
-
-        return pohmelfs_send_xattr_req(pi, flags, attrsize, name,
-                        value, attrsize, NETFS_XATTR_SET);
-}
-
-static ssize_t pohmelfs_getxattr(struct dentry *dentry, const char *name,
-                void *value, size_t attrsize)
-{
-        struct inode *inode = dentry->d_inode;
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-        struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb);
-        struct pohmelfs_mcache *m;
-        int err;
-        long timeout = psb->mcache_timeout;
-
-        if (!(psb->state_flags & POHMELFS_FLAGS_XATTR))
-                return -EOPNOTSUPP;
-
-        m = pohmelfs_mcache_alloc(psb, 0, attrsize, value);
-        if (IS_ERR(m))
-                return PTR_ERR(m);
-
-        dprintk("%s: ino: %llu, name: '%s', size: %zu.\n",
-                        __func__, pi->ino, name, attrsize);
-
-        err = pohmelfs_send_xattr_req(pi, m->gen, attrsize, name, value, 0, NETFS_XATTR_GET);
-        if (err)
-                goto err_out_put;
-
-        do {
-                err = wait_for_completion_timeout(&m->complete, timeout);
-                if (err) {
-                        err = m->err;
-                        break;
-                }
-
-                /*
-                 * This loop is a bit ugly, since it waits until reference counter
-                 * hits 1 and then puts the object here. Main goal is to prevent race with
-                 * the network thread, when it can start processing the given request, i.e.
-                 * increase its reference counter but yet not complete it, while
-                 * we will exit from ->getxattr() with timeout, and although request
-                 * will not be freed (its reference counter was increased by network
-                 * thread), data pointer provided by user may be released, so we will
-                 * overwrite an already freed area in the network thread.
-                 *
-                 * Now after timeout we remove request from the cache, so it can not be
-                 * found by network thread, and wait for its reference counter to hit 1,
-                 * i.e. if network thread already started to process this request, we wait
-                 * for it to finish, and then free object locally. If reference counter is
-                 * already 1, i.e. request is not used by anyone else, we can free it without
-                 * problem.
-                 */
-                err = -ETIMEDOUT;
-                timeout = HZ;
-
-                pohmelfs_mcache_remove_locked(psb, m);
-        } while (atomic_read(&m->refcnt) != 1);
-
-        pohmelfs_mcache_put(psb, m);
-
-        dprintk("%s: ino: %llu, err: %d.\n", __func__, pi->ino, err);
-
-        return err;
-
-err_out_put:
-        pohmelfs_mcache_put(psb, m);
-        return err;
-}
-
-static int pohmelfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
-{
-        struct inode *inode = dentry->d_inode;
-#if 0
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-        int err;
-
-        err = pohmelfs_data_lock(pi, 0, ~0, POHMELFS_READ_LOCK);
-        if (err)
-                return err;
-        dprintk("%s: ino: %llu, mode: %o, uid: %u, gid: %u, size: %llu.\n",
-                        __func__, pi->ino, inode->i_mode, inode->i_uid,
-                        inode->i_gid, inode->i_size);
-#endif
-
-        generic_fillattr(inode, stat);
-        return 0;
-}
-
-const struct inode_operations pohmelfs_file_inode_operations = {
-        .setattr        = pohmelfs_setattr,
-        .getattr        = pohmelfs_getattr,
-        .setxattr       = pohmelfs_setxattr,
-        .getxattr       = pohmelfs_getxattr,
-};
-
-/*
- * Fill inode data: mode, size, operation callbacks and so on...
- */
-void pohmelfs_fill_inode(struct inode *inode, struct netfs_inode_info *info)
-{
-        inode->i_mode = info->mode;
-        set_nlink(inode, info->nlink);
-        inode->i_uid = info->uid;
-        inode->i_gid = info->gid;
-        inode->i_blocks = info->blocks;
-        inode->i_rdev = info->rdev;
-        inode->i_size = info->size;
-        inode->i_version = info->version;
-        inode->i_blkbits = ffs(info->blocksize);
-
-        dprintk("%s: inode: %p, num: %lu/%llu inode is regular: %d, dir: %d, link: %d, mode: %o, size: %llu.\n",
-                        __func__, inode, inode->i_ino, info->ino,
-                        S_ISREG(inode->i_mode), S_ISDIR(inode->i_mode),
-                        S_ISLNK(inode->i_mode), inode->i_mode, inode->i_size);
-
-        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
-
-        /*
-         * i_mapping is a pointer to i_data during inode initialization.
-         */
-        inode->i_data.a_ops = &pohmelfs_aops;
-
-        if (S_ISREG(inode->i_mode)) {
-                inode->i_fop = &pohmelfs_file_ops;
-                inode->i_op = &pohmelfs_file_inode_operations;
-        } else if (S_ISDIR(inode->i_mode)) {
-                inode->i_fop = &pohmelfs_dir_fops;
-                inode->i_op = &pohmelfs_dir_inode_ops;
-        } else if (S_ISLNK(inode->i_mode)) {
-                inode->i_op = &pohmelfs_symlink_inode_operations;
-                inode->i_fop = &pohmelfs_file_ops;
-        } else {
-                inode->i_fop = &generic_ro_fops;
-        }
-}
-
-static int pohmelfs_drop_inode(struct inode *inode)
-{
-        struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb);
-        struct pohmelfs_inode *pi = POHMELFS_I(inode);
-
-        spin_lock(&psb->ino_lock);
-        list_del_init(&pi->inode_entry);
-        spin_unlock(&psb->ino_lock);
-
-        return generic_drop_inode(inode);
-}
-
-static struct pohmelfs_inode *pohmelfs_get_inode_from_list(struct pohmelfs_sb *psb,
-                struct list_head *head, unsigned int *count)
-{
-        struct pohmelfs_inode *pi = NULL;
-
-        spin_lock(&psb->ino_lock);
-        if (!list_empty(head)) {
-                pi = list_entry(head->next, struct pohmelfs_inode,
-                                        inode_entry);
-                list_del_init(&pi->inode_entry);
-                *count = pi->drop_count;
-                pi->drop_count = 0;
-        }
-        spin_unlock(&psb->ino_lock);
-
-        return pi;
-}
-
-static void pohmelfs_flush_transactions(struct pohmelfs_sb *psb)
-{
-        struct pohmelfs_config *c;
-
-        mutex_lock(&psb->state_lock);
-        list_for_each_entry(c, &psb->state_list, config_entry) {
-                pohmelfs_state_flush_transactions(&c->state);
-        }
-        mutex_unlock(&psb->state_lock);
-}
-
-/*
- * ->put_super() callback. Invoked before superblock is destroyed,
- *  so it has to clean all private data.
- */
-static void pohmelfs_put_super(struct super_block *sb)
-{
-        struct pohmelfs_sb *psb = POHMELFS_SB(sb);
-        struct pohmelfs_inode *pi;
-        unsigned int count = 0;
-        unsigned int in_drop_list = 0;
-        struct inode *inode, *tmp;
-
-        dprintk("%s.\n", __func__);
-
-        /*
-         * Kill pending transactions, which could affect inodes in-flight.
-         */
-        pohmelfs_flush_transactions(psb);
-
-        while ((pi = pohmelfs_get_inode_from_list(psb, &psb->drop_list, &count))) {
-                inode = &pi->vfs_inode;
-
-                dprintk("%s: ino: %llu, pi: %p, inode: %p, count: %u.\n",
-                                __func__, pi->ino, pi, inode, count);
-
-                if (atomic_read(&inode->i_count) != count) {
-                        printk("%s: ino: %llu, pi: %p, inode: %p, count: %u, i_count: %d.\n",
-                                        __func__, pi->ino, pi, inode, count,
-                                        atomic_read(&inode->i_count));
-                        count = atomic_read(&inode->i_count);
-                        in_drop_list++;
-                }
-
-                while (count--)
-                        iput(&pi->vfs_inode);
-        }
-
-        list_for_each_entry_safe(inode, tmp, &sb->s_inodes, i_sb_list) {
-                pi = POHMELFS_I(inode);
-
-                dprintk("%s: ino: %llu, pi: %p, inode: %p, i_count: %u.\n",
-                                __func__, pi->ino, pi, inode, atomic_read(&inode->i_count));
-
-                /*
-                 * These are special inodes, they were created during
-                 * directory reading or lookup, and were not bound to dentry,
-                 * so they live here with reference counter being 1 and prevent
-                 * umount from succeed since it believes that they are busy.
-                 */
-                count = atomic_read(&inode->i_count);
-                if (count) {
-                        list_del_init(&inode->i_sb_list);
-                        while (count--)
-                                iput(&pi->vfs_inode);
-                }
-        }
-
-        psb->trans_scan_timeout = psb->drop_scan_timeout = 0;
-        cancel_delayed_work_sync(&psb->dwork);
-        cancel_delayed_work_sync(&psb->drop_dwork);
-        flush_scheduled_work();
-
-        dprintk("%s: stopped workqueues.\n", __func__);
-
-        pohmelfs_crypto_exit(psb);
-        pohmelfs_state_exit(psb);
-
-        bdi_destroy(&psb->bdi);
-
-        kfree(psb);
-        sb->s_fs_info = NULL;
-}
-
-static int pohmelfs_statfs(struct dentry *dentry, struct kstatfs *buf)
-{
-        struct super_block *sb = dentry->d_sb;
-        struct pohmelfs_sb *psb = POHMELFS_SB(sb);
-
-        /*
-         * There are no filesystem size limits yet.
-         */
-        memset(buf, 0, sizeof(struct kstatfs));
-
-        buf->f_type = POHMELFS_MAGIC_NUM; /* 'POH.' */
-        buf->f_bsize = sb->s_blocksize;
-        buf->f_files = psb->ino;
-        buf->f_namelen = 255;
-        buf->f_files = atomic_long_read(&psb->total_inodes);
-        buf->f_bfree = buf->f_bavail = psb->avail_size >> PAGE_SHIFT;
-        buf->f_blocks = psb->total_size >> PAGE_SHIFT;
-
-        dprintk("%s: total: %llu, avail: %llu, inodes: %llu, bsize: %lu.\n",
-                __func__, psb->total_size, psb->avail_size, buf->f_files, sb->s_blocksize);
-
-        return 0;
-}
-
-static int pohmelfs_show_options(struct seq_file *seq, struct dentry *root)
-{
-        struct pohmelfs_sb *psb = POHMELFS_SB(root->d_sb);
-
-        seq_printf(seq, ",idx=%u", psb->idx);
-        seq_printf(seq, ",trans_scan_timeout=%u", jiffies_to_msecs(psb->trans_scan_timeout));
-        seq_printf(seq, ",drop_scan_timeout=%u", jiffies_to_msecs(psb->drop_scan_timeout));
-        seq_printf(seq, ",wait_on_page_timeout=%u", jiffies_to_msecs(psb->wait_on_page_timeout));
-        seq_printf(seq, ",trans_retries=%u", psb->trans_retries);
-        seq_printf(seq, ",crypto_thread_num=%u", psb->crypto_thread_num);
-        seq_printf(seq, ",trans_max_pages=%u", psb->trans_max_pages);
-        seq_printf(seq, ",mcache_timeout=%u", jiffies_to_msecs(psb->mcache_timeout));
-        if (psb->crypto_fail_unsupported)
-                seq_printf(seq, ",crypto_fail_unsupported");
-
-        return 0;
-}
-
-enum {
-        pohmelfs_opt_idx,
-        pohmelfs_opt_crypto_thread_num,
-        pohmelfs_opt_trans_max_pages,
-        pohmelfs_opt_crypto_fail_unsupported,
-
-        /* Remountable options */
-        pohmelfs_opt_trans_scan_timeout,
-        pohmelfs_opt_drop_scan_timeout,
-        pohmelfs_opt_wait_on_page_timeout,
-        pohmelfs_opt_trans_retries,
-        pohmelfs_opt_mcache_timeout,
-};
-
-static struct match_token pohmelfs_tokens[] = {
-        {pohmelfs_opt_idx, "idx=%u"},
-        {pohmelfs_opt_crypto_thread_num, "crypto_thread_num=%u"},
-        {pohmelfs_opt_trans_max_pages, "trans_max_pages=%u"},
-        {pohmelfs_opt_crypto_fail_unsupported, "crypto_fail_unsupported"},
-        {pohmelfs_opt_trans_scan_timeout, "trans_scan_timeout=%u"},
-        {pohmelfs_opt_drop_scan_timeout, "drop_scan_timeout=%u"},
-        {pohmelfs_opt_wait_on_page_timeout, "wait_on_page_timeout=%u"},
-        {pohmelfs_opt_trans_retries, "trans_retries=%u"},
-        {pohmelfs_opt_mcache_timeout, "mcache_timeout=%u"},
-};
-
-static int pohmelfs_parse_options(char *options, struct pohmelfs_sb *psb, int remount)
-{
-        char *p;
-        substring_t args[MAX_OPT_ARGS];
-        int option, err;
-
-        if (!options)
-                return 0;
-
-        while ((p = strsep(&options, ",")) != NULL) {
-                int token;
-                if (!*p)
-                        continue;
-
-                token = match_token(p, pohmelfs_tokens, args);
-
-                err = match_int(&args[0], &option);
-                if (err)
-                        return err;
-
-                if (remount && token <= pohmelfs_opt_crypto_fail_unsupported)
-                        continue;
-
-                switch (token) {
-                case pohmelfs_opt_idx:
-                        psb->idx = option;
-                        break;
-                case pohmelfs_opt_trans_scan_timeout:
-                        psb->trans_scan_timeout = msecs_to_jiffies(option);
-                        break;
-                case pohmelfs_opt_drop_scan_timeout:
-                        psb->drop_scan_timeout = msecs_to_jiffies(option);
-                        break;
-                case pohmelfs_opt_wait_on_page_timeout:
-                        psb->wait_on_page_timeout = msecs_to_jiffies(option);
-                        break;
-                case pohmelfs_opt_mcache_timeout:
-                        psb->mcache_timeout = msecs_to_jiffies(option);
-                        break;
-                case pohmelfs_opt_trans_retries:
-                        psb->trans_retries = option;
-                        break;
-                case pohmelfs_opt_crypto_thread_num:
-                        psb->crypto_thread_num = option;
-                        break;
-                case pohmelfs_opt_trans_max_pages:
-                        psb->trans_max_pages = option;
-                        break;
-                case pohmelfs_opt_crypto_fail_unsupported:
-                        psb->crypto_fail_unsupported = 1;
-                        break;
-                default:
-                        return -EINVAL;
-                }
-        }
-
-        return 0;
-}
-
-static int pohmelfs_remount(struct super_block *sb, int *flags, char *data)
-{
-        int err;
-        struct pohmelfs_sb *psb = POHMELFS_SB(sb);
-        unsigned long old_sb_flags = sb->s_flags;
-
-        err = pohmelfs_parse_options(data, psb, 1);
-        if (err)
-                goto err_out_restore;
-
-        if (!(*flags & MS_RDONLY))
-                sb->s_flags &= ~MS_RDONLY;
-        return 0;
-
-err_out_restore:
-        sb->s_flags = old_sb_flags;
-        return err;
-}
-
-static void pohmelfs_flush_inode(struct pohmelfs_inode *pi, unsigned int count)
-{
-        struct inode *inode = &pi->vfs_inode;
-
-        dprintk("%s: %p: ino: %llu, owned: %d.\n",
-                __func__, inode, pi->ino, test_bit(NETFS_INODE_OWNED, &pi->state));
-
-        mutex_lock(&inode->i_mutex);
-        if (test_and_clear_bit(NETFS_INODE_OWNED, &pi->state)) {
-                filemap_fdatawrite(inode->i_mapping);
-                inode->i_sb->s_op->write_inode(inode, 0);
-        }
-
-#ifdef POHMELFS_TRUNCATE_ON_INODE_FLUSH
-        truncate_inode_pages(inode->i_mapping, 0);
-#endif
-
-        pohmelfs_data_unlock(pi, 0, ~0, POHMELFS_WRITE_LOCK);
-        mutex_unlock(&inode->i_mutex);
-}
-
-static void pohmelfs_put_inode_count(struct pohmelfs_inode *pi, unsigned int count)
-{
-        dprintk("%s: ino: %llu, pi: %p, inode: %p, count: %u.\n",
-                        __func__, pi->ino, pi, &pi->vfs_inode, count);
-
-        if (test_and_clear_bit(NETFS_INODE_NEED_FLUSH, &pi->state))
-                pohmelfs_flush_inode(pi, count);
-
-        while (count--)
-                iput(&pi->vfs_inode);
-}
-
-static void pohmelfs_drop_scan(struct work_struct *work)
-{
-        struct pohmelfs_sb *psb =
-                container_of(work, struct pohmelfs_sb, drop_dwork.work);
-        struct pohmelfs_inode *pi;
-        unsigned int count = 0;
-
-        while ((pi = pohmelfs_get_inode_from_list(psb, &psb->drop_list, &count)))
-                pohmelfs_put_inode_count(pi, count);
-
-        pohmelfs_check_states(psb);
-
-        if (psb->drop_scan_timeout)
-                schedule_delayed_work(&psb->drop_dwork, psb->drop_scan_timeout);
-}
-
-/*
- * Run through all transactions starting from the oldest,
- * drop transaction from current state and try to send it
- * to all remote nodes, which are currently installed.
- */
-static void pohmelfs_trans_scan_state(struct netfs_state *st)
-{
-        struct rb_node *rb_node;
-        struct netfs_trans_dst *dst;
-        struct pohmelfs_sb *psb = st->psb;
-        unsigned int timeout = psb->trans_scan_timeout;
-        struct netfs_trans *t;
-        int err;
-
-        mutex_lock(&st->trans_lock);
-        for (rb_node = rb_first(&st->trans_root); rb_node; ) {
-                dst = rb_entry(rb_node, struct netfs_trans_dst, state_entry);
-                t = dst->trans;
-
-                if (timeout && time_after(dst->send_time + timeout, jiffies)
-                                && dst->retries == 0)
-                        break;
-
-                dprintk("%s: t: %p, gen: %u, st: %p, retries: %u, max: %u.\n",
-                        __func__, t, t->gen, st, dst->retries, psb->trans_retries);
-                netfs_trans_get(t);
-
-                rb_node = rb_next(rb_node);
-
-                err = -ETIMEDOUT;
-                if (timeout && (++dst->retries < psb->trans_retries))
-                        err = netfs_trans_resend(t, psb);
-
-                if (err || (t->flags & NETFS_TRANS_SINGLE_DST)) {
-                        if (netfs_trans_remove_nolock(dst, st))
-                                netfs_trans_drop_dst_nostate(dst);
-                }
-
-                t->result = err;
-                netfs_trans_put(t);
-        }
-        mutex_unlock(&st->trans_lock);
-}
-
-/*
- * Walk through all installed network states and resend all
- * transactions, which are old enough.
- */
-static void pohmelfs_trans_scan(struct work_struct *work)
-{
-        struct pohmelfs_sb *psb =
-                container_of(work, struct pohmelfs_sb, dwork.work);
-        struct netfs_state *st;
-        struct pohmelfs_config *c;
-
-        mutex_lock(&psb->state_lock);
-        list_for_each_entry(c, &psb->state_list, config_entry) {
-                st = &c->state;
-
-                pohmelfs_trans_scan_state(st);
-        }
-        mutex_unlock(&psb->state_lock);
-
-        /*
-         * If no timeout specified then system is in the middle of umount process,
-         * so no need to reschedule scanning process again.
-         */
-        if (psb->trans_scan_timeout)
-                schedule_delayed_work(&psb->dwork, psb->trans_scan_timeout);
-}
-
-int pohmelfs_meta_command_data(struct pohmelfs_inode *pi, u64 id, unsigned int cmd_op, char *addon,
-                unsigned int flags, netfs_trans_complete_t complete, void *priv, u64 start)
-{
-        struct inode *inode = &pi->vfs_inode;
-        struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb);
-        int err = 0, sz;
-        struct netfs_trans *t;
-        int path_len, addon_len = 0;
-        void *data;
-        struct netfs_inode_info *info;
-        struct netfs_cmd *cmd;
-
-        dprintk("%s: ino: %llu, cmd: %u, addon: %p.\n", __func__, pi->ino, cmd_op, addon);
-
-        path_len = pohmelfs_path_length(pi);
-        if (path_len < 0) {
-                err = path_len;
-                goto err_out_exit;
-        }
-
-        if (addon)
-                addon_len = strlen(addon) + 1; /* 0-byte */
-        sz = addon_len;
-
-        if (cmd_op == NETFS_INODE_INFO)
-                sz += sizeof(struct netfs_inode_info);
-
-        t = netfs_trans_alloc(psb, sz + path_len, flags, 0);
-        if (!t) {
-                err = -ENOMEM;
-                goto err_out_exit;
-        }
-        t->complete = complete;
-        t->private = priv;
-
-        cmd = netfs_trans_current(t);
-        data = (void *)(cmd + 1);
-
-        if (cmd_op == NETFS_INODE_INFO) {
-                info = (struct netfs_inode_info *)(cmd + 1);
-                data = (void *)(info + 1);
-
-                /*
-                 * We are under i_mutex, can read and change whatever we want...
-                 */
-                info->mode = inode->i_mode;
-                info->nlink = inode->i_nlink;
-                info->uid = inode->i_uid;
-                info->gid = inode->i_gid;
-                info->blocks = inode->i_blocks;
-                info->rdev = inode->i_rdev;
-                info->size = inode->i_size;
-                info->version = inode->i_version;
-
-                netfs_convert_inode_info(info);
-        }
-
-        path_len = pohmelfs_construct_path_string(pi, data, path_len);
-        if (path_len < 0)
-                goto err_out_free;
-
-        dprintk("%s: path_len: %d.\n", __func__, path_len);
-
-        if (addon) {
-                path_len--; /* Do not place null-byte before the addon */
-                path_len += sprintf(data + path_len, "/%s", addon) + 1; /* 0 - byte */
-        }
-
-        sz += path_len;
-
-        cmd->cmd = cmd_op;
-        cmd->ext = path_len;
-        cmd->size = sz;
-        cmd->id = id;
-        cmd->start = start;
-
-        netfs_convert_cmd(cmd);
-        netfs_trans_update(cmd, t, sz);
-
-        /*
-         * Note, that it is possible to leak error here: transaction callback will not
-         * be invoked for allocation path failure.
-         */
-        return netfs_trans_finish(t, psb);
-
-err_out_free:
-        netfs_trans_free(t);
-err_out_exit:
-        if (complete)
-                complete(NULL, 0, priv, err);
-        return err;
-}
-
-int pohmelfs_meta_command(struct pohmelfs_inode *pi, unsigned int cmd_op, unsigned int flags,
-                netfs_trans_complete_t complete, void *priv, u64 start)
-{
-        return pohmelfs_meta_command_data(pi, pi->ino, cmd_op, NULL, flags, complete, priv, start);
-}
-
-/*
- * Send request and wait for POHMELFS root capabilities response,
- * which will update server's informaion about size of the export,
- * permissions, number of objects, available size and so on.
- */
-static int pohmelfs_root_handshake(struct pohmelfs_sb *psb)
-{
-        struct netfs_trans *t;
-        struct netfs_cmd *cmd;
-        int err = -ENOMEM;
-
-        t = netfs_trans_alloc(psb, 0, 0, 0);
-        if (!t)
-                goto err_out_exit;
-
-        cmd = netfs_trans_current(t);
-
-        cmd->cmd = NETFS_CAPABILITIES;
-        cmd->id = POHMELFS_ROOT_CAPABILITIES;
-        cmd->size = 0;
-        cmd->start = 0;
-        cmd->ext = 0;
-        cmd->csize = 0;
-
-        netfs_convert_cmd(cmd);
-        netfs_trans_update(cmd, t, 0);
-
-        err = netfs_trans_finish(t, psb);
-        if (err)
-                goto err_out_exit;
-
-        psb->flags = ~0;
-        err = wait_event_interruptible_timeout(psb->wait,
-                        (psb->flags != ~0),
-                        psb->wait_on_page_timeout);
-        if (!err)
-                err = -ETIMEDOUT;
-        else if (err > 0)
-                err = -psb->flags;
-
-        if (err)
-                goto err_out_exit;
-
-        return 0;
-
-err_out_exit:
-        return err;
-}
-
-static int pohmelfs_show_stats(struct seq_file *m, struct dentry *root)
-{
-        struct netfs_state *st;
-        struct pohmelfs_ctl *ctl;
-        struct pohmelfs_sb *psb = POHMELFS_SB(root->d_sb);
-        struct pohmelfs_config *c;
-
-        mutex_lock(&psb->state_lock);
-
-        seq_printf(m, "\nidx addr(:port) socket_type protocol active priority permissions\n");
-
-        list_for_each_entry(c, &psb->state_list, config_entry) {
-                st = &c->state;
-                ctl = &st->ctl;
-
-                seq_printf(m, "%u ", ctl->idx);
-                if (ctl->addr.sa_family == AF_INET) {
-                        struct sockaddr_in *sin = (struct sockaddr_in *)&st->ctl.addr;
-                        seq_printf(m, "%pI4:%u", &sin->sin_addr.s_addr, ntohs(sin->sin_port));
-                } else if (ctl->addr.sa_family == AF_INET6) {
-                        struct sockaddr_in6 *sin = (struct sockaddr_in6 *)&st->ctl.addr;
-                        seq_printf(m, "%pi6:%u", &sin->sin6_addr, ntohs(sin->sin6_port));
-                } else {
-                        unsigned int i;
-                        for (i = 0; i < ctl->addrlen; ++i)
-                                seq_printf(m, "%02x.", ctl->addr.addr[i]);
-                }
-
-                seq_printf(m, " %u %u %d %u %x\n",
-                                ctl->type, ctl->proto,
-                                st->socket != NULL,
-                                ctl->prio, ctl->perm);
-        }
-        mutex_unlock(&psb->state_lock);
-
-        return 0;
-}
-
-static const struct super_operations pohmelfs_sb_ops = {
-        .alloc_inode    = pohmelfs_alloc_inode,
-        .destroy_inode  = pohmelfs_destroy_inode,
-        .drop_inode     = pohmelfs_drop_inode,
-        .write_inode    = pohmelfs_write_inode,
-        .put_super      = pohmelfs_put_super,
-        .remount_fs     = pohmelfs_remount,
-        .statfs         = pohmelfs_statfs,
-        .show_options   = pohmelfs_show_options,
-        .show_stats     = pohmelfs_show_stats,
-};
-
-/*
- * Allocate private superblock and create root dir.
- */
-static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
-{
-        struct pohmelfs_sb *psb;
-        int err = -ENOMEM;
-        struct inode *root;
-        struct pohmelfs_inode *npi;
-        struct qstr str;
-
-        psb = kzalloc(sizeof(struct pohmelfs_sb), GFP_KERNEL);
-        if (!psb)
-                goto err_out_exit;
-
-        err = bdi_init(&psb->bdi);
-        if (err)
-                goto err_out_free_sb;
-
-        err = bdi_register(&psb->bdi, NULL, "pfs-%d", atomic_inc_return(&psb_bdi_num));
-        if (err) {
-                bdi_destroy(&psb->bdi);
-                goto err_out_free_sb;
-        }
-
-        sb->s_fs_info = psb;
-        sb->s_op = &pohmelfs_sb_ops;
-        sb->s_magic = POHMELFS_MAGIC_NUM;
-        sb->s_maxbytes = MAX_LFS_FILESIZE;
-        sb->s_blocksize = PAGE_SIZE;
-        sb->s_bdi = &psb->bdi;
-
-        psb->sb = sb;
-
-        psb->ino = 2;
-        psb->idx = 0;
-        psb->active_state = NULL;
-        psb->trans_retries = 5;
-        psb->trans_data_size = PAGE_SIZE;
-        psb->drop_scan_timeout = msecs_to_jiffies(1000);
-        psb->trans_scan_timeout = msecs_to_jiffies(5000);
-        psb->wait_on_page_timeout = msecs_to_jiffies(5000);
-        init_waitqueue_head(&psb->wait);
-
-        spin_lock_init(&psb->ino_lock);
-
-        INIT_LIST_HEAD(&psb->drop_list);
-
-        mutex_init(&psb->mcache_lock);
-        psb->mcache_root = RB_ROOT;
-        psb->mcache_timeout = msecs_to_jiffies(5000);
-        atomic_long_set(&psb->mcache_gen, 0);
-
-        psb->trans_max_pages = 100;
-
-        psb->crypto_align_size = 16;
-        psb->crypto_attached_size = 0;
-        psb->hash_strlen = 0;
-        psb->cipher_strlen = 0;
-        psb->perform_crypto = 0;
-        psb->crypto_thread_num = 2;
-        psb->crypto_fail_unsupported = 0;
-        mutex_init(&psb->crypto_thread_lock);
-        INIT_LIST_HEAD(&psb->crypto_ready_list);
-        INIT_LIST_HEAD(&psb->crypto_active_list);
-
-        atomic_set(&psb->trans_gen, 1);
-        atomic_long_set(&psb->total_inodes, 0);
-
-        mutex_init(&psb->state_lock);
-        INIT_LIST_HEAD(&psb->state_list);
-
-        err = pohmelfs_parse_options((char *) data, psb, 0);
-        if (err)
-                goto err_out_free_bdi;
-
-        err = pohmelfs_copy_crypto(psb);
-        if (err)
-                goto err_out_free_bdi;
-
-        err = pohmelfs_state_init(psb);
-        if (err)
-                goto err_out_free_strings;
-
-        err = pohmelfs_crypto_init(psb);
-        if (err)
-                goto err_out_state_exit;
-
-        err = pohmelfs_root_handshake(psb);
-        if (err)
-                goto err_out_crypto_exit;
-
-        str.name = "/";
-        str.hash = jhash("/", 1, 0);
-        str.len = 1;
-
-        npi = pohmelfs_create_entry_local(psb, NULL, &str, 0, 0755|S_IFDIR);
-        if (IS_ERR(npi)) {
-                err = PTR_ERR(npi);
-                goto err_out_crypto_exit;
-        }
-        set_bit(NETFS_INODE_REMOTE_SYNCED, &npi->state);
-        clear_bit(NETFS_INODE_OWNED, &npi->state);
-
-        root = &npi->vfs_inode;
-
-        sb->s_root = d_alloc_root(root);
-        if (!sb->s_root)
-                goto err_out_put_root;
-
-        INIT_DELAYED_WORK(&psb->drop_dwork, pohmelfs_drop_scan);
-        schedule_delayed_work(&psb->drop_dwork, psb->drop_scan_timeout);
-
-        INIT_DELAYED_WORK(&psb->dwork, pohmelfs_trans_scan);
-        schedule_delayed_work(&psb->dwork, psb->trans_scan_timeout);
-
-        return 0;
-
-err_out_put_root:
-        iput(root);
-err_out_crypto_exit:
-        pohmelfs_crypto_exit(psb);
-err_out_state_exit:
-        pohmelfs_state_exit(psb);
-err_out_free_strings:
-        kfree(psb->cipher_string);
-        kfree(psb->hash_string);
-err_out_free_bdi:
-        bdi_destroy(&psb->bdi);
-err_out_free_sb:
-        kfree(psb);
-err_out_exit:
-
-        dprintk("%s: err: %d.\n", __func__, err);
-        return err;
-}
-
-/*
- * Some VFS magic here...
- */
-static struct dentry *pohmelfs_mount(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data)
-{
-        return mount_nodev(fs_type, flags, data, pohmelfs_fill_super);
-}
-
-/*
- * We need this to sync all inodes earlier, since when writeback
- * is invoked from the umount/mntput path dcache is already shrunk,
- * see generic_shutdown_super(), and no inodes can access the path.
- */
-static void pohmelfs_kill_super(struct super_block *sb)
-{
-        sync_inodes_sb(sb);
-        kill_anon_super(sb);
-}
-
-static struct file_system_type pohmel_fs_type = {
-        .owner          = THIS_MODULE,
-        .name           = "pohmel",
-        .mount          = pohmelfs_mount,
-        .kill_sb        = pohmelfs_kill_super,
-};
-
-/*
- * Cache and module initializations and freeing routings.
- */
-static void pohmelfs_init_once(void *data)
-{
-        struct pohmelfs_inode *pi = data;
-
-        inode_init_once(&pi->vfs_inode);
-}
-
-static int __init pohmelfs_init_inodecache(void)
-{
-        pohmelfs_inode_cache = kmem_cache_create("pohmelfs_inode_cache",
-                                sizeof(struct pohmelfs_inode),
-                                0, (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD),
-                                pohmelfs_init_once);
-        if (!pohmelfs_inode_cache)
-                return -ENOMEM;
-
-        return 0;
-}
-
-static void pohmelfs_destroy_inodecache(void)
-{
-        kmem_cache_destroy(pohmelfs_inode_cache);
-}
-
-static int __init init_pohmel_fs(void)
-{
-        int err;
-
-        err = pohmelfs_config_init();
-        if (err)
-                goto err_out_exit;
-
-        err = pohmelfs_init_inodecache();
-        if (err)
-                goto err_out_config_exit;
-
-        err = pohmelfs_mcache_init();
-        if (err)
-                goto err_out_destroy;
-
-        err = netfs_trans_init();
-        if (err)
-                goto err_out_mcache_exit;
-
-        err = register_filesystem(&pohmel_fs_type);
-        if (err)
-                goto err_out_trans;
-
-        return 0;
-
-err_out_trans:
-        netfs_trans_exit();
-err_out_mcache_exit:
-        pohmelfs_mcache_exit();
-err_out_destroy:
-        pohmelfs_destroy_inodecache();
-err_out_config_exit:
-        pohmelfs_config_exit();
-err_out_exit:
-        return err;
-}
-
-static void __exit exit_pohmel_fs(void)
-{
-        unregister_filesystem(&pohmel_fs_type);
-        pohmelfs_destroy_inodecache();
-        pohmelfs_mcache_exit();
-        pohmelfs_config_exit();
-        netfs_trans_exit();
-}
-
-module_init(init_pohmel_fs);
-module_exit(exit_pohmel_fs);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");
-MODULE_DESCRIPTION("Pohmel filesystem");
diff --git a/drivers/staging/pohmelfs/lock.c b/drivers/staging/pohmelfs/lock.c
deleted file mode 100644
index 6710114cd425..000000000000
--- a/drivers/staging/pohmelfs/lock.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * 2007+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
- * All rights reserved.
- *
- * 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.
- */
-
-#include <linux/module.h>
-#include <linux/backing-dev.h>
-#include <linux/fs.h>
-#include <linux/fsnotify.h>
-#include <linux/mempool.h>
-
-#include "netfs.h"
-
-static int pohmelfs_send_lock_trans(struct pohmelfs_inode *pi,
-                u64 id, u64 start, u32 size, int type)
-{
-        struct inode *inode = &pi->vfs_inode;
-        struct pohmelfs_sb *psb = POHMELFS_SB(inode->i_sb);
-        struct netfs_trans *t;
-        struct netfs_cmd *cmd;
-        int path_len, err;
-        void *data;
-        struct netfs_lock *l;
-        int isize = (type & POHMELFS_LOCK_GRAB) ? 0 : sizeof(struct netfs_inode_info);
-
-        err = pohmelfs_path_length(pi);
-        if (err < 0)
-                goto err_out_exit;
-
-        path_len = err;
-
-        err = -ENOMEM;
-        t = netfs_trans_alloc(psb, path_len + sizeof(struct netfs_lock) + isize,
-                        NETFS_TRANS_SINGLE_DST, 0);
-        if (!t)
-                goto err_out_exit;
-
-        cmd = netfs_trans_current(t);
-        data = cmd + 1;
-
-        err = pohmelfs_construct_path_string(pi, data, path_len);
-        if (err < 0)
-                goto err_out_free;
-        path_len = err;
-
-        l = data + path_len;
-
-        l->start = start;
-        l->size = size;
-        l->type = type;
-        l->ino = pi->ino;
-
-        cmd->cmd = NETFS_LOCK;
-        cmd->start = 0;
-        cmd->id = id;
-        cmd->size = sizeof(struct netfs_lock) + path_len + isize;
-        cmd->ext = path_len;
-        cmd->csize = 0;
-
-        netfs_convert_cmd(cmd);
-        netfs_convert_lock(l);
-
-        if (isize) {
-                struct netfs_inode_info *info = (struct netfs_inode_info *)(l + 1);
-
-                info->mode = inode->i_mode;
-                info->nlink = inode->i_nlink;
-                info->uid = inode->i_uid;
-                info->gid = inode->i_gid;
-                info->blocks = inode->i_blocks;
-                info->rdev = inode->i_rdev;
-                info->size = inode->i_size;
-                info->version = inode->i_version;
-
-                netfs_convert_inode_info(info);
-        }
-
-        netfs_trans_update(cmd, t, path_len + sizeof(struct netfs_lock) + isize);
-
-        return netfs_trans_finish(t, psb);
-
-err_out_free:
-        netfs_trans_free(t);
-err_out_exit:
-        printk("%s: err: %d.\n", __func__, err);
-        return err;
-}
-
-int pohmelfs_data_lock(struct pohmelfs_inode *pi, u64 start, u32 size, int type)
-{
-        struct pohmelfs_sb *psb = POHMELFS_SB(pi->vfs_inode.i_sb);
-        struct pohmelfs_mcache *m;
-        int err = -ENOMEM;
-        struct iattr iattr;
-        struct inode *inode = &pi->vfs_inode;
-
-        dprintk("%s: %p: ino: %llu, start: %llu, size: %u, "
-                        "type: %d, locked as: %d, owned: %d.\n",
-                        __func__, &pi->vfs_inode, pi->ino,
-                        start, size, type, pi->lock_type,
-                        !!test_bit(NETFS_INODE_OWNED, &pi->state));
-
-        if (!pohmelfs_need_lock(pi, type))
-                return 0;
-
-        m = pohmelfs_mcache_alloc(psb, start, size, NULL);
-        if (IS_ERR(m))
-                return PTR_ERR(m);
-
-        err = pohmelfs_send_lock_trans(pi, m->gen, start, size,
-                        type | POHMELFS_LOCK_GRAB);
-        if (err)
-                goto err_out_put;
-
-        err = wait_for_completion_timeout(&m->complete, psb->mcache_timeout);
-        if (err)
-                err = m->err;
-        else
-                err = -ETIMEDOUT;
-
-        if (err) {
-                printk("%s: %p: ino: %llu, mgen: %llu, start: %llu, size: %u, err: %d.\n",
-                        __func__, &pi->vfs_inode, pi->ino, m->gen, start, size, err);
-        }
-
-        if (err && (err != -ENOENT))
-                goto err_out_put;
-
-        if (!err) {
-                netfs_convert_inode_info(&m->info);
-
-                iattr.ia_valid = ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE | ATTR_ATIME;
-                iattr.ia_mode = m->info.mode;
-                iattr.ia_uid = m->info.uid;
-                iattr.ia_gid = m->info.gid;
-                iattr.ia_size = m->info.size;
-                iattr.ia_atime = CURRENT_TIME;
-
-                dprintk("%s: %p: ino: %llu, mgen: %llu, start: %llu, isize: %llu -> %llu.\n",
-                        __func__, &pi->vfs_inode, pi->ino, m->gen, start, inode->i_size, m->info.size);
-
-                err = pohmelfs_setattr_raw(inode, &iattr);
-                if (!err) {
-                        struct dentry *dentry = d_find_alias(inode);
-                        if (dentry) {
-                                fsnotify_change(dentry, iattr.ia_valid);
-                                dput(dentry);
-                        }
-                }
-        }
-
-        pi->lock_type = type;
-        set_bit(NETFS_INODE_OWNED, &pi->state);
-
-        pohmelfs_mcache_put(psb, m);
-
-        return 0;
-
-err_out_put:
-        pohmelfs_mcache_put(psb, m);
-        return err;
-}
-
-int pohmelfs_data_unlock(struct pohmelfs_inode *pi, u64 start, u32 size, int type)
-{
-        dprintk("%s: %p: ino: %llu, start: %llu, size: %u, type: %d.\n",
-                        __func__, &pi->vfs_inode, pi->ino, start, size, type);
-        pi->lock_type = 0;
-        clear_bit(NETFS_INODE_REMOTE_DIR_SYNCED, &pi->state);
-        clear_bit(NETFS_INODE_OWNED, &pi->state);
-        return pohmelfs_send_lock_trans(pi, pi->ino, start, size, type);
-}
diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c
deleted file mode 100644
index e22665cdd16c..000000000000
--- a/drivers/staging/pohmelfs/mcache.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * 2007+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
- * All rights reserved.
- *
- * 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.
- */
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/mempool.h>
-
-#include "netfs.h"
-
-static struct kmem_cache *pohmelfs_mcache_cache;
-static mempool_t *pohmelfs_mcache_pool;
-
-static inline int pohmelfs_mcache_cmp(u64 gen, u64 new)
-{
-        if (gen < new)
-                return 1;
-        if (gen > new)
-                return -1;
-        return 0;
-}
-
-struct pohmelfs_mcache *pohmelfs_mcache_search(struct pohmelfs_sb *psb, u64 gen)
-{
-        struct rb_root *root = &psb->mcache_root;
-        struct rb_node *n = root->rb_node;
-        struct pohmelfs_mcache *tmp, *ret = NULL;
-        int cmp;
-
-        while (n) {
-                tmp = rb_entry(n, struct pohmelfs_mcache, mcache_entry);
-
-                cmp = pohmelfs_mcache_cmp(tmp->gen, gen);
-                if (cmp < 0)
-                        n = n->rb_left;
-                else if (cmp > 0)
-                        n = n->rb_right;
-                else {
-                        ret = tmp;
-                        pohmelfs_mcache_get(ret);
-                        break;
-                }
-        }
-
-        return ret;
-}
-
-static int pohmelfs_mcache_insert(struct pohmelfs_sb *psb, struct pohmelfs_mcache *m)
-{
-        struct rb_root *root = &psb->mcache_root;
-        struct rb_node **n = &root->rb_node, *parent = NULL;
-        struct pohmelfs_mcache *ret = NULL, *tmp;
-        int cmp;
-
-        while (*n) {
-                parent = *n;
-
-                tmp = rb_entry(parent, struct pohmelfs_mcache, mcache_entry);
-
-                cmp = pohmelfs_mcache_cmp(tmp->gen, m->gen);
-                if (cmp < 0)
-                        n = &parent->rb_left;
-                else if (cmp > 0)
-                        n = &parent->rb_right;
-                else {
-                        ret = tmp;
-                        break;
-                }
-        }
-
-        if (ret)
-                return -EEXIST;
-
-        rb_link_node(&m->mcache_entry, parent, n);
-        rb_insert_color(&m->mcache_entry, root);
-
-        return 0;
-}
-
-static int pohmelfs_mcache_remove(struct pohmelfs_sb *psb, struct pohmelfs_mcache *m)
-{
-        if (m && m->mcache_entry.rb_parent_color) {
-                rb_erase(&m->mcache_entry, &psb->mcache_root);
-                m->mcache_entry.rb_parent_color = 0;
-                return 1;
-        }
-        return 0;
-}
-
-void pohmelfs_mcache_remove_locked(struct pohmelfs_sb *psb, struct pohmelfs_mcache *m)
-{
-        mutex_lock(&psb->mcache_lock);
-        pohmelfs_mcache_remove(psb, m);
-        mutex_unlock(&psb->mcache_lock);
-}
-
-struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start,
-                unsigned int size, void *data)
-{
-        struct pohmelfs_mcache *m;
-        int err = -ENOMEM;
-
-        m = mempool_alloc(pohmelfs_mcache_pool, GFP_KERNEL);
-        if (!m)
-                goto err_out_exit;
-
-        init_completion(&m->complete);
-        m->err = 0;
-        atomic_set(&m->refcnt, 1);
-        m->data = data;
-        m->start = start;
-        m->size = size;
-        m->gen = atomic_long_inc_return(&psb->mcache_gen);
-
-        mutex_lock(&psb->mcache_lock);
-        err = pohmelfs_mcache_insert(psb, m);
-        mutex_unlock(&psb->mcache_lock);
-        if (err)
-                goto err_out_free;
-
-        return m;
-
-err_out_free:
-        mempool_free(m, pohmelfs_mcache_pool);
-err_out_exit:
-        return ERR_PTR(err);
-}
-
-void pohmelfs_mcache_free(struct pohmelfs_sb *psb, struct pohmelfs_mcache *m)
-{
-        pohmelfs_mcache_remove_locked(psb, m);
-
-        mempool_free(m, pohmelfs_mcache_pool);
-}
-
-int __init pohmelfs_mcache_init(void)
-{
-        pohmelfs_mcache_cache = kmem_cache_create("pohmelfs_mcache_cache",
-                                sizeof(struct pohmelfs_mcache),
-                                0, (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD), NULL);
-        if (!pohmelfs_mcache_cache)
-                goto err_out_exit;
-
-        pohmelfs_mcache_pool = mempool_create_slab_pool(256, pohmelfs_mcache_cache);
-        if (!pohmelfs_mcache_pool)
-                goto err_out_free;
-
-        return 0;
-
-err_out_free:
-        kmem_cache_destroy(pohmelfs_mcache_cache);
-err_out_exit:
-        return -ENOMEM;
-}
-
-void pohmelfs_mcache_exit(void)
-{
-        mempool_destroy(pohmelfs_mcache_pool);
-        kmem_cache_destroy(pohmelfs_mcache_cache);
-}
diff --git a/drivers/staging/pohmelfs/net.c b/drivers/staging/pohmelfs/net.c
deleted file mode 100644
index b2e918622088..000000000000
--- a/drivers/staging/pohmelfs/net.c
+++ /dev/null
@@ -1,1209 +0,0 @@
-/*
- * 2007+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
- * All rights reserved.
- *
- * 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.
- */
-
-#include <linux/fsnotify.h>
-#include <linux/jhash.h>
-#include <linux/in.h>
-#include <linux/in6.h>
-#include <linux/kthread.h>
-#include <linux/pagemap.h>
-#include <linux/poll.h>
-#include <linux/slab.h>
-#include <linux/swap.h>
-#include <linux/syscalls.h>
-#include <linux/vmalloc.h>
-
-#include "netfs.h"
-
-/*
- * Async machinery lives here.
- * All commands being sent to server do _not_ require sync reply,
- * instead, if it is really needed, like readdir or readpage, caller
- * sleeps waiting for data, which will be placed into provided buffer
- * and caller will be awakened.
- *
- * Every command response can come without some listener. For example
- * readdir response will add new objects into cache without appropriate
- * request from userspace. This is used in cache coherency.
- *
- * If object is not found for given data, it is discarded.
- *
- * All requests are received by dedicated kernel thread.
- */
-
-/*
- * Basic network sending/receiving functions.
- * Blocked mode is used.
- */
-static int netfs_data_recv(struct netfs_state *st, void *buf, u64 size)
-{
-        struct msghdr msg;
-        struct kvec iov;
-        int err;
-
-        BUG_ON(!size);
-
-        iov.iov_base = buf;
-        iov.iov_len = size;
-
-        msg.msg_iov = (struct iovec *)&iov;
-        msg.msg_iovlen = 1;
-        msg.msg_name = NULL;
-        msg.msg_namelen = 0;
-        msg.msg_control = NULL;
-        msg.msg_controllen = 0;
-        msg.msg_flags = MSG_DONTWAIT;
-
-        err = kernel_recvmsg(st->socket, &msg, &iov, 1, iov.iov_len,
-                        msg.msg_flags);
-        if (err <= 0) {
-                printk("%s: failed to recv data: size: %llu, err: %d.\n", __func__, size, err);
-                if (err == 0)
-                        err = -ECONNRESET;
-        }
-
-        return err;
-}
-
-static int pohmelfs_data_recv(struct netfs_state *st, void *data, unsigned int size)
-{
-        unsigned int revents = 0;
-        unsigned int err_mask = POLLERR | POLLHUP | POLLRDHUP;
-        unsigned int mask = err_mask | POLLIN;
-        int err = 0;
-
-        while (size && !err) {
-                revents = netfs_state_poll(st);
-
-                if (!(revents & mask)) {
-                        DEFINE_WAIT(wait);
-
-                        for (;;) {
-                                prepare_to_wait(&st->thread_wait, &wait, TASK_INTERRUPTIBLE);
-                                if (kthread_should_stop())
-                                        break;
-
-                                revents = netfs_state_poll(st);
-
-                                if (revents & mask)
-                                        break;
-
-                                if (signal_pending(current))
-                                        break;
-
-                                schedule();
-                                continue;
-                        }
-                        finish_wait(&st->thread_wait, &wait);
-                }
-
-                err = 0;
-                netfs_state_lock(st);
-                if (st->socket && (st->read_socket == st->socket) && (revents & POLLIN)) {
-                        err = netfs_data_recv(st, data, size);
-                        if (err > 0) {
-                                data += err;
-                                size -= err;
-                                err = 0;
-                        } else if (err == 0)
-                                err = -ECONNRESET;
-                }
-
-                if (revents & err_mask) {
-                        printk("%s: revents: %x, socket: %p, size: %u, err: %d.\n",
-                                        __func__, revents, st->socket, size, err);
-                        err = -ECONNRESET;
-                }
-                netfs_state_unlock(st);
-
-                if (err < 0) {
-                        if (netfs_state_trylock_send(st)) {
-                                netfs_state_exit(st);
-                                err = netfs_state_init(st);
-                                if (!err)
-                                        err = -EAGAIN;
-                                netfs_state_unlock_send(st);
-                        } else {
-                                st->need_reset = 1;
-                        }
-                }
-
-                if (kthread_should_stop())
-                        err = -ENODEV;
-
-                if (err)
-                        printk("%s: socket: %p, read_socket: %p, revents: %x, rev_error: %d, "
-                                        "should_stop: %d, size: %u, err: %d.\n",
-                                __func__, st->socket, st->read_socket,
-                                revents, revents & err_mask, kthread_should_stop(), size, err);
-        }
-
-        return err;
-}
-
-int pohmelfs_data_recv_and_check(struct netfs_state *st, void *data, unsigned int size)
-{
-        struct netfs_cmd *cmd = &st->cmd;
-        int err;
-
-        err = pohmelfs_data_recv(st, data, size);
-        if (err)
-                return err;
-
-        return pohmelfs_crypto_process_input_data(&st->eng, cmd->iv, data, NULL, size);
-}
-
-/*
- * Polling machinery.
- */
-
-struct netfs_poll_helper {
-        poll_table              pt;
-        struct netfs_state      *st;
-};
-
-static int netfs_queue_wake(wait_queue_t *wait, unsigned mode, int sync, void *key)
-{
-        struct netfs_state *st = container_of(wait, struct netfs_state, wait);
-
-        wake_up(&st->thread_wait);
-        return 1;
-}
-
-static void netfs_queue_func(struct file *file, wait_queue_head_t *whead,
-                                 poll_table *pt)
-{
-        struct netfs_state *st = container_of(pt, struct netfs_poll_helper, pt)->st;
-
-        st->whead = whead;
-        init_waitqueue_func_entry(&st->wait, netfs_queue_wake);
-        add_wait_queue(whead, &st->wait);
-}
-
-static void netfs_poll_exit(struct netfs_state *st)
-{
-        if (st->whead) {
-                remove_wait_queue(st->whead, &st->wait);
-                st->whead = NULL;
-        }
-}
-
-static int netfs_poll_init(struct netfs_state *st)
-{
-        struct netfs_poll_helper ph;
-
-        ph.st = st;
-        init_poll_funcptr(&ph.pt, &netfs_queue_func);
-
-        st->socket->ops->poll(NULL, st->socket, &ph.pt);
-        return 0;
-}
-
-/*
- * Get response for readpage command. We search inode and page in its mapping
- * and copy data into. If it was async request, then we queue page into shared
- * data and wakeup listener, who will copy it to userspace.
- *
- * There is a work in progress of allowing to call copy_to_user() directly from
- * async receiving kernel thread.
- */
-static int pohmelfs_read_page_response(struct netfs_state *st)
-{
-        struct pohmelfs_sb *psb = st->psb;
-        struct netfs_cmd *cmd = &st->cmd;
-        struct inode *inode;
-        struct page *page;
-        int err = 0;
-
-        if (cmd->size > PAGE_CACHE_SIZE) {
-                err = -EINVAL;
-                goto err_out_exit;
-        }
-
-        inode = ilookup(st->psb->sb, cmd->id);
-        if (!inode) {
-                printk("%s: failed to find inode: id: %llu.\n", __func__, cmd->id);
-                err = -ENOENT;
-                goto err_out_exit;
-        }
-
-        page = find_get_page(inode->i_mapping, cmd->start >> PAGE_CACHE_SHIFT);
-        if (!page || !PageLocked(page)) {
-                printk("%s: failed to find/lock page: page: %p, id: %llu, start: %llu, index: %llu.\n",
-                                __func__, page, cmd->id, cmd->start, cmd->start >> PAGE_CACHE_SHIFT);
-
-                while (cmd->size) {
-                        unsigned int sz = min(cmd->size, st->size);
-
-                        err = pohmelfs_data_recv(st, st->data, sz);
-                        if (err)
-                                break;
-
-                        cmd->size -= sz;
-                }
-
-                err = -ENODEV;
-                if (page)
-                        goto err_out_page_put;
-                goto err_out_put;
-        }
-
-        if (cmd->size) {
-                void *addr;
-
-                addr = kmap(page);
-                err = pohmelfs_data_recv(st, addr, cmd->size);
-                kunmap(page);
-
-                if (err)
-                        goto err_out_page_unlock;
-        }
-
-        dprintk("%s: page: %p, start: %llu, size: %u, locked: %d.\n",
-                __func__, page, cmd->start, cmd->size, PageLocked(page));
-
-        SetPageChecked(page);
-        if ((psb->hash_string || psb->cipher_string) && psb->perform_crypto && cmd->size) {
-                err = pohmelfs_crypto_process_input_page(&st->eng, page, cmd->size, cmd->iv);
-                if (err < 0)
-                        goto err_out_page_unlock;
-        } else {
-                SetPageUptodate(page);
-                unlock_page(page);
-                page_cache_release(page);
-        }
-
-        pohmelfs_put_inode(POHMELFS_I(inode));
-        wake_up(&st->psb->wait);
-
-        return 0;
-
-err_out_page_unlock:
-        SetPageError(page);
-        unlock_page(page);
-err_out_page_put:
-        page_cache_release(page);
-err_out_put:
-        pohmelfs_put_inode(POHMELFS_I(inode));
-err_out_exit:
-        wake_up(&st->psb->wait);
-        return err;
-}
-
-static int pohmelfs_check_name(struct pohmelfs_inode *parent, struct qstr *str,
-                struct netfs_inode_info *info)
-{
-        struct inode *inode;
-        struct pohmelfs_name *n;
-        int err = 0;
-        u64 ino = 0;
-
-        mutex_lock(&parent->offset_lock);
-        n = pohmelfs_search_hash(parent, str->hash);
-        if (n)
-                ino = n->ino;
-        mutex_unlock(&parent->offset_lock);
-
-        if (!ino)
-                goto out;
-
-        inode = ilookup(parent->vfs_inode.i_sb, ino);
-        if (!inode)
-                goto out;
-
-        dprintk("%s: parent: %llu, inode: %llu.\n", __func__, parent->ino, ino);
-
-        pohmelfs_fill_inode(inode, info);
-        pohmelfs_put_inode(POHMELFS_I(inode));
-        err = -EEXIST;
-out:
-        return err;
-}
-
-/*
- * Readdir response from server. If special field is set, we wakeup
- * listener (readdir() call), which will copy data to userspace.
- */
-static int pohmelfs_readdir_response(struct netfs_state *st)
-{
-        struct inode *inode;
-        struct netfs_cmd *cmd = &st->cmd;
-        struct netfs_inode_info *info;
-        struct pohmelfs_inode *parent = NULL, *npi;
-        int err = 0, last = cmd->ext;
-        struct qstr str;
-
-        if (cmd->size > st->size)
-                return -EINVAL;
-
-        inode = ilookup(st->psb->sb, cmd->id);
-        if (!inode) {
-                printk("%s: failed to find inode: id: %llu.\n", __func__, cmd->id);
-                return -ENOENT;
-        }
-        parent = POHMELFS_I(inode);
-
-        if (!cmd->size && cmd->start) {
-                err = -cmd->start;
-                goto out;
-        }
-
-        if (cmd->size) {
-                char *name;
-
-                err = pohmelfs_data_recv_and_check(st, st->data, cmd->size);
-                if (err)
-                        goto err_out_put;
-
-                info = (struct netfs_inode_info *)(st->data);
-
-                name = (char *)(info + 1);
-                str.len = cmd->size - sizeof(struct netfs_inode_info) - 1 - cmd->cpad;
-                name[str.len] = 0;
-                str.name = name;
-                str.hash = jhash(str.name, str.len, 0);
-
-                netfs_convert_inode_info(info);
-
-                if (parent) {
-                        err = pohmelfs_check_name(parent, &str, info);
-                        if (err) {
-                                if (err == -EEXIST)
-                                        err = 0;
-                                goto out;
-                        }
-                }
-
-                info->ino = cmd->start;
-                if (!info->ino)
-                        info->ino = pohmelfs_new_ino(st->psb);
-
-                dprintk("%s: parent: %llu, ino: %llu, name: '%s', hash: %x, len: %u, mode: %o.\n",
-                                __func__, parent->ino, info->ino, str.name, str.hash, str.len,
-                                info->mode);
-
-                npi = pohmelfs_new_inode(st->psb, parent, &str, info, 0);
-                if (IS_ERR(npi)) {
-                        err = PTR_ERR(npi);
-
-                        if (err != -EEXIST)
-                                goto err_out_put;
-                } else {
-                        struct dentry *dentry, *alias, *pd;
-
-                        set_bit(NETFS_INODE_REMOTE_SYNCED, &npi->state);
-                        clear_bit(NETFS_INODE_OWNED, &npi->state);
-
-                        pd = d_find_alias(&parent->vfs_inode);
-                        if (pd) {
-                                str.hash = full_name_hash(str.name, str.len);
-                                dentry = d_alloc(pd, &str);
-                                if (dentry) {
-                                        alias = d_materialise_unique(dentry, &npi->vfs_inode);
-                                        if (alias)
-                                                dput(alias);
-                                }
-
-                                dput(dentry);
-                                dput(pd);
-                        }
-                }
-        }
-out:
-        if (last) {
-                set_bit(NETFS_INODE_REMOTE_DIR_SYNCED, &parent->state);
-                set_bit(NETFS_INODE_REMOTE_SYNCED, &parent->state);
-                wake_up(&st->psb->wait);
-        }
-        pohmelfs_put_inode(parent);
-
-        return err;
-
-err_out_put:
-        clear_bit(NETFS_INODE_REMOTE_DIR_SYNCED, &parent->state);
-        printk("%s: parent: %llu, ino: %llu, cmd_id: %llu.\n", __func__, parent->ino, cmd->start, cmd->id);
-        pohmelfs_put_inode(parent);
-        wake_up(&st->psb->wait);
-        return err;
-}
-
-/*
- * Lookup command response.
- * It searches for inode to be looked at (if it exists) and substitutes
- * its inode information (size, permission, mode and so on), if inode does
- * not exist, new one will be created and inserted into caches.
- */
-static int pohmelfs_lookup_response(struct netfs_state *st)
-{
-        struct inode *inode = NULL;
-        struct netfs_cmd *cmd = &st->cmd;
-        struct netfs_inode_info *info;
-        struct pohmelfs_inode *parent = NULL, *npi;
-        int err = -EINVAL;
-        char *name;
-
-        inode = ilookup(st->psb->sb, cmd->id);
-        if (!inode) {
-                printk("%s: lookup response: id: %llu, start: %llu, size: %u.\n",
-                                __func__, cmd->id, cmd->start, cmd->size);
-                err = -ENOENT;
-                goto err_out_exit;
-        }
-        parent = POHMELFS_I(inode);
-
-        if (!cmd->size) {
-                err = -cmd->start;
-                goto err_out_put;
-        }
-
-        if (cmd->size < sizeof(struct netfs_inode_info)) {
-                printk("%s: broken lookup response: id: %llu, start: %llu, size: %u.\n",
-                                __func__, cmd->id, cmd->start, cmd->size);
-                err = -EINVAL;
-                goto err_out_put;
-        }
-
-        err = pohmelfs_data_recv_and_check(st, st->data, cmd->size);
-        if (err)
-                goto err_out_put;
-
-        info = (struct netfs_inode_info *)(st->data);
-        name = (char *)(info + 1);
-
-        netfs_convert_inode_info(info);
-
-        info->ino = cmd->start;
-        if (!info->ino)
-                info->ino = pohmelfs_new_ino(st->psb);
-
-        dprintk("%s: parent: %llu, ino: %llu, name: '%s', start: %llu.\n",
-                        __func__, parent->ino, info->ino, name, cmd->start);
-
-        if (cmd->start)
-                npi = pohmelfs_new_inode(st->psb, parent, NULL, info, 0);
-        else {
-                struct qstr str;
-
-                str.name = name;
-                str.len = cmd->size - sizeof(struct netfs_inode_info) - 1 - cmd->cpad;
-                str.hash = jhash(name, str.len, 0);
-
-                npi = pohmelfs_new_inode(st->psb, parent, &str, info, 0);
-        }
-        if (IS_ERR(npi)) {
-                err = PTR_ERR(npi);
-
-                if (err != -EEXIST)
-                        goto err_out_put;
-        } else {
-                set_bit(NETFS_INODE_REMOTE_SYNCED, &npi->state);
-                clear_bit(NETFS_INODE_OWNED, &npi->state);
-        }
-
-        clear_bit(NETFS_COMMAND_PENDING, &parent->state);
-        pohmelfs_put_inode(parent);
-
-        wake_up(&st->psb->wait);
-
-        return 0;
-
-err_out_put:
-        pohmelfs_put_inode(parent);
-err_out_exit:
-        clear_bit(NETFS_COMMAND_PENDING, &parent->state);
-        wake_up(&st->psb->wait);
-        printk("%s: inode: %p, id: %llu, start: %llu, size: %u, err: %d.\n",
-                        __func__, inode, cmd->id, cmd->start, cmd->size, err);
-        return err;
-}
-
-/*
- * Create response, just marks local inode as 'created', so that writeback
- * for any of its children (or own) would not try to sync it again.
- */
-static int pohmelfs_create_response(struct netfs_state *st)
-{
-        struct inode *inode;
-        struct netfs_cmd *cmd = &st->cmd;
-        struct pohmelfs_inode *pi;
-
-        inode = ilookup(st->psb->sb, cmd->id);
-        if (!inode) {
-                printk("%s: failed to find inode: id: %llu, start: %llu.\n",
-                                __func__, cmd->id, cmd->start);
-                goto err_out_exit;
-        }
-
-        pi = POHMELFS_I(inode);
-
-        /*
-         * To lock or not to lock?
-         * We actually do not care if it races...
-         */
-        if (cmd->start)
-                make_bad_inode(inode);
-        set_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state);
-
-        pohmelfs_put_inode(pi);
-
-        wake_up(&st->psb->wait);
-        return 0;
-
-err_out_exit:
-        wake_up(&st->psb->wait);
-        return -ENOENT;
-}
-
-/*
- * Object remove response. Just says that remove request has been received.
- * Used in cache coherency protocol.
- */
-static int pohmelfs_remove_response(struct netfs_state *st)
-{
-        struct netfs_cmd *cmd = &st->cmd;
-        int err;
-
-        err = pohmelfs_data_recv_and_check(st, st->data, cmd->size);
-        if (err)
-                return err;
-
-        dprintk("%s: parent: %llu, path: '%s'.\n", __func__, cmd->id, (char *)st->data);
-
-        return 0;
-}
-
-/*
- * Transaction reply processing.
- *
- * Find transaction based on its generation number, bump its reference counter,
- * so that none could free it under us, drop from the trees and lists and
- * drop reference counter. When it hits zero (when all destinations replied
- * and all timeout handled by async scanning code), completion will be called
- * and transaction will be freed.
- */
-static int pohmelfs_transaction_response(struct netfs_state *st)
-{
-        struct netfs_trans_dst *dst;
-        struct netfs_trans *t = NULL;
-        struct netfs_cmd *cmd = &st->cmd;
-        short err = (signed)cmd->ext;
-
-        mutex_lock(&st->trans_lock);
-        dst = netfs_trans_search(st, cmd->start);
-        if (dst) {
-                netfs_trans_remove_nolock(dst, st);
-                t = dst->trans;
-        }
-        mutex_unlock(&st->trans_lock);
-
-        if (!t) {
-                printk("%s: failed to find transaction: start: %llu: id: %llu, size: %u, ext: %u.\n",
-                                __func__, cmd->start, cmd->id, cmd->size, cmd->ext);
-                err = -EINVAL;
-                goto out;
-        }
-
-        t->result = err;
-        netfs_trans_drop_dst_nostate(dst);
-
-out:
-        wake_up(&st->psb->wait);
-        return err;
-}
-
-/*
- * Inode metadata cache coherency message.
- */
-static int pohmelfs_page_cache_response(struct netfs_state *st)
-{
-        struct netfs_cmd *cmd = &st->cmd;
-        struct inode *inode;
-
-        dprintk("%s: st: %p, id: %llu, start: %llu, size: %u.\n", __func__, st, cmd->id, cmd->start, cmd->size);
-
-        inode = ilookup(st->psb->sb, cmd->id);
-        if (!inode) {
-                printk("%s: failed to find inode: id: %llu.\n", __func__, cmd->id);
-                return -ENOENT;
-        }
-
-        set_bit(NETFS_INODE_NEED_FLUSH, &POHMELFS_I(inode)->state);
-        pohmelfs_put_inode(POHMELFS_I(inode));
-
-        return 0;
-}
-
-/*
- * Root capabilities response: export statistics
- * like used and available size, number of files and dirs,
- * permissions.
- */
-static int pohmelfs_root_cap_response(struct netfs_state *st)
-{
-        struct netfs_cmd *cmd = &st->cmd;
-        struct netfs_root_capabilities *cap;
-        struct pohmelfs_sb *psb = st->psb;
-
-        if (cmd->size != sizeof(struct netfs_root_capabilities)) {
-                psb->flags = EPROTO;
-                wake_up(&psb->wait);
-                return -EPROTO;
-        }
-
-        cap = st->data;
-
-        netfs_convert_root_capabilities(cap);
-
-        if (psb->total_size < cap->used + cap->avail)
-                psb->total_size = cap->used + cap->avail;
-        if (cap->avail)
-                psb->avail_size = cap->avail;
-        psb->state_flags = cap->flags;
-
-        if (psb->state_flags & POHMELFS_FLAGS_RO) {
-                psb->sb->s_flags |= MS_RDONLY;
-                printk(KERN_INFO "Mounting POHMELFS (%d) read-only.\n", psb->idx);
-        }
-
-        if (psb->state_flags & POHMELFS_FLAGS_XATTR)
-                printk(KERN_INFO "Mounting POHMELFS (%d) "
-                        "with extended attributes support.\n", psb->idx);
-
-        if (atomic_long_read(&psb->total_inodes) <= 1)
-                atomic_long_set(&psb->total_inodes, cap->nr_files);
-
-        dprintk("%s: total: %llu, avail: %llu, flags: %llx, inodes: %llu.\n",
-                __func__, psb->total_size, psb->avail_size, psb->state_flags, cap->nr_files);
-
-        psb->flags = 0;
-        wake_up(&psb->wait);
-        return 0;
-}
-
-/*
- * Crypto capabilities of the server, where it says that
- * it supports or does not requested hash/cipher algorithms.
- */
-static int pohmelfs_crypto_cap_response(struct netfs_state *st)
-{
-        struct netfs_cmd *cmd = &st->cmd;
-        struct netfs_crypto_capabilities *cap;
-        struct pohmelfs_sb *psb = st->psb;
-        int err = 0;
-
-        if (cmd->size != sizeof(struct netfs_crypto_capabilities)) {
-                psb->flags = EPROTO;
-                wake_up(&psb->wait);
-                return -EPROTO;
-        }
-
-        cap = st->data;
-
-        dprintk("%s: cipher '%s': %s, hash: '%s': %s.\n",
-                        __func__,
-                        psb->cipher_string, (cap->cipher_strlen) ? "SUPPORTED" : "NOT SUPPORTED",
-                        psb->hash_string, (cap->hash_strlen) ? "SUPPORTED" : "NOT SUPPORTED");
-
-        if (!cap->hash_strlen) {
-                if (psb->hash_strlen && psb->crypto_fail_unsupported)
-                        err = -ENOTSUPP;
-                psb->hash_strlen = 0;
-                kfree(psb->hash_string);
-                psb->hash_string = NULL;
-        }
-
-        if (!cap->cipher_strlen) {
-                if (psb->cipher_strlen && psb->crypto_fail_unsupported)
-                        err = -ENOTSUPP;
-                psb->cipher_strlen = 0;
-                kfree(psb->cipher_string);
-                psb->cipher_string = NULL;
-        }
-
-        return err;
-}
-
-/*
- * Capabilities handshake response.
- */
-static int pohmelfs_capabilities_response(struct netfs_state *st)
-{
-        struct netfs_cmd *cmd = &st->cmd;
-        int err = 0;
-
-        err = pohmelfs_data_recv(st, st->data, cmd->size);
-        if (err)
-                return err;
-
-        switch (cmd->id) {
-        case POHMELFS_CRYPTO_CAPABILITIES:
-                        return pohmelfs_crypto_cap_response(st);
-        case POHMELFS_ROOT_CAPABILITIES:
-                        return pohmelfs_root_cap_response(st);
-        default:
-                        break;
-        }
-        return -EINVAL;
-}
-
-/*
- * Receiving extended attribute.
- * Does not work properly if received size is more than requested one,
- * it should not happen with current request/reply model though.
- */
-static int pohmelfs_getxattr_response(struct netfs_state *st)
-{
-        struct pohmelfs_sb *psb = st->psb;
-        struct netfs_cmd *cmd = &st->cmd;
-        struct pohmelfs_mcache *m;
-        short error = (signed short)cmd->ext, err;
-        unsigned int sz, total_size;
-
-        m = pohmelfs_mcache_search(psb, cmd->id);
-
-        dprintk("%s: id: %llu, gen: %llu, err: %d.\n",
-                __func__, cmd->id, (m) ? m->gen : 0, error);
-
-        if (!m) {
-                printk("%s: failed to find getxattr cache entry: id: %llu.\n", __func__, cmd->id);
-                return -ENOENT;
-        }
-
-        if (cmd->size) {
-                sz = min_t(unsigned int, cmd->size, m->size);
-                err = pohmelfs_data_recv_and_check(st, m->data, sz);
-                if (err) {
-                        error = err;
-                        goto out;
-                }
-
-                m->size = sz;
-                total_size = cmd->size - sz;
-
-                while (total_size) {
-                        sz = min(total_size, st->size);
-
-                        err = pohmelfs_data_recv_and_check(st, st->data, sz);
-                        if (err) {
-                                error = err;
-                                break;
-                        }
-
-                        total_size -= sz;
-                }
-        }
-
-out:
-        m->err = error;
-        complete(&m->complete);
-        pohmelfs_mcache_put(psb, m);
-
-        return error;
-}
-
-int pohmelfs_data_lock_response(struct netfs_state *st)
-{
-        struct pohmelfs_sb *psb = st->psb;
-        struct netfs_cmd *cmd = &st->cmd;
-        struct pohmelfs_mcache *m;
-        short err = (signed short)cmd->ext;
-        u64 id = cmd->id;
-
-        m = pohmelfs_mcache_search(psb, id);
-
-        dprintk("%s: id: %llu, gen: %llu, err: %d.\n",
-                __func__, cmd->id, (m) ? m->gen : 0, err);
-
-        if (!m) {
-                pohmelfs_data_recv(st, st->data, cmd->size);
-                printk("%s: failed to find data lock response: id: %llu.\n", __func__, cmd->id);
-                return -ENOENT;
-        }
-
-        if (cmd->size)
-                err = pohmelfs_data_recv_and_check(st, &m->info, cmd->size);
-
-        m->err = err;
-        complete(&m->complete);
-        pohmelfs_mcache_put(psb, m);
-
-        return err;
-}
-
-static void __inline__ netfs_state_reset(struct netfs_state *st)
-{
-        netfs_state_lock_send(st);
-        netfs_state_exit(st);
-        netfs_state_init(st);
-        netfs_state_unlock_send(st);
-}
-
-/*
- * Main receiving function, called from dedicated kernel thread.
- */
-static int pohmelfs_recv(void *data)
-{
-        int err = -EINTR;
-        struct netfs_state *st = data;
-        struct netfs_cmd *cmd = &st->cmd;
-
-        while (!kthread_should_stop()) {
-                /*
-                 * If socket will be reset after this statement, then
-                 * pohmelfs_data_recv() will just fail and loop will
-                 * start again, so it can be done without any locks.
-                 *
-                 * st->read_socket is needed to prevents state machine
-                 * breaking between this data reading and subsequent one
-                 * in protocol specific functions during connection reset.
-                 * In case of reset we have to read next command and do
-                 * not expect data for old command to magically appear in
-                 * new connection.
-                 */
-                st->read_socket = st->socket;
-                err = pohmelfs_data_recv(st, cmd, sizeof(struct netfs_cmd));
-                if (err) {
-                        msleep(1000);
-                        continue;
-                }
-
-                netfs_convert_cmd(cmd);
-
-                dprintk("%s: cmd: %u, id: %llu, start: %llu, size: %u, "
-                                "ext: %u, csize: %u, cpad: %u.\n",
-                                __func__, cmd->cmd, cmd->id, cmd->start,
-                                cmd->size, cmd->ext, cmd->csize, cmd->cpad);
-
-                if (cmd->csize) {
-                        struct pohmelfs_crypto_engine *e = &st->eng;
-
-                        if (unlikely(cmd->csize > e->size/2)) {
-                                netfs_state_reset(st);
-                                continue;
-                        }
-
-                        if (e->hash && unlikely(cmd->csize != st->psb->crypto_attached_size)) {
-                                dprintk("%s: cmd: cmd: %u, id: %llu, start: %llu, size: %u, "
-                                                "csize: %u != digest size %u.\n",
-                                                __func__, cmd->cmd, cmd->id, cmd->start, cmd->size,
-                                                cmd->csize, st->psb->crypto_attached_size);
-                                netfs_state_reset(st);
-                                continue;
-                        }
-
-                        err = pohmelfs_data_recv(st, e->data, cmd->csize);
-                        if (err) {
-                                netfs_state_reset(st);
-                                continue;
-                        }
-
-#ifdef CONFIG_POHMELFS_DEBUG
-                        {
-                                unsigned int i;
-                                unsigned char *hash = e->data;
-
-                                dprintk("%s: received hash: ", __func__);
-                                for (i = 0; i < cmd->csize; ++i)
-                                        printk("%02x ", hash[i]);
-
-                                printk("\n");
-                        }
-#endif
-                        cmd->size -= cmd->csize;
-                }
-
-                /*
-                 * This should catch protocol breakage and random garbage instead of commands.
-                 */
-                if (unlikely((cmd->size > st->size) && (cmd->cmd != NETFS_XATTR_GET))) {
-                        netfs_state_reset(st);
-                        continue;
-                }
-
-                switch (cmd->cmd) {
-                case NETFS_READ_PAGE:
-                                err = pohmelfs_read_page_response(st);
-                                break;
-                case NETFS_READDIR:
-                                err = pohmelfs_readdir_response(st);
-                                break;
-                case NETFS_LOOKUP:
-                                err = pohmelfs_lookup_response(st);
-                                break;
-                case NETFS_CREATE:
-                                err = pohmelfs_create_response(st);
-                                break;
-                case NETFS_REMOVE:
-                                err = pohmelfs_remove_response(st);
-                                break;
-                case NETFS_TRANS:
-                                err = pohmelfs_transaction_response(st);
-                                break;
-                case NETFS_PAGE_CACHE:
-                                err = pohmelfs_page_cache_response(st);
-                                break;
-                case NETFS_CAPABILITIES:
-                                err = pohmelfs_capabilities_response(st);
-                                break;
-                case NETFS_LOCK:
-                                err = pohmelfs_data_lock_response(st);
-                                break;
-                case NETFS_XATTR_GET:
-                                err = pohmelfs_getxattr_response(st);
-                                break;
-                default:
-                                printk("%s: wrong cmd: %u, id: %llu, start: %llu, size: %u, ext: %u.\n",
-                                        __func__, cmd->cmd, cmd->id, cmd->start, cmd->size, cmd->ext);
-                                netfs_state_reset(st);
-                                break;
-                }
-        }
-
-        while (!kthread_should_stop())
-                schedule_timeout_uninterruptible(msecs_to_jiffies(10));
-
-        return err;
-}
-
-int netfs_state_init(struct netfs_state *st)
-{
-        int err;
-        struct pohmelfs_ctl *ctl = &st->ctl;
-
-        err = sock_create(ctl->addr.sa_family, ctl->type, ctl->proto, &st->socket);
-        if (err) {
-                printk("%s: failed to create a socket: family: %d, type: %d, proto: %d, err: %d.\n",
-                                __func__, ctl->addr.sa_family, ctl->type, ctl->proto, err);
-                goto err_out_exit;
-        }
-
-        st->socket->sk->sk_allocation = GFP_NOIO;
-        st->socket->sk->sk_sndtimeo = st->socket->sk->sk_rcvtimeo = msecs_to_jiffies(60000);
-
-        err = kernel_connect(st->socket, (struct sockaddr *)&ctl->addr, ctl->addrlen, 0);
-        if (err) {
-                printk("%s: failed to connect to server: idx: %u, err: %d.\n",
-                                __func__, st->psb->idx, err);
-                goto err_out_release;
-        }
-        st->socket->sk->sk_sndtimeo = st->socket->sk->sk_rcvtimeo = msecs_to_jiffies(60000);
-
-        err = netfs_poll_init(st);
-        if (err)
-                goto err_out_release;
-
-        if (st->socket->ops->family == AF_INET) {
-                struct sockaddr_in *sin = (struct sockaddr_in *)&ctl->addr;
-                printk(KERN_INFO "%s: (re)connected to peer %pi4:%d.\n", __func__,
-                        &sin->sin_addr.s_addr, ntohs(sin->sin_port));
-        } else if (st->socket->ops->family == AF_INET6) {
-                struct sockaddr_in6 *sin = (struct sockaddr_in6 *)&ctl->addr;
-                printk(KERN_INFO "%s: (re)connected to peer %pi6:%d", __func__,
-                                &sin->sin6_addr, ntohs(sin->sin6_port));
-        }
-
-        return 0;
-
-err_out_release:
-        sock_release(st->socket);
-err_out_exit:
-        st->socket = NULL;
-        return err;
-}
-
-void netfs_state_exit(struct netfs_state *st)
-{
-        if (st->socket) {
-                netfs_poll_exit(st);
-                st->socket->ops->shutdown(st->socket, 2);
-
-                if (st->socket->ops->family == AF_INET) {
-                        struct sockaddr_in *sin = (struct sockaddr_in *)&st->ctl.addr;
-                        printk(KERN_INFO "%s: disconnected from peer %pi4:%d.\n", __func__,
-                                &sin->sin_addr.s_addr, ntohs(sin->sin_port));
-                } else if (st->socket->ops->family == AF_INET6) {
-                        struct sockaddr_in6 *sin = (struct sockaddr_in6 *)&st->ctl.addr;
-                        printk(KERN_INFO "%s: disconnected from peer %pi6:%d", __func__,
-                                &sin->sin6_addr, ntohs(sin->sin6_port));
-                }
-
-                sock_release(st->socket);
-                st->socket = NULL;
-                st->read_socket = NULL;
-                st->need_reset = 0;
-        }
-}
-
-int pohmelfs_state_init_one(struct pohmelfs_sb *psb, struct pohmelfs_config *conf)
-{
-        struct netfs_state *st = &conf->state;
-        int err = -ENOMEM;
-
-        mutex_init(&st->__state_lock);
-        mutex_init(&st->__state_send_lock);
-        init_waitqueue_head(&st->thread_wait);
-
-        st->psb = psb;
-        st->trans_root = RB_ROOT;
-        mutex_init(&st->trans_lock);
-
-        st->size = psb->trans_data_size;
-        st->data = kmalloc(st->size, GFP_KERNEL);
-        if (!st->data)
-                goto err_out_exit;
-
-        if (psb->perform_crypto) {
-                err = pohmelfs_crypto_engine_init(&st->eng, psb);
-                if (err)
-                        goto err_out_free_data;
-        }
-
-        err = netfs_state_init(st);
-        if (err)
-                goto err_out_free_engine;
-
-        st->thread = kthread_run(pohmelfs_recv, st, "pohmelfs/%u", psb->idx);
-        if (IS_ERR(st->thread)) {
-                err = PTR_ERR(st->thread);
-                goto err_out_netfs_exit;
-        }
-
-        if (!psb->active_state)
-                psb->active_state = conf;
-
-        dprintk("%s: conf: %p, st: %p, socket: %p.\n",
-                        __func__, conf, st, st->socket);
-        return 0;
-
-err_out_netfs_exit:
-        netfs_state_exit(st);
-err_out_free_engine:
-        pohmelfs_crypto_engine_exit(&st->eng);
-err_out_free_data:
-        kfree(st->data);
-err_out_exit:
-        return err;
-
-}
-
-void pohmelfs_state_flush_transactions(struct netfs_state *st)
-{
-        struct rb_node *rb_node;
-        struct netfs_trans_dst *dst;
-
-        mutex_lock(&st->trans_lock);
-        for (rb_node = rb_first(&st->trans_root); rb_node; ) {
-                dst = rb_entry(rb_node, struct netfs_trans_dst, state_entry);
-                rb_node = rb_next(rb_node);
-
-                dst->trans->result = -EINVAL;
-                netfs_trans_remove_nolock(dst, st);
-                netfs_trans_drop_dst_nostate(dst);
-        }
-        mutex_unlock(&st->trans_lock);
-}
-
-static void pohmelfs_state_exit_one(struct pohmelfs_config *c)
-{
-        struct netfs_state *st = &c->state;
-
-        dprintk("%s: exiting, st: %p.\n", __func__, st);
-        if (st->thread) {
-                kthread_stop(st->thread);
-                st->thread = NULL;
-        }
-
-        netfs_state_lock_send(st);
-        netfs_state_exit(st);
-        netfs_state_unlock_send(st);
-
-        pohmelfs_state_flush_transactions(st);
-
-        pohmelfs_crypto_engine_exit(&st->eng);
-        kfree(st->data);
-
-        kfree(c);
-}
-
-/*
- * Initialize network stack. It searches for given ID in global
- * configuration table, this contains information of the remote server
- * (address (any supported by socket interface) and port, protocol and so on).
- */
-int pohmelfs_state_init(struct pohmelfs_sb *psb)
-{
-        int err = -ENOMEM;
-
-        err = pohmelfs_copy_config(psb);
-        if (err) {
-                pohmelfs_state_exit(psb);
-                return err;
-        }
-
-        return 0;
-}
-
-void pohmelfs_state_exit(struct pohmelfs_sb *psb)
-{
-        struct pohmelfs_config *c, *tmp;
-
-        list_for_each_entry_safe(c, tmp, &psb->state_list, config_entry) {
-                list_del(&c->config_entry);
-                pohmelfs_state_exit_one(c);
-        }
-}
-
-void pohmelfs_switch_active(struct pohmelfs_sb *psb)
-{
-        struct pohmelfs_config *c = psb->active_state;
-
-        if (!list_empty(&psb->state_list)) {
-                if (c->config_entry.next != &psb->state_list) {
-                        psb->active_state = list_entry(c->config_entry.next,
-                                struct pohmelfs_config, config_entry);
-                } else {
-                        psb->active_state = list_entry(psb->state_list.next,
-                                struct pohmelfs_config, config_entry);
-                }
-
-                dprintk("%s: empty: %d, active %p -> %p.\n",
-                        __func__, list_empty(&psb->state_list), c,
-                        psb->active_state);
-        } else
-                psb->active_state = NULL;
-}
-
-void pohmelfs_check_states(struct pohmelfs_sb *psb)
-{
-        struct pohmelfs_config *c, *tmp;
-        LIST_HEAD(delete_list);
-
-        mutex_lock(&psb->state_lock);
-        list_for_each_entry_safe(c, tmp, &psb->state_list, config_entry) {
-                if (pohmelfs_config_check(c, psb->idx)) {
-
-                        if (psb->active_state == c)
-                                pohmelfs_switch_active(psb);
-                        list_move(&c->config_entry, &delete_list);
-                }
-        }
-        pohmelfs_copy_config(psb);
-        mutex_unlock(&psb->state_lock);
-
-        list_for_each_entry_safe(c, tmp, &delete_list, config_entry) {
-                list_del(&c->config_entry);
-                pohmelfs_state_exit_one(c);
-        }
-}
diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
deleted file mode 100644
index f26894f2a57f..000000000000
--- a/drivers/staging/pohmelfs/netfs.h
+++ /dev/null
@@ -1,919 +0,0 @@
-/*
- * 2007+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
- * All rights reserved.
- *
- * 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.
- */
-
-#ifndef __NETFS_H
-#define __NETFS_H
-
-#include <linux/types.h>
-#include <linux/connector.h>
-#include <linux/backing-dev.h>
-
-#define POHMELFS_CN_IDX                 5
-#define POHMELFS_CN_VAL                 0
-
-#define POHMELFS_CTLINFO_ACK            1
-#define POHMELFS_NOINFO_ACK             2
-
-#define POHMELFS_NULL_IDX               65535
-
-/*
- * Network command structure.
- * Will be extended.
- */
-struct netfs_cmd {
-        __u16                   cmd;    /* Command number */
-        __u16                   csize;  /* Attached crypto information size */
-        __u16                   cpad;   /* Attached padding size */
-        __u16                   ext;    /* External flags */
-        __u32                   size;   /* Size of the attached data */
-        __u32                   trans;  /* Transaction id */
-        __u64                   id;     /* Object ID to operate on. Used for feedback.*/
-        __u64                   start;  /* Start of the object. */
-        __u64                   iv;     /* IV sequence */
-        __u8                    data[0];
-};
-
-static inline void netfs_convert_cmd(struct netfs_cmd *cmd)
-{
-        cmd->id = __be64_to_cpu(cmd->id);
-        cmd->start = __be64_to_cpu(cmd->start);
-        cmd->iv = __be64_to_cpu(cmd->iv);
-        cmd->cmd = __be16_to_cpu(cmd->cmd);
-        cmd->ext = __be16_to_cpu(cmd->ext);
-        cmd->csize = __be16_to_cpu(cmd->csize);
-        cmd->cpad = __be16_to_cpu(cmd->cpad);
-        cmd->size = __be32_to_cpu(cmd->size);
-}
-
-#define NETFS_TRANS_SINGLE_DST          (1<<0)
-
-enum {
-        NETFS_READDIR   = 1,    /* Read directory for given inode number */
-        NETFS_READ_PAGE,        /* Read data page from the server */
-        NETFS_WRITE_PAGE,       /* Write data page to the server */
-        NETFS_CREATE,           /* Create directory entry */
-        NETFS_REMOVE,           /* Remove directory entry */
-
-        NETFS_LOOKUP,           /* Lookup single object */
-        NETFS_LINK,             /* Create a link */
-        NETFS_TRANS,            /* Transaction */
-        NETFS_OPEN,             /* Open intent */
-        NETFS_INODE_INFO,       /* Metadata cache coherency synchronization message */
-
-        NETFS_PAGE_CACHE,       /* Page cache invalidation message */
-        NETFS_READ_PAGES,       /* Read multiple contiguous pages in one go */
-        NETFS_RENAME,           /* Rename object */
-        NETFS_CAPABILITIES,     /* Capabilities of the client, for example supported crypto */
-        NETFS_LOCK,             /* Distributed lock message */
-
-        NETFS_XATTR_SET,        /* Set extended attribute */
-        NETFS_XATTR_GET,        /* Get extended attribute */
-        NETFS_CMD_MAX
-};
-
-enum {
-        POHMELFS_FLAGS_ADD = 0, /* Network state control message for ADD */
-        POHMELFS_FLAGS_DEL,     /* Network state control message for DEL */
-        POHMELFS_FLAGS_SHOW,    /* Network state control message for SHOW */
-        POHMELFS_FLAGS_CRYPTO,  /* Crypto data control message */
-        POHMELFS_FLAGS_MODIFY,  /* Network state modification message */
-        POHMELFS_FLAGS_DUMP,    /* Network state control message for SHOW ALL */
-        POHMELFS_FLAGS_FLUSH,   /* Network state control message for FLUSH */
-};
-
-/*
- * Always wanted to copy it from socket headers into public one,
- * since they are __KERNEL__ protected there.
- */
-#define _K_SS_MAXSIZE   128
-
-struct saddr {
-        unsigned short          sa_family;
-        char                    addr[_K_SS_MAXSIZE];
-};
-
-enum {
-        POHMELFS_CRYPTO_HASH = 0,
-        POHMELFS_CRYPTO_CIPHER,
-};
-
-struct pohmelfs_crypto {
-        unsigned int            idx;            /* Config index */
-        unsigned short          strlen;         /* Size of the attached crypto string including 0-byte
-                                                 * "cbc(aes)" for example */
-        unsigned short          type;           /* HMAC, cipher, both */
-        unsigned int            keysize;        /* Key size */
-        unsigned char           data[0];        /* Algorithm string, key and IV */
-};
-
-#define POHMELFS_IO_PERM_READ           (1<<0)
-#define POHMELFS_IO_PERM_WRITE          (1<<1)
-
-/*
- * Configuration command used to create table of different remote servers.
- */
-struct pohmelfs_ctl {
-        __u32                   idx;            /* Config index */
-        __u32                   type;           /* Socket type */
-        __u32                   proto;          /* Socket protocol */
-        __u16                   addrlen;        /* Size of the address */
-        __u16                   perm;           /* IO permission */
-        __u16                   prio;           /* IO priority */
-        struct saddr            addr;           /* Remote server address */
-};
-
-/*
- * Ack for userspace about requested command.
- */
-struct pohmelfs_cn_ack {
-        struct cn_msg           msg;
-        int                     error;
-        int                     msg_num;
-        int                     unused[3];
-        struct pohmelfs_ctl     ctl;
-};
-
-/*
- * Inode info structure used to sync with server.
- * Check what stat() returns.
- */
-struct netfs_inode_info {
-        unsigned int            mode;
-        unsigned int            nlink;
-        unsigned int            uid;
-        unsigned int            gid;
-        unsigned int            blocksize;
-        unsigned int            padding;
-        __u64                   ino;
-        __u64                   blocks;
-        __u64                   rdev;
-        __u64                   size;
-        __u64                   version;
-};
-
-static inline void netfs_convert_inode_info(struct netfs_inode_info *info)
-{
-        info->mode = __cpu_to_be32(info->mode);
-        info->nlink = __cpu_to_be32(info->nlink);
-        info->uid = __cpu_to_be32(info->uid);
-        info->gid = __cpu_to_be32(info->gid);
-        info->blocksize = __cpu_to_be32(info->blocksize);
-        info->blocks = __cpu_to_be64(info->blocks);
-        info->rdev = __cpu_to_be64(info->rdev);
-        info->size = __cpu_to_be64(info->size);
-        info->version = __cpu_to_be64(info->version);
-        info->ino = __cpu_to_be64(info->ino);
-}
-
-/*
- * Cache state machine.
- */
-enum {
-        NETFS_COMMAND_PENDING = 0,      /* Command is being executed */
-        NETFS_INODE_REMOTE_SYNCED,      /* Inode was synced to server */
-        NETFS_INODE_REMOTE_DIR_SYNCED,  /* Inode (directory) was synced from the server */
-        NETFS_INODE_OWNED,              /* Inode is owned by given host */
-        NETFS_INODE_NEED_FLUSH,         /* Inode has to be flushed to the server */
-};
-
-/*
- * POHMELFS capabilities: information about supported
- * crypto operations (hash/cipher, modes, key sizes and so on),
- * root information (used/available size, number of objects, permissions)
- */
-enum pohmelfs_capabilities {
-        POHMELFS_CRYPTO_CAPABILITIES = 0,
-        POHMELFS_ROOT_CAPABILITIES,
-};
-
-/* Read-only mount */
-#define POHMELFS_FLAGS_RO               (1<<0)
-/* Extended attributes support on/off */
-#define POHMELFS_FLAGS_XATTR            (1<<1)
-
-struct netfs_root_capabilities {
-        __u64                   nr_files;
-        __u64                   used, avail;
-        __u64                   flags;
-};
-
-static inline void netfs_convert_root_capabilities(struct netfs_root_capabilities *cap)
-{
-        cap->nr_files = __cpu_to_be64(cap->nr_files);
-        cap->used = __cpu_to_be64(cap->used);
-        cap->avail = __cpu_to_be64(cap->avail);
-        cap->flags = __cpu_to_be64(cap->flags);
-}
-
-struct netfs_crypto_capabilities {
-        unsigned short          hash_strlen;    /* Hash string length, like "hmac(sha1) including 0 byte "*/
-        unsigned short          cipher_strlen;  /* Cipher string length with the same format */
-        unsigned int            cipher_keysize; /* Cipher key size */
-};
-
-static inline void netfs_convert_crypto_capabilities(struct netfs_crypto_capabilities *cap)
-{
-        cap->hash_strlen = __cpu_to_be16(cap->hash_strlen);
-        cap->cipher_strlen = __cpu_to_be16(cap->cipher_strlen);
-        cap->cipher_keysize = __cpu_to_be32(cap->cipher_keysize);
-}
-
-enum pohmelfs_lock_type {
-        POHMELFS_LOCK_GRAB      = (1<<15),
-
-        POHMELFS_READ_LOCK      = 0,
-        POHMELFS_WRITE_LOCK,
-};
-
-struct netfs_lock {
-        __u64                   start;
-        __u64                   ino;
-        __u32                   size;
-        __u32                   type;
-};
-
-static inline void netfs_convert_lock(struct netfs_lock *lock)
-{
-        lock->start = __cpu_to_be64(lock->start);
-        lock->ino = __cpu_to_be64(lock->ino);
-        lock->size = __cpu_to_be32(lock->size);
-        lock->type = __cpu_to_be32(lock->type);
-}
-
-#ifdef __KERNEL__
-
-#include <linux/kernel.h>
-#include <linux/completion.h>
-#include <linux/rbtree.h>
-#include <linux/net.h>
-#include <linux/poll.h>
-
-/*
- * Private POHMELFS cache of objects in directory.
- */
-struct pohmelfs_name {
-        struct rb_node          hash_node;
-
-        struct list_head        sync_create_entry;
-
-        u64                     ino;
-
-        u32                     hash;
-        u32                     mode;
-        u32                     len;
-
-        char                    *data;
-};
-
-/*
- * POHMELFS inode. Main object.
- */
-struct pohmelfs_inode {
-        struct list_head        inode_entry;            /* Entry in superblock list.
-                                                         * Objects which are not bound to dentry require to be dropped
-                                                         * in ->put_super()
-                                                         */
-        struct rb_root          hash_root;              /* The same, but indexed by name hash and len */
-        struct mutex            offset_lock;            /* Protect both above trees */
-
-        struct list_head        sync_create_list;       /* List of created but not yet synced to the server children */
-
-        unsigned int            drop_count;
-
-        int                     lock_type;              /* How this inode is locked: read or write */
-
-        int                     error;                  /* Transaction error for given inode */
-
-        long                    state;                  /* State machine above */
-
-        u64                     ino;                    /* Inode number */
-        u64                     total_len;              /* Total length of all children names, used to create offsets */
-
-        struct inode            vfs_inode;
-};
-
-struct netfs_trans;
-typedef int (*netfs_trans_complete_t)(struct page **pages, unsigned int page_num,
-                void *private, int err);
-
-struct netfs_state;
-struct pohmelfs_sb;
-
-struct netfs_trans {
-        /*
-         * Transaction header and attached contiguous data live here.
-         */
-        struct iovec                    iovec;
-
-        /*
-         * Pages attached to transaction.
-         */
-        struct page                     **pages;
-
-        /*
-         * List and protecting lock for transaction destination
-         * network states.
-         */
-        spinlock_t                      dst_lock;
-        struct list_head                dst_list;
-
-        /*
-         * Number of users for given transaction.
-         * For example each network state attached to transaction
-         * via dst_list increases it.
-         */
-        atomic_t                        refcnt;
-
-        /*
-         * Number of pages attached to given transaction.
-         * Some slots in above page array can be NULL, since
-         * for example page can be under writeback already,
-         * so we skip it in this transaction.
-         */
-        unsigned int                    page_num;
-
-        /*
-         * Transaction flags: single dst or broadcast and so on.
-         */
-        unsigned int                    flags;
-
-        /*
-         * Size of the data, which can be placed into
-         * iovec.iov_base area.
-         */
-        unsigned int                    total_size;
-
-        /*
-         * Number of pages to be sent to remote server.
-         * Usually equal to above page_num, but in case of partial
-         * writeback it can accumulate only pages already completed
-         * previous writeback.
-         */
-        unsigned int                    attached_pages;
-
-        /*
-         * Attached number of bytes in all above pages.
-         */
-        unsigned int                    attached_size;
-
-        /*
-         * Unique transacton generation number.
-         * Used as identity in the network state tree of transactions.
-         */
-        unsigned int                    gen;
-
-        /*
-         * Transaction completion status.
-         */
-        int                             result;
-
-        /*
-         * Superblock this transaction belongs to
-         */
-        struct pohmelfs_sb              *psb;
-
-        /*
-         * Crypto engine, which processed this transaction.
-         * Can be not NULL only if crypto engine holds encrypted pages.
-         */
-        struct pohmelfs_crypto_engine   *eng;
-
-        /* Private data */
-        void                            *private;
-
-        /* Completion callback, invoked just before transaction is destroyed */
-        netfs_trans_complete_t          complete;
-};
-
-static inline int netfs_trans_cur_len(struct netfs_trans *t)
-{
-        return (signed)(t->total_size - t->iovec.iov_len);
-}
-
-static inline void *netfs_trans_current(struct netfs_trans *t)
-{
-        return t->iovec.iov_base + t->iovec.iov_len;
-}
-
-struct netfs_trans *netfs_trans_alloc(struct pohmelfs_sb *psb, unsigned int size,
-                unsigned int flags, unsigned int nr);
-void netfs_trans_free(struct netfs_trans *t);
-int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb);
-int netfs_trans_finish_send(struct netfs_trans *t, struct pohmelfs_sb *psb);
-
-static inline void netfs_trans_reset(struct netfs_trans *t)
-{
-        t->complete = NULL;
-}
-
-struct netfs_trans_dst {
-        struct list_head                trans_entry;
-        struct rb_node                  state_entry;
-
-        unsigned long                   send_time;
-
-        /*
-         * Times this transaction was resent to its old or new,
-         * depending on flags, destinations. When it reaches maximum
-         * allowed number, specified in superblock->trans_retries,
-         * transaction will be freed with ETIMEDOUT error.
-         */
-        unsigned int                    retries;
-
-        struct netfs_trans              *trans;
-        struct netfs_state              *state;
-};
-
-struct netfs_trans_dst *netfs_trans_search(struct netfs_state *st, unsigned int gen);
-void netfs_trans_drop_dst(struct netfs_trans_dst *dst);
-void netfs_trans_drop_dst_nostate(struct netfs_trans_dst *dst);
-void netfs_trans_drop_trans(struct netfs_trans *t, struct netfs_state *st);
-void netfs_trans_drop_last(struct netfs_trans *t, struct netfs_state *st);
-int netfs_trans_resend(struct netfs_trans *t, struct pohmelfs_sb *psb);
-int netfs_trans_remove_nolock(struct netfs_trans_dst *dst, struct netfs_state *st);
-
-int netfs_trans_init(void);
-void netfs_trans_exit(void);
-
-struct pohmelfs_crypto_engine {
-        u64                             iv;             /* Crypto IV for current operation */
-        unsigned long                   timeout;        /* Crypto waiting timeout */
-        unsigned int                    size;           /* Size of crypto scratchpad */
-        void                            *data;          /* Temporal crypto scratchpad */
-        /*
-         * Crypto operations performed on objects.
-         */
-        struct crypto_hash              *hash;
-        struct crypto_ablkcipher        *cipher;
-
-        struct pohmelfs_crypto_thread   *thread;        /* Crypto thread which hosts this engine */
-
-        struct page                     **pages;
-        unsigned int                    page_num;
-};
-
-struct pohmelfs_crypto_thread {
-        struct list_head                thread_entry;
-
-        struct task_struct              *thread;
-        struct pohmelfs_sb              *psb;
-
-        struct pohmelfs_crypto_engine   eng;
-
-        struct netfs_trans              *trans;
-
-        wait_queue_head_t               wait;
-        int                             error;
-
-        unsigned int                    size;
-        struct page                     *page;
-};
-
-void pohmelfs_crypto_thread_make_ready(struct pohmelfs_crypto_thread *th);
-
-/*
- * Network state, attached to one server.
- */
-struct netfs_state {
-        struct mutex            __state_lock;           /* Can not allow to use the same socket simultaneously */
-        struct mutex            __state_send_lock;
-        struct netfs_cmd        cmd;                    /* Cached command */
-        struct netfs_inode_info info;                   /* Cached inode info */
-
-        void                    *data;                  /* Cached some data */
-        unsigned int            size;                   /* Size of that data */
-
-        struct pohmelfs_sb      *psb;                   /* Superblock */
-
-        struct task_struct      *thread;                /* Async receiving thread */
-
-        /* Waiting/polling machinery */
-        wait_queue_t            wait;
-        wait_queue_head_t       *whead;
-        wait_queue_head_t       thread_wait;
-
-        struct mutex            trans_lock;
-        struct rb_root          trans_root;
-
-        struct pohmelfs_ctl     ctl;                    /* Remote peer */
-
-        struct socket           *socket;                /* Socket object */
-        struct socket           *read_socket;           /* Cached pointer to socket object.
-                                                         * Used to determine if between lock drops socket was changed.
-                                                         * Never used to read data or any kind of access.
-                                                         */
-        /*
-         * Crypto engines to process incoming data.
-         */
-        struct pohmelfs_crypto_engine   eng;
-
-        int                     need_reset;
-};
-
-int netfs_state_init(struct netfs_state *st);
-void netfs_state_exit(struct netfs_state *st);
-
-static inline void netfs_state_lock_send(struct netfs_state *st)
-{
-        mutex_lock(&st->__state_send_lock);
-}
-
-static inline int netfs_state_trylock_send(struct netfs_state *st)
-{
-        return mutex_trylock(&st->__state_send_lock);
-}
-
-static inline void netfs_state_unlock_send(struct netfs_state *st)
-{
-        BUG_ON(!mutex_is_locked(&st->__state_send_lock));
-
-        mutex_unlock(&st->__state_send_lock);
-}
-
-static inline void netfs_state_lock(struct netfs_state *st)
-{
-        mutex_lock(&st->__state_lock);
-}
-
-static inline void netfs_state_unlock(struct netfs_state *st)
-{
-        BUG_ON(!mutex_is_locked(&st->__state_lock));
-
-        mutex_unlock(&st->__state_lock);
-}
-
-static inline unsigned int netfs_state_poll(struct netfs_state *st)
-{
-        unsigned int revents = POLLHUP | POLLERR;
-
-        netfs_state_lock(st);
-        if (st->socket)
-                revents = st->socket->ops->poll(NULL, st->socket, NULL);
-        netfs_state_unlock(st);
-
-        return revents;
-}
-
-struct pohmelfs_config;
-
-struct pohmelfs_sb {
-        struct rb_root          mcache_root;
-        struct mutex            mcache_lock;
-        atomic_long_t           mcache_gen;
-        unsigned long           mcache_timeout;
-
-        unsigned int            idx;
-
-        unsigned int            trans_retries;
-
-        atomic_t                trans_gen;
-
-        unsigned int            crypto_attached_size;
-        unsigned int            crypto_align_size;
-
-        unsigned int            crypto_fail_unsupported;
-
-        unsigned int            crypto_thread_num;
-        struct list_head        crypto_active_list, crypto_ready_list;
-        struct mutex            crypto_thread_lock;
-
-        unsigned int            trans_max_pages;
-        unsigned long           trans_data_size;
-        unsigned long           trans_timeout;
-
-        unsigned long           drop_scan_timeout;
-        unsigned long           trans_scan_timeout;
-
-        unsigned long           wait_on_page_timeout;
-
-        struct list_head        flush_list;
-        struct list_head        drop_list;
-        spinlock_t              ino_lock;
-        u64                     ino;
-
-        /*
-         * Remote nodes POHMELFS connected to.
-         */
-        struct list_head        state_list;
-        struct mutex            state_lock;
-
-        /*
-         * Currently active state to request data from.
-         */
-        struct pohmelfs_config  *active_state;
-
-
-        wait_queue_head_t       wait;
-
-        /*
-         * Timed checks: stale transactions, inodes to be freed and so on.
-         */
-        struct delayed_work     dwork;
-        struct delayed_work     drop_dwork;
-
-        struct super_block      *sb;
-
-        struct backing_dev_info bdi;
-
-        /*
-         * Algorithm strings.
-         */
-        char                    *hash_string;
-        char                    *cipher_string;
-
-        u8                      *hash_key;
-        u8                      *cipher_key;
-
-        /*
-         * Algorithm string lengths.
-         */
-        unsigned int            hash_strlen;
-        unsigned int            cipher_strlen;
-        unsigned int            hash_keysize;
-        unsigned int            cipher_keysize;
-
-        /*
-         * Controls whether to perfrom crypto processing or not.
-         */
-        int                     perform_crypto;
-
-        /*
-         * POHMELFS statistics.
-         */
-        u64                     total_size;
-        u64                     avail_size;
-        atomic_long_t           total_inodes;
-
-        /*
-         * Xattr support, read-only and so on.
-         */
-        u64                     state_flags;
-
-        /*
-         * Temporary storage to detect changes in the wait queue.
-         */
-        long                    flags;
-};
-
-static inline void netfs_trans_update(struct netfs_cmd *cmd,
-                struct netfs_trans *t, unsigned int size)
-{
-        unsigned int sz = ALIGN(size, t->psb->crypto_align_size);
-
-        t->iovec.iov_len += sizeof(struct netfs_cmd) + sz;
-        cmd->cpad = __cpu_to_be16(sz - size);
-}
-
-static inline struct pohmelfs_sb *POHMELFS_SB(struct super_block *sb)
-{
-        return sb->s_fs_info;
-}
-
-static inline struct pohmelfs_inode *POHMELFS_I(struct inode *inode)
-{
-        return container_of(inode, struct pohmelfs_inode, vfs_inode);
-}
-
-static inline u64 pohmelfs_new_ino(struct pohmelfs_sb *psb)
-{
-        u64 ino;
-
-        spin_lock(&psb->ino_lock);
-        ino = psb->ino++;
-        spin_unlock(&psb->ino_lock);
-
-        return ino;
-}
-
-static inline void pohmelfs_put_inode(struct pohmelfs_inode *pi)
-{
-        struct pohmelfs_sb *psb = POHMELFS_SB(pi->vfs_inode.i_sb);
-
-        spin_lock(&psb->ino_lock);
-        list_move_tail(&pi->inode_entry, &psb->drop_list);
-        pi->drop_count++;
-        spin_unlock(&psb->ino_lock);
-}
-
-struct pohmelfs_config {
-        struct list_head        config_entry;
-
-        struct netfs_state      state;
-};
-
-struct pohmelfs_config_group {
-        /*
-         * Entry in the global config group list.
-         */
-        struct list_head        group_entry;
-
-        /*
-         * Index of the current group.
-         */
-        unsigned int            idx;
-        /*
-         * Number of config_list entries in this group entry.
-         */
-        unsigned int            num_entry;
-        /*
-         * Algorithm strings.
-         */
-        char                    *hash_string;
-        char                    *cipher_string;
-
-        /*
-         * Algorithm string lengths.
-         */
-        unsigned int            hash_strlen;
-        unsigned int            cipher_strlen;
-
-        /*
-         * Key and its size.
-         */
-        unsigned int            hash_keysize;
-        unsigned int            cipher_keysize;
-        u8                      *hash_key;
-        u8                      *cipher_key;
-
-        /*
-         * List of config entries (network state info) for given idx.
-         */
-        struct list_head        config_list;
-};
-
-int __init pohmelfs_config_init(void);
-void pohmelfs_config_exit(void);
-int pohmelfs_copy_config(struct pohmelfs_sb *psb);
-int pohmelfs_copy_crypto(struct pohmelfs_sb *psb);
-int pohmelfs_config_check(struct pohmelfs_config *config, int idx);
-int pohmelfs_state_init_one(struct pohmelfs_sb *psb, struct pohmelfs_config *conf);
-
-extern const struct file_operations pohmelfs_dir_fops;
-extern const struct inode_operations pohmelfs_dir_inode_ops;
-
-int pohmelfs_state_init(struct pohmelfs_sb *psb);
-void pohmelfs_state_exit(struct pohmelfs_sb *psb);
-void pohmelfs_state_flush_transactions(struct netfs_state *st);
-
-void pohmelfs_fill_inode(struct inode *inode, struct netfs_inode_info *info);
-
-void pohmelfs_name_del(struct pohmelfs_inode *parent, struct pohmelfs_name *n);
-void pohmelfs_free_names(struct pohmelfs_inode *parent);
-struct pohmelfs_name *pohmelfs_search_hash(struct pohmelfs_inode *pi, u32 hash);
-
-void pohmelfs_inode_del_inode(struct pohmelfs_sb *psb, struct pohmelfs_inode *pi);
-
-struct pohmelfs_inode *pohmelfs_create_entry_local(struct pohmelfs_sb *psb,
-        struct pohmelfs_inode *parent, struct qstr *str, u64 start, umode_t mode);
-
-int pohmelfs_write_create_inode(struct pohmelfs_inode *pi);
-
-int pohmelfs_write_inode_create(struct inode *inode, struct netfs_trans *trans);
-int pohmelfs_remove_child(struct pohmelfs_inode *parent, struct pohmelfs_name *n);
-
-struct pohmelfs_inode *pohmelfs_new_inode(struct pohmelfs_sb *psb,
-                struct pohmelfs_inode *parent, struct qstr *str,
-                struct netfs_inode_info *info, int link);
-
-int pohmelfs_setattr(struct dentry *dentry, struct iattr *attr);
-int pohmelfs_setattr_raw(struct inode *inode, struct iattr *attr);
-
-int pohmelfs_meta_command(struct pohmelfs_inode *pi, unsigned int cmd_op, unsigned int flags,
-                netfs_trans_complete_t complete, void *priv, u64 start);
-int pohmelfs_meta_command_data(struct pohmelfs_inode *pi, u64 id, unsigned int cmd_op, char *addon,
-                unsigned int flags, netfs_trans_complete_t complete, void *priv, u64 start);
-
-void pohmelfs_check_states(struct pohmelfs_sb *psb);
-void pohmelfs_switch_active(struct pohmelfs_sb *psb);
-
-int pohmelfs_construct_path_string(struct pohmelfs_inode *pi, void *data, int len);
-int pohmelfs_path_length(struct pohmelfs_inode *pi);
-
-struct pohmelfs_crypto_completion {
-        struct completion       complete;
-        int                     error;
-};
-
-int pohmelfs_trans_crypt(struct netfs_trans *t, struct pohmelfs_sb *psb);
-void pohmelfs_crypto_exit(struct pohmelfs_sb *psb);
-int pohmelfs_crypto_init(struct pohmelfs_sb *psb);
-
-int pohmelfs_crypto_engine_init(struct pohmelfs_crypto_engine *e, struct pohmelfs_sb *psb);
-void pohmelfs_crypto_engine_exit(struct pohmelfs_crypto_engine *e);
-
-int pohmelfs_crypto_process_input_data(struct pohmelfs_crypto_engine *e, u64 iv,
-                void *data, struct page *page, unsigned int size);
-int pohmelfs_crypto_process_input_page(struct pohmelfs_crypto_engine *e,
-                struct page *page, unsigned int size, u64 iv);
-
-static inline u64 pohmelfs_gen_iv(struct netfs_trans *t)
-{
-        u64 iv = t->gen;
-
-        iv <<= 32;
-        iv |= ((unsigned long)t) & 0xffffffff;
-
-        return iv;
-}
-
-int pohmelfs_data_lock(struct pohmelfs_inode *pi, u64 start, u32 size, int type);
-int pohmelfs_data_unlock(struct pohmelfs_inode *pi, u64 start, u32 size, int type);
-int pohmelfs_data_lock_response(struct netfs_state *st);
-
-static inline int pohmelfs_need_lock(struct pohmelfs_inode *pi, int type)
-{
-        if (test_bit(NETFS_INODE_OWNED, &pi->state)) {
-                if (type == pi->lock_type)
-                        return 0;
-                if ((type == POHMELFS_READ_LOCK) && (pi->lock_type == POHMELFS_WRITE_LOCK))
-                        return 0;
-        }
-
-        if (!test_bit(NETFS_INODE_REMOTE_SYNCED, &pi->state))
-                return 0;
-
-        return 1;
-}
-
-int __init pohmelfs_mcache_init(void);
-void pohmelfs_mcache_exit(void);
-
-/* #define CONFIG_POHMELFS_DEBUG */
-
-#ifdef CONFIG_POHMELFS_DEBUG
-#define dprintka(f, a...) printk(f, ##a)
-#define dprintk(f, a...) printk("%d: " f, task_pid_vnr(current), ##a)
-#else
-#define dprintka(f, a...) do {} while (0)
-#define dprintk(f, a...) do {} while (0)
-#endif
-
-static inline void netfs_trans_get(struct netfs_trans *t)
-{
-        atomic_inc(&t->refcnt);
-}
-
-static inline void netfs_trans_put(struct netfs_trans *t)
-{
-        if (atomic_dec_and_test(&t->refcnt)) {
-                dprintk("%s: t: %p, gen: %u, err: %d.\n",
-                        __func__, t, t->gen, t->result);
-                if (t->complete)
-                        t->complete(t->pages, t->page_num,
-                                t->private, t->result);
-                netfs_trans_free(t);
-        }
-}
-
-struct pohmelfs_mcache {
-        struct rb_node                  mcache_entry;
-        struct completion               complete;
-
-        atomic_t                        refcnt;
-
-        u64                             gen;
-
-        void                            *data;
-        u64                             start;
-        u32                             size;
-        int                             err;
-
-        struct netfs_inode_info         info;
-};
-
-struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start,
-                unsigned int size, void *data);
-void pohmelfs_mcache_free(struct pohmelfs_sb *psb, struct pohmelfs_mcache *m);
-struct pohmelfs_mcache *pohmelfs_mcache_search(struct pohmelfs_sb *psb, u64 gen);
-void pohmelfs_mcache_remove_locked(struct pohmelfs_sb *psb, struct pohmelfs_mcache *m);
-
-static inline void pohmelfs_mcache_get(struct pohmelfs_mcache *m)
-{
-        atomic_inc(&m->refcnt);
-}
-
-static inline void pohmelfs_mcache_put(struct pohmelfs_sb *psb,
-                struct pohmelfs_mcache *m)
-{
-        if (atomic_dec_and_test(&m->refcnt))
-                pohmelfs_mcache_free(psb, m);
-}
-
-/*#define POHMELFS_TRUNCATE_ON_INODE_FLUSH
- */
-
-#endif /* __KERNEL__*/
-
-#endif /* __NETFS_H */
diff --git a/drivers/staging/pohmelfs/path_entry.c b/drivers/staging/pohmelfs/path_entry.c
deleted file mode 100644
index 400a9fc386ad..000000000000
--- a/drivers/staging/pohmelfs/path_entry.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 2007+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
- * All rights reserved.
- *
- * 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.
- */
-
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/ktime.h>
-#include <linux/fs_struct.h>
-#include <linux/pagemap.h>
-#include <linux/writeback.h>
-#include <linux/mount.h>
-#include <linux/mm.h>
-
-#include "netfs.h"
-
-#define UNHASHED_OBSCURE_STRING_SIZE            sizeof(" (deleted)")
-
-/*
- * Create path from root for given inode.
- * Path is formed as set of stuctures, containing name of the object
- * and its inode data (mode, permissions and so on).
- */
-int pohmelfs_construct_path_string(struct pohmelfs_inode *pi, void *data, int len)
-{
-        struct path path;
-        struct dentry *d;
-        char *ptr;
-        int err = 0, strlen, reduce = 0;
-
-        d = d_find_alias(&pi->vfs_inode);
-        if (!d) {
-                printk("%s: no alias, list_empty: %d.\n", __func__, list_empty(&pi->vfs_inode.i_dentry));
-                return -ENOENT;
-        }
-
-        spin_lock(&current->fs->lock);
-        path.mnt = mntget(current->fs->root.mnt);
-        spin_unlock(&current->fs->lock);
-
-        path.dentry = d;
-
-        if (!IS_ROOT(d) && d_unhashed(d))
-                reduce = 1;
-
-        ptr = d_path(&path, data, len);
-        if (IS_ERR(ptr)) {
-                err = PTR_ERR(ptr);
-                goto out;
-        }
-
-        if (reduce && len >= UNHASHED_OBSCURE_STRING_SIZE) {
-                char *end = data + len - UNHASHED_OBSCURE_STRING_SIZE;
-                *end = '\0';
-        }
-
-        strlen = len - (ptr - (char *)data);
-        memmove(data, ptr, strlen);
-        ptr = data;
-
-        err = strlen;
-
-        dprintk("%s: dname: '%s', len: %u, maxlen: %u, name: '%s', strlen: %d.\n",
-                        __func__, d->d_name.name, d->d_name.len, len, ptr, strlen);
-
-out:
-        dput(d);
-        mntput(path.mnt);
-
-        return err;
-}
-
-int pohmelfs_path_length(struct pohmelfs_inode *pi)
-{
-        struct dentry *d, *root, *first;
-        int len;
-        unsigned seq;
-
-        first = d_find_alias(&pi->vfs_inode);
-        if (!first) {
-                dprintk("%s: ino: %llu, mode: %o.\n", __func__, pi->ino, pi->vfs_inode.i_mode);
-                return -ENOENT;
-        }
-
-        spin_lock(&current->fs->lock);
-        root = dget(current->fs->root.dentry);
-        spin_unlock(&current->fs->lock);
-
-rename_retry:
-        len = 1; /* Root slash */
-        d = first;
-        seq = read_seqbegin(&rename_lock);
-        rcu_read_lock();
-
-        if (!IS_ROOT(d) && d_unhashed(d))
-                len += UNHASHED_OBSCURE_STRING_SIZE; /* Obscure " (deleted)" string */
-
-        while (d && d != root && !IS_ROOT(d)) {
-                len += d->d_name.len + 1; /* Plus slash */
-                d = d->d_parent;
-        }
-        rcu_read_unlock();
-        if (read_seqretry(&rename_lock, seq))
-                goto rename_retry;
-
-        dput(root);
-        dput(first);
-
-        return len + 1; /* Including zero-byte */
-}
diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
deleted file mode 100644
index 06c1a7451b1b..000000000000
--- a/drivers/staging/pohmelfs/trans.c
+++ /dev/null
@@ -1,706 +0,0 @@
-/*
- * 2007+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
- * All rights reserved.
- *
- * 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.
- */
-
-#include <linux/module.h>
-#include <linux/crypto.h>
-#include <linux/fs.h>
-#include <linux/jhash.h>
-#include <linux/hash.h>
-#include <linux/ktime.h>
-#include <linux/mempool.h>
-#include <linux/mm.h>
-#include <linux/mount.h>
-#include <linux/pagemap.h>
-#include <linux/parser.h>
-#include <linux/poll.h>
-#include <linux/swap.h>
-#include <linux/slab.h>
-#include <linux/statfs.h>
-#include <linux/writeback.h>
-
-#include "netfs.h"
-
-static struct kmem_cache *netfs_trans_dst;
-static mempool_t *netfs_trans_dst_pool;
-
-static void netfs_trans_init_static(struct netfs_trans *t, int num, int size)
-{
-        t->page_num = num;
-        t->total_size = size;
-        atomic_set(&t->refcnt, 1);
-
-        spin_lock_init(&t->dst_lock);
-        INIT_LIST_HEAD(&t->dst_list);
-}
-
-static int netfs_trans_send_pages(struct netfs_trans *t, struct netfs_state *st)
-{
-        int err = 0;
-        unsigned int i, attached_pages = t->attached_pages, ci;
-        struct msghdr msg;
-        struct page **pages = (t->eng) ? t->eng->pages : t->pages;
-        struct page *p;
-        unsigned int size;
-
-        msg.msg_name = NULL;
-        msg.msg_namelen = 0;
-        msg.msg_control = NULL;
-        msg.msg_controllen = 0;
-        msg.msg_flags = MSG_WAITALL | MSG_MORE;
-
-        ci = 0;
-        for (i = 0; i < t->page_num; ++i) {
-                struct page *page = pages[ci];
-                struct netfs_cmd cmd;
-                struct iovec io;
-
-                p = t->pages[i];
-
-                if (!p)
-                        continue;
-
-                size = page_private(p);
-
-                io.iov_base = &cmd;
-                io.iov_len = sizeof(struct netfs_cmd);
-
-                cmd.cmd = NETFS_WRITE_PAGE;
-                cmd.ext = 0;
-                cmd.id = 0;
-                cmd.size = size;
-                cmd.start = p->index;
-                cmd.start <<= PAGE_CACHE_SHIFT;
-                cmd.csize = 0;
-                cmd.cpad = 0;
-                cmd.iv = pohmelfs_gen_iv(t);
-
-                netfs_convert_cmd(&cmd);
-
-                msg.msg_iov = &io;
-                msg.msg_iovlen = 1;
-                msg.msg_flags = MSG_WAITALL | MSG_MORE;
-
-                err = kernel_sendmsg(st->socket, &msg, (struct kvec *)msg.msg_iov, 1, sizeof(struct netfs_cmd));
-                if (err <= 0) {
-                        printk("%s: %d/%d failed to send transaction header: t: %p, gen: %u, err: %d.\n",
-                                        __func__, i, t->page_num, t, t->gen, err);
-                        if (err == 0)
-                                err = -ECONNRESET;
-                        goto err_out;
-                }
-
-                msg.msg_flags = MSG_WAITALL | (attached_pages == 1 ? 0 :
-                                MSG_MORE);
-
-                err = kernel_sendpage(st->socket, page, 0, size, msg.msg_flags);
-                if (err <= 0) {
-                        printk("%s: %d/%d failed to send transaction page: t: %p, gen: %u, size: %u, err: %d.\n",
-                                        __func__, i, t->page_num, t, t->gen, size, err);
-                        if (err == 0)
-                                err = -ECONNRESET;
-                        goto err_out;
-                }
-
-                dprintk("%s: %d/%d sent t: %p, gen: %u, page: %p/%p, size: %u.\n",
-                        __func__, i, t->page_num, t, t->gen, page, p, size);
-
-                err = 0;
-                attached_pages--;
-                if (!attached_pages)
-                        break;
-                ci++;
-
-                continue;
-
-err_out:
-                printk("%s: t: %p, gen: %u, err: %d.\n", __func__, t, t->gen, err);
-                netfs_state_exit(st);
-                break;
-        }
-
-        return err;
-}
-
-int netfs_trans_send(struct netfs_trans *t, struct netfs_state *st)
-{
-        int err;
-        struct msghdr msg;
-
-        BUG_ON(!t->iovec.iov_len);
-        BUG_ON(t->iovec.iov_len > 1024*1024*1024);
-
-        netfs_state_lock_send(st);
-        if (!st->socket) {
-                err = netfs_state_init(st);
-                if (err)
-                        goto err_out_unlock_return;
-        }
-
-        msg.msg_iov = &t->iovec;
-        msg.msg_iovlen = 1;
-        msg.msg_name = NULL;
-        msg.msg_namelen = 0;
-        msg.msg_control = NULL;
-        msg.msg_controllen = 0;
-        msg.msg_flags = MSG_WAITALL;
-
-        if (t->attached_pages)
-                msg.msg_flags |= MSG_MORE;
-
-        err = kernel_sendmsg(st->socket, &msg, (struct kvec *)msg.msg_iov, 1, t->iovec.iov_len);
-        if (err <= 0) {
-                printk("%s: failed to send contig transaction: t: %p, gen: %u, size: %zu, err: %d.\n",
-                                __func__, t, t->gen, t->iovec.iov_len, err);
-                if (err == 0)
-                        err = -ECONNRESET;
-                goto err_out_unlock_return;
-        }
-
-        dprintk("%s: sent %s transaction: t: %p, gen: %u, size: %zu, page_num: %u.\n",
-                        __func__, (t->page_num) ? "partial" : "full",
-                        t, t->gen, t->iovec.iov_len, t->page_num);
-
-        err = 0;
-        if (t->attached_pages)
-                err = netfs_trans_send_pages(t, st);
-
-err_out_unlock_return:
-
-        if (st->need_reset)
-                netfs_state_exit(st);
-
-        netfs_state_unlock_send(st);
-
-        dprintk("%s: t: %p, gen: %u, err: %d.\n",
-                __func__, t, t->gen, err);
-
-        t->result = err;
-        return err;
-}
-
-static inline int netfs_trans_cmp(unsigned int gen, unsigned int new)
-{
-        if (gen < new)
-                return 1;
-        if (gen > new)
-                return -1;
-        return 0;
-}
-
-struct netfs_trans_dst *netfs_trans_search(struct netfs_state *st, unsigned int gen)
-{
-        struct rb_root *root = &st->trans_root;
-        struct rb_node *n = root->rb_node;
-        struct netfs_trans_dst *tmp, *ret = NULL;
-        struct netfs_trans *t;
-        int cmp;
-
-        while (n) {
-                tmp = rb_entry(n, struct netfs_trans_dst, state_entry);
-                t = tmp->trans;
-
-                cmp = netfs_trans_cmp(t->gen, gen);
-                if (cmp < 0)
-                        n = n->rb_left;
-                else if (cmp > 0)
-                        n = n->rb_right;
-                else {
-                        ret = tmp;
-                        break;
-                }
-        }
-
-        return ret;
-}
-
-static int netfs_trans_insert(struct netfs_trans_dst *ndst, struct netfs_state *st)
-{
-        struct rb_root *root = &st->trans_root;
-        struct rb_node **n = &root->rb_node, *parent = NULL;
-        struct netfs_trans_dst *ret = NULL, *tmp;
-        struct netfs_trans *t = NULL, *new = ndst->trans;
-        int cmp;
-
-        while (*n) {
-                parent = *n;
-
-                tmp = rb_entry(parent, struct netfs_trans_dst, state_entry);
-                t = tmp->trans;
-
-                cmp = netfs_trans_cmp(t->gen, new->gen);
-                if (cmp < 0)
-                        n = &parent->rb_left;
-                else if (cmp > 0)
-                        n = &parent->rb_right;
-                else {
-                        ret = tmp;
-                        break;
-                }
-        }
-
-        if (ret) {
-                printk("%s: exist: old: gen: %u, flags: %x, send_time: %lu, "
-                                "new: gen: %u, flags: %x, send_time: %lu.\n",
-                        __func__, t->gen, t->flags, ret->send_time,
-                        new->gen, new->flags, ndst->send_time);
-                return -EEXIST;
-        }
-
-        rb_link_node(&ndst->state_entry, parent, n);
-        rb_insert_color(&ndst->state_entry, root);
-        ndst->send_time = jiffies;
-
-        return 0;
-}
-
-int netfs_trans_remove_nolock(struct netfs_trans_dst *dst, struct netfs_state *st)
-{
-        if (dst && dst->state_entry.rb_parent_color) {
-                rb_erase(&dst->state_entry, &st->trans_root);
-                dst->state_entry.rb_parent_color = 0;
-                return 1;
-        }
-        return 0;
-}
-
-static int netfs_trans_remove_state(struct netfs_trans_dst *dst)
-{
-        int ret;
-        struct netfs_state *st = dst->state;
-
-        mutex_lock(&st->trans_lock);
-        ret = netfs_trans_remove_nolock(dst, st);
-        mutex_unlock(&st->trans_lock);
-
-        return ret;
-}
-
-/*
- * Create new destination for given transaction associated with given network state.
- * Transaction's reference counter is bumped and will be dropped when either
- * reply is received or when async timeout detection task will fail resending
- * and drop transaction.
- */
-static int netfs_trans_push_dst(struct netfs_trans *t, struct netfs_state *st)
-{
-        struct netfs_trans_dst *dst;
-        int err;
-
-        dst = mempool_alloc(netfs_trans_dst_pool, GFP_KERNEL);
-        if (!dst)
-                return -ENOMEM;
-
-        dst->retries = 0;
-        dst->send_time = 0;
-        dst->state = st;
-        dst->trans = t;
-        netfs_trans_get(t);
-
-        mutex_lock(&st->trans_lock);
-        err = netfs_trans_insert(dst, st);
-        mutex_unlock(&st->trans_lock);
-
-        if (err)
-                goto err_out_free;
-
-        spin_lock(&t->dst_lock);
-        list_add_tail(&dst->trans_entry, &t->dst_list);
-        spin_unlock(&t->dst_lock);
-
-        return 0;
-
-err_out_free:
-        t->result = err;
-        netfs_trans_put(t);
-        mempool_free(dst, netfs_trans_dst_pool);
-        return err;
-}
-
-static void netfs_trans_free_dst(struct netfs_trans_dst *dst)
-{
-        netfs_trans_put(dst->trans);
-        mempool_free(dst, netfs_trans_dst_pool);
-}
-
-static void netfs_trans_remove_dst(struct netfs_trans_dst *dst)
-{
-        if (netfs_trans_remove_state(dst))
-                netfs_trans_free_dst(dst);
-}
-
-/*
- * Drop destination transaction entry when we know it.
- */
-void netfs_trans_drop_dst(struct netfs_trans_dst *dst)
-{
-        struct netfs_trans *t = dst->trans;
-
-        spin_lock(&t->dst_lock);
-        list_del_init(&dst->trans_entry);
-        spin_unlock(&t->dst_lock);
-
-        netfs_trans_remove_dst(dst);
-}
-
-/*
- * Drop destination transaction entry when we know it and when we
- * already removed dst from state tree.
- */
-void netfs_trans_drop_dst_nostate(struct netfs_trans_dst *dst)
-{
-        struct netfs_trans *t = dst->trans;
-
-        spin_lock(&t->dst_lock);
-        list_del_init(&dst->trans_entry);
-        spin_unlock(&t->dst_lock);
-
-        netfs_trans_free_dst(dst);
-}
-
-/*
- * This drops destination transaction entry from appropriate network state
- * tree and drops related reference counter. It is possible that transaction
- * will be freed here if its reference counter hits zero.
- * Destination transaction entry will be freed.
- */
-void netfs_trans_drop_trans(struct netfs_trans *t, struct netfs_state *st)
-{
-        struct netfs_trans_dst *dst, *tmp, *ret = NULL;
-
-        spin_lock(&t->dst_lock);
-        list_for_each_entry_safe(dst, tmp, &t->dst_list, trans_entry) {
-                if (dst->state == st) {
-                        ret = dst;
-                        list_del(&dst->trans_entry);
-                        break;
-                }
-        }
-        spin_unlock(&t->dst_lock);
-
-        if (ret)
-                netfs_trans_remove_dst(ret);
-}
-
-/*
- * This drops destination transaction entry from appropriate network state
- * tree and drops related reference counter. It is possible that transaction
- * will be freed here if its reference counter hits zero.
- * Destination transaction entry will be freed.
- */
-void netfs_trans_drop_last(struct netfs_trans *t, struct netfs_state *st)
-{
-        struct netfs_trans_dst *dst, *tmp, *ret;
-
-        spin_lock(&t->dst_lock);
-        ret = list_entry(t->dst_list.prev, struct netfs_trans_dst, trans_entry);
-        if (ret->state != st) {
-                ret = NULL;
-                list_for_each_entry_safe(dst, tmp, &t->dst_list, trans_entry) {
-                        if (dst->state == st) {
-                                ret = dst;
-                                list_del_init(&dst->trans_entry);
-                                break;
-                        }
-                }
-        } else {
-                list_del(&ret->trans_entry);
-        }
-        spin_unlock(&t->dst_lock);
-
-        if (ret)
-                netfs_trans_remove_dst(ret);
-}
-
-static int netfs_trans_push(struct netfs_trans *t, struct netfs_state *st)
-{
-        int err;
-
-        err = netfs_trans_push_dst(t, st);
-        if (err)
-                return err;
-
-        err = netfs_trans_send(t, st);
-        if (err)
-                goto err_out_free;
-
-        if (t->flags & NETFS_TRANS_SINGLE_DST)
-                pohmelfs_switch_active(st->psb);
-
-        return 0;
-
-err_out_free:
-        t->result = err;
-        netfs_trans_drop_last(t, st);
-
-        return err;
-}
-
-int netfs_trans_finish_send(struct netfs_trans *t, struct pohmelfs_sb *psb)
-{
-        struct pohmelfs_config *c;
-        int err = -ENODEV;
-        struct netfs_state *st;
-#if 0
-        dprintk("%s: t: %p, gen: %u, size: %u, page_num: %u, active: %p.\n",
-                __func__, t, t->gen, t->iovec.iov_len, t->page_num, psb->active_state);
-#endif
-        mutex_lock(&psb->state_lock);
-        list_for_each_entry(c, &psb->state_list, config_entry) {
-                st = &c->state;
-
-                if (t->flags & NETFS_TRANS_SINGLE_DST) {
-                        if (!(st->ctl.perm & POHMELFS_IO_PERM_READ))
-                                continue;
-                } else {
-                        if (!(st->ctl.perm & POHMELFS_IO_PERM_WRITE))
-                                continue;
-                }
-
-                if (psb->active_state && (psb->active_state->state.ctl.prio >= st->ctl.prio) &&
-                                (t->flags & NETFS_TRANS_SINGLE_DST))
-                        st = &psb->active_state->state;
-
-                err = netfs_trans_push(t, st);
-                if (!err && (t->flags & NETFS_TRANS_SINGLE_DST))
-                        break;
-        }
-
-        mutex_unlock(&psb->state_lock);
-#if 0
-        dprintk("%s: fully sent t: %p, gen: %u, size: %u, page_num: %u, err: %d.\n",
-                __func__, t, t->gen, t->iovec.iov_len, t->page_num, err);
-#endif
-        if (err)
-                t->result = err;
-        return err;
-}
-
-int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb)
-{
-        int err;
-        struct netfs_cmd *cmd = t->iovec.iov_base;
-
-        t->gen = atomic_inc_return(&psb->trans_gen);
-
-        cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
-                t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
-        cmd->cmd = NETFS_TRANS;
-        cmd->start = t->gen;
-        cmd->id = 0;
-
-        if (psb->perform_crypto) {
-                cmd->ext = psb->crypto_attached_size;
-                cmd->csize = psb->crypto_attached_size;
-        }
-
-        dprintk("%s: t: %u, size: %u, iov_len: %zu, attached_size: %u, attached_pages: %u.\n",
-                        __func__, t->gen, cmd->size, t->iovec.iov_len, t->attached_size, t->attached_pages);
-        err = pohmelfs_trans_crypt(t, psb);
-        if (err) {
-                t->result = err;
-                netfs_convert_cmd(cmd);
-                dprintk("%s: trans: %llu, crypto_attached_size: %u, attached_size: %u, attached_pages: %d, trans_size: %u, err: %d.\n",
-                        __func__, cmd->start, psb->crypto_attached_size, t->attached_size, t->attached_pages, cmd->size, err);
-        }
-        netfs_trans_put(t);
-        return err;
-}
-
-/*
- * Resend transaction to remote server(s).
- * If new servers were added into superblock, we can try to send data
- * to them too.
- *
- * It is called under superblock's state_lock, so we can safely
- * dereference psb->state_list. Also, transaction's reference counter is
- * bumped, so it can not go away under us, thus we can safely access all
- * its members. State is locked.
- *
- * This function returns 0 if transaction was successfully sent to at
- * least one destination target.
- */
-int netfs_trans_resend(struct netfs_trans *t, struct pohmelfs_sb *psb)
-{
-        struct netfs_trans_dst *dst;
-        struct netfs_state *st;
-        struct pohmelfs_config *c;
-        int err, exist, error = -ENODEV;
-
-        list_for_each_entry(c, &psb->state_list, config_entry) {
-                st = &c->state;
-
-                exist = 0;
-                spin_lock(&t->dst_lock);
-                list_for_each_entry(dst, &t->dst_list, trans_entry) {
-                        if (st == dst->state) {
-                                exist = 1;
-                                break;
-                        }
-                }
-                spin_unlock(&t->dst_lock);
-
-                if (exist) {
-                        if (!(t->flags & NETFS_TRANS_SINGLE_DST) ||
-                                        (c->config_entry.next == &psb->state_list)) {
-                                dprintk("%s: resending st: %p, t: %p, gen: %u.\n",
-                                                __func__, st, t, t->gen);
-                                err = netfs_trans_send(t, st);
-                                if (!err)
-                                        error = 0;
-                        }
-                        continue;
-                }
-
-                dprintk("%s: pushing/resending st: %p, t: %p, gen: %u.\n",
-                                __func__, st, t, t->gen);
-                err = netfs_trans_push(t, st);
-                if (err)
-                        continue;
-                error = 0;
-                if (t->flags & NETFS_TRANS_SINGLE_DST)
-                        break;
-        }
-
-        t->result = error;
-        return error;
-}
-
-void *netfs_trans_add(struct netfs_trans *t, unsigned int size)
-{
-        struct iovec *io = &t->iovec;
-        void *ptr;
-
-        if (size > t->total_size) {
-                ptr = ERR_PTR(-EINVAL);
-                goto out;
-        }
-
-        if (io->iov_len + size > t->total_size) {
-                dprintk("%s: too big size t: %p, gen: %u, iov_len: %zu, size: %u, total: %u.\n",
-                                __func__, t, t->gen, io->iov_len, size, t->total_size);
-                ptr = ERR_PTR(-E2BIG);
-                goto out;
-        }
-
-        ptr = io->iov_base + io->iov_len;
-        io->iov_len += size;
-
-out:
-        dprintk("%s: t: %p, gen: %u, size: %u, total: %zu.\n",
-                __func__, t, t->gen, size, io->iov_len);
-        return ptr;
-}
-
-void netfs_trans_free(struct netfs_trans *t)
-{
-        if (t->eng)
-                pohmelfs_crypto_thread_make_ready(t->eng->thread);
-        kfree(t);
-}
-
-struct netfs_trans *netfs_trans_alloc(struct pohmelfs_sb *psb, unsigned int size,
-                unsigned int flags, unsigned int nr)
-{
-        struct netfs_trans *t;
-        unsigned int num, cont, pad, size_no_trans;
-        unsigned int crypto_added = 0;
-        struct netfs_cmd *cmd;
-
-        if (psb->perform_crypto)
-                crypto_added = psb->crypto_attached_size;
-
-        /*
-         * |sizeof(struct netfs_trans)|
-         * |sizeof(struct netfs_cmd)| - transaction header
-         * |size| - buffer with requested size
-         * |padding| - crypto padding, zero bytes
-         * |nr * sizeof(struct page *)| - array of page pointers
-         *
-         * Overall size should be less than PAGE_SIZE for guaranteed allocation.
-         */
-
-        cont = size;
-        size = ALIGN(size, psb->crypto_align_size);
-        pad = size - cont;
-
-        size_no_trans = size + sizeof(struct netfs_cmd) * 2 + crypto_added;
-
-        cont = sizeof(struct netfs_trans) + size_no_trans;
-
-        num = (PAGE_SIZE - cont)/sizeof(struct page *);
-
-        if (nr > num)
-                nr = num;
-
-        t = kzalloc(cont + nr*sizeof(struct page *), GFP_NOIO);
-        if (!t)
-                goto err_out_exit;
-
-        t->iovec.iov_base = (void *)(t + 1);
-        t->pages = (struct page **)(t->iovec.iov_base + size_no_trans);
-
-        /*
-         * Reserving space for transaction header.
-         */
-        t->iovec.iov_len = sizeof(struct netfs_cmd) + crypto_added;
-
-        netfs_trans_init_static(t, nr, size_no_trans);
-
-        t->flags = flags;
-        t->psb = psb;
-
-        cmd = (struct netfs_cmd *)t->iovec.iov_base;
-
-        cmd->size = size;
-        cmd->cpad = pad;
-        cmd->csize = crypto_added;
-
-        dprintk("%s: t: %p, gen: %u, size: %u, padding: %u, align_size: %u, flags: %x, "
-                        "page_num: %u, base: %p, pages: %p.\n",
-                        __func__, t, t->gen, size, pad, psb->crypto_align_size, flags, nr,
-                        t->iovec.iov_base, t->pages);
-
-        return t;
-
-err_out_exit:
-        return NULL;
-}
-
-int netfs_trans_init(void)
-{
-        int err = -ENOMEM;
-
-        netfs_trans_dst = kmem_cache_create("netfs_trans_dst", sizeof(struct netfs_trans_dst),
-                        0, 0, NULL);
-        if (!netfs_trans_dst)
-                goto err_out_exit;
-
-        netfs_trans_dst_pool = mempool_create_slab_pool(256, netfs_trans_dst);
-        if (!netfs_trans_dst_pool)
-                goto err_out_free;
-
-        return 0;
-
-err_out_free:
-        kmem_cache_destroy(netfs_trans_dst);
-err_out_exit:
-        return err;
-}
-
-void netfs_trans_exit(void)
-{
-        mempool_destroy(netfs_trans_dst_pool);
-        kmem_cache_destroy(netfs_trans_dst);
-}
diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h
index 9b5d771e650c..ed85b4415207 100644
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -37,6 +37,8 @@ struct _adapter;
 #include "wlan_bssdef.h"
 #include "rtl8712_spec.h"
 #include "rtl8712_hal.h"
+#include <linux/mutex.h>
+#include <linux/completion.h>
 
 enum _NIC_VERSION {
         RTL8711_NIC,
@@ -168,6 +170,7 @@ struct _adapter {
         s32     bSurpriseRemoved;
         u32     IsrContent;
         u32     ImrContent;
+        bool    fw_found;
         u8      EepromAddressSize;
         u8      hw_init_completed;
         struct task_struct *cmdThread;
@@ -184,6 +187,10 @@ struct _adapter {
         _workitem wkFilterRxFF0;
         u8 blnEnableRxFF0Filter;
         spinlock_t lockRxFF0Filter;
+        const struct firmware *fw;
+        struct usb_interface *pusb_intf;
+        struct mutex mutex_start;
+        struct completion rtl8712_fw_ready;
 };
 
 static inline u8 *myid(struct eeprom_priv *peepriv)
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index d0029aa4cd3c..cc893c0f5ad3 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -42,29 +42,56 @@
 #define FWBUFF_ALIGN_SZ 512
 #define MAX_DUMP_FWSZ   49152 /*default = 49152 (48k)*/
 
-static u32 rtl871x_open_fw(struct _adapter *padapter, void **pphfwfile_hdl,
-                    const u8 **ppmappedfw)
+static void rtl871x_load_fw_cb(const struct firmware *firmware, void *context)
 {
+        struct _adapter *padapter = context;
+
+        complete(&padapter->rtl8712_fw_ready);
+        if (!firmware) {
+                struct usb_device *udev = padapter->dvobjpriv.pusbdev;
+                struct usb_interface *pusb_intf = padapter->pusb_intf;
+                printk(KERN_ERR "r8712u: Firmware request failed\n");
+                padapter->fw_found = false;
+                usb_put_dev(udev);
+                usb_set_intfdata(pusb_intf, NULL);
+                return;
+        }
+        padapter->fw = firmware;
+        padapter->fw_found = true;
+        /* firmware available - start netdev */
+        register_netdev(padapter->pnetdev);
+}
+
+static const char firmware_file[] = "rtlwifi/rtl8712u.bin";
+
+int rtl871x_load_fw(struct _adapter *padapter)
+{
+        struct device *dev = &padapter->dvobjpriv.pusbdev->dev;
         int rc;
-        const char firmware_file[] = "rtlwifi/rtl8712u.bin";
-        const struct firmware **praw = (const struct firmware **)
-                                       (pphfwfile_hdl);
-        struct dvobj_priv *pdvobjpriv = (struct dvobj_priv *)
-                                        (&padapter->dvobjpriv);
-        struct usb_device *pusbdev = pdvobjpriv->pusbdev;
 
+        init_completion(&padapter->rtl8712_fw_ready);
         printk(KERN_INFO "r8712u: Loading firmware from \"%s\"\n",
                firmware_file);
-        rc = request_firmware(praw, firmware_file, &pusbdev->dev);
-        if (rc < 0) {
-                printk(KERN_ERR "r8712u: Unable to load firmware\n");
-                printk(KERN_ERR "r8712u: Install latest linux-firmware\n");
+        rc = request_firmware_nowait(THIS_MODULE, 1, firmware_file, dev,
+                                     GFP_KERNEL, padapter, rtl871x_load_fw_cb);
+        if (rc)
+                printk(KERN_ERR "r8712u: Firmware request error %d\n", rc);
+        return rc;
+}
+MODULE_FIRMWARE("rtlwifi/rtl8712u.bin");
+
+static u32 rtl871x_open_fw(struct _adapter *padapter, const u8 **ppmappedfw)
+{
+        const struct firmware **praw = &padapter->fw;
+
+        if (padapter->fw->size > 200000) {
+                printk(KERN_ERR "r8172u: Badfw->size of %d\n",
+                       (int)padapter->fw->size);
                 return 0;
         }
         *ppmappedfw = (u8 *)((*praw)->data);
         return (*praw)->size;
 }
-MODULE_FIRMWARE("rtlwifi/rtl8712u.bin");
 
 static void fill_fwpriv(struct _adapter *padapter, struct fw_priv *pfwpriv)
 {
@@ -142,18 +169,17 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
         uint dump_imem_sz, imem_sz, dump_emem_sz, emem_sz; /* max = 49152; */
         struct fw_hdr fwhdr;
         u32 ulfilelength;       /* FW file size */
-        void *phfwfile_hdl = NULL;
         const u8 *pmappedfw = NULL;
         u8 *ptmpchar = NULL, *ppayload, *ptr;
         struct tx_desc *ptx_desc;
         u32 txdscp_sz = sizeof(struct tx_desc);
         u8 ret = _FAIL;
 
-        ulfilelength = rtl871x_open_fw(padapter, &phfwfile_hdl, &pmappedfw);
+        ulfilelength = rtl871x_open_fw(padapter, &pmappedfw);
         if (pmappedfw && (ulfilelength > 0)) {
                 update_fwhdr(&fwhdr, pmappedfw);
                 if (chk_fwhdr(&fwhdr, ulfilelength) == _FAIL)
-                        goto firmware_rel;
+                        return ret;
                 fill_fwpriv(padapter, &fwhdr.fwpriv);
                 /* firmware check ok */
                 maxlen = (fwhdr.img_IMEM_size > fwhdr.img_SRAM_size) ?
@@ -161,7 +187,7 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
                 maxlen += txdscp_sz;
                 ptmpchar = _malloc(maxlen + FWBUFF_ALIGN_SZ);
                 if (ptmpchar == NULL)
-                        goto firmware_rel;
+                        return ret;
 
                 ptx_desc = (struct tx_desc *)(ptmpchar + FWBUFF_ALIGN_SZ -
                             ((addr_t)(ptmpchar) & (FWBUFF_ALIGN_SZ - 1)));
@@ -297,8 +323,6 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
 
 exit_fail:
         kfree(ptmpchar);
-firmware_rel:
-        release_firmware((struct firmware *)phfwfile_hdl);
         return ret;
 }
 
diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index 9a75c6dbe505..98a3d684f9b2 100644
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -31,6 +31,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kthread.h>
+#include <linux/firmware.h>
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "xmit_osdep.h"
@@ -264,12 +265,12 @@ static void start_drv_timers(struct _adapter *padapter)
 void r8712_stop_drv_timers(struct _adapter *padapter)
 {
         _cancel_timer_ex(&padapter->mlmepriv.assoc_timer);
-        _cancel_timer_ex(&padapter->mlmepriv.sitesurveyctrl.
-                         sitesurvey_ctrl_timer);
         _cancel_timer_ex(&padapter->securitypriv.tkip_timer);
         _cancel_timer_ex(&padapter->mlmepriv.scan_to_timer);
         _cancel_timer_ex(&padapter->mlmepriv.dhcp_timer);
         _cancel_timer_ex(&padapter->mlmepriv.wdg_timer);
+        _cancel_timer_ex(&padapter->mlmepriv.sitesurveyctrl.
+                         sitesurvey_ctrl_timer);
 }
 
 static u8 init_default_value(struct _adapter *padapter)
@@ -347,7 +348,8 @@ u8 r8712_free_drv_sw(struct _adapter *padapter)
         r8712_free_mlme_priv(&padapter->mlmepriv);
         r8712_free_io_queue(padapter);
         _free_xmit_priv(&padapter->xmitpriv);
-        _r8712_free_sta_priv(&padapter->stapriv);
+        if (padapter->fw_found)
+                _r8712_free_sta_priv(&padapter->stapriv);
         _r8712_free_recv_priv(&padapter->recvpriv);
         mp871xdeinit(padapter);
         if (pnetdev)
@@ -388,6 +390,7 @@ static int netdev_open(struct net_device *pnetdev)
 {
         struct _adapter *padapter = (struct _adapter *)netdev_priv(pnetdev);
 
+        mutex_lock(&padapter->mutex_start);
         if (padapter->bup == false) {
                 padapter->bDriverStopped = false;
                 padapter->bSurpriseRemoved = false;
@@ -435,11 +438,13 @@ static int netdev_open(struct net_device *pnetdev)
         /* start driver mlme relation timer */
         start_drv_timers(padapter);
         padapter->ledpriv.LedControlHandler(padapter, LED_CTL_NO_LINK);
+        mutex_unlock(&padapter->mutex_start);
         return 0;
 netdev_open_error:
         padapter->bup = false;
         netif_carrier_off(pnetdev);
         netif_stop_queue(pnetdev);
+        mutex_unlock(&padapter->mutex_start);
         return -1;
 }
 
@@ -473,6 +478,9 @@ static int netdev_close(struct net_device *pnetdev)
         r8712_free_network_queue(padapter);
         /* The interface is no longer Up: */
         padapter->bup = false;
+        release_firmware(padapter->fw);
+        /* never exit with a firmware callback pending */
+        wait_for_completion(&padapter->rtl8712_fw_ready);
         return 0;
 }
 
diff --git a/drivers/staging/rtl8712/rtl8712_hal.h b/drivers/staging/rtl8712/rtl8712_hal.h
index 665e71838172..d19865a5a50c 100644
--- a/drivers/staging/rtl8712/rtl8712_hal.h
+++ b/drivers/staging/rtl8712/rtl8712_hal.h
@@ -145,5 +145,6 @@ struct hal_priv {
 };
 
 uint     rtl8712_hal_init(struct _adapter *padapter);
+int rtl871x_load_fw(struct _adapter *padapter);
 
 #endif
diff --git a/drivers/staging/rtl8712/rtl871x_sta_mgt.c b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
index 64f569618839..81bde803c59f 100644
--- a/drivers/staging/rtl8712/rtl871x_sta_mgt.c
+++ b/drivers/staging/rtl8712/rtl871x_sta_mgt.c
@@ -43,6 +43,7 @@ static void _init_stainfo(struct sta_info *psta)
         _r8712_init_sta_xmit_priv(&psta->sta_xmitpriv);
         _r8712_init_sta_recv_priv(&psta->sta_recvpriv);
 #ifdef CONFIG_R8712_AP
+        _init_listhead(&psta->asoc_list);
         _init_listhead(&psta->auth_list);
 #endif
 }
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index 5385da2e9cdb..9bade184883b 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -89,6 +89,7 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = {
         {USB_DEVICE(0x0DF6, 0x0045)},
         {USB_DEVICE(0x0DF6, 0x0059)}, /* 11n mode disable */
         {USB_DEVICE(0x0DF6, 0x004B)},
+        {USB_DEVICE(0x0DF6, 0x005B)},
         {USB_DEVICE(0x0DF6, 0x005D)},
         {USB_DEVICE(0x0DF6, 0x0063)},
         /* Sweex */
@@ -389,6 +390,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
         pdvobjpriv = &padapter->dvobjpriv;
         pdvobjpriv->padapter = padapter;
         padapter->dvobjpriv.pusbdev = udev;
+        padapter->pusb_intf = pusb_intf;
         usb_set_intfdata(pusb_intf, pnetdev);
         SET_NETDEV_DEV(pnetdev, &pusb_intf->dev);
         /* step 2. */
@@ -595,10 +597,11 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
                                "%pM\n", mac);
                 memcpy(pnetdev->dev_addr, mac, ETH_ALEN);
         }
-        /* step 6. Tell the network stack we exist */
-        if (register_netdev(pnetdev) != 0)
+        /* step 6. Load the firmware asynchronously */
+        if (rtl871x_load_fw(padapter))
                 goto error;
         spin_lock_init(&padapter->lockRxFF0Filter);
+        mutex_init(&padapter->mutex_start);
         return 0;
 error:
         usb_put_dev(udev);
@@ -629,7 +632,8 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)
                 flush_scheduled_work();
                 udelay(1);
                 /*Stop driver mlme relation timer */
-                r8712_stop_drv_timers(padapter);
+                if (padapter->fw_found)
+                        r8712_stop_drv_timers(padapter);
                 r871x_dev_unload(padapter);
                 r8712_free_drv_sw(padapter);
         }
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index e1c4492a7105..dde559d06c43 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -1046,8 +1046,6 @@ static int bridge_dev_destroy(struct bridge_dev_context *dev_ctxt)
 
         /* Free the driver's device context: */
         kfree(drv_datap->base_img);
-        kfree(drv_datap);
-        dev_set_drvdata(bridge, NULL);
         kfree((void *)dev_ctxt);
         return status;
 }
diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c
index 76cfc6edecd9..385740bad0de 100644
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -410,6 +410,9 @@ static int __devexit omap34_xx_bridge_remove(struct platform_device *pdev)
                 DBC_ASSERT(ret == true);
         }
 
+        kfree(drv_datap);
+        dev_set_drvdata(bridge, NULL);
+
 func_cont:
         mem_ext_phys_pool_release();
 
@@ -500,35 +503,42 @@ static int bridge_open(struct inode *ip, struct file *filp)
         }
 #endif
         pr_ctxt = kzalloc(sizeof(struct process_context), GFP_KERNEL);
-        if (pr_ctxt) {
-                pr_ctxt->res_state = PROC_RES_ALLOCATED;
-                spin_lock_init(&pr_ctxt->dmm_map_lock);
-                INIT_LIST_HEAD(&pr_ctxt->dmm_map_list);
-                spin_lock_init(&pr_ctxt->dmm_rsv_lock);
-                INIT_LIST_HEAD(&pr_ctxt->dmm_rsv_list);
-
-                pr_ctxt->node_id = kzalloc(sizeof(struct idr), GFP_KERNEL);
-                if (pr_ctxt->node_id) {
-                        idr_init(pr_ctxt->node_id);
-                } else {
-                        status = -ENOMEM;
-                        goto err;
-                }
+        if (!pr_ctxt)
+                return -ENOMEM;
+
+        pr_ctxt->res_state = PROC_RES_ALLOCATED;
+        spin_lock_init(&pr_ctxt->dmm_map_lock);
+        INIT_LIST_HEAD(&pr_ctxt->dmm_map_list);
+        spin_lock_init(&pr_ctxt->dmm_rsv_lock);
+        INIT_LIST_HEAD(&pr_ctxt->dmm_rsv_list);
 
-                pr_ctxt->stream_id = kzalloc(sizeof(struct idr), GFP_KERNEL);
-                if (pr_ctxt->stream_id)
-                        idr_init(pr_ctxt->stream_id);
-                else
-                        status = -ENOMEM;
-        } else {
+        pr_ctxt->node_id = kzalloc(sizeof(struct idr), GFP_KERNEL);
+        if (!pr_ctxt->node_id) {
                 status = -ENOMEM;
+                goto err1;
         }
-err:
+
+        idr_init(pr_ctxt->node_id);
+
+        pr_ctxt->stream_id = kzalloc(sizeof(struct idr), GFP_KERNEL);
+        if (!pr_ctxt->stream_id) {
+                status = -ENOMEM;
+                goto err2;
+        }
+
+        idr_init(pr_ctxt->stream_id);
+
         filp->private_data = pr_ctxt;
+
 #ifdef CONFIG_TIDSPBRIDGE_RECOVERY
-        if (!status)
-                atomic_inc(&bridge_cref);
+        atomic_inc(&bridge_cref);
 #endif
+        return 0;
+
+err2:
+        kfree(pr_ctxt->node_id);
+err1:
+        kfree(pr_ctxt);
         return status;
 }
 
@@ -550,6 +560,8 @@ static int bridge_release(struct inode *ip, struct file *filp)
         flush_signals(current);
         drv_remove_all_resources(pr_ctxt);
         proc_detach(pr_ctxt);
+        kfree(pr_ctxt->node_id);
+        kfree(pr_ctxt->stream_id);
         kfree(pr_ctxt);
 
         filp->private_data = NULL;
diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c
index 2d6317850064..705a9e530a19 100644
--- a/drivers/staging/usbip/stub_main.c
+++ b/drivers/staging/usbip/stub_main.c
@@ -246,8 +246,9 @@ static int __init usbip_host_init(void)
 {
         int ret;
 
-        stub_priv_cache = KMEM_CACHE(stub_priv, SLAB_HWCACHE_ALIGN);
+        init_busid_table();
 
+        stub_priv_cache = KMEM_CACHE(stub_priv, SLAB_HWCACHE_ALIGN);
         if (!stub_priv_cache) {
                 pr_err("kmem_cache_create failed\n");
                 return -ENOMEM;
@@ -266,7 +267,6 @@ static int __init usbip_host_init(void)
                 goto err_create_file;
         }
 
-        init_busid_table();
         pr_info(DRIVER_DESC " v" USBIP_VERSION "\n");
         return ret;
 
diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index 642840c612ac..ef7c52bb1df9 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -358,8 +358,8 @@ static struct zbud_hdr *zbud_create(uint16_t client_id, uint16_t pool_id,
         if (unlikely(zbpg == NULL))
                 goto out;
         /* ok, have a page, now compress the data before taking locks */
-        spin_lock(&zbpg->lock);
         spin_lock(&zbud_budlists_spinlock);
+        spin_lock(&zbpg->lock);
         list_add_tail(&zbpg->bud_list, &zbud_unbuddied[nchunks].list);
         zbud_unbuddied[nchunks].count++;
         zh = &zbpg->buddy[0];
@@ -389,12 +389,11 @@ init_zh:
         zh->oid = *oid;
         zh->pool_id = pool_id;
         zh->client_id = client_id;
-        /* can wait to copy the data until the list locks are dropped */
-        spin_unlock(&zbud_budlists_spinlock);
-
         to = zbud_data(zh, size);
         memcpy(to, cdata, size);
         spin_unlock(&zbpg->lock);
+        spin_unlock(&zbud_budlists_spinlock);
+
         zbud_cumul_chunk_counts[nchunks]++;
         atomic_inc(&zcache_zbud_curr_zpages);
         zcache_zbud_cumul_zpages++;
@@ -655,8 +654,8 @@ static unsigned int zv_max_zsize = (PAGE_SIZE / 8) * 7;
  */
 static unsigned int zv_max_mean_zsize = (PAGE_SIZE / 8) * 5;
 
-static unsigned long zv_curr_dist_counts[NCHUNKS];
-static unsigned long zv_cumul_dist_counts[NCHUNKS];
+static atomic_t zv_curr_dist_counts[NCHUNKS];
+static atomic_t zv_cumul_dist_counts[NCHUNKS];
 
 static struct zv_hdr *zv_create(struct xv_pool *xvpool, uint32_t pool_id,
                                 struct tmem_oid *oid, uint32_t index,
@@ -675,8 +674,8 @@ static struct zv_hdr *zv_create(struct xv_pool *xvpool, uint32_t pool_id,
                         &page, &offset, ZCACHE_GFP_MASK);
         if (unlikely(ret))
                 goto out;
-        zv_curr_dist_counts[chunks]++;
-        zv_cumul_dist_counts[chunks]++;
+        atomic_inc(&zv_curr_dist_counts[chunks]);
+        atomic_inc(&zv_cumul_dist_counts[chunks]);
         zv = kmap_atomic(page, KM_USER0) + offset;
         zv->index = index;
         zv->oid = *oid;
@@ -698,7 +697,7 @@ static void zv_free(struct xv_pool *xvpool, struct zv_hdr *zv)
 
         ASSERT_SENTINEL(zv, ZVH);
         BUG_ON(chunks >= NCHUNKS);
-        zv_curr_dist_counts[chunks]--;
+        atomic_dec(&zv_curr_dist_counts[chunks]);
         size -= sizeof(*zv);
         BUG_ON(size == 0);
         INVERT_SENTINEL(zv, ZVH);
@@ -738,7 +737,7 @@ static int zv_curr_dist_counts_show(char *buf)
         char *p = buf;
 
         for (i = 0; i < NCHUNKS; i++) {
-                n = zv_curr_dist_counts[i];
+                n = atomic_read(&zv_curr_dist_counts[i]);
                 p += sprintf(p, "%lu ", n);
                 chunks += n;
                 sum_total_chunks += i * n;
@@ -754,7 +753,7 @@ static int zv_cumul_dist_counts_show(char *buf)
         char *p = buf;
 
         for (i = 0; i < NCHUNKS; i++) {
-                n = zv_cumul_dist_counts[i];
+                n = atomic_read(&zv_cumul_dist_counts[i]);
                 p += sprintf(p, "%lu ", n);
                 chunks += n;
                 sum_total_chunks += i * n;
@@ -1782,9 +1781,9 @@ static int zcache_frontswap_poolid = -1;
  * Swizzling increases objects per swaptype, increasing tmem concurrency
  * for heavy swaploads.  Later, larger nr_cpus -> larger SWIZ_BITS
  * Setting SWIZ_BITS to 27 basically reconstructs the swap entry from
- * frontswap_get_page()
+ * frontswap_get_page(), but has side-effects. Hence using 8.
  */
-#define SWIZ_BITS               27
+#define SWIZ_BITS               8
 #define SWIZ_MASK               ((1 << SWIZ_BITS) - 1)
 #define _oswiz(_type, _ind)     ((_type << SWIZ_BITS) | (_ind & SWIZ_MASK))
 #define iswiz(_ind)             (_ind >> SWIZ_BITS)
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index ac44af165b27..44262908def5 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -1061,7 +1061,7 @@ attach_cmd:
         if (ret < 0)
                 return iscsit_add_reject_from_cmd(
                                 ISCSI_REASON_BOOKMARK_NO_RESOURCES,
-                                1, 1, buf, cmd);
+                                1, 0, buf, cmd);
         /*
          * Check the CmdSN against ExpCmdSN/MaxCmdSN here if
          * the Immediate Bit is not set, and no Immediate
@@ -3164,6 +3164,30 @@ static int iscsit_send_task_mgt_rsp(
         return 0;
 }
 
+static bool iscsit_check_inaddr_any(struct iscsi_np *np)
+{
+        bool ret = false;
+
+        if (np->np_sockaddr.ss_family == AF_INET6) {
+                const struct sockaddr_in6 sin6 = {
+                        .sin6_addr = IN6ADDR_ANY_INIT };
+                struct sockaddr_in6 *sock_in6 =
+                         (struct sockaddr_in6 *)&np->np_sockaddr;
+
+                if (!memcmp(sock_in6->sin6_addr.s6_addr,
+                                sin6.sin6_addr.s6_addr, 16))
+                        ret = true;
+        } else {
+                struct sockaddr_in * sock_in =
+                        (struct sockaddr_in *)&np->np_sockaddr;
+
+                if (sock_in->sin_addr.s_addr == INADDR_ANY)
+                        ret = true;
+        }
+
+        return ret;
+}
+
 static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd)
 {
         char *payload = NULL;
@@ -3213,12 +3237,17 @@ static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd)
                         spin_lock(&tpg->tpg_np_lock);
                         list_for_each_entry(tpg_np, &tpg->tpg_gnp_list,
                                                 tpg_np_list) {
+                                struct iscsi_np *np = tpg_np->tpg_np;
+                                bool inaddr_any = iscsit_check_inaddr_any(np);
+
                                 len = sprintf(buf, "TargetAddress="
                                         "%s%s%s:%hu,%hu",
-                                        (tpg_np->tpg_np->np_sockaddr.ss_family == AF_INET6) ?
-                                        "[" : "", tpg_np->tpg_np->np_ip,
-                                        (tpg_np->tpg_np->np_sockaddr.ss_family == AF_INET6) ?
-                                        "]" : "", tpg_np->tpg_np->np_port,
+                                        (np->np_sockaddr.ss_family == AF_INET6) ?
+                                        "[" : "", (inaddr_any == false) ?
+                                                np->np_ip : conn->local_ip,
+                                        (np->np_sockaddr.ss_family == AF_INET6) ?
+                                        "]" : "", (inaddr_any == false) ?
+                                                np->np_port : conn->local_port,
                                         tpg->tpgt);
                                 len += 1;
 
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 3468caab47a2..6b35b37988ed 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -21,6 +21,7 @@
 
 #include <linux/configfs.h>
 #include <linux/export.h>
+#include <linux/inet.h>
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
 #include <target/target_core_fabric_configfs.h>
diff --git a/drivers/target/iscsi/iscsi_target_core.h b/drivers/target/iscsi/iscsi_target_core.h
index f1a02dad05a0..0ec3b77a0c27 100644
--- a/drivers/target/iscsi/iscsi_target_core.h
+++ b/drivers/target/iscsi/iscsi_target_core.h
@@ -508,6 +508,7 @@ struct iscsi_conn {
         u16                     cid;
         /* Remote TCP Port */
         u16                     login_port;
+        u16                     local_port;
         int                     net_size;
         u32                     auth_id;
 #define CONNFLAG_SCTP_STRUCT_FILE                       0x01
@@ -527,6 +528,7 @@ struct iscsi_conn {
         unsigned char           bad_hdr[ISCSI_HDR_LEN];
 #define IPV6_ADDRESS_SPACE                              48
         unsigned char           login_ip[IPV6_ADDRESS_SPACE];
+        unsigned char           local_ip[IPV6_ADDRESS_SPACE];
         int                     conn_usage_count;
         int                     conn_waiting_on_uc;
         atomic_t                check_immediate_queue;
@@ -561,8 +563,8 @@ struct iscsi_conn {
         struct hash_desc        conn_tx_hash;
         /* Used for scheduling TX and RX connection kthreads */
         cpumask_var_t           conn_cpumask;
-        int                     conn_rx_reset_cpumask:1;
-        int                     conn_tx_reset_cpumask:1;
+        unsigned int            conn_rx_reset_cpumask:1;
+        unsigned int            conn_tx_reset_cpumask:1;
         /* list_head of struct iscsi_cmd for this connection */
         struct list_head        conn_cmd_list;
         struct list_head        immed_queue_list;
diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index 255c0d67e898..27901e37c125 100644
--- a/drivers/target/iscsi/iscsi_target_erl1.c
+++ b/drivers/target/iscsi/iscsi_target_erl1.c
@@ -1238,7 +1238,7 @@ void iscsit_mod_dataout_timer(struct iscsi_cmd *cmd)
 {
         struct iscsi_conn *conn = cmd->conn;
         struct iscsi_session *sess = conn->sess;
-        struct iscsi_node_attrib *na = na = iscsit_tpg_get_node_attrib(sess);
+        struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);
 
         spin_lock_bh(&cmd->dataout_timeout_lock);
         if (!(cmd->dataout_timer_flags & ISCSI_TF_RUNNING)) {
@@ -1261,7 +1261,7 @@ void iscsit_start_dataout_timer(
         struct iscsi_conn *conn)
 {
         struct iscsi_session *sess = conn->sess;
-        struct iscsi_node_attrib *na = na = iscsit_tpg_get_node_attrib(sess);
+        struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);
 
         if (cmd->dataout_timer_flags & ISCSI_TF_RUNNING)
                 return;
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index 373b0cc6abd8..38cb7ce8469e 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -615,8 +615,8 @@ static int iscsi_post_login_handler(
                 }
 
                 pr_debug("iSCSI Login successful on CID: %hu from %s to"
-                        " %s:%hu,%hu\n", conn->cid, conn->login_ip, np->np_ip,
-                                np->np_port, tpg->tpgt);
+                        " %s:%hu,%hu\n", conn->cid, conn->login_ip,
+                        conn->local_ip, conn->local_port, tpg->tpgt);
 
                 list_add_tail(&conn->conn_list, &sess->sess_conn_list);
                 atomic_inc(&sess->nconn);
@@ -658,7 +658,8 @@ static int iscsi_post_login_handler(
         sess->session_state = TARG_SESS_STATE_LOGGED_IN;
 
         pr_debug("iSCSI Login successful on CID: %hu from %s to %s:%hu,%hu\n",
-                conn->cid, conn->login_ip, np->np_ip, np->np_port, tpg->tpgt);
+                conn->cid, conn->login_ip, conn->local_ip, conn->local_port,
+                tpg->tpgt);
 
         spin_lock_bh(&sess->conn_lock);
         list_add_tail(&conn->conn_list, &sess->sess_conn_list);
@@ -841,6 +842,14 @@ int iscsi_target_setup_login_socket(
                 goto fail;
         }
 
+        ret = kernel_setsockopt(sock, IPPROTO_IP, IP_FREEBIND,
+                        (char *)&opt, sizeof(opt));
+        if (ret < 0) {
+                pr_err("kernel_setsockopt() for IP_FREEBIND"
+                        " failed\n");
+                goto fail;
+        }
+
         ret = kernel_bind(sock, (struct sockaddr *)&np->np_sockaddr, len);
         if (ret < 0) {
                 pr_err("kernel_bind() failed: %d\n", ret);
@@ -1020,6 +1029,18 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
                 snprintf(conn->login_ip, sizeof(conn->login_ip), "%pI6c",
                                 &sock_in6.sin6_addr.in6_u);
                 conn->login_port = ntohs(sock_in6.sin6_port);
+
+                if (conn->sock->ops->getname(conn->sock,
+                                (struct sockaddr *)&sock_in6, &err, 0) < 0) {
+                        pr_err("sock_ops->getname() failed.\n");
+                        iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
+                                        ISCSI_LOGIN_STATUS_TARGET_ERROR);
+                        goto new_sess_out;
+                }
+                snprintf(conn->local_ip, sizeof(conn->local_ip), "%pI6c",
+                                &sock_in6.sin6_addr.in6_u);
+                conn->local_port = ntohs(sock_in6.sin6_port);
+
         } else {
                 memset(&sock_in, 0, sizeof(struct sockaddr_in));
 
@@ -1032,6 +1053,16 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
                 }
                 sprintf(conn->login_ip, "%pI4", &sock_in.sin_addr.s_addr);
                 conn->login_port = ntohs(sock_in.sin_port);
+
+                if (conn->sock->ops->getname(conn->sock,
+                                (struct sockaddr *)&sock_in, &err, 0) < 0) {
+                        pr_err("sock_ops->getname() failed.\n");
+                        iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
+                                        ISCSI_LOGIN_STATUS_TARGET_ERROR);
+                        goto new_sess_out;
+                }
+                sprintf(conn->local_ip, "%pI4", &sock_in.sin_addr.s_addr);
+                conn->local_port = ntohs(sock_in.sin_port);
         }
 
         conn->network_transport = np->np_network_transport;
@@ -1039,7 +1070,7 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
         pr_debug("Received iSCSI login request from %s on %s Network"
                         " Portal %s:%hu\n", conn->login_ip,
                 (conn->network_transport == ISCSI_TCP) ? "TCP" : "SCTP",
-                        np->np_ip, np->np_port);
+                        conn->local_ip, conn->local_port);
 
         pr_debug("Moving to TARG_CONN_STATE_IN_LOGIN.\n");
         conn->conn_state        = TARG_CONN_STATE_IN_LOGIN;
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index a05ca1c4f01c..11287e1ece13 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -849,6 +849,17 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd)
         case ISCSI_OP_SCSI_TMFUNC:
                 transport_generic_free_cmd(&cmd->se_cmd, 1);
                 break;
+        case ISCSI_OP_REJECT:
+                /*
+                 * Handle special case for REJECT when iscsi_add_reject*() has
+                 * overwritten the original iscsi_opcode assignment, and the
+                 * associated cmd->se_cmd needs to be released.
+                 */
+                if (cmd->se_cmd.se_tfo != NULL) {
+                        transport_generic_free_cmd(&cmd->se_cmd, 1);
+                        break;
+                }
+                /* Fall-through */
         default:
                 iscsit_release_cmd(cmd);
                 break;
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index 1b1edd14f4bf..01a2691dfb47 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -78,7 +78,7 @@ int target_emulate_report_target_port_groups(struct se_task *task)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);
         list_for_each_entry(tg_pt_gp, &su_dev->t10_alua.tg_pt_gps_list,
@@ -163,7 +163,7 @@ int target_emulate_report_target_port_groups(struct se_task *task)
         buf[2] = ((rd_len >> 8) & 0xff);
         buf[3] = (rd_len & 0xff);
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
@@ -194,7 +194,7 @@ int target_emulate_set_target_port_groups(struct se_task *task)
                 cmd->scsi_sense_reason = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
                 return -EINVAL;
         }
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         /*
          * Determine if explict ALUA via SET_TARGET_PORT_GROUPS is allowed
@@ -351,7 +351,7 @@ int target_emulate_set_target_port_groups(struct se_task *task)
         }
 
 out:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
         return 0;
diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c
index 2f2235edefff..f3d71fa88a28 100644
--- a/drivers/target/target_core_cdb.c
+++ b/drivers/target/target_core_cdb.c
@@ -83,7 +83,7 @@ target_emulate_inquiry_std(struct se_cmd *cmd)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         if (dev == tpg->tpg_virt_lun0.lun_se_dev) {
                 buf[0] = 0x3f; /* Not connected */
@@ -134,7 +134,7 @@ target_emulate_inquiry_std(struct se_cmd *cmd)
         buf[4] = 31; /* Set additional length to 31 */
 
 out:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         return 0;
 }
 
@@ -698,6 +698,13 @@ int target_emulate_inquiry(struct se_task *task)
         int p, ret;
 
         if (!(cdb[1] & 0x1)) {
+                if (cdb[2]) {
+                        pr_err("INQUIRY with EVPD==0 but PAGE CODE=%02x\n",
+                               cdb[2]);
+                        cmd->scsi_sense_reason = TCM_INVALID_CDB_FIELD;
+                        return -EINVAL;
+                }
+
                 ret = target_emulate_inquiry_std(cmd);
                 goto out;
         }
@@ -716,7 +723,7 @@ int target_emulate_inquiry(struct se_task *task)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         buf[0] = dev->transport->get_device_type(dev);
 
@@ -729,11 +736,11 @@ int target_emulate_inquiry(struct se_task *task)
         }
 
         pr_err("Unknown VPD Code: 0x%02x\n", cdb[2]);
-        cmd->scsi_sense_reason = TCM_UNSUPPORTED_SCSI_OPCODE;
+        cmd->scsi_sense_reason = TCM_INVALID_CDB_FIELD;
         ret = -EINVAL;
 
 out_unmap:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 out:
         if (!ret) {
                 task->task_scsi_status = GOOD;
@@ -755,7 +762,7 @@ int target_emulate_readcapacity(struct se_task *task)
         else
                 blocks = (u32)blocks_long;
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         buf[0] = (blocks >> 24) & 0xff;
         buf[1] = (blocks >> 16) & 0xff;
@@ -771,7 +778,7 @@ int target_emulate_readcapacity(struct se_task *task)
         if (dev->se_sub_dev->se_dev_attrib.emulate_tpu || dev->se_sub_dev->se_dev_attrib.emulate_tpws)
                 put_unaligned_be32(0xFFFFFFFF, &buf[0]);
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
@@ -785,7 +792,7 @@ int target_emulate_readcapacity_16(struct se_task *task)
         unsigned char *buf;
         unsigned long long blocks = dev->transport->get_blocks(dev);
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         buf[0] = (blocks >> 56) & 0xff;
         buf[1] = (blocks >> 48) & 0xff;
@@ -806,7 +813,7 @@ int target_emulate_readcapacity_16(struct se_task *task)
         if (dev->se_sub_dev->se_dev_attrib.emulate_tpu || dev->se_sub_dev->se_dev_attrib.emulate_tpws)
                 buf[14] = 0x80;
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
@@ -1019,9 +1026,9 @@ int target_emulate_modesense(struct se_task *task)
                         offset = cmd->data_length;
         }
 
-        rbuf = transport_kmap_first_data_page(cmd);
+        rbuf = transport_kmap_data_sg(cmd);
         memcpy(rbuf, buf, offset);
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
@@ -1043,7 +1050,7 @@ int target_emulate_request_sense(struct se_task *task)
                 return -ENOSYS;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         if (!core_scsi3_ua_clear_for_request_sense(cmd, &ua_asc, &ua_ascq)) {
                 /*
@@ -1051,11 +1058,8 @@ int target_emulate_request_sense(struct se_task *task)
                  */
                 buf[0] = 0x70;
                 buf[SPC_SENSE_KEY_OFFSET] = UNIT_ATTENTION;
-                /*
-                 * Make sure request data length is enough for additional
-                 * sense data.
-                 */
-                if (cmd->data_length <= 18) {
+
+                if (cmd->data_length < 18) {
                         buf[7] = 0x00;
                         err = -EINVAL;
                         goto end;
@@ -1072,11 +1076,8 @@ int target_emulate_request_sense(struct se_task *task)
                  */
                 buf[0] = 0x70;
                 buf[SPC_SENSE_KEY_OFFSET] = NO_SENSE;
-                /*
-                 * Make sure request data length is enough for additional
-                 * sense data.
-                 */
-                if (cmd->data_length <= 18) {
+
+                if (cmd->data_length < 18) {
                         buf[7] = 0x00;
                         err = -EINVAL;
                         goto end;
@@ -1089,7 +1090,7 @@ int target_emulate_request_sense(struct se_task *task)
         }
 
 end:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         task->task_scsi_status = GOOD;
         transport_complete_task(task, 1);
         return 0;
@@ -1123,7 +1124,7 @@ int target_emulate_unmap(struct se_task *task)
         dl = get_unaligned_be16(&cdb[0]);
         bd_dl = get_unaligned_be16(&cdb[2]);
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         ptr = &buf[offset];
         pr_debug("UNMAP: Sub: %s Using dl: %hu bd_dl: %hu size: %hu"
@@ -1147,7 +1148,7 @@ int target_emulate_unmap(struct se_task *task)
         }
 
 err:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         if (!ret) {
                 task->task_scsi_status = GOOD;
                 transport_complete_task(task, 1);
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 0955bb8979fb..6e043eeb1db9 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -1704,13 +1704,15 @@ static ssize_t target_core_store_dev_alias(
                 return -EINVAL;
         }
 
-        se_dev->su_dev_flags |= SDF_USING_ALIAS;
         read_bytes = snprintf(&se_dev->se_dev_alias[0], SE_DEV_ALIAS_LEN,
                         "%s", page);
-
+        if (!read_bytes)
+                return -EINVAL;
         if (se_dev->se_dev_alias[read_bytes - 1] == '\n')
                 se_dev->se_dev_alias[read_bytes - 1] = '\0';
 
+        se_dev->su_dev_flags |= SDF_USING_ALIAS;
+
         pr_debug("Target_Core_ConfigFS: %s/%s set alias: %s\n",
                 config_item_name(&hba->hba_group.cg_item),
                 config_item_name(&se_dev->se_dev_group.cg_item),
@@ -1753,13 +1755,15 @@ static ssize_t target_core_store_dev_udev_path(
                 return -EINVAL;
         }
 
-        se_dev->su_dev_flags |= SDF_USING_UDEV_PATH;
         read_bytes = snprintf(&se_dev->se_dev_udev_path[0], SE_UDEV_PATH_LEN,
                         "%s", page);
-
+        if (!read_bytes)
+                return -EINVAL;
         if (se_dev->se_dev_udev_path[read_bytes - 1] == '\n')
                 se_dev->se_dev_udev_path[read_bytes - 1] = '\0';
 
+        se_dev->su_dev_flags |= SDF_USING_UDEV_PATH;
+
         pr_debug("Target_Core_ConfigFS: %s/%s set udev_path: %s\n",
                 config_item_name(&hba->hba_group.cg_item),
                 config_item_name(&se_dev->se_dev_group.cg_item),
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 0c5992f0d946..edbcabbf85f7 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -320,11 +320,12 @@ int core_free_device_list_for_node(
 void core_dec_lacl_count(struct se_node_acl *se_nacl, struct se_cmd *se_cmd)
 {
         struct se_dev_entry *deve;
+        unsigned long flags;
 
-        spin_lock_irq(&se_nacl->device_list_lock);
+        spin_lock_irqsave(&se_nacl->device_list_lock, flags);
         deve = &se_nacl->device_list[se_cmd->orig_fe_lun];
         deve->deve_cmds--;
-        spin_unlock_irq(&se_nacl->device_list_lock);
+        spin_unlock_irqrestore(&se_nacl->device_list_lock, flags);
 }
 
 void core_update_device_list_access(
@@ -656,7 +657,7 @@ int target_report_luns(struct se_task *se_task)
         unsigned char *buf;
         u32 cdb_offset = 0, lun_count = 0, offset = 8, i;
 
-        buf = transport_kmap_first_data_page(se_cmd);
+        buf = (unsigned char *) transport_kmap_data_sg(se_cmd);
 
         /*
          * If no struct se_session pointer is present, this struct se_cmd is
@@ -694,7 +695,7 @@ int target_report_luns(struct se_task *se_task)
          * See SPC3 r07, page 159.
          */
 done:
-        transport_kunmap_first_data_page(se_cmd);
+        transport_kunmap_data_sg(se_cmd);
         lun_count *= 8;
         buf[0] = ((lun_count >> 24) & 0xff);
         buf[1] = ((lun_count >> 16) & 0xff);
@@ -1294,24 +1295,26 @@ struct se_lun *core_dev_add_lun(
 {
         struct se_lun *lun_p;
         u32 lun_access = 0;
+        int rc;
 
         if (atomic_read(&dev->dev_access_obj.obj_access_count) != 0) {
                 pr_err("Unable to export struct se_device while dev_access_obj: %d\n",
                         atomic_read(&dev->dev_access_obj.obj_access_count));
-                return NULL;
+                return ERR_PTR(-EACCES);
         }
 
         lun_p = core_tpg_pre_addlun(tpg, lun);
-        if ((IS_ERR(lun_p)) || !lun_p)
-                return NULL;
+        if (IS_ERR(lun_p))
+                return lun_p;
 
         if (dev->dev_flags & DF_READ_ONLY)
                 lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
         else
                 lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
 
-        if (core_tpg_post_addlun(tpg, lun_p, lun_access, dev) < 0)
-                return NULL;
+        rc = core_tpg_post_addlun(tpg, lun_p, lun_access, dev);
+        if (rc < 0)
+                return ERR_PTR(rc);
 
         pr_debug("%s_TPG[%u]_LUN[%u] - Activated %s Logical Unit from"
                 " CORE HBA: %u\n", tpg->se_tpg_tfo->get_fabric_name(),
@@ -1348,11 +1351,10 @@ int core_dev_del_lun(
         u32 unpacked_lun)
 {
         struct se_lun *lun;
-        int ret = 0;
 
-        lun = core_tpg_pre_dellun(tpg, unpacked_lun, &ret);
-        if (!lun)
-                return ret;
+        lun = core_tpg_pre_dellun(tpg, unpacked_lun);
+        if (IS_ERR(lun))
+                return PTR_ERR(lun);
 
         core_tpg_post_dellun(tpg, lun);
 
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 4f77cce22646..9a2ce11e1a6e 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -766,9 +766,9 @@ static int target_fabric_port_link(
 
         lun_p = core_dev_add_lun(se_tpg, dev->se_hba, dev,
                                 lun->unpacked_lun);
-        if (IS_ERR(lun_p) || !lun_p) {
+        if (IS_ERR(lun_p)) {
                 pr_err("core_dev_add_lun() failed\n");
-                ret = -EINVAL;
+                ret = PTR_ERR(lun_p);
                 goto out;
         }
 
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index cc8e6b58ef20..8572eae62da7 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -129,7 +129,7 @@ static struct se_device *iblock_create_virtdevice(
         /*
          * These settings need to be made tunable..
          */
-        ib_dev->ibd_bio_set = bioset_create(32, 64);
+        ib_dev->ibd_bio_set = bioset_create(32, 0);
         if (!ib_dev->ibd_bio_set) {
                 pr_err("IBLOCK: Unable to create bioset()\n");
                 return ERR_PTR(-ENOMEM);
@@ -181,7 +181,7 @@ static struct se_device *iblock_create_virtdevice(
                  */
                 dev->se_sub_dev->se_dev_attrib.max_unmap_block_desc_count = 1;
                 dev->se_sub_dev->se_dev_attrib.unmap_granularity =
-                                q->limits.discard_granularity;
+                                q->limits.discard_granularity >> 9;
                 dev->se_sub_dev->se_dev_attrib.unmap_granularity_alignment =
                                 q->limits.discard_alignment;
 
@@ -488,6 +488,13 @@ iblock_get_bio(struct se_task *task, sector_t lba, u32 sg_num)
         struct iblock_req *ib_req = IBLOCK_REQ(task);
         struct bio *bio;
 
+        /*
+         * Only allocate as many vector entries as the bio code allows us to,
+         * we'll loop later on until we have handled the whole request.
+         */
+        if (sg_num > BIO_MAX_PAGES)
+                sg_num = BIO_MAX_PAGES;
+
         bio = bio_alloc_bioset(GFP_NOIO, sg_num, ib_dev->ibd_bio_set);
         if (!bio) {
                 pr_err("Unable to allocate memory for bio\n");
diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index 26f135e94f6e..45001364788a 100644
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -90,7 +90,7 @@ void	core_tpg_wait_for_nacl_pr_ref(struct se_node_acl *);
 struct se_lun *core_tpg_pre_addlun(struct se_portal_group *, u32);
 int     core_tpg_post_addlun(struct se_portal_group *, struct se_lun *,
                 u32, void *);
-struct se_lun *core_tpg_pre_dellun(struct se_portal_group *, u32, int *);
+struct se_lun *core_tpg_pre_dellun(struct se_portal_group *, u32 unpacked_lun);
 int     core_tpg_post_dellun(struct se_portal_group *, struct se_lun *);
 
 /* target_core_transport.c */
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 429ad7291664..b7c779389eea 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -478,6 +478,7 @@ static int core_scsi3_pr_seq_non_holder(
         case READ_MEDIA_SERIAL_NUMBER:
         case REPORT_LUNS:
         case REQUEST_SENSE:
+        case PERSISTENT_RESERVE_IN:
                 ret = 0; /*/ Allowed CDBs */
                 break;
         default:
@@ -1534,7 +1535,7 @@ static int core_scsi3_decode_spec_i_port(
         tidh_new->dest_local_nexus = 1;
         list_add_tail(&tidh_new->dest_list, &tid_dest_list);
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         /*
          * For a PERSISTENT RESERVE OUT specify initiator ports payload,
          * first extract TransportID Parameter Data Length, and make sure
@@ -1785,7 +1786,7 @@ static int core_scsi3_decode_spec_i_port(
 
         }
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         /*
          * Go ahead and create a registrations from tid_dest_list for the
@@ -1833,7 +1834,7 @@ static int core_scsi3_decode_spec_i_port(
 
         return 0;
 out:
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         /*
          * For the failure case, release everything from tid_dest_list
          * including *dest_pr_reg and the configfs dependances..
@@ -3120,7 +3121,7 @@ static int core_scsi3_pro_preempt(
                         if (!calling_it_nexus)
                                 core_scsi3_ua_allocate(pr_reg_nacl,
                                         pr_res_mapped_lun, 0x2A,
-                                        ASCQ_2AH_RESERVATIONS_PREEMPTED);
+                                        ASCQ_2AH_REGISTRATIONS_PREEMPTED);
                 }
                 spin_unlock(&pr_tmpl->registration_lock);
                 /*
@@ -3233,7 +3234,7 @@ static int core_scsi3_pro_preempt(
                  *    additional sense code set to REGISTRATIONS PREEMPTED;
                  */
                 core_scsi3_ua_allocate(pr_reg_nacl, pr_res_mapped_lun, 0x2A,
-                                ASCQ_2AH_RESERVATIONS_PREEMPTED);
+                                ASCQ_2AH_REGISTRATIONS_PREEMPTED);
         }
         spin_unlock(&pr_tmpl->registration_lock);
         /*
@@ -3410,14 +3411,14 @@ static int core_scsi3_emulate_pro_register_and_move(
          * will be moved to for the TransportID containing SCSI initiator WWN
          * information.
          */
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         rtpi = (buf[18] & 0xff) << 8;
         rtpi |= buf[19] & 0xff;
         tid_len = (buf[20] & 0xff) << 24;
         tid_len |= (buf[21] & 0xff) << 16;
         tid_len |= (buf[22] & 0xff) << 8;
         tid_len |= buf[23] & 0xff;
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         buf = NULL;
 
         if ((tid_len + 24) != cmd->data_length) {
@@ -3469,7 +3470,7 @@ static int core_scsi3_emulate_pro_register_and_move(
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         proto_ident = (buf[24] & 0x0f);
 #if 0
         pr_debug("SPC-3 PR REGISTER_AND_MOVE: Extracted Protocol Identifier:"
@@ -3503,7 +3504,7 @@ static int core_scsi3_emulate_pro_register_and_move(
                 goto out;
         }
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         buf = NULL;
 
         pr_debug("SPC-3 PR [%s] Extracted initiator %s identifier: %s"
@@ -3768,13 +3769,13 @@ after_iport_check:
                                         " REGISTER_AND_MOVE\n");
         }
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         core_scsi3_put_pr_reg(dest_pr_reg);
         return 0;
 out:
         if (buf)
-                transport_kunmap_first_data_page(cmd);
+                transport_kunmap_data_sg(cmd);
         if (dest_se_deve)
                 core_scsi3_lunacl_undepend_item(dest_se_deve);
         if (dest_node_acl)
@@ -3848,7 +3849,7 @@ int target_scsi3_emulate_pr_out(struct se_task *task)
         scope = (cdb[2] & 0xf0);
         type = (cdb[2] & 0x0f);
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         /*
          * From PERSISTENT_RESERVE_OUT parameter list (payload)
          */
@@ -3866,7 +3867,7 @@ int target_scsi3_emulate_pr_out(struct se_task *task)
                 aptpl = (buf[17] & 0x01);
                 unreg = (buf[17] & 0x02);
         }
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
         buf = NULL;
 
         /*
@@ -3966,7 +3967,7 @@ static int core_scsi3_pri_read_keys(struct se_cmd *cmd)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         buf[0] = ((su_dev->t10_pr.pr_generation >> 24) & 0xff);
         buf[1] = ((su_dev->t10_pr.pr_generation >> 16) & 0xff);
         buf[2] = ((su_dev->t10_pr.pr_generation >> 8) & 0xff);
@@ -4000,7 +4001,7 @@ static int core_scsi3_pri_read_keys(struct se_cmd *cmd)
         buf[6] = ((add_len >> 8) & 0xff);
         buf[7] = (add_len & 0xff);
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         return 0;
 }
@@ -4026,7 +4027,7 @@ static int core_scsi3_pri_read_reservation(struct se_cmd *cmd)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
         buf[0] = ((su_dev->t10_pr.pr_generation >> 24) & 0xff);
         buf[1] = ((su_dev->t10_pr.pr_generation >> 16) & 0xff);
         buf[2] = ((su_dev->t10_pr.pr_generation >> 8) & 0xff);
@@ -4085,7 +4086,7 @@ static int core_scsi3_pri_read_reservation(struct se_cmd *cmd)
 
 err:
         spin_unlock(&se_dev->dev_reservation_lock);
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         return 0;
 }
@@ -4109,7 +4110,7 @@ static int core_scsi3_pri_report_capabilities(struct se_cmd *cmd)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         buf[0] = ((add_len << 8) & 0xff);
         buf[1] = (add_len & 0xff);
@@ -4141,7 +4142,7 @@ static int core_scsi3_pri_report_capabilities(struct se_cmd *cmd)
         buf[4] |= 0x02; /* PR_TYPE_WRITE_EXCLUSIVE */
         buf[5] |= 0x01; /* PR_TYPE_EXCLUSIVE_ACCESS_ALLREG */
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         return 0;
 }
@@ -4171,7 +4172,7 @@ static int core_scsi3_pri_read_full_status(struct se_cmd *cmd)
                 return -EINVAL;
         }
 
-        buf = transport_kmap_first_data_page(cmd);
+        buf = transport_kmap_data_sg(cmd);
 
         buf[0] = ((su_dev->t10_pr.pr_generation >> 24) & 0xff);
         buf[1] = ((su_dev->t10_pr.pr_generation >> 16) & 0xff);
@@ -4292,7 +4293,7 @@ static int core_scsi3_pri_read_full_status(struct se_cmd *cmd)
         buf[6] = ((add_len >> 8) & 0xff);
         buf[7] = (add_len & 0xff);
 
-        transport_kunmap_first_data_page(cmd);
+        transport_kunmap_data_sg(cmd);
 
         return 0;
 }
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index d35467d42e12..8d4def30e9e8 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -693,7 +693,7 @@ static int pscsi_transport_complete(struct se_task *task)
 
                 if (task->task_se_cmd->se_deve->lun_flags &
                                 TRANSPORT_LUNFLAGS_READ_ONLY) {
-                        unsigned char *buf = transport_kmap_first_data_page(task->task_se_cmd);
+                        unsigned char *buf = transport_kmap_data_sg(task->task_se_cmd);
 
                         if (cdb[0] == MODE_SENSE_10) {
                                 if (!(buf[3] & 0x80))
@@ -703,7 +703,7 @@ static int pscsi_transport_complete(struct se_task *task)
                                         buf[2] |= 0x80;
                         }
 
-                        transport_kunmap_first_data_page(task->task_se_cmd);
+                        transport_kunmap_data_sg(task->task_se_cmd);
                 }
         }
 after_mode_sense:
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index b7668029bb31..06336ecd872d 100644
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -807,8 +807,7 @@ static void core_tpg_shutdown_lun(
 
 struct se_lun *core_tpg_pre_dellun(
         struct se_portal_group *tpg,
-        u32 unpacked_lun,
-        int *ret)
+        u32 unpacked_lun)
 {
         struct se_lun *lun;
 
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index d3ddd1361949..58cea07b12fb 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -1255,32 +1255,34 @@ static void core_setup_task_attr_emulation(struct se_device *dev)
 static void scsi_dump_inquiry(struct se_device *dev)
 {
         struct t10_wwn *wwn = &dev->se_sub_dev->t10_wwn;
+        char buf[17];
         int i, device_type;
         /*
          * Print Linux/SCSI style INQUIRY formatting to the kernel ring buffer
          */
-        pr_debug("  Vendor: ");
         for (i = 0; i < 8; i++)
                 if (wwn->vendor[i] >= 0x20)
-                        pr_debug("%c", wwn->vendor[i]);
+                        buf[i] = wwn->vendor[i];
                 else
-                        pr_debug(" ");
+                        buf[i] = ' ';
+        buf[i] = '\0';
+        pr_debug("  Vendor: %s\n", buf);
 
-        pr_debug("  Model: ");
         for (i = 0; i < 16; i++)
                 if (wwn->model[i] >= 0x20)
-                        pr_debug("%c", wwn->model[i]);
+                        buf[i] = wwn->model[i];
                 else
-                        pr_debug(" ");
+                        buf[i] = ' ';
+        buf[i] = '\0';
+        pr_debug("  Model: %s\n", buf);
 
-        pr_debug("  Revision: ");
         for (i = 0; i < 4; i++)
                 if (wwn->revision[i] >= 0x20)
-                        pr_debug("%c", wwn->revision[i]);
+                        buf[i] = wwn->revision[i];
                 else
-                        pr_debug(" ");
-
-        pr_debug("\n");
+                        buf[i] = ' ';
+        buf[i] = '\0';
+        pr_debug("  Revision: %s\n", buf);
 
         device_type = dev->transport->get_device_type(dev);
         pr_debug("  Type:   %s ", scsi_device_type(device_type));
@@ -1655,7 +1657,7 @@ EXPORT_SYMBOL(transport_handle_cdb_direct);
  * This may only be called from process context, and also currently
  * assumes internal allocation of fabric payload buffer by target-core.
  **/
-int target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
+void target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
                 unsigned char *cdb, unsigned char *sense, u32 unpacked_lun,
                 u32 data_length, int task_attr, int data_dir, int flags)
 {
@@ -1688,15 +1690,21 @@ int target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
         /*
          * Locate se_lun pointer and attach it to struct se_cmd
          */
-        if (transport_lookup_cmd_lun(se_cmd, unpacked_lun) < 0)
-                goto out_check_cond;
+        if (transport_lookup_cmd_lun(se_cmd, unpacked_lun) < 0) {
+                transport_send_check_condition_and_sense(se_cmd,
+                                se_cmd->scsi_sense_reason, 0);
+                target_put_sess_cmd(se_sess, se_cmd);
+                return;
+        }
         /*
          * Sanitize CDBs via transport_generic_cmd_sequencer() and
          * allocate the necessary tasks to complete the received CDB+data
          */
         rc = transport_generic_allocate_tasks(se_cmd, cdb);
-        if (rc != 0)
-                goto out_check_cond;
+        if (rc != 0) {
+                transport_generic_request_failure(se_cmd);
+                return;
+        }
         /*
          * Dispatch se_cmd descriptor to se_lun->lun_se_dev backend
          * for immediate execution of READs, otherwise wait for
@@ -1704,12 +1712,7 @@ int target_submit_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,
          * when fabric has filled the incoming buffer.
          */
         transport_handle_cdb_direct(se_cmd);
-        return 0;
-
-out_check_cond:
-        transport_send_check_condition_and_sense(se_cmd,
-                                se_cmd->scsi_sense_reason, 0);
-        return 0;
+        return;
 }
 EXPORT_SYMBOL(target_submit_cmd);
 
@@ -2694,7 +2697,7 @@ static int transport_generic_cmd_sequencer(
                         cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
 
                         if (target_check_write_same_discard(&cdb[10], dev) < 0)
-                                goto out_invalid_cdb_field;
+                                goto out_unsupported_cdb;
                         if (!passthrough)
                                 cmd->execute_task = target_emulate_write_same;
                         break;
@@ -2977,7 +2980,7 @@ static int transport_generic_cmd_sequencer(
                 cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
 
                 if (target_check_write_same_discard(&cdb[1], dev) < 0)
-                        goto out_invalid_cdb_field;
+                        goto out_unsupported_cdb;
                 if (!passthrough)
                         cmd->execute_task = target_emulate_write_same;
                 break;
@@ -3000,7 +3003,7 @@ static int transport_generic_cmd_sequencer(
                  * of byte 1 bit 3 UNMAP instead of original reserved field
                  */
                 if (target_check_write_same_discard(&cdb[1], dev) < 0)
-                        goto out_invalid_cdb_field;
+                        goto out_unsupported_cdb;
                 if (!passthrough)
                         cmd->execute_task = target_emulate_write_same;
                 break;
@@ -3082,11 +3085,6 @@ static int transport_generic_cmd_sequencer(
              (cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB)))
                 goto out_unsupported_cdb;
 
-        /* Let's limit control cdbs to a page, for simplicity's sake. */
-        if ((cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB) &&
-            size > PAGE_SIZE)
-                goto out_invalid_cdb_field;
-
         transport_set_supported_SAM_opcode(cmd);
         return ret;
 
@@ -3490,9 +3488,11 @@ int transport_generic_map_mem_to_cmd(
 }
 EXPORT_SYMBOL(transport_generic_map_mem_to_cmd);
 
-void *transport_kmap_first_data_page(struct se_cmd *cmd)
+void *transport_kmap_data_sg(struct se_cmd *cmd)
 {
         struct scatterlist *sg = cmd->t_data_sg;
+        struct page **pages;
+        int i;
 
         BUG_ON(!sg);
         /*
@@ -3500,15 +3500,41 @@ void *transport_kmap_first_data_page(struct se_cmd *cmd)
          * tcm_loop who may be using a contig buffer from the SCSI midlayer for
          * control CDBs passed as SGLs via transport_generic_map_mem_to_cmd()
          */
-        return kmap(sg_page(sg)) + sg->offset;
+        if (!cmd->t_data_nents)
+                return NULL;
+        else if (cmd->t_data_nents == 1)
+                return kmap(sg_page(sg)) + sg->offset;
+
+        /* >1 page. use vmap */
+        pages = kmalloc(sizeof(*pages) * cmd->t_data_nents, GFP_KERNEL);
+        if (!pages)
+                return NULL;
+
+        /* convert sg[] to pages[] */
+        for_each_sg(cmd->t_data_sg, sg, cmd->t_data_nents, i) {
+                pages[i] = sg_page(sg);
+        }
+
+        cmd->t_data_vmap = vmap(pages, cmd->t_data_nents,  VM_MAP, PAGE_KERNEL);
+        kfree(pages);
+        if (!cmd->t_data_vmap)
+                return NULL;
+
+        return cmd->t_data_vmap + cmd->t_data_sg[0].offset;
 }
-EXPORT_SYMBOL(transport_kmap_first_data_page);
+EXPORT_SYMBOL(transport_kmap_data_sg);
 
-void transport_kunmap_first_data_page(struct se_cmd *cmd)
+void transport_kunmap_data_sg(struct se_cmd *cmd)
 {
-        kunmap(sg_page(cmd->t_data_sg));
+        if (!cmd->t_data_nents)
+                return;
+        else if (cmd->t_data_nents == 1)
+                kunmap(sg_page(cmd->t_data_sg));
+
+        vunmap(cmd->t_data_vmap);
+        cmd->t_data_vmap = NULL;
 }
-EXPORT_SYMBOL(transport_kunmap_first_data_page);
+EXPORT_SYMBOL(transport_kunmap_data_sg);
 
 static int
 transport_generic_get_mem(struct se_cmd *cmd)
@@ -3516,6 +3542,7 @@ transport_generic_get_mem(struct se_cmd *cmd)
         u32 length = cmd->data_length;
         unsigned int nents;
         struct page *page;
+        gfp_t zero_flag;
         int i = 0;
 
         nents = DIV_ROUND_UP(length, PAGE_SIZE);
@@ -3526,9 +3553,11 @@ transport_generic_get_mem(struct se_cmd *cmd)
         cmd->t_data_nents = nents;
         sg_init_table(cmd->t_data_sg, nents);
 
+        zero_flag = cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB ? 0 : __GFP_ZERO;
+
         while (length) {
                 u32 page_len = min_t(u32, length, PAGE_SIZE);
-                page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+                page = alloc_page(GFP_KERNEL | zero_flag);
                 if (!page)
                         goto out;
 
@@ -3756,6 +3785,11 @@ transport_allocate_control_task(struct se_cmd *cmd)
         struct se_task *task;
         unsigned long flags;
 
+        /* Workaround for handling zero-length control CDBs */
+        if ((cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB) &&
+            !cmd->data_length)
+                return 0;
+
         task = transport_generic_get_task(cmd, cmd->data_direction);
         if (!task)
                 return -ENOMEM;
@@ -3827,6 +3861,14 @@ int transport_generic_new_cmd(struct se_cmd *cmd)
         else if (!task_cdbs && (cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB)) {
                 cmd->t_state = TRANSPORT_COMPLETE;
                 atomic_set(&cmd->t_transport_active, 1);
+
+                if (cmd->t_task_cdb[0] == REQUEST_SENSE) {
+                        u8 ua_asc = 0, ua_ascq = 0;
+
+                        core_scsi3_ua_clear_for_request_sense(cmd,
+                                        &ua_asc, &ua_ascq);
+                }
+
                 INIT_WORK(&cmd->work, target_complete_ok_work);
                 queue_work(target_completion_wq, &cmd->work);
                 return 0;
@@ -4448,8 +4490,8 @@ int transport_send_check_condition_and_sense(
                 /* CURRENT ERROR */
                 buffer[offset] = 0x70;
                 buffer[offset+SPC_ADD_SENSE_LEN_OFFSET] = 10;
-                /* ABORTED COMMAND */
-                buffer[offset+SPC_SENSE_KEY_OFFSET] = ABORTED_COMMAND;
+                /* ILLEGAL REQUEST */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ILLEGAL_REQUEST;
                 /* INVALID FIELD IN CDB */
                 buffer[offset+SPC_ASC_KEY_OFFSET] = 0x24;
                 break;
@@ -4457,8 +4499,8 @@ int transport_send_check_condition_and_sense(
                 /* CURRENT ERROR */
                 buffer[offset] = 0x70;
                 buffer[offset+SPC_ADD_SENSE_LEN_OFFSET] = 10;
-                /* ABORTED COMMAND */
-                buffer[offset+SPC_SENSE_KEY_OFFSET] = ABORTED_COMMAND;
+                /* ILLEGAL REQUEST */
+                buffer[offset+SPC_SENSE_KEY_OFFSET] = ILLEGAL_REQUEST;
                 /* INVALID FIELD IN PARAMETER LIST */
                 buffer[offset+SPC_ASC_KEY_OFFSET] = 0x26;
                 break;
diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index addc18f727ea..9e7e26c74c79 100644
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -540,7 +540,6 @@ static void ft_send_work(struct work_struct *work)
         int data_dir = 0;
         u32 data_len;
         int task_attr;
-        int ret;
 
         fcp = fc_frame_payload_get(cmd->req_frame, sizeof(*fcp));
         if (!fcp)
@@ -603,14 +602,10 @@ static void ft_send_work(struct work_struct *work)
          * Use a single se_cmd->cmd_kref as we expect to release se_cmd
          * directly from ft_check_stop_free callback in response path.
          */
-        ret = target_submit_cmd(&cmd->se_cmd, cmd->sess->se_sess, cmd->cdb,
+        target_submit_cmd(&cmd->se_cmd, cmd->sess->se_sess, cmd->cdb,
                                 &cmd->ft_sense_buffer[0], cmd->lun, data_len,
                                 task_attr, data_dir, 0);
-        pr_debug("r_ctl %x alloc target_submit_cmd %d\n", fh->fh_r_ctl, ret);
-        if (ret < 0) {
-                ft_dump_cmd(cmd, __func__);
-                return;
-        }
+        pr_debug("r_ctl %x alloc target_submit_cmd\n", fh->fh_r_ctl);
         return;
 
 err:
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index dd9a5743fa99..220ce7e31cf5 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -1304,7 +1304,7 @@ static struct genl_multicast_group thermal_event_mcgrp = {
         .name = THERMAL_GENL_MCAST_GROUP_NAME,
 };
 
-int generate_netlink_event(u32 orig, enum events event)
+int thermal_generate_netlink_event(u32 orig, enum events event)
 {
         struct sk_buff *skb;
         struct nlattr *attr;
@@ -1363,7 +1363,7 @@ int generate_netlink_event(u32 orig, enum events event)
 
         return result;
 }
-EXPORT_SYMBOL(generate_netlink_event);
+EXPORT_SYMBOL(thermal_generate_netlink_event);
 
 static int genetlink_init(void)
 {
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250/8250.c
index 9f50c4e3c2be..9b7336fcfbb3 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250/8250.c
@@ -45,7 +45,7 @@
 #include "8250.h"
 
 #ifdef CONFIG_SPARC
-#include "suncore.h"
+#include "../suncore.h"
 #endif
 
 /*
diff --git a/drivers/tty/serial/8250.h b/drivers/tty/serial/8250/8250.h
index ae027be57e25..ae027be57e25 100644
--- a/drivers/tty/serial/8250.h
+++ b/drivers/tty/serial/8250/8250.h
diff --git a/drivers/tty/serial/8250_accent.c b/drivers/tty/serial/8250/8250_accent.c
index 34b51c651192..34b51c651192 100644
--- a/drivers/tty/serial/8250_accent.c
+++ b/drivers/tty/serial/8250/8250_accent.c
diff --git a/drivers/tty/serial/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c
index b0ce8c56f1a4..b0ce8c56f1a4 100644
--- a/drivers/tty/serial/8250_acorn.c
+++ b/drivers/tty/serial/8250/8250_acorn.c
diff --git a/drivers/tty/serial/8250_boca.c b/drivers/tty/serial/8250/8250_boca.c
index d125dc107985..d125dc107985 100644
--- a/drivers/tty/serial/8250_boca.c
+++ b/drivers/tty/serial/8250/8250_boca.c
diff --git a/drivers/tty/serial/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index f574eef3075f..f574eef3075f 100644
--- a/drivers/tty/serial/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
diff --git a/drivers/tty/serial/8250_early.c b/drivers/tty/serial/8250/8250_early.c
index eaafb98debed..eaafb98debed 100644
--- a/drivers/tty/serial/8250_early.c
+++ b/drivers/tty/serial/8250/8250_early.c
diff --git a/drivers/tty/serial/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c
index bf53aabf9b5e..bf53aabf9b5e 100644
--- a/drivers/tty/serial/8250_exar_st16c554.c
+++ b/drivers/tty/serial/8250/8250_exar_st16c554.c
diff --git a/drivers/tty/serial/8250_fourport.c b/drivers/tty/serial/8250/8250_fourport.c
index be1582609626..be1582609626 100644
--- a/drivers/tty/serial/8250_fourport.c
+++ b/drivers/tty/serial/8250/8250_fourport.c
diff --git a/drivers/tty/serial/8250_fsl.c b/drivers/tty/serial/8250/8250_fsl.c
index f4d3c47b88e8..f4d3c47b88e8 100644
--- a/drivers/tty/serial/8250_fsl.c
+++ b/drivers/tty/serial/8250/8250_fsl.c
diff --git a/drivers/tty/serial/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c
index d8c0ffbfa6e3..d8c0ffbfa6e3 100644
--- a/drivers/tty/serial/8250_gsc.c
+++ b/drivers/tty/serial/8250/8250_gsc.c
diff --git a/drivers/tty/serial/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
index c13438c93012..c13438c93012 100644
--- a/drivers/tty/serial/8250_hp300.c
+++ b/drivers/tty/serial/8250/8250_hp300.c
diff --git a/drivers/tty/serial/8250_hub6.c b/drivers/tty/serial/8250/8250_hub6.c
index a5c778e83de0..a5c778e83de0 100644
--- a/drivers/tty/serial/8250_hub6.c
+++ b/drivers/tty/serial/8250/8250_hub6.c
diff --git a/drivers/tty/serial/8250_mca.c b/drivers/tty/serial/8250/8250_mca.c
index d20abf04541e..d20abf04541e 100644
--- a/drivers/tty/serial/8250_mca.c
+++ b/drivers/tty/serial/8250/8250_mca.c
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index da2b0b0a183f..da2b0b0a183f 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
diff --git a/drivers/tty/serial/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
index a2f236510ff1..a2f236510ff1 100644
--- a/drivers/tty/serial/8250_pnp.c
+++ b/drivers/tty/serial/8250/8250_pnp.c
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
new file mode 100644
index 000000000000..591f8018e7dd
--- /dev/null
+++ b/drivers/tty/serial/8250/Kconfig
@@ -0,0 +1,280 @@
+#
+# The 8250/16550 serial drivers.  You shouldn't be in this list unless
+# you somehow have an implicit or explicit dependency on SERIAL_8250.
+#
+
+config SERIAL_8250
+        tristate "8250/16550 and compatible serial support"
+        select SERIAL_CORE
+        ---help---
+          This selects whether you want to include the driver for the standard
+          serial ports.  The standard answer is Y.  People who might say N
+          here are those that are setting up dedicated Ethernet WWW/FTP
+          servers, or users that have one of the various bus mice instead of a
+          serial mouse and don't intend to use their machine's standard serial
+          port for anything.  (Note that the Cyclades and Stallion multi
+          serial port drivers do not need this driver built in for them to
+          work.)
+
+          To compile this driver as a module, choose M here: the
+          module will be called 8250.
+          [WARNING: Do not compile this driver as a module if you are using
+          non-standard serial ports, since the configuration information will
+          be lost when the driver is unloaded.  This limitation may be lifted
+          in the future.]
+
+          BTW1: If you have a mouseman serial mouse which is not recognized by
+          the X window system, try running gpm first.
+
+          BTW2: If you intend to use a software modem (also called Winmodem)
+          under Linux, forget it.  These modems are crippled and require
+          proprietary drivers which are only available under Windows.
+
+          Most people will say Y or M here, so that they can use serial mice,
+          modems and similar devices connecting to the standard serial ports.
+
+config SERIAL_8250_CONSOLE
+        bool "Console on 8250/16550 and compatible serial port"
+        depends on SERIAL_8250=y
+        select SERIAL_CORE_CONSOLE
+        ---help---
+          If you say Y here, it will be possible to use a serial port as the
+          system console (the system console is the device which receives all
+          kernel messages and warnings and which allows logins in single user
+          mode). This could be useful if some terminal or printer is connected
+          to that serial port.
+
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttyS1". (Try "man bootparam" or see the documentation of
+          your boot loader (grub or lilo or loadlin) about how to pass options
+          to the kernel at boot time.)
+
+          If you don't have a VGA card installed and you say Y here, the
+          kernel will automatically use the first serial line, /dev/ttyS0, as
+          system console.
+
+          You can set that using a kernel command line option such as
+          "console=uart8250,io,0x3f8,9600n8"
+          "console=uart8250,mmio,0xff5e0000,115200n8".
+          and it will switch to normal serial console when the corresponding
+          port is ready.
+          "earlycon=uart8250,io,0x3f8,9600n8"
+          "earlycon=uart8250,mmio,0xff5e0000,115200n8".
+          it will not only setup early console.
+
+          If unsure, say N.
+
+config FIX_EARLYCON_MEM
+        bool
+        depends on X86
+        default y
+
+config SERIAL_8250_GSC
+        tristate
+        depends on SERIAL_8250 && GSC
+        default SERIAL_8250
+
+config SERIAL_8250_PCI
+        tristate "8250/16550 PCI device support" if EXPERT
+        depends on SERIAL_8250 && PCI
+        default SERIAL_8250
+        help
+          This builds standard PCI serial support. You may be able to
+          disable this feature if you only need legacy serial support.
+          Saves about 9K.
+
+config SERIAL_8250_PNP
+        tristate "8250/16550 PNP device support" if EXPERT
+        depends on SERIAL_8250 && PNP
+        default SERIAL_8250
+        help
+          This builds standard PNP serial support. You may be able to
+          disable this feature if you only need legacy serial support.
+
+config SERIAL_8250_HP300
+        tristate
+        depends on SERIAL_8250 && HP300
+        default SERIAL_8250
+
+config SERIAL_8250_CS
+        tristate "8250/16550 PCMCIA device support"
+        depends on PCMCIA && SERIAL_8250
+        ---help---
+          Say Y here to enable support for 16-bit PCMCIA serial devices,
+          including serial port cards, modems, and the modem functions of
+          multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are
+          credit-card size devices often used with laptops.)
+
+          To compile this driver as a module, choose M here: the
+          module will be called serial_cs.
+
+          If unsure, say N.
+
+config SERIAL_8250_NR_UARTS
+        int "Maximum number of 8250/16550 serial ports"
+        depends on SERIAL_8250
+        default "4"
+        help
+          Set this to the number of serial ports you want the driver
+          to support.  This includes any ports discovered via ACPI or
+          PCI enumeration and any ports that may be added at run-time
+          via hot-plug, or any ISA multi-port serial cards.
+
+config SERIAL_8250_RUNTIME_UARTS
+        int "Number of 8250/16550 serial ports to register at runtime"
+        depends on SERIAL_8250
+        range 0 SERIAL_8250_NR_UARTS
+        default "4"
+        help
+          Set this to the maximum number of serial ports you want
+          the kernel to register at boot time.  This can be overridden
+          with the module parameter "nr_uarts", or boot-time parameter
+          8250.nr_uarts
+
+config SERIAL_8250_EXTENDED
+        bool "Extended 8250/16550 serial driver options"
+        depends on SERIAL_8250
+        help
+          If you wish to use any non-standard features of the standard "dumb"
+          driver, say Y here. This includes HUB6 support, shared serial
+          interrupts, special multiport support, support for more than the
+          four COM 1/2/3/4 boards, etc.
+
+          Note that the answer to this question won't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about serial driver options. If unsure, say N.
+
+config SERIAL_8250_MANY_PORTS
+        bool "Support more than 4 legacy serial ports"
+        depends on SERIAL_8250_EXTENDED && !IA64
+        help
+          Say Y here if you have dumb serial boards other than the four
+          standard COM 1/2/3/4 ports. This may happen if you have an AST
+          FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
+          from <http://www.tldp.org/docs.html#howto>), or other custom
+          serial port hardware which acts similar to standard serial port
+          hardware. If you only use the standard COM 1/2/3/4 ports, you can
+          say N here to save some memory. You can also say Y if you have an
+          "intelligent" multiport card such as Cyclades, Digiboards, etc.
+
+#
+# Multi-port serial cards
+#
+
+config SERIAL_8250_FOURPORT
+        tristate "Support Fourport cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have an AST FourPort serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_fourport.
+
+config SERIAL_8250_ACCENT
+        tristate "Support Accent cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have an Accent Async serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_accent.
+
+config SERIAL_8250_BOCA
+        tristate "Support Boca cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have a Boca serial board.  Please read the Boca
+          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_boca.
+
+config SERIAL_8250_EXAR_ST16C554
+        tristate "Support Exar ST16C554/554D Quad UART"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          The Uplogix Envoy TU301 uses this Exar Quad UART.  If you are
+          tinkering with your Envoy TU301, or have a machine with this UART,
+          say Y here.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_exar_st16c554.
+
+config SERIAL_8250_HUB6
+        tristate "Support Hub6 cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have a HUB6 serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_hub6.
+
+#
+# Misc. options/drivers.
+#
+
+config SERIAL_8250_SHARE_IRQ
+        bool "Support for sharing serial interrupts"
+        depends on SERIAL_8250_EXTENDED
+        help
+          Some serial boards have hardware support which allows multiple dumb
+          serial ports on the same board to share a single IRQ. To enable
+          support for this in the serial driver, say Y here.
+
+config SERIAL_8250_DETECT_IRQ
+        bool "Autodetect IRQ on standard ports (unsafe)"
+        depends on SERIAL_8250_EXTENDED
+        help
+          Say Y here if you want the kernel to try to guess which IRQ
+          to use for your serial port.
+
+          This is considered unsafe; it is far better to configure the IRQ in
+          a boot script using the setserial command.
+
+          If unsure, say N.
+
+config SERIAL_8250_RSA
+        bool "Support RSA serial ports"
+        depends on SERIAL_8250_EXTENDED
+        help
+          ::: To be written :::
+
+config SERIAL_8250_MCA
+        tristate "Support 8250-type ports on MCA buses"
+        depends on SERIAL_8250 != n && MCA
+        help
+          Say Y here if you have a MCA serial ports.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_mca.
+
+config SERIAL_8250_ACORN
+        tristate "Acorn expansion card serial port support"
+        depends on ARCH_ACORN && SERIAL_8250
+        help
+          If you have an Atomwide Serial card or Serial Port card for an Acorn
+          system, say Y to this option.  The driver can handle 1, 2, or 3 port
+          cards.  If unsure, say N.
+
+config SERIAL_8250_RM9K
+        bool "Support for MIPS RM9xxx integrated serial port"
+        depends on SERIAL_8250 != n && SERIAL_RM9000
+        select SERIAL_8250_SHARE_IRQ
+        help
+          Selecting this option will add support for the integrated serial
+          port hardware found on MIPS RM9122 and similar processors.
+          If unsure, say N.
+
+config SERIAL_8250_FSL
+        bool
+        depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550
+        default PPC
+
+config SERIAL_8250_DW
+        tristate "Support for Synopsys DesignWare 8250 quirks"
+        depends on SERIAL_8250 && OF
+        help
+          Selecting this option will enable handling of the extra features
+          present in the Synopsys DesignWare APB UART.
diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile
new file mode 100644
index 000000000000..867bba738908
--- /dev/null
+++ b/drivers/tty/serial/8250/Makefile
@@ -0,0 +1,20 @@
+#
+# Makefile for the 8250 serial device drivers.
+#
+
+obj-$(CONFIG_SERIAL_8250)               += 8250.o
+obj-$(CONFIG_SERIAL_8250_PNP)           += 8250_pnp.o
+obj-$(CONFIG_SERIAL_8250_GSC)           += 8250_gsc.o
+obj-$(CONFIG_SERIAL_8250_PCI)           += 8250_pci.o
+obj-$(CONFIG_SERIAL_8250_HP300)         += 8250_hp300.o
+obj-$(CONFIG_SERIAL_8250_CS)            += serial_cs.o
+obj-$(CONFIG_SERIAL_8250_ACORN)         += 8250_acorn.o
+obj-$(CONFIG_SERIAL_8250_CONSOLE)       += 8250_early.o
+obj-$(CONFIG_SERIAL_8250_FOURPORT)      += 8250_fourport.o
+obj-$(CONFIG_SERIAL_8250_ACCENT)        += 8250_accent.o
+obj-$(CONFIG_SERIAL_8250_BOCA)          += 8250_boca.o
+obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
+obj-$(CONFIG_SERIAL_8250_HUB6)          += 8250_hub6.o
+obj-$(CONFIG_SERIAL_8250_MCA)           += 8250_mca.o
+obj-$(CONFIG_SERIAL_8250_FSL)           += 8250_fsl.o
+obj-$(CONFIG_SERIAL_8250_DW)            += 8250_dw.o
diff --git a/drivers/tty/serial/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
index 86090605a84e..86090605a84e 100644
--- a/drivers/tty/serial/serial_cs.c
+++ b/drivers/tty/serial/8250/serial_cs.c
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index aca2386c5ef1..2de99248dfae 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -5,279 +5,7 @@
 menu "Serial drivers"
         depends on HAS_IOMEM
 
-#
-# The new 8250/16550 serial drivers
-config SERIAL_8250
-        tristate "8250/16550 and compatible serial support"
-        select SERIAL_CORE
-        ---help---
-          This selects whether you want to include the driver for the standard
-          serial ports.  The standard answer is Y.  People who might say N
-          here are those that are setting up dedicated Ethernet WWW/FTP
-          servers, or users that have one of the various bus mice instead of a
-          serial mouse and don't intend to use their machine's standard serial
-          port for anything.  (Note that the Cyclades and Stallion multi
-          serial port drivers do not need this driver built in for them to
-          work.)
-
-          To compile this driver as a module, choose M here: the
-          module will be called 8250.
-          [WARNING: Do not compile this driver as a module if you are using
-          non-standard serial ports, since the configuration information will
-          be lost when the driver is unloaded.  This limitation may be lifted
-          in the future.]
-
-          BTW1: If you have a mouseman serial mouse which is not recognized by
-          the X window system, try running gpm first.
-
-          BTW2: If you intend to use a software modem (also called Winmodem)
-          under Linux, forget it.  These modems are crippled and require
-          proprietary drivers which are only available under Windows.
-
-          Most people will say Y or M here, so that they can use serial mice,
-          modems and similar devices connecting to the standard serial ports.
-
-config SERIAL_8250_CONSOLE
-        bool "Console on 8250/16550 and compatible serial port"
-        depends on SERIAL_8250=y
-        select SERIAL_CORE_CONSOLE
-        ---help---
-          If you say Y here, it will be possible to use a serial port as the
-          system console (the system console is the device which receives all
-          kernel messages and warnings and which allows logins in single user
-          mode). This could be useful if some terminal or printer is connected
-          to that serial port.
-
-          Even if you say Y here, the currently visible virtual console
-          (/dev/tty0) will still be used as the system console by default, but
-          you can alter that using a kernel command line option such as
-          "console=ttyS1". (Try "man bootparam" or see the documentation of
-          your boot loader (grub or lilo or loadlin) about how to pass options
-          to the kernel at boot time.)
-
-          If you don't have a VGA card installed and you say Y here, the
-          kernel will automatically use the first serial line, /dev/ttyS0, as
-          system console.
-
-          You can set that using a kernel command line option such as
-          "console=uart8250,io,0x3f8,9600n8"
-          "console=uart8250,mmio,0xff5e0000,115200n8".
-          and it will switch to normal serial console when the corresponding 
-          port is ready.
-          "earlycon=uart8250,io,0x3f8,9600n8"
-          "earlycon=uart8250,mmio,0xff5e0000,115200n8".
-          it will not only setup early console.
-
-          If unsure, say N.
-
-config FIX_EARLYCON_MEM
-        bool
-        depends on X86
-        default y
-
-config SERIAL_8250_GSC
-        tristate
-        depends on SERIAL_8250 && GSC
-        default SERIAL_8250
-
-config SERIAL_8250_PCI
-        tristate "8250/16550 PCI device support" if EXPERT
-        depends on SERIAL_8250 && PCI
-        default SERIAL_8250
-        help
-          This builds standard PCI serial support. You may be able to
-          disable this feature if you only need legacy serial support.
-          Saves about 9K.
-
-config SERIAL_8250_PNP
-        tristate "8250/16550 PNP device support" if EXPERT
-        depends on SERIAL_8250 && PNP
-        default SERIAL_8250
-        help
-          This builds standard PNP serial support. You may be able to
-          disable this feature if you only need legacy serial support.
-
-config SERIAL_8250_FSL
-        bool
-        depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550
-        default PPC
-
-config SERIAL_8250_HP300
-        tristate
-        depends on SERIAL_8250 && HP300
-        default SERIAL_8250
-
-config SERIAL_8250_CS
-        tristate "8250/16550 PCMCIA device support"
-        depends on PCMCIA && SERIAL_8250
-        ---help---
-          Say Y here to enable support for 16-bit PCMCIA serial devices,
-          including serial port cards, modems, and the modem functions of
-          multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are
-          credit-card size devices often used with laptops.)
-
-          To compile this driver as a module, choose M here: the
-          module will be called serial_cs.
-
-          If unsure, say N.
-
-config SERIAL_8250_NR_UARTS
-        int "Maximum number of 8250/16550 serial ports"
-        depends on SERIAL_8250
-        default "4"
-        help
-          Set this to the number of serial ports you want the driver
-          to support.  This includes any ports discovered via ACPI or
-          PCI enumeration and any ports that may be added at run-time
-          via hot-plug, or any ISA multi-port serial cards.
-
-config SERIAL_8250_RUNTIME_UARTS
-        int "Number of 8250/16550 serial ports to register at runtime"
-        depends on SERIAL_8250
-        range 0 SERIAL_8250_NR_UARTS
-        default "4"
-        help
-          Set this to the maximum number of serial ports you want
-          the kernel to register at boot time.  This can be overridden
-          with the module parameter "nr_uarts", or boot-time parameter
-          8250.nr_uarts
-
-config SERIAL_8250_EXTENDED
-        bool "Extended 8250/16550 serial driver options"
-        depends on SERIAL_8250
-        help
-          If you wish to use any non-standard features of the standard "dumb"
-          driver, say Y here. This includes HUB6 support, shared serial
-          interrupts, special multiport support, support for more than the
-          four COM 1/2/3/4 boards, etc.
-
-          Note that the answer to this question won't directly affect the
-          kernel: saying N will just cause the configurator to skip all
-          the questions about serial driver options. If unsure, say N.
-
-config SERIAL_8250_MANY_PORTS
-        bool "Support more than 4 legacy serial ports"
-        depends on SERIAL_8250_EXTENDED && !IA64
-        help
-          Say Y here if you have dumb serial boards other than the four
-          standard COM 1/2/3/4 ports. This may happen if you have an AST
-          FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
-          from <http://www.tldp.org/docs.html#howto>), or other custom
-          serial port hardware which acts similar to standard serial port
-          hardware. If you only use the standard COM 1/2/3/4 ports, you can
-          say N here to save some memory. You can also say Y if you have an
-          "intelligent" multiport card such as Cyclades, Digiboards, etc.
-
-#
-# Multi-port serial cards
-#
-
-config SERIAL_8250_FOURPORT
-        tristate "Support Fourport cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have an AST FourPort serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_fourport.
-
-config SERIAL_8250_ACCENT
-        tristate "Support Accent cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have an Accent Async serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_accent.
-
-config SERIAL_8250_BOCA
-        tristate "Support Boca cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have a Boca serial board.  Please read the Boca
-          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_boca.
-
-config SERIAL_8250_EXAR_ST16C554
-        tristate "Support Exar ST16C554/554D Quad UART"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          The Uplogix Envoy TU301 uses this Exar Quad UART.  If you are
-          tinkering with your Envoy TU301, or have a machine with this UART,
-          say Y here.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_exar_st16c554.
-
-config SERIAL_8250_HUB6
-        tristate "Support Hub6 cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have a HUB6 serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_hub6.
-
-config SERIAL_8250_SHARE_IRQ
-        bool "Support for sharing serial interrupts"
-        depends on SERIAL_8250_EXTENDED
-        help
-          Some serial boards have hardware support which allows multiple dumb
-          serial ports on the same board to share a single IRQ. To enable
-          support for this in the serial driver, say Y here.
-
-config SERIAL_8250_DETECT_IRQ
-        bool "Autodetect IRQ on standard ports (unsafe)"
-        depends on SERIAL_8250_EXTENDED
-        help
-          Say Y here if you want the kernel to try to guess which IRQ
-          to use for your serial port.
-
-          This is considered unsafe; it is far better to configure the IRQ in
-          a boot script using the setserial command.
-
-          If unsure, say N.
-
-config SERIAL_8250_RSA
-        bool "Support RSA serial ports"
-        depends on SERIAL_8250_EXTENDED
-        help
-          ::: To be written :::
-
-config SERIAL_8250_MCA
-        tristate "Support 8250-type ports on MCA buses"
-        depends on SERIAL_8250 != n && MCA
-        help
-          Say Y here if you have a MCA serial ports.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_mca.
-
-config SERIAL_8250_ACORN
-        tristate "Acorn expansion card serial port support"
-        depends on ARCH_ACORN && SERIAL_8250
-        help
-          If you have an Atomwide Serial card or Serial Port card for an Acorn
-          system, say Y to this option.  The driver can handle 1, 2, or 3 port
-          cards.  If unsure, say N.
-
-config SERIAL_8250_RM9K
-        bool "Support for MIPS RM9xxx integrated serial port"
-        depends on SERIAL_8250 != n && SERIAL_RM9000
-        select SERIAL_8250_SHARE_IRQ
-        help
-          Selecting this option will add support for the integrated serial
-          port hardware found on MIPS RM9122 and similar processors.
-          If unsure, say N.
-
-config SERIAL_8250_DW
-        tristate "Support for Synopsys DesignWare 8250 quirks"
-        depends on SERIAL_8250 && OF
-        help
-          Selecting this option will enable handling of the extra features
-          present in the Synopsys DesignWare APB UART.
+source "drivers/tty/serial/8250/Kconfig"
 
 comment "Non-8250 serial port support"
 
@@ -536,15 +264,6 @@ config SERIAL_MAX3107
         help
           MAX3107 chip support
 
-config SERIAL_MAX3107_AAVA
-        tristate "MAX3107 AAVA platform support"
-        depends on X86_MRST && SERIAL_MAX3107 && GPIOLIB
-        select SERIAL_CORE
-        help
-          Support for the MAX3107 chip configuration found on the AAVA
-          platform. Includes the extra initialisation and GPIO support
-          neded for this device.
-
 config SERIAL_DZ
         bool "DECstation DZ serial driver"
         depends on MACH_DECSTATION && 32BIT
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index f5b01f2ce525..fef32e10c851 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -14,22 +14,9 @@ obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o
 obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
 obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
 
-obj-$(CONFIG_SERIAL_8250) += 8250.o
-obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
-obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
-obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o
-obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o
-obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o
-obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o
-obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o
-obj-$(CONFIG_SERIAL_8250_FOURPORT) += 8250_fourport.o
-obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o
-obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
-obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
-obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
-obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
-obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o
-obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o
+# Now bring in any enabled 8250/16450/16550 type drivers.
+obj-$(CONFIG_SERIAL_8250) += 8250/
+
 obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
 obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
 obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
@@ -42,7 +29,6 @@ obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
 obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
 obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
 obj-$(CONFIG_SERIAL_MAX3107) += max3107.o
-obj-$(CONFIG_SERIAL_MAX3107_AAVA) += max3107-aava.o
 obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
 obj-$(CONFIG_SERIAL_MUX) += mux.o
 obj-$(CONFIG_SERIAL_68328) += 68328serial.o
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 9ae024025ff3..6800f5f26241 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -159,6 +159,7 @@ struct uart_amba_port {
         unsigned int            fifosize;       /* vendor-specific */
         unsigned int            lcrh_tx;        /* vendor-specific */
         unsigned int            lcrh_rx;        /* vendor-specific */
+        unsigned int            old_cr;         /* state during shutdown */
         bool                    autorts;
         char                    type[12];
         bool                    interrupt_may_hang; /* vendor-specific */
@@ -1411,7 +1412,9 @@ static int pl011_startup(struct uart_port *port)
         while (readw(uap->port.membase + UART01x_FR) & UART01x_FR_BUSY)
                 barrier();
 
-        cr = UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
+        /* restore RTS and DTR */
+        cr = uap->old_cr & (UART011_CR_RTS | UART011_CR_DTR);
+        cr |= UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
         writew(cr, uap->port.membase + UART011_CR);
 
         /* Clear pending error interrupts */
@@ -1469,6 +1472,7 @@ static void pl011_shutdown_channel(struct uart_amba_port *uap,
 static void pl011_shutdown(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned int cr;
 
         /*
          * disable all interrupts
@@ -1488,9 +1492,16 @@ static void pl011_shutdown(struct uart_port *port)
 
         /*
          * disable the port
+         * disable the port. It should not disable RTS and DTR.
+         * Also RTS and DTR state should be preserved to restore
+         * it during startup().
          */
         uap->autorts = false;
-        writew(UART01x_CR_UARTEN | UART011_CR_TXE, uap->port.membase + UART011_CR);
+        cr = readw(uap->port.membase + UART011_CR);
+        uap->old_cr = cr;
+        cr &= UART011_CR_RTS | UART011_CR_DTR;
+        cr |= UART01x_CR_UARTEN | UART011_CR_TXE;
+        writew(cr, uap->port.membase + UART011_CR);
 
         /*
          * disable break condition and fifos
@@ -1740,9 +1751,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct uart_amba_port *uap = amba_ports[co->index];
         unsigned int status, old_cr, new_cr;
+        unsigned long flags;
+        int locked = 1;
 
         clk_enable(uap->clk);
 
+        local_irq_save(flags);
+        if (uap->port.sysrq)
+                locked = 0;
+        else if (oops_in_progress)
+                locked = spin_trylock(&uap->port.lock);
+        else
+                spin_lock(&uap->port.lock);
+
         /*
          *      First save the CR then disable the interrupts
          */
@@ -1762,6 +1783,10 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
         } while (status & UART01x_FR_BUSY);
         writew(old_cr, uap->port.membase + UART011_CR);
 
+        if (locked)
+                spin_unlock(&uap->port.lock);
+        local_irq_restore(flags);
+
         clk_disable(uap->clk);
 }
 
@@ -1905,6 +1930,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
         uap->vendor = vendor;
         uap->lcrh_rx = vendor->lcrh_rx;
         uap->lcrh_tx = vendor->lcrh_tx;
+        uap->old_cr = 0;
         uap->fifosize = vendor->fifosize;
         uap->interrupt_may_hang = vendor->interrupt_may_hang;
         uap->port.dev = &dev->dev;
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index 7c867a046c97..7545fe1b9925 100644
--- a/drivers/tty/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -251,6 +251,7 @@ static void jsm_io_resume(struct pci_dev *pdev)
         struct jsm_board *brd = pci_get_drvdata(pdev);
 
         pci_restore_state(pdev);
+        pci_save_state(pdev);
 
         jsm_uart_port_init(brd);
 }
diff --git a/drivers/tty/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c
deleted file mode 100644
index aae772a71de6..000000000000
--- a/drivers/tty/serial/max3107-aava.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- *  max3107.c - spi uart protocol driver for Maxim 3107
- *  Based on max3100.c
- *      by Christian Pellegrin <chripell@evolware.org>
- *  and max3110.c
- *      by Feng Tang <feng.tang@intel.com>
- *
- *  Copyright (C) Aavamobile 2009
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- */
-
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-#include <linux/spi/spi.h>
-#include <linux/freezer.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <linux/sfi.h>
-#include <linux/module.h>
-#include <asm/mrst.h>
-#include "max3107.h"
-
-/* GPIO direction to input function */
-static int max3107_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[1];             /* Buffer for SPI transfer */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return -EINVAL;
-        }
-
-        /* Read current GPIO configuration register */
-        buf[0] = MAX3107_GPIOCFG_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) {
-                dev_err(&s->spi->dev, "SPI transfer GPIO read failed\n");
-                return -EIO;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-
-        /* Set GPIO to input */
-        buf[0] &= ~(0x0001 << offset);
-
-        /* Write new GPIO configuration register value */
-        buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIOCFG_REG);
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, NULL, 2)) {
-                dev_err(&s->spi->dev, "SPI transfer GPIO write failed\n");
-                return -EIO;
-        }
-        return 0;
-}
-
-/* GPIO direction to output function */
-static int max3107_gpio_direction_out(struct gpio_chip *chip, unsigned offset,
-                                        int value)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[2];     /* Buffer for SPI transfers */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return -EINVAL;
-        }
-
-        /* Read current GPIO configuration and data registers */
-        buf[0] = MAX3107_GPIOCFG_REG;
-        buf[1] = MAX3107_GPIODATA_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 4)) {
-                dev_err(&s->spi->dev, "SPI transfer gpio failed\n");
-                return -EIO;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-        buf[1] &= MAX3107_SPI_RX_DATA_MASK;
-
-        /* Set GPIO to output */
-        buf[0] |= (0x0001 << offset);
-        /* Set value */
-        if (value)
-                buf[1] |= (0x0001 << offset);
-        else
-                buf[1] &= ~(0x0001 << offset);
-
-        /* Write new GPIO configuration and data register values */
-        buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIOCFG_REG);
-        buf[1] |= (MAX3107_WRITE_BIT | MAX3107_GPIODATA_REG);
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, NULL, 4)) {
-                dev_err(&s->spi->dev,
-                        "SPI transfer for GPIO conf data w failed\n");
-                return -EIO;
-        }
-        return 0;
-}
-
-/* GPIO value query function */
-static int max3107_gpio_get(struct gpio_chip *chip, unsigned offset)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[1];     /* Buffer for SPI transfer */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return -EINVAL;
-        }
-
-        /* Read current GPIO data register */
-        buf[0] = MAX3107_GPIODATA_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) {
-                dev_err(&s->spi->dev, "SPI transfer GPIO data r failed\n");
-                return -EIO;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-
-        /* Return value */
-        return buf[0] & (0x0001 << offset);
-}
-
-/* GPIO value set function */
-static void max3107_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[2];     /* Buffer for SPI transfers */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return;
-        }
-
-        /* Read current GPIO configuration registers*/
-        buf[0] = MAX3107_GPIODATA_REG;
-        buf[1] = MAX3107_GPIOCFG_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 4)) {
-                dev_err(&s->spi->dev,
-                        "SPI transfer for GPIO data and config read failed\n");
-                return;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-        buf[1] &= MAX3107_SPI_RX_DATA_MASK;
-
-        if (!(buf[1] & (0x0001 << offset))) {
-                /* Configured as input, can't set value */
-                dev_warn(&s->spi->dev,
-                                "Trying to set value for input GPIO\n");
-                return;
-        }
-
-        /* Set value */
-        if (value)
-                buf[0] |= (0x0001 << offset);
-        else
-                buf[0] &= ~(0x0001 << offset);
-
-        /* Write new GPIO data register value */
-        buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIODATA_REG);
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, NULL, 2))
-                dev_err(&s->spi->dev, "SPI transfer GPIO data w failed\n");
-}
-
-/* GPIO chip data */
-static struct gpio_chip max3107_gpio_chip = {
-        .owner                  = THIS_MODULE,
-        .direction_input        = max3107_gpio_direction_in,
-        .direction_output       = max3107_gpio_direction_out,
-        .get                    = max3107_gpio_get,
-        .set                    = max3107_gpio_set,
-        .can_sleep              = 1,
-        .base                   = MAX3107_GPIO_BASE,
-        .ngpio                  = MAX3107_GPIO_COUNT,
-};
-
-/**
- *      max3107_aava_reset      -       reset on AAVA systems
- *      @spi: The SPI device we are probing
- *
- *      Reset the device ready for probing.
- */
-
-static int max3107_aava_reset(struct spi_device *spi)
-{
-        /* Reset the chip */
-        if (gpio_request(MAX3107_RESET_GPIO, "max3107")) {
-                pr_err("Requesting RESET GPIO failed\n");
-                return -EIO;
-        }
-        if (gpio_direction_output(MAX3107_RESET_GPIO, 0)) {
-                pr_err("Setting RESET GPIO to 0 failed\n");
-                gpio_free(MAX3107_RESET_GPIO);
-                return -EIO;
-        }
-        msleep(MAX3107_RESET_DELAY);
-        if (gpio_direction_output(MAX3107_RESET_GPIO, 1)) {
-                pr_err("Setting RESET GPIO to 1 failed\n");
-                gpio_free(MAX3107_RESET_GPIO);
-                return -EIO;
-        }
-        gpio_free(MAX3107_RESET_GPIO);
-        msleep(MAX3107_WAKEUP_DELAY);
-        return 0;
-}
-
-static int max3107_aava_configure(struct max3107_port *s)
-{
-        int retval;
-
-        /* Initialize GPIO chip data */
-        s->chip = max3107_gpio_chip;
-        s->chip.label = s->spi->modalias;
-        s->chip.dev = &s->spi->dev;
-
-        /* Add GPIO chip */
-        retval = gpiochip_add(&s->chip);
-        if (retval) {
-                dev_err(&s->spi->dev, "Adding GPIO chip failed\n");
-                return retval;
-        }
-
-        /* Temporary fix for EV2 boot problems, set modem reset to 0 */
-        max3107_gpio_direction_out(&s->chip, 3, 0);
-        return 0;
-}
-
-#if 0
-/* This will get enabled once we have the board stuff merged for this
-   specific case */
-
-static const struct baud_table brg13_ext[] = {
-        { 300,    MAX3107_BRG13_B300 },
-        { 600,    MAX3107_BRG13_B600 },
-        { 1200,   MAX3107_BRG13_B1200 },
-        { 2400,   MAX3107_BRG13_B2400 },
-        { 4800,   MAX3107_BRG13_B4800 },
-        { 9600,   MAX3107_BRG13_B9600 },
-        { 19200,  MAX3107_BRG13_B19200 },
-        { 57600,  MAX3107_BRG13_B57600 },
-        { 115200, MAX3107_BRG13_B115200 },
-        { 230400, MAX3107_BRG13_B230400 },
-        { 460800, MAX3107_BRG13_B460800 },
-        { 921600, MAX3107_BRG13_B921600 },
-        { 0, 0 }
-};
-
-static void max3107_aava_init(struct max3107_port *s)
-{
-        /*override for AAVA SC specific*/
-        if (mrst_platform_id() == MRST_PLATFORM_AAVA_SC) {
-                if (get_koski_build_id() <= KOSKI_EV2)
-                        if (s->ext_clk) {
-                                s->brg_cfg = MAX3107_BRG13_B9600;
-                                s->baud_tbl = (struct baud_table *)brg13_ext;
-                        }
-        }
-}
-#endif
-
-static int __devexit max3107_aava_remove(struct spi_device *spi)
-{
-        struct max3107_port *s = dev_get_drvdata(&spi->dev);
-
-        /* Remove GPIO chip */
-        if (gpiochip_remove(&s->chip))
-                dev_warn(&spi->dev, "Removing GPIO chip failed\n");
-
-        /* Then do the default remove */
-        return max3107_remove(spi);
-}
-
-/* Platform data */
-static struct max3107_plat aava_plat_data = {
-        .loopback               = 0,
-        .ext_clk                = 1,
-/*      .init                   = max3107_aava_init, */
-        .configure              = max3107_aava_configure,
-        .hw_suspend             = max3107_hw_susp,
-        .polled_mode            = 0,
-        .poll_time              = 0,
-};
-
-
-static int __devinit max3107_probe_aava(struct spi_device *spi)
-{
-        int err = max3107_aava_reset(spi);
-        if (err < 0)
-                return err;
-        return max3107_probe(spi, &aava_plat_data);
-}
-
-/* Spi driver data */
-static struct spi_driver max3107_driver = {
-        .driver = {
-                .name           = "aava-max3107",
-                .owner          = THIS_MODULE,
-        },
-        .probe          = max3107_probe_aava,
-        .remove         = __devexit_p(max3107_aava_remove),
-        .suspend        = max3107_suspend,
-        .resume         = max3107_resume,
-};
-
-/* Driver init function */
-static int __init max3107_init(void)
-{
-        return spi_register_driver(&max3107_driver);
-}
-
-/* Driver exit function */
-static void __exit max3107_exit(void)
-{
-        spi_unregister_driver(&max3107_driver);
-}
-
-module_init(max3107_init);
-module_exit(max3107_exit);
-
-MODULE_DESCRIPTION("MAX3107 driver");
-MODULE_AUTHOR("Aavamobile");
-MODULE_ALIAS("spi:aava-max3107");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index d192dcbb82f5..f80904145fd4 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -46,6 +46,13 @@
 
 #define DEFAULT_CLK_SPEED 48000000 /* 48Mhz*/
 
+/* SCR register bitmasks */
+#define OMAP_UART_SCR_RX_TRIG_GRANU1_MASK               (1 << 7)
+
+/* FCR register bitmasks */
+#define OMAP_UART_FCR_RX_FIFO_TRIG_SHIFT                6
+#define OMAP_UART_FCR_RX_FIFO_TRIG_MASK                 (0x3 << 6)
+
 static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS];
 
 /* Forward declaration of functions */
@@ -129,6 +136,7 @@ static void serial_omap_enable_ms(struct uart_port *port)
 static void serial_omap_stop_tx(struct uart_port *port)
 {
         struct uart_omap_port *up = (struct uart_omap_port *)port;
+        struct omap_uart_port_info *pdata = up->pdev->dev.platform_data;
 
         if (up->use_dma &&
                 up->uart_dma.tx_dma_channel != OMAP_UART_DMA_CH_FREE) {
@@ -151,6 +159,9 @@ static void serial_omap_stop_tx(struct uart_port *port)
                 serial_out(up, UART_IER, up->ier);
         }
 
+        if (!up->use_dma && pdata->set_forceidle)
+                pdata->set_forceidle(up->pdev);
+
         pm_runtime_mark_last_busy(&up->pdev->dev);
         pm_runtime_put_autosuspend(&up->pdev->dev);
 }
@@ -279,6 +290,7 @@ static inline void serial_omap_enable_ier_thri(struct uart_omap_port *up)
 static void serial_omap_start_tx(struct uart_port *port)
 {
         struct uart_omap_port *up = (struct uart_omap_port *)port;
+        struct omap_uart_port_info *pdata = up->pdev->dev.platform_data;
         struct circ_buf *xmit;
         unsigned int start;
         int ret = 0;
@@ -286,6 +298,8 @@ static void serial_omap_start_tx(struct uart_port *port)
         if (!up->use_dma) {
                 pm_runtime_get_sync(&up->pdev->dev);
                 serial_omap_enable_ier_thri(up);
+                if (pdata->set_noidle)
+                        pdata->set_noidle(up->pdev);
                 pm_runtime_mark_last_busy(&up->pdev->dev);
                 pm_runtime_put_autosuspend(&up->pdev->dev);
                 return;
@@ -726,8 +740,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
         quot = serial_omap_get_divisor(port, baud);
 
         /* calculate wakeup latency constraint */
-        up->calc_latency = (1000000 * up->port.fifosize) /
-                                (1000 * baud / 8);
+        up->calc_latency = (USEC_PER_SEC * up->port.fifosize) / (baud / 8);
         up->latency = up->calc_latency;
         schedule_work(&up->qos_work);
 
@@ -811,14 +824,21 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
         up->mcr = serial_in(up, UART_MCR);
         serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
         /* FIFO ENABLE, DMA MODE */
-        serial_out(up, UART_FCR, up->fcr);
-        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
+
+        up->scr |= OMAP_UART_SCR_RX_TRIG_GRANU1_MASK;
 
         if (up->use_dma) {
                 serial_out(up, UART_TI752_TLR, 0);
-                up->scr |= (UART_FCR_TRIGGER_4 | UART_FCR_TRIGGER_8);
+                up->scr |= UART_FCR_TRIGGER_4;
+        } else {
+                /* Set receive FIFO threshold to 1 byte */
+                up->fcr &= ~OMAP_UART_FCR_RX_FIFO_TRIG_MASK;
+                up->fcr |= (0x1 << OMAP_UART_FCR_RX_FIFO_TRIG_SHIFT);
         }
 
+        serial_out(up, UART_FCR, up->fcr);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
+
         serial_out(up, UART_OMAP_SCR, up->scr);
 
         serial_out(up, UART_EFR, up->efr);
@@ -1160,7 +1180,7 @@ static struct uart_driver serial_omap_reg = {
         .cons           = OMAP_CONSOLE,
 };
 
-#ifdef CONFIG_SUSPEND
+#ifdef CONFIG_PM_SLEEP
 static int serial_omap_suspend(struct device *dev)
 {
         struct uart_omap_port *up = dev_get_drvdata(dev);
@@ -1521,6 +1541,7 @@ static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1)
         }
 }
 
+#ifdef CONFIG_PM_RUNTIME
 static void serial_omap_restore_context(struct uart_omap_port *up)
 {
         if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
@@ -1550,7 +1571,6 @@ static void serial_omap_restore_context(struct uart_omap_port *up)
                 serial_out(up, UART_OMAP_MDR1, up->mdr1);
 }
 
-#ifdef CONFIG_PM_RUNTIME
 static int serial_omap_runtime_suspend(struct device *dev)
 {
         struct uart_omap_port *up = dev_get_drvdata(dev);
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index f96f37b5fec6..c55e5fb16fa3 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1593,7 +1593,8 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data = {
 #define S5PV210_SERIAL_DRV_DATA (kernel_ulong_t)NULL
 #endif
 
-#ifdef CONFIG_CPU_EXYNOS4210
+#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212) || \
+        defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250)
 static struct s3c24xx_serial_drv_data exynos4210_serial_drv_data = {
         .info = &(struct s3c24xx_uart_info) {
                 .name           = "Samsung Exynos4 UART",
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index c7bf31a6a7e7..13056180adf5 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2348,11 +2348,11 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
          */
         tty_dev = tty_register_device(drv->tty_driver, uport->line, uport->dev);
         if (likely(!IS_ERR(tty_dev))) {
-                device_init_wakeup(tty_dev, 1);
-                device_set_wakeup_enable(tty_dev, 0);
-        } else
+                device_set_wakeup_capable(tty_dev, 1);
+        } else {
                 printk(KERN_ERR "Cannot register tty device on line %d\n",
                        uport->line);
+        }
 
         /*
          * Ensure UPF_DEAD is not set.
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index ef9dd628ba0b..bf6e238146ae 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -227,7 +227,6 @@ int tty_port_block_til_ready(struct tty_port *port,
         int do_clocal = 0, retval;
         unsigned long flags;
         DEFINE_WAIT(wait);
-        int cd;
 
         /* block if port is in the process of being closed */
         if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
@@ -284,11 +283,14 @@ int tty_port_block_til_ready(struct tty_port *port,
                                 retval = -ERESTARTSYS;
                         break;
                 }
-                /* Probe the carrier. For devices with no carrier detect this
-                   will always return true */
-                cd = tty_port_carrier_raised(port);
+                /*
+                 * Probe the carrier. For devices with no carrier detect
+                 * tty_port_carrier_raised will always return true.
+                 * Never ask drivers if CLOCAL is set, this causes troubles
+                 * on some hardware.
+                 */
                 if (!(port->flags & ASYNC_CLOSING) &&
-                                (do_clocal || cd))
+                                (do_clocal || tty_port_carrier_raised(port)))
                         break;
                 if (signal_pending(current)) {
                         retval = -ERESTARTSYS;
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 5e096f43bcea..65447c5f91d7 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -1463,7 +1463,6 @@ compat_kdfontop_ioctl(struct compat_console_font_op __user *fontop,
         if (!perm && op->op != KD_FONT_OP_GET)
                 return -EPERM;
         op->data = compat_ptr(((struct compat_console_font_op *)op)->data);
-        op->flags |= KD_FONT_FLAG_OLD;
         i = con_font_op(vc, op);
         if (i)
                 return i;
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 1c50baff7725..d2b3cffca3f7 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -57,6 +57,8 @@ MODULE_DEVICE_TABLE (usb, wdm_ids);
 
 #define WDM_MAX                 16
 
+/* CDC-WMC r1.1 requires wMaxCommand to be "at least 256 decimal (0x100)" */
+#define WDM_DEFAULT_BUFSIZE     256
 
 static DEFINE_MUTEX(wdm_mutex);
 
@@ -88,7 +90,8 @@ struct wdm_device {
         int                     count;
         dma_addr_t              shandle;
         dma_addr_t              ihandle;
-        struct mutex            lock;
+        struct mutex            wlock;
+        struct mutex            rlock;
         wait_queue_head_t       wait;
         struct work_struct      rxwork;
         int                     werr;
@@ -323,7 +326,7 @@ static ssize_t wdm_write
         }
 
         /* concurrent writes and disconnect */
-        r = mutex_lock_interruptible(&desc->lock);
+        r = mutex_lock_interruptible(&desc->wlock);
         rv = -ERESTARTSYS;
         if (r) {
                 kfree(buf);
@@ -386,7 +389,7 @@ static ssize_t wdm_write
 out:
         usb_autopm_put_interface(desc->intf);
 outnp:
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
 outnl:
         return rv < 0 ? rv : count;
 }
@@ -399,7 +402,7 @@ static ssize_t wdm_read
         struct wdm_device *desc = file->private_data;
 
 
-        rv = mutex_lock_interruptible(&desc->lock); /*concurrent reads */
+        rv = mutex_lock_interruptible(&desc->rlock); /*concurrent reads */
         if (rv < 0)
                 return -ERESTARTSYS;
 
@@ -467,14 +470,16 @@ retry:
         for (i = 0; i < desc->length - cntr; i++)
                 desc->ubuf[i] = desc->ubuf[i + cntr];
 
+        spin_lock_irq(&desc->iuspin);
         desc->length -= cntr;
+        spin_unlock_irq(&desc->iuspin);
         /* in case we had outstanding data */
         if (!desc->length)
                 clear_bit(WDM_READ, &desc->flags);
         rv = cntr;
 
 err:
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->rlock);
         return rv;
 }
 
@@ -540,7 +545,8 @@ static int wdm_open(struct inode *inode, struct file *file)
         }
         intf->needs_remote_wakeup = 1;
 
-        mutex_lock(&desc->lock);
+        /* using write lock to protect desc->count */
+        mutex_lock(&desc->wlock);
         if (!desc->count++) {
                 desc->werr = 0;
                 desc->rerr = 0;
@@ -553,7 +559,7 @@ static int wdm_open(struct inode *inode, struct file *file)
         } else {
                 rv = 0;
         }
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
         usb_autopm_put_interface(desc->intf);
 out:
         mutex_unlock(&wdm_mutex);
@@ -565,9 +571,11 @@ static int wdm_release(struct inode *inode, struct file *file)
         struct wdm_device *desc = file->private_data;
 
         mutex_lock(&wdm_mutex);
-        mutex_lock(&desc->lock);
+
+        /* using write lock to protect desc->count */
+        mutex_lock(&desc->wlock);
         desc->count--;
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
 
         if (!desc->count) {
                 dev_dbg(&desc->intf->dev, "wdm_release: cleanup");
@@ -630,7 +638,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)
         struct usb_cdc_dmm_desc *dmhd;
         u8 *buffer = intf->altsetting->extra;
         int buflen = intf->altsetting->extralen;
-        u16 maxcom = 0;
+        u16 maxcom = WDM_DEFAULT_BUFSIZE;
 
         if (!buffer)
                 goto out;
@@ -665,7 +673,8 @@ next_desc:
         desc = kzalloc(sizeof(struct wdm_device), GFP_KERNEL);
         if (!desc)
                 goto out;
-        mutex_init(&desc->lock);
+        mutex_init(&desc->rlock);
+        mutex_init(&desc->wlock);
         spin_lock_init(&desc->iuspin);
         init_waitqueue_head(&desc->wait);
         desc->wMaxCommand = maxcom;
@@ -716,7 +725,7 @@ next_desc:
                 goto err;
 
         desc->inbuf = usb_alloc_coherent(interface_to_usbdev(intf),
-                                         desc->bMaxPacketSize0,
+                                         desc->wMaxCommand,
                                          GFP_KERNEL,
                                          &desc->response->transfer_dma);
         if (!desc->inbuf)
@@ -779,11 +788,13 @@ static void wdm_disconnect(struct usb_interface *intf)
         /* to terminate pending flushes */
         clear_bit(WDM_IN_USE, &desc->flags);
         spin_unlock_irqrestore(&desc->iuspin, flags);
-        mutex_lock(&desc->lock);
+        wake_up_all(&desc->wait);
+        mutex_lock(&desc->rlock);
+        mutex_lock(&desc->wlock);
         kill_urbs(desc);
         cancel_work_sync(&desc->rxwork);
-        mutex_unlock(&desc->lock);
-        wake_up_all(&desc->wait);
+        mutex_unlock(&desc->wlock);
+        mutex_unlock(&desc->rlock);
         if (!desc->count)
                 cleanup(desc);
         mutex_unlock(&wdm_mutex);
@@ -798,8 +809,10 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
         dev_dbg(&desc->intf->dev, "wdm%d_suspend\n", intf->minor);
 
         /* if this is an autosuspend the caller does the locking */
-        if (!PMSG_IS_AUTO(message))
-                mutex_lock(&desc->lock);
+        if (!PMSG_IS_AUTO(message)) {
+                mutex_lock(&desc->rlock);
+                mutex_lock(&desc->wlock);
+        }
         spin_lock_irq(&desc->iuspin);
 
         if (PMSG_IS_AUTO(message) &&
@@ -815,8 +828,10 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
                 kill_urbs(desc);
                 cancel_work_sync(&desc->rxwork);
         }
-        if (!PMSG_IS_AUTO(message))
-                mutex_unlock(&desc->lock);
+        if (!PMSG_IS_AUTO(message)) {
+                mutex_unlock(&desc->wlock);
+                mutex_unlock(&desc->rlock);
+        }
 
         return rv;
 }
@@ -854,7 +869,8 @@ static int wdm_pre_reset(struct usb_interface *intf)
 {
         struct wdm_device *desc = usb_get_intfdata(intf);
 
-        mutex_lock(&desc->lock);
+        mutex_lock(&desc->rlock);
+        mutex_lock(&desc->wlock);
         kill_urbs(desc);
 
         /*
@@ -876,7 +892,8 @@ static int wdm_post_reset(struct usb_interface *intf)
         int rv;
 
         rv = recover_from_urb_loss(desc);
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
+        mutex_unlock(&desc->rlock);
         return 0;
 }
 
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index d136b8f4c8a7..81e2c0d9c17d 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -187,7 +187,10 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 return -ENODEV;
         dev->current_state = PCI_D0;
 
-        if (!dev->irq) {
+        /* The xHCI driver supports MSI and MSI-X,
+         * so don't fail if the BIOS doesn't provide a legacy IRQ.
+         */
+        if (!dev->irq && (driver->flags & HCD_MASK) != HCD_USB3) {
                 dev_err(&dev->dev,
                         "Found HC with no IRQ.  Check BIOS/PCI %s setup!\n",
                         pci_name(dev));
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index eb19cba34ac9..e1282328fc27 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2447,8 +2447,10 @@ int usb_add_hcd(struct usb_hcd *hcd,
                         && device_can_wakeup(&hcd->self.root_hub->dev))
                 dev_dbg(hcd->self.controller, "supports USB remote wakeup\n");
 
-        /* enable irqs just before we start the controller */
-        if (usb_hcd_is_primary_hcd(hcd)) {
+        /* enable irqs just before we start the controller,
+         * if the BIOS provides legacy PCI irqs.
+         */
+        if (usb_hcd_is_primary_hcd(hcd) && irqnum) {
                 retval = usb_hcd_request_irqs(hcd, irqnum, irqflags);
                 if (retval)
                         goto err_request_irq;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index a0613d8f9be7..265c2f675d04 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -705,10 +705,26 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
         if (type == HUB_INIT3)
                 goto init3;
 
-        /* After a resume, port power should still be on.
+        /* The superspeed hub except for root hub has to use Hub Depth
+         * value as an offset into the route string to locate the bits
+         * it uses to determine the downstream port number. So hub driver
+         * should send a set hub depth request to superspeed hub after
+         * the superspeed hub is set configuration in initialization or
+         * reset procedure.
+         *
+         * After a resume, port power should still be on.
          * For any other type of activation, turn it on.
          */
         if (type != HUB_RESUME) {
+                if (hdev->parent && hub_is_superspeed(hdev)) {
+                        ret = usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
+                                        HUB_SET_DEPTH, USB_RT_HUB,
+                                        hdev->level - 1, 0, NULL, 0,
+                                        USB_CTRL_SET_TIMEOUT);
+                        if (ret < 0)
+                                dev_err(hub->intfdev,
+                                                "set hub depth failed\n");
+                }
 
                 /* Speed up system boot by using a delayed_work for the
                  * hub's initial power-up delays.  This is pretty awkward
@@ -987,18 +1003,6 @@ static int hub_configure(struct usb_hub *hub,
                 goto fail;
         }
 
-        if (hub_is_superspeed(hdev) && (hdev->parent != NULL)) {
-                ret = usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-                                HUB_SET_DEPTH, USB_RT_HUB,
-                                hdev->level - 1, 0, NULL, 0,
-                                USB_CTRL_SET_TIMEOUT);
-
-                if (ret < 0) {
-                        message = "can't set hub depth";
-                        goto fail;
-                }
-        }
-
         /* Request the entire hub descriptor.
          * hub->descriptor can handle USB_MAXCHILDREN ports,
          * but the hub can/will return fewer bytes here.
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 2f51de57593a..c8df1dd967ef 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -126,7 +126,6 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
                 struct dwc3_request *req)
 {
         struct dwc3             *dwc = dep->dwc;
-        u32                     type;
         int                     ret = 0;
 
         req->request.actual     = 0;
@@ -149,20 +148,14 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
 
                 direction = !!(dep->flags & DWC3_EP0_DIR_IN);
 
-                if (dwc->ep0state == EP0_STATUS_PHASE) {
-                        type = dwc->three_stage_setup
-                                ? DWC3_TRBCTL_CONTROL_STATUS3
-                                : DWC3_TRBCTL_CONTROL_STATUS2;
-                } else if (dwc->ep0state == EP0_DATA_PHASE) {
-                        type = DWC3_TRBCTL_CONTROL_DATA;
-                } else {
-                        /* should never happen */
-                        WARN_ON(1);
+                if (dwc->ep0state != EP0_DATA_PHASE) {
+                        dev_WARN(dwc->dev, "Unexpected pending request\n");
                         return 0;
                 }
 
                 ret = dwc3_ep0_start_trans(dwc, direction,
-                                req->request.dma, req->request.length, type);
+                                req->request.dma, req->request.length,
+                                DWC3_TRBCTL_CONTROL_DATA);
                 dep->flags &= ~(DWC3_EP_PENDING_REQUEST |
                                 DWC3_EP0_DIR_IN);
         } else if (dwc->delayed_status) {
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index a696bde53222..064b6e2cd411 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -101,7 +101,7 @@ void dwc3_unmap_buffer_from_dma(struct dwc3_request *req)
         if (req->request.num_mapped_sgs) {
                 req->request.dma = DMA_ADDR_INVALID;
                 dma_unmap_sg(dwc->dev, req->request.sg,
-                                req->request.num_sgs,
+                                req->request.num_mapped_sgs,
                                 req->direction ? DMA_TO_DEVICE
                                 : DMA_FROM_DEVICE);
 
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index a95de6a4a134..baaebf2830fc 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -175,13 +175,12 @@ ep_found:
         _ep->comp_desc = comp_desc;
         if (g->speed == USB_SPEED_SUPER) {
                 switch (usb_endpoint_type(_ep->desc)) {
-                case USB_ENDPOINT_XFER_BULK:
-                case USB_ENDPOINT_XFER_INT:
-                        _ep->maxburst = comp_desc->bMaxBurst;
-                        break;
                 case USB_ENDPOINT_XFER_ISOC:
                         /* mult: bits 1:0 of bmAttributes */
                         _ep->mult = comp_desc->bmAttributes & 0x3;
+                case USB_ENDPOINT_XFER_BULK:
+                case USB_ENDPOINT_XFER_INT:
+                        _ep->maxburst = comp_desc->bMaxBurst;
                         break;
                 default:
                         /* Do nothing for control endpoints */
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 753aa0683ac1..e0e6375ef5dd 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -126,7 +126,7 @@ ep_matches (
          * descriptor and see if the EP matches it
          */
         if (usb_endpoint_xfer_bulk(desc)) {
-                if (ep_comp) {
+                if (ep_comp && gadget->max_speed >= USB_SPEED_SUPER) {
                         num_req_streams = ep_comp->bmAttributes & 0x1f;
                         if (num_req_streams > ep->max_streams)
                                 return 0;
diff --git a/drivers/usb/gadget/f_loopback.c b/drivers/usb/gadget/f_loopback.c
index 6d87f288df4e..2c0cd824c667 100644
--- a/drivers/usb/gadget/f_loopback.c
+++ b/drivers/usb/gadget/f_loopback.c
@@ -418,7 +418,7 @@ int __init loopback_add(struct usb_composite_dev *cdev, bool autoresume)
 
         /* support autoresume for remote wakeup testing */
         if (autoresume)
-                sourcesink_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+                loopback_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
 
         /* support OTG systems */
         if (gadget_is_otg(cdev->gadget)) {
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 6353eca1e852..ee8ceec01560 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -3123,15 +3123,15 @@ fsg_add(struct usb_composite_dev *cdev, struct usb_configuration *c,
 
 struct fsg_module_parameters {
         char            *file[FSG_MAX_LUNS];
-        int             ro[FSG_MAX_LUNS];
-        int             removable[FSG_MAX_LUNS];
-        int             cdrom[FSG_MAX_LUNS];
-        int             nofua[FSG_MAX_LUNS];
+        bool            ro[FSG_MAX_LUNS];
+        bool            removable[FSG_MAX_LUNS];
+        bool            cdrom[FSG_MAX_LUNS];
+        bool            nofua[FSG_MAX_LUNS];
 
         unsigned int    file_count, ro_count, removable_count, cdrom_count;
         unsigned int    nofua_count;
         unsigned int    luns;   /* nluns */
-        int             stall;  /* can_stall */
+        bool            stall;  /* can_stall */
 };
 
 #define _FSG_MODULE_PARAM_ARRAY(prefix, params, name, type, desc)       \
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index d7ea6c076ce9..b04712f19f1e 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -1430,7 +1430,7 @@ static void setup_received_irq(struct fsl_udc *udc,
                         int pipe = get_pipe_by_windex(wIndex);
                         struct fsl_ep *ep;
 
-                        if (wValue != 0 || wLength != 0 || pipe > udc->max_ep)
+                        if (wValue != 0 || wLength != 0 || pipe >= udc->max_ep)
                                 break;
                         ep = get_ep_by_pipe(udc, pipe);
 
@@ -1673,7 +1673,7 @@ static void dtd_complete_irq(struct fsl_udc *udc)
         if (!bit_pos)
                 return;
 
-        for (i = 0; i < udc->max_ep * 2; i++) {
+        for (i = 0; i < udc->max_ep; i++) {
                 ep_num = i >> 1;
                 direction = i % 2;
 
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index fa0fcc11263f..e2293c1588ee 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -11,11 +11,6 @@
 /* #undef       DEBUG */
 /* #undef       VERBOSE_DEBUG */
 
-#if defined(CONFIG_USB_LANGWELL_OTG)
-#define OTG_TRANSCEIVER
-#endif
-
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
@@ -1522,8 +1517,7 @@ static void langwell_udc_stop(struct langwell_udc *dev)
 
 
 /* stop all USB activities */
-static void stop_activity(struct langwell_udc *dev,
-                struct usb_gadget_driver *driver)
+static void stop_activity(struct langwell_udc *dev)
 {
         struct langwell_ep      *ep;
         dev_dbg(&dev->pdev->dev, "---> %s()\n", __func__);
@@ -1535,9 +1529,9 @@ static void stop_activity(struct langwell_udc *dev,
         }
 
         /* report disconnect; the driver is already quiesced */
-        if (driver) {
+        if (dev->driver) {
                 spin_unlock(&dev->lock);
-                driver->disconnect(&dev->gadget);
+                dev->driver->disconnect(&dev->gadget);
                 spin_lock(&dev->lock);
         }
 
@@ -1925,11 +1919,10 @@ static int langwell_stop(struct usb_gadget *g,
 
         /* stop all usb activities */
         dev->gadget.speed = USB_SPEED_UNKNOWN;
-        stop_activity(dev, driver);
-        spin_unlock_irqrestore(&dev->lock, flags);
-
         dev->gadget.dev.driver = NULL;
         dev->driver = NULL;
+        stop_activity(dev);
+        spin_unlock_irqrestore(&dev->lock, flags);
 
         device_remove_file(&dev->pdev->dev, &dev_attr_function);
 
@@ -2315,13 +2308,9 @@ static void handle_setup_packet(struct langwell_udc *dev,
 
                         if (!gadget_is_otg(&dev->gadget))
                                 break;
-                        else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE) {
+                        else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE)
                                 dev->gadget.b_hnp_enable = 1;
-#ifdef  OTG_TRANSCEIVER
-                                if (!dev->lotg->otg.default_a)
-                                        dev->lotg->hsm.b_hnp_enable = 1;
-#endif
-                        } else if (setup->bRequest == USB_DEVICE_A_HNP_SUPPORT)
+                        else if (setup->bRequest == USB_DEVICE_A_HNP_SUPPORT)
                                 dev->gadget.a_hnp_support = 1;
                         else if (setup->bRequest ==
                                         USB_DEVICE_A_ALT_HNP_SUPPORT)
@@ -2733,7 +2722,7 @@ static void handle_usb_reset(struct langwell_udc *dev)
                 dev->bus_reset = 1;
 
                 /* reset all the queues, stop all USB activities */
-                stop_activity(dev, dev->driver);
+                stop_activity(dev);
                 dev->usb_state = USB_STATE_DEFAULT;
         } else {
                 dev_vdbg(&dev->pdev->dev, "device controller reset\n");
@@ -2741,7 +2730,7 @@ static void handle_usb_reset(struct langwell_udc *dev)
                 langwell_udc_reset(dev);
 
                 /* reset all the queues, stop all USB activities */
-                stop_activity(dev, dev->driver);
+                stop_activity(dev);
 
                 /* reset ep0 dQH and endptctrl */
                 ep0_reset(dev);
@@ -2752,12 +2741,6 @@ static void handle_usb_reset(struct langwell_udc *dev)
                 dev->usb_state = USB_STATE_ATTACHED;
         }
 
-#ifdef  OTG_TRANSCEIVER
-        /* refer to USB OTG 6.6.2.3 b_hnp_en is cleared */
-        if (!dev->lotg->otg.default_a)
-                dev->lotg->hsm.b_hnp_enable = 0;
-#endif
-
         dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__);
 }
 
@@ -2770,29 +2753,6 @@ static void handle_bus_suspend(struct langwell_udc *dev)
         dev->resume_state = dev->usb_state;
         dev->usb_state = USB_STATE_SUSPENDED;
 
-#ifdef  OTG_TRANSCEIVER
-        if (dev->lotg->otg.default_a) {
-                if (dev->lotg->hsm.b_bus_suspend_vld == 1) {
-                        dev->lotg->hsm.b_bus_suspend = 1;
-                        /* notify transceiver the state changes */
-                        if (spin_trylock(&dev->lotg->wq_lock)) {
-                                langwell_update_transceiver();
-                                spin_unlock(&dev->lotg->wq_lock);
-                        }
-                }
-                dev->lotg->hsm.b_bus_suspend_vld++;
-        } else {
-                if (!dev->lotg->hsm.a_bus_suspend) {
-                        dev->lotg->hsm.a_bus_suspend = 1;
-                        /* notify transceiver the state changes */
-                        if (spin_trylock(&dev->lotg->wq_lock)) {
-                                langwell_update_transceiver();
-                                spin_unlock(&dev->lotg->wq_lock);
-                        }
-                }
-        }
-#endif
-
         /* report suspend to the driver */
         if (dev->driver) {
                 if (dev->driver->suspend) {
@@ -2823,11 +2783,6 @@ static void handle_bus_resume(struct langwell_udc *dev)
         if (dev->pdev->device != 0x0829)
                 langwell_phy_low_power(dev, 0);
 
-#ifdef  OTG_TRANSCEIVER
-        if (dev->lotg->otg.default_a == 0)
-                dev->lotg->hsm.a_bus_suspend = 0;
-#endif
-
         /* report resume to the driver */
         if (dev->driver) {
                 if (dev->driver->resume) {
@@ -3020,7 +2975,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
 
         dev->done = &done;
 
-#ifndef OTG_TRANSCEIVER
         /* free dTD dma_pool and dQH */
         if (dev->dtd_pool)
                 dma_pool_destroy(dev->dtd_pool);
@@ -3032,7 +2986,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
         /* release SRAM caching */
         if (dev->has_sram && dev->got_sram)
                 sram_deinit(dev);
-#endif
 
         if (dev->status_req) {
                 kfree(dev->status_req->req.buf);
@@ -3045,7 +2998,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
         if (dev->got_irq)
                 free_irq(pdev->irq, dev);
 
-#ifndef OTG_TRANSCEIVER
         if (dev->cap_regs)
                 iounmap(dev->cap_regs);
 
@@ -3055,13 +3007,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
 
         if (dev->enabled)
                 pci_disable_device(pdev);
-#else
-        if (dev->transceiver) {
-                otg_put_transceiver(dev->transceiver);
-                dev->transceiver = NULL;
-                dev->lotg = NULL;
-        }
-#endif
 
         dev->cap_regs = NULL;
 
@@ -3072,9 +3017,7 @@ static void langwell_udc_remove(struct pci_dev *pdev)
         device_remove_file(&pdev->dev, &dev_attr_langwell_udc);
         device_remove_file(&pdev->dev, &dev_attr_remote_wakeup);
 
-#ifndef OTG_TRANSCEIVER
         pci_set_drvdata(pdev, NULL);
-#endif
 
         /* free dev, wait for the release() finished */
         wait_for_completion(&done);
@@ -3089,9 +3032,7 @@ static int langwell_udc_probe(struct pci_dev *pdev,
                 const struct pci_device_id *id)
 {
         struct langwell_udc     *dev;
-#ifndef OTG_TRANSCEIVER
         unsigned long           resource, len;
-#endif
         void                    __iomem *base = NULL;
         size_t                  size;
         int                     retval;
@@ -3109,16 +3050,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->pdev = pdev;
         dev_dbg(&dev->pdev->dev, "---> %s()\n", __func__);
 
-#ifdef  OTG_TRANSCEIVER
-        /* PCI device is already enabled by otg_transceiver driver */
-        dev->enabled = 1;
-
-        /* mem region and register base */
-        dev->region = 1;
-        dev->transceiver = otg_get_transceiver();
-        dev->lotg = otg_to_langwell(dev->transceiver);
-        base = dev->lotg->regs;
-#else
         pci_set_drvdata(pdev, dev);
 
         /* now all the pci goodies ... */
@@ -3139,7 +3070,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->region = 1;
 
         base = ioremap_nocache(resource, len);
-#endif
         if (base == NULL) {
                 dev_err(&dev->pdev->dev, "can't map memory\n");
                 retval = -EFAULT;
@@ -3163,7 +3093,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->got_sram = 0;
         dev_vdbg(&dev->pdev->dev, "dev->has_sram: %d\n", dev->has_sram);
 
-#ifndef OTG_TRANSCEIVER
         /* enable SRAM caching if detected */
         if (dev->has_sram && !dev->got_sram)
                 sram_init(dev);
@@ -3182,7 +3111,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
                 goto error;
         }
         dev->got_irq = 1;
-#endif
 
         /* set stopped bit */
         dev->stopped = 1;
@@ -3257,10 +3185,8 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->remote_wakeup = 0;
         dev->dev_status = 1 << USB_DEVICE_SELF_POWERED;
 
-#ifndef OTG_TRANSCEIVER
         /* reset device controller */
         langwell_udc_reset(dev);
-#endif
 
         /* initialize gadget structure */
         dev->gadget.ops = &langwell_ops;        /* usb_gadget_ops */
@@ -3268,9 +3194,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         INIT_LIST_HEAD(&dev->gadget.ep_list);   /* ep_list */
         dev->gadget.speed = USB_SPEED_UNKNOWN;  /* speed */
         dev->gadget.max_speed = USB_SPEED_HIGH; /* support dual speed */
-#ifdef  OTG_TRANSCEIVER
-        dev->gadget.is_otg = 1;                 /* support otg mode */
-#endif
 
         /* the "gadget" abstracts/virtualizes the controller */
         dev_set_name(&dev->gadget.dev, "gadget");
@@ -3282,10 +3205,8 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         /* controller endpoints reinit */
         eps_reinit(dev);
 
-#ifndef OTG_TRANSCEIVER
         /* reset ep0 dQH and endptctrl */
         ep0_reset(dev);
-#endif
 
         /* create dTD dma_pool resource */
         dev->dtd_pool = dma_pool_create("langwell_dtd",
@@ -3367,7 +3288,7 @@ static int langwell_udc_suspend(struct pci_dev *pdev, pm_message_t state)
 
         spin_lock_irq(&dev->lock);
         /* stop all usb activities */
-        stop_activity(dev, dev->driver);
+        stop_activity(dev);
         spin_unlock_irq(&dev->lock);
 
         /* free dTD dma_pool and dQH */
@@ -3525,22 +3446,14 @@ static struct pci_driver langwell_pci_driver = {
 
 static int __init init(void)
 {
-#ifdef  OTG_TRANSCEIVER
-        return langwell_register_peripheral(&langwell_pci_driver);
-#else
         return pci_register_driver(&langwell_pci_driver);
-#endif
 }
 module_init(init);
 
 
 static void __exit cleanup(void)
 {
-#ifdef  OTG_TRANSCEIVER
-        return langwell_unregister_peripheral(&langwell_pci_driver);
-#else
         pci_unregister_driver(&langwell_pci_driver);
-#endif
 }
 module_exit(cleanup);
 
diff --git a/drivers/usb/gadget/langwell_udc.h b/drivers/usb/gadget/langwell_udc.h
index ef79e242b7b0..d6e78accaffe 100644
--- a/drivers/usb/gadget/langwell_udc.h
+++ b/drivers/usb/gadget/langwell_udc.h
@@ -8,7 +8,6 @@
  */
 
 #include <linux/usb/langwell_udc.h>
-#include <linux/usb/langwell_otg.h>
 
 /*-------------------------------------------------------------------------*/
 
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index c7f291a331df..85ea14e2545e 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -598,16 +598,16 @@ static __maybe_unused struct usb_ss_cap_descriptor fsg_ss_cap_desc = {
                 | USB_5GBPS_OPERATION),
         .bFunctionalitySupport = USB_LOW_SPEED_OPERATION,
         .bU1devExitLat =        USB_DEFAULT_U1_DEV_EXIT_LAT,
-        .bU2DevExitLat =        USB_DEFAULT_U2_DEV_EXIT_LAT,
+        .bU2DevExitLat =        cpu_to_le16(USB_DEFAULT_U2_DEV_EXIT_LAT),
 };
 
 static __maybe_unused struct usb_bos_descriptor fsg_bos_desc = {
         .bLength =              USB_DT_BOS_SIZE,
         .bDescriptorType =      USB_DT_BOS,
 
-        .wTotalLength =         USB_DT_BOS_SIZE
+        .wTotalLength =         cpu_to_le16(USB_DT_BOS_SIZE
                                 + USB_DT_USB_EXT_CAP_SIZE
-                                + USB_DT_USB_SS_CAP_SIZE,
+                                + USB_DT_USB_SS_CAP_SIZE),
 
         .bNumDeviceCaps =       2,
 };
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 91413cac97be..353cdd488b93 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -130,7 +130,7 @@ config USB_FSL_MPH_DR_OF
         tristate
 
 config USB_EHCI_FSL
-        bool "Support for Freescale on-chip EHCI USB controller"
+        bool "Support for Freescale PPC on-chip EHCI USB controller"
         depends on USB_EHCI_HCD && FSL_SOC
         select USB_EHCI_ROOT_HUB_TT
         select USB_FSL_MPH_DR_OF if OF
@@ -138,7 +138,7 @@ config USB_EHCI_FSL
           Variation of ARC USB block used in some Freescale chips.
 
 config USB_EHCI_MXC
-        bool "Support for Freescale on-chip EHCI USB controller"
+        bool "Support for Freescale i.MX on-chip EHCI USB controller"
         depends on USB_EHCI_HCD && ARCH_MXC
         select USB_EHCI_ROOT_HUB_TT
         ---help---
@@ -546,7 +546,7 @@ config USB_RENESAS_USBHS_HCD
 config USB_WHCI_HCD
         tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)"
         depends on EXPERIMENTAL
-        depends on PCI && USB
+        depends on PCI && USB && UWB
         select USB_WUSB
         select UWB_WHCI
         help
@@ -559,7 +559,7 @@ config USB_WHCI_HCD
 config USB_HWA_HCD
         tristate "Host Wire Adapter (HWA) driver (EXPERIMENTAL)"
         depends on EXPERIMENTAL
-        depends on USB
+        depends on USB && UWB
         select USB_WUSB
         select UWB_HWA
         help
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index e90344a17631..c26a82e83f6e 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -125,7 +125,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
          */
         if (pdata->init && pdata->init(pdev)) {
                 retval = -ENODEV;
-                goto err3;
+                goto err4;
         }
 
         /* Enable USB controller, 83xx or 8536 */
@@ -239,7 +239,7 @@ static void ehci_fsl_setup_phy(struct ehci_hcd *ehci,
         ehci_writel(ehci, portsc, &ehci->regs->port_status[port_offset]);
 }
 
-static void ehci_fsl_usb_setup(struct ehci_hcd *ehci)
+static int ehci_fsl_usb_setup(struct ehci_hcd *ehci)
 {
         struct usb_hcd *hcd = ehci_to_hcd(ehci);
         struct fsl_usb2_platform_data *pdata;
@@ -299,12 +299,19 @@ static void ehci_fsl_usb_setup(struct ehci_hcd *ehci)
 #endif
                 out_be32(non_ehci + FSL_SOC_USB_SICTRL, 0x00000001);
         }
+
+        if (!(in_be32(non_ehci + FSL_SOC_USB_CTRL) & CTRL_PHY_CLK_VALID)) {
+                printk(KERN_WARNING "fsl-ehci: USB PHY clock invalid\n");
+                return -ENODEV;
+        }
+        return 0;
 }
 
 /* called after powerup, by probe or system-pm "wakeup" */
 static int ehci_fsl_reinit(struct ehci_hcd *ehci)
 {
-        ehci_fsl_usb_setup(ehci);
+        if (ehci_fsl_usb_setup(ehci))
+                return -ENODEV;
         ehci_port_power(ehci, 0);
 
         return 0;
diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h
index 491806221165..bdf43e2adc51 100644
--- a/drivers/usb/host/ehci-fsl.h
+++ b/drivers/usb/host/ehci-fsl.h
@@ -45,5 +45,6 @@
 #define FSL_SOC_USB_PRICTRL     0x40c   /* NOTE: big-endian */
 #define FSL_SOC_USB_SICTRL      0x410   /* NOTE: big-endian */
 #define FSL_SOC_USB_CTRL        0x500   /* NOTE: big-endian */
+#define CTRL_PHY_CLK_VALID      (1 << 17)
 #define SNOOP_SIZE_2GB          0x1e
 #endif                          /* _EHCI_FSL_H */
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index f4b627d343ac..01bb7241d6ef 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -276,6 +276,9 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
 
         /* Serial Bus Release Number is at PCI 0x60 offset */
         pci_read_config_byte(pdev, 0x60, &ehci->sbrn);
+        if (pdev->vendor == PCI_VENDOR_ID_STMICRO
+            && pdev->device == PCI_DEVICE_ID_STMICRO_USB_HOST)
+                ehci->sbrn = 0x20; /* ConneXT has no sbrn register */
 
         /* Keep this around for a while just in case some EHCI
          * implementation uses legacy PCI PM support.  This test
@@ -526,6 +529,9 @@ static const struct pci_device_id pci_ids [] = { {
         /* handle any USB 2.0 EHCI controller */
         PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
         .driver_data =  (unsigned long) &ehci_pci_hc_driver,
+        }, {
+        PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_HOST),
+        .driver_data = (unsigned long) &ehci_pci_hc_driver,
         },
         { /* end: all zeroes */ }
 };
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 5df0b0e3392b..77afabc77f9b 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -139,8 +139,23 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
         }
 
         iclk = clk_get(&pdev->dev, "ohci_clk");
+        if (IS_ERR(iclk)) {
+                dev_err(&pdev->dev, "failed to get ohci_clk\n");
+                retval = PTR_ERR(iclk);
+                goto err3;
+        }
         fclk = clk_get(&pdev->dev, "uhpck");
+        if (IS_ERR(fclk)) {
+                dev_err(&pdev->dev, "failed to get uhpck\n");
+                retval = PTR_ERR(fclk);
+                goto err4;
+        }
         hclk = clk_get(&pdev->dev, "hclk");
+        if (IS_ERR(hclk)) {
+                dev_err(&pdev->dev, "failed to get hclk\n");
+                retval = PTR_ERR(hclk);
+                goto err5;
+        }
 
         at91_start_hc(pdev);
         ohci_hcd_init(hcd_to_ohci(hcd));
@@ -153,9 +168,12 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
         at91_stop_hc(pdev);
 
         clk_put(hclk);
+ err5:
         clk_put(fclk);
+ err4:
         clk_put(iclk);
 
+ err3:
         iounmap(hcd->regs);
 
  err2:
@@ -226,7 +244,8 @@ static void ohci_at91_usb_set_power(struct at91_usbh_data *pdata, int port, int
         if (!gpio_is_valid(pdata->vbus_pin[port]))
                 return;
 
-        gpio_set_value(pdata->vbus_pin[port], !pdata->vbus_pin_inverted ^ enable);
+        gpio_set_value(pdata->vbus_pin[port],
+                       !pdata->vbus_pin_active_low[port] ^ enable);
 }
 
 static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
@@ -237,7 +256,8 @@ static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
         if (!gpio_is_valid(pdata->vbus_pin[port]))
                 return -EINVAL;
 
-        return gpio_get_value(pdata->vbus_pin[port]) ^ !pdata->vbus_pin_inverted;
+        return gpio_get_value(pdata->vbus_pin[port]) ^
+                !pdata->vbus_pin_active_low[port];
 }
 
 /*
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index 5179fcd73d8a..e4bcb62b930a 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -82,6 +82,14 @@ urb_print(struct urb * urb, char * str, int small, int status)
                 ohci_dbg(ohci,format, ## arg ); \
         } while (0);
 
+/* Version for use where "next" is the address of a local variable */
+#define ohci_dbg_nosw(ohci, next, size, format, arg...) \
+        do { \
+                unsigned s_len; \
+                s_len = scnprintf(*next, *size, format, ## arg); \
+                *size -= s_len; *next += s_len; \
+        } while (0);
+
 
 static void ohci_dump_intr_mask (
         struct ohci_hcd *ohci,
@@ -653,7 +661,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
 
         /* dump driver info, then registers in spec order */
 
-        ohci_dbg_sw (ohci, &next, &size,
+        ohci_dbg_nosw(ohci, &next, &size,
                 "bus %s, device %s\n"
                 "%s\n"
                 "%s\n",
@@ -672,7 +680,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
 
         /* hcca */
         if (ohci->hcca)
-                ohci_dbg_sw (ohci, &next, &size,
+                ohci_dbg_nosw(ohci, &next, &size,
                         "hcca frame 0x%04x\n", ohci_frame_no(ohci));
 
         /* other registers mostly affect frame timings */
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 6109810cc2d3..1843bb68ac7c 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -397,6 +397,10 @@ static const struct pci_device_id pci_ids [] = { {
         /* handle any USB OHCI controller */
         PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0),
         .driver_data =  (unsigned long) &ohci_pci_hc_driver,
+        }, {
+        /* The device in the ConneXT I/O hub has no class reg */
+        PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_OHCI),
+        .driver_data =  (unsigned long) &ohci_pci_hc_driver,
         }, { /* end: all zeroes */ }
 };
 MODULE_DEVICE_TABLE (pci, pci_ids);
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index caf87428ca43..7732d69e49e0 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -867,6 +867,22 @@ hc_init:
 
 static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
 {
+        /* Skip Netlogic mips SoC's internal PCI USB controller.
+         * This device does not need/support EHCI/OHCI handoff
+         */
+        if (pdev->vendor == 0x184e)     /* vendor Netlogic */
+                return;
+        if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI &&
+                        pdev->class != PCI_CLASS_SERIAL_USB_OHCI &&
+                        pdev->class != PCI_CLASS_SERIAL_USB_EHCI &&
+                        pdev->class != PCI_CLASS_SERIAL_USB_XHCI)
+                return;
+
+        if (pci_enable_device(pdev) < 0) {
+                dev_warn(&pdev->dev, "Can't enable PCI device, "
+                                "BIOS handoff failed.\n");
+                return;
+        }
         if (pdev->class == PCI_CLASS_SERIAL_USB_UHCI)
                 quirk_usb_handoff_uhci(pdev);
         else if (pdev->class == PCI_CLASS_SERIAL_USB_OHCI)
@@ -875,5 +891,6 @@ static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
                 quirk_usb_disable_ehci(pdev);
         else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI)
                 quirk_usb_handoff_xhci(pdev);
+        pci_disable_device(pdev);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 35e257f79c7b..557b6f32db86 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -93,7 +93,7 @@ static void xhci_usb2_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
          */
         memset(port_removable, 0, sizeof(port_removable));
         for (i = 0; i < ports; i++) {
-                portsc = xhci_readl(xhci, xhci->usb3_ports[i]);
+                portsc = xhci_readl(xhci, xhci->usb2_ports[i]);
                 /* If a device is removable, PORTSC reports a 0, same as in the
                  * hub descriptor DeviceRemovable bits.
                  */
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 36cbe2226a44..383fc857491c 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1126,26 +1126,42 @@ static unsigned int xhci_parse_exponent_interval(struct usb_device *udev,
 }
 
 /*
- * Convert bInterval expressed in frames (in 1-255 range) to exponent of
+ * Convert bInterval expressed in microframes (in 1-255 range) to exponent of
  * microframes, rounded down to nearest power of 2.
  */
-static unsigned int xhci_parse_frame_interval(struct usb_device *udev,
-                struct usb_host_endpoint *ep)
+static unsigned int xhci_microframes_to_exponent(struct usb_device *udev,
+                struct usb_host_endpoint *ep, unsigned int desc_interval,
+                unsigned int min_exponent, unsigned int max_exponent)
 {
         unsigned int interval;
 
-        interval = fls(8 * ep->desc.bInterval) - 1;
-        interval = clamp_val(interval, 3, 10);
-        if ((1 << interval) != 8 * ep->desc.bInterval)
+        interval = fls(desc_interval) - 1;
+        interval = clamp_val(interval, min_exponent, max_exponent);
+        if ((1 << interval) != desc_interval)
                 dev_warn(&udev->dev,
                          "ep %#x - rounding interval to %d microframes, ep desc says %d microframes\n",
                          ep->desc.bEndpointAddress,
                          1 << interval,
-                         8 * ep->desc.bInterval);
+                         desc_interval);
 
         return interval;
 }
 
+static unsigned int xhci_parse_microframe_interval(struct usb_device *udev,
+                struct usb_host_endpoint *ep)
+{
+        return xhci_microframes_to_exponent(udev, ep,
+                        ep->desc.bInterval, 0, 15);
+}
+
+
+static unsigned int xhci_parse_frame_interval(struct usb_device *udev,
+                struct usb_host_endpoint *ep)
+{
+        return xhci_microframes_to_exponent(udev, ep,
+                        ep->desc.bInterval * 8, 3, 10);
+}
+
 /* Return the polling or NAK interval.
  *
  * The polling interval is expressed in "microframes".  If xHCI's Interval field
@@ -1164,7 +1180,7 @@ static unsigned int xhci_get_endpoint_interval(struct usb_device *udev,
                 /* Max NAK rate */
                 if (usb_endpoint_xfer_control(&ep->desc) ||
                     usb_endpoint_xfer_bulk(&ep->desc)) {
-                        interval = ep->desc.bInterval;
+                        interval = xhci_parse_microframe_interval(udev, ep);
                         break;
                 }
                 /* Fall through - SS and HS isoc/int have same decoding */
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index b90e1386418b..b62037bff688 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1204,6 +1204,7 @@ static void handle_vendor_event(struct xhci_hcd *xhci,
  *
  * Returns a zero-based port number, which is suitable for indexing into each of
  * the split roothubs' port arrays and bus state arrays.
+ * Add one to it in order to call xhci_find_slot_id_by_port.
  */
 static unsigned int find_faked_portnum_from_hw_portnum(struct usb_hcd *hcd,
                 struct xhci_hcd *xhci, u32 port_id)
@@ -1324,7 +1325,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
                         xhci_set_link_state(xhci, port_array, faked_port_index,
                                                 XDEV_U0);
                         slot_id = xhci_find_slot_id_by_port(hcd, xhci,
-                                        faked_port_index);
+                                        faked_port_index + 1);
                         if (!slot_id) {
                                 xhci_dbg(xhci, "slot_id is zero\n");
                                 goto cleanup;
@@ -3323,7 +3324,8 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                 /* Check TD length */
                 if (running_total != td_len) {
                         xhci_err(xhci, "ISOC TD length unmatch\n");
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto cleanup;
                 }
         }
 
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 6bbe3c3a7111..c939f5fdef9e 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -352,6 +352,11 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd)
                 /* hcd->irq is -1, we have MSI */
                 return 0;
 
+        if (!pdev->irq) {
+                xhci_err(xhci, "No msi-x/msi found and no IRQ in BIOS\n");
+                return -EINVAL;
+        }
+
         /* fall back to legacy interrupt*/
         ret = request_irq(pdev->irq, &usb_hcd_irq, IRQF_SHARED,
                         hcd->irq_descr, hcd);
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c
index d9b6a0355443..da97dcec1f32 100644
--- a/drivers/usb/misc/emi26.c
+++ b/drivers/usb/misc/emi26.c
@@ -37,9 +37,6 @@ static int emi26_set_reset(struct usb_device *dev, unsigned char reset_bit);
 static int emi26_load_firmware (struct usb_device *dev);
 static int emi26_probe(struct usb_interface *intf, const struct usb_device_id *id);
 static void emi26_disconnect(struct usb_interface *intf);
-static int __init emi26_init (void);
-static void __exit emi26_exit (void);
-
 
 /* thanks to drivers/usb/serial/keyspan_pda.c code */
 static int emi26_writememory (struct usb_device *dev, int address,
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c
index 9f39062ebb08..4e0f167a6c4e 100644
--- a/drivers/usb/misc/emi62.c
+++ b/drivers/usb/misc/emi62.c
@@ -46,9 +46,6 @@ static int emi62_set_reset(struct usb_device *dev, unsigned char reset_bit);
 static int emi62_load_firmware (struct usb_device *dev);
 static int emi62_probe(struct usb_interface *intf, const struct usb_device_id *id);
 static void emi62_disconnect(struct usb_interface *intf);
-static int __init emi62_init (void);
-static void __exit emi62_exit (void);
-
 
 /* thanks to drivers/usb/serial/keyspan_pda.c code */
 static int emi62_writememory(struct usb_device *dev, int address,
diff --git a/drivers/usb/misc/usbsevseg.c b/drivers/usb/misc/usbsevseg.c
index 107bf13b1cf1..b2d82b937392 100644
--- a/drivers/usb/misc/usbsevseg.c
+++ b/drivers/usb/misc/usbsevseg.c
@@ -24,7 +24,7 @@
 
 #define VENDOR_ID       0x0fc5
 #define PRODUCT_ID      0x1227
-#define MAXLEN          6
+#define MAXLEN          8
 
 /* table of devices that work with this driver */
 static const struct usb_device_id id_table[] = {
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index f9a3f62a83b5..7c569f51212a 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -33,9 +33,6 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
-#include <mach/hardware.h>
-#include <mach/memory.h>
-#include <asm/gpio.h>
 #include <mach/cputype.h>
 
 #include <asm/mach-types.h>
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 56cf0243979e..3d11cf64ebd1 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -981,6 +981,9 @@ static void musb_shutdown(struct platform_device *pdev)
         unsigned long   flags;
 
         pm_runtime_get_sync(musb->controller);
+
+        musb_gadget_cleanup(musb);
+
         spin_lock_irqsave(&musb->lock, flags);
         musb_platform_disable(musb);
         musb_generic_disable(musb);
@@ -1827,8 +1830,6 @@ static void musb_free(struct musb *musb)
         sysfs_remove_group(&musb->controller->kobj, &musb_attr_group);
 #endif
 
-        musb_gadget_cleanup(musb);
-
         if (musb->nIrq >= 0) {
                 if (musb->irq_wake)
                         disable_irq_wake(musb->nIrq);
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index e61aa95f2d2a..1d5eda26fbd1 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -39,7 +39,8 @@
 
 #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \
         && !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \
-        && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN)
+        && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \
+        && !defined(CONFIG_MIPS)
 static inline void readsl(const void __iomem *addr, void *buf, int len)
         { insl((unsigned long)addr, buf, len); }
 static inline void readsw(const void __iomem *addr, void *buf, int len)
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index c27bbbf32b52..df719eae3b03 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -222,7 +222,6 @@ static inline void omap2430_low_level_init(struct musb *musb)
         musb_writel(musb->mregs, OTG_FORCESTDBY, l);
 }
 
-/* blocking notifier support */
 static int musb_otg_notifications(struct notifier_block *nb,
                 unsigned long event, void *unused)
 {
@@ -231,7 +230,7 @@ static int musb_otg_notifications(struct notifier_block *nb,
         musb->xceiv_event = event;
         schedule_work(&musb->otg_notifier_work);
 
-        return 0;
+        return NOTIFY_OK;
 }
 
 static void musb_otg_notifier_work(struct work_struct *data_notifier_work)
@@ -386,6 +385,7 @@ static void omap2430_musb_disable(struct musb *musb)
 static int omap2430_musb_exit(struct musb *musb)
 {
         del_timer_sync(&musb_idle_timer);
+        cancel_work_sync(&musb->otg_notifier_work);
 
         omap2430_low_level_exit(musb);
         otg_put_transceiver(musb->xceiv);
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 2a25955881fc..735ef4c2339a 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -86,20 +86,6 @@ config NOP_USB_XCEIV
           built-in with usb ip or which are autonomous and doesn't require any
           phy programming such as ISP1x04 etc.
 
-config USB_LANGWELL_OTG
-        tristate "Intel Langwell USB OTG dual-role support"
-        depends on USB && PCI && INTEL_SCU_IPC
-        select USB_OTG
-        select USB_OTG_UTILS
-        help
-          Say Y here if you want to build Intel Langwell USB OTG
-          transciever driver in kernel. This driver implements role
-          switch between EHCI host driver and Langwell USB OTG
-          client driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called langwell_otg.
-
 config USB_MSM_OTG
         tristate "OTG support for Qualcomm on-chip USB controller"
         depends on (USB || USB_GADGET) && ARCH_MSM
@@ -124,7 +110,7 @@ config AB8500_USB
 
 config FSL_USB2_OTG
         bool "Freescale USB OTG Transceiver Driver"
-        depends on USB_EHCI_FSL && USB_GADGET_FSL_USB2
+        depends on USB_EHCI_FSL && USB_GADGET_FSL_USB2 && USB_SUSPEND
         select USB_OTG
         select USB_OTG_UTILS
         help
@@ -132,7 +118,7 @@ config FSL_USB2_OTG
 
 config USB_MV_OTG
         tristate "Marvell USB OTG support"
-        depends on USB_MV_UDC
+        depends on USB_EHCI_MV && USB_MV_UDC && USB_SUSPEND
         select USB_OTG
         select USB_OTG_UTILS
         help
diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile
index b2c5a9598637..41aa5098b139 100644
--- a/drivers/usb/otg/Makefile
+++ b/drivers/usb/otg/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_USB_GPIO_VBUS)	+= gpio_vbus.o
 obj-$(CONFIG_ISP1301_OMAP)      += isp1301_omap.o
 obj-$(CONFIG_TWL4030_USB)       += twl4030-usb.o
 obj-$(CONFIG_TWL6030_USB)       += twl6030-usb.o
-obj-$(CONFIG_USB_LANGWELL_OTG)  += langwell_otg.o
 obj-$(CONFIG_NOP_USB_XCEIV)     += nop-usb-xceiv.o
 obj-$(CONFIG_USB_ULPI)          += ulpi.o
 obj-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi_viewport.o
diff --git a/drivers/usb/otg/langwell_otg.c b/drivers/usb/otg/langwell_otg.c
deleted file mode 100644
index f08f784086f7..000000000000
--- a/drivers/usb/otg/langwell_otg.c
+++ /dev/null
@@ -1,2347 +0,0 @@
-/*
- * Intel Langwell USB OTG transceiver driver
- * Copyright (C) 2008 - 2010, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-/* This driver helps to switch Langwell OTG controller function between host
- * and peripheral. It works with EHCI driver and Langwell client controller
- * driver together.
- */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/device.h>
-#include <linux/moduleparam.h>
-#include <linux/usb/ch9.h>
-#include <linux/usb/gadget.h>
-#include <linux/usb.h>
-#include <linux/usb/otg.h>
-#include <linux/usb/hcd.h>
-#include <linux/notifier.h>
-#include <linux/delay.h>
-#include <asm/intel_scu_ipc.h>
-
-#include <linux/usb/langwell_otg.h>
-
-#define DRIVER_DESC             "Intel Langwell USB OTG transceiver driver"
-#define DRIVER_VERSION          "July 10, 2010"
-
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_AUTHOR("Henry Yuan <hang.yuan@intel.com>, Hao Wu <hao.wu@intel.com>");
-MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL");
-
-static const char driver_name[] = "langwell_otg";
-
-static int langwell_otg_probe(struct pci_dev *pdev,
-                        const struct pci_device_id *id);
-static void langwell_otg_remove(struct pci_dev *pdev);
-static int langwell_otg_suspend(struct pci_dev *pdev, pm_message_t message);
-static int langwell_otg_resume(struct pci_dev *pdev);
-
-static int langwell_otg_set_host(struct otg_transceiver *otg,
-                                struct usb_bus *host);
-static int langwell_otg_set_peripheral(struct otg_transceiver *otg,
-                                struct usb_gadget *gadget);
-static int langwell_otg_start_srp(struct otg_transceiver *otg);
-
-static const struct pci_device_id pci_ids[] = {{
-        .class =        ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
-        .class_mask =   ~0,
-        .vendor =       0x8086,
-        .device =       0x0811,
-        .subvendor =    PCI_ANY_ID,
-        .subdevice =    PCI_ANY_ID,
-}, { /* end: all zeroes */ }
-};
-
-static struct pci_driver otg_pci_driver = {
-        .name =         (char *) driver_name,
-        .id_table =     pci_ids,
-
-        .probe =        langwell_otg_probe,
-        .remove =       langwell_otg_remove,
-
-        .suspend =      langwell_otg_suspend,
-        .resume =       langwell_otg_resume,
-};
-
-/* HSM timers */
-static inline struct langwell_otg_timer *otg_timer_initializer
-(void (*function)(unsigned long), unsigned long expires, unsigned long data)
-{
-        struct langwell_otg_timer *timer;
-        timer = kmalloc(sizeof(struct langwell_otg_timer), GFP_KERNEL);
-        if (timer == NULL)
-                return timer;
-
-        timer->function = function;
-        timer->expires = expires;
-        timer->data = data;
-        return timer;
-}
-
-static struct langwell_otg_timer *a_wait_vrise_tmr, *a_aidl_bdis_tmr,
-        *b_se0_srp_tmr, *b_srp_init_tmr;
-
-static struct list_head active_timers;
-
-static struct langwell_otg *the_transceiver;
-
-/* host/client notify transceiver when event affects HNP state */
-void langwell_update_transceiver(void)
-{
-        struct langwell_otg *lnw = the_transceiver;
-
-        dev_dbg(lnw->dev, "transceiver is updated\n");
-
-        if (!lnw->qwork)
-                return ;
-
-        queue_work(lnw->qwork, &lnw->work);
-}
-EXPORT_SYMBOL(langwell_update_transceiver);
-
-static int langwell_otg_set_host(struct otg_transceiver *otg,
-                                        struct usb_bus *host)
-{
-        otg->host = host;
-
-        return 0;
-}
-
-static int langwell_otg_set_peripheral(struct otg_transceiver *otg,
-                                        struct usb_gadget *gadget)
-{
-        otg->gadget = gadget;
-
-        return 0;
-}
-
-static int langwell_otg_set_power(struct otg_transceiver *otg,
-                                unsigned mA)
-{
-        return 0;
-}
-
-/* A-device drives vbus, controlled through IPC commands */
-static int langwell_otg_set_vbus(struct otg_transceiver *otg, bool enabled)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        u8                              sub_id;
-
-        dev_dbg(lnw->dev, "%s <--- %s\n", __func__, enabled ? "on" : "off");
-
-        if (enabled)
-                sub_id = 0x8; /* Turn on the VBus */
-        else
-                sub_id = 0x9; /* Turn off the VBus */
-
-        if (intel_scu_ipc_simple_command(0xef, sub_id)) {
-                dev_dbg(lnw->dev, "Failed to set Vbus via IPC commands\n");
-                return -EBUSY;
-        }
-
-        dev_dbg(lnw->dev, "%s --->\n", __func__);
-
-        return 0;
-}
-
-/* charge vbus or discharge vbus through a resistor to ground */
-static void langwell_otg_chrg_vbus(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        u32     val;
-
-        val = readl(lnw->iotg.base + CI_OTGSC);
-
-        if (on)
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_VC,
-                                lnw->iotg.base + CI_OTGSC);
-        else
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_VD,
-                                lnw->iotg.base + CI_OTGSC);
-}
-
-/* Start SRP */
-static int langwell_otg_start_srp(struct otg_transceiver *otg)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s --->\n", __func__);
-
-        val = readl(iotg->base + CI_OTGSC);
-
-        writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HADP,
-                                iotg->base + CI_OTGSC);
-
-        /* Check if the data plus is finished or not */
-        msleep(8);
-        val = readl(iotg->base + CI_OTGSC);
-        if (val & (OTGSC_HADP | OTGSC_DP))
-                dev_dbg(lnw->dev, "DataLine SRP Error\n");
-
-        /* Disable interrupt - b_sess_vld */
-        val = readl(iotg->base + CI_OTGSC);
-        val &= (~(OTGSC_BSVIE | OTGSC_BSEIE));
-        writel(val, iotg->base + CI_OTGSC);
-
-        /* Start VBus SRP, drive vbus to generate VBus pulse */
-        iotg->otg.set_vbus(&iotg->otg, true);
-        msleep(15);
-        iotg->otg.set_vbus(&iotg->otg, false);
-
-        /* Enable interrupt - b_sess_vld*/
-        val = readl(iotg->base + CI_OTGSC);
-        dev_dbg(lnw->dev, "after VBUS pulse otgsc = %x\n", val);
-
-        val |= (OTGSC_BSVIE | OTGSC_BSEIE);
-        writel(val, iotg->base + CI_OTGSC);
-
-        /* If Vbus is valid, then update the hsm */
-        if (val & OTGSC_BSV) {
-                dev_dbg(lnw->dev, "no b_sess_vld interrupt\n");
-
-                lnw->iotg.hsm.b_sess_vld = 1;
-                langwell_update_transceiver();
-        }
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-        return 0;
-}
-
-/* stop SOF via bus_suspend */
-static void langwell_otg_loc_sof(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        struct usb_hcd          *hcd;
-        int                     err;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "suspend" : "resume");
-
-        hcd = bus_to_hcd(lnw->iotg.otg.host);
-        if (on)
-                err = hcd->driver->bus_resume(hcd);
-        else
-                err = hcd->driver->bus_suspend(hcd);
-
-        if (err)
-                dev_dbg(lnw->dev, "Fail to resume/suspend USB bus - %d\n", err);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-static int langwell_otg_check_otgsc(void)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        u32                             otgsc, usbcfg;
-
-        dev_dbg(lnw->dev, "check sync OTGSC and USBCFG registers\n");
-
-        otgsc = readl(lnw->iotg.base + CI_OTGSC);
-        usbcfg = readl(lnw->usbcfg);
-
-        dev_dbg(lnw->dev, "OTGSC = %08x, USBCFG = %08x\n",
-                                        otgsc, usbcfg);
-        dev_dbg(lnw->dev, "OTGSC_AVV = %d\n", !!(otgsc & OTGSC_AVV));
-        dev_dbg(lnw->dev, "USBCFG.VBUSVAL = %d\n",
-                                        !!(usbcfg & USBCFG_VBUSVAL));
-        dev_dbg(lnw->dev, "OTGSC_ASV = %d\n", !!(otgsc & OTGSC_ASV));
-        dev_dbg(lnw->dev, "USBCFG.AVALID = %d\n",
-                                        !!(usbcfg & USBCFG_AVALID));
-        dev_dbg(lnw->dev, "OTGSC_BSV = %d\n", !!(otgsc & OTGSC_BSV));
-        dev_dbg(lnw->dev, "USBCFG.BVALID = %d\n",
-                                        !!(usbcfg & USBCFG_BVALID));
-        dev_dbg(lnw->dev, "OTGSC_BSE = %d\n", !!(otgsc & OTGSC_BSE));
-        dev_dbg(lnw->dev, "USBCFG.SESEND = %d\n",
-                                        !!(usbcfg & USBCFG_SESEND));
-
-        /* Check USBCFG VBusValid/AValid/BValid/SessEnd */
-        if (!!(otgsc & OTGSC_AVV) ^ !!(usbcfg & USBCFG_VBUSVAL)) {
-                dev_dbg(lnw->dev, "OTGSC.AVV != USBCFG.VBUSVAL\n");
-                goto err;
-        }
-        if (!!(otgsc & OTGSC_ASV) ^ !!(usbcfg & USBCFG_AVALID)) {
-                dev_dbg(lnw->dev, "OTGSC.ASV != USBCFG.AVALID\n");
-                goto err;
-        }
-        if (!!(otgsc & OTGSC_BSV) ^ !!(usbcfg & USBCFG_BVALID)) {
-                dev_dbg(lnw->dev, "OTGSC.BSV != USBCFG.BVALID\n");
-                goto err;
-        }
-        if (!!(otgsc & OTGSC_BSE) ^ !!(usbcfg & USBCFG_SESEND)) {
-                dev_dbg(lnw->dev, "OTGSC.BSE != USBCFG.SESSEN\n");
-                goto err;
-        }
-
-        dev_dbg(lnw->dev, "OTGSC and USBCFG are synced\n");
-
-        return 0;
-
-err:
-        dev_warn(lnw->dev, "OTGSC isn't equal to USBCFG\n");
-        return -EPIPE;
-}
-
-
-static void langwell_otg_phy_low_power(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u8                              val, phcd;
-        int                             retval;
-
-        dev_dbg(lnw->dev, "%s ---> %s mode\n",
-                        __func__, on ? "Low power" : "Normal");
-
-        phcd = 0x40;
-
-        val = readb(iotg->base + CI_HOSTPC1 + 2);
-
-        if (on) {
-                /* Due to hardware issue, after set PHCD, sync will failed
-                 * between USBCFG and OTGSC, so before set PHCD, check if
-                 * sync is in process now. If the answer is "yes", then do
-                 * not touch PHCD bit */
-                retval = langwell_otg_check_otgsc();
-                if (retval) {
-                        dev_dbg(lnw->dev, "Skip PHCD programming..\n");
-                        return ;
-                }
-
-                writeb(val | phcd, iotg->base + CI_HOSTPC1 + 2);
-        } else
-                writeb(val & ~phcd, iotg->base + CI_HOSTPC1 + 2);
-
-        dev_dbg(lnw->dev, "%s <--- done\n", __func__);
-}
-
-/* After drv vbus, add 5 ms delay to set PHCD */
-static void langwell_otg_phy_low_power_wait(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-
-        dev_dbg(lnw->dev, "add 5ms delay before programing PHCD\n");
-
-        mdelay(5);
-        langwell_otg_phy_low_power(on);
-}
-
-/* Enable/Disable OTG interrupt */
-static void langwell_otg_intr(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off");
-
-        val = readl(iotg->base + CI_OTGSC);
-
-        /* OTGSC_INT_MASK doesn't contains 1msInt */
-        if (on) {
-                val = val | (OTGSC_INT_MASK);
-                writel(val, iotg->base + CI_OTGSC);
-        } else {
-                val = val & ~(OTGSC_INT_MASK);
-                writel(val, iotg->base + CI_OTGSC);
-        }
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-/* set HAAR: Hardware Assist Auto-Reset */
-static void langwell_otg_HAAR(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off");
-
-        val = readl(iotg->base + CI_OTGSC);
-        if (on)
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HAAR,
-                                        iotg->base + CI_OTGSC);
-        else
-                writel((val & ~OTGSC_INTSTS_MASK) & ~OTGSC_HAAR,
-                                        iotg->base + CI_OTGSC);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-/* set HABA: Hardware Assist B-Disconnect to A-Connect */
-static void langwell_otg_HABA(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off");
-
-        val = readl(iotg->base + CI_OTGSC);
-        if (on)
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HABA,
-                                        iotg->base + CI_OTGSC);
-        else
-                writel((val & ~OTGSC_INTSTS_MASK) & ~OTGSC_HABA,
-                                        iotg->base + CI_OTGSC);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-static int langwell_otg_check_se0_srp(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        int                     delay_time = TB_SE0_SRP * 10;
-        u32                     val;
-
-        dev_dbg(lnw->dev, "%s --->\n", __func__);
-
-        do {
-                udelay(100);
-                if (!delay_time--)
-                        break;
-                val = readl(lnw->iotg.base + CI_PORTSC1);
-                val &= PORTSC_LS;
-        } while (!val);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-        return val;
-}
-
-/* The timeout callback function to set time out bit */
-static void set_tmout(unsigned long indicator)
-{
-        *(int *)indicator = 1;
-}
-
-void langwell_otg_nsf_msg(unsigned long indicator)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-
-        switch (indicator) {
-        case 2:
-        case 4:
-        case 6:
-        case 7:
-                dev_warn(lnw->dev,
-                        "OTG:NSF-%lu - deivce not responding\n", indicator);
-                break;
-        case 3:
-                dev_warn(lnw->dev,
-                        "OTG:NSF-%lu - deivce not supported\n", indicator);
-                break;
-        default:
-                dev_warn(lnw->dev, "Do not have this kind of NSF\n");
-                break;
-        }
-}
-
-/* Initialize timers */
-static int langwell_otg_init_timers(struct otg_hsm *hsm)
-{
-        /* HSM used timers */
-        a_wait_vrise_tmr = otg_timer_initializer(&set_tmout, TA_WAIT_VRISE,
-                                (unsigned long)&hsm->a_wait_vrise_tmout);
-        if (a_wait_vrise_tmr == NULL)
-                return -ENOMEM;
-        a_aidl_bdis_tmr = otg_timer_initializer(&set_tmout, TA_AIDL_BDIS,
-                                (unsigned long)&hsm->a_aidl_bdis_tmout);
-        if (a_aidl_bdis_tmr == NULL)
-                return -ENOMEM;
-        b_se0_srp_tmr = otg_timer_initializer(&set_tmout, TB_SE0_SRP,
-                                (unsigned long)&hsm->b_se0_srp);
-        if (b_se0_srp_tmr == NULL)
-                return -ENOMEM;
-        b_srp_init_tmr = otg_timer_initializer(&set_tmout, TB_SRP_INIT,
-                                (unsigned long)&hsm->b_srp_init_tmout);
-        if (b_srp_init_tmr == NULL)
-                return -ENOMEM;
-
-        return 0;
-}
-
-/* Free timers */
-static void langwell_otg_free_timers(void)
-{
-        kfree(a_wait_vrise_tmr);
-        kfree(a_aidl_bdis_tmr);
-        kfree(b_se0_srp_tmr);
-        kfree(b_srp_init_tmr);
-}
-
-/* The timeout callback function to set time out bit */
-static void langwell_otg_timer_fn(unsigned long indicator)
-{
-        struct langwell_otg *lnw = the_transceiver;
-
-        *(int *)indicator = 1;
-
-        dev_dbg(lnw->dev, "kernel timer - timeout\n");
-
-        langwell_update_transceiver();
-}
-
-/* kernel timer used instead of HW based interrupt */
-static void langwell_otg_add_ktimer(enum langwell_otg_timer_type timers)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        unsigned long           j = jiffies;
-        unsigned long           data, time;
-
-        switch (timers) {
-        case TA_WAIT_VRISE_TMR:
-                iotg->hsm.a_wait_vrise_tmout = 0;
-                data = (unsigned long)&iotg->hsm.a_wait_vrise_tmout;
-                time = TA_WAIT_VRISE;
-                break;
-        case TA_WAIT_BCON_TMR:
-                iotg->hsm.a_wait_bcon_tmout = 0;
-                data = (unsigned long)&iotg->hsm.a_wait_bcon_tmout;
-                time = TA_WAIT_BCON;
-                break;
-        case TA_AIDL_BDIS_TMR:
-                iotg->hsm.a_aidl_bdis_tmout = 0;
-                data = (unsigned long)&iotg->hsm.a_aidl_bdis_tmout;
-                time = TA_AIDL_BDIS;
-                break;
-        case TB_ASE0_BRST_TMR:
-                iotg->hsm.b_ase0_brst_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_ase0_brst_tmout;
-                time = TB_ASE0_BRST;
-                break;
-        case TB_SRP_INIT_TMR:
-                iotg->hsm.b_srp_init_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_srp_init_tmout;
-                time = TB_SRP_INIT;
-                break;
-        case TB_SRP_FAIL_TMR:
-                iotg->hsm.b_srp_fail_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_srp_fail_tmout;
-                time = TB_SRP_FAIL;
-                break;
-        case TB_BUS_SUSPEND_TMR:
-                iotg->hsm.b_bus_suspend_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_bus_suspend_tmout;
-                time = TB_BUS_SUSPEND;
-                break;
-        default:
-                dev_dbg(lnw->dev, "unknown timer, cannot enable it\n");
-                return;
-        }
-
-        lnw->hsm_timer.data = data;
-        lnw->hsm_timer.function = langwell_otg_timer_fn;
-        lnw->hsm_timer.expires = j + time * HZ / 1000; /* milliseconds */
-
-        add_timer(&lnw->hsm_timer);
-
-        dev_dbg(lnw->dev, "add timer successfully\n");
-}
-
-/* Add timer to timer list */
-static void langwell_otg_add_timer(void *gtimer)
-{
-        struct langwell_otg_timer *timer = (struct langwell_otg_timer *)gtimer;
-        struct langwell_otg_timer *tmp_timer;
-        struct intel_mid_otg_xceiv *iotg = &the_transceiver->iotg;
-        u32     val32;
-
-        /* Check if the timer is already in the active list,
-         * if so update timer count
-         */
-        list_for_each_entry(tmp_timer, &active_timers, list)
-                if (tmp_timer == timer) {
-                        timer->count = timer->expires;
-                        return;
-                }
-        timer->count = timer->expires;
-
-        if (list_empty(&active_timers)) {
-                val32 = readl(iotg->base + CI_OTGSC);
-                writel(val32 | OTGSC_1MSE, iotg->base + CI_OTGSC);
-        }
-
-        list_add_tail(&timer->list, &active_timers);
-}
-
-/* Remove timer from the timer list; clear timeout status */
-static void langwell_otg_del_timer(void *gtimer)
-{
-        struct langwell_otg *lnw = the_transceiver;
-        struct langwell_otg_timer *timer = (struct langwell_otg_timer *)gtimer;
-        struct langwell_otg_timer *tmp_timer, *del_tmp;
-        u32 val32;
-
-        list_for_each_entry_safe(tmp_timer, del_tmp, &active_timers, list)
-                if (tmp_timer == timer)
-                        list_del(&timer->list);
-
-        if (list_empty(&active_timers)) {
-                val32 = readl(lnw->iotg.base + CI_OTGSC);
-                writel(val32 & ~OTGSC_1MSE, lnw->iotg.base + CI_OTGSC);
-        }
-}
-
-/* Reduce timer count by 1, and find timeout conditions.*/
-static int langwell_otg_tick_timer(u32 *int_sts)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        struct langwell_otg_timer *tmp_timer, *del_tmp;
-        int expired = 0;
-
-        list_for_each_entry_safe(tmp_timer, del_tmp, &active_timers, list) {
-                tmp_timer->count--;
-                /* check if timer expires */
-                if (!tmp_timer->count) {
-                        list_del(&tmp_timer->list);
-                        tmp_timer->function(tmp_timer->data);
-                        expired = 1;
-                }
-        }
-
-        if (list_empty(&active_timers)) {
-                dev_dbg(lnw->dev, "tick timer: disable 1ms int\n");
-                *int_sts = *int_sts & ~OTGSC_1MSE;
-        }
-        return expired;
-}
-
-static void reset_otg(void)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        int                     delay_time = 1000;
-        u32                     val;
-
-        dev_dbg(lnw->dev, "reseting OTG controller ...\n");
-        val = readl(lnw->iotg.base + CI_USBCMD);
-        writel(val | USBCMD_RST, lnw->iotg.base + CI_USBCMD);
-        do {
-                udelay(100);
-                if (!delay_time--)
-                        dev_dbg(lnw->dev, "reset timeout\n");
-                val = readl(lnw->iotg.base + CI_USBCMD);
-                val &= USBCMD_RST;
-        } while (val != 0);
-        dev_dbg(lnw->dev, "reset done.\n");
-}
-
-static void set_host_mode(void)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        u32                     val;
-
-        reset_otg();
-        val = readl(lnw->iotg.base + CI_USBMODE);
-        val = (val & (~USBMODE_CM)) | USBMODE_HOST;
-        writel(val, lnw->iotg.base + CI_USBMODE);
-}
-
-static void set_client_mode(void)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        u32                     val;
-
-        reset_otg();
-        val = readl(lnw->iotg.base + CI_USBMODE);
-        val = (val & (~USBMODE_CM)) | USBMODE_DEVICE;
-        writel(val, lnw->iotg.base + CI_USBMODE);
-}
-
-static void init_hsm(void)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val32;
-
-        /* read OTGSC after reset */
-        val32 = readl(lnw->iotg.base + CI_OTGSC);
-        dev_dbg(lnw->dev, "%s: OTGSC init value = 0x%x\n", __func__, val32);
-
-        /* set init state */
-        if (val32 & OTGSC_ID) {
-                iotg->hsm.id = 1;
-                iotg->otg.default_a = 0;
-                set_client_mode();
-                iotg->otg.state = OTG_STATE_B_IDLE;
-        } else {
-                iotg->hsm.id = 0;
-                iotg->otg.default_a = 1;
-                set_host_mode();
-                iotg->otg.state = OTG_STATE_A_IDLE;
-        }
-
-        /* set session indicator */
-        if (val32 & OTGSC_BSE)
-                iotg->hsm.b_sess_end = 1;
-        if (val32 & OTGSC_BSV)
-                iotg->hsm.b_sess_vld = 1;
-        if (val32 & OTGSC_ASV)
-                iotg->hsm.a_sess_vld = 1;
-        if (val32 & OTGSC_AVV)
-                iotg->hsm.a_vbus_vld = 1;
-
-        /* defautly power the bus */
-        iotg->hsm.a_bus_req = 1;
-        iotg->hsm.a_bus_drop = 0;
-        /* defautly don't request bus as B device */
-        iotg->hsm.b_bus_req = 0;
-        /* no system error */
-        iotg->hsm.a_clr_err = 0;
-
-        langwell_otg_phy_low_power_wait(1);
-}
-
-static void update_hsm(void)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val32;
-
-        /* read OTGSC */
-        val32 = readl(lnw->iotg.base + CI_OTGSC);
-        dev_dbg(lnw->dev, "%s: OTGSC value = 0x%x\n", __func__, val32);
-
-        iotg->hsm.id = !!(val32 & OTGSC_ID);
-        iotg->hsm.b_sess_end = !!(val32 & OTGSC_BSE);
-        iotg->hsm.b_sess_vld = !!(val32 & OTGSC_BSV);
-        iotg->hsm.a_sess_vld = !!(val32 & OTGSC_ASV);
-        iotg->hsm.a_vbus_vld = !!(val32 & OTGSC_AVV);
-}
-
-static irqreturn_t otg_dummy_irq(int irq, void *_dev)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        void __iomem            *reg_base = _dev;
-        u32                     val;
-        u32                     int_mask = 0;
-
-        val = readl(reg_base + CI_USBMODE);
-        if ((val & USBMODE_CM) != USBMODE_DEVICE)
-                return IRQ_NONE;
-
-        val = readl(reg_base + CI_USBSTS);
-        int_mask = val & INTR_DUMMY_MASK;
-
-        if (int_mask == 0)
-                return IRQ_NONE;
-
-        /* clear hsm.b_conn here since host driver can't detect it
-        *  otg_dummy_irq called means B-disconnect happened.
-        */
-        if (lnw->iotg.hsm.b_conn) {
-                lnw->iotg.hsm.b_conn = 0;
-                if (spin_trylock(&lnw->wq_lock)) {
-                        langwell_update_transceiver();
-                        spin_unlock(&lnw->wq_lock);
-                }
-        }
-
-        /* Clear interrupts */
-        writel(int_mask, reg_base + CI_USBSTS);
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t otg_irq(int irq, void *_dev)
-{
-        struct langwell_otg             *lnw = _dev;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             int_sts, int_en;
-        u32                             int_mask = 0;
-        int                             flag = 0;
-
-        int_sts = readl(lnw->iotg.base + CI_OTGSC);
-        int_en = (int_sts & OTGSC_INTEN_MASK) >> 8;
-        int_mask = int_sts & int_en;
-        if (int_mask == 0)
-                return IRQ_NONE;
-
-        if (int_mask & OTGSC_IDIS) {
-                dev_dbg(lnw->dev, "%s: id change int\n", __func__);
-                iotg->hsm.id = (int_sts & OTGSC_ID) ? 1 : 0;
-                dev_dbg(lnw->dev, "id = %d\n", iotg->hsm.id);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_DPIS) {
-                dev_dbg(lnw->dev, "%s: data pulse int\n", __func__);
-                iotg->hsm.a_srp_det = (int_sts & OTGSC_DPS) ? 1 : 0;
-                dev_dbg(lnw->dev, "data pulse = %d\n", iotg->hsm.a_srp_det);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_BSEIS) {
-                dev_dbg(lnw->dev, "%s: b session end int\n", __func__);
-                iotg->hsm.b_sess_end = (int_sts & OTGSC_BSE) ? 1 : 0;
-                dev_dbg(lnw->dev, "b_sess_end = %d\n", iotg->hsm.b_sess_end);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_BSVIS) {
-                dev_dbg(lnw->dev, "%s: b session valid int\n", __func__);
-                iotg->hsm.b_sess_vld = (int_sts & OTGSC_BSV) ? 1 : 0;
-                dev_dbg(lnw->dev, "b_sess_vld = %d\n", iotg->hsm.b_sess_end);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_ASVIS) {
-                dev_dbg(lnw->dev, "%s: a session valid int\n", __func__);
-                iotg->hsm.a_sess_vld = (int_sts & OTGSC_ASV) ? 1 : 0;
-                dev_dbg(lnw->dev, "a_sess_vld = %d\n", iotg->hsm.a_sess_vld);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_AVVIS) {
-                dev_dbg(lnw->dev, "%s: a vbus valid int\n", __func__);
-                iotg->hsm.a_vbus_vld = (int_sts & OTGSC_AVV) ? 1 : 0;
-                dev_dbg(lnw->dev, "a_vbus_vld = %d\n", iotg->hsm.a_vbus_vld);
-                flag = 1;
-        }
-
-        if (int_mask & OTGSC_1MSS) {
-                /* need to schedule otg_work if any timer is expired */
-                if (langwell_otg_tick_timer(&int_sts))
-                        flag = 1;
-        }
-
-        writel((int_sts & ~OTGSC_INTSTS_MASK) | int_mask,
-                                        lnw->iotg.base + CI_OTGSC);
-        if (flag)
-                langwell_update_transceiver();
-
-        return IRQ_HANDLED;
-}
-
-static int langwell_otg_iotg_notify(struct notifier_block *nb,
-                                unsigned long action, void *data)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = data;
-        int                             flag = 0;
-
-        if (iotg == NULL)
-                return NOTIFY_BAD;
-
-        if (lnw == NULL)
-                return NOTIFY_BAD;
-
-        switch (action) {
-        case MID_OTG_NOTIFY_CONNECT:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Connect Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.b_conn = 1;
-                else
-                        iotg->hsm.a_conn = 1;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_DISCONN:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Disconnect Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.b_conn = 0;
-                else
-                        iotg->hsm.a_conn = 0;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_HSUSPEND:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Host Bus suspend Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.a_suspend_req = 1;
-                else
-                        iotg->hsm.b_bus_req = 0;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_HRESUME:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Host Bus resume Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.b_bus_resume = 1;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_CSUSPEND:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Client Bus suspend Event\n");
-                if (iotg->otg.default_a == 1) {
-                        if (iotg->hsm.b_bus_suspend_vld == 2) {
-                                iotg->hsm.b_bus_suspend = 1;
-                                iotg->hsm.b_bus_suspend_vld = 0;
-                                flag = 1;
-                        } else {
-                                iotg->hsm.b_bus_suspend_vld++;
-                                flag = 0;
-                        }
-                } else {
-                        if (iotg->hsm.a_bus_suspend == 0) {
-                                iotg->hsm.a_bus_suspend = 1;
-                                flag = 1;
-                        }
-                }
-                break;
-        case MID_OTG_NOTIFY_CRESUME:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Client Bus resume Event\n");
-                if (iotg->otg.default_a == 0)
-                        iotg->hsm.a_bus_suspend = 0;
-                flag = 0;
-                break;
-        case MID_OTG_NOTIFY_HOSTADD:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Host Driver Add\n");
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_HOSTREMOVE:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Host Driver remove\n");
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_CLIENTADD:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Client Driver Add\n");
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_CLIENTREMOVE:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Client Driver remove\n");
-                flag = 1;
-                break;
-        default:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity unknown notify message\n");
-                return NOTIFY_DONE;
-        }
-
-        if (flag)
-                langwell_update_transceiver();
-
-        return NOTIFY_OK;
-}
-
-static void langwell_otg_work(struct work_struct *work)
-{
-        struct langwell_otg             *lnw;
-        struct intel_mid_otg_xceiv      *iotg;
-        int                             retval;
-        struct pci_dev                  *pdev;
-
-        lnw = container_of(work, struct langwell_otg, work);
-        iotg = &lnw->iotg;
-        pdev = to_pci_dev(lnw->dev);
-
-        dev_dbg(lnw->dev, "%s: old state = %s\n", __func__,
-                        otg_state_string(iotg->otg.state));
-
-        switch (iotg->otg.state) {
-        case OTG_STATE_UNDEFINED:
-        case OTG_STATE_B_IDLE:
-                if (!iotg->hsm.id) {
-                        langwell_otg_del_timer(b_srp_init_tmr);
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.b_sess_vld) {
-                        langwell_otg_del_timer(b_srp_init_tmr);
-                        del_timer_sync(&lnw->hsm_timer);
-                        iotg->hsm.b_sess_end = 0;
-                        iotg->hsm.a_bus_suspend = 0;
-                        langwell_otg_chrg_vbus(0);
-
-                        if (lnw->iotg.start_peripheral) {
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                                iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                        } else
-                                dev_dbg(lnw->dev, "client driver not loaded\n");
-
-                } else if (iotg->hsm.b_srp_init_tmout) {
-                        iotg->hsm.b_srp_init_tmout = 0;
-                        dev_warn(lnw->dev, "SRP init timeout\n");
-                } else if (iotg->hsm.b_srp_fail_tmout) {
-                        iotg->hsm.b_srp_fail_tmout = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        /* No silence failure */
-                        langwell_otg_nsf_msg(6);
-                } else if (iotg->hsm.b_bus_req && iotg->hsm.b_sess_end) {
-                        del_timer_sync(&lnw->hsm_timer);
-                        /* workaround for b_se0_srp detection */
-                        retval = langwell_otg_check_se0_srp(0);
-                        if (retval) {
-                                iotg->hsm.b_bus_req = 0;
-                                dev_dbg(lnw->dev, "LS isn't SE0, try later\n");
-                        } else {
-                                /* clear the PHCD before start srp */
-                                langwell_otg_phy_low_power(0);
-
-                                /* Start SRP */
-                                langwell_otg_add_timer(b_srp_init_tmr);
-                                iotg->otg.start_srp(&iotg->otg);
-                                langwell_otg_del_timer(b_srp_init_tmr);
-                                langwell_otg_add_ktimer(TB_SRP_FAIL_TMR);
-
-                                /* reset PHY low power mode here */
-                                langwell_otg_phy_low_power_wait(1);
-                        }
-                }
-                break;
-        case OTG_STATE_B_SRP_INIT:
-                if (!iotg->hsm.id) {
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_chrg_vbus(0);
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.b_sess_vld) {
-                        langwell_otg_chrg_vbus(0);
-                        if (lnw->iotg.start_peripheral) {
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                                iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                        } else
-                                dev_dbg(lnw->dev, "client driver not loaded\n");
-                }
-                break;
-        case OTG_STATE_B_PERIPHERAL:
-                if (!iotg->hsm.id) {
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.b_sess_vld) {
-                        iotg->hsm.b_hnp_enable = 0;
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if (iotg->hsm.b_bus_req && iotg->otg.gadget &&
-                                        iotg->otg.gadget->b_hnp_enable &&
-                                        iotg->hsm.a_bus_suspend) {
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        langwell_otg_HAAR(1);
-                        iotg->hsm.a_conn = 0;
-
-                        if (lnw->iotg.start_host) {
-                                lnw->iotg.start_host(&lnw->iotg);
-                                iotg->otg.state = OTG_STATE_B_WAIT_ACON;
-                        } else
-                                dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-
-                        iotg->hsm.a_bus_resume = 0;
-                        langwell_otg_add_ktimer(TB_ASE0_BRST_TMR);
-                }
-                break;
-
-        case OTG_STATE_B_WAIT_ACON:
-                if (!iotg->hsm.id) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-
-                        langwell_otg_HAAR(0);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.b_sess_vld) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->hsm.b_hnp_enable = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        langwell_otg_HAAR(0);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if (iotg->hsm.a_conn) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        langwell_otg_HAAR(0);
-                        iotg->otg.state = OTG_STATE_B_HOST;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_resume ||
-                                iotg->hsm.b_ase0_brst_tmout) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        langwell_otg_HAAR(0);
-                        langwell_otg_nsf_msg(7);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        iotg->hsm.a_bus_suspend = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.start_peripheral)
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver not loaded.\n");
-
-                        iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                }
-                break;
-
-        case OTG_STATE_B_HOST:
-                if (!iotg->hsm.id) {
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.b_sess_vld) {
-                        iotg->hsm.b_hnp_enable = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if ((!iotg->hsm.b_bus_req) ||
-                                (!iotg->hsm.a_conn)) {
-                        iotg->hsm.b_bus_req = 0;
-                        langwell_otg_loc_sof(0);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        iotg->hsm.a_bus_suspend = 0;
-
-                        if (lnw->iotg.start_peripheral)
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                                "client driver not loaded.\n");
-
-                        iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                }
-                break;
-
-        case OTG_STATE_A_IDLE:
-                iotg->otg.default_a = 1;
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-                        iotg->hsm.vbus_srp_up = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_bus_drop &&
-                        (iotg->hsm.a_srp_det || iotg->hsm.a_bus_req)) {
-                        langwell_otg_phy_low_power(0);
-
-                        /* Turn on VBus */
-                        iotg->otg.set_vbus(&iotg->otg, true);
-
-                        iotg->hsm.vbus_srp_up = 0;
-                        iotg->hsm.a_wait_vrise_tmout = 0;
-                        langwell_otg_add_timer(a_wait_vrise_tmr);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VRISE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_bus_drop && iotg->hsm.a_sess_vld) {
-                        iotg->hsm.vbus_srp_up = 1;
-                } else if (!iotg->hsm.a_sess_vld && iotg->hsm.vbus_srp_up) {
-                        msleep(10);
-                        langwell_otg_phy_low_power(0);
-
-                        /* Turn on VBus */
-                        iotg->otg.set_vbus(&iotg->otg, true);
-                        iotg->hsm.a_srp_det = 1;
-                        iotg->hsm.vbus_srp_up = 0;
-                        iotg->hsm.a_wait_vrise_tmout = 0;
-                        langwell_otg_add_timer(a_wait_vrise_tmr);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VRISE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_sess_vld &&
-                                !iotg->hsm.vbus_srp_up) {
-                        langwell_otg_phy_low_power(1);
-                }
-                break;
-        case OTG_STATE_A_WAIT_VRISE:
-                if (iotg->hsm.id) {
-                        langwell_otg_del_timer(a_wait_vrise_tmr);
-                        iotg->hsm.b_bus_req = 0;
-                        iotg->otg.default_a = 0;
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if (iotg->hsm.a_vbus_vld) {
-                        langwell_otg_del_timer(a_wait_vrise_tmr);
-                        iotg->hsm.b_conn = 0;
-                        if (lnw->iotg.start_host)
-                                lnw->iotg.start_host(&lnw->iotg);
-                        else {
-                                dev_dbg(lnw->dev, "host driver not loaded.\n");
-                                break;
-                        }
-
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                } else if (iotg->hsm.a_wait_vrise_tmout) {
-                        iotg->hsm.b_conn = 0;
-                        if (iotg->hsm.a_vbus_vld) {
-                                if (lnw->iotg.start_host)
-                                        lnw->iotg.start_host(&lnw->iotg);
-                                else {
-                                        dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-                                        break;
-                                }
-                                langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                                iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                        } else {
-
-                                /* Turn off VBus */
-                                iotg->otg.set_vbus(&iotg->otg, false);
-                                langwell_otg_phy_low_power_wait(1);
-                                iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                        }
-                }
-                break;
-        case OTG_STATE_A_WAIT_BCON:
-                if (iotg->hsm.id) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                } else if (iotg->hsm.a_bus_drop ||
-                                (iotg->hsm.a_wait_bcon_tmout &&
-                                !iotg->hsm.a_bus_req)) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (iotg->hsm.b_conn) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->hsm.a_suspend_req = 0;
-                        iotg->otg.state = OTG_STATE_A_HOST;
-                        if (iotg->hsm.a_srp_det && iotg->otg.host &&
-                                        !iotg->otg.host->b_hnp_enable) {
-                                /* SRP capable peripheral-only device */
-                                iotg->hsm.a_bus_req = 1;
-                                iotg->hsm.a_srp_det = 0;
-                        } else if (!iotg->hsm.a_bus_req && iotg->otg.host &&
-                                        iotg->otg.host->b_hnp_enable) {
-                                /* It is not safe enough to do a fast
-                                 * transition from A_WAIT_BCON to
-                                 * A_SUSPEND */
-                                msleep(10000);
-                                if (iotg->hsm.a_bus_req)
-                                        break;
-
-                                if (request_irq(pdev->irq,
-                                        otg_dummy_irq, IRQF_SHARED,
-                                        driver_name, iotg->base) != 0) {
-                                        dev_dbg(lnw->dev,
-                                                "request interrupt %d fail\n",
-                                                pdev->irq);
-                                }
-
-                                langwell_otg_HABA(1);
-                                iotg->hsm.b_bus_resume = 0;
-                                iotg->hsm.a_aidl_bdis_tmout = 0;
-
-                                langwell_otg_loc_sof(0);
-                                /* clear PHCD to enable HW timer */
-                                langwell_otg_phy_low_power(0);
-                                langwell_otg_add_timer(a_aidl_bdis_tmr);
-                                iotg->otg.state = OTG_STATE_A_SUSPEND;
-                        } else if (!iotg->hsm.a_bus_req && iotg->otg.host &&
-                                !iotg->otg.host->b_hnp_enable) {
-                                if (lnw->iotg.stop_host)
-                                        lnw->iotg.stop_host(&lnw->iotg);
-                                else
-                                        dev_dbg(lnw->dev,
-                                                "host driver removed.\n");
-
-                                /* Turn off VBus */
-                                iotg->otg.set_vbus(&iotg->otg, false);
-                                iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                        }
-                }
-                break;
-        case OTG_STATE_A_HOST:
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_drop ||
-                                (iotg->otg.host &&
-                                !iotg->otg.host->b_hnp_enable &&
-                                        !iotg->hsm.a_bus_req)) {
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                } else if (iotg->otg.host &&
-                                iotg->otg.host->b_hnp_enable &&
-                                !iotg->hsm.a_bus_req) {
-                        /* Set HABA to enable hardware assistance to signal
-                         *  A-connect after receiver B-disconnect. Hardware
-                         *  will then set client mode and enable URE, SLE and
-                         *  PCE after the assistance. otg_dummy_irq is used to
-                         *  clean these ints when client driver is not resumed.
-                         */
-                        if (request_irq(pdev->irq, otg_dummy_irq, IRQF_SHARED,
-                                        driver_name, iotg->base) != 0) {
-                                dev_dbg(lnw->dev,
-                                        "request interrupt %d failed\n",
-                                                pdev->irq);
-                        }
-
-                        /* set HABA */
-                        langwell_otg_HABA(1);
-                        iotg->hsm.b_bus_resume = 0;
-                        iotg->hsm.a_aidl_bdis_tmout = 0;
-                        langwell_otg_loc_sof(0);
-                        /* clear PHCD to enable HW timer */
-                        langwell_otg_phy_low_power(0);
-                        langwell_otg_add_timer(a_aidl_bdis_tmr);
-                        iotg->otg.state = OTG_STATE_A_SUSPEND;
-                } else if (!iotg->hsm.b_conn || !iotg->hsm.a_bus_req) {
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                }
-                break;
-        case OTG_STATE_A_SUSPEND:
-                if (iotg->hsm.id) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_req ||
-                                iotg->hsm.b_bus_resume) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        iotg->hsm.a_suspend_req = 0;
-                        langwell_otg_loc_sof(1);
-                        iotg->otg.state = OTG_STATE_A_HOST;
-                } else if (iotg->hsm.a_aidl_bdis_tmout ||
-                                iotg->hsm.a_bus_drop) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (!iotg->hsm.b_conn && iotg->otg.host &&
-                                iotg->otg.host->b_hnp_enable) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        iotg->hsm.b_bus_suspend = 0;
-                        iotg->hsm.b_bus_suspend_vld = 0;
-
-                        /* msleep(200); */
-                        if (lnw->iotg.start_peripheral)
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver not loaded.\n");
-
-                        langwell_otg_add_ktimer(TB_BUS_SUSPEND_TMR);
-                        iotg->otg.state = OTG_STATE_A_PERIPHERAL;
-                        break;
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                }
-                break;
-        case OTG_STATE_A_PERIPHERAL:
-                if (iotg->hsm.id) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                } else if (iotg->hsm.a_bus_drop) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (iotg->hsm.b_bus_suspend) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        if (lnw->iotg.start_host)
-                                lnw->iotg.start_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                } else if (iotg->hsm.b_bus_suspend_tmout) {
-                        u32     val;
-                        val = readl(lnw->iotg.base + CI_PORTSC1);
-                        if (!(val & PORTSC_SUSP))
-                                break;
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        if (lnw->iotg.start_host)
-                                lnw->iotg.start_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                }
-                break;
-        case OTG_STATE_A_VBUS_ERR:
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.a_clr_err = 0;
-                        iotg->hsm.a_srp_det = 0;
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_clr_err) {
-                        iotg->hsm.a_clr_err = 0;
-                        iotg->hsm.a_srp_det = 0;
-                        reset_otg();
-                        init_hsm();
-                        if (iotg->otg.state == OTG_STATE_A_IDLE)
-                                langwell_update_transceiver();
-                } else {
-                        /* FW will clear PHCD bit when any VBus
-                         * event detected. Reset PHCD to 1 again */
-                        langwell_otg_phy_low_power(1);
-                }
-                break;
-        case OTG_STATE_A_WAIT_VFALL:
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_req) {
-
-                        /* Turn on VBus */
-                        iotg->otg.set_vbus(&iotg->otg, true);
-                        iotg->hsm.a_wait_vrise_tmout = 0;
-                        langwell_otg_add_timer(a_wait_vrise_tmr);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VRISE;
-                } else if (!iotg->hsm.a_sess_vld) {
-                        iotg->hsm.a_srp_det = 0;
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                }
-                break;
-        default:
-                ;
-        }
-
-        dev_dbg(lnw->dev, "%s: new state = %s\n", __func__,
-                        otg_state_string(iotg->otg.state));
-}
-
-static ssize_t
-show_registers(struct device *_dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size,
-                "\n"
-                "USBCMD = 0x%08x\n"
-                "USBSTS = 0x%08x\n"
-                "USBINTR = 0x%08x\n"
-                "ASYNCLISTADDR = 0x%08x\n"
-                "PORTSC1 = 0x%08x\n"
-                "HOSTPC1 = 0x%08x\n"
-                "OTGSC = 0x%08x\n"
-                "USBMODE = 0x%08x\n",
-                readl(lnw->iotg.base + 0x30),
-                readl(lnw->iotg.base + 0x34),
-                readl(lnw->iotg.base + 0x38),
-                readl(lnw->iotg.base + 0x48),
-                readl(lnw->iotg.base + 0x74),
-                readl(lnw->iotg.base + 0xb4),
-                readl(lnw->iotg.base + 0xf4),
-                readl(lnw->iotg.base + 0xf8)
-             );
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-static DEVICE_ATTR(registers, S_IRUGO, show_registers, NULL);
-
-static ssize_t
-show_hsm(struct device *_dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        char                            *next;
-        unsigned                        size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        if (iotg->otg.host)
-                iotg->hsm.a_set_b_hnp_en = iotg->otg.host->b_hnp_enable;
-
-        if (iotg->otg.gadget)
-                iotg->hsm.b_hnp_enable = iotg->otg.gadget->b_hnp_enable;
-
-        t = scnprintf(next, size,
-                "\n"
-                "current state = %s\n"
-                "a_bus_resume = \t%d\n"
-                "a_bus_suspend = \t%d\n"
-                "a_conn = \t%d\n"
-                "a_sess_vld = \t%d\n"
-                "a_srp_det = \t%d\n"
-                "a_vbus_vld = \t%d\n"
-                "b_bus_resume = \t%d\n"
-                "b_bus_suspend = \t%d\n"
-                "b_conn = \t%d\n"
-                "b_se0_srp = \t%d\n"
-                "b_sess_end = \t%d\n"
-                "b_sess_vld = \t%d\n"
-                "id = \t%d\n"
-                "a_set_b_hnp_en = \t%d\n"
-                "b_srp_done = \t%d\n"
-                "b_hnp_enable = \t%d\n"
-                "a_wait_vrise_tmout = \t%d\n"
-                "a_wait_bcon_tmout = \t%d\n"
-                "a_aidl_bdis_tmout = \t%d\n"
-                "b_ase0_brst_tmout = \t%d\n"
-                "a_bus_drop = \t%d\n"
-                "a_bus_req = \t%d\n"
-                "a_clr_err = \t%d\n"
-                "a_suspend_req = \t%d\n"
-                "b_bus_req = \t%d\n"
-                "b_bus_suspend_tmout = \t%d\n"
-                "b_bus_suspend_vld = \t%d\n",
-                otg_state_string(iotg->otg.state),
-                iotg->hsm.a_bus_resume,
-                iotg->hsm.a_bus_suspend,
-                iotg->hsm.a_conn,
-                iotg->hsm.a_sess_vld,
-                iotg->hsm.a_srp_det,
-                iotg->hsm.a_vbus_vld,
-                iotg->hsm.b_bus_resume,
-                iotg->hsm.b_bus_suspend,
-                iotg->hsm.b_conn,
-                iotg->hsm.b_se0_srp,
-                iotg->hsm.b_sess_end,
-                iotg->hsm.b_sess_vld,
-                iotg->hsm.id,
-                iotg->hsm.a_set_b_hnp_en,
-                iotg->hsm.b_srp_done,
-                iotg->hsm.b_hnp_enable,
-                iotg->hsm.a_wait_vrise_tmout,
-                iotg->hsm.a_wait_bcon_tmout,
-                iotg->hsm.a_aidl_bdis_tmout,
-                iotg->hsm.b_ase0_brst_tmout,
-                iotg->hsm.a_bus_drop,
-                iotg->hsm.a_bus_req,
-                iotg->hsm.a_clr_err,
-                iotg->hsm.a_suspend_req,
-                iotg->hsm.b_bus_req,
-                iotg->hsm.b_bus_suspend_tmout,
-                iotg->hsm.b_bus_suspend_vld
-                );
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-static DEVICE_ATTR(hsm, S_IRUGO, show_hsm, NULL);
-
-static ssize_t
-get_a_bus_req(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size, "%d", lnw->iotg.hsm.a_bus_req);
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-
-static ssize_t
-set_a_bus_req(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (!iotg->otg.default_a)
-                return -1;
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '0') {
-                iotg->hsm.a_bus_req = 0;
-                dev_dbg(lnw->dev, "User request: a_bus_req = 0\n");
-        } else if (buf[0] == '1') {
-                /* If a_bus_drop is TRUE, a_bus_req can't be set */
-                if (iotg->hsm.a_bus_drop)
-                        return -1;
-                iotg->hsm.a_bus_req = 1;
-                dev_dbg(lnw->dev, "User request: a_bus_req = 1\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(a_bus_req, S_IRUGO | S_IWUSR, get_a_bus_req, set_a_bus_req);
-
-static ssize_t
-get_a_bus_drop(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size, "%d", lnw->iotg.hsm.a_bus_drop);
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-
-static ssize_t
-set_a_bus_drop(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (!iotg->otg.default_a)
-                return -1;
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '0') {
-                iotg->hsm.a_bus_drop = 0;
-                dev_dbg(lnw->dev, "User request: a_bus_drop = 0\n");
-        } else if (buf[0] == '1') {
-                iotg->hsm.a_bus_drop = 1;
-                iotg->hsm.a_bus_req = 0;
-                dev_dbg(lnw->dev, "User request: a_bus_drop = 1\n");
-                dev_dbg(lnw->dev, "User request: and a_bus_req = 0\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(a_bus_drop, S_IRUGO | S_IWUSR, get_a_bus_drop, set_a_bus_drop);
-
-static ssize_t
-get_b_bus_req(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size, "%d", lnw->iotg.hsm.b_bus_req);
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-
-static ssize_t
-set_b_bus_req(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (iotg->otg.default_a)
-                return -1;
-
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '0') {
-                iotg->hsm.b_bus_req = 0;
-                dev_dbg(lnw->dev, "User request: b_bus_req = 0\n");
-        } else if (buf[0] == '1') {
-                iotg->hsm.b_bus_req = 1;
-                dev_dbg(lnw->dev, "User request: b_bus_req = 1\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(b_bus_req, S_IRUGO | S_IWUSR, get_b_bus_req, set_b_bus_req);
-
-static ssize_t
-set_a_clr_err(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (!iotg->otg.default_a)
-                return -1;
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '1') {
-                iotg->hsm.a_clr_err = 1;
-                dev_dbg(lnw->dev, "User request: a_clr_err = 1\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(a_clr_err, S_IWUSR, NULL, set_a_clr_err);
-
-static struct attribute *inputs_attrs[] = {
-        &dev_attr_a_bus_req.attr,
-        &dev_attr_a_bus_drop.attr,
-        &dev_attr_b_bus_req.attr,
-        &dev_attr_a_clr_err.attr,
-        NULL,
-};
-
-static struct attribute_group debug_dev_attr_group = {
-        .name = "inputs",
-        .attrs = inputs_attrs,
-};
-
-static int langwell_otg_probe(struct pci_dev *pdev,
-                const struct pci_device_id *id)
-{
-        unsigned long           resource, len;
-        void __iomem            *base = NULL;
-        int                     retval;
-        u32                     val32;
-        struct langwell_otg     *lnw;
-        char                    qname[] = "langwell_otg_queue";
-
-        retval = 0;
-        dev_dbg(&pdev->dev, "\notg controller is detected.\n");
-        if (pci_enable_device(pdev) < 0) {
-                retval = -ENODEV;
-                goto done;
-        }
-
-        lnw = kzalloc(sizeof *lnw, GFP_KERNEL);
-        if (lnw == NULL) {
-                retval = -ENOMEM;
-                goto done;
-        }
-        the_transceiver = lnw;
-
-        /* control register: BAR 0 */
-        resource = pci_resource_start(pdev, 0);
-        len = pci_resource_len(pdev, 0);
-        if (!request_mem_region(resource, len, driver_name)) {
-                retval = -EBUSY;
-                goto err;
-        }
-        lnw->region = 1;
-
-        base = ioremap_nocache(resource, len);
-        if (base == NULL) {
-                retval = -EFAULT;
-                goto err;
-        }
-        lnw->iotg.base = base;
-
-        if (!request_mem_region(USBCFG_ADDR, USBCFG_LEN, driver_name)) {
-                retval = -EBUSY;
-                goto err;
-        }
-        lnw->cfg_region = 1;
-
-        /* For the SCCB.USBCFG register */
-        base = ioremap_nocache(USBCFG_ADDR, USBCFG_LEN);
-        if (base == NULL) {
-                retval = -EFAULT;
-                goto err;
-        }
-        lnw->usbcfg = base;
-
-        if (!pdev->irq) {
-                dev_dbg(&pdev->dev, "No IRQ.\n");
-                retval = -ENODEV;
-                goto err;
-        }
-
-        lnw->qwork = create_singlethread_workqueue(qname);
-        if (!lnw->qwork) {
-                dev_dbg(&pdev->dev, "cannot create workqueue %s\n", qname);
-                retval = -ENOMEM;
-                goto err;
-        }
-        INIT_WORK(&lnw->work, langwell_otg_work);
-
-        /* OTG common part */
-        lnw->dev = &pdev->dev;
-        lnw->iotg.otg.dev = lnw->dev;
-        lnw->iotg.otg.label = driver_name;
-        lnw->iotg.otg.set_host = langwell_otg_set_host;
-        lnw->iotg.otg.set_peripheral = langwell_otg_set_peripheral;
-        lnw->iotg.otg.set_power = langwell_otg_set_power;
-        lnw->iotg.otg.set_vbus = langwell_otg_set_vbus;
-        lnw->iotg.otg.start_srp = langwell_otg_start_srp;
-        lnw->iotg.otg.state = OTG_STATE_UNDEFINED;
-
-        if (otg_set_transceiver(&lnw->iotg.otg)) {
-                dev_dbg(lnw->dev, "can't set transceiver\n");
-                retval = -EBUSY;
-                goto err;
-        }
-
-        reset_otg();
-        init_hsm();
-
-        spin_lock_init(&lnw->lock);
-        spin_lock_init(&lnw->wq_lock);
-        INIT_LIST_HEAD(&active_timers);
-        retval = langwell_otg_init_timers(&lnw->iotg.hsm);
-        if (retval) {
-                dev_dbg(&pdev->dev, "Failed to init timers\n");
-                goto err;
-        }
-
-        init_timer(&lnw->hsm_timer);
-        ATOMIC_INIT_NOTIFIER_HEAD(&lnw->iotg.iotg_notifier);
-
-        lnw->iotg_notifier.notifier_call = langwell_otg_iotg_notify;
-
-        retval = intel_mid_otg_register_notifier(&lnw->iotg,
-                                                &lnw->iotg_notifier);
-        if (retval) {
-                dev_dbg(lnw->dev, "Failed to register notifier\n");
-                goto err;
-        }
-
-        if (request_irq(pdev->irq, otg_irq, IRQF_SHARED,
-                                driver_name, lnw) != 0) {
-                dev_dbg(lnw->dev, "request interrupt %d failed\n", pdev->irq);
-                retval = -EBUSY;
-                goto err;
-        }
-
-        /* enable OTGSC int */
-        val32 = OTGSC_DPIE | OTGSC_BSEIE | OTGSC_BSVIE |
-                OTGSC_ASVIE | OTGSC_AVVIE | OTGSC_IDIE | OTGSC_IDPU;
-        writel(val32, lnw->iotg.base + CI_OTGSC);
-
-        retval = device_create_file(&pdev->dev, &dev_attr_registers);
-        if (retval < 0) {
-                dev_dbg(lnw->dev,
-                        "Can't register sysfs attribute: %d\n", retval);
-                goto err;
-        }
-
-        retval = device_create_file(&pdev->dev, &dev_attr_hsm);
-        if (retval < 0) {
-                dev_dbg(lnw->dev, "Can't hsm sysfs attribute: %d\n", retval);
-                goto err;
-        }
-
-        retval = sysfs_create_group(&pdev->dev.kobj, &debug_dev_attr_group);
-        if (retval < 0) {
-                dev_dbg(lnw->dev,
-                        "Can't register sysfs attr group: %d\n", retval);
-                goto err;
-        }
-
-        if (lnw->iotg.otg.state == OTG_STATE_A_IDLE)
-                langwell_update_transceiver();
-
-        return 0;
-
-err:
-        if (the_transceiver)
-                langwell_otg_remove(pdev);
-done:
-        return retval;
-}
-
-static void langwell_otg_remove(struct pci_dev *pdev)
-{
-        struct langwell_otg *lnw = the_transceiver;
-
-        if (lnw->qwork) {
-                flush_workqueue(lnw->qwork);
-                destroy_workqueue(lnw->qwork);
-        }
-        intel_mid_otg_unregister_notifier(&lnw->iotg, &lnw->iotg_notifier);
-        langwell_otg_free_timers();
-
-        /* disable OTGSC interrupt as OTGSC doesn't change in reset */
-        writel(0, lnw->iotg.base + CI_OTGSC);
-
-        if (pdev->irq)
-                free_irq(pdev->irq, lnw);
-        if (lnw->usbcfg)
-                iounmap(lnw->usbcfg);
-        if (lnw->cfg_region)
-                release_mem_region(USBCFG_ADDR, USBCFG_LEN);
-        if (lnw->iotg.base)
-                iounmap(lnw->iotg.base);
-        if (lnw->region)
-                release_mem_region(pci_resource_start(pdev, 0),
-                                pci_resource_len(pdev, 0));
-
-        otg_set_transceiver(NULL);
-        pci_disable_device(pdev);
-        sysfs_remove_group(&pdev->dev.kobj, &debug_dev_attr_group);
-        device_remove_file(&pdev->dev, &dev_attr_hsm);
-        device_remove_file(&pdev->dev, &dev_attr_registers);
-        kfree(lnw);
-        lnw = NULL;
-}
-
-static void transceiver_suspend(struct pci_dev *pdev)
-{
-        pci_save_state(pdev);
-        pci_set_power_state(pdev, PCI_D3hot);
-        langwell_otg_phy_low_power(1);
-}
-
-static int langwell_otg_suspend(struct pci_dev *pdev, pm_message_t message)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        int                             ret = 0;
-
-        /* Disbale OTG interrupts */
-        langwell_otg_intr(0);
-
-        if (pdev->irq)
-                free_irq(pdev->irq, lnw);
-
-        /* Prevent more otg_work */
-        flush_workqueue(lnw->qwork);
-        destroy_workqueue(lnw->qwork);
-        lnw->qwork = NULL;
-
-        /* start actions */
-        switch (iotg->otg.state) {
-        case OTG_STATE_A_WAIT_VFALL:
-                iotg->otg.state = OTG_STATE_A_IDLE;
-        case OTG_STATE_A_IDLE:
-        case OTG_STATE_B_IDLE:
-        case OTG_STATE_A_VBUS_ERR:
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_WAIT_VRISE:
-                langwell_otg_del_timer(a_wait_vrise_tmr);
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_WAIT_BCON:
-                del_timer_sync(&lnw->hsm_timer);
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_HOST:
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_SUSPEND:
-                langwell_otg_del_timer(a_aidl_bdis_tmr);
-                langwell_otg_HABA(0);
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(lnw->dev, "host driver has been removed.\n");
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_PERIPHERAL:
-                del_timer_sync(&lnw->hsm_timer);
-
-                if (lnw->iotg.stop_peripheral)
-                        lnw->iotg.stop_peripheral(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev,
-                                "client driver has been removed.\n");
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_B_HOST:
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-                iotg->hsm.b_bus_req = 0;
-                iotg->otg.state = OTG_STATE_B_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_B_PERIPHERAL:
-                if (lnw->iotg.stop_peripheral)
-                        lnw->iotg.stop_peripheral(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev,
-                                "client driver has been removed.\n");
-                iotg->otg.state = OTG_STATE_B_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_B_WAIT_ACON:
-                /* delete hsm timer for b_ase0_brst_tmr */
-                del_timer_sync(&lnw->hsm_timer);
-
-                langwell_otg_HAAR(0);
-
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-                iotg->hsm.b_bus_req = 0;
-                iotg->otg.state = OTG_STATE_B_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        default:
-                dev_dbg(lnw->dev, "error state before suspend\n");
-                break;
-        }
-
-        return ret;
-}
-
-static void transceiver_resume(struct pci_dev *pdev)
-{
-        pci_restore_state(pdev);
-        pci_set_power_state(pdev, PCI_D0);
-}
-
-static int langwell_otg_resume(struct pci_dev *pdev)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        int                     ret = 0;
-
-        transceiver_resume(pdev);
-
-        lnw->qwork = create_singlethread_workqueue("langwell_otg_queue");
-        if (!lnw->qwork) {
-                dev_dbg(&pdev->dev, "cannot create langwell otg workqueuen");
-                ret = -ENOMEM;
-                goto error;
-        }
-
-        if (request_irq(pdev->irq, otg_irq, IRQF_SHARED,
-                                driver_name, lnw) != 0) {
-                dev_dbg(&pdev->dev, "request interrupt %d failed\n", pdev->irq);
-                ret = -EBUSY;
-                goto error;
-        }
-
-        /* enable OTG interrupts */
-        langwell_otg_intr(1);
-
-        update_hsm();
-
-        langwell_update_transceiver();
-
-        return ret;
-error:
-        langwell_otg_intr(0);
-        transceiver_suspend(pdev);
-        return ret;
-}
-
-static int __init langwell_otg_init(void)
-{
-        return pci_register_driver(&otg_pci_driver);
-}
-module_init(langwell_otg_init);
-
-static void __exit langwell_otg_cleanup(void)
-{
-        pci_unregister_driver(&otg_pci_driver);
-}
-module_exit(langwell_otg_cleanup);
diff --git a/drivers/usb/otg/mv_otg.c b/drivers/usb/otg/mv_otg.c
index db0d4fcdc8e2..b5fbe1452ab0 100644
--- a/drivers/usb/otg/mv_otg.c
+++ b/drivers/usb/otg/mv_otg.c
@@ -202,6 +202,7 @@ static void mv_otg_init_irq(struct mv_otg *mvotg)
 
 static void mv_otg_start_host(struct mv_otg *mvotg, int on)
 {
+#ifdef CONFIG_USB
         struct otg_transceiver *otg = &mvotg->otg;
         struct usb_hcd *hcd;
 
@@ -216,6 +217,7 @@ static void mv_otg_start_host(struct mv_otg *mvotg, int on)
                 usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
         else
                 usb_remove_hcd(hcd);
+#endif /* CONFIG_USB */
 }
 
 static void mv_otg_start_periphrals(struct mv_otg *mvotg, int on)
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 528691d5f3e2..7542aa94a462 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -425,7 +425,7 @@ static int usbhsg_recip_run_handle(struct usbhs_priv *priv,
         struct usbhs_pipe *pipe;
         int recip = ctrl->bRequestType & USB_RECIP_MASK;
         int nth = le16_to_cpu(ctrl->wIndex) & USB_ENDPOINT_NUMBER_MASK;
-        int ret;
+        int ret = 0;
         int (*func)(struct usbhs_priv *priv, struct usbhsg_uep *uep,
                     struct usb_ctrlrequest *ctrl);
         char *msg;
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index fba1147ed916..08a5575724cd 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -39,6 +39,8 @@ static void cp210x_get_termios(struct tty_struct *,
         struct usb_serial_port *port);
 static void cp210x_get_termios_port(struct usb_serial_port *port,
         unsigned int *cflagp, unsigned int *baudp);
+static void cp210x_change_speed(struct tty_struct *, struct usb_serial_port *,
+                                                        struct ktermios *);
 static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *,
                                                         struct ktermios*);
 static int cp210x_tiocmget(struct tty_struct *);
@@ -134,10 +136,13 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x16DC, 0x0011) }, /* W-IE-NE-R Plein & Baus GmbH RCM Remote Control for MARATON Power Supply */
         { USB_DEVICE(0x16DC, 0x0012) }, /* W-IE-NE-R Plein & Baus GmbH MPOD Multi Channel Power Supply */
         { USB_DEVICE(0x16DC, 0x0015) }, /* W-IE-NE-R Plein & Baus GmbH CML Control, Monitoring and Data Logger */
+        { USB_DEVICE(0x17A8, 0x0001) }, /* Kamstrup Optical Eye/3-wire */
+        { USB_DEVICE(0x17A8, 0x0005) }, /* Kamstrup M-Bus Master MultiPort 250D */
         { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */
         { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */
         { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
         { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */
+        { USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */
         { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */
         { } /* Terminating Entry */
 };
@@ -201,6 +206,8 @@ static struct usb_serial_driver cp210x_device = {
 #define CP210X_EMBED_EVENTS     0x15
 #define CP210X_GET_EVENTSTATE   0x16
 #define CP210X_SET_CHARS        0x19
+#define CP210X_GET_BAUDRATE     0x1D
+#define CP210X_SET_BAUDRATE     0x1E
 
 /* CP210X_IFC_ENABLE */
 #define UART_ENABLE             0x0001
@@ -360,8 +367,8 @@ static inline int cp210x_set_config_single(struct usb_serial_port *port,
  * Quantises the baud rate as per AN205 Table 1
  */
 static unsigned int cp210x_quantise_baudrate(unsigned int baud) {
-        if      (baud <= 56)       baud = 0;
-        else if (baud <= 300)      baud = 300;
+        if (baud <= 300)
+                baud = 300;
         else if (baud <= 600)      baud = 600;
         else if (baud <= 1200)     baud = 1200;
         else if (baud <= 1800)     baud = 1800;
@@ -389,10 +396,10 @@ static unsigned int cp210x_quantise_baudrate(unsigned int baud) {
         else if (baud <= 491520)   baud = 460800;
         else if (baud <= 567138)   baud = 500000;
         else if (baud <= 670254)   baud = 576000;
-        else if (baud <= 1053257)  baud = 921600;
-        else if (baud <= 1474560)  baud = 1228800;
-        else if (baud <= 2457600)  baud = 1843200;
-        else                       baud = 3686400;
+        else if (baud < 1000000)
+                baud = 921600;
+        else if (baud > 2000000)
+                baud = 2000000;
         return baud;
 }
 
@@ -409,13 +416,14 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
                 return result;
         }
 
-        result = usb_serial_generic_open(tty, port);
-        if (result)
-                return result;
-
         /* Configure the termios structure */
         cp210x_get_termios(tty, port);
-        return 0;
+
+        /* The baud rate must be initialised on cp2104 */
+        if (tty)
+                cp210x_change_speed(tty, port, NULL);
+
+        return usb_serial_generic_open(tty, port);
 }
 
 static void cp210x_close(struct usb_serial_port *port)
@@ -467,10 +475,7 @@ static void cp210x_get_termios_port(struct usb_serial_port *port,
 
         dbg("%s - port %d", __func__, port->number);
 
-        cp210x_get_config(port, CP210X_GET_BAUDDIV, &baud, 2);
-        /* Convert to baudrate */
-        if (baud)
-                baud = cp210x_quantise_baudrate((BAUD_RATE_GEN_FREQ + baud/2)/ baud);
+        cp210x_get_config(port, CP210X_GET_BAUDRATE, &baud, 4);
 
         dbg("%s - baud rate = %d", __func__, baud);
         *baudp = baud;
@@ -579,11 +584,64 @@ static void cp210x_get_termios_port(struct usb_serial_port *port,
         *cflagp = cflag;
 }
 
+/*
+ * CP2101 supports the following baud rates:
+ *
+ *      300, 600, 1200, 1800, 2400, 4800, 7200, 9600, 14400, 19200, 28800,
+ *      38400, 56000, 57600, 115200, 128000, 230400, 460800, 921600
+ *
+ * CP2102 and CP2103 support the following additional rates:
+ *
+ *      4000, 16000, 51200, 64000, 76800, 153600, 250000, 256000, 500000,
+ *      576000
+ *
+ * The device will map a requested rate to a supported one, but the result
+ * of requests for rates greater than 1053257 is undefined (see AN205).
+ *
+ * CP2104, CP2105 and CP2110 support most rates up to 2M, 921k and 1M baud,
+ * respectively, with an error less than 1%. The actual rates are determined
+ * by
+ *
+ *      div = round(freq / (2 x prescale x request))
+ *      actual = freq / (2 x prescale x div)
+ *
+ * For CP2104 and CP2105 freq is 48Mhz and prescale is 4 for request <= 365bps
+ * or 1 otherwise.
+ * For CP2110 freq is 24Mhz and prescale is 4 for request <= 300bps or 1
+ * otherwise.
+ */
+static void cp210x_change_speed(struct tty_struct *tty,
+                struct usb_serial_port *port, struct ktermios *old_termios)
+{
+        u32 baud;
+
+        baud = tty->termios->c_ospeed;
+
+        /* This maps the requested rate to a rate valid on cp2102 or cp2103,
+         * or to an arbitrary rate in [1M,2M].
+         *
+         * NOTE: B0 is not implemented.
+         */
+        baud = cp210x_quantise_baudrate(baud);
+
+        dbg("%s - setting baud rate to %u", __func__, baud);
+        if (cp210x_set_config(port, CP210X_SET_BAUDRATE, &baud,
+                                                        sizeof(baud))) {
+                dev_warn(&port->dev, "failed to set baud rate to %u\n", baud);
+                if (old_termios)
+                        baud = old_termios->c_ospeed;
+                else
+                        baud = 9600;
+        }
+
+        tty_encode_baud_rate(tty, baud, baud);
+}
+
 static void cp210x_set_termios(struct tty_struct *tty,
                 struct usb_serial_port *port, struct ktermios *old_termios)
 {
         unsigned int cflag, old_cflag;
-        unsigned int baud = 0, bits;
+        unsigned int bits;
         unsigned int modem_ctl[4];
 
         dbg("%s - port %d", __func__, port->number);
@@ -593,20 +651,9 @@ static void cp210x_set_termios(struct tty_struct *tty,
 
         cflag = tty->termios->c_cflag;
         old_cflag = old_termios->c_cflag;
-        baud = cp210x_quantise_baudrate(tty_get_baud_rate(tty));
-
-        /* If the baud rate is to be updated*/
-        if (baud != tty_termios_baud_rate(old_termios) && baud != 0) {
-                dbg("%s - Setting baud rate to %d baud", __func__,
-                                baud);
-                if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV,
-                                        ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) {
-                        dbg("Baud rate requested not supported by device");
-                        baud = tty_termios_baud_rate(old_termios);
-                }
-        }
-        /* Report back the resulting baud rate */
-        tty_encode_baud_rate(tty, baud, baud);
+
+        if (tty->termios->c_ospeed != old_termios->c_ospeed)
+                cp210x_change_speed(tty, port, old_termios);
 
         /* If the number of data bits is to be updated */
         if ((cflag & CSIZE) != (old_cflag & CSIZE)) {
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 01b6404df395..f770415305f8 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -797,6 +797,7 @@ static struct usb_device_id id_table_combined [] = {
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+        { USB_DEVICE(HORNBY_VID, HORNBY_ELITE_PID) },
         { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
         { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
@@ -805,6 +806,8 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
         { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+        { USB_DEVICE(FTDI_VID, TI_XDS100V2_PID),
+                .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
         { USB_DEVICE(FTDI_VID, HAMEG_HO720_PID) },
         { USB_DEVICE(FTDI_VID, HAMEG_HO730_PID) },
@@ -836,11 +839,13 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_CINTERION_MC55I_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_DOTEC_PID) },
         { USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(ST_VID, ST_STMCLT1030_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk },
+        { USB_DEVICE(FTDI_VID, FTDI_RF_R106) },
         { },                                    /* Optional parameter entry */
         { }                                     /* Terminating entry */
 };
@@ -1333,8 +1338,7 @@ static int set_serial_info(struct tty_struct *tty,
                 goto check_and_exit;
         }
 
-        if ((new_serial.baud_base != priv->baud_base) &&
-            (new_serial.baud_base < 9600)) {
+        if (new_serial.baud_base != priv->baud_base) {
                 mutex_unlock(&priv->cfg_lock);
                 return -EINVAL;
         }
@@ -1824,6 +1828,7 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port)
 
 static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
+        struct ktermios dummy;
         struct usb_device *dev = port->serial->dev;
         struct ftdi_private *priv = usb_get_serial_port_data(port);
         int result;
@@ -1842,8 +1847,10 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
            This is same behaviour as serial.c/rs_open() - Kuba */
 
         /* ftdi_set_termios  will send usb control messages */
-        if (tty)
-                ftdi_set_termios(tty, port, tty->termios);
+        if (tty) {
+                memset(&dummy, 0, sizeof(dummy));
+                ftdi_set_termios(tty, port, &dummy);
+        }
 
         /* Start reading from the device */
         result = usb_serial_generic_open(tty, port);
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index df1d7da933ec..6f6058f0db1b 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -39,6 +39,13 @@
 /* www.candapter.com Ewert Energy Systems CANdapter device */
 #define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */
 
+/*
+ * Texas Instruments XDS100v2 JTAG / BeagleBone A3
+ * http://processors.wiki.ti.com/index.php/XDS100
+ * http://beagleboard.org/bone
+ */
+#define TI_XDS100V2_PID         0xa6d0
+
 #define FTDI_NXTCAM_PID         0xABB8 /* NXTCam for Mindstorms NXT */
 
 /* US Interface Navigator (http://www.usinterface.com/) */
@@ -525,6 +532,12 @@
 #define ADI_GNICEPLUS_PID       0xF001
 
 /*
+ * Hornby Elite
+ */
+#define HORNBY_VID              0x04D8
+#define HORNBY_ELITE_PID        0x000A
+
+/*
  * RATOC REX-USB60F
  */
 #define RATOC_VENDOR_ID         0x0584
@@ -1168,3 +1181,16 @@
  */
 /* TagTracer MIFARE*/
 #define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID    0xF7C0
+
+/*
+ * Rainforest Automation
+ */
+/* ZigBee controller */
+#define FTDI_RF_R106            0x8A28
+
+/*
+ * Product: HCP HIT GPRS modem
+ * Manufacturer: HCP d.o.o.
+ * ATI command output: Cinterion MC55i
+ */
+#define FTDI_CINTERION_MC55I_PID        0xA951
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 65bf06aa591a..5818bfc3261e 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2657,15 +2657,7 @@ cleanup:
 
 static void edge_disconnect(struct usb_serial *serial)
 {
-        int i;
-        struct edgeport_port *edge_port;
-
         dbg("%s", __func__);
-
-        for (i = 0; i < serial->num_ports; ++i) {
-                edge_port = usb_get_serial_port_data(serial->port[i]);
-                edge_remove_sysfs_attrs(edge_port->port);
-        }
 }
 
 static void edge_release(struct usb_serial *serial)
@@ -2744,6 +2736,7 @@ static struct usb_serial_driver edgeport_1port_device = {
         .disconnect             = edge_disconnect,
         .release                = edge_release,
         .port_probe             = edge_create_sysfs_attrs,
+        .port_remove            = edge_remove_sysfs_attrs,
         .ioctl                  = edge_ioctl,
         .set_termios            = edge_set_termios,
         .tiocmget               = edge_tiocmget,
@@ -2775,6 +2768,7 @@ static struct usb_serial_driver edgeport_2port_device = {
         .disconnect             = edge_disconnect,
         .release                = edge_release,
         .port_probe             = edge_create_sysfs_attrs,
+        .port_remove            = edge_remove_sysfs_attrs,
         .ioctl                  = edge_ioctl,
         .set_termios            = edge_set_termios,
         .tiocmget               = edge_tiocmget,
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 5d3beeeb5fd9..a92a3efb507b 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -38,7 +38,7 @@
 #include <linux/ioctl.h>
 #include "kobil_sct.h"
 
-static int debug;
+static bool debug;
 
 /* Version Information */
 #define DRIVER_VERSION "21/05/2004"
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 420d9857394a..b54afceb9611 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -480,6 +480,10 @@ static void option_instat_callback(struct urb *urb);
 #define ZD_VENDOR_ID                            0x0685
 #define ZD_PRODUCT_7000                         0x7000
 
+/* LG products */
+#define LG_VENDOR_ID                            0x1004
+#define LG_PRODUCT_L02C                         0x618f
+
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
                 OPTION_BLACKLIST_NONE = 0,
@@ -784,7 +788,6 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0012, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0013, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0014, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0016, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff),
@@ -799,7 +802,6 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0024, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0025, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
-        /* { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0026, 0xff, 0xff, 0xff) }, */
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0028, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0029, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0030, 0xff, 0xff, 0xff) },
@@ -824,7 +826,6 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0051, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0052, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
-        /* { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0053, 0xff, 0xff, 0xff) }, */
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0054, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0055, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
@@ -832,7 +833,6 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0057, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0058, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0059, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0061, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0062, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0063, 0xff, 0xff, 0xff),
@@ -842,7 +842,6 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0066, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0067, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0069, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0070, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0076, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0077, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0078, 0xff, 0xff, 0xff) },
@@ -851,6 +850,16 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0083, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0086, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0087, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0088, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0089, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0090, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0091, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0092, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0093, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0094, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0095, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0096, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0097, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0104, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0105, 0xff, 0xff, 0xff) },
@@ -871,23 +880,18 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0143, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0144, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0145, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0146, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0147, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0148, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0149, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0150, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0151, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0152, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0153, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0154, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0155, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0156, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0157, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0158, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0159, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0160, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0161, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0162, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0164, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0165, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff) },
@@ -1062,17 +1066,27 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1298, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1299, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1300, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff,
+          0xff, 0xff), .driver_info = (kernel_ulong_t)&zte_k3765_z_blacklist },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2003, 0xff, 0xff, 0xff) },
+
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0014, 0xff, 0xff, 0xff) }, /* ZTE CDMA products */
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0027, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0059, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0060, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0070, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0073, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0094, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0130, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0133, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0141, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff,
-          0xff, 0xff), .driver_info = (kernel_ulong_t)&zte_k3765_z_blacklist },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2003, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0147, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0152, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0168, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0170, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0176, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0178, 0xff, 0xff, 0xff) },
+
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
@@ -1183,6 +1197,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU526) },
         { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) },
+        { USB_DEVICE(LG_VENDOR_ID, LG_PRODUCT_L02C) }, /* docomo L-02C modem */
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/qcaux.c b/drivers/usb/serial/qcaux.c
index 30b73e68a904..a34819884c1a 100644
--- a/drivers/usb/serial/qcaux.c
+++ b/drivers/usb/serial/qcaux.c
@@ -36,6 +36,7 @@
 #define UTSTARCOM_PRODUCT_UM175_V1              0x3712
 #define UTSTARCOM_PRODUCT_UM175_V2              0x3714
 #define UTSTARCOM_PRODUCT_UM175_ALLTEL          0x3715
+#define PANTECH_PRODUCT_UML190_VZW              0x3716
 #define PANTECH_PRODUCT_UML290_VZW              0x3718
 
 /* CMOTECH devices */
@@ -67,7 +68,11 @@ static struct usb_device_id id_table[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(LG_VENDOR_ID, LG_PRODUCT_VX4400_6000, 0xff, 0xff, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(SANYO_VENDOR_ID, SANYO_PRODUCT_KATANA_LX, 0xff, 0xff, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_U520, 0xff, 0x00, 0x00) },
-        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML190_VZW, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML190_VZW, 0xff, 0xfe, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xfd, 0xff) },  /* NMEA */
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xfe, 0xff) },  /* WMC */
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xff, 0xff) },  /* DIAG */
         { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index 1d5deee3be52..f98800f2324c 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -36,6 +36,11 @@ static const struct usb_device_id id_table[] = {
         {USB_DEVICE(0x413c, 0x8171)},   /* Dell Gobi QDL device */
         {USB_DEVICE(0x1410, 0xa001)},   /* Novatel Gobi Modem device */
         {USB_DEVICE(0x1410, 0xa008)},   /* Novatel Gobi QDL device */
+        {USB_DEVICE(0x1410, 0xa010)},   /* Novatel Gobi QDL device */
+        {USB_DEVICE(0x1410, 0xa011)},   /* Novatel Gobi QDL device */
+        {USB_DEVICE(0x1410, 0xa012)},   /* Novatel Gobi QDL device */
+        {USB_DEVICE(0x1410, 0xa013)},   /* Novatel Gobi QDL device */
+        {USB_DEVICE(0x1410, 0xa014)},   /* Novatel Gobi QDL device */
         {USB_DEVICE(0x0b05, 0x1776)},   /* Asus Gobi Modem device */
         {USB_DEVICE(0x0b05, 0x1774)},   /* Asus Gobi QDL device */
         {USB_DEVICE(0x19d2, 0xfff3)},   /* ONDA Gobi Modem device */
@@ -86,7 +91,16 @@ static const struct usb_device_id id_table[] = {
         {USB_DEVICE(0x16d8, 0x8002)},   /* CMDTech Gobi 2000 Modem device (VU922) */
         {USB_DEVICE(0x05c6, 0x9204)},   /* Gobi 2000 QDL device */
         {USB_DEVICE(0x05c6, 0x9205)},   /* Gobi 2000 Modem device */
+
+        {USB_DEVICE(0x05c6, 0x920c)},   /* Gobi 3000 QDL */
+        {USB_DEVICE(0x05c6, 0x920d)},   /* Gobi 3000 Composite */
+        {USB_DEVICE(0x1410, 0xa020)},   /* Novatel Gobi 3000 QDL */
+        {USB_DEVICE(0x1410, 0xa021)},   /* Novatel Gobi 3000 Composite */
+        {USB_DEVICE(0x413c, 0x8193)},   /* Dell Gobi 3000 QDL */
+        {USB_DEVICE(0x413c, 0x8194)},   /* Dell Gobi 3000 Composite */
         {USB_DEVICE(0x1199, 0x9013)},   /* Sierra Wireless Gobi 3000 Modem device (MC8355) */
+        {USB_DEVICE(0x12D1, 0x14F0)},   /* Sony Gobi 3000 QDL */
+        {USB_DEVICE(0x12D1, 0x14F1)},   /* Sony Gobi 3000 Composite */
         { }                             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, id_table);
@@ -123,8 +137,6 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
 
         spin_lock_init(&data->susp_lock);
 
-        usb_enable_autosuspend(serial->dev);
-
         switch (nintf) {
         case 1:
                 /* QDL mode */
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 8468eb769a29..75b838eff178 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -165,7 +165,7 @@ static unsigned int product_5052_count;
 /* the array dimension is the number of default entries plus */
 /* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */
 /* null entry */
-static struct usb_device_id ti_id_table_3410[13+TI_EXTRA_VID_PID_COUNT+1] = {
+static struct usb_device_id ti_id_table_3410[14+TI_EXTRA_VID_PID_COUNT+1] = {
         { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
         { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
         { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -179,6 +179,7 @@ static struct usb_device_id ti_id_table_3410[13+TI_EXTRA_VID_PID_COUNT+1] = {
         { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
         { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
         { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
+        { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },
 };
 
 static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = {
@@ -188,7 +189,7 @@ static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = {
         { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },
 };
 
-static struct usb_device_id ti_id_table_combined[17+2*TI_EXTRA_VID_PID_COUNT+1] = {
+static struct usb_device_id ti_id_table_combined[18+2*TI_EXTRA_VID_PID_COUNT+1] = {
         { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
         { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
         { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) },
@@ -206,6 +207,7 @@ static struct usb_device_id ti_id_table_combined[17+2*TI_EXTRA_VID_PID_COUNT+1]
         { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
         { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
         { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
+        { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },
         { }
 };
 
diff --git a/drivers/usb/serial/ti_usb_3410_5052.h b/drivers/usb/serial/ti_usb_3410_5052.h
index 2aac1953993b..f140f1b9d5c0 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.h
+++ b/drivers/usb/serial/ti_usb_3410_5052.h
@@ -49,6 +49,10 @@
 #define MTS_MT9234ZBA_PRODUCT_ID        0xF115
 #define MTS_MT9234ZBAOLD_PRODUCT_ID     0x0319
 
+/* Abbott Diabetics vendor and product ids */
+#define ABBOTT_VENDOR_ID                0x1a61
+#define ABBOTT_PRODUCT_ID               0x3410
+
 /* Commands */
 #define TI_GET_VERSION                  0x01
 #define TI_GET_PORT_STATUS              0x02
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index 1f62723ef1a8..d32f72061c09 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -789,7 +789,7 @@ static void rts51x_suspend_timer_fn(unsigned long data)
                         rts51x_set_stat(chip, RTS51X_STAT_SS);
                         /* ignore mass storage interface's children */
                         pm_suspend_ignore_children(&us->pusb_intf->dev, true);
-                        usb_autopm_put_interface(us->pusb_intf);
+                        usb_autopm_put_interface_async(us->pusb_intf);
                         US_DEBUGP("%s: RTS51X_STAT_SS 01,"
                                 "intf->pm_usage_cnt:%d, power.usage:%d\n",
                                 __func__,
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 3dd7da9fd504..db51ba16dc07 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -788,15 +788,19 @@ static void quiesce_and_remove_host(struct us_data *us)
         struct Scsi_Host *host = us_to_host(us);
 
         /* If the device is really gone, cut short reset delays */
-        if (us->pusb_dev->state == USB_STATE_NOTATTACHED)
+        if (us->pusb_dev->state == USB_STATE_NOTATTACHED) {
                 set_bit(US_FLIDX_DISCONNECTING, &us->dflags);
+                wake_up(&us->delay_wait);
+        }
 
-        /* Prevent SCSI-scanning (if it hasn't started yet)
-         * and wait for the SCSI-scanning thread to stop.
+        /* Prevent SCSI scanning (if it hasn't started yet)
+         * or wait for the SCSI-scanning routine to stop.
          */
-        set_bit(US_FLIDX_DONT_SCAN, &us->dflags);
-        wake_up(&us->delay_wait);
-        wait_for_completion(&us->scanning_done);
+        cancel_delayed_work_sync(&us->scan_dwork);
+
+        /* Balance autopm calls if scanning was cancelled */
+        if (test_bit(US_FLIDX_SCAN_PENDING, &us->dflags))
+                usb_autopm_put_interface_no_suspend(us->pusb_intf);
 
         /* Removing the host will perform an orderly shutdown: caches
          * synchronized, disks spun down, etc.
@@ -823,53 +827,28 @@ static void release_everything(struct us_data *us)
         scsi_host_put(us_to_host(us));
 }
 
-/* Thread to carry out delayed SCSI-device scanning */
-static int usb_stor_scan_thread(void * __us)
+/* Delayed-work routine to carry out SCSI-device scanning */
+static void usb_stor_scan_dwork(struct work_struct *work)
 {
-        struct us_data *us = (struct us_data *)__us;
+        struct us_data *us = container_of(work, struct us_data,
+                        scan_dwork.work);
         struct device *dev = &us->pusb_intf->dev;
 
-        dev_dbg(dev, "device found\n");
-
-        set_freezable();
+        dev_dbg(dev, "starting scan\n");
 
-        /*
-         * Wait for the timeout to expire or for a disconnect
-         *
-         * We can't freeze in this thread or we risk causing khubd to
-         * fail to freeze, but we can't be non-freezable either. Nor can
-         * khubd freeze while waiting for scanning to complete as it may
-         * hold the device lock, causing a hang when suspending devices.
-         * So instead of using wait_event_freezable(), explicitly test
-         * for (DONT_SCAN || freezing) in interruptible wait and proceed
-         * if any of DONT_SCAN, freezing or timeout has happened.
-         */
-        if (delay_use > 0) {
-                dev_dbg(dev, "waiting for device to settle "
-                                "before scanning\n");
-                wait_event_interruptible_timeout(us->delay_wait,
-                                test_bit(US_FLIDX_DONT_SCAN, &us->dflags) ||
-                                freezing(current), delay_use * HZ);
+        /* For bulk-only devices, determine the max LUN value */
+        if (us->protocol == USB_PR_BULK && !(us->fflags & US_FL_SINGLE_LUN)) {
+                mutex_lock(&us->dev_mutex);
+                us->max_lun = usb_stor_Bulk_max_lun(us);
+                mutex_unlock(&us->dev_mutex);
         }
+        scsi_scan_host(us_to_host(us));
+        dev_dbg(dev, "scan complete\n");
 
-        /* If the device is still connected, perform the scanning */
-        if (!test_bit(US_FLIDX_DONT_SCAN, &us->dflags)) {
-
-                /* For bulk-only devices, determine the max LUN value */
-                if (us->protocol == USB_PR_BULK &&
-                                !(us->fflags & US_FL_SINGLE_LUN)) {
-                        mutex_lock(&us->dev_mutex);
-                        us->max_lun = usb_stor_Bulk_max_lun(us);
-                        mutex_unlock(&us->dev_mutex);
-                }
-                scsi_scan_host(us_to_host(us));
-                dev_dbg(dev, "scan complete\n");
-
-                /* Should we unbind if no devices were detected? */
-        }
+        /* Should we unbind if no devices were detected? */
 
         usb_autopm_put_interface(us->pusb_intf);
-        complete_and_exit(&us->scanning_done, 0);
+        clear_bit(US_FLIDX_SCAN_PENDING, &us->dflags);
 }
 
 static unsigned int usb_stor_sg_tablesize(struct usb_interface *intf)
@@ -916,7 +895,7 @@ int usb_stor_probe1(struct us_data **pus,
         init_completion(&us->cmnd_ready);
         init_completion(&(us->notify));
         init_waitqueue_head(&us->delay_wait);
-        init_completion(&us->scanning_done);
+        INIT_DELAYED_WORK(&us->scan_dwork, usb_stor_scan_dwork);
 
         /* Associate the us_data structure with the USB device */
         result = associate_dev(us, intf);
@@ -947,7 +926,6 @@ EXPORT_SYMBOL_GPL(usb_stor_probe1);
 /* Second part of general USB mass-storage probing */
 int usb_stor_probe2(struct us_data *us)
 {
-        struct task_struct *th;
         int result;
         struct device *dev = &us->pusb_intf->dev;
 
@@ -988,20 +966,14 @@ int usb_stor_probe2(struct us_data *us)
                 goto BadDevice;
         }
 
-        /* Start up the thread for delayed SCSI-device scanning */
-        th = kthread_create(usb_stor_scan_thread, us, "usb-stor-scan");
-        if (IS_ERR(th)) {
-                dev_warn(dev,
-                                "Unable to start the device-scanning thread\n");
-                complete(&us->scanning_done);
-                quiesce_and_remove_host(us);
-                result = PTR_ERR(th);
-                goto BadDevice;
-        }
-
+        /* Submit the delayed_work for SCSI-device scanning */
         usb_autopm_get_interface_no_resume(us->pusb_intf);
-        wake_up_process(th);
+        set_bit(US_FLIDX_SCAN_PENDING, &us->dflags);
 
+        if (delay_use > 0)
+                dev_dbg(dev, "waiting for device to settle before scanning\n");
+        queue_delayed_work(system_freezable_wq, &us->scan_dwork,
+                        delay_use * HZ);
         return 0;
 
         /* We come here if there are any problems */
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index 7b0f2113632e..75f70f04f37b 100644
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -47,6 +47,7 @@
 #include <linux/blkdev.h>
 #include <linux/completion.h>
 #include <linux/mutex.h>
+#include <linux/workqueue.h>
 #include <scsi/scsi_host.h>
 
 struct us_data;
@@ -72,7 +73,7 @@ struct us_unusual_dev {
 #define US_FLIDX_DISCONNECTING  3       /* disconnect in progress   */
 #define US_FLIDX_RESETTING      4       /* device reset in progress */
 #define US_FLIDX_TIMED_OUT      5       /* SCSI midlayer timed out  */
-#define US_FLIDX_DONT_SCAN      6       /* don't scan (disconnect)  */
+#define US_FLIDX_SCAN_PENDING   6       /* scanning not yet done    */
 #define US_FLIDX_REDO_READ10    7       /* redo READ(10) command    */
 #define US_FLIDX_READ10_WORKED  8       /* previous READ(10) succeeded */
 
@@ -147,8 +148,8 @@ struct us_data {
         /* mutual exclusion and synchronization structures */
         struct completion       cmnd_ready;      /* to sleep thread on      */
         struct completion       notify;          /* thread begin/end        */
-        wait_queue_head_t       delay_wait;      /* wait during scan, reset */
-        struct completion       scanning_done;   /* wait for scan thread    */
+        wait_queue_head_t       delay_wait;      /* wait during reset       */
+        struct delayed_work     scan_dwork;      /* for async scanning      */
 
         /* subdriver information */
         void                    *extra;          /* Any extra data          */
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index 8efeae24764f..b4a71679c933 100644
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -27,8 +27,6 @@
 #define USB_SKEL_VENDOR_ID      0xfff0
 #define USB_SKEL_PRODUCT_ID     0xfff0
 
-static DEFINE_MUTEX(skel_mutex);
-
 /* table of devices that work with this driver */
 static const struct usb_device_id skel_table[] = {
         { USB_DEVICE(USB_SKEL_VENDOR_ID, USB_SKEL_PRODUCT_ID) },
@@ -101,25 +99,18 @@ static int skel_open(struct inode *inode, struct file *file)
                 goto exit;
         }
 
-        mutex_lock(&skel_mutex);
         dev = usb_get_intfdata(interface);
         if (!dev) {
-                mutex_unlock(&skel_mutex);
                 retval = -ENODEV;
                 goto exit;
         }
 
         /* increment our usage count for the device */
         kref_get(&dev->kref);
-        mutex_unlock(&skel_mutex);
 
         /* lock the device to allow correctly handling errors
          * in resumption */
         mutex_lock(&dev->io_mutex);
-        if (!dev->interface) {
-                retval = -ENODEV;
-                goto out_err;
-        }
 
         retval = usb_autopm_get_interface(interface);
         if (retval)
@@ -127,11 +118,7 @@ static int skel_open(struct inode *inode, struct file *file)
 
         /* save our object in the file's private structure */
         file->private_data = dev;
-
-out_err:
         mutex_unlock(&dev->io_mutex);
-        if (retval)
-                kref_put(&dev->kref, skel_delete);
 
 exit:
         return retval;
@@ -611,6 +598,7 @@ static void skel_disconnect(struct usb_interface *interface)
         int minor = interface->minor;
 
         dev = usb_get_intfdata(interface);
+        usb_set_intfdata(interface, NULL);
 
         /* give back our minor */
         usb_deregister_dev(interface, &skel_class);
@@ -622,12 +610,8 @@ static void skel_disconnect(struct usb_interface *interface)
 
         usb_kill_anchored_urbs(&dev->submitted);
 
-        mutex_lock(&skel_mutex);
-        usb_set_intfdata(interface, NULL);
-
         /* decrement our usage count */
         kref_put(&dev->kref, skel_delete);
-        mutex_unlock(&skel_mutex);
 
         dev_info(&interface->dev, "USB Skeleton #%d now disconnected", minor);
 }
diff --git a/drivers/usb/wusbcore/Kconfig b/drivers/usb/wusbcore/Kconfig
index 0ead8826ec79..f29fdd7f6d75 100644
--- a/drivers/usb/wusbcore/Kconfig
+++ b/drivers/usb/wusbcore/Kconfig
@@ -6,7 +6,7 @@ config USB_WUSB
         depends on EXPERIMENTAL
         depends on USB
         depends on PCI
-        select UWB
+        depends on UWB
         select CRYPTO
         select CRYPTO_BLKCIPHER
         select CRYPTO_CBC
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 0d7b20d4285d..e40c00f2c2ba 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -1108,7 +1108,7 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
          */
         lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
 
-        sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
+        sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_CTR);
         lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
         if (sinfo->atmel_lcdfb_power_control)
                 sinfo->atmel_lcdfb_power_control(0);
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 66bc74d9ce2a..378276c9d3cf 100644
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -146,7 +146,7 @@ static int adp8860_set_bits(struct i2c_client *client, int reg, uint8_t bit_mask
 
         ret = adp8860_read(client, reg, &reg_val);
 
-        if (!ret && ((reg_val & bit_mask) == 0)) {
+        if (!ret && ((reg_val & bit_mask) != bit_mask)) {
                 reg_val |= bit_mask;
                 ret = adp8860_write(client, reg, reg_val);
         }
diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index 6c68a6899e87..6735059376d6 100644
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c
@@ -160,7 +160,7 @@ static int adp8870_set_bits(struct i2c_client *client, int reg, uint8_t bit_mask
 
         ret = adp8870_read(client, reg, &reg_val);
 
-        if (!ret && ((reg_val & bit_mask) == 0)) {
+        if (!ret && ((reg_val & bit_mask) != bit_mask)) {
                 reg_val |= bit_mask;
                 ret = adp8870_write(client, reg, reg_val);
         }
diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c
index 4f5d1c4cb6ab..27d1d7a29c77 100644
--- a/drivers/video/backlight/l4f00242t03.c
+++ b/drivers/video/backlight/l4f00242t03.c
@@ -190,6 +190,7 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
 
         priv->io_reg = regulator_get(&spi->dev, "vdd");
         if (IS_ERR(priv->io_reg)) {
+                ret = PTR_ERR(priv->io_reg);
                 dev_err(&spi->dev, "%s: Unable to get the IO regulator\n",
                        __func__);
                 goto err3;
@@ -197,6 +198,7 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
 
         priv->core_reg = regulator_get(&spi->dev, "vcore");
         if (IS_ERR(priv->core_reg)) {
+                ret = PTR_ERR(priv->core_reg);
                 dev_err(&spi->dev, "%s: Unable to get the core regulator\n",
                        __func__);
                 goto err4;
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index acf292bfba02..6af3f16754f0 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1432,7 +1432,7 @@ static int fsl_diu_suspend(struct platform_device *ofdev, pm_message_t state)
         struct fsl_diu_data *data;
 
         data = dev_get_drvdata(&ofdev->dev);
-        disable_lcdc(data->fsl_diu_info[0]);
+        disable_lcdc(data->fsl_diu_info);
 
         return 0;
 }
@@ -1442,7 +1442,7 @@ static int fsl_diu_resume(struct platform_device *ofdev)
         struct fsl_diu_data *data;
 
         data = dev_get_drvdata(&ofdev->dev);
-        enable_lcdc(data->fsl_diu_info[0]);
+        enable_lcdc(data->fsl_diu_info);
 
         return 0;
 }
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index c6afa33a4532..02fd2263610c 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -529,7 +529,6 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
         if (fb_alloc_cmap(&info->cmap, 256, 1) < 0) {
                 ERR_MSG("Could not allocate cmap for intelfb_info.\n");
                 goto err_out_cmap;
-                return -ENODEV;
         }
 
         dinfo = info->par;
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index 43207cc6cc19..fe01add3700e 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -592,12 +592,12 @@ static int __init macfb_init(void)
         if (!fb_info.screen_base)
                 return -ENODEV;
 
-        printk("macfb: framebuffer at 0x%08lx, mapped to 0x%p, size %dk\n",
-               macfb_fix.smem_start, fb_info.screen_base,
-               macfb_fix.smem_len / 1024);
-        printk("macfb: mode is %dx%dx%d, linelength=%d\n",
-               macfb_defined.xres, macfb_defined.yres,
-               macfb_defined.bits_per_pixel, macfb_fix.line_length);
+        pr_info("macfb: framebuffer at 0x%08lx, mapped to 0x%p, size %dk\n",
+                macfb_fix.smem_start, fb_info.screen_base,
+                macfb_fix.smem_len / 1024);
+        pr_info("macfb: mode is %dx%dx%d, linelength=%d\n",
+                macfb_defined.xres, macfb_defined.yres,
+                macfb_defined.bits_per_pixel, macfb_fix.line_length);
 
         /* Fill in the available video resolution */
         macfb_defined.xres_virtual = macfb_defined.xres;
@@ -613,14 +613,10 @@ static int __init macfb_init(void)
 
         switch (macfb_defined.bits_per_pixel) {
         case 1:
-                /*
-                 * XXX: I think this will catch any program that tries
-                 * to do FBIO_PUTCMAP when the visual is monochrome.
-                 */
                 macfb_defined.red.length = macfb_defined.bits_per_pixel;
                 macfb_defined.green.length = macfb_defined.bits_per_pixel;
                 macfb_defined.blue.length = macfb_defined.bits_per_pixel;
-                video_cmap_len = 0;
+                video_cmap_len = 2;
                 macfb_fix.visual = FB_VISUAL_MONO01;
                 break;
         case 2:
@@ -660,11 +656,10 @@ static int __init macfb_init(void)
                 macfb_fix.visual = FB_VISUAL_TRUECOLOR;
                 break;
         default:
-                video_cmap_len = 0;
-                macfb_fix.visual = FB_VISUAL_MONO01;
-                printk("macfb: unknown or unsupported bit depth: %d\n",
+                pr_err("macfb: unknown or unsupported bit depth: %d\n",
                        macfb_defined.bits_per_pixel);
-                break;
+                err = -EINVAL;
+                goto fail_unmap;
         }
         
         /*
@@ -734,8 +729,8 @@ static int __init macfb_init(void)
                 case MAC_MODEL_Q950:
                         strcpy(macfb_fix.id, "DAFB");
                         macfb_setpalette = dafb_setpalette;
-                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         dafb_cmap_regs = ioremap(DAFB_BASE, 0x1000);
+                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;
 
                 /*
@@ -744,8 +739,8 @@ static int __init macfb_init(void)
                 case MAC_MODEL_LCII:
                         strcpy(macfb_fix.id, "V8");
                         macfb_setpalette = v8_brazil_setpalette;
-                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
+                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;
 
                 /*
@@ -758,8 +753,8 @@ static int __init macfb_init(void)
                 case MAC_MODEL_P600:
                         strcpy(macfb_fix.id, "Brazil");
                         macfb_setpalette = v8_brazil_setpalette;
-                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
+                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;
 
                 /*
@@ -773,10 +768,10 @@ static int __init macfb_init(void)
                 case MAC_MODEL_P520:
                 case MAC_MODEL_P550:
                 case MAC_MODEL_P460:
-                        macfb_setpalette = v8_brazil_setpalette;
-                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         strcpy(macfb_fix.id, "Sonora");
+                        macfb_setpalette = v8_brazil_setpalette;
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
+                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;
 
                 /*
@@ -786,10 +781,10 @@ static int __init macfb_init(void)
                  */
                 case MAC_MODEL_IICI:
                 case MAC_MODEL_IISI:
-                        macfb_setpalette = rbv_setpalette;
-                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         strcpy(macfb_fix.id, "RBV");
+                        macfb_setpalette = rbv_setpalette;
                         rbv_cmap_regs = ioremap(DAC_BASE, 0x1000);
+                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;
 
                 /*
@@ -797,10 +792,10 @@ static int __init macfb_init(void)
                  */
                 case MAC_MODEL_Q840:
                 case MAC_MODEL_C660:
-                        macfb_setpalette = civic_setpalette;
-                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         strcpy(macfb_fix.id, "Civic");
+                        macfb_setpalette = civic_setpalette;
                         civic_cmap_regs = ioremap(CIVIC_BASE, 0x1000);
+                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;
 
                 
@@ -809,26 +804,26 @@ static int __init macfb_init(void)
                  * We think this may be like the LC II
                  */
                 case MAC_MODEL_LC:
+                        strcpy(macfb_fix.id, "LC");
                         if (vidtest) {
                                 macfb_setpalette = v8_brazil_setpalette;
-                                macfb_defined.activate = FB_ACTIVATE_NOW;
                                 v8_brazil_cmap_regs =
                                         ioremap(DAC_BASE, 0x1000);
+                                macfb_defined.activate = FB_ACTIVATE_NOW;
                         }
-                        strcpy(macfb_fix.id, "LC");
                         break;
 
                 /*
                  * We think this may be like the LC II
                  */
                 case MAC_MODEL_CCL:
+                        strcpy(macfb_fix.id, "Color Classic");
                         if (vidtest) {
                                 macfb_setpalette = v8_brazil_setpalette;
-                                macfb_defined.activate = FB_ACTIVATE_NOW;
                                 v8_brazil_cmap_regs =
                                         ioremap(DAC_BASE, 0x1000);
+                                macfb_defined.activate = FB_ACTIVATE_NOW;
                         }
-                        strcpy(macfb_fix.id, "Color Classic");
                         break;
 
                 /*
@@ -893,10 +888,10 @@ static int __init macfb_init(void)
                 case MAC_MODEL_PB270C:
                 case MAC_MODEL_PB280:
                 case MAC_MODEL_PB280C:
-                        macfb_setpalette = csc_setpalette;
-                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         strcpy(macfb_fix.id, "CSC");
+                        macfb_setpalette = csc_setpalette;
                         csc_cmap_regs = ioremap(CSC_BASE, 0x1000);
+                        macfb_defined.activate = FB_ACTIVATE_NOW;
                         break;
 
                 default:
@@ -918,8 +913,9 @@ static int __init macfb_init(void)
         if (err)
                 goto fail_dealloc;
 
-        printk("fb%d: %s frame buffer device\n",
-               fb_info.node, fb_info.fix.id);
+        pr_info("fb%d: %s frame buffer device\n",
+                fb_info.node, fb_info.fix.id);
+
         return 0;
 
 fail_dealloc:
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index a5ec7f37c185..e1626a1d5c45 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -401,7 +401,7 @@ void dispc_runtime_put(void)
 
         DSSDBG("dispc_runtime_put\n");
 
-        r = pm_runtime_put(&dispc.pdev->dev);
+        r = pm_runtime_put_sync(&dispc.pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 395d658a94fc..faaf305fda27 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -180,6 +180,11 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
 {
         int r;
 
+        if (cpu_is_omap34xx() && !dpi.vdds_dsi_reg) {
+                DSSERR("no VDSS_DSI regulator\n");
+                return -ENODEV;
+        }
+
         if (dssdev->manager == NULL) {
                 DSSERR("failed to enable display: no manager\n");
                 return -ENODEV;
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index d4d676c82c12..52f36ec1c8bb 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -1079,7 +1079,7 @@ void dsi_runtime_put(struct platform_device *dsidev)
 
         DSSDBG("dsi_runtime_put\n");
 
-        r = pm_runtime_put(&dsi->pdev->dev);
+        r = pm_runtime_put_sync(&dsi->pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 17033457ee89..77c2b5a32b5d 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -720,7 +720,7 @@ void dss_runtime_put(void)
 
         DSSDBG("dss_runtime_put\n");
 
-        r = pm_runtime_put(&dss.pdev->dev);
+        r = pm_runtime_put_sync(&dss.pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index b4c270edb915..d7aa3b056529 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -176,7 +176,7 @@ static void hdmi_runtime_put(void)
 
         DSSDBG("hdmi_runtime_put\n");
 
-        r = pm_runtime_put(&hdmi.pdev->dev);
+        r = pm_runtime_put_sync(&hdmi.pdev->dev);
         WARN_ON(r < 0);
 }
 
@@ -497,6 +497,7 @@ bool omapdss_hdmi_detect(void)
 
 int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)
 {
+        struct omap_dss_hdmi_data *priv = dssdev->data;
         int r = 0;
 
         DSSDBG("ENTER hdmi_display_enable\n");
@@ -509,6 +510,8 @@ int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)
                 goto err0;
         }
 
+        hdmi.ip_data.hpd_gpio = priv->hpd_gpio;
+
         r = omap_dss_start_device(dssdev);
         if (r) {
                 DSSERR("failed to start device\n");
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 814bb9500dca..55f398014f33 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -140,7 +140,7 @@ static void rfbi_runtime_put(void)
 
         DSSDBG("rfbi_runtime_put\n");
 
-        r = pm_runtime_put(&rfbi.pdev->dev);
+        r = pm_runtime_put_sync(&rfbi.pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/ti_hdmi.h b/drivers/video/omap2/dss/ti_hdmi.h
index 7503f7f619a7..50dadba5070a 100644
--- a/drivers/video/omap2/dss/ti_hdmi.h
+++ b/drivers/video/omap2/dss/ti_hdmi.h
@@ -126,6 +126,10 @@ struct hdmi_ip_data {
         const struct ti_hdmi_ip_ops *ops;
         struct hdmi_config cfg;
         struct hdmi_pll_info pll_data;
+
+        /* ti_hdmi_4xxx_ip private data. These should be in a separate struct */
+        int hpd_gpio;
+        bool phy_tx_enabled;
 };
 int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data);
 void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data);
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
index 9af81f18f163..2d72334ca3da 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/seq_file.h>
+#include <linux/gpio.h>
 
 #include "ti_hdmi_4xxx_ip.h"
 #include "dss.h"
@@ -223,6 +224,49 @@ void ti_hdmi_4xxx_pll_disable(struct hdmi_ip_data *ip_data)
         hdmi_set_pll_pwr(ip_data, HDMI_PLLPWRCMD_ALLOFF);
 }
 
+static int hdmi_check_hpd_state(struct hdmi_ip_data *ip_data)
+{
+        unsigned long flags;
+        bool hpd;
+        int r;
+        /* this should be in ti_hdmi_4xxx_ip private data */
+        static DEFINE_SPINLOCK(phy_tx_lock);
+
+        spin_lock_irqsave(&phy_tx_lock, flags);
+
+        hpd = gpio_get_value(ip_data->hpd_gpio);
+
+        if (hpd == ip_data->phy_tx_enabled) {
+                spin_unlock_irqrestore(&phy_tx_lock, flags);
+                return 0;
+        }
+
+        if (hpd)
+                r = hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_TXON);
+        else
+                r = hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_LDOON);
+
+        if (r) {
+                DSSERR("Failed to %s PHY TX power\n",
+                                hpd ? "enable" : "disable");
+                goto err;
+        }
+
+        ip_data->phy_tx_enabled = hpd;
+err:
+        spin_unlock_irqrestore(&phy_tx_lock, flags);
+        return r;
+}
+
+static irqreturn_t hpd_irq_handler(int irq, void *data)
+{
+        struct hdmi_ip_data *ip_data = data;
+
+        hdmi_check_hpd_state(ip_data);
+
+        return IRQ_HANDLED;
+}
+
 int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
 {
         u16 r = 0;
@@ -232,10 +276,6 @@ int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
         if (r)
                 return r;
 
-        r = hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_TXON);
-        if (r)
-                return r;
-
         /*
          * Read address 0 in order to get the SCP reset done completed
          * Dummy access performed to make sure reset is done
@@ -257,12 +297,32 @@ int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
         /* Write to phy address 3 to change the polarity control */
         REG_FLD_MOD(phy_base, HDMI_TXPHY_PAD_CFG_CTRL, 0x1, 27, 27);
 
+        r = request_threaded_irq(gpio_to_irq(ip_data->hpd_gpio),
+                        NULL, hpd_irq_handler,
+                        IRQF_DISABLED | IRQF_TRIGGER_RISING |
+                        IRQF_TRIGGER_FALLING, "hpd", ip_data);
+        if (r) {
+                DSSERR("HPD IRQ request failed\n");
+                hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
+                return r;
+        }
+
+        r = hdmi_check_hpd_state(ip_data);
+        if (r) {
+                free_irq(gpio_to_irq(ip_data->hpd_gpio), ip_data);
+                hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
+                return r;
+        }
+
         return 0;
 }
 
 void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data)
 {
+        free_irq(gpio_to_irq(ip_data->hpd_gpio), ip_data);
+
         hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
+        ip_data->phy_tx_enabled = false;
 }
 
 static int hdmi_core_ddc_init(struct hdmi_ip_data *ip_data)
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index b3e9f9091581..5c3d0f901510 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -401,7 +401,7 @@ static void venc_runtime_put(void)
 
         DSSDBG("venc_runtime_put\n");
 
-        r = pm_runtime_put(&venc.pdev->dev);
+        r = pm_runtime_put_sync(&venc.pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index f9975100d56d..3a3fdc62c75b 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -1061,7 +1061,7 @@ static struct pvr2_board {
         int (*init)(void);
         void (*exit)(void);
         char name[16];
-} board_driver[] = {
+} board_driver[] __refdata = {
 #ifdef CONFIG_SH_DREAMCAST
         { pvr2fb_dc_init, pvr2fb_dc_exit, "Sega DC PVR2" },
 #endif
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 79e1b292c030..5aa43c3392a2 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -35,7 +35,7 @@
 #define virtio_rmb(vq) \
         do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0)
 #define virtio_wmb(vq) \
-        do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0)
+        do { if ((vq)->weak_barriers) smp_wmb(); else wmb(); } while(0)
 #else
 /* We must force memory ordering even if guest is UP since host could be
  * running on another CPU, but SMP barriers are defined to barrier() in that
@@ -308,9 +308,9 @@ bool virtqueue_kick_prepare(struct virtqueue *_vq)
         bool needs_kick;
 
         START_USE(vq);
-        /* Descriptors and available array need to be set before we expose the
-         * new available array entries. */
-        virtio_wmb(vq);
+        /* We need to expose available array entries before checking avail
+         * event. */
+        virtio_mb(vq);
 
         old = vq->vring.avail->idx - vq->num_added;
         new = vq->vring.avail->idx;
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 1b0e3dd81c1a..63d7b58f1c7d 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -300,11 +300,7 @@ static int __devinit dw_wdt_drv_probe(struct platform_device *pdev)
         if (!mem)
                 return -EINVAL;
 
-        if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem),
-                                     "dw_wdt"))
-                return -ENOMEM;
-
-        dw_wdt.regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
+        dw_wdt.regs = devm_request_and_ioremap(&pdev->dev, mem);
         if (!dw_wdt.regs)
                 return -ENOMEM;
 
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 99796c5d913d..bdf401b240b5 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -36,6 +36,7 @@
  *      document number TBD                   : Patsburg (PBG)
  *      document number TBD                   : DH89xxCC
  *      document number TBD                   : Panther Point
+ *      document number TBD                   : Lynx Point
  */
 
 /*
@@ -126,6 +127,7 @@ enum iTCO_chipsets {
         TCO_PBG,        /* Patsburg */
         TCO_DH89XXCC,   /* DH89xxCC */
         TCO_PPT,        /* Panther Point */
+        TCO_LPT,        /* Lynx Point */
 };
 
 static struct {
@@ -189,6 +191,7 @@ static struct {
         {"Patsburg", 2},
         {"DH89xxCC", 2},
         {"Panther Point", 2},
+        {"Lynx Point", 2},
         {NULL, 0}
 };
 
@@ -331,6 +334,38 @@ static DEFINE_PCI_DEVICE_TABLE(iTCO_wdt_pci_tbl) = {
         { PCI_VDEVICE(INTEL, 0x1e5d), TCO_PPT},
         { PCI_VDEVICE(INTEL, 0x1e5e), TCO_PPT},
         { PCI_VDEVICE(INTEL, 0x1e5f), TCO_PPT},
+        { PCI_VDEVICE(INTEL, 0x8c40), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c41), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c42), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c43), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c44), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c45), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c46), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c47), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c48), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c49), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4a), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4b), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4c), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4d), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4e), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c4f), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c50), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c51), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c52), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c53), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c54), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c55), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c56), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c57), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c58), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c59), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5a), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5b), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5c), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5d), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5e), TCO_LPT},
+        { PCI_VDEVICE(INTEL, 0x8c5f), TCO_LPT},
         { 0, },                 /* End of list */
 };
 MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index b8ef2c6dca7c..c44c3334003a 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -247,7 +247,6 @@ static struct miscdevice imx2_wdt_miscdev = {
 static int __init imx2_wdt_probe(struct platform_device *pdev)
 {
         int ret;
-        int res_size;
         struct resource *res;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -256,15 +255,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        res_size = resource_size(res);
-        if (!devm_request_mem_region(&pdev->dev, res->start, res_size,
-                res->name)) {
-                dev_err(&pdev->dev, "can't allocate %d bytes at %d address\n",
-                        res_size, res->start);
-                return -ENOMEM;
-        }
-
-        imx2_wdt.base = devm_ioremap_nocache(&pdev->dev, res->start, res_size);
+        imx2_wdt.base = devm_request_and_ioremap(&pdev->dev, res);
         if (!imx2_wdt.base) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 return -ENOMEM;
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c
index 50359bad9177..529085b8b8fb 100644
--- a/drivers/watchdog/nuc900_wdt.c
+++ b/drivers/watchdog/nuc900_wdt.c
@@ -72,7 +72,7 @@ struct nuc900_wdt {
 };
 
 static unsigned long nuc900wdt_busy;
-struct nuc900_wdt *nuc900_wdt;
+static struct nuc900_wdt *nuc900_wdt;
 
 static inline void nuc900_wdt_keepalive(void)
 {
@@ -287,7 +287,8 @@ static int __devinit nuc900wdt_probe(struct platform_device *pdev)
 
         setup_timer(&nuc900_wdt->timer, nuc900_wdt_timer_ping, 0);
 
-        if (misc_register(&nuc900wdt_miscdev)) {
+        ret = misc_register(&nuc900wdt_miscdev);
+        if (ret) {
                 dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n",
                         WATCHDOG_MINOR, ret);
                 goto err_clk;
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 4b33e3fd726b..d19ff5145e82 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -339,6 +339,7 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev)
         return 0;
 
 err_misc:
+        pm_runtime_disable(wdev->dev);
         platform_set_drvdata(pdev, NULL);
         iounmap(wdev->base);
 
@@ -371,6 +372,7 @@ static int __devexit omap_wdt_remove(struct platform_device *pdev)
         struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
         struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
+        pm_runtime_disable(wdev->dev);
         if (!res)
                 return -ENOENT;
 
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index bd143c9dd3e6..8e210aafdfd0 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -226,7 +226,7 @@ static long pnx4008_wdt_ioctl(struct file *file, unsigned int cmd,
 static int pnx4008_wdt_release(struct inode *inode, struct file *file)
 {
         if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status))
-                printk(KERN_WARNING "WATCHDOG: Device closed unexpectdly\n");
+                printk(KERN_WARNING "WATCHDOG: Device closed unexpectedly\n");
 
         wdt_disable();
         clk_disable(wdt_clk);
diff --git a/drivers/watchdog/stmp3xxx_wdt.c b/drivers/watchdog/stmp3xxx_wdt.c
index 4c2a4e8698f9..e37d81178b9e 100644
--- a/drivers/watchdog/stmp3xxx_wdt.c
+++ b/drivers/watchdog/stmp3xxx_wdt.c
@@ -174,7 +174,7 @@ static int stmp3xxx_wdt_release(struct inode *inode, struct file *file)
         if (!nowayout) {
                 if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status)) {
                         wdt_ping();
-                        pr_debug("%s: Device closed unexpectdly\n", __func__);
+                        pr_debug("%s: Device closed unexpectedly\n", __func__);
                         ret = -EINVAL;
                 } else {
                         wdt_disable();
diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c
index 026b4bbfa0aa..8f07dd4bd94a 100644
--- a/drivers/watchdog/via_wdt.c
+++ b/drivers/watchdog/via_wdt.c
@@ -124,8 +124,6 @@ static int wdt_stop(struct watchdog_device *wdd)
 static int wdt_set_timeout(struct watchdog_device *wdd,
                            unsigned int new_timeout)
 {
-        if (new_timeout < 1 || new_timeout > WDT_TIMEOUT_MAX)
-                return -EINVAL;
         writel(new_timeout, wdt_mem + VIA_WDT_COUNT);
         timeout = new_timeout;
         return 0;
@@ -150,6 +148,8 @@ static const struct watchdog_ops wdt_ops = {
 static struct watchdog_device wdt_dev = {
         .info =         &wdt_info,
         .ops =          &wdt_ops,
+        .min_timeout =  1,
+        .max_timeout =  WDT_TIMEOUT_MAX,
 };
 
 static int __devinit wdt_probe(struct pci_dev *pdev,
@@ -233,7 +233,7 @@ static void __devexit wdt_remove(struct pci_dev *pdev)
         pci_disable_device(pdev);
 }
 
-DEFINE_PCI_DEVICE_TABLE(wdt_pci_table) = {
+static DEFINE_PCI_DEVICE_TABLE(wdt_pci_table) = {
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_CX700) },
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX800) },
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) },
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c
index 42e940c23891..c3c3188c34d7 100644
--- a/drivers/watchdog/wafer5823wdt.c
+++ b/drivers/watchdog/wafer5823wdt.c
@@ -152,12 +152,12 @@ static long wafwdt_ioctl(struct file *file, unsigned int cmd,
                         return -EFAULT;
 
                 if (options & WDIOS_DISABLECARD) {
-                        wafwdt_start();
+                        wafwdt_stop();
                         retval = 0;
                 }
 
                 if (options & WDIOS_ENABLECARD) {
-                        wafwdt_stop();
+                        wafwdt_start();
                         retval = 0;
                 }
 
diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c
index 909c78650d3e..5d7113c7e501 100644
--- a/drivers/watchdog/wm8350_wdt.c
+++ b/drivers/watchdog/wm8350_wdt.c
@@ -212,10 +212,10 @@ static long wm8350_wdt_ioctl(struct file *file, unsigned int cmd,
 
                 /* Setting both simultaneously means at least one must fail */
                 if (options == WDIOS_DISABLECARD)
-                        ret = wm8350_wdt_start(wm8350);
+                        ret = wm8350_wdt_stop(wm8350);
 
                 if (options == WDIOS_ENABLECARD)
-                        ret = wm8350_wdt_stop(wm8350);
+                        ret = wm8350_wdt_start(wm8350);
                 break;
         }
 
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index 14e2d995e958..4dcfced107f5 100644
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
@@ -30,7 +30,8 @@ static int vcpu_online(unsigned int cpu)
         sprintf(dir, "cpu/%u", cpu);
         err = xenbus_scanf(XBT_NIL, dir, "availability", "%s", state);
         if (err != 1) {
-                printk(KERN_ERR "XENBUS: Unable to read cpu state\n");
+                if (!xen_initial_domain())
+                        printk(KERN_ERR "XENBUS: Unable to read cpu state\n");
                 return err;
         }
 
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 1cd94daa71db..b4d4eac761db 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -948,9 +948,12 @@ static void gnttab_request_version(void)
         int rc;
         struct gnttab_set_version gsv;
 
-        gsv.version = 2;
+        if (xen_hvm_domain())
+                gsv.version = 1;
+        else
+                gsv.version = 2;
         rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1);
-        if (rc == 0) {
+        if (rc == 0 && gsv.version == 2) {
                 grant_table_version = 2;
                 gnttab_interface = &gnttab_v2_ops;
         } else if (grant_table_version == 2) {
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c
index 7944a17f5cbf..19834d1c7c36 100644
--- a/drivers/xen/xen-pciback/pci_stub.c
+++ b/drivers/xen/xen-pciback/pci_stub.c
@@ -884,7 +884,7 @@ static inline int str_to_quirk(const char *buf, int *domain, int *bus, int
         int err;
 
         err =
-            sscanf(buf, " %04x:%02x:%02x.%1x-%08x:%1x:%08x", domain, bus, slot,
+            sscanf(buf, " %04x:%02x:%02x.%d-%08x:%1x:%08x", domain, bus, slot,
                    func, reg, size, mask);
         if (err == 7)
                 return 0;
@@ -904,7 +904,7 @@ static int pcistub_device_id_add(int domain, int bus, int slot, int func)
         pci_dev_id->bus = bus;
         pci_dev_id->devfn = PCI_DEVFN(slot, func);
 
-        pr_debug(DRV_NAME ": wants to seize %04x:%02x:%02x.%01x\n",
+        pr_debug(DRV_NAME ": wants to seize %04x:%02x:%02x.%d\n",
                  domain, bus, slot, func);
 
         spin_lock_irqsave(&device_ids_lock, flags);
@@ -934,7 +934,7 @@ static int pcistub_device_id_remove(int domain, int bus, int slot, int func)
 
                         err = 0;
 
-                        pr_debug(DRV_NAME ": removed %04x:%02x:%02x.%01x from "
+                        pr_debug(DRV_NAME ": removed %04x:%02x:%02x.%d from "
                                  "seize list\n", domain, bus, slot, func);
                 }
         }
@@ -1029,7 +1029,7 @@ static ssize_t pcistub_slot_show(struct device_driver *drv, char *buf)
                         break;
 
                 count += scnprintf(buf + count, PAGE_SIZE - count,
-                                   "%04x:%02x:%02x.%01x\n",
+                                   "%04x:%02x:%02x.%d\n",
                                    pci_dev_id->domain, pci_dev_id->bus,
                                    PCI_SLOT(pci_dev_id->devfn),
                                    PCI_FUNC(pci_dev_id->devfn));
diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c
index d5dcf8d5d3d9..64b11f99eacc 100644
--- a/drivers/xen/xen-pciback/xenbus.c
+++ b/drivers/xen/xen-pciback/xenbus.c
@@ -206,6 +206,7 @@ static int xen_pcibk_publish_pci_dev(struct xen_pcibk_device *pdev,
                 goto out;
         }
 
+        /* Note: The PV protocol uses %02x, don't change it */
         err = xenbus_printf(XBT_NIL, pdev->xdev->nodename, str,
                             "%04x:%02x:%02x.%02x", domain, bus,
                             PCI_SLOT(devfn), PCI_FUNC(devfn));
@@ -229,7 +230,7 @@ static int xen_pcibk_export_device(struct xen_pcibk_device *pdev,
                 err = -EINVAL;
                 xenbus_dev_fatal(pdev->xdev, err,
                                  "Couldn't locate PCI device "
-                                 "(%04x:%02x:%02x.%01x)! "
+                                 "(%04x:%02x:%02x.%d)! "
                                  "perhaps already in-use?",
                                  domain, bus, slot, func);
                 goto out;
@@ -274,7 +275,7 @@ static int xen_pcibk_remove_device(struct xen_pcibk_device *pdev,
         if (!dev) {
                 err = -EINVAL;
                 dev_dbg(&pdev->xdev->dev, "Couldn't locate PCI device "
-                        "(%04x:%02x:%02x.%01x)! not owned by this domain\n",
+                        "(%04x:%02x:%02x.%d)! not owned by this domain\n",
                         domain, bus, slot, func);
                 goto out;
         }
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index 527dc2a3b89f..89f76252a16f 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -369,6 +369,10 @@ static int xenbus_write_watch(unsigned msg_type, struct xenbus_file_priv *u)
                 goto out;
         }
         token++;
+        if (memchr(token, 0, u->u.msg.len - (token - path)) == NULL) {
+                rc = -EILSEQ;
+                goto out;
+        }
 
         if (msg_type == XS_WATCH) {
                 watch = alloc_watch_adapter(path, token);
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
index d8d8e7ba6a1e..eb1cc92cd67d 100644
--- a/fs/autofs4/autofs_i.h
+++ b/fs/autofs4/autofs_i.h
@@ -110,6 +110,7 @@ struct autofs_sb_info {
         int sub_version;
         int min_proto;
         int max_proto;
+        int compat_daemon;
         unsigned long exp_timeout;
         unsigned int type;
         int reghost_enabled;
diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index 76741d8d7786..85f1fcdb30e7 100644
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -385,6 +385,7 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,
                 sbi->pipefd = pipefd;
                 sbi->pipe = pipe;
                 sbi->catatonic = 0;
+                sbi->compat_daemon = is_compat_task();
         }
 out:
         mutex_unlock(&sbi->wq_mutex);
diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 450f529a4eae..1feb68ecef95 100644
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -124,6 +124,7 @@ start:
         /* Negative dentry - try next */
         if (!simple_positive(q)) {
                 spin_unlock(&p->d_lock);
+                lock_set_subclass(&q->d_lock.dep_map, 0, _RET_IP_);
                 p = q;
                 goto again;
         }
@@ -186,6 +187,7 @@ again:
         /* Negative dentry - try next */
         if (!simple_positive(ret)) {
                 spin_unlock(&p->d_lock);
+                lock_set_subclass(&ret->d_lock.dep_map, 0, _RET_IP_);
                 p = ret;
                 goto again;
         }
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index e16980b00b8d..06858d955120 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -19,6 +19,7 @@
 #include <linux/parser.h>
 #include <linux/bitops.h>
 #include <linux/magic.h>
+#include <linux/compat.h>
 #include "autofs_i.h"
 #include <linux/module.h>
 
@@ -224,6 +225,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
         set_autofs_type_indirect(&sbi->type);
         sbi->min_proto = 0;
         sbi->max_proto = 0;
+        sbi->compat_daemon = is_compat_task();
         mutex_init(&sbi->wq_mutex);
         mutex_init(&sbi->pipe_mutex);
         spin_lock_init(&sbi->fs_lock);
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index da8876d38a7b..9c098db43344 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -91,7 +91,24 @@ static int autofs4_write(struct autofs_sb_info *sbi,
 
         return (bytes > 0);
 }
-        
+
+/*
+ * The autofs_v5 packet was misdesigned.
+ *
+ * The packets are identical on x86-32 and x86-64, but have different
+ * alignment. Which means that 'sizeof()' will give different results.
+ * Fix it up for the case of running 32-bit user mode on a 64-bit kernel.
+ */
+static noinline size_t autofs_v5_packet_size(struct autofs_sb_info *sbi)
+{
+        size_t pktsz = sizeof(struct autofs_v5_packet);
+#if defined(CONFIG_X86_64) && defined(CONFIG_COMPAT)
+        if (sbi->compat_daemon > 0)
+                pktsz -= 4;
+#endif
+        return pktsz;
+}
+
 static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
                                  struct autofs_wait_queue *wq,
                                  int type)
@@ -155,8 +172,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
         {
                 struct autofs_v5_packet *packet = &pkt.v5_pkt.v5_packet;
 
-                pktsz = sizeof(*packet);
-
+                pktsz = autofs_v5_packet_size(sbi);
                 packet->wait_queue_token = wq->wait_queue_token;
                 packet->len = wq->name.len;
                 memcpy(packet->name, wq->name.name, wq->name.len);
diff --git a/fs/bio.c b/fs/bio.c
index b1fe82cf88cf..b980ecde026a 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -505,13 +505,9 @@ EXPORT_SYMBOL(bio_clone);
 int bio_get_nr_vecs(struct block_device *bdev)
 {
         struct request_queue *q = bdev_get_queue(bdev);
-        int nr_pages;
-
-        nr_pages = ((queue_max_sectors(q) << 9) + PAGE_SIZE - 1) >> PAGE_SHIFT;
-        if (nr_pages > queue_max_segments(q))
-                nr_pages = queue_max_segments(q);
-
-        return nr_pages;
+        return min_t(unsigned,
+                     queue_max_segments(q),
+                     queue_max_sectors(q) / (PAGE_SIZE >> 9) + 1);
 }
 EXPORT_SYMBOL(bio_get_nr_vecs);
 
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index b9a843226de8..98f6bf10bbd4 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -297,7 +297,7 @@ static int __add_delayed_refs(struct btrfs_delayed_ref_head *head, u64 seq,
         struct btrfs_delayed_extent_op *extent_op = head->extent_op;
         struct rb_node *n = &head->node.rb_node;
         int sgn;
-        int ret;
+        int ret = 0;
 
         if (extent_op && extent_op->update_key)
                 btrfs_disk_key_to_cpu(info_key, &extent_op->key);
@@ -392,7 +392,7 @@ static int __add_inline_refs(struct btrfs_fs_info *fs_info,
                              struct btrfs_key *info_key, int *info_level,
                              struct list_head *prefs)
 {
-        int ret;
+        int ret = 0;
         int slot;
         struct extent_buffer *leaf;
         struct btrfs_key key;
@@ -892,6 +892,8 @@ static char *iref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,
                 if (eb != eb_in)
                         free_extent_buffer(eb);
                 ret = inode_ref_info(parent, 0, fs_root, path, &found_key);
+                if (ret > 0)
+                        ret = -ENOENT;
                 if (ret)
                         break;
                 next_inum = found_key.offset;
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index ad0b3ba735b7..d986824bb2b4 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -644,7 +644,7 @@ static struct btrfsic_dev_state *btrfsic_dev_state_hashtable_lookup(
 static int btrfsic_process_superblock(struct btrfsic_state *state,
                                       struct btrfs_fs_devices *fs_devices)
 {
-        int ret;
+        int ret = 0;
         struct btrfs_super_block *selected_super;
         struct list_head *dev_head = &fs_devices->devices;
         struct btrfs_device *device;
@@ -1662,7 +1662,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state,
         block = btrfsic_block_hashtable_lookup(bdev, dev_bytenr,
                                                &state->block_hashtable);
         if (NULL != block) {
-                u64 bytenr;
+                u64 bytenr = 0;
                 struct list_head *elem_ref_to;
                 struct list_head *tmp_ref_to;
 
@@ -2777,9 +2777,10 @@ int btrfsic_submit_bh(int rw, struct buffer_head *bh)
                         printk(KERN_INFO
                                "submit_bh(rw=0x%x, blocknr=%lu (bytenr %llu),"
                                " size=%lu, data=%p, bdev=%p)\n",
-                               rw, bh->b_blocknr,
-                               (unsigned long long)dev_bytenr, bh->b_size,
-                               bh->b_data, bh->b_bdev);
+                               rw, (unsigned long)bh->b_blocknr,
+                               (unsigned long long)dev_bytenr,
+                               (unsigned long)bh->b_size, bh->b_data,
+                               bh->b_bdev);
                 btrfsic_process_written_block(dev_state, dev_bytenr,
                                               bh->b_data, bh->b_size, NULL,
                                               NULL, bh, rw);
@@ -2844,7 +2845,7 @@ void btrfsic_submit_bio(int rw, struct bio *bio)
                         printk(KERN_INFO
                                "submit_bio(rw=0x%x, bi_vcnt=%u,"
                                " bi_sector=%lu (bytenr %llu), bi_bdev=%p)\n",
-                               rw, bio->bi_vcnt, bio->bi_sector,
+                               rw, bio->bi_vcnt, (unsigned long)bio->bi_sector,
                                (unsigned long long)dev_bytenr,
                                bio->bi_bdev);
 
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 14f1c5a0b2d2..d02c27cd14c7 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -588,6 +588,8 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
                                    page_offset(bio->bi_io_vec->bv_page),
                                    PAGE_CACHE_SIZE);
         read_unlock(&em_tree->lock);
+        if (!em)
+                return -EIO;
 
         compressed_len = em->block_len;
         cb = kmalloc(compressed_bio_size(root, compressed_len), GFP_NOFS);
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 27ebe61d3ccc..80b6486fd5e6 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -886,7 +886,7 @@ struct btrfs_block_rsv {
         u64 reserved;
         struct btrfs_space_info *space_info;
         spinlock_t lock;
-        unsigned int full:1;
+        unsigned int full;
 };
 
 /*
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 7aa9cd36bf1b..534266fe505f 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -962,6 +962,13 @@ static int btree_releasepage(struct page *page, gfp_t gfp_flags)
         tree = &BTRFS_I(page->mapping->host)->io_tree;
         map = &BTRFS_I(page->mapping->host)->extent_tree;
 
+        /*
+         * We need to mask out eg. __GFP_HIGHMEM and __GFP_DMA32 as we're doing
+         * slab allocation from alloc_extent_state down the callchain where
+         * it'd hit a BUG_ON as those flags are not allowed.
+         */
+        gfp_flags &= ~GFP_SLAB_BUG_MASK;
+
         ret = try_release_extent_state(map, tree, page, gfp_flags);
         if (!ret)
                 return 0;
@@ -2253,6 +2260,12 @@ int open_ctree(struct super_block *sb,
                 goto fail_sb_buffer;
         }
 
+        if (sectorsize < PAGE_SIZE) {
+                printk(KERN_WARNING "btrfs: Incompatible sector size "
+                       "found on %s\n", sb->s_id);
+                goto fail_sb_buffer;
+        }
+
         mutex_lock(&fs_info->chunk_mutex);
         ret = btrfs_read_sys_array(tree_root);
         mutex_unlock(&fs_info->chunk_mutex);
@@ -2294,6 +2307,12 @@ int open_ctree(struct super_block *sb,
 
         btrfs_close_extra_devices(fs_devices);
 
+        if (!fs_devices->latest_bdev) {
+                printk(KERN_CRIT "btrfs: failed to read devices on %s\n",
+                       sb->s_id);
+                goto fail_tree_roots;
+        }
+
 retry_root_backup:
         blocksize = btrfs_level_size(tree_root,
                                      btrfs_super_root_level(disk_super));
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 700879ed64cf..37e0a800d34e 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -34,23 +34,24 @@
 #include "locking.h"
 #include "free-space-cache.h"
 
-/* control flags for do_chunk_alloc's force field
+/*
+ * control flags for do_chunk_alloc's force field
  * CHUNK_ALLOC_NO_FORCE means to only allocate a chunk
  * if we really need one.
  *
- * CHUNK_ALLOC_FORCE means it must try to allocate one
- *
  * CHUNK_ALLOC_LIMITED means to only try and allocate one
  * if we have very few chunks already allocated.  This is
  * used as part of the clustering code to help make sure
  * we have a good pool of storage to cluster in, without
  * filling the FS with empty chunks
  *
+ * CHUNK_ALLOC_FORCE means it must try to allocate one
+ *
  */
 enum {
         CHUNK_ALLOC_NO_FORCE = 0,
-        CHUNK_ALLOC_FORCE = 1,
-        CHUNK_ALLOC_LIMITED = 2,
+        CHUNK_ALLOC_LIMITED = 1,
+        CHUNK_ALLOC_FORCE = 2,
 };
 
 /*
@@ -3311,7 +3312,8 @@ commit_trans:
         }
         data_sinfo->bytes_may_use += bytes;
         trace_btrfs_space_reservation(root->fs_info, "space_info",
-                                      (u64)data_sinfo, bytes, 1);
+                                      (u64)(unsigned long)data_sinfo,
+                                      bytes, 1);
         spin_unlock(&data_sinfo->lock);
 
         return 0;
@@ -3332,7 +3334,8 @@ void btrfs_free_reserved_data_space(struct inode *inode, u64 bytes)
         spin_lock(&data_sinfo->lock);
         data_sinfo->bytes_may_use -= bytes;
         trace_btrfs_space_reservation(root->fs_info, "space_info",
-                                      (u64)data_sinfo, bytes, 0);
+                                      (u64)(unsigned long)data_sinfo,
+                                      bytes, 0);
         spin_unlock(&data_sinfo->lock);
 }
 
@@ -3414,7 +3417,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans,
 
 again:
         spin_lock(&space_info->lock);
-        if (space_info->force_alloc)
+        if (force < space_info->force_alloc)
                 force = space_info->force_alloc;
         if (space_info->full) {
                 spin_unlock(&space_info->lock);
@@ -3610,12 +3613,15 @@ static int may_commit_transaction(struct btrfs_root *root,
         if (space_info != delayed_rsv->space_info)
                 return -ENOSPC;
 
+        spin_lock(&space_info->lock);
         spin_lock(&delayed_rsv->lock);
-        if (delayed_rsv->size < bytes) {
+        if (space_info->bytes_pinned + delayed_rsv->size < bytes) {
                 spin_unlock(&delayed_rsv->lock);
+                spin_unlock(&space_info->lock);
                 return -ENOSPC;
         }
         spin_unlock(&delayed_rsv->lock);
+        spin_unlock(&space_info->lock);
 
 commit:
         trans = btrfs_join_transaction(root);
@@ -3694,9 +3700,9 @@ again:
                 if (used + orig_bytes <= space_info->total_bytes) {
                         space_info->bytes_may_use += orig_bytes;
                         trace_btrfs_space_reservation(root->fs_info,
-                                                      "space_info",
-                                                      (u64)space_info,
-                                                      orig_bytes, 1);
+                                              "space_info",
+                                              (u64)(unsigned long)space_info,
+                                              orig_bytes, 1);
                         ret = 0;
                 } else {
                         /*
@@ -3765,9 +3771,9 @@ again:
                 if (used + num_bytes < space_info->total_bytes + avail) {
                         space_info->bytes_may_use += orig_bytes;
                         trace_btrfs_space_reservation(root->fs_info,
-                                                      "space_info",
-                                                      (u64)space_info,
-                                                      orig_bytes, 1);
+                                              "space_info",
+                                              (u64)(unsigned long)space_info,
+                                              orig_bytes, 1);
                         ret = 0;
                 } else {
                         wait_ordered = true;
@@ -3912,8 +3918,8 @@ static void block_rsv_release_bytes(struct btrfs_fs_info *fs_info,
                         spin_lock(&space_info->lock);
                         space_info->bytes_may_use -= num_bytes;
                         trace_btrfs_space_reservation(fs_info, "space_info",
-                                                      (u64)space_info,
-                                                      num_bytes, 0);
+                                              (u64)(unsigned long)space_info,
+                                              num_bytes, 0);
                         space_info->reservation_progress++;
                         spin_unlock(&space_info->lock);
                 }
@@ -4104,7 +4110,7 @@ static u64 calc_global_metadata_size(struct btrfs_fs_info *fs_info)
         num_bytes += div64_u64(data_used + meta_used, 50);
 
         if (num_bytes * 3 > meta_used)
-                num_bytes = div64_u64(meta_used, 3);
+                num_bytes = div64_u64(meta_used, 3) * 2;
 
         return ALIGN(num_bytes, fs_info->extent_root->leafsize << 10);
 }
@@ -4131,14 +4137,14 @@ static void update_global_block_rsv(struct btrfs_fs_info *fs_info)
                 block_rsv->reserved += num_bytes;
                 sinfo->bytes_may_use += num_bytes;
                 trace_btrfs_space_reservation(fs_info, "space_info",
-                                              (u64)sinfo, num_bytes, 1);
+                                      (u64)(unsigned long)sinfo, num_bytes, 1);
         }
 
         if (block_rsv->reserved >= block_rsv->size) {
                 num_bytes = block_rsv->reserved - block_rsv->size;
                 sinfo->bytes_may_use -= num_bytes;
                 trace_btrfs_space_reservation(fs_info, "space_info",
-                                              (u64)sinfo, num_bytes, 0);
+                                      (u64)(unsigned long)sinfo, num_bytes, 0);
                 sinfo->reservation_progress++;
                 block_rsv->reserved = block_rsv->size;
                 block_rsv->full = 1;
@@ -4191,7 +4197,8 @@ void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,
         if (!trans->bytes_reserved)
                 return;
 
-        trace_btrfs_space_reservation(root->fs_info, "transaction", (u64)trans,
+        trace_btrfs_space_reservation(root->fs_info, "transaction",
+                                      (u64)(unsigned long)trans,
                                       trans->bytes_reserved, 0);
         btrfs_block_rsv_release(root, trans->block_rsv, trans->bytes_reserved);
         trans->bytes_reserved = 0;
@@ -4709,9 +4716,9 @@ static int btrfs_update_reserved_bytes(struct btrfs_block_group_cache *cache,
                         space_info->bytes_reserved += num_bytes;
                         if (reserve == RESERVE_ALLOC) {
                                 trace_btrfs_space_reservation(cache->fs_info,
-                                                              "space_info",
-                                                              (u64)space_info,
-                                                              num_bytes, 0);
+                                              "space_info",
+                                              (u64)(unsigned long)space_info,
+                                              num_bytes, 0);
                                 space_info->bytes_may_use -= num_bytes;
                         }
                 }
@@ -5794,6 +5801,7 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans,
                          u64 search_end, struct btrfs_key *ins,
                          u64 data)
 {
+        bool final_tried = false;
         int ret;
         u64 search_start = 0;
 
@@ -5813,22 +5821,25 @@ again:
                                search_start, search_end, hint_byte,
                                ins, data);
 
-        if (ret == -ENOSPC && num_bytes > min_alloc_size) {
-                num_bytes = num_bytes >> 1;
-                num_bytes = num_bytes & ~(root->sectorsize - 1);
-                num_bytes = max(num_bytes, min_alloc_size);
-                do_chunk_alloc(trans, root->fs_info->extent_root,
-                               num_bytes, data, CHUNK_ALLOC_FORCE);
-                goto again;
-        }
-        if (ret == -ENOSPC && btrfs_test_opt(root, ENOSPC_DEBUG)) {
-                struct btrfs_space_info *sinfo;
-
-                sinfo = __find_space_info(root->fs_info, data);
-                printk(KERN_ERR "btrfs allocation failed flags %llu, "
-                       "wanted %llu\n", (unsigned long long)data,
-                       (unsigned long long)num_bytes);
-                dump_space_info(sinfo, num_bytes, 1);
+        if (ret == -ENOSPC) {
+                if (!final_tried) {
+                        num_bytes = num_bytes >> 1;
+                        num_bytes = num_bytes & ~(root->sectorsize - 1);
+                        num_bytes = max(num_bytes, min_alloc_size);
+                        do_chunk_alloc(trans, root->fs_info->extent_root,
+                                       num_bytes, data, CHUNK_ALLOC_FORCE);
+                        if (num_bytes == min_alloc_size)
+                                final_tried = true;
+                        goto again;
+                } else if (btrfs_test_opt(root, ENOSPC_DEBUG)) {
+                        struct btrfs_space_info *sinfo;
+
+                        sinfo = __find_space_info(root->fs_info, data);
+                        printk(KERN_ERR "btrfs allocation failed flags %llu, "
+                               "wanted %llu\n", (unsigned long long)data,
+                               (unsigned long long)num_bytes);
+                        dump_space_info(sinfo, num_bytes, 1);
+                }
         }
 
         trace_btrfs_reserved_extent_alloc(root, ins->objectid, ins->offset);
@@ -7881,9 +7892,16 @@ int btrfs_trim_fs(struct btrfs_root *root, struct fstrim_range *range)
         u64 start;
         u64 end;
         u64 trimmed = 0;
+        u64 total_bytes = btrfs_super_total_bytes(fs_info->super_copy);
         int ret = 0;
 
-        cache = btrfs_lookup_block_group(fs_info, range->start);
+        /*
+         * try to trim all FS space, our block group may start from non-zero.
+         */
+        if (range->len == total_bytes)
+                cache = btrfs_lookup_first_block_group(fs_info, range->start);
+        else
+                cache = btrfs_lookup_block_group(fs_info, range->start);
 
         while (cache) {
                 if (cache->key.objectid >= (range->start + range->len)) {
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 9d09a4f81875..a55fbe6252de 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -513,6 +513,15 @@ hit_next:
         WARN_ON(state->end < start);
         last_end = state->end;
 
+        if (state->end < end && !need_resched())
+                next_node = rb_next(&state->rb_node);
+        else
+                next_node = NULL;
+
+        /* the state doesn't have the wanted bits, go ahead */
+        if (!(state->state & bits))
+                goto next;
+
         /*
          *     | ---- desired range ---- |
          *  | state | or
@@ -565,20 +574,15 @@ hit_next:
                 goto out;
         }
 
-        if (state->end < end && prealloc && !need_resched())
-                next_node = rb_next(&state->rb_node);
-        else
-                next_node = NULL;
-
         set |= clear_state_bit(tree, state, &bits, wake);
+next:
         if (last_end == (u64)-1)
                 goto out;
         start = last_end + 1;
         if (start <= end && next_node) {
                 state = rb_entry(next_node, struct extent_state,
                                  rb_node);
-                if (state->start == start)
-                        goto hit_next;
+                goto hit_next;
         }
         goto search_again;
 
@@ -961,8 +965,6 @@ hit_next:
 
                 set_state_bits(tree, state, &bits);
                 clear_state_bit(tree, state, &clear_bits, 0);
-
-                merge_state(tree, state);
                 if (last_end == (u64)-1)
                         goto out;
 
@@ -1007,7 +1009,6 @@ hit_next:
                 if (state->end <= end) {
                         set_state_bits(tree, state, &bits);
                         clear_state_bit(tree, state, &clear_bits, 0);
-                        merge_state(tree, state);
                         if (last_end == (u64)-1)
                                 goto out;
                         start = last_end + 1;
@@ -1068,8 +1069,6 @@ hit_next:
 
                 set_state_bits(tree, prealloc, &bits);
                 clear_state_bit(tree, prealloc, &clear_bits, 0);
-
-                merge_state(tree, prealloc);
                 prealloc = NULL;
                 goto out;
         }
@@ -2154,13 +2153,46 @@ static int bio_readpage_error(struct bio *failed_bio, struct page *page,
                  "this_mirror=%d, num_copies=%d, in_validation=%d\n", read_mode,
                  failrec->this_mirror, num_copies, failrec->in_validation);
 
-        tree->ops->submit_bio_hook(inode, read_mode, bio, failrec->this_mirror,
-                                        failrec->bio_flags, 0);
-        return 0;
+        ret = tree->ops->submit_bio_hook(inode, read_mode, bio,
+                                         failrec->this_mirror,
+                                         failrec->bio_flags, 0);
+        return ret;
 }
 
 /* lots and lots of room for performance fixes in the end_bio funcs */
 
+int end_extent_writepage(struct page *page, int err, u64 start, u64 end)
+{
+        int uptodate = (err == 0);
+        struct extent_io_tree *tree;
+        int ret;
+
+        tree = &BTRFS_I(page->mapping->host)->io_tree;
+
+        if (tree->ops && tree->ops->writepage_end_io_hook) {
+                ret = tree->ops->writepage_end_io_hook(page, start,
+                                               end, NULL, uptodate);
+                if (ret)
+                        uptodate = 0;
+        }
+
+        if (!uptodate && tree->ops &&
+            tree->ops->writepage_io_failed_hook) {
+                ret = tree->ops->writepage_io_failed_hook(NULL, page,
+                                                 start, end, NULL);
+                /* Writeback already completed */
+                if (ret == 0)
+                        return 1;
+        }
+
+        if (!uptodate) {
+                clear_extent_uptodate(tree, start, end, NULL, GFP_NOFS);
+                ClearPageUptodate(page);
+                SetPageError(page);
+        }
+        return 0;
+}
+
 /*
  * after a writepage IO is done, we need to:
  * clear the uptodate bits on error
@@ -2172,13 +2204,11 @@ static int bio_readpage_error(struct bio *failed_bio, struct page *page,
  */
 static void end_bio_extent_writepage(struct bio *bio, int err)
 {
-        int uptodate = err == 0;
         struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1;
         struct extent_io_tree *tree;
         u64 start;
         u64 end;
         int whole_page;
-        int ret;
 
         do {
                 struct page *page = bvec->bv_page;
@@ -2195,28 +2225,9 @@ static void end_bio_extent_writepage(struct bio *bio, int err)
 
                 if (--bvec >= bio->bi_io_vec)
                         prefetchw(&bvec->bv_page->flags);
-                if (tree->ops && tree->ops->writepage_end_io_hook) {
-                        ret = tree->ops->writepage_end_io_hook(page, start,
-                                                       end, NULL, uptodate);
-                        if (ret)
-                                uptodate = 0;
-                }
-
-                if (!uptodate && tree->ops &&
-                    tree->ops->writepage_io_failed_hook) {
-                        ret = tree->ops->writepage_io_failed_hook(bio, page,
-                                                         start, end, NULL);
-                        if (ret == 0) {
-                                uptodate = (err == 0);
-                                continue;
-                        }
-                }
 
-                if (!uptodate) {
-                        clear_extent_uptodate(tree, start, end, NULL, GFP_NOFS);
-                        ClearPageUptodate(page);
-                        SetPageError(page);
-                }
+                if (end_extent_writepage(page, err, start, end))
+                        continue;
 
                 if (whole_page)
                         end_page_writeback(page);
@@ -2779,9 +2790,12 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
                                 delalloc_start = delalloc_end + 1;
                                 continue;
                         }
-                        tree->ops->fill_delalloc(inode, page, delalloc_start,
-                                                 delalloc_end, &page_started,
-                                                 &nr_written);
+                        ret = tree->ops->fill_delalloc(inode, page,
+                                                       delalloc_start,
+                                                       delalloc_end,
+                                                       &page_started,
+                                                       &nr_written);
+                        BUG_ON(ret);
                         /*
                          * delalloc_end is already one less than the total
                          * length, so we don't subtract one from
@@ -2818,8 +2832,12 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
         if (tree->ops && tree->ops->writepage_start_hook) {
                 ret = tree->ops->writepage_start_hook(page, start,
                                                       page_end);
-                if (ret == -EAGAIN) {
-                        redirty_page_for_writepage(wbc, page);
+                if (ret) {
+                        /* Fixup worker will requeue */
+                        if (ret == -EBUSY)
+                                wbc->pages_skipped++;
+                        else
+                                redirty_page_for_writepage(wbc, page);
                         update_nr_written(page, wbc, nr_written);
                         unlock_page(page);
                         ret = 0;
@@ -3289,7 +3307,7 @@ int try_release_extent_mapping(struct extent_map_tree *map,
                         len = end - start + 1;
                         write_lock(&map->lock);
                         em = lookup_extent_mapping(map, start, len);
-                        if (IS_ERR_OR_NULL(em)) {
+                        if (!em) {
                                 write_unlock(&map->lock);
                                 break;
                         }
@@ -3853,10 +3871,9 @@ int clear_extent_buffer_uptodate(struct extent_io_tree *tree,
         num_pages = num_extent_pages(eb->start, eb->len);
         clear_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);
 
-        if (eb_straddles_pages(eb)) {
-                clear_extent_uptodate(tree, eb->start, eb->start + eb->len - 1,
-                                      cached_state, GFP_NOFS);
-        }
+        clear_extent_uptodate(tree, eb->start, eb->start + eb->len - 1,
+                              cached_state, GFP_NOFS);
+
         for (i = 0; i < num_pages; i++) {
                 page = extent_buffer_page(eb, i);
                 if (page)
@@ -3909,6 +3926,8 @@ int extent_range_uptodate(struct extent_io_tree *tree,
         while (start <= end) {
                 index = start >> PAGE_CACHE_SHIFT;
                 page = find_get_page(tree->mapping, index);
+                if (!page)
+                        return 1;
                 uptodate = PageUptodate(page);
                 page_cache_release(page);
                 if (!uptodate) {
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index bc6a042cb6fc..cecc3518c121 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -319,4 +319,5 @@ struct btrfs_mapping_tree;
 int repair_io_failure(struct btrfs_mapping_tree *map_tree, u64 start,
                         u64 length, u64 logical, struct page *page,
                         int mirror_num);
+int end_extent_writepage(struct page *page, int err, u64 start, u64 end);
 #endif
diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h
index 33a7890b1f40..1195f09761fe 100644
--- a/fs/btrfs/extent_map.h
+++ b/fs/btrfs/extent_map.h
@@ -26,8 +26,8 @@ struct extent_map {
         unsigned long flags;
         struct block_device *bdev;
         atomic_t refs;
-        unsigned int in_tree:1;
-        unsigned int compress_type:4;
+        unsigned int in_tree;
+        unsigned int compress_type;
 };
 
 struct extent_map_tree {
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 859ba2dd8890..e8d06b6b9194 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1605,6 +1605,14 @@ static long btrfs_fallocate(struct file *file, int mode,
                 return -EOPNOTSUPP;
 
         /*
+         * Make sure we have enough space before we do the
+         * allocation.
+         */
+        ret = btrfs_check_data_free_space(inode, len);
+        if (ret)
+                return ret;
+
+        /*
          * wait for ordered IO before we have any locks.  We'll loop again
          * below with the locks held.
          */
@@ -1667,27 +1675,12 @@ static long btrfs_fallocate(struct file *file, int mode,
                 if (em->block_start == EXTENT_MAP_HOLE ||
                     (cur_offset >= inode->i_size &&
                      !test_bit(EXTENT_FLAG_PREALLOC, &em->flags))) {
-
-                        /*
-                         * Make sure we have enough space before we do the
-                         * allocation.
-                         */
-                        ret = btrfs_check_data_free_space(inode, last_byte -
-                                                          cur_offset);
-                        if (ret) {
-                                free_extent_map(em);
-                                break;
-                        }
-
                         ret = btrfs_prealloc_file_range(inode, mode, cur_offset,
                                                         last_byte - cur_offset,
                                                         1 << inode->i_blkbits,
                                                         offset + len,
                                                         &alloc_hint);
 
-                        /* Let go of our reservation. */
-                        btrfs_free_reserved_data_space(inode, last_byte -
-                                                       cur_offset);
                         if (ret < 0) {
                                 free_extent_map(em);
                                 break;
@@ -1715,6 +1708,8 @@ static long btrfs_fallocate(struct file *file, int mode,
                              &cached_state, GFP_NOFS);
 out:
         mutex_unlock(&inode->i_mutex);
+        /* Let go of our reservation. */
+        btrfs_free_reserved_data_space(inode, len);
         return ret;
 }
 
@@ -1761,7 +1756,7 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int origin)
                                                      start - root->sectorsize,
                                                      root->sectorsize, 0);
                 if (IS_ERR(em)) {
-                        ret = -ENXIO;
+                        ret = PTR_ERR(em);
                         goto out;
                 }
                 last_end = em->start + em->len;
@@ -1773,7 +1768,7 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int origin)
         while (1) {
                 em = btrfs_get_extent_fiemap(inode, NULL, 0, start, len, 0);
                 if (IS_ERR(em)) {
-                        ret = -ENXIO;
+                        ret = PTR_ERR(em);
                         break;
                 }
 
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index d20ff87ca603..710ea380c7ed 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -777,6 +777,7 @@ int load_free_space_cache(struct btrfs_fs_info *fs_info,
         spin_lock(&block_group->lock);
         if (block_group->disk_cache_state != BTRFS_DC_WRITTEN) {
                 spin_unlock(&block_group->lock);
+                btrfs_free_path(path);
                 goto out;
         }
         spin_unlock(&block_group->lock);
@@ -2242,7 +2243,7 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group,
                 if (entry->bitmap) {
                         ret = btrfs_alloc_from_bitmap(block_group,
                                                       cluster, entry, bytes,
-                                                      min_start);
+                                                      cluster->window_start);
                         if (ret == 0) {
                                 node = rb_next(&entry->offset_index);
                                 if (!node)
@@ -2251,6 +2252,7 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group,
                                                  offset_index);
                                 continue;
                         }
+                        cluster->window_start += bytes;
                 } else {
                         ret = entry->offset;
 
@@ -2475,7 +2477,7 @@ setup_cluster_bitmap(struct btrfs_block_group_cache *block_group,
         }
 
         list_for_each_entry(entry, bitmaps, list) {
-                if (entry->bytes < min_bytes)
+                if (entry->bytes < bytes)
                         continue;
                 ret = btrfs_bitmap_cluster(block_group, entry, cluster, offset,
                                            bytes, cont1_bytes, min_bytes);
diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index 213ffa86ce1b..ee15d88b33d2 100644
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -438,7 +438,8 @@ int btrfs_save_ino_cache(struct btrfs_root *root,
                                           trans->bytes_reserved);
         if (ret)
                 goto out;
-        trace_btrfs_space_reservation(root->fs_info, "ino_cache", (u64)trans,
+        trace_btrfs_space_reservation(root->fs_info, "ino_cache",
+                                      (u64)(unsigned long)trans,
                                       trans->bytes_reserved, 1);
 again:
         inode = lookup_free_ino_inode(root, path);
@@ -500,7 +501,8 @@ again:
 out_put:
         iput(inode);
 out_release:
-        trace_btrfs_space_reservation(root->fs_info, "ino_cache", (u64)trans,
+        trace_btrfs_space_reservation(root->fs_info, "ino_cache",
+                                      (u64)(unsigned long)trans,
                                       trans->bytes_reserved, 0);
         btrfs_block_rsv_release(root, trans->block_rsv, trans->bytes_reserved);
 out:
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0da19a0ea00d..892b34785ccc 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1555,6 +1555,7 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work)
         struct inode *inode;
         u64 page_start;
         u64 page_end;
+        int ret;
 
         fixup = container_of(work, struct btrfs_writepage_fixup, work);
         page = fixup->page;
@@ -1582,12 +1583,21 @@ again:
                                      page_end, &cached_state, GFP_NOFS);
                 unlock_page(page);
                 btrfs_start_ordered_extent(inode, ordered, 1);
+                btrfs_put_ordered_extent(ordered);
                 goto again;
         }
 
-        BUG();
+        ret = btrfs_delalloc_reserve_space(inode, PAGE_CACHE_SIZE);
+        if (ret) {
+                mapping_set_error(page->mapping, ret);
+                end_extent_writepage(page, ret, page_start, page_end);
+                ClearPageChecked(page);
+                goto out;
+         }
+
         btrfs_set_extent_delalloc(inode, page_start, page_end, &cached_state);
         ClearPageChecked(page);
+        set_page_dirty(page);
 out:
         unlock_extent_cached(&BTRFS_I(inode)->io_tree, page_start, page_end,
                              &cached_state, GFP_NOFS);
@@ -1630,7 +1640,7 @@ static int btrfs_writepage_start_hook(struct page *page, u64 start, u64 end)
         fixup->work.func = btrfs_writepage_fixup_worker;
         fixup->page = page;
         btrfs_queue_worker(&root->fs_info->fixup_workers, &fixup->work);
-        return -EAGAIN;
+        return -EBUSY;
 }
 
 static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,
@@ -4575,7 +4585,8 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,
                 ret = btrfs_insert_dir_item(trans, root, name, name_len,
                                             parent_inode, &key,
                                             btrfs_inode_type(inode), index);
-                BUG_ON(ret);
+                if (ret)
+                        goto fail_dir_item;
 
                 btrfs_i_size_write(parent_inode, parent_inode->i_size +
                                    name_len * 2);
@@ -4583,6 +4594,23 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,
                 ret = btrfs_update_inode(trans, root, parent_inode);
         }
         return ret;
+
+fail_dir_item:
+        if (unlikely(ino == BTRFS_FIRST_FREE_OBJECTID)) {
+                u64 local_index;
+                int err;
+                err = btrfs_del_root_ref(trans, root->fs_info->tree_root,
+                                 key.objectid, root->root_key.objectid,
+                                 parent_ino, &local_index, name, name_len);
+
+        } else if (add_backref) {
+                u64 local_index;
+                int err;
+
+                err = btrfs_del_inode_ref(trans, root, name, name_len,
+                                          ino, parent_ino, &local_index);
+        }
+        return ret;
 }
 
 static int btrfs_add_nondir(struct btrfs_trans_handle *trans,
@@ -6401,18 +6429,23 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
         unsigned long zero_start;
         loff_t size;
         int ret;
+        int reserved = 0;
         u64 page_start;
         u64 page_end;
 
         ret  = btrfs_delalloc_reserve_space(inode, PAGE_CACHE_SIZE);
-        if (!ret)
+        if (!ret) {
                 ret = btrfs_update_time(vma->vm_file);
+                reserved = 1;
+        }
         if (ret) {
                 if (ret == -ENOMEM)
                         ret = VM_FAULT_OOM;
                 else /* -ENOSPC, -EIO, etc */
                         ret = VM_FAULT_SIGBUS;
-                goto out;
+                if (reserved)
+                        goto out;
+                goto out_noreserve;
         }
 
         ret = VM_FAULT_NOPAGE; /* make the VM retry the fault */
@@ -6495,6 +6528,7 @@ out_unlock:
         unlock_page(page);
 out:
         btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE);
+out_noreserve:
         return ret;
 }
 
@@ -6690,8 +6724,10 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
         int err;
         u64 index = 0;
 
-        inode = btrfs_new_inode(trans, new_root, NULL, "..", 2, new_dirid,
-                                new_dirid, S_IFDIR | 0700, &index);
+        inode = btrfs_new_inode(trans, new_root, NULL, "..", 2,
+                                new_dirid, new_dirid,
+                                S_IFDIR | (~current_umask() & S_IRWXUGO),
+                                &index);
         if (IS_ERR(inode))
                 return PTR_ERR(inode);
         inode->i_op = &btrfs_dir_inode_operations;
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index ab620014bcc3..d8b54715c2de 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -861,6 +861,7 @@ static int cluster_pages_for_defrag(struct inode *inode,
         int i_done;
         struct btrfs_ordered_extent *ordered;
         struct extent_state *cached_state = NULL;
+        struct extent_io_tree *tree;
         gfp_t mask = btrfs_alloc_write_mask(inode->i_mapping);
 
         if (isize == 0)
@@ -871,18 +872,34 @@ static int cluster_pages_for_defrag(struct inode *inode,
                                            num_pages << PAGE_CACHE_SHIFT);
         if (ret)
                 return ret;
-again:
-        ret = 0;
         i_done = 0;
+        tree = &BTRFS_I(inode)->io_tree;
 
         /* step one, lock all the pages */
         for (i = 0; i < num_pages; i++) {
                 struct page *page;
+again:
                 page = find_or_create_page(inode->i_mapping,
-                                            start_index + i, mask);
+                                           start_index + i, mask);
                 if (!page)
                         break;
 
+                page_start = page_offset(page);
+                page_end = page_start + PAGE_CACHE_SIZE - 1;
+                while (1) {
+                        lock_extent(tree, page_start, page_end, GFP_NOFS);
+                        ordered = btrfs_lookup_ordered_extent(inode,
+                                                              page_start);
+                        unlock_extent(tree, page_start, page_end, GFP_NOFS);
+                        if (!ordered)
+                                break;
+
+                        unlock_page(page);
+                        btrfs_start_ordered_extent(inode, ordered, 1);
+                        btrfs_put_ordered_extent(ordered);
+                        lock_page(page);
+                }
+
                 if (!PageUptodate(page)) {
                         btrfs_readpage(NULL, page);
                         lock_page(page);
@@ -893,15 +910,22 @@ again:
                                 break;
                         }
                 }
+
                 isize = i_size_read(inode);
                 file_end = (isize - 1) >> PAGE_CACHE_SHIFT;
-                if (!isize || page->index > file_end ||
-                    page->mapping != inode->i_mapping) {
+                if (!isize || page->index > file_end) {
                         /* whoops, we blew past eof, skip this page */
                         unlock_page(page);
                         page_cache_release(page);
                         break;
                 }
+
+                if (page->mapping != inode->i_mapping) {
+                        unlock_page(page);
+                        page_cache_release(page);
+                        goto again;
+                }
+
                 pages[i] = page;
                 i_done++;
         }
@@ -924,25 +948,6 @@ again:
         lock_extent_bits(&BTRFS_I(inode)->io_tree,
                          page_start, page_end - 1, 0, &cached_state,
                          GFP_NOFS);
-        ordered = btrfs_lookup_first_ordered_extent(inode, page_end - 1);
-        if (ordered &&
-            ordered->file_offset + ordered->len > page_start &&
-            ordered->file_offset < page_end) {
-                btrfs_put_ordered_extent(ordered);
-                unlock_extent_cached(&BTRFS_I(inode)->io_tree,
-                                     page_start, page_end - 1,
-                                     &cached_state, GFP_NOFS);
-                for (i = 0; i < i_done; i++) {
-                        unlock_page(pages[i]);
-                        page_cache_release(pages[i]);
-                }
-                btrfs_wait_ordered_range(inode, page_start,
-                                         page_end - page_start);
-                goto again;
-        }
-        if (ordered)
-                btrfs_put_ordered_extent(ordered);
-
         clear_extent_bit(&BTRFS_I(inode)->io_tree, page_start,
                           page_end - 1, EXTENT_DIRTY | EXTENT_DELALLOC |
                           EXTENT_DO_ACCOUNTING, 0, 0, &cached_state,
@@ -1065,7 +1070,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
                 i = range->start >> PAGE_CACHE_SHIFT;
         }
         if (!max_to_defrag)
-                max_to_defrag = last_index;
+                max_to_defrag = last_index + 1;
 
         /*
          * make writeback starts from i, so the defrag range can be
@@ -1327,6 +1332,12 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
                 goto out;
         }
 
+        if (name[0] == '.' &&
+           (namelen == 1 || (name[1] == '.' && namelen == 2))) {
+                ret = -EEXIST;
+                goto out;
+        }
+
         if (subvol) {
                 ret = btrfs_mksubvol(&file->f_path, name, namelen,
                                      NULL, transid, readonly);
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 9770cc5bfb76..abc0fbffa510 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -1367,7 +1367,8 @@ out:
 }
 
 static noinline_for_stack int scrub_chunk(struct scrub_dev *sdev,
-        u64 chunk_tree, u64 chunk_objectid, u64 chunk_offset, u64 length)
+        u64 chunk_tree, u64 chunk_objectid, u64 chunk_offset, u64 length,
+        u64 dev_offset)
 {
         struct btrfs_mapping_tree *map_tree =
                 &sdev->dev->dev_root->fs_info->mapping_tree;
@@ -1391,7 +1392,8 @@ static noinline_for_stack int scrub_chunk(struct scrub_dev *sdev,
                 goto out;
 
         for (i = 0; i < map->num_stripes; ++i) {
-                if (map->stripes[i].dev == sdev->dev) {
+                if (map->stripes[i].dev == sdev->dev &&
+                    map->stripes[i].physical == dev_offset) {
                         ret = scrub_stripe(sdev, map, i, chunk_offset, length);
                         if (ret)
                                 goto out;
@@ -1487,7 +1489,7 @@ int scrub_enumerate_chunks(struct scrub_dev *sdev, u64 start, u64 end)
                         break;
                 }
                 ret = scrub_chunk(sdev, chunk_tree, chunk_objectid,
-                                  chunk_offset, length);
+                                  chunk_offset, length, found_key.offset);
                 btrfs_put_block_group(cache);
                 if (ret)
                         break;
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 287a6728b1ad..04b77e3ceb7a 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -327,7 +327,8 @@ again:
 
         if (num_bytes) {
                 trace_btrfs_space_reservation(root->fs_info, "transaction",
-                                              (u64)h, num_bytes, 1);
+                                              (u64)(unsigned long)h,
+                                              num_bytes, 1);
                 h->block_rsv = &root->fs_info->trans_block_rsv;
                 h->bytes_reserved = num_bytes;
         }
@@ -915,7 +916,11 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
                                 dentry->d_name.name, dentry->d_name.len,
                                 parent_inode, &key,
                                 BTRFS_FT_DIR, index);
-        BUG_ON(ret);
+        if (ret) {
+                pending->error = -EEXIST;
+                dput(parent);
+                goto fail;
+        }
 
         btrfs_i_size_write(parent_inode, parent_inode->i_size +
                                          dentry->d_name.len * 2);
@@ -993,12 +998,9 @@ static noinline int create_pending_snapshots(struct btrfs_trans_handle *trans,
 {
         struct btrfs_pending_snapshot *pending;
         struct list_head *head = &trans->transaction->pending_snapshots;
-        int ret;
 
-        list_for_each_entry(pending, head, list) {
-                ret = create_pending_snapshot(trans, fs_info, pending);
-                BUG_ON(ret);
-        }
+        list_for_each_entry(pending, head, list)
+                create_pending_snapshot(trans, fs_info, pending);
         return 0;
 }
 
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index cb877e0886a7..966cc74f5d6c 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1957,7 +1957,8 @@ static int wait_log_commit(struct btrfs_trans_handle *trans,
 
                 finish_wait(&root->log_commit_wait[index], &wait);
                 mutex_lock(&root->log_mutex);
-        } while (root->log_transid < transid + 2 &&
+        } while (root->fs_info->last_trans_log_full_commit !=
+                 trans->transid && root->log_transid < transid + 2 &&
                  atomic_read(&root->log_commit[index]));
         return 0;
 }
@@ -1966,7 +1967,8 @@ static int wait_for_writer(struct btrfs_trans_handle *trans,
                            struct btrfs_root *root)
 {
         DEFINE_WAIT(wait);
-        while (atomic_read(&root->log_writers)) {
+        while (root->fs_info->last_trans_log_full_commit !=
+               trans->transid && atomic_read(&root->log_writers)) {
                 prepare_to_wait(&root->log_writer_wait,
                                 &wait, TASK_UNINTERRUPTIBLE);
                 mutex_unlock(&root->log_mutex);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 0b4e2af7954d..ef41f285a475 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -459,12 +459,23 @@ int btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices)
 {
         struct btrfs_device *device, *next;
 
+        struct block_device *latest_bdev = NULL;
+        u64 latest_devid = 0;
+        u64 latest_transid = 0;
+
         mutex_lock(&uuid_mutex);
 again:
         /* This is the initialized path, it is safe to release the devices. */
         list_for_each_entry_safe(device, next, &fs_devices->devices, dev_list) {
-                if (device->in_fs_metadata)
+                if (device->in_fs_metadata) {
+                        if (!latest_transid ||
+                            device->generation > latest_transid) {
+                                latest_devid = device->devid;
+                                latest_transid = device->generation;
+                                latest_bdev = device->bdev;
+                        }
                         continue;
+                }
 
                 if (device->bdev) {
                         blkdev_put(device->bdev, device->mode);
@@ -487,6 +498,10 @@ again:
                 goto again;
         }
 
+        fs_devices->latest_bdev = latest_bdev;
+        fs_devices->latest_devid = latest_devid;
+        fs_devices->latest_trans = latest_transid;
+
         mutex_unlock(&uuid_mutex);
         return 0;
 }
@@ -1953,7 +1968,7 @@ static int btrfs_relocate_chunk(struct btrfs_root *root,
         em = lookup_extent_mapping(em_tree, chunk_offset, 1);
         read_unlock(&em_tree->lock);
 
-        BUG_ON(em->start > chunk_offset ||
+        BUG_ON(!em || em->start > chunk_offset ||
                em->start + em->len < chunk_offset);
         map = (struct map_lookup *)em->bdev;
 
@@ -4356,6 +4371,20 @@ int btrfs_read_sys_array(struct btrfs_root *root)
                 return -ENOMEM;
         btrfs_set_buffer_uptodate(sb);
         btrfs_set_buffer_lockdep_class(root->root_key.objectid, sb, 0);
+        /*
+         * The sb extent buffer is artifical and just used to read the system array.
+         * btrfs_set_buffer_uptodate() call does not properly mark all it's
+         * pages up-to-date when the page is larger: extent does not cover the
+         * whole page and consequently check_page_uptodate does not find all
+         * the page's extents up-to-date (the hole beyond sb),
+         * write_extent_buffer then triggers a WARN_ON.
+         *
+         * Regular short extents go through mark_extent_buffer_dirty/writeback cycle,
+         * but sb spans only this function. Add an explicit SetPageUptodate call
+         * to silence the warning eg. on PowerPC 64.
+         */
+        if (PAGE_CACHE_SIZE > BTRFS_SUPER_INFO_SIZE)
+                SetPageUptodate(sb->first_page);
 
         write_extent_buffer(sb, super_copy, 0, BTRFS_SUPER_INFO_SIZE);
         array_size = btrfs_super_sys_array_size(super_copy);
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index b60fc8bfb3e9..620daad201db 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -641,10 +641,10 @@ static int __cap_is_valid(struct ceph_cap *cap)
         unsigned long ttl;
         u32 gen;
 
-        spin_lock(&cap->session->s_cap_lock);
+        spin_lock(&cap->session->s_gen_ttl_lock);
         gen = cap->session->s_cap_gen;
         ttl = cap->session->s_cap_ttl;
-        spin_unlock(&cap->session->s_cap_lock);
+        spin_unlock(&cap->session->s_gen_ttl_lock);
 
         if (cap->cap_gen < gen || time_after_eq(jiffies, ttl)) {
                 dout("__cap_is_valid %p cap %p issued %s "
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 618246bc2196..3e8094be4604 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -975,10 +975,10 @@ static int dentry_lease_is_valid(struct dentry *dentry)
         di = ceph_dentry(dentry);
         if (di->lease_session) {
                 s = di->lease_session;
-                spin_lock(&s->s_cap_lock);
+                spin_lock(&s->s_gen_ttl_lock);
                 gen = s->s_cap_gen;
                 ttl = s->s_cap_ttl;
-                spin_unlock(&s->s_cap_lock);
+                spin_unlock(&s->s_gen_ttl_lock);
 
                 if (di->lease_gen == gen &&
                     time_before(jiffies, dentry->d_time) &&
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 23ab6a3f1825..866e8d7ca37d 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -262,6 +262,7 @@ static int parse_reply_info(struct ceph_msg *msg,
         /* trace */
         ceph_decode_32_safe(&p, end, len, bad);
         if (len > 0) {
+                ceph_decode_need(&p, end, len, bad);
                 err = parse_reply_info_trace(&p, p+len, info, features);
                 if (err < 0)
                         goto out_bad;
@@ -270,6 +271,7 @@ static int parse_reply_info(struct ceph_msg *msg,
         /* extra */
         ceph_decode_32_safe(&p, end, len, bad);
         if (len > 0) {
+                ceph_decode_need(&p, end, len, bad);
                 err = parse_reply_info_extra(&p, p+len, info, features);
                 if (err < 0)
                         goto out_bad;
@@ -398,9 +400,11 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc,
         s->s_con.peer_name.type = CEPH_ENTITY_TYPE_MDS;
         s->s_con.peer_name.num = cpu_to_le64(mds);
 
-        spin_lock_init(&s->s_cap_lock);
+        spin_lock_init(&s->s_gen_ttl_lock);
         s->s_cap_gen = 0;
         s->s_cap_ttl = 0;
+
+        spin_lock_init(&s->s_cap_lock);
         s->s_renew_requested = 0;
         s->s_renew_seq = 0;
         INIT_LIST_HEAD(&s->s_caps);
@@ -2326,10 +2330,10 @@ static void handle_session(struct ceph_mds_session *session,
         case CEPH_SESSION_STALE:
                 pr_info("mds%d caps went stale, renewing\n",
                         session->s_mds);
-                spin_lock(&session->s_cap_lock);
+                spin_lock(&session->s_gen_ttl_lock);
                 session->s_cap_gen++;
                 session->s_cap_ttl = 0;
-                spin_unlock(&session->s_cap_lock);
+                spin_unlock(&session->s_gen_ttl_lock);
                 send_renew_caps(mdsc, session);
                 break;
 
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index a50ca0e39475..8c7c04ebb595 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -117,10 +117,13 @@ struct ceph_mds_session {
         void             *s_authorizer_buf, *s_authorizer_reply_buf;
         size_t            s_authorizer_buf_len, s_authorizer_reply_buf_len;
 
-        /* protected by s_cap_lock */
-        spinlock_t        s_cap_lock;
+        /* protected by s_gen_ttl_lock */
+        spinlock_t        s_gen_ttl_lock;
         u32               s_cap_gen;  /* inc each time we get mds stale msg */
         unsigned long     s_cap_ttl;  /* when session caps expire */
+
+        /* protected by s_cap_lock */
+        spinlock_t        s_cap_lock;
         struct list_head  s_caps;     /* all caps issued by this session */
         int               s_nr_caps, s_trim_caps;
         int               s_num_cap_releases;
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 857214ae8c08..a76f697303d9 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -111,8 +111,10 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
 }
 
 static struct ceph_vxattr_cb ceph_file_vxattrs[] = {
+        { true, "ceph.file.layout", ceph_vxattrcb_layout},
+        /* The following extended attribute name is deprecated */
         { true, "ceph.layout", ceph_vxattrcb_layout},
-        { NULL, NULL }
+        { true, NULL, NULL }
 };
 
 static struct ceph_vxattr_cb *ceph_inode_vxattrs(struct inode *inode)
diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig
index f66cc1625150..2b243af70aa3 100644
--- a/fs/cifs/Kconfig
+++ b/fs/cifs/Kconfig
@@ -139,8 +139,7 @@ config CIFS_DFS_UPCALL
             points. If unsure, say N.
 
 config CIFS_FSCACHE
-          bool "Provide CIFS client caching support (EXPERIMENTAL)"
-          depends on EXPERIMENTAL
+          bool "Provide CIFS client caching support"
           depends on CIFS=m && FSCACHE || CIFS=y && FSCACHE=y
           help
             Makes CIFS FS-Cache capable. Say Y here if you want your CIFS data
@@ -148,8 +147,8 @@ config CIFS_FSCACHE
             manager. If unsure, say N.
 
 config CIFS_ACL
-          bool "Provide CIFS ACL support (EXPERIMENTAL)"
-          depends on EXPERIMENTAL && CIFS_XATTR && KEYS
+          bool "Provide CIFS ACL support"
+          depends on CIFS_XATTR && KEYS
           help
             Allows to fetch CIFS/NTFS ACL from the server.  The DACL blob
             is handed over to the application/caller.
diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 84e8c0724704..24b3dfc05282 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -676,14 +676,23 @@ static ssize_t cifs_multiuser_mount_proc_write(struct file *file,
 {
         char c;
         int rc;
+        static bool warned;
 
         rc = get_user(c, buffer);
         if (rc)
                 return rc;
         if (c == '0' || c == 'n' || c == 'N')
                 multiuser_mount = 0;
-        else if (c == '1' || c == 'y' || c == 'Y')
+        else if (c == '1' || c == 'y' || c == 'Y') {
                 multiuser_mount = 1;
+                if (!warned) {
+                        warned = true;
+                        printk(KERN_WARNING "CIFS VFS: The legacy multiuser "
+                                "mount code is scheduled to be deprecated in "
+                                "3.5. Please switch to using the multiuser "
+                                "mount option.");
+                }
+        }
 
         return count;
 }
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index 2272fd5fe5b7..e622863b292f 100644
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -113,9 +113,11 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo)
                    MAX_MECH_STR_LEN +
                    UID_KEY_LEN + (sizeof(uid_t) * 2) +
                    CREDUID_KEY_LEN + (sizeof(uid_t) * 2) +
-                   USER_KEY_LEN + strlen(sesInfo->user_name) +
                    PID_KEY_LEN + (sizeof(pid_t) * 2) + 1;
 
+        if (sesInfo->user_name)
+                desc_len += USER_KEY_LEN + strlen(sesInfo->user_name);
+
         spnego_key = ERR_PTR(-ENOMEM);
         description = kzalloc(desc_len, GFP_KERNEL);
         if (description == NULL)
@@ -152,8 +154,10 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo)
         dp = description + strlen(description);
         sprintf(dp, ";creduid=0x%x", sesInfo->cred_uid);
 
-        dp = description + strlen(description);
-        sprintf(dp, ";user=%s", sesInfo->user_name);
+        if (sesInfo->user_name) {
+                dp = description + strlen(description);
+                sprintf(dp, ";user=%s", sesInfo->user_name);
+        }
 
         dp = description + strlen(description);
         sprintf(dp, ";pid=0x%x", current->pid);
diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c
index 1b2e180b018d..fbb9da951843 100644
--- a/fs/cifs/cifs_unicode.c
+++ b/fs/cifs/cifs_unicode.c
@@ -27,17 +27,17 @@
 #include "cifs_debug.h"
 
 /*
- * cifs_ucs2_bytes - how long will a string be after conversion?
- * @ucs - pointer to input string
+ * cifs_utf16_bytes - how long will a string be after conversion?
+ * @utf16 - pointer to input string
  * @maxbytes - don't go past this many bytes of input string
  * @codepage - destination codepage
  *
- * Walk a ucs2le string and return the number of bytes that the string will
+ * Walk a utf16le string and return the number of bytes that the string will
  * be after being converted to the given charset, not including any null
  * termination required. Don't walk past maxbytes in the source buffer.
  */
 int
-cifs_ucs2_bytes(const __le16 *from, int maxbytes,
+cifs_utf16_bytes(const __le16 *from, int maxbytes,
                 const struct nls_table *codepage)
 {
         int i;
@@ -122,7 +122,7 @@ cp_convert:
 }
 
 /*
- * cifs_from_ucs2 - convert utf16le string to local charset
+ * cifs_from_utf16 - convert utf16le string to local charset
  * @to - destination buffer
  * @from - source buffer
  * @tolen - destination buffer size (in bytes)
@@ -130,7 +130,7 @@ cp_convert:
  * @codepage - codepage to which characters should be converted
  * @mapchar - should characters be remapped according to the mapchars option?
  *
- * Convert a little-endian ucs2le string (as sent by the server) to a string
+ * Convert a little-endian utf16le string (as sent by the server) to a string
  * in the provided codepage. The tolen and fromlen parameters are to ensure
  * that the code doesn't walk off of the end of the buffer (which is always
  * a danger if the alignment of the source buffer is off). The destination
@@ -139,12 +139,12 @@ cp_convert:
  * null terminator).
  *
  * Note that some windows versions actually send multiword UTF-16 characters
- * instead of straight UCS-2. The linux nls routines however aren't able to
+ * instead of straight UTF16-2. The linux nls routines however aren't able to
  * deal with those characters properly. In the event that we get some of
  * those characters, they won't be translated properly.
  */
 int
-cifs_from_ucs2(char *to, const __le16 *from, int tolen, int fromlen,
+cifs_from_utf16(char *to, const __le16 *from, int tolen, int fromlen,
                  const struct nls_table *codepage, bool mapchar)
 {
         int i, charlen, safelen;
@@ -190,13 +190,13 @@ cifs_from_ucs2(char *to, const __le16 *from, int tolen, int fromlen,
 }
 
 /*
- * NAME:        cifs_strtoUCS()
+ * NAME:        cifs_strtoUTF16()
  *
  * FUNCTION:    Convert character string to unicode string
  *
  */
 int
-cifs_strtoUCS(__le16 *to, const char *from, int len,
+cifs_strtoUTF16(__le16 *to, const char *from, int len,
               const struct nls_table *codepage)
 {
         int charlen;
@@ -206,7 +206,7 @@ cifs_strtoUCS(__le16 *to, const char *from, int len,
         for (i = 0; len && *from; i++, from += charlen, len -= charlen) {
                 charlen = codepage->char2uni(from, len, &wchar_to);
                 if (charlen < 1) {
-                        cERROR(1, "strtoUCS: char2uni of 0x%x returned %d",
+                        cERROR(1, "strtoUTF16: char2uni of 0x%x returned %d",
                                 *from, charlen);
                         /* A question mark */
                         wchar_to = 0x003f;
@@ -220,7 +220,8 @@ cifs_strtoUCS(__le16 *to, const char *from, int len,
 }
 
 /*
- * cifs_strndup_from_ucs - copy a string from wire format to the local codepage
+ * cifs_strndup_from_utf16 - copy a string from wire format to the local
+ * codepage
  * @src - source string
  * @maxlen - don't walk past this many bytes in the source string
  * @is_unicode - is this a unicode string?
@@ -231,19 +232,19 @@ cifs_strtoUCS(__le16 *to, const char *from, int len,
  * error.
  */
 char *
-cifs_strndup_from_ucs(const char *src, const int maxlen, const bool is_unicode,
-             const struct nls_table *codepage)
+cifs_strndup_from_utf16(const char *src, const int maxlen,
+                        const bool is_unicode, const struct nls_table *codepage)
 {
         int len;
         char *dst;
 
         if (is_unicode) {
-                len = cifs_ucs2_bytes((__le16 *) src, maxlen, codepage);
+                len = cifs_utf16_bytes((__le16 *) src, maxlen, codepage);
                 len += nls_nullsize(codepage);
                 dst = kmalloc(len, GFP_KERNEL);
                 if (!dst)
                         return NULL;
-                cifs_from_ucs2(dst, (__le16 *) src, len, maxlen, codepage,
+                cifs_from_utf16(dst, (__le16 *) src, len, maxlen, codepage,
                                false);
         } else {
                 len = strnlen(src, maxlen);
@@ -264,7 +265,7 @@ cifs_strndup_from_ucs(const char *src, const int maxlen, const bool is_unicode,
  * names are little endian 16 bit Unicode on the wire
  */
 int
-cifsConvertToUCS(__le16 *target, const char *source, int srclen,
+cifsConvertToUTF16(__le16 *target, const char *source, int srclen,
                  const struct nls_table *cp, int mapChars)
 {
         int i, j, charlen;
@@ -273,7 +274,7 @@ cifsConvertToUCS(__le16 *target, const char *source, int srclen,
         wchar_t tmp;
 
         if (!mapChars)
-                return cifs_strtoUCS(target, source, PATH_MAX, cp);
+                return cifs_strtoUTF16(target, source, PATH_MAX, cp);
 
         for (i = 0, j = 0; i < srclen; j++) {
                 src_char = source[i];
@@ -281,7 +282,7 @@ cifsConvertToUCS(__le16 *target, const char *source, int srclen,
                 switch (src_char) {
                 case 0:
                         put_unaligned(0, &target[j]);
-                        goto ctoUCS_out;
+                        goto ctoUTF16_out;
                 case ':':
                         dst_char = cpu_to_le16(UNI_COLON);
                         break;
@@ -326,7 +327,7 @@ cifsConvertToUCS(__le16 *target, const char *source, int srclen,
                 put_unaligned(dst_char, &target[j]);
         }
 
-ctoUCS_out:
+ctoUTF16_out:
         return i;
 }
 
diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h
index 6d02fd560566..a513a546700b 100644
--- a/fs/cifs/cifs_unicode.h
+++ b/fs/cifs/cifs_unicode.h
@@ -74,16 +74,16 @@ extern const struct UniCaseRange CifsUniLowerRange[];
 #endif                          /* UNIUPR_NOLOWER */
 
 #ifdef __KERNEL__
-int cifs_from_ucs2(char *to, const __le16 *from, int tolen, int fromlen,
-                   const struct nls_table *codepage, bool mapchar);
-int cifs_ucs2_bytes(const __le16 *from, int maxbytes,
-                    const struct nls_table *codepage);
-int cifs_strtoUCS(__le16 *, const char *, int, const struct nls_table *);
-char *cifs_strndup_from_ucs(const char *src, const int maxlen,
-                            const bool is_unicode,
-                            const struct nls_table *codepage);
-extern int cifsConvertToUCS(__le16 *target, const char *source, int maxlen,
-                        const struct nls_table *cp, int mapChars);
+int cifs_from_utf16(char *to, const __le16 *from, int tolen, int fromlen,
+                    const struct nls_table *codepage, bool mapchar);
+int cifs_utf16_bytes(const __le16 *from, int maxbytes,
+                     const struct nls_table *codepage);
+int cifs_strtoUTF16(__le16 *, const char *, int, const struct nls_table *);
+char *cifs_strndup_from_utf16(const char *src, const int maxlen,
+                              const bool is_unicode,
+                              const struct nls_table *codepage);
+extern int cifsConvertToUTF16(__le16 *target, const char *source, int maxlen,
+                              const struct nls_table *cp, int mapChars);
 
 #endif
 
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 72ddf23ef6f7..c1b254487388 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -909,6 +909,8 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl,
                 umode_t group_mask = S_IRWXG;
                 umode_t other_mask = S_IRWXU | S_IRWXG | S_IRWXO;
 
+                if (num_aces > ULONG_MAX / sizeof(struct cifs_ace *))
+                        return;
                 ppace = kmalloc(num_aces * sizeof(struct cifs_ace *),
                                 GFP_KERNEL);
                 if (!ppace) {
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
index 5d9b9acc5fce..63c460e503b6 100644
--- a/fs/cifs/cifsencrypt.c
+++ b/fs/cifs/cifsencrypt.c
@@ -327,7 +327,7 @@ build_avpair_blob(struct cifs_ses *ses, const struct nls_table *nls_cp)
         attrptr->type = cpu_to_le16(NTLMSSP_AV_NB_DOMAIN_NAME);
         attrptr->length = cpu_to_le16(2 * dlen);
         blobptr = (unsigned char *)attrptr + sizeof(struct ntlmssp2_name);
-        cifs_strtoUCS((__le16 *)blobptr, ses->domainName, dlen, nls_cp);
+        cifs_strtoUTF16((__le16 *)blobptr, ses->domainName, dlen, nls_cp);
 
         return 0;
 }
@@ -376,7 +376,7 @@ find_domain_name(struct cifs_ses *ses, const struct nls_table *nls_cp)
                                         kmalloc(attrsize + 1, GFP_KERNEL);
                                 if (!ses->domainName)
                                                 return -ENOMEM;
-                                cifs_from_ucs2(ses->domainName,
+                                cifs_from_utf16(ses->domainName,
                                         (__le16 *)blobptr, attrsize, attrsize,
                                         nls_cp, false);
                                 break;
@@ -420,15 +420,20 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,
         }
 
         /* convert ses->user_name to unicode and uppercase */
-        len = strlen(ses->user_name);
+        len = ses->user_name ? strlen(ses->user_name) : 0;
         user = kmalloc(2 + (len * 2), GFP_KERNEL);
         if (user == NULL) {
                 cERROR(1, "calc_ntlmv2_hash: user mem alloc failure\n");
                 rc = -ENOMEM;
                 return rc;
         }
-        len = cifs_strtoUCS((__le16 *)user, ses->user_name, len, nls_cp);
-        UniStrupr(user);
+
+        if (len) {
+                len = cifs_strtoUTF16((__le16 *)user, ses->user_name, len, nls_cp);
+                UniStrupr(user);
+        } else {
+                memset(user, '\0', 2);
+        }
 
         rc = crypto_shash_update(&ses->server->secmech.sdeschmacmd5->shash,
                                 (char *)user, 2 * len);
@@ -448,8 +453,8 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,
                         rc = -ENOMEM;
                         return rc;
                 }
-                len = cifs_strtoUCS((__le16 *)domain, ses->domainName, len,
-                                        nls_cp);
+                len = cifs_strtoUTF16((__le16 *)domain, ses->domainName, len,
+                                      nls_cp);
                 rc =
                 crypto_shash_update(&ses->server->secmech.sdeschmacmd5->shash,
                                         (char *)domain, 2 * len);
@@ -468,7 +473,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,
                         rc = -ENOMEM;
                         return rc;
                 }
-                len = cifs_strtoUCS((__le16 *)server, ses->serverName, len,
+                len = cifs_strtoUTF16((__le16 *)server, ses->serverName, len,
                                         nls_cp);
                 rc =
                 crypto_shash_update(&ses->server->secmech.sdeschmacmd5->shash,
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index ba53c1c6c6cc..76e7d8b6da17 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -879,6 +879,8 @@ require use of the stronger protocol */
 #define   CIFSSEC_MASK          0xB70B7 /* current flags supported if weak */
 #endif /* UPCALL */
 #else /* do not allow weak pw hash */
+#define   CIFSSEC_MUST_LANMAN   0
+#define   CIFSSEC_MUST_PLNTXT   0
 #ifdef CONFIG_CIFS_UPCALL
 #define   CIFSSEC_MASK          0x8F08F /* flags supported if no weak allowed */
 #else
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 6600aa2d2ef3..8b7794c31591 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -821,8 +821,8 @@ PsxDelete:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, fileName,
-                                     PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->FileName, fileName,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else { /* BB add path length overrun check */
@@ -893,8 +893,8 @@ DelFileRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->fileName, fileName,
-                                     PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->fileName, fileName,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {                /* BB improve check for buffer overruns BB */
@@ -938,8 +938,8 @@ RmDirRetry:
                 return rc;
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
-                name_len = cifsConvertToUCS((__le16 *) pSMB->DirName, dirName,
-                                         PATH_MAX, nls_codepage, remap);
+                name_len = cifsConvertToUTF16((__le16 *) pSMB->DirName, dirName,
+                                              PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {                /* BB improve check for buffer overruns BB */
@@ -981,8 +981,8 @@ MkDirRetry:
                 return rc;
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
-                name_len = cifsConvertToUCS((__le16 *) pSMB->DirName, name,
-                                            PATH_MAX, nls_codepage, remap);
+                name_len = cifsConvertToUTF16((__le16 *) pSMB->DirName, name,
+                                              PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {                /* BB improve check for buffer overruns BB */
@@ -1030,8 +1030,8 @@ PsxCreat:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, name,
-                                     PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->FileName, name,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -1197,8 +1197,8 @@ OldOpenRetry:
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 count = 1;      /* account for one byte pad to word boundary */
                 name_len =
-                   cifsConvertToUCS((__le16 *) (pSMB->fileName + 1),
-                                    fileName, PATH_MAX, nls_codepage, remap);
+                   cifsConvertToUTF16((__le16 *) (pSMB->fileName + 1),
+                                      fileName, PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {                /* BB improve check for buffer overruns BB */
@@ -1304,8 +1304,8 @@ openRetry:
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 count = 1;      /* account for one byte pad to word boundary */
                 name_len =
-                    cifsConvertToUCS((__le16 *) (pSMB->fileName + 1),
-                                     fileName, PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) (pSMB->fileName + 1),
+                                       fileName, PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
                 pSMB->NameLength = cpu_to_le16(name_len);
@@ -2649,16 +2649,16 @@ renameRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->OldFileName, fromName,
-                                     PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->OldFileName, fromName,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
                 pSMB->OldFileName[name_len] = 0x04;     /* pad */
         /* protocol requires ASCII signature byte on Unicode string */
                 pSMB->OldFileName[name_len + 1] = 0x00;
                 name_len2 =
-                    cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2],
-                                     toName, PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *)&pSMB->OldFileName[name_len+2],
+                                       toName, PATH_MAX, nls_codepage, remap);
                 name_len2 += 1 /* trailing null */  + 1 /* Signature word */ ;
                 name_len2 *= 2; /* convert to bytes */
         } else {        /* BB improve the check for buffer overruns BB */
@@ -2738,10 +2738,12 @@ int CIFSSMBRenameOpenFile(const int xid, struct cifs_tcon *pTcon,
         /* unicode only call */
         if (target_name == NULL) {
                 sprintf(dummy_string, "cifs%x", pSMB->hdr.Mid);
-                len_of_str = cifsConvertToUCS((__le16 *)rename_info->target_name,
+                len_of_str =
+                        cifsConvertToUTF16((__le16 *)rename_info->target_name,
                                         dummy_string, 24, nls_codepage, remap);
         } else {
-                len_of_str = cifsConvertToUCS((__le16 *)rename_info->target_name,
+                len_of_str =
+                        cifsConvertToUTF16((__le16 *)rename_info->target_name,
                                         target_name, PATH_MAX, nls_codepage,
                                         remap);
         }
@@ -2795,17 +2797,17 @@ copyRetry:
         pSMB->Flags = cpu_to_le16(flags & COPY_TREE);
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
-                name_len = cifsConvertToUCS((__le16 *) pSMB->OldFileName,
-                                            fromName, PATH_MAX, nls_codepage,
-                                            remap);
+                name_len = cifsConvertToUTF16((__le16 *) pSMB->OldFileName,
+                                              fromName, PATH_MAX, nls_codepage,
+                                              remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
                 pSMB->OldFileName[name_len] = 0x04;     /* pad */
                 /* protocol requires ASCII signature byte on Unicode string */
                 pSMB->OldFileName[name_len + 1] = 0x00;
                 name_len2 =
-                    cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2],
-                                toName, PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *)&pSMB->OldFileName[name_len+2],
+                                       toName, PATH_MAX, nls_codepage, remap);
                 name_len2 += 1 /* trailing null */  + 1 /* Signature word */ ;
                 name_len2 *= 2; /* convert to bytes */
         } else {        /* BB improve the check for buffer overruns BB */
@@ -2861,9 +2863,9 @@ createSymLinkRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifs_strtoUCS((__le16 *) pSMB->FileName, fromName, PATH_MAX
-                                  /* find define for this maxpathcomponent */
-                                  , nls_codepage);
+                    cifs_strtoUTF16((__le16 *) pSMB->FileName, fromName,
+                                    /* find define for this maxpathcomponent */
+                                    PATH_MAX, nls_codepage);
                 name_len++;     /* trailing null */
                 name_len *= 2;
 
@@ -2885,9 +2887,9 @@ createSymLinkRetry:
         data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len_target =
-                    cifs_strtoUCS((__le16 *) data_offset, toName, PATH_MAX
-                                  /* find define for this maxpathcomponent */
-                                  , nls_codepage);
+                    cifs_strtoUTF16((__le16 *) data_offset, toName, PATH_MAX
+                                    /* find define for this maxpathcomponent */
+                                    , nls_codepage);
                 name_len_target++;      /* trailing null */
                 name_len_target *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -2949,8 +2951,8 @@ createHardLinkRetry:
                 return rc;
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
-                name_len = cifsConvertToUCS((__le16 *) pSMB->FileName, toName,
-                                            PATH_MAX, nls_codepage, remap);
+                name_len = cifsConvertToUTF16((__le16 *) pSMB->FileName, toName,
+                                              PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
 
@@ -2972,8 +2974,8 @@ createHardLinkRetry:
         data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len_target =
-                    cifsConvertToUCS((__le16 *) data_offset, fromName, PATH_MAX,
-                                     nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) data_offset, fromName,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len_target++;      /* trailing null */
                 name_len_target *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -3042,8 +3044,8 @@ winCreateHardLinkRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->OldFileName, fromName,
-                                     PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->OldFileName, fromName,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
 
@@ -3051,8 +3053,8 @@ winCreateHardLinkRetry:
                 pSMB->OldFileName[name_len] = 0x04;
                 pSMB->OldFileName[name_len + 1] = 0x00; /* pad */
                 name_len2 =
-                    cifsConvertToUCS((__le16 *)&pSMB->OldFileName[name_len + 2],
-                                     toName, PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *)&pSMB->OldFileName[name_len+2],
+                                       toName, PATH_MAX, nls_codepage, remap);
                 name_len2 += 1 /* trailing null */  + 1 /* Signature word */ ;
                 name_len2 *= 2; /* convert to bytes */
         } else {        /* BB improve the check for buffer overruns BB */
@@ -3108,8 +3110,8 @@ querySymLinkRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifs_strtoUCS((__le16 *) pSMB->FileName, searchName,
-                                  PATH_MAX, nls_codepage);
+                        cifs_strtoUTF16((__le16 *) pSMB->FileName, searchName,
+                                        PATH_MAX, nls_codepage);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -3166,8 +3168,8 @@ querySymLinkRetry:
                                 is_unicode = false;
 
                         /* BB FIXME investigate remapping reserved chars here */
-                        *symlinkinfo = cifs_strndup_from_ucs(data_start, count,
-                                                    is_unicode, nls_codepage);
+                        *symlinkinfo = cifs_strndup_from_utf16(data_start,
+                                        count, is_unicode, nls_codepage);
                         if (!*symlinkinfo)
                                 rc = -ENOMEM;
                 }
@@ -3450,8 +3452,9 @@ queryAclRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                        cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
-                                         PATH_MAX, nls_codepage, remap);
+                        cifsConvertToUTF16((__le16 *) pSMB->FileName,
+                                           searchName, PATH_MAX, nls_codepage,
+                                           remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
                 pSMB->FileName[name_len] = 0;
@@ -3537,8 +3540,8 @@ setAclRetry:
                 return rc;
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                        cifsConvertToUCS((__le16 *) pSMB->FileName, fileName,
-                                      PATH_MAX, nls_codepage, remap);
+                        cifsConvertToUTF16((__le16 *) pSMB->FileName, fileName,
+                                           PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -3948,8 +3951,9 @@ QInfRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                        cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
-                                        PATH_MAX, nls_codepage, remap);
+                        cifsConvertToUTF16((__le16 *) pSMB->FileName,
+                                           searchName, PATH_MAX, nls_codepage,
+                                           remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {
@@ -4086,8 +4090,8 @@ QPathInfoRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
-                                     PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->FileName, searchName,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -4255,8 +4259,8 @@ UnixQPathInfoRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
-                                  PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->FileName, searchName,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -4344,8 +4348,8 @@ findFirstRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
-                                 PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->FileName, searchName,
+                                       PATH_MAX, nls_codepage, remap);
                 /* We can not add the asterik earlier in case
                 it got remapped to 0xF03A as if it were part of the
                 directory name instead of a wildcard */
@@ -4656,8 +4660,9 @@ GetInodeNumberRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                        cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
-                                         PATH_MAX, nls_codepage, remap);
+                        cifsConvertToUTF16((__le16 *) pSMB->FileName,
+                                           searchName, PATH_MAX, nls_codepage,
+                                           remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -4794,9 +4799,9 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
                                 rc = -ENOMEM;
                                 goto parse_DFS_referrals_exit;
                         }
-                        cifsConvertToUCS((__le16 *) tmp, searchName,
-                                        PATH_MAX, nls_codepage, remap);
-                        node->path_consumed = cifs_ucs2_bytes(tmp,
+                        cifsConvertToUTF16((__le16 *) tmp, searchName,
+                                           PATH_MAX, nls_codepage, remap);
+                        node->path_consumed = cifs_utf16_bytes(tmp,
                                         le16_to_cpu(pSMBr->PathConsumed),
                                         nls_codepage);
                         kfree(tmp);
@@ -4809,8 +4814,8 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
                 /* copy DfsPath */
                 temp = (char *)ref + le16_to_cpu(ref->DfsPathOffset);
                 max_len = data_end - temp;
-                node->path_name = cifs_strndup_from_ucs(temp, max_len,
-                                                      is_unicode, nls_codepage);
+                node->path_name = cifs_strndup_from_utf16(temp, max_len,
+                                                is_unicode, nls_codepage);
                 if (!node->path_name) {
                         rc = -ENOMEM;
                         goto parse_DFS_referrals_exit;
@@ -4819,8 +4824,8 @@ parse_DFS_referrals(TRANSACTION2_GET_DFS_REFER_RSP *pSMBr,
                 /* copy link target UNC */
                 temp = (char *)ref + le16_to_cpu(ref->NetworkAddressOffset);
                 max_len = data_end - temp;
-                node->node_name = cifs_strndup_from_ucs(temp, max_len,
-                                                      is_unicode, nls_codepage);
+                node->node_name = cifs_strndup_from_utf16(temp, max_len,
+                                                is_unicode, nls_codepage);
                 if (!node->node_name)
                         rc = -ENOMEM;
         }
@@ -4873,8 +4878,9 @@ getDFSRetry:
         if (ses->capabilities & CAP_UNICODE) {
                 pSMB->hdr.Flags2 |= SMBFLG2_UNICODE;
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->RequestFileName,
-                                     searchName, PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->RequestFileName,
+                                       searchName, PATH_MAX, nls_codepage,
+                                       remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -5506,8 +5512,8 @@ SetEOFRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, fileName,
-                                     PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->FileName, fileName,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -5796,8 +5802,8 @@ SetTimesRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, fileName,
-                                     PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->FileName, fileName,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -5877,8 +5883,8 @@ SetAttrLgcyRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                        ConvertToUCS((__le16 *) pSMB->fileName, fileName,
-                                PATH_MAX, nls_codepage);
+                        ConvertToUTF16((__le16 *) pSMB->fileName, fileName,
+                                       PATH_MAX, nls_codepage);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -6030,8 +6036,8 @@ setPermsRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, fileName,
-                                     PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->FileName, fileName,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -6123,8 +6129,8 @@ QAllEAsRetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 list_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, searchName,
-                                     PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->FileName, searchName,
+                                       PATH_MAX, nls_codepage, remap);
                 list_len++;     /* trailing null */
                 list_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
@@ -6301,8 +6307,8 @@ SetEARetry:
 
         if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) {
                 name_len =
-                    cifsConvertToUCS((__le16 *) pSMB->FileName, fileName,
-                                     PATH_MAX, nls_codepage, remap);
+                    cifsConvertToUTF16((__le16 *) pSMB->FileName, fileName,
+                                       PATH_MAX, nls_codepage, remap);
                 name_len++;     /* trailing null */
                 name_len *= 2;
         } else {        /* BB improve the check for buffer overruns BB */
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 4666780f315d..602f77c304c9 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -38,6 +38,7 @@
 #include <asm/processor.h>
 #include <linux/inet.h>
 #include <linux/module.h>
+#include <keys/user-type.h>
 #include <net/ipv6.h>
 #include "cifspdu.h"
 #include "cifsglob.h"
@@ -225,74 +226,90 @@ static int check2ndT2(struct smb_hdr *pSMB)
 
 static int coalesce_t2(struct smb_hdr *psecond, struct smb_hdr *pTargetSMB)
 {
-        struct smb_t2_rsp *pSMB2 = (struct smb_t2_rsp *)psecond;
+        struct smb_t2_rsp *pSMBs = (struct smb_t2_rsp *)psecond;
         struct smb_t2_rsp *pSMBt  = (struct smb_t2_rsp *)pTargetSMB;
-        char *data_area_of_target;
-        char *data_area_of_buf2;
+        char *data_area_of_tgt;
+        char *data_area_of_src;
         int remaining;
-        unsigned int byte_count, total_in_buf;
-        __u16 total_data_size, total_in_buf2;
+        unsigned int byte_count, total_in_tgt;
+        __u16 tgt_total_cnt, src_total_cnt, total_in_src;
 
-        total_data_size = get_unaligned_le16(&pSMBt->t2_rsp.TotalDataCount);
+        src_total_cnt = get_unaligned_le16(&pSMBs->t2_rsp.TotalDataCount);
+        tgt_total_cnt = get_unaligned_le16(&pSMBt->t2_rsp.TotalDataCount);
 
-        if (total_data_size !=
-            get_unaligned_le16(&pSMB2->t2_rsp.TotalDataCount))
-                cFYI(1, "total data size of primary and secondary t2 differ");
+        if (tgt_total_cnt != src_total_cnt)
+                cFYI(1, "total data count of primary and secondary t2 differ "
+                        "source=%hu target=%hu", src_total_cnt, tgt_total_cnt);
 
-        total_in_buf = get_unaligned_le16(&pSMBt->t2_rsp.DataCount);
+        total_in_tgt = get_unaligned_le16(&pSMBt->t2_rsp.DataCount);
 
-        remaining = total_data_size - total_in_buf;
+        remaining = tgt_total_cnt - total_in_tgt;
 
-        if (remaining < 0)
+        if (remaining < 0) {
+                cFYI(1, "Server sent too much data. tgt_total_cnt=%hu "
+                        "total_in_tgt=%hu", tgt_total_cnt, total_in_tgt);
                 return -EPROTO;
+        }
 
-        if (remaining == 0) /* nothing to do, ignore */
+        if (remaining == 0) {
+                /* nothing to do, ignore */
+                cFYI(1, "no more data remains");
                 return 0;
+        }
 
-        total_in_buf2 = get_unaligned_le16(&pSMB2->t2_rsp.DataCount);
-        if (remaining < total_in_buf2) {
+        total_in_src = get_unaligned_le16(&pSMBs->t2_rsp.DataCount);
+        if (remaining < total_in_src)
                 cFYI(1, "transact2 2nd response contains too much data");
-        }
 
         /* find end of first SMB data area */
-        data_area_of_target = (char *)&pSMBt->hdr.Protocol +
+        data_area_of_tgt = (char *)&pSMBt->hdr.Protocol +
                                 get_unaligned_le16(&pSMBt->t2_rsp.DataOffset);
-        /* validate target area */
 
-        data_area_of_buf2 = (char *)&pSMB2->hdr.Protocol +
-                                get_unaligned_le16(&pSMB2->t2_rsp.DataOffset);
+        /* validate target area */
+        data_area_of_src = (char *)&pSMBs->hdr.Protocol +
+                                get_unaligned_le16(&pSMBs->t2_rsp.DataOffset);
 
-        data_area_of_target += total_in_buf;
+        data_area_of_tgt += total_in_tgt;
 
-        /* copy second buffer into end of first buffer */
-        total_in_buf += total_in_buf2;
+        total_in_tgt += total_in_src;
         /* is the result too big for the field? */
-        if (total_in_buf > USHRT_MAX)
+        if (total_in_tgt > USHRT_MAX) {
+                cFYI(1, "coalesced DataCount too large (%u)", total_in_tgt);
                 return -EPROTO;
-        put_unaligned_le16(total_in_buf, &pSMBt->t2_rsp.DataCount);
+        }
+        put_unaligned_le16(total_in_tgt, &pSMBt->t2_rsp.DataCount);
 
         /* fix up the BCC */
         byte_count = get_bcc(pTargetSMB);
-        byte_count += total_in_buf2;
+        byte_count += total_in_src;
         /* is the result too big for the field? */
-        if (byte_count > USHRT_MAX)
+        if (byte_count > USHRT_MAX) {
+                cFYI(1, "coalesced BCC too large (%u)", byte_count);
                 return -EPROTO;
+        }
         put_bcc(byte_count, pTargetSMB);
 
         byte_count = be32_to_cpu(pTargetSMB->smb_buf_length);
-        byte_count += total_in_buf2;
+        byte_count += total_in_src;
         /* don't allow buffer to overflow */
-        if (byte_count > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4)
+        if (byte_count > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4) {
+                cFYI(1, "coalesced BCC exceeds buffer size (%u)", byte_count);
                 return -ENOBUFS;
+        }
         pTargetSMB->smb_buf_length = cpu_to_be32(byte_count);
 
-        memcpy(data_area_of_target, data_area_of_buf2, total_in_buf2);
+        /* copy second buffer into end of first buffer */
+        memcpy(data_area_of_tgt, data_area_of_src, total_in_src);
 
-        if (remaining == total_in_buf2) {
-                cFYI(1, "found the last secondary response");
-                return 0; /* we are done */
-        } else /* more responses to go */
+        if (remaining != total_in_src) {
+                /* more responses to go */
+                cFYI(1, "waiting for more secondary responses");
                 return 1;
+        }
+
+        /* we are done */
+        cFYI(1, "found the last secondary response");
+        return 0;
 }
 
 static void
@@ -756,10 +773,11 @@ standard_receive3(struct TCP_Server_Info *server, struct mid_q_entry *mid)
                 cifs_dump_mem("Bad SMB: ", buf,
                         min_t(unsigned int, server->total_read, 48));
 
-        if (mid)
-                handle_mid(mid, server, smb_buffer, length);
+        if (!mid)
+                return length;
 
-        return length;
+        handle_mid(mid, server, smb_buffer, length);
+        return 0;
 }
 
 static int
@@ -1578,11 +1596,14 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                 }
         }
 
-        if (vol->multiuser && !(vol->secFlg & CIFSSEC_MAY_KRB5)) {
-                cERROR(1, "Multiuser mounts currently require krb5 "
-                          "authentication!");
+#ifndef CONFIG_KEYS
+        /* Muliuser mounts require CONFIG_KEYS support */
+        if (vol->multiuser) {
+                cERROR(1, "Multiuser mounts require kernels with "
+                          "CONFIG_KEYS enabled.");
                 goto cifs_parse_mount_err;
         }
+#endif
 
         if (vol->UNCip == NULL)
                 vol->UNCip = &vol->UNC[2];
@@ -1981,10 +2002,16 @@ static int match_session(struct cifs_ses *ses, struct smb_vol *vol)
                         return 0;
                 break;
         default:
+                /* NULL username means anonymous session */
+                if (ses->user_name == NULL) {
+                        if (!vol->nullauth)
+                                return 0;
+                        break;
+                }
+
                 /* anything else takes username/password */
-                if (ses->user_name == NULL)
-                        return 0;
-                if (strncmp(ses->user_name, vol->username,
+                if (strncmp(ses->user_name,
+                            vol->username ? vol->username : "",
                             MAX_USERNAME_SIZE))
                         return 0;
                 if (strlen(vol->username) != 0 &&
@@ -2039,6 +2066,132 @@ cifs_put_smb_ses(struct cifs_ses *ses)
         cifs_put_tcp_session(server);
 }
 
+#ifdef CONFIG_KEYS
+
+/* strlen("cifs:a:") + INET6_ADDRSTRLEN + 1 */
+#define CIFSCREDS_DESC_SIZE (7 + INET6_ADDRSTRLEN + 1)
+
+/* Populate username and pw fields from keyring if possible */
+static int
+cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses)
+{
+        int rc = 0;
+        char *desc, *delim, *payload;
+        ssize_t len;
+        struct key *key;
+        struct TCP_Server_Info *server = ses->server;
+        struct sockaddr_in *sa;
+        struct sockaddr_in6 *sa6;
+        struct user_key_payload *upayload;
+
+        desc = kmalloc(CIFSCREDS_DESC_SIZE, GFP_KERNEL);
+        if (!desc)
+                return -ENOMEM;
+
+        /* try to find an address key first */
+        switch (server->dstaddr.ss_family) {
+        case AF_INET:
+                sa = (struct sockaddr_in *)&server->dstaddr;
+                sprintf(desc, "cifs:a:%pI4", &sa->sin_addr.s_addr);
+                break;
+        case AF_INET6:
+                sa6 = (struct sockaddr_in6 *)&server->dstaddr;
+                sprintf(desc, "cifs:a:%pI6c", &sa6->sin6_addr.s6_addr);
+                break;
+        default:
+                cFYI(1, "Bad ss_family (%hu)", server->dstaddr.ss_family);
+                rc = -EINVAL;
+                goto out_err;
+        }
+
+        cFYI(1, "%s: desc=%s", __func__, desc);
+        key = request_key(&key_type_logon, desc, "");
+        if (IS_ERR(key)) {
+                if (!ses->domainName) {
+                        cFYI(1, "domainName is NULL");
+                        rc = PTR_ERR(key);
+                        goto out_err;
+                }
+
+                /* didn't work, try to find a domain key */
+                sprintf(desc, "cifs:d:%s", ses->domainName);
+                cFYI(1, "%s: desc=%s", __func__, desc);
+                key = request_key(&key_type_logon, desc, "");
+                if (IS_ERR(key)) {
+                        rc = PTR_ERR(key);
+                        goto out_err;
+                }
+        }
+
+        down_read(&key->sem);
+        upayload = key->payload.data;
+        if (IS_ERR_OR_NULL(upayload)) {
+                rc = upayload ? PTR_ERR(upayload) : -EINVAL;
+                goto out_key_put;
+        }
+
+        /* find first : in payload */
+        payload = (char *)upayload->data;
+        delim = strnchr(payload, upayload->datalen, ':');
+        cFYI(1, "payload=%s", payload);
+        if (!delim) {
+                cFYI(1, "Unable to find ':' in payload (datalen=%d)",
+                                upayload->datalen);
+                rc = -EINVAL;
+                goto out_key_put;
+        }
+
+        len = delim - payload;
+        if (len > MAX_USERNAME_SIZE || len <= 0) {
+                cFYI(1, "Bad value from username search (len=%zd)", len);
+                rc = -EINVAL;
+                goto out_key_put;
+        }
+
+        vol->username = kstrndup(payload, len, GFP_KERNEL);
+        if (!vol->username) {
+                cFYI(1, "Unable to allocate %zd bytes for username", len);
+                rc = -ENOMEM;
+                goto out_key_put;
+        }
+        cFYI(1, "%s: username=%s", __func__, vol->username);
+
+        len = key->datalen - (len + 1);
+        if (len > MAX_PASSWORD_SIZE || len <= 0) {
+                cFYI(1, "Bad len for password search (len=%zd)", len);
+                rc = -EINVAL;
+                kfree(vol->username);
+                vol->username = NULL;
+                goto out_key_put;
+        }
+
+        ++delim;
+        vol->password = kstrndup(delim, len, GFP_KERNEL);
+        if (!vol->password) {
+                cFYI(1, "Unable to allocate %zd bytes for password", len);
+                rc = -ENOMEM;
+                kfree(vol->username);
+                vol->username = NULL;
+                goto out_key_put;
+        }
+
+out_key_put:
+        up_read(&key->sem);
+        key_put(key);
+out_err:
+        kfree(desc);
+        cFYI(1, "%s: returning %d", __func__, rc);
+        return rc;
+}
+#else /* ! CONFIG_KEYS */
+static inline int
+cifs_set_cifscreds(struct smb_vol *vol __attribute__((unused)),
+                   struct cifs_ses *ses __attribute__((unused)))
+{
+        return -ENOSYS;
+}
+#endif /* CONFIG_KEYS */
+
 static bool warned_on_ntlm;  /* globals init to false automatically */
 
 static struct cifs_ses *
@@ -2914,18 +3067,33 @@ void cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
 #define CIFS_DEFAULT_IOSIZE (1024 * 1024)
 
 /*
- * Windows only supports a max of 60k reads. Default to that when posix
- * extensions aren't in force.
+ * Windows only supports a max of 60kb reads and 65535 byte writes. Default to
+ * those values when posix extensions aren't in force. In actuality here, we
+ * use 65536 to allow for a write that is a multiple of 4k. Most servers seem
+ * to be ok with the extra byte even though Windows doesn't send writes that
+ * are that large.
+ *
+ * Citation:
+ *
+ * http://blogs.msdn.com/b/openspecification/archive/2009/04/10/smb-maximum-transmit-buffer-size-and-performance-tuning.aspx
  */
 #define CIFS_DEFAULT_NON_POSIX_RSIZE (60 * 1024)
+#define CIFS_DEFAULT_NON_POSIX_WSIZE (65536)
 
 static unsigned int
 cifs_negotiate_wsize(struct cifs_tcon *tcon, struct smb_vol *pvolume_info)
 {
         __u64 unix_cap = le64_to_cpu(tcon->fsUnixInfo.Capability);
         struct TCP_Server_Info *server = tcon->ses->server;
-        unsigned int wsize = pvolume_info->wsize ? pvolume_info->wsize :
-                                CIFS_DEFAULT_IOSIZE;
+        unsigned int wsize;
+
+        /* start with specified wsize, or default */
+        if (pvolume_info->wsize)
+                wsize = pvolume_info->wsize;
+        else if (tcon->unix_ext && (unix_cap & CIFS_UNIX_LARGE_WRITE_CAP))
+                wsize = CIFS_DEFAULT_IOSIZE;
+        else
+                wsize = CIFS_DEFAULT_NON_POSIX_WSIZE;
 
         /* can server support 24-bit write sizes? (via UNIX extensions) */
         if (!tcon->unix_ext || !(unix_cap & CIFS_UNIX_LARGE_WRITE_CAP))
@@ -3136,10 +3304,9 @@ cifs_setup_volume_info(struct smb_vol *volume_info, char *mount_data,
                 return -EINVAL;
 
         if (volume_info->nullauth) {
-                cFYI(1, "null user");
-                volume_info->username = kzalloc(1, GFP_KERNEL);
-                if (volume_info->username == NULL)
-                        return -ENOMEM;
+                cFYI(1, "Anonymous login");
+                kfree(volume_info->username);
+                volume_info->username = NULL;
         } else if (volume_info->username) {
                 /* BB fixme parse for domain name here */
                 cFYI(1, "Username: %s", volume_info->username);
@@ -3478,7 +3645,7 @@ CIFSTCon(unsigned int xid, struct cifs_ses *ses,
         if (ses->capabilities & CAP_UNICODE) {
                 smb_buffer->Flags2 |= SMBFLG2_UNICODE;
                 length =
-                    cifs_strtoUCS((__le16 *) bcc_ptr, tree,
+                    cifs_strtoUTF16((__le16 *) bcc_ptr, tree,
                         6 /* max utf8 char length in bytes */ *
                         (/* server len*/ + 256 /* share len */), nls_codepage);
                 bcc_ptr += 2 * length;  /* convert num 16 bit words to bytes */
@@ -3533,7 +3700,7 @@ CIFSTCon(unsigned int xid, struct cifs_ses *ses,
 
                 /* mostly informational -- no need to fail on error here */
                 kfree(tcon->nativeFileSystem);
-                tcon->nativeFileSystem = cifs_strndup_from_ucs(bcc_ptr,
+                tcon->nativeFileSystem = cifs_strndup_from_utf16(bcc_ptr,
                                                       bytes_left, is_unicode,
                                                       nls_codepage);
 
@@ -3657,25 +3824,43 @@ int cifs_setup_session(unsigned int xid, struct cifs_ses *ses,
         return rc;
 }
 
+static int
+cifs_set_vol_auth(struct smb_vol *vol, struct cifs_ses *ses)
+{
+        switch (ses->server->secType) {
+        case Kerberos:
+                vol->secFlg = CIFSSEC_MUST_KRB5;
+                return 0;
+        case NTLMv2:
+                vol->secFlg = CIFSSEC_MUST_NTLMV2;
+                break;
+        case NTLM:
+                vol->secFlg = CIFSSEC_MUST_NTLM;
+                break;
+        case RawNTLMSSP:
+                vol->secFlg = CIFSSEC_MUST_NTLMSSP;
+                break;
+        case LANMAN:
+                vol->secFlg = CIFSSEC_MUST_LANMAN;
+                break;
+        }
+
+        return cifs_set_cifscreds(vol, ses);
+}
+
 static struct cifs_tcon *
 cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid)
 {
+        int rc;
         struct cifs_tcon *master_tcon = cifs_sb_master_tcon(cifs_sb);
         struct cifs_ses *ses;
         struct cifs_tcon *tcon = NULL;
         struct smb_vol *vol_info;
-        char username[28]; /* big enough for "krb50x" + hex of ULONG_MAX 6+16 */
-                           /* We used to have this as MAX_USERNAME which is   */
-                           /* way too big now (256 instead of 32) */
 
         vol_info = kzalloc(sizeof(*vol_info), GFP_KERNEL);
-        if (vol_info == NULL) {
-                tcon = ERR_PTR(-ENOMEM);
-                goto out;
-        }
+        if (vol_info == NULL)
+                return ERR_PTR(-ENOMEM);
 
-        snprintf(username, sizeof(username), "krb50x%x", fsuid);
-        vol_info->username = username;
         vol_info->local_nls = cifs_sb->local_nls;
         vol_info->linux_uid = fsuid;
         vol_info->cred_uid = fsuid;
@@ -3685,8 +3870,11 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid)
         vol_info->local_lease = master_tcon->local_lease;
         vol_info->no_linux_ext = !master_tcon->unix_ext;
 
-        /* FIXME: allow for other secFlg settings */
-        vol_info->secFlg = CIFSSEC_MUST_KRB5;
+        rc = cifs_set_vol_auth(vol_info, master_tcon->ses);
+        if (rc) {
+                tcon = ERR_PTR(rc);
+                goto out;
+        }
 
         /* get a reference for the same TCP session */
         spin_lock(&cifs_tcp_ses_lock);
@@ -3709,6 +3897,8 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid)
         if (ses->capabilities & CAP_UNIX)
                 reset_cifs_unix_caps(0, tcon, NULL, vol_info);
 out:
+        kfree(vol_info->username);
+        kfree(vol_info->password);
         kfree(vol_info);
 
         return tcon;
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index df8fecb5b993..63a196b97d50 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -492,7 +492,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
 {
         int xid;
         int rc = 0; /* to get around spurious gcc warning, set to zero here */
-        __u32 oplock = 0;
+        __u32 oplock = enable_oplocks ? REQ_OPLOCK : 0;
         __u16 fileHandle = 0;
         bool posix_open = false;
         struct cifs_sb_info *cifs_sb;
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index a090bbe6ee29..e2bbc683e018 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -647,10 +647,11 @@ static int cifs_filldir(char *find_entry, struct file *file, filldir_t filldir,
 
                 name.name = scratch_buf;
                 name.len =
-                        cifs_from_ucs2((char *)name.name, (__le16 *)de.name,
-                                       UNICODE_NAME_MAX,
-                                       min(de.namelen, (size_t)max_len), nlt,
-                                       cifs_sb->mnt_cifs_flags &
+                        cifs_from_utf16((char *)name.name, (__le16 *)de.name,
+                                        UNICODE_NAME_MAX,
+                                        min_t(size_t, de.namelen,
+                                              (size_t)max_len), nlt,
+                                        cifs_sb->mnt_cifs_flags &
                                                 CIFS_MOUNT_MAP_SPECIAL_CHR);
                 name.len -= nls_nullsize(nlt);
         } else {
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 4ec3ee9d72cc..551d0c2b9736 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -167,16 +167,16 @@ unicode_oslm_strings(char **pbcc_area, const struct nls_table *nls_cp)
         int bytes_ret = 0;
 
         /* Copy OS version */
-        bytes_ret = cifs_strtoUCS((__le16 *)bcc_ptr, "Linux version ", 32,
-                                  nls_cp);
+        bytes_ret = cifs_strtoUTF16((__le16 *)bcc_ptr, "Linux version ", 32,
+                                    nls_cp);
         bcc_ptr += 2 * bytes_ret;
-        bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, init_utsname()->release,
-                                  32, nls_cp);
+        bytes_ret = cifs_strtoUTF16((__le16 *) bcc_ptr, init_utsname()->release,
+                                    32, nls_cp);
         bcc_ptr += 2 * bytes_ret;
         bcc_ptr += 2; /* trailing null */
 
-        bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, CIFS_NETWORK_OPSYS,
-                                  32, nls_cp);
+        bytes_ret = cifs_strtoUTF16((__le16 *) bcc_ptr, CIFS_NETWORK_OPSYS,
+                                    32, nls_cp);
         bcc_ptr += 2 * bytes_ret;
         bcc_ptr += 2; /* trailing null */
 
@@ -197,8 +197,8 @@ static void unicode_domain_string(char **pbcc_area, struct cifs_ses *ses,
                 *(bcc_ptr+1) = 0;
                 bytes_ret = 0;
         } else
-                bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, ses->domainName,
-                                          256, nls_cp);
+                bytes_ret = cifs_strtoUTF16((__le16 *) bcc_ptr, ses->domainName,
+                                            256, nls_cp);
         bcc_ptr += 2 * bytes_ret;
         bcc_ptr += 2;  /* account for null terminator */
 
@@ -226,8 +226,8 @@ static void unicode_ssetup_strings(char **pbcc_area, struct cifs_ses *ses,
                 *bcc_ptr = 0;
                 *(bcc_ptr+1) = 0;
         } else {
-                bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, ses->user_name,
-                                          MAX_USERNAME_SIZE, nls_cp);
+                bytes_ret = cifs_strtoUTF16((__le16 *) bcc_ptr, ses->user_name,
+                                            MAX_USERNAME_SIZE, nls_cp);
         }
         bcc_ptr += 2 * bytes_ret;
         bcc_ptr += 2; /* account for null termination */
@@ -246,16 +246,15 @@ static void ascii_ssetup_strings(char **pbcc_area, struct cifs_ses *ses,
         /* copy user */
         /* BB what about null user mounts - check that we do this BB */
         /* copy user */
-        if (ses->user_name != NULL)
+        if (ses->user_name != NULL) {
                 strncpy(bcc_ptr, ses->user_name, MAX_USERNAME_SIZE);
+                bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE);
+        }
         /* else null user mount */
-
-        bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE);
         *bcc_ptr = 0;
         bcc_ptr++; /* account for null termination */
 
         /* copy domain */
-
         if (ses->domainName != NULL) {
                 strncpy(bcc_ptr, ses->domainName, 256);
                 bcc_ptr += strnlen(ses->domainName, 256);
@@ -287,7 +286,7 @@ decode_unicode_ssetup(char **pbcc_area, int bleft, struct cifs_ses *ses,
         cFYI(1, "bleft %d", bleft);
 
         kfree(ses->serverOS);
-        ses->serverOS = cifs_strndup_from_ucs(data, bleft, true, nls_cp);
+        ses->serverOS = cifs_strndup_from_utf16(data, bleft, true, nls_cp);
         cFYI(1, "serverOS=%s", ses->serverOS);
         len = (UniStrnlen((wchar_t *) data, bleft / 2) * 2) + 2;
         data += len;
@@ -296,7 +295,7 @@ decode_unicode_ssetup(char **pbcc_area, int bleft, struct cifs_ses *ses,
                 return;
 
         kfree(ses->serverNOS);
-        ses->serverNOS = cifs_strndup_from_ucs(data, bleft, true, nls_cp);
+        ses->serverNOS = cifs_strndup_from_utf16(data, bleft, true, nls_cp);
         cFYI(1, "serverNOS=%s", ses->serverNOS);
         len = (UniStrnlen((wchar_t *) data, bleft / 2) * 2) + 2;
         data += len;
@@ -305,7 +304,7 @@ decode_unicode_ssetup(char **pbcc_area, int bleft, struct cifs_ses *ses,
                 return;
 
         kfree(ses->serverDomain);
-        ses->serverDomain = cifs_strndup_from_ucs(data, bleft, true, nls_cp);
+        ses->serverDomain = cifs_strndup_from_utf16(data, bleft, true, nls_cp);
         cFYI(1, "serverDomain=%s", ses->serverDomain);
 
         return;
@@ -395,6 +394,10 @@ static int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len,
         ses->ntlmssp->server_flags = le32_to_cpu(pblob->NegotiateFlags);
         tioffset = le32_to_cpu(pblob->TargetInfoArray.BufferOffset);
         tilen = le16_to_cpu(pblob->TargetInfoArray.Length);
+        if (tioffset > blob_len || tioffset + tilen > blob_len) {
+                cERROR(1, "tioffset + tilen too high %u + %u", tioffset, tilen);
+                return -EINVAL;
+        }
         if (tilen) {
                 ses->auth_key.response = kmalloc(tilen, GFP_KERNEL);
                 if (!ses->auth_key.response) {
@@ -502,8 +505,8 @@ static int build_ntlmssp_auth_blob(unsigned char *pbuffer,
                 tmp += 2;
         } else {
                 int len;
-                len = cifs_strtoUCS((__le16 *)tmp, ses->domainName,
-                                    MAX_USERNAME_SIZE, nls_cp);
+                len = cifs_strtoUTF16((__le16 *)tmp, ses->domainName,
+                                      MAX_USERNAME_SIZE, nls_cp);
                 len *= 2; /* unicode is 2 bytes each */
                 sec_blob->DomainName.BufferOffset = cpu_to_le32(tmp - pbuffer);
                 sec_blob->DomainName.Length = cpu_to_le16(len);
@@ -518,8 +521,8 @@ static int build_ntlmssp_auth_blob(unsigned char *pbuffer,
                 tmp += 2;
         } else {
                 int len;
-                len = cifs_strtoUCS((__le16 *)tmp, ses->user_name,
-                                    MAX_USERNAME_SIZE, nls_cp);
+                len = cifs_strtoUTF16((__le16 *)tmp, ses->user_name,
+                                      MAX_USERNAME_SIZE, nls_cp);
                 len *= 2; /* unicode is 2 bytes each */
                 sec_blob->UserName.BufferOffset = cpu_to_le32(tmp - pbuffer);
                 sec_blob->UserName.Length = cpu_to_le16(len);
diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c
index 80d850881938..d5cd9aa7eacc 100644
--- a/fs/cifs/smbencrypt.c
+++ b/fs/cifs/smbencrypt.c
@@ -213,7 +213,7 @@ E_md4hash(const unsigned char *passwd, unsigned char *p16,
 
         /* Password cannot be longer than 128 characters */
         if (passwd) /* Password must be converted to NT unicode */
-                len = cifs_strtoUCS(wpwd, passwd, 128, codepage);
+                len = cifs_strtoUTF16(wpwd, passwd, 128, codepage);
         else {
                 len = 0;
                 *wpwd = 0; /* Ensure string is null terminated */
diff --git a/fs/compat.c b/fs/compat.c
index fa9d721ecfee..07880bae28a9 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -131,41 +131,35 @@ asmlinkage long compat_sys_utimes(const char __user *filename, struct compat_tim
 
 static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
 {
-        compat_ino_t ino = stat->ino;
-        typeof(ubuf->st_uid) uid = 0;
-        typeof(ubuf->st_gid) gid = 0;
-        int err;
+        struct compat_stat tmp;
 
-        SET_UID(uid, stat->uid);
-        SET_GID(gid, stat->gid);
+        if (!old_valid_dev(stat->dev) || !old_valid_dev(stat->rdev))
+                return -EOVERFLOW;
 
-        if ((u64) stat->size > MAX_NON_LFS ||
-            !old_valid_dev(stat->dev) ||
-            !old_valid_dev(stat->rdev))
+        memset(&tmp, 0, sizeof(tmp));
+        tmp.st_dev = old_encode_dev(stat->dev);
+        tmp.st_ino = stat->ino;
+        if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
                 return -EOVERFLOW;
-        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+        tmp.st_mode = stat->mode;
+        tmp.st_nlink = stat->nlink;
+        if (tmp.st_nlink != stat->nlink)
                 return -EOVERFLOW;
-
-        if (clear_user(ubuf, sizeof(*ubuf)))
-                return -EFAULT;
-
-        err  = __put_user(old_encode_dev(stat->dev), &ubuf->st_dev);
-        err |= __put_user(ino, &ubuf->st_ino);
-        err |= __put_user(stat->mode, &ubuf->st_mode);
-        err |= __put_user(stat->nlink, &ubuf->st_nlink);
-        err |= __put_user(uid, &ubuf->st_uid);
-        err |= __put_user(gid, &ubuf->st_gid);
-        err |= __put_user(old_encode_dev(stat->rdev), &ubuf->st_rdev);
-        err |= __put_user(stat->size, &ubuf->st_size);
-        err |= __put_user(stat->atime.tv_sec, &ubuf->st_atime);
-        err |= __put_user(stat->atime.tv_nsec, &ubuf->st_atime_nsec);
-        err |= __put_user(stat->mtime.tv_sec, &ubuf->st_mtime);
-        err |= __put_user(stat->mtime.tv_nsec, &ubuf->st_mtime_nsec);
-        err |= __put_user(stat->ctime.tv_sec, &ubuf->st_ctime);
-        err |= __put_user(stat->ctime.tv_nsec, &ubuf->st_ctime_nsec);
-        err |= __put_user(stat->blksize, &ubuf->st_blksize);
-        err |= __put_user(stat->blocks, &ubuf->st_blocks);
-        return err;
+        SET_UID(tmp.st_uid, stat->uid);
+        SET_GID(tmp.st_gid, stat->gid);
+        tmp.st_rdev = old_encode_dev(stat->rdev);
+        if ((u64) stat->size > MAX_NON_LFS)
+                return -EOVERFLOW;
+        tmp.st_size = stat->size;
+        tmp.st_atime = stat->atime.tv_sec;
+        tmp.st_atime_nsec = stat->atime.tv_nsec;
+        tmp.st_mtime = stat->mtime.tv_sec;
+        tmp.st_mtime_nsec = stat->mtime.tv_nsec;
+        tmp.st_ctime = stat->ctime.tv_sec;
+        tmp.st_ctime_nsec = stat->ctime.tv_nsec;
+        tmp.st_blocks = stat->blocks;
+        tmp.st_blksize = stat->blksize;
+        return copy_to_user(ubuf, &tmp, sizeof(tmp)) ? -EFAULT : 0;
 }
 
 asmlinkage long compat_sys_newstat(const char __user * filename,
diff --git a/fs/dcache.c b/fs/dcache.c
index 16a53cc2cc02..fe19ac13f75f 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -2968,7 +2968,7 @@ __setup("dhash_entries=", set_dhash_entries);
 
 static void __init dcache_init_early(void)
 {
-        int loop;
+        unsigned int loop;
 
         /* If hashes are distributed across NUMA nodes, defer
          * hash allocation until vmalloc space is available.
@@ -2986,13 +2986,13 @@ static void __init dcache_init_early(void)
                                         &d_hash_mask,
                                         0);
 
-        for (loop = 0; loop < (1 << d_hash_shift); loop++)
+        for (loop = 0; loop < (1U << d_hash_shift); loop++)
                 INIT_HLIST_BL_HEAD(dentry_hashtable + loop);
 }
 
 static void __init dcache_init(void)
 {
-        int loop;
+        unsigned int loop;
 
         /* 
          * A constructor could be added for stable state like the lists,
@@ -3016,7 +3016,7 @@ static void __init dcache_init(void)
                                         &d_hash_mask,
                                         0);
 
-        for (loop = 0; loop < (1 << d_hash_shift); loop++)
+        for (loop = 0; loop < (1U << d_hash_shift); loop++)
                 INIT_HLIST_BL_HEAD(dentry_hashtable + loop);
 }
 
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index f65d4455c5e5..ef023eef0464 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -540,7 +540,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_blob);
  * debugfs_print_regs32 - use seq_print to describe a set of registers
  * @s: the seq_file structure being used to generate output
  * @regs: an array if struct debugfs_reg32 structures
- * @mregs: the length of the above array
+ * @nregs: the length of the above array
  * @base: the base address to be used in reading the registers
  * @prefix: a string to be prefixed to every output line
  *
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 4a588dbd11bf..f4aadd15b613 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -173,7 +173,7 @@ void inode_dio_wait(struct inode *inode)
         if (atomic_read(&inode->i_dio_count))
                 __inode_dio_wait(inode);
 }
-EXPORT_SYMBOL_GPL(inode_dio_wait);
+EXPORT_SYMBOL(inode_dio_wait);
 
 /*
  * inode_dio_done - signal finish of a direct I/O requests
@@ -187,7 +187,7 @@ void inode_dio_done(struct inode *inode)
         if (atomic_dec_and_test(&inode->i_dio_count))
                 wake_up_bit(&inode->i_state, __I_DIO_WAKEUP);
 }
-EXPORT_SYMBOL_GPL(inode_dio_done);
+EXPORT_SYMBOL(inode_dio_done);
 
 /*
  * How many pages are in the queue?
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 2a834255c75d..ea9931281557 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -417,17 +417,6 @@ static int ecryptfs_encrypt_extent(struct page *enc_extent_page,
                         (unsigned long long)(extent_base + extent_offset), rc);
                 goto out;
         }
-        if (unlikely(ecryptfs_verbosity > 0)) {
-                ecryptfs_printk(KERN_DEBUG, "Encrypting extent "
-                                "with iv:\n");
-                ecryptfs_dump_hex(extent_iv, crypt_stat->iv_bytes);
-                ecryptfs_printk(KERN_DEBUG, "First 8 bytes before "
-                                "encryption:\n");
-                ecryptfs_dump_hex((char *)
-                                  (page_address(page)
-                                   + (extent_offset * crypt_stat->extent_size)),
-                                  8);
-        }
         rc = ecryptfs_encrypt_page_offset(crypt_stat, enc_extent_page, 0,
                                           page, (extent_offset
                                                  * crypt_stat->extent_size),
@@ -440,14 +429,6 @@ static int ecryptfs_encrypt_extent(struct page *enc_extent_page,
                 goto out;
         }
         rc = 0;
-        if (unlikely(ecryptfs_verbosity > 0)) {
-                ecryptfs_printk(KERN_DEBUG, "Encrypt extent [0x%.16llx]; "
-                        "rc = [%d]\n",
-                        (unsigned long long)(extent_base + extent_offset), rc);
-                ecryptfs_printk(KERN_DEBUG, "First 8 bytes after "
-                                "encryption:\n");
-                ecryptfs_dump_hex((char *)(page_address(enc_extent_page)), 8);
-        }
 out:
         return rc;
 }
@@ -543,17 +524,6 @@ static int ecryptfs_decrypt_extent(struct page *page,
                         (unsigned long long)(extent_base + extent_offset), rc);
                 goto out;
         }
-        if (unlikely(ecryptfs_verbosity > 0)) {
-                ecryptfs_printk(KERN_DEBUG, "Decrypting extent "
-                                "with iv:\n");
-                ecryptfs_dump_hex(extent_iv, crypt_stat->iv_bytes);
-                ecryptfs_printk(KERN_DEBUG, "First 8 bytes before "
-                                "decryption:\n");
-                ecryptfs_dump_hex((char *)
-                                  (page_address(enc_extent_page)
-                                   + (extent_offset * crypt_stat->extent_size)),
-                                  8);
-        }
         rc = ecryptfs_decrypt_page_offset(crypt_stat, page,
                                           (extent_offset
                                            * crypt_stat->extent_size),
@@ -567,16 +537,6 @@ static int ecryptfs_decrypt_extent(struct page *page,
                 goto out;
         }
         rc = 0;
-        if (unlikely(ecryptfs_verbosity > 0)) {
-                ecryptfs_printk(KERN_DEBUG, "Decrypt extent [0x%.16llx]; "
-                        "rc = [%d]\n",
-                        (unsigned long long)(extent_base + extent_offset), rc);
-                ecryptfs_printk(KERN_DEBUG, "First 8 bytes after "
-                                "decryption:\n");
-                ecryptfs_dump_hex((char *)(page_address(page)
-                                           + (extent_offset
-                                              * crypt_stat->extent_size)), 8);
-        }
 out:
         return rc;
 }
@@ -1590,8 +1550,8 @@ int ecryptfs_read_and_validate_xattr_region(struct dentry *dentry,
  */
 int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
 {
-        int rc = 0;
-        char *page_virt = NULL;
+        int rc;
+        char *page_virt;
         struct inode *ecryptfs_inode = ecryptfs_dentry->d_inode;
         struct ecryptfs_crypt_stat *crypt_stat =
             &ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat;
@@ -1616,11 +1576,13 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
                                                 ecryptfs_dentry,
                                                 ECRYPTFS_VALIDATE_HEADER_SIZE);
         if (rc) {
+                /* metadata is not in the file header, so try xattrs */
                 memset(page_virt, 0, PAGE_CACHE_SIZE);
                 rc = ecryptfs_read_xattr_region(page_virt, ecryptfs_inode);
                 if (rc) {
                         printk(KERN_DEBUG "Valid eCryptfs headers not found in "
-                               "file header region or xattr region\n");
+                               "file header region or xattr region, inode %lu\n",
+                                ecryptfs_inode->i_ino);
                         rc = -EINVAL;
                         goto out;
                 }
@@ -1629,7 +1591,8 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
                                                 ECRYPTFS_DONT_VALIDATE_HEADER_SIZE);
                 if (rc) {
                         printk(KERN_DEBUG "Valid eCryptfs headers not found in "
-                               "file xattr region either\n");
+                               "file xattr region either, inode %lu\n",
+                                ecryptfs_inode->i_ino);
                         rc = -EINVAL;
                 }
                 if (crypt_stat->mount_crypt_stat->flags
@@ -1640,7 +1603,8 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
                                "crypto metadata only in the extended attribute "
                                "region, but eCryptfs was mounted without "
                                "xattr support enabled. eCryptfs will not treat "
-                               "this like an encrypted file.\n");
+                               "this like an encrypted file, inode %lu\n",
+                                ecryptfs_inode->i_ino);
                         rc = -EINVAL;
                 }
         }
@@ -2026,6 +1990,17 @@ out:
         return;
 }
 
+static size_t ecryptfs_max_decoded_size(size_t encoded_size)
+{
+        /* Not exact; conservatively long. Every block of 4
+         * encoded characters decodes into a block of 3
+         * decoded characters. This segment of code provides
+         * the caller with the maximum amount of allocated
+         * space that @dst will need to point to in a
+         * subsequent call. */
+        return ((encoded_size + 1) * 3) / 4;
+}
+
 /**
  * ecryptfs_decode_from_filename
  * @dst: If NULL, this function only sets @dst_size and returns. If
@@ -2044,13 +2019,7 @@ ecryptfs_decode_from_filename(unsigned char *dst, size_t *dst_size,
         size_t dst_byte_offset = 0;
 
         if (dst == NULL) {
-                /* Not exact; conservatively long. Every block of 4
-                 * encoded characters decodes into a block of 3
-                 * decoded characters. This segment of code provides
-                 * the caller with the maximum amount of allocated
-                 * space that @dst will need to point to in a
-                 * subsequent call. */
-                (*dst_size) = (((src_size + 1) * 3) / 4);
+                (*dst_size) = ecryptfs_max_decoded_size(src_size);
                 goto out;
         }
         while (src_byte_offset < src_size) {
@@ -2275,3 +2244,52 @@ out_free:
 out:
         return rc;
 }
+
+#define ENC_NAME_MAX_BLOCKLEN_8_OR_16   143
+
+int ecryptfs_set_f_namelen(long *namelen, long lower_namelen,
+                           struct ecryptfs_mount_crypt_stat *mount_crypt_stat)
+{
+        struct blkcipher_desc desc;
+        struct mutex *tfm_mutex;
+        size_t cipher_blocksize;
+        int rc;
+
+        if (!(mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES)) {
+                (*namelen) = lower_namelen;
+                return 0;
+        }
+
+        rc = ecryptfs_get_tfm_and_mutex_for_cipher_name(&desc.tfm, &tfm_mutex,
+                        mount_crypt_stat->global_default_fn_cipher_name);
+        if (unlikely(rc)) {
+                (*namelen) = 0;
+                return rc;
+        }
+
+        mutex_lock(tfm_mutex);
+        cipher_blocksize = crypto_blkcipher_blocksize(desc.tfm);
+        mutex_unlock(tfm_mutex);
+
+        /* Return an exact amount for the common cases */
+        if (lower_namelen == NAME_MAX
+            && (cipher_blocksize == 8 || cipher_blocksize == 16)) {
+                (*namelen) = ENC_NAME_MAX_BLOCKLEN_8_OR_16;
+                return 0;
+        }
+
+        /* Return a safe estimate for the uncommon cases */
+        (*namelen) = lower_namelen;
+        (*namelen) -= ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX_SIZE;
+        /* Since this is the max decoded size, subtract 1 "decoded block" len */
+        (*namelen) = ecryptfs_max_decoded_size(*namelen) - 3;
+        (*namelen) -= ECRYPTFS_TAG_70_MAX_METADATA_SIZE;
+        (*namelen) -= ECRYPTFS_FILENAME_MIN_RANDOM_PREPEND_BYTES;
+        /* Worst case is that the filename is padded nearly a full block size */
+        (*namelen) -= cipher_blocksize - 1;
+
+        if ((*namelen) < 0)
+                (*namelen) = 0;
+
+        return 0;
+}
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index a9f29b12fbf2..867b64c5d84f 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -151,12 +151,21 @@ ecryptfs_get_key_payload_data(struct key *key)
                                           * dentry name */
 #define ECRYPTFS_TAG_73_PACKET_TYPE 0x49 /* FEK-encrypted filename as
                                           * metadata */
+#define ECRYPTFS_MIN_PKT_LEN_SIZE 1 /* Min size to specify packet length */
+#define ECRYPTFS_MAX_PKT_LEN_SIZE 2 /* Pass at least this many bytes to
+                                     * ecryptfs_parse_packet_length() and
+                                     * ecryptfs_write_packet_length()
+                                     */
 /* Constraint: ECRYPTFS_FILENAME_MIN_RANDOM_PREPEND_BYTES >=
  * ECRYPTFS_MAX_IV_BYTES */
 #define ECRYPTFS_FILENAME_MIN_RANDOM_PREPEND_BYTES 16
 #define ECRYPTFS_NON_NULL 0x42 /* A reasonable substitute for NULL */
 #define MD5_DIGEST_SIZE 16
 #define ECRYPTFS_TAG_70_DIGEST_SIZE MD5_DIGEST_SIZE
+#define ECRYPTFS_TAG_70_MIN_METADATA_SIZE (1 + ECRYPTFS_MIN_PKT_LEN_SIZE \
+                                           + ECRYPTFS_SIG_SIZE + 1 + 1)
+#define ECRYPTFS_TAG_70_MAX_METADATA_SIZE (1 + ECRYPTFS_MAX_PKT_LEN_SIZE \
+                                           + ECRYPTFS_SIG_SIZE + 1 + 1)
 #define ECRYPTFS_FEK_ENCRYPTED_FILENAME_PREFIX "ECRYPTFS_FEK_ENCRYPTED."
 #define ECRYPTFS_FEK_ENCRYPTED_FILENAME_PREFIX_SIZE 23
 #define ECRYPTFS_FNEK_ENCRYPTED_FILENAME_PREFIX "ECRYPTFS_FNEK_ENCRYPTED."
@@ -696,6 +705,8 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
                              size_t *packet_size,
                              struct ecryptfs_mount_crypt_stat *mount_crypt_stat,
                              char *data, size_t max_packet_size);
+int ecryptfs_set_f_namelen(long *namelen, long lower_namelen,
+                           struct ecryptfs_mount_crypt_stat *mount_crypt_stat);
 int ecryptfs_derive_iv(char *iv, struct ecryptfs_crypt_stat *crypt_stat,
                        loff_t offset);
 
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 19a8ca4ab1dd..ab35b113003b 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -822,18 +822,6 @@ static int truncate_upper(struct dentry *dentry, struct iattr *ia,
                 size_t num_zeros = (PAGE_CACHE_SIZE
                                     - (ia->ia_size & ~PAGE_CACHE_MASK));
 
-
-                /*
-                 * XXX(truncate) this should really happen at the begginning
-                 * of ->setattr.  But the code is too messy to that as part
-                 * of a larger patch.  ecryptfs is also totally missing out
-                 * on the inode_change_ok check at the beginning of
-                 * ->setattr while would include this.
-                 */
-                rc = inode_newsize_ok(inode, ia->ia_size);
-                if (rc)
-                        goto out;
-
                 if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) {
                         truncate_setsize(inode, ia->ia_size);
                         lower_ia->ia_size = ia->ia_size;
@@ -883,6 +871,28 @@ out:
         return rc;
 }
 
+static int ecryptfs_inode_newsize_ok(struct inode *inode, loff_t offset)
+{
+        struct ecryptfs_crypt_stat *crypt_stat;
+        loff_t lower_oldsize, lower_newsize;
+
+        crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat;
+        lower_oldsize = upper_size_to_lower_size(crypt_stat,
+                                                 i_size_read(inode));
+        lower_newsize = upper_size_to_lower_size(crypt_stat, offset);
+        if (lower_newsize > lower_oldsize) {
+                /*
+                 * The eCryptfs inode and the new *lower* size are mixed here
+                 * because we may not have the lower i_mutex held and/or it may
+                 * not be appropriate to call inode_newsize_ok() with inodes
+                 * from other filesystems.
+                 */
+                return inode_newsize_ok(inode, lower_newsize);
+        }
+
+        return 0;
+}
+
 /**
  * ecryptfs_truncate
  * @dentry: The ecryptfs layer dentry
@@ -899,6 +909,10 @@ int ecryptfs_truncate(struct dentry *dentry, loff_t new_length)
         struct iattr lower_ia = { .ia_valid = 0 };
         int rc;
 
+        rc = ecryptfs_inode_newsize_ok(dentry->d_inode, new_length);
+        if (rc)
+                return rc;
+
         rc = truncate_upper(dentry, &ia, &lower_ia);
         if (!rc && lower_ia.ia_valid & ATTR_SIZE) {
                 struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
@@ -978,6 +992,16 @@ static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)
                 }
         }
         mutex_unlock(&crypt_stat->cs_mutex);
+
+        rc = inode_change_ok(inode, ia);
+        if (rc)
+                goto out;
+        if (ia->ia_valid & ATTR_SIZE) {
+                rc = ecryptfs_inode_newsize_ok(inode, ia->ia_size);
+                if (rc)
+                        goto out;
+        }
+
         if (S_ISREG(inode->i_mode)) {
                 rc = filemap_write_and_wait(inode->i_mapping);
                 if (rc)
@@ -1061,6 +1085,8 @@ ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,
         }
 
         rc = vfs_setxattr(lower_dentry, name, value, size, flags);
+        if (!rc)
+                fsstack_copy_attr_all(dentry->d_inode, lower_dentry->d_inode);
 out:
         return rc;
 }
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index ac1ad48c2376..2333203a120b 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -109,7 +109,7 @@ int ecryptfs_parse_packet_length(unsigned char *data, size_t *size,
                 (*size) += ((unsigned char)(data[1]) + 192);
                 (*length_size) = 2;
         } else if (data[0] == 255) {
-                /* Five-byte length; we're not supposed to see this */
+                /* If support is added, adjust ECRYPTFS_MAX_PKT_LEN_SIZE */
                 ecryptfs_printk(KERN_ERR, "Five-byte packet length not "
                                 "supported\n");
                 rc = -EINVAL;
@@ -126,7 +126,7 @@ out:
 /**
  * ecryptfs_write_packet_length
  * @dest: The byte array target into which to write the length. Must
- *        have at least 5 bytes allocated.
+ *        have at least ECRYPTFS_MAX_PKT_LEN_SIZE bytes allocated.
  * @size: The length to write.
  * @packet_size_length: The number of bytes used to encode the packet
  *                      length is written to this address.
@@ -146,6 +146,7 @@ int ecryptfs_write_packet_length(char *dest, size_t size,
                 dest[1] = ((size - 192) % 256);
                 (*packet_size_length) = 2;
         } else {
+                /* If support is added, adjust ECRYPTFS_MAX_PKT_LEN_SIZE */
                 rc = -EINVAL;
                 ecryptfs_printk(KERN_WARNING,
                                 "Unsupported packet size: [%zd]\n", size);
@@ -678,10 +679,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
          * Octets N3-N4: Block-aligned encrypted filename
          *  - Consists of a minimum number of random characters, a \0
          *    separator, and then the filename */
-        s->max_packet_size = (1                   /* Tag 70 identifier */
-                              + 3                 /* Max Tag 70 packet size */
-                              + ECRYPTFS_SIG_SIZE /* FNEK sig */
-                              + 1                 /* Cipher identifier */
+        s->max_packet_size = (ECRYPTFS_TAG_70_MAX_METADATA_SIZE
                               + s->block_aligned_filename_size);
         if (dest == NULL) {
                 (*packet_size) = s->max_packet_size;
@@ -933,10 +931,10 @@ ecryptfs_parse_tag_70_packet(char **filename, size_t *filename_size,
                 goto out;
         }
         s->desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
-        if (max_packet_size < (1 + 1 + ECRYPTFS_SIG_SIZE + 1 + 1)) {
+        if (max_packet_size < ECRYPTFS_TAG_70_MIN_METADATA_SIZE) {
                 printk(KERN_WARNING "%s: max_packet_size is [%zd]; it must be "
                        "at least [%d]\n", __func__, max_packet_size,
-                        (1 + 1 + ECRYPTFS_SIG_SIZE + 1 + 1));
+                       ECRYPTFS_TAG_70_MIN_METADATA_SIZE);
                 rc = -EINVAL;
                 goto out;
         }
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
index 940a82e63dc3..349209dc6a91 100644
--- a/fs/ecryptfs/miscdev.c
+++ b/fs/ecryptfs/miscdev.c
@@ -218,6 +218,29 @@ out_unlock:
         return rc;
 }
 
+/*
+ * miscdevfs packet format:
+ *  Octet 0: Type
+ *  Octets 1-4: network byte order msg_ctx->counter
+ *  Octets 5-N0: Size of struct ecryptfs_message to follow
+ *  Octets N0-N1: struct ecryptfs_message (including data)
+ *
+ *  Octets 5-N1 not written if the packet type does not include a message
+ */
+#define PKT_TYPE_SIZE           1
+#define PKT_CTR_SIZE            4
+#define MIN_NON_MSG_PKT_SIZE    (PKT_TYPE_SIZE + PKT_CTR_SIZE)
+#define MIN_MSG_PKT_SIZE        (PKT_TYPE_SIZE + PKT_CTR_SIZE \
+                                 + ECRYPTFS_MIN_PKT_LEN_SIZE)
+/* 4 + ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES comes from tag 65 packet format */
+#define MAX_MSG_PKT_SIZE        (PKT_TYPE_SIZE + PKT_CTR_SIZE \
+                                 + ECRYPTFS_MAX_PKT_LEN_SIZE \
+                                 + sizeof(struct ecryptfs_message) \
+                                 + 4 + ECRYPTFS_MAX_ENCRYPTED_KEY_BYTES)
+#define PKT_TYPE_OFFSET         0
+#define PKT_CTR_OFFSET          PKT_TYPE_SIZE
+#define PKT_LEN_OFFSET          (PKT_TYPE_SIZE + PKT_CTR_SIZE)
+
 /**
  * ecryptfs_miscdev_read - format and send message from queue
  * @file: fs/ecryptfs/euid miscdevfs handle (ignored)
@@ -237,7 +260,7 @@ ecryptfs_miscdev_read(struct file *file, char __user *buf, size_t count,
         struct ecryptfs_daemon *daemon;
         struct ecryptfs_msg_ctx *msg_ctx;
         size_t packet_length_size;
-        char packet_length[3];
+        char packet_length[ECRYPTFS_MAX_PKT_LEN_SIZE];
         size_t i;
         size_t total_length;
         uid_t euid = current_euid();
@@ -305,15 +328,8 @@ check_list:
                 packet_length_size = 0;
                 msg_ctx->msg_size = 0;
         }
-        /* miscdevfs packet format:
-         *  Octet 0: Type
-         *  Octets 1-4: network byte order msg_ctx->counter
-         *  Octets 5-N0: Size of struct ecryptfs_message to follow
-         *  Octets N0-N1: struct ecryptfs_message (including data)
-         *
-         *  Octets 5-N1 not written if the packet type does not
-         *  include a message */
-        total_length = (1 + 4 + packet_length_size + msg_ctx->msg_size);
+        total_length = (PKT_TYPE_SIZE + PKT_CTR_SIZE + packet_length_size
+                        + msg_ctx->msg_size);
         if (count < total_length) {
                 rc = 0;
                 printk(KERN_WARNING "%s: Only given user buffer of "
@@ -324,9 +340,10 @@ check_list:
         rc = -EFAULT;
         if (put_user(msg_ctx->type, buf))
                 goto out_unlock_msg_ctx;
-        if (put_user(cpu_to_be32(msg_ctx->counter), (__be32 __user *)(buf + 1)))
+        if (put_user(cpu_to_be32(msg_ctx->counter),
+                     (__be32 __user *)(&buf[PKT_CTR_OFFSET])))
                 goto out_unlock_msg_ctx;
-        i = 5;
+        i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
         if (msg_ctx->msg) {
                 if (copy_to_user(&buf[i], packet_length, packet_length_size))
                         goto out_unlock_msg_ctx;
@@ -391,12 +408,6 @@ out:
  * @count: Amount of data in @buf
  * @ppos: Pointer to offset in file (ignored)
  *
- * miscdevfs packet format:
- *  Octet 0: Type
- *  Octets 1-4: network byte order msg_ctx->counter (0's for non-response)
- *  Octets 5-N0: Size of struct ecryptfs_message to follow
- *  Octets N0-N1: struct ecryptfs_message (including data)
- *
  * Returns the number of bytes read from @buf
  */
 static ssize_t
@@ -405,60 +416,78 @@ ecryptfs_miscdev_write(struct file *file, const char __user *buf,
 {
         __be32 counter_nbo;
         u32 seq;
-        size_t packet_size, packet_size_length, i;
-        ssize_t sz = 0;
+        size_t packet_size, packet_size_length;
         char *data;
         uid_t euid = current_euid();
-        int rc;
+        unsigned char packet_size_peek[ECRYPTFS_MAX_PKT_LEN_SIZE];
+        ssize_t rc;
 
-        if (count == 0)
-                goto out;
+        if (count == 0) {
+                return 0;
+        } else if (count == MIN_NON_MSG_PKT_SIZE) {
+                /* Likely a harmless MSG_HELO or MSG_QUIT - no packet length */
+                goto memdup;
+        } else if (count < MIN_MSG_PKT_SIZE || count > MAX_MSG_PKT_SIZE) {
+                printk(KERN_WARNING "%s: Acceptable packet size range is "
+                       "[%d-%lu], but amount of data written is [%zu].",
+                       __func__, MIN_MSG_PKT_SIZE, MAX_MSG_PKT_SIZE, count);
+                return -EINVAL;
+        }
+
+        if (copy_from_user(packet_size_peek, &buf[PKT_LEN_OFFSET],
+                           sizeof(packet_size_peek))) {
+                printk(KERN_WARNING "%s: Error while inspecting packet size\n",
+                       __func__);
+                return -EFAULT;
+        }
 
+        rc = ecryptfs_parse_packet_length(packet_size_peek, &packet_size,
+                                          &packet_size_length);
+        if (rc) {
+                printk(KERN_WARNING "%s: Error parsing packet length; "
+                       "rc = [%zd]\n", __func__, rc);
+                return rc;
+        }
+
+        if ((PKT_TYPE_SIZE + PKT_CTR_SIZE + packet_size_length + packet_size)
+            != count) {
+                printk(KERN_WARNING "%s: Invalid packet size [%zu]\n", __func__,
+                       packet_size);
+                return -EINVAL;
+        }
+
+memdup:
         data = memdup_user(buf, count);
         if (IS_ERR(data)) {
                 printk(KERN_ERR "%s: memdup_user returned error [%ld]\n",
                        __func__, PTR_ERR(data));
-                goto out;
+                return PTR_ERR(data);
         }
-        sz = count;
-        i = 0;
-        switch (data[i++]) {
+        switch (data[PKT_TYPE_OFFSET]) {
         case ECRYPTFS_MSG_RESPONSE:
-                if (count < (1 + 4 + 1 + sizeof(struct ecryptfs_message))) {
+                if (count < (MIN_MSG_PKT_SIZE
+                             + sizeof(struct ecryptfs_message))) {
                         printk(KERN_WARNING "%s: Minimum acceptable packet "
                                "size is [%zd], but amount of data written is "
                                "only [%zd]. Discarding response packet.\n",
                                __func__,
-                               (1 + 4 + 1 + sizeof(struct ecryptfs_message)),
-                               count);
+                               (MIN_MSG_PKT_SIZE
+                                + sizeof(struct ecryptfs_message)), count);
+                        rc = -EINVAL;
                         goto out_free;
                 }
-                memcpy(&counter_nbo, &data[i], 4);
+                memcpy(&counter_nbo, &data[PKT_CTR_OFFSET], PKT_CTR_SIZE);
                 seq = be32_to_cpu(counter_nbo);
-                i += 4;
-                rc = ecryptfs_parse_packet_length(&data[i], &packet_size,
-                                                  &packet_size_length);
+                rc = ecryptfs_miscdev_response(
+                                &data[PKT_LEN_OFFSET + packet_size_length],
+                                packet_size, euid, current_user_ns(),
+                                task_pid(current), seq);
                 if (rc) {
-                        printk(KERN_WARNING "%s: Error parsing packet length; "
-                               "rc = [%d]\n", __func__, rc);
-                        goto out_free;
-                }
-                i += packet_size_length;
-                if ((1 + 4 + packet_size_length + packet_size) != count) {
-                        printk(KERN_WARNING "%s: (1 + packet_size_length([%zd])"
-                               " + packet_size([%zd]))([%zd]) != "
-                               "count([%zd]). Invalid packet format.\n",
-                               __func__, packet_size_length, packet_size,
-                               (1 + packet_size_length + packet_size), count);
-                        goto out_free;
-                }
-                rc = ecryptfs_miscdev_response(&data[i], packet_size,
-                                               euid, current_user_ns(),
-                                               task_pid(current), seq);
-                if (rc)
                         printk(KERN_WARNING "%s: Failed to deliver miscdev "
-                               "response to requesting operation; rc = [%d]\n",
+                               "response to requesting operation; rc = [%zd]\n",
                                __func__, rc);
+                        goto out_free;
+                }
                 break;
         case ECRYPTFS_MSG_HELO:
         case ECRYPTFS_MSG_QUIT:
@@ -467,12 +496,13 @@ ecryptfs_miscdev_write(struct file *file, const char __user *buf,
                 ecryptfs_printk(KERN_WARNING, "Dropping miscdev "
                                 "message of unrecognized type [%d]\n",
                                 data[0]);
-                break;
+                rc = -EINVAL;
+                goto out_free;
         }
+        rc = count;
 out_free:
         kfree(data);
-out:
-        return sz;
+        return rc;
 }
 
 
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index 6a44148c5fb9..a46b3a8fee1e 100644
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -57,6 +57,10 @@ struct page *ecryptfs_get_locked_page(struct inode *inode, loff_t index)
  * @page: Page that is locked before this call is made
  *
  * Returns zero on success; non-zero otherwise
+ *
+ * This is where we encrypt the data and pass the encrypted data to
+ * the lower filesystem.  In OpenPGP-compatible mode, we operate on
+ * entire underlying packets.
  */
 static int ecryptfs_writepage(struct page *page, struct writeback_control *wbc)
 {
@@ -146,7 +150,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,
                         /* This is a header extent */
                         char *page_virt;
 
-                        page_virt = kmap_atomic(page, KM_USER0);
+                        page_virt = kmap_atomic(page);
                         memset(page_virt, 0, PAGE_CACHE_SIZE);
                         /* TODO: Support more than one header extent */
                         if (view_extent_num == 0) {
@@ -159,7 +163,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,
                                                                crypt_stat,
                                                                &written);
                         }
-                        kunmap_atomic(page_virt, KM_USER0);
+                        kunmap_atomic(page_virt);
                         flush_dcache_page(page);
                         if (rc) {
                                 printk(KERN_ERR "%s: Error reading xattr "
@@ -481,10 +485,6 @@ int ecryptfs_write_inode_size_to_metadata(struct inode *ecryptfs_inode)
  * @copied: The amount of data copied
  * @page: The eCryptfs page
  * @fsdata: The fsdata (unused)
- *
- * This is where we encrypt the data and pass the encrypted data to
- * the lower filesystem.  In OpenPGP-compatible mode, we operate on
- * entire underlying packets.
  */
 static int ecryptfs_write_end(struct file *file,
                         struct address_space *mapping,
diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
index 3745f7c2b9c2..b2a34a192f4f 100644
--- a/fs/ecryptfs/read_write.c
+++ b/fs/ecryptfs/read_write.c
@@ -130,13 +130,18 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
                 pgoff_t ecryptfs_page_idx = (pos >> PAGE_CACHE_SHIFT);
                 size_t start_offset_in_page = (pos & ~PAGE_CACHE_MASK);
                 size_t num_bytes = (PAGE_CACHE_SIZE - start_offset_in_page);
-                size_t total_remaining_bytes = ((offset + size) - pos);
+                loff_t total_remaining_bytes = ((offset + size) - pos);
+
+                if (fatal_signal_pending(current)) {
+                        rc = -EINTR;
+                        break;
+                }
 
                 if (num_bytes > total_remaining_bytes)
                         num_bytes = total_remaining_bytes;
                 if (pos < offset) {
                         /* remaining zeros to write, up to destination offset */
-                        size_t total_remaining_zeros = (offset - pos);
+                        loff_t total_remaining_zeros = (offset - pos);
 
                         if (num_bytes > total_remaining_zeros)
                                 num_bytes = total_remaining_zeros;
@@ -151,7 +156,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
                                ecryptfs_page_idx, rc);
                         goto out;
                 }
-                ecryptfs_page_virt = kmap_atomic(ecryptfs_page, KM_USER0);
+                ecryptfs_page_virt = kmap_atomic(ecryptfs_page);
 
                 /*
                  * pos: where we're now writing, offset: where the request was
@@ -174,7 +179,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
                                (data + data_offset), num_bytes);
                         data_offset += num_bytes;
                 }
-                kunmap_atomic(ecryptfs_page_virt, KM_USER0);
+                kunmap_atomic(ecryptfs_page_virt);
                 flush_dcache_page(ecryptfs_page);
                 SetPageUptodate(ecryptfs_page);
                 unlock_page(ecryptfs_page);
@@ -193,15 +198,19 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset,
                 }
                 pos += num_bytes;
         }
-        if ((offset + size) > ecryptfs_file_size) {
-                i_size_write(ecryptfs_inode, (offset + size));
+        if (pos > ecryptfs_file_size) {
+                i_size_write(ecryptfs_inode, pos);
                 if (crypt_stat->flags & ECRYPTFS_ENCRYPTED) {
-                        rc = ecryptfs_write_inode_size_to_metadata(
+                        int rc2;
+
+                        rc2 = ecryptfs_write_inode_size_to_metadata(
                                                                 ecryptfs_inode);
-                        if (rc) {
+                        if (rc2) {
                                 printk(KERN_ERR "Problem with "
                                        "ecryptfs_write_inode_size_to_metadata; "
-                                       "rc = [%d]\n", rc);
+                                       "rc = [%d]\n", rc2);
+                                if (!rc)
+                                        rc = rc2;
                                 goto out;
                         }
                 }
@@ -273,76 +282,3 @@ int ecryptfs_read_lower_page_segment(struct page *page_for_ecryptfs,
         flush_dcache_page(page_for_ecryptfs);
         return rc;
 }
-
-#if 0
-/**
- * ecryptfs_read
- * @data: The virtual address into which to write the data read (and
- *        possibly decrypted) from the lower file
- * @offset: The offset in the decrypted view of the file from which to
- *          read into @data
- * @size: The number of bytes to read into @data
- * @ecryptfs_file: The eCryptfs file from which to read
- *
- * Read an arbitrary amount of data from an arbitrary location in the
- * eCryptfs page cache. This is done on an extent-by-extent basis;
- * individual extents are decrypted and read from the lower page
- * cache (via VFS reads). This function takes care of all the
- * address translation to locations in the lower filesystem.
- *
- * Returns zero on success; non-zero otherwise
- */
-int ecryptfs_read(char *data, loff_t offset, size_t size,
-                  struct file *ecryptfs_file)
-{
-        struct inode *ecryptfs_inode = ecryptfs_file->f_dentry->d_inode;
-        struct page *ecryptfs_page;
-        char *ecryptfs_page_virt;
-        loff_t ecryptfs_file_size = i_size_read(ecryptfs_inode);
-        loff_t data_offset = 0;
-        loff_t pos;
-        int rc = 0;
-
-        if ((offset + size) > ecryptfs_file_size) {
-                rc = -EINVAL;
-                printk(KERN_ERR "%s: Attempt to read data past the end of the "
-                        "file; offset = [%lld]; size = [%td]; "
-                       "ecryptfs_file_size = [%lld]\n",
-                       __func__, offset, size, ecryptfs_file_size);
-                goto out;
-        }
-        pos = offset;
-        while (pos < (offset + size)) {
-                pgoff_t ecryptfs_page_idx = (pos >> PAGE_CACHE_SHIFT);
-                size_t start_offset_in_page = (pos & ~PAGE_CACHE_MASK);
-                size_t num_bytes = (PAGE_CACHE_SIZE - start_offset_in_page);
-                size_t total_remaining_bytes = ((offset + size) - pos);
-
-                if (num_bytes > total_remaining_bytes)
-                        num_bytes = total_remaining_bytes;
-                ecryptfs_page = ecryptfs_get_locked_page(ecryptfs_inode,
-                                                         ecryptfs_page_idx);
-                if (IS_ERR(ecryptfs_page)) {
-                        rc = PTR_ERR(ecryptfs_page);
-                        printk(KERN_ERR "%s: Error getting page at "
-                               "index [%ld] from eCryptfs inode "
-                               "mapping; rc = [%d]\n", __func__,
-                               ecryptfs_page_idx, rc);
-                        goto out;
-                }
-                ecryptfs_page_virt = kmap_atomic(ecryptfs_page, KM_USER0);
-                memcpy((data + data_offset),
-                       ((char *)ecryptfs_page_virt + start_offset_in_page),
-                       num_bytes);
-                kunmap_atomic(ecryptfs_page_virt, KM_USER0);
-                flush_dcache_page(ecryptfs_page);
-                SetPageUptodate(ecryptfs_page);
-                unlock_page(ecryptfs_page);
-                page_cache_release(ecryptfs_page);
-                pos += num_bytes;
-                data_offset += num_bytes;
-        }
-out:
-        return rc;
-}
-#endif  /*  0  */
diff --git a/fs/ecryptfs/super.c b/fs/ecryptfs/super.c
index 9df7fd6e0c39..cf152823bbf4 100644
--- a/fs/ecryptfs/super.c
+++ b/fs/ecryptfs/super.c
@@ -30,6 +30,8 @@
 #include <linux/seq_file.h>
 #include <linux/file.h>
 #include <linux/crypto.h>
+#include <linux/statfs.h>
+#include <linux/magic.h>
 #include "ecryptfs_kernel.h"
 
 struct kmem_cache *ecryptfs_inode_info_cache;
@@ -102,10 +104,20 @@ static void ecryptfs_destroy_inode(struct inode *inode)
 static int ecryptfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
         struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
+        int rc;
 
         if (!lower_dentry->d_sb->s_op->statfs)
                 return -ENOSYS;
-        return lower_dentry->d_sb->s_op->statfs(lower_dentry, buf);
+
+        rc = lower_dentry->d_sb->s_op->statfs(lower_dentry, buf);
+        if (rc)
+                return rc;
+
+        buf->f_type = ECRYPTFS_SUPER_MAGIC;
+        rc = ecryptfs_set_f_namelen(&buf->f_namelen, buf->f_namelen,
+               &ecryptfs_superblock_to_private(dentry->d_sb)->mount_crypt_stat);
+
+        return rc;
 }
 
 /**
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index aabdfc38cf24..ea54cdef04dd 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -320,6 +320,11 @@ static inline int ep_is_linked(struct list_head *p)
         return !list_empty(p);
 }
 
+static inline struct eppoll_entry *ep_pwq_from_wait(wait_queue_t *p)
+{
+        return container_of(p, struct eppoll_entry, wait);
+}
+
 /* Get the "struct epitem" from a wait queue pointer */
 static inline struct epitem *ep_item_from_wait(wait_queue_t *p)
 {
@@ -467,6 +472,18 @@ static void ep_poll_safewake(wait_queue_head_t *wq)
         put_cpu();
 }
 
+static void ep_remove_wait_queue(struct eppoll_entry *pwq)
+{
+        wait_queue_head_t *whead;
+
+        rcu_read_lock();
+        /* If it is cleared by POLLFREE, it should be rcu-safe */
+        whead = rcu_dereference(pwq->whead);
+        if (whead)
+                remove_wait_queue(whead, &pwq->wait);
+        rcu_read_unlock();
+}
+
 /*
  * This function unregisters poll callbacks from the associated file
  * descriptor.  Must be called with "mtx" held (or "epmutex" if called from
@@ -481,7 +498,7 @@ static void ep_unregister_pollwait(struct eventpoll *ep, struct epitem *epi)
                 pwq = list_first_entry(lsthead, struct eppoll_entry, llink);
 
                 list_del(&pwq->llink);
-                remove_wait_queue(pwq->whead, &pwq->wait);
+                ep_remove_wait_queue(pwq);
                 kmem_cache_free(pwq_cache, pwq);
         }
 }
@@ -842,6 +859,17 @@ static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *k
         struct epitem *epi = ep_item_from_wait(wait);
         struct eventpoll *ep = epi->ep;
 
+        if ((unsigned long)key & POLLFREE) {
+                ep_pwq_from_wait(wait)->whead = NULL;
+                /*
+                 * whead = NULL above can race with ep_remove_wait_queue()
+                 * which can do another remove_wait_queue() after us, so we
+                 * can't use __remove_wait_queue(). whead->lock is held by
+                 * the caller.
+                 */
+                list_del_init(&wait->task_list);
+        }
+
         spin_lock_irqsave(&ep->lock, flags);
 
         /*
diff --git a/fs/exec.c b/fs/exec.c
index aeb135c7ff5c..92ce83a11e90 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1071,6 +1071,21 @@ void set_task_comm(struct task_struct *tsk, char *buf)
         perf_event_comm(tsk);
 }
 
+static void filename_to_taskname(char *tcomm, const char *fn, unsigned int len)
+{
+        int i, ch;
+
+        /* Copies the binary name from after last slash */
+        for (i = 0; (ch = *(fn++)) != '\0';) {
+                if (ch == '/')
+                        i = 0; /* overwrite what we wrote */
+                else
+                        if (i < len - 1)
+                                tcomm[i++] = ch;
+        }
+        tcomm[i] = '\0';
+}
+
 int flush_old_exec(struct linux_binprm * bprm)
 {
         int retval;
@@ -1085,6 +1100,7 @@ int flush_old_exec(struct linux_binprm * bprm)
 
         set_mm_exe_file(bprm->mm, bprm->file);
 
+        filename_to_taskname(bprm->tcomm, bprm->filename, sizeof(bprm->tcomm));
         /*
          * Release all of the old mmap stuff
          */
@@ -1116,10 +1132,6 @@ EXPORT_SYMBOL(would_dump);
 
 void setup_new_exec(struct linux_binprm * bprm)
 {
-        int i, ch;
-        const char *name;
-        char tcomm[sizeof(current->comm)];
-
         arch_pick_mmap_layout(current->mm);
 
         /* This is the point of no return */
@@ -1130,18 +1142,7 @@ void setup_new_exec(struct linux_binprm * bprm)
         else
                 set_dumpable(current->mm, suid_dumpable);
 
-        name = bprm->filename;
-
-        /* Copies the binary name from after last slash */
-        for (i=0; (ch = *(name++)) != '\0';) {
-                if (ch == '/')
-                        i = 0; /* overwrite what we wrote */
-                else
-                        if (i < (sizeof(tcomm) - 1))
-                                tcomm[i++] = ch;
-        }
-        tcomm[i] = '\0';
-        set_task_comm(current, tcomm);
+        set_task_comm(current, bprm->tcomm);
 
         /* Set the new mm task size. We have to do that late because it may
          * depend on TIF_32BIT which is only updated in flush_thread() on
diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c
index 1089f760c847..2de655f5d625 100644
--- a/fs/ext2/ioctl.c
+++ b/fs/ext2/ioctl.c
@@ -77,10 +77,11 @@ long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 flags = flags & EXT2_FL_USER_MODIFIABLE;
                 flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
                 ei->i_flags = flags;
-                mutex_unlock(&inode->i_mutex);
 
                 ext2_set_inode_flags(inode);
                 inode->i_ctime = CURRENT_TIME_SEC;
+                mutex_unlock(&inode->i_mutex);
+
                 mark_inode_dirty(inode);
 setflags_out:
                 mnt_drop_write_file(filp);
@@ -88,20 +89,29 @@ setflags_out:
         }
         case EXT2_IOC_GETVERSION:
                 return put_user(inode->i_generation, (int __user *) arg);
-        case EXT2_IOC_SETVERSION:
+        case EXT2_IOC_SETVERSION: {
+                __u32 generation;
+
                 if (!inode_owner_or_capable(inode))
                         return -EPERM;
                 ret = mnt_want_write_file(filp);
                 if (ret)
                         return ret;
-                if (get_user(inode->i_generation, (int __user *) arg)) {
+                if (get_user(generation, (int __user *) arg)) {
                         ret = -EFAULT;
-                } else {
-                        inode->i_ctime = CURRENT_TIME_SEC;
-                        mark_inode_dirty(inode);
+                        goto setversion_out;
                 }
+
+                mutex_lock(&inode->i_mutex);
+                inode->i_ctime = CURRENT_TIME_SEC;
+                inode->i_generation = generation;
+                mutex_unlock(&inode->i_mutex);
+
+                mark_inode_dirty(inode);
+setversion_out:
                 mnt_drop_write_file(filp);
                 return ret;
+        }
         case EXT2_IOC_GETRSVSZ:
                 if (test_opt(inode->i_sb, RESERVATION)
                         && S_ISREG(inode->i_mode)
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index f855916657ba..5b4a9362d5aa 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -53,14 +53,6 @@ struct wb_writeback_work {
 };
 
 /*
- * Include the creation of the trace points after defining the
- * wb_writeback_work structure so that the definition remains local to this
- * file.
- */
-#define CREATE_TRACE_POINTS
-#include <trace/events/writeback.h>
-
-/*
  * We don't actually have pdflush, but this one is exported though /proc...
  */
 int nr_pdflush_threads;
@@ -92,6 +84,14 @@ static inline struct inode *wb_inode(struct list_head *head)
         return list_entry(head, struct inode, i_wb_list);
 }
 
+/*
+ * Include the creation of the trace points after defining the
+ * wb_writeback_work structure and inline functions so that the definition
+ * remains local to this file.
+ */
+#define CREATE_TRACE_POINTS
+#include <trace/events/writeback.h>
+
 /* Wakeup flusher thread or forker thread to fork it. Requires bdi->wb_lock. */
 static void bdi_wakeup_flusher(struct backing_dev_info *bdi)
 {
diff --git a/fs/inode.c b/fs/inode.c
index fb10d86ffad7..d3ebdbe723d0 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1651,7 +1651,7 @@ __setup("ihash_entries=", set_ihash_entries);
  */
 void __init inode_init_early(void)
 {
-        int loop;
+        unsigned int loop;
 
         /* If hashes are distributed across NUMA nodes, defer
          * hash allocation until vmalloc space is available.
@@ -1669,13 +1669,13 @@ void __init inode_init_early(void)
                                         &i_hash_mask,
                                         0);
 
-        for (loop = 0; loop < (1 << i_hash_shift); loop++)
+        for (loop = 0; loop < (1U << i_hash_shift); loop++)
                 INIT_HLIST_HEAD(&inode_hashtable[loop]);
 }
 
 void __init inode_init(void)
 {
-        int loop;
+        unsigned int loop;
 
         /* inode slab cache */
         inode_cachep = kmem_cache_create("inode_cache",
@@ -1699,7 +1699,7 @@ void __init inode_init(void)
                                         &i_hash_mask,
                                         0);
 
-        for (loop = 0; loop < (1 << i_hash_shift); loop++)
+        for (loop = 0; loop < (1U << i_hash_shift); loop++)
                 INIT_HLIST_HEAD(&inode_hashtable[loop]);
 }
 
diff --git a/fs/ioprio.c b/fs/ioprio.c
index f84b380d65e5..0f1b9515213b 100644
--- a/fs/ioprio.c
+++ b/fs/ioprio.c
@@ -51,7 +51,7 @@ int set_task_ioprio(struct task_struct *task, int ioprio)
         ioc = get_task_io_context(task, GFP_ATOMIC, NUMA_NO_NODE);
         if (ioc) {
                 ioc_ioprio_changed(ioc, ioprio);
-                put_io_context(ioc, NULL);
+                put_io_context(ioc);
         }
 
         return err;
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index 5d1a00a5041b..05f0754f2b46 100644
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -453,8 +453,6 @@ out:
  *
  * Return <0 on error, 0 on success, 1 if there was nothing to clean up.
  *
- * Called with the journal lock held.
- *
  * This is the only part of the journaling code which really needs to be
  * aware of transaction aborts.  Checkpointing involves writing to the
  * main filesystem area rather than to the journal, so it can proceed
@@ -472,13 +470,14 @@ int cleanup_journal_tail(journal_t *journal)
         if (is_journal_aborted(journal))
                 return 1;
 
-        /* OK, work out the oldest transaction remaining in the log, and
+        /*
+         * OK, work out the oldest transaction remaining in the log, and
          * the log block it starts at.
          *
          * If the log is now empty, we need to work out which is the
          * next transaction ID we will write, and where it will
-         * start. */
-
+         * start.
+         */
         spin_lock(&journal->j_state_lock);
         spin_lock(&journal->j_list_lock);
         transaction = journal->j_checkpoint_transactions;
@@ -504,7 +503,25 @@ int cleanup_journal_tail(journal_t *journal)
                 spin_unlock(&journal->j_state_lock);
                 return 1;
         }
+        spin_unlock(&journal->j_state_lock);
+
+        /*
+         * We need to make sure that any blocks that were recently written out
+         * --- perhaps by log_do_checkpoint() --- are flushed out before we
+         * drop the transactions from the journal. It's unlikely this will be
+         * necessary, especially with an appropriately sized journal, but we
+         * need this to guarantee correctness.  Fortunately
+         * cleanup_journal_tail() doesn't get called all that often.
+         */
+        if (journal->j_flags & JFS_BARRIER)
+                blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL);
 
+        spin_lock(&journal->j_state_lock);
+        if (!tid_gt(first_tid, journal->j_tail_sequence)) {
+                spin_unlock(&journal->j_state_lock);
+                /* Someone else cleaned up journal so return 0 */
+                return 0;
+        }
         /* OK, update the superblock to recover the freed space.
          * Physical blocks come first: have we wrapped beyond the end of
          * the log?  */
diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c
index 5b43e96788e6..008bf062fd26 100644
--- a/fs/jbd/recovery.c
+++ b/fs/jbd/recovery.c
@@ -20,6 +20,7 @@
 #include <linux/fs.h>
 #include <linux/jbd.h>
 #include <linux/errno.h>
+#include <linux/blkdev.h>
 #endif
 
 /*
@@ -263,6 +264,9 @@ int journal_recover(journal_t *journal)
         err2 = sync_blockdev(journal->j_fs_dev);
         if (!err)
                 err = err2;
+        /* Flush disk caches to get replayed data on the permanent storage */
+        if (journal->j_flags & JFS_BARRIER)
+                blkdev_issue_flush(journal->j_fs_dev, GFP_KERNEL, NULL);
 
         return err;
 }
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
index a01cdad6aad1..eafb8d37a6fb 100644
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -335,7 +335,7 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl
         void *ebuf;
         uint32_t ofs;
         size_t retlen;
-        int ret = -EIO;
+        int ret;
         unsigned long *wordebuf;
 
         ret = mtd_point(c->mtd, jeb->offset, c->sector_size, &retlen,
diff --git a/fs/logfs/dev_mtd.c b/fs/logfs/dev_mtd.c
index e97404d611e0..9c501449450d 100644
--- a/fs/logfs/dev_mtd.c
+++ b/fs/logfs/dev_mtd.c
@@ -152,9 +152,6 @@ static struct page *logfs_mtd_find_first_sb(struct super_block *sb, u64 *ofs)
         filler_t *filler = logfs_mtd_readpage;
         struct mtd_info *mtd = super->s_mtd;
 
-        if (!mtd_can_have_bb(mtd))
-                return NULL;
-
         *ofs = 0;
         while (mtd_block_isbad(mtd, *ofs)) {
                 *ofs += mtd->erasesize;
@@ -172,9 +169,6 @@ static struct page *logfs_mtd_find_last_sb(struct super_block *sb, u64 *ofs)
         filler_t *filler = logfs_mtd_readpage;
         struct mtd_info *mtd = super->s_mtd;
 
-        if (!mtd_can_have_bb(mtd))
-                return NULL;
-
         *ofs = mtd->size - mtd->erasesize;
         while (mtd_block_isbad(mtd, *ofs)) {
                 *ofs -= mtd->erasesize;
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index 501043e8966c..3de7a32cadbe 100644
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -71,7 +71,7 @@ static int write_dir(struct inode *dir, struct logfs_disk_dentry *dd,
 
 static int write_inode(struct inode *inode)
 {
-        return __logfs_write_inode(inode, WF_LOCK);
+        return __logfs_write_inode(inode, NULL, WF_LOCK);
 }
 
 static s64 dir_seek_data(struct inode *inode, s64 pos)
diff --git a/fs/logfs/file.c b/fs/logfs/file.c
index b548c87a86f1..3886cded283c 100644
--- a/fs/logfs/file.c
+++ b/fs/logfs/file.c
@@ -230,7 +230,9 @@ int logfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
                 return ret;
 
         mutex_lock(&inode->i_mutex);
+        logfs_get_wblocks(sb, NULL, WF_LOCK);
         logfs_write_anchor(sb);
+        logfs_put_wblocks(sb, NULL, WF_LOCK);
         mutex_unlock(&inode->i_mutex);
 
         return 0;
diff --git a/fs/logfs/gc.c b/fs/logfs/gc.c
index caa4419285dc..d4efb061bdc5 100644
--- a/fs/logfs/gc.c
+++ b/fs/logfs/gc.c
@@ -367,7 +367,7 @@ static struct gc_candidate *get_candidate(struct super_block *sb)
         int i, max_dist;
         struct gc_candidate *cand = NULL, *this;
 
-        max_dist = min(no_free_segments(sb), LOGFS_NO_AREAS);
+        max_dist = min(no_free_segments(sb), LOGFS_NO_AREAS - 1);
 
         for (i = max_dist; i >= 0; i--) {
                 this = first_in_list(&super->s_low_list[i]);
diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c
index 388df1aa35e5..a422f42238b2 100644
--- a/fs/logfs/inode.c
+++ b/fs/logfs/inode.c
@@ -286,7 +286,7 @@ static int logfs_write_inode(struct inode *inode, struct writeback_control *wbc)
         if (logfs_inode(inode)->li_flags & LOGFS_IF_STILLBORN)
                 return 0;
 
-        ret = __logfs_write_inode(inode, flags);
+        ret = __logfs_write_inode(inode, NULL, flags);
         LOGFS_BUG_ON(ret, inode->i_sb);
         return ret;
 }
@@ -363,7 +363,9 @@ static void logfs_init_once(void *_li)
 
 static int logfs_sync_fs(struct super_block *sb, int wait)
 {
+        logfs_get_wblocks(sb, NULL, WF_LOCK);
         logfs_write_anchor(sb);
+        logfs_put_wblocks(sb, NULL, WF_LOCK);
         return 0;
 }
 
diff --git a/fs/logfs/journal.c b/fs/logfs/journal.c
index 9da29706f91c..1e1c369df22b 100644
--- a/fs/logfs/journal.c
+++ b/fs/logfs/journal.c
@@ -612,7 +612,6 @@ static size_t __logfs_write_je(struct super_block *sb, void *buf, u16 type,
         if (len == 0)
                 return logfs_write_header(super, header, 0, type);
 
-        BUG_ON(len > sb->s_blocksize);
         compr_len = logfs_compress(buf, data, len, sb->s_blocksize);
         if (compr_len < 0 || type == JE_ANCHOR) {
                 memcpy(data, buf, len);
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h
index 926373866a55..5f0937609465 100644
--- a/fs/logfs/logfs.h
+++ b/fs/logfs/logfs.h
@@ -528,7 +528,7 @@ void logfs_destroy_inode_cache(void);
 void logfs_set_blocks(struct inode *inode, u64 no);
 /* these logically belong into inode.c but actually reside in readwrite.c */
 int logfs_read_inode(struct inode *inode);
-int __logfs_write_inode(struct inode *inode, long flags);
+int __logfs_write_inode(struct inode *inode, struct page *, long flags);
 void logfs_evict_inode(struct inode *inode);
 
 /* journal.c */
@@ -577,6 +577,8 @@ void initialize_block_counters(struct page *page, struct logfs_block *block,
                 __be64 *array, int page_is_empty);
 int logfs_exist_block(struct inode *inode, u64 bix);
 int get_page_reserve(struct inode *inode, struct page *page);
+void logfs_get_wblocks(struct super_block *sb, struct page *page, int lock);
+void logfs_put_wblocks(struct super_block *sb, struct page *page, int lock);
 extern struct logfs_block_ops indirect_block_ops;
 
 /* segment.c */
@@ -594,6 +596,7 @@ int logfs_init_mapping(struct super_block *sb);
 void logfs_sync_area(struct logfs_area *area);
 void logfs_sync_segments(struct super_block *sb);
 void freeseg(struct super_block *sb, u32 segno);
+void free_areas(struct super_block *sb);
 
 /* area handling */
 int logfs_init_areas(struct super_block *sb);
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
index 2ac4217b7901..4153e65b0148 100644
--- a/fs/logfs/readwrite.c
+++ b/fs/logfs/readwrite.c
@@ -244,8 +244,7 @@ static void preunlock_page(struct super_block *sb, struct page *page, int lock)
  * is waiting for s_write_mutex.  We annotate this fact by setting PG_pre_locked
  * in addition to PG_locked.
  */
-static void logfs_get_wblocks(struct super_block *sb, struct page *page,
-                int lock)
+void logfs_get_wblocks(struct super_block *sb, struct page *page, int lock)
 {
         struct logfs_super *super = logfs_super(sb);
 
@@ -260,8 +259,7 @@ static void logfs_get_wblocks(struct super_block *sb, struct page *page,
         }
 }
 
-static void logfs_put_wblocks(struct super_block *sb, struct page *page,
-                int lock)
+void logfs_put_wblocks(struct super_block *sb, struct page *page, int lock)
 {
         struct logfs_super *super = logfs_super(sb);
 
@@ -424,7 +422,7 @@ static void inode_write_block(struct logfs_block *block)
         if (inode->i_ino == LOGFS_INO_MASTER)
                 logfs_write_anchor(inode->i_sb);
         else {
-                ret = __logfs_write_inode(inode, 0);
+                ret = __logfs_write_inode(inode, NULL, 0);
                 /* see indirect_write_block comment */
                 BUG_ON(ret);
         }
@@ -560,8 +558,13 @@ static void inode_free_block(struct super_block *sb, struct logfs_block *block)
 static void indirect_free_block(struct super_block *sb,
                 struct logfs_block *block)
 {
-        ClearPagePrivate(block->page);
-        block->page->private = 0;
+        struct page *page = block->page;
+
+        if (PagePrivate(page)) {
+                ClearPagePrivate(page);
+                page_cache_release(page);
+                set_page_private(page, 0);
+        }
         __free_block(sb, block);
 }
 
@@ -650,8 +653,11 @@ static void alloc_data_block(struct inode *inode, struct page *page)
         logfs_unpack_index(page->index, &bix, &level);
         block = __alloc_block(inode->i_sb, inode->i_ino, bix, level);
         block->page = page;
+
         SetPagePrivate(page);
-        page->private = (unsigned long)block;
+        page_cache_get(page);
+        set_page_private(page, (unsigned long) block);
+
         block->ops = &indirect_block_ops;
 }
 
@@ -1570,11 +1576,15 @@ int logfs_write_buf(struct inode *inode, struct page *page, long flags)
 static int __logfs_delete(struct inode *inode, struct page *page)
 {
         long flags = WF_DELETE;
+        int err;
 
         inode->i_ctime = inode->i_mtime = CURRENT_TIME;
 
         if (page->index < I0_BLOCKS)
                 return logfs_write_direct(inode, page, flags);
+        err = grow_inode(inode, page->index, 0);
+        if (err)
+                return err;
         return logfs_write_rec(inode, page, page->index, 0, flags);
 }
 
@@ -1623,7 +1633,7 @@ int logfs_rewrite_block(struct inode *inode, u64 bix, u64 ofs,
                         if (inode->i_ino == LOGFS_INO_MASTER)
                                 logfs_write_anchor(inode->i_sb);
                         else {
-                                err = __logfs_write_inode(inode, flags);
+                                err = __logfs_write_inode(inode, page, flags);
                         }
                 }
         }
@@ -1873,7 +1883,7 @@ int logfs_truncate(struct inode *inode, u64 target)
                 logfs_get_wblocks(sb, NULL, 1);
                 err = __logfs_truncate(inode, size);
                 if (!err)
-                        err = __logfs_write_inode(inode, 0);
+                        err = __logfs_write_inode(inode, NULL, 0);
                 logfs_put_wblocks(sb, NULL, 1);
         }
 
@@ -1901,8 +1911,11 @@ static void move_page_to_inode(struct inode *inode, struct page *page)
         li->li_block = block;
 
         block->page = NULL;
-        page->private = 0;
-        ClearPagePrivate(page);
+        if (PagePrivate(page)) {
+                ClearPagePrivate(page);
+                page_cache_release(page);
+                set_page_private(page, 0);
+        }
 }
 
 static void move_inode_to_page(struct page *page, struct inode *inode)
@@ -1918,8 +1931,12 @@ static void move_inode_to_page(struct page *page, struct inode *inode)
         BUG_ON(PagePrivate(page));
         block->ops = &indirect_block_ops;
         block->page = page;
-        page->private = (unsigned long)block;
-        SetPagePrivate(page);
+
+        if (!PagePrivate(page)) {
+                SetPagePrivate(page);
+                page_cache_get(page);
+                set_page_private(page, (unsigned long) block);
+        }
 
         block->inode = NULL;
         li->li_block = NULL;
@@ -2106,14 +2123,14 @@ void logfs_set_segment_unreserved(struct super_block *sb, u32 segno, u32 ec)
                         ec_level);
 }
 
-int __logfs_write_inode(struct inode *inode, long flags)
+int __logfs_write_inode(struct inode *inode, struct page *page, long flags)
 {
         struct super_block *sb = inode->i_sb;
         int ret;
 
-        logfs_get_wblocks(sb, NULL, flags & WF_LOCK);
+        logfs_get_wblocks(sb, page, flags & WF_LOCK);
         ret = do_write_inode(inode);
-        logfs_put_wblocks(sb, NULL, flags & WF_LOCK);
+        logfs_put_wblocks(sb, page, flags & WF_LOCK);
         return ret;
 }
 
diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c
index 9d5187353255..ab798ed1cc88 100644
--- a/fs/logfs/segment.c
+++ b/fs/logfs/segment.c
@@ -86,7 +86,11 @@ int __logfs_buf_write(struct logfs_area *area, u64 ofs, void *buf, size_t len,
                 BUG_ON(!page); /* FIXME: reserve a pool */
                 SetPageUptodate(page);
                 memcpy(page_address(page) + offset, buf, copylen);
-                SetPagePrivate(page);
+
+                if (!PagePrivate(page)) {
+                        SetPagePrivate(page);
+                        page_cache_get(page);
+                }
                 page_cache_release(page);
 
                 buf += copylen;
@@ -110,7 +114,10 @@ static void pad_partial_page(struct logfs_area *area)
                 page = get_mapping_page(sb, index, 0);
                 BUG_ON(!page); /* FIXME: reserve a pool */
                 memset(page_address(page) + offset, 0xff, len);
-                SetPagePrivate(page);
+                if (!PagePrivate(page)) {
+                        SetPagePrivate(page);
+                        page_cache_get(page);
+                }
                 page_cache_release(page);
         }
 }
@@ -130,7 +137,10 @@ static void pad_full_pages(struct logfs_area *area)
                 BUG_ON(!page); /* FIXME: reserve a pool */
                 SetPageUptodate(page);
                 memset(page_address(page), 0xff, PAGE_CACHE_SIZE);
-                SetPagePrivate(page);
+                if (!PagePrivate(page)) {
+                        SetPagePrivate(page);
+                        page_cache_get(page);
+                }
                 page_cache_release(page);
                 index++;
                 no_indizes--;
@@ -485,8 +495,12 @@ static void move_btree_to_page(struct inode *inode, struct page *page,
                 mempool_free(item, super->s_alias_pool);
         }
         block->page = page;
-        SetPagePrivate(page);
-        page->private = (unsigned long)block;
+
+        if (!PagePrivate(page)) {
+                SetPagePrivate(page);
+                page_cache_get(page);
+                set_page_private(page, (unsigned long) block);
+        }
         block->ops = &indirect_block_ops;
         initialize_block_counters(page, block, data, 0);
 }
@@ -536,8 +550,12 @@ void move_page_to_btree(struct page *page)
                 list_add(&item->list, &block->item_list);
         }
         block->page = NULL;
-        ClearPagePrivate(page);
-        page->private = 0;
+
+        if (PagePrivate(page)) {
+                ClearPagePrivate(page);
+                page_cache_release(page);
+                set_page_private(page, 0);
+        }
         block->ops = &btree_block_ops;
         err = alias_tree_insert(block->sb, block->ino, block->bix, block->level,
                         block);
@@ -702,7 +720,10 @@ void freeseg(struct super_block *sb, u32 segno)
                 page = find_get_page(mapping, ofs >> PAGE_SHIFT);
                 if (!page)
                         continue;
-                ClearPagePrivate(page);
+                if (PagePrivate(page)) {
+                        ClearPagePrivate(page);
+                        page_cache_release(page);
+                }
                 page_cache_release(page);
         }
 }
@@ -841,6 +862,16 @@ static void free_area(struct logfs_area *area)
         kfree(area);
 }
 
+void free_areas(struct super_block *sb)
+{
+        struct logfs_super *super = logfs_super(sb);
+        int i;
+
+        for_each_area(i)
+                free_area(super->s_area[i]);
+        free_area(super->s_journal_area);
+}
+
 static struct logfs_area *alloc_area(struct super_block *sb)
 {
         struct logfs_area *area;
@@ -923,10 +954,6 @@ err:
 void logfs_cleanup_areas(struct super_block *sb)
 {
         struct logfs_super *super = logfs_super(sb);
-        int i;
 
         btree_grim_visitor128(&super->s_object_alias_tree, 0, kill_alias);
-        for_each_area(i)
-                free_area(super->s_area[i]);
-        free_area(super->s_journal_area);
 }
diff --git a/fs/logfs/super.c b/fs/logfs/super.c
index e795c234ea33..c9ee7f5d1caf 100644
--- a/fs/logfs/super.c
+++ b/fs/logfs/super.c
@@ -486,14 +486,15 @@ static void logfs_kill_sb(struct super_block *sb)
         /* Alias entries slow down mount, so evict as many as possible */
         sync_filesystem(sb);
         logfs_write_anchor(sb);
+        free_areas(sb);
 
         /*
          * From this point on alias entries are simply dropped - and any
          * writes to the object store are considered bugs.
          */
-        super->s_flags |= LOGFS_SB_FLAG_SHUTDOWN;
         log_super("LogFS: Now in shutdown\n");
         generic_shutdown_super(sb);
+        super->s_flags |= LOGFS_SB_FLAG_SHUTDOWN;
 
         BUG_ON(super->s_dirty_used_bytes || super->s_dirty_free_bytes);
 
diff --git a/fs/namei.c b/fs/namei.c
index 208c6aa4a989..a780ea515c47 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1095,8 +1095,10 @@ static struct dentry *d_inode_lookup(struct dentry *parent, struct dentry *dentr
         struct dentry *old;
 
         /* Don't create child dentry for a dead directory. */
-        if (unlikely(IS_DEADDIR(inode)))
+        if (unlikely(IS_DEADDIR(inode))) {
+                dput(dentry);
                 return ERR_PTR(-ENOENT);
+        }
 
         old = inode->i_op->lookup(inode, dentry, nd);
         if (unlikely(old)) {
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index f0c849c98fe4..ec9f6ef6c5dd 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3575,8 +3575,8 @@ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t bu
         }
         if (npages > 1) {
                 /* for decoding across pages */
-                args.acl_scratch = alloc_page(GFP_KERNEL);
-                if (!args.acl_scratch)
+                res.acl_scratch = alloc_page(GFP_KERNEL);
+                if (!res.acl_scratch)
                         goto out_free;
         }
         args.acl_len = npages * PAGE_SIZE;
@@ -3612,8 +3612,8 @@ out_free:
         for (i = 0; i < npages; i++)
                 if (pages[i])
                         __free_page(pages[i]);
-        if (args.acl_scratch)
-                __free_page(args.acl_scratch);
+        if (res.acl_scratch)
+                __free_page(res.acl_scratch);
         return ret;
 }
 
@@ -4883,8 +4883,10 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred)
                                 clp->cl_rpcclient->cl_auth->au_flavor);
 
         res.server_scope = kzalloc(sizeof(struct server_scope), GFP_KERNEL);
-        if (unlikely(!res.server_scope))
-                return -ENOMEM;
+        if (unlikely(!res.server_scope)) {
+                status = -ENOMEM;
+                goto out;
+        }
 
         status = rpc_call_sync(clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);
         if (!status)
@@ -4901,12 +4903,13 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred)
                         clp->server_scope = NULL;
                 }
 
-                if (!clp->server_scope)
+                if (!clp->server_scope) {
                         clp->server_scope = res.server_scope;
-                else
-                        kfree(res.server_scope);
+                        goto out;
+                }
         }
-
+        kfree(res.server_scope);
+out:
         dprintk("<-- %s status= %d\n", __func__, status);
         return status;
 }
@@ -5008,37 +5011,53 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo)
         return status;
 }
 
+static struct nfs4_slot *nfs4_alloc_slots(u32 max_slots, gfp_t gfp_flags)
+{
+        return kcalloc(max_slots, sizeof(struct nfs4_slot), gfp_flags);
+}
+
+static void nfs4_add_and_init_slots(struct nfs4_slot_table *tbl,
+                struct nfs4_slot *new,
+                u32 max_slots,
+                u32 ivalue)
+{
+        struct nfs4_slot *old = NULL;
+        u32 i;
+
+        spin_lock(&tbl->slot_tbl_lock);
+        if (new) {
+                old = tbl->slots;
+                tbl->slots = new;
+                tbl->max_slots = max_slots;
+        }
+        tbl->highest_used_slotid = -1;  /* no slot is currently used */
+        for (i = 0; i < tbl->max_slots; i++)
+                tbl->slots[i].seq_nr = ivalue;
+        spin_unlock(&tbl->slot_tbl_lock);
+        kfree(old);
+}
+
 /*
- * Reset a slot table
+ * (re)Initialise a slot table
  */
-static int nfs4_reset_slot_table(struct nfs4_slot_table *tbl, u32 max_reqs,
-                                 int ivalue)
+static int nfs4_realloc_slot_table(struct nfs4_slot_table *tbl, u32 max_reqs,
+                                 u32 ivalue)
 {
         struct nfs4_slot *new = NULL;
-        int i;
-        int ret = 0;
+        int ret = -ENOMEM;
 
         dprintk("--> %s: max_reqs=%u, tbl->max_slots %d\n", __func__,
                 max_reqs, tbl->max_slots);
 
         /* Does the newly negotiated max_reqs match the existing slot table? */
         if (max_reqs != tbl->max_slots) {
-                ret = -ENOMEM;
-                new = kmalloc(max_reqs * sizeof(struct nfs4_slot),
-                              GFP_NOFS);
+                new = nfs4_alloc_slots(max_reqs, GFP_NOFS);
                 if (!new)
                         goto out;
-                ret = 0;
-                kfree(tbl->slots);
         }
-        spin_lock(&tbl->slot_tbl_lock);
-        if (new) {
-                tbl->slots = new;
-                tbl->max_slots = max_reqs;
-        }
-        for (i = 0; i < tbl->max_slots; ++i)
-                tbl->slots[i].seq_nr = ivalue;
-        spin_unlock(&tbl->slot_tbl_lock);
+        ret = 0;
+
+        nfs4_add_and_init_slots(tbl, new, max_reqs, ivalue);
         dprintk("%s: tbl=%p slots=%p max_slots=%d\n", __func__,
                 tbl, tbl->slots, tbl->max_slots);
 out:
@@ -5061,36 +5080,6 @@ static void nfs4_destroy_slot_tables(struct nfs4_session *session)
 }
 
 /*
- * Initialize slot table
- */
-static int nfs4_init_slot_table(struct nfs4_slot_table *tbl,
-                int max_slots, int ivalue)
-{
-        struct nfs4_slot *slot;
-        int ret = -ENOMEM;
-
-        BUG_ON(max_slots > NFS4_MAX_SLOT_TABLE);
-
-        dprintk("--> %s: max_reqs=%u\n", __func__, max_slots);
-
-        slot = kcalloc(max_slots, sizeof(struct nfs4_slot), GFP_NOFS);
-        if (!slot)
-                goto out;
-        ret = 0;
-
-        spin_lock(&tbl->slot_tbl_lock);
-        tbl->max_slots = max_slots;
-        tbl->slots = slot;
-        tbl->highest_used_slotid = -1;  /* no slot is currently used */
-        spin_unlock(&tbl->slot_tbl_lock);
-        dprintk("%s: tbl=%p slots=%p max_slots=%d\n", __func__,
-                tbl, tbl->slots, tbl->max_slots);
-out:
-        dprintk("<-- %s: return %d\n", __func__, ret);
-        return ret;
-}
-
-/*
  * Initialize or reset the forechannel and backchannel tables
  */
 static int nfs4_setup_session_slot_tables(struct nfs4_session *ses)
@@ -5101,25 +5090,16 @@ static int nfs4_setup_session_slot_tables(struct nfs4_session *ses)
         dprintk("--> %s\n", __func__);
         /* Fore channel */
         tbl = &ses->fc_slot_table;
-        if (tbl->slots == NULL) {
-                status = nfs4_init_slot_table(tbl, ses->fc_attrs.max_reqs, 1);
-                if (status) /* -ENOMEM */
-                        return status;
-        } else {
-                status = nfs4_reset_slot_table(tbl, ses->fc_attrs.max_reqs, 1);
-                if (status)
-                        return status;
-        }
+        status = nfs4_realloc_slot_table(tbl, ses->fc_attrs.max_reqs, 1);
+        if (status) /* -ENOMEM */
+                return status;
         /* Back channel */
         tbl = &ses->bc_slot_table;
-        if (tbl->slots == NULL) {
-                status = nfs4_init_slot_table(tbl, ses->bc_attrs.max_reqs, 0);
-                if (status)
-                        /* Fore and back channel share a connection so get
-                         * both slot tables or neither */
-                        nfs4_destroy_slot_tables(ses);
-        } else
-                status = nfs4_reset_slot_table(tbl, ses->bc_attrs.max_reqs, 0);
+        status = nfs4_realloc_slot_table(tbl, ses->bc_attrs.max_reqs, 0);
+        if (status && tbl->slots == NULL)
+                /* Fore and back channel share a connection so get
+                 * both slot tables or neither */
+                nfs4_destroy_slot_tables(ses);
         return status;
 }
 
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index a53f33b4ac3a..45392032e7bd 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1132,6 +1132,8 @@ void nfs4_schedule_stateid_recovery(const struct nfs_server *server, struct nfs4
 {
         struct nfs_client *clp = server->nfs_client;
 
+        if (test_and_clear_bit(NFS_DELEGATED_STATE, &state->flags))
+                nfs_async_inode_return_delegation(state->inode, &state->stateid);
         nfs4_state_mark_reclaim_nograce(clp, state);
         nfs4_schedule_state_manager(clp);
 }
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 95e92e438407..33bd8d0f745d 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -2522,7 +2522,6 @@ static void nfs4_xdr_enc_getacl(struct rpc_rqst *req, struct xdr_stream *xdr,
 
         xdr_inline_pages(&req->rq_rcv_buf, replen << 2,
                 args->acl_pages, args->acl_pgbase, args->acl_len);
-        xdr_set_scratch_buffer(xdr, page_address(args->acl_scratch), PAGE_SIZE);
 
         encode_nops(&hdr);
 }
@@ -6032,6 +6031,10 @@ nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
         struct compound_hdr hdr;
         int status;
 
+        if (res->acl_scratch != NULL) {
+                void *p = page_address(res->acl_scratch);
+                xdr_set_scratch_buffer(xdr, p, PAGE_SIZE);
+        }
         status = decode_compound_hdr(xdr, &hdr);
         if (status)
                 goto out;
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index 886649627c3d..2a70fce70c65 100644
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -603,6 +603,8 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
         nsegs = argv[4].v_nmembs;
         if (argv[4].v_size != argsz[4])
                 goto out;
+        if (nsegs > UINT_MAX / sizeof(__u64))
+                goto out;
 
         /*
          * argv[4] points to segment numbers this ioctl cleans.  We
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index be244692550d..a9856e3eaaf0 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -1053,7 +1053,7 @@ static int ocfs2_rename(struct inode *old_dir,
         handle_t *handle = NULL;
         struct buffer_head *old_dir_bh = NULL;
         struct buffer_head *new_dir_bh = NULL;
-        nlink_t old_dir_nlink = old_dir->i_nlink;
+        u32 old_dir_nlink = old_dir->i_nlink;
         struct ocfs2_dinode *old_di;
         struct ocfs2_dir_lookup_result old_inode_dot_dot_res = { NULL, };
         struct ocfs2_dir_lookup_result target_lookup_res = { NULL, };
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 9cde9edf9c4d..d4548dd49b02 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -198,26 +198,6 @@ static int proc_root_link(struct dentry *dentry, struct path *path)
         return result;
 }
 
-static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
-{
-        struct mm_struct *mm;
-        int err;
-
-        err =  mutex_lock_killable(&task->signal->cred_guard_mutex);
-        if (err)
-                return ERR_PTR(err);
-
-        mm = get_task_mm(task);
-        if (mm && mm != current->mm &&
-                        !ptrace_may_access(task, mode)) {
-                mmput(mm);
-                mm = ERR_PTR(-EACCES);
-        }
-        mutex_unlock(&task->signal->cred_guard_mutex);
-
-        return mm;
-}
-
 struct mm_struct *mm_for_maps(struct task_struct *task)
 {
         return mm_access(task, PTRACE_MODE_READ);
@@ -711,6 +691,13 @@ static int mem_open(struct inode* inode, struct file* file)
         if (IS_ERR(mm))
                 return PTR_ERR(mm);
 
+        if (mm) {
+                /* ensure this mm_struct can't be freed */
+                atomic_inc(&mm->mm_count);
+                /* but do not pin its memory */
+                mmput(mm);
+        }
+
         /* OK to pass negative loff_t, we can catch out-of-range */
         file->f_mode |= FMODE_UNSIGNED_OFFSET;
         file->private_data = mm;
@@ -718,57 +705,13 @@ static int mem_open(struct inode* inode, struct file* file)
         return 0;
 }
 
-static ssize_t mem_read(struct file * file, char __user * buf,
-                        size_t count, loff_t *ppos)
+static ssize_t mem_rw(struct file *file, char __user *buf,
+                        size_t count, loff_t *ppos, int write)
 {
-        int ret;
-        char *page;
-        unsigned long src = *ppos;
         struct mm_struct *mm = file->private_data;
-
-        if (!mm)
-                return 0;
-
-        page = (char *)__get_free_page(GFP_TEMPORARY);
-        if (!page)
-                return -ENOMEM;
-
-        ret = 0;
- 
-        while (count > 0) {
-                int this_len, retval;
-
-                this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
-                retval = access_remote_vm(mm, src, page, this_len, 0);
-                if (!retval) {
-                        if (!ret)
-                                ret = -EIO;
-                        break;
-                }
-
-                if (copy_to_user(buf, page, retval)) {
-                        ret = -EFAULT;
-                        break;
-                }
- 
-                ret += retval;
-                src += retval;
-                buf += retval;
-                count -= retval;
-        }
-        *ppos = src;
-
-        free_page((unsigned long) page);
-        return ret;
-}
-
-static ssize_t mem_write(struct file * file, const char __user *buf,
-                         size_t count, loff_t *ppos)
-{
-        int copied;
+        unsigned long addr = *ppos;
+        ssize_t copied;
         char *page;
-        unsigned long dst = *ppos;
-        struct mm_struct *mm = file->private_data;
 
         if (!mm)
                 return 0;
@@ -778,31 +721,54 @@ static ssize_t mem_write(struct file * file, const char __user *buf,
                 return -ENOMEM;
 
         copied = 0;
+        if (!atomic_inc_not_zero(&mm->mm_users))
+                goto free;
+
         while (count > 0) {
-                int this_len, retval;
+                int this_len = min_t(int, count, PAGE_SIZE);
 
-                this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
-                if (copy_from_user(page, buf, this_len)) {
+                if (write && copy_from_user(page, buf, this_len)) {
                         copied = -EFAULT;
                         break;
                 }
-                retval = access_remote_vm(mm, dst, page, this_len, 1);
-                if (!retval) {
+
+                this_len = access_remote_vm(mm, addr, page, this_len, write);
+                if (!this_len) {
                         if (!copied)
                                 copied = -EIO;
                         break;
                 }
-                copied += retval;
-                buf += retval;
-                dst += retval;
-                count -= retval;                        
+
+                if (!write && copy_to_user(buf, page, this_len)) {
+                        copied = -EFAULT;
+                        break;
+                }
+
+                buf += this_len;
+                addr += this_len;
+                copied += this_len;
+                count -= this_len;
         }
-        *ppos = dst;
+        *ppos = addr;
 
+        mmput(mm);
+free:
         free_page((unsigned long) page);
         return copied;
 }
 
+static ssize_t mem_read(struct file *file, char __user *buf,
+                        size_t count, loff_t *ppos)
+{
+        return mem_rw(file, buf, count, ppos, 0);
+}
+
+static ssize_t mem_write(struct file *file, const char __user *buf,
+                         size_t count, loff_t *ppos)
+{
+        return mem_rw(file, (char __user*)buf, count, ppos, 1);
+}
+
 loff_t mem_lseek(struct file *file, loff_t offset, int orig)
 {
         switch (orig) {
@@ -822,8 +788,8 @@ loff_t mem_lseek(struct file *file, loff_t offset, int orig)
 static int mem_release(struct inode *inode, struct file *file)
 {
         struct mm_struct *mm = file->private_data;
-
-        mmput(mm);
+        if (mm)
+                mmdrop(mm);
         return 0;
 }
 
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index e418c5abdb0e..7dcd2a250495 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -518,6 +518,9 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
                 if (!page)
                         continue;
 
+                if (PageReserved(page))
+                        continue;
+
                 /* Clear accessed and referenced bits. */
                 ptep_test_and_clear_young(vma, addr, pte);
                 ClearPageReferenced(page);
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 5ec59b20cf76..46741970371b 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2125,6 +2125,8 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
                 mutex_unlock(&dqopt->dqio_mutex);
                 goto out_file_init;
         }
+        if (dqopt->flags & DQUOT_QUOTA_SYS_FILE)
+                dqopt->info[type].dqi_flags |= DQF_SYS_FILE;
         mutex_unlock(&dqopt->dqio_mutex);
         spin_lock(&dq_state_lock);
         dqopt->flags |= dquot_state_flag(flags, type);
@@ -2464,7 +2466,7 @@ int dquot_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
         spin_lock(&dq_data_lock);
         ii->dqi_bgrace = mi->dqi_bgrace;
         ii->dqi_igrace = mi->dqi_igrace;
-        ii->dqi_flags = mi->dqi_flags & DQF_MASK;
+        ii->dqi_flags = mi->dqi_flags & DQF_GETINFO_MASK;
         ii->dqi_valid = IIF_ALL;
         spin_unlock(&dq_data_lock);
         mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
@@ -2490,8 +2492,8 @@ int dquot_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
         if (ii->dqi_valid & IIF_IGRACE)
                 mi->dqi_igrace = ii->dqi_igrace;
         if (ii->dqi_valid & IIF_FLAGS)
-                mi->dqi_flags = (mi->dqi_flags & ~DQF_MASK) |
-                                (ii->dqi_flags & DQF_MASK);
+                mi->dqi_flags = (mi->dqi_flags & ~DQF_SETINFO_MASK) |
+                                (ii->dqi_flags & DQF_SETINFO_MASK);
         spin_unlock(&dq_data_lock);
         mark_info_dirty(sb, type);
         /* Force write to disk */
diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index 7898cd688a00..fc2c4388d126 100644
--- a/fs/quota/quota.c
+++ b/fs/quota/quota.c
@@ -292,11 +292,26 @@ static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id,
         }
 }
 
+/* Return 1 if 'cmd' will block on frozen filesystem */
+static int quotactl_cmd_write(int cmd)
+{
+        switch (cmd) {
+        case Q_GETFMT:
+        case Q_GETINFO:
+        case Q_SYNC:
+        case Q_XGETQSTAT:
+        case Q_XGETQUOTA:
+        case Q_XQUOTASYNC:
+                return 0;
+        }
+        return 1;
+}
+
 /*
  * look up a superblock on which quota ops will be performed
  * - use the name of a block device to find the superblock thereon
  */
-static struct super_block *quotactl_block(const char __user *special)
+static struct super_block *quotactl_block(const char __user *special, int cmd)
 {
 #ifdef CONFIG_BLOCK
         struct block_device *bdev;
@@ -309,7 +324,10 @@ static struct super_block *quotactl_block(const char __user *special)
         putname(tmp);
         if (IS_ERR(bdev))
                 return ERR_CAST(bdev);
-        sb = get_super(bdev);
+        if (quotactl_cmd_write(cmd))
+                sb = get_super_thawed(bdev);
+        else
+                sb = get_super(bdev);
         bdput(bdev);
         if (!sb)
                 return ERR_PTR(-ENODEV);
@@ -361,7 +379,7 @@ SYSCALL_DEFINE4(quotactl, unsigned int, cmd, const char __user *, special,
                         pathp = &path;
         }
 
-        sb = quotactl_block(special);
+        sb = quotactl_block(special, cmds);
         if (IS_ERR(sb)) {
                 ret = PTR_ERR(sb);
                 goto out;
diff --git a/fs/select.c b/fs/select.c
index d33418fdc858..e782258d0de3 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -912,7 +912,7 @@ static long do_restart_poll(struct restart_block *restart_block)
 }
 
 SYSCALL_DEFINE3(poll, struct pollfd __user *, ufds, unsigned int, nfds,
-                long, timeout_msecs)
+                int, timeout_msecs)
 {
         struct timespec end_time, *to = NULL;
         int ret;
diff --git a/fs/signalfd.c b/fs/signalfd.c
index 492465b451dd..7ae2a574cb25 100644
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -30,6 +30,21 @@
 #include <linux/signalfd.h>
 #include <linux/syscalls.h>
 
+void signalfd_cleanup(struct sighand_struct *sighand)
+{
+        wait_queue_head_t *wqh = &sighand->signalfd_wqh;
+        /*
+         * The lockless check can race with remove_wait_queue() in progress,
+         * but in this case its caller should run under rcu_read_lock() and
+         * sighand_cachep is SLAB_DESTROY_BY_RCU, we can safely return.
+         */
+        if (likely(!waitqueue_active(wqh)))
+                return;
+
+        /* wait_queue_t->func(POLLFREE) should do remove_wait_queue() */
+        wake_up_poll(wqh, POLLHUP | POLLFREE);
+}
+
 struct signalfd_ctx {
         sigset_t sigmask;
 };
diff --git a/fs/super.c b/fs/super.c
index 6015c02296b7..6277ec6cb60a 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -634,6 +634,28 @@ rescan:
 EXPORT_SYMBOL(get_super);
 
 /**
+ *      get_super_thawed - get thawed superblock of a device
+ *      @bdev: device to get the superblock for
+ *
+ *      Scans the superblock list and finds the superblock of the file system
+ *      mounted on the device. The superblock is returned once it is thawed
+ *      (or immediately if it was not frozen). %NULL is returned if no match
+ *      is found.
+ */
+struct super_block *get_super_thawed(struct block_device *bdev)
+{
+        while (1) {
+                struct super_block *s = get_super(bdev);
+                if (!s || s->s_frozen == SB_UNFROZEN)
+                        return s;
+                up_read(&s->s_umount);
+                vfs_check_frozen(s, SB_FREEZE_WRITE);
+                put_super(s);
+        }
+}
+EXPORT_SYMBOL(get_super_thawed);
+
+/**
  * get_active_super - get an active reference to the superblock of a device
  * @bdev: device to get the superblock for
  *
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 62f4fb37789e..00012e31829d 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -493,6 +493,12 @@ int sysfs_attr_ns(struct kobject *kobj, const struct attribute *attr,
         const void *ns = NULL;
         int err;
 
+        if (!dir_sd) {
+                WARN(1, KERN_ERR "sysfs: kobject %s without dirent\n",
+                        kobject_name(kobj));
+                return -ENOENT;
+        }
+
         err = 0;
         if (!sysfs_ns_type(dir_sd))
                 goto out;
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index 4a802b4a9056..85eb81683a29 100644
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -318,8 +318,11 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const void *ns, const cha
         struct sysfs_addrm_cxt acxt;
         struct sysfs_dirent *sd;
 
-        if (!dir_sd)
+        if (!dir_sd) {
+                WARN(1, KERN_WARNING "sysfs: can not remove '%s', no directory\n",
+                        name);
                 return -ENOENT;
+        }
 
         sysfs_addrm_start(&acxt, dir_sd);
 
diff --git a/fs/xfs/kmem.h b/fs/xfs/kmem.h
index 292eff198030..ab7c53fe346e 100644
--- a/fs/xfs/kmem.h
+++ b/fs/xfs/kmem.h
@@ -110,10 +110,4 @@ kmem_zone_destroy(kmem_zone_t *zone)
 extern void *kmem_zone_alloc(kmem_zone_t *, unsigned int __nocast);
 extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast);
 
-static inline int
-kmem_shake_allow(gfp_t gfp_mask)
-{
-        return ((gfp_mask & __GFP_WAIT) && (gfp_mask & __GFP_FS));
-}
-
 #endif /* __XFS_SUPPORT_KMEM_H__ */
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index b4ff40b5f918..53db20ee3e77 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -63,82 +63,6 @@ int xfs_dqerror_mod = 33;
 static struct lock_class_key xfs_dquot_other_class;
 
 /*
- * Allocate and initialize a dquot. We don't always allocate fresh memory;
- * we try to reclaim a free dquot if the number of incore dquots are above
- * a threshold.
- * The only field inside the core that gets initialized at this point
- * is the d_id field. The idea is to fill in the entire q_core
- * when we read in the on disk dquot.
- */
-STATIC xfs_dquot_t *
-xfs_qm_dqinit(
-        xfs_mount_t  *mp,
-        xfs_dqid_t   id,
-        uint         type)
-{
-        xfs_dquot_t     *dqp;
-        boolean_t       brandnewdquot;
-
-        brandnewdquot = xfs_qm_dqalloc_incore(&dqp);
-        dqp->dq_flags = type;
-        dqp->q_core.d_id = cpu_to_be32(id);
-        dqp->q_mount = mp;
-
-        /*
-         * No need to re-initialize these if this is a reclaimed dquot.
-         */
-        if (brandnewdquot) {
-                INIT_LIST_HEAD(&dqp->q_freelist);
-                mutex_init(&dqp->q_qlock);
-                init_waitqueue_head(&dqp->q_pinwait);
-
-                /*
-                 * Because we want to use a counting completion, complete
-                 * the flush completion once to allow a single access to
-                 * the flush completion without blocking.
-                 */
-                init_completion(&dqp->q_flush);
-                complete(&dqp->q_flush);
-
-                trace_xfs_dqinit(dqp);
-        } else {
-                /*
-                 * Only the q_core portion was zeroed in dqreclaim_one().
-                 * So, we need to reset others.
-                 */
-                dqp->q_nrefs = 0;
-                dqp->q_blkno = 0;
-                INIT_LIST_HEAD(&dqp->q_mplist);
-                INIT_LIST_HEAD(&dqp->q_hashlist);
-                dqp->q_bufoffset = 0;
-                dqp->q_fileoffset = 0;
-                dqp->q_transp = NULL;
-                dqp->q_gdquot = NULL;
-                dqp->q_res_bcount = 0;
-                dqp->q_res_icount = 0;
-                dqp->q_res_rtbcount = 0;
-                atomic_set(&dqp->q_pincount, 0);
-                dqp->q_hash = NULL;
-                ASSERT(list_empty(&dqp->q_freelist));
-
-                trace_xfs_dqreuse(dqp);
-        }
-
-        /*
-         * In either case we need to make sure group quotas have a different
-         * lock class than user quotas, to make sure lockdep knows we can
-         * locks of one of each at the same time.
-         */
-        if (!(type & XFS_DQ_USER))
-                lockdep_set_class(&dqp->q_qlock, &xfs_dquot_other_class);
-
-        /*
-         * log item gets initialized later
-         */
-        return (dqp);
-}
-
-/*
  * This is called to free all the memory associated with a dquot
  */
 void
@@ -215,10 +139,10 @@ xfs_qm_adjust_dqtimers(
 
         if (!d->d_btimer) {
                 if ((d->d_blk_softlimit &&
-                     (be64_to_cpu(d->d_bcount) >=
+                     (be64_to_cpu(d->d_bcount) >
                       be64_to_cpu(d->d_blk_softlimit))) ||
                     (d->d_blk_hardlimit &&
-                     (be64_to_cpu(d->d_bcount) >=
+                     (be64_to_cpu(d->d_bcount) >
                       be64_to_cpu(d->d_blk_hardlimit)))) {
                         d->d_btimer = cpu_to_be32(get_seconds() +
                                         mp->m_quotainfo->qi_btimelimit);
@@ -227,10 +151,10 @@ xfs_qm_adjust_dqtimers(
                 }
         } else {
                 if ((!d->d_blk_softlimit ||
-                     (be64_to_cpu(d->d_bcount) <
+                     (be64_to_cpu(d->d_bcount) <=
                       be64_to_cpu(d->d_blk_softlimit))) &&
                     (!d->d_blk_hardlimit ||
-                    (be64_to_cpu(d->d_bcount) <
+                    (be64_to_cpu(d->d_bcount) <=
                      be64_to_cpu(d->d_blk_hardlimit)))) {
                         d->d_btimer = 0;
                 }
@@ -238,10 +162,10 @@ xfs_qm_adjust_dqtimers(
 
         if (!d->d_itimer) {
                 if ((d->d_ino_softlimit &&
-                     (be64_to_cpu(d->d_icount) >=
+                     (be64_to_cpu(d->d_icount) >
                       be64_to_cpu(d->d_ino_softlimit))) ||
                     (d->d_ino_hardlimit &&
-                     (be64_to_cpu(d->d_icount) >=
+                     (be64_to_cpu(d->d_icount) >
                       be64_to_cpu(d->d_ino_hardlimit)))) {
                         d->d_itimer = cpu_to_be32(get_seconds() +
                                         mp->m_quotainfo->qi_itimelimit);
@@ -250,10 +174,10 @@ xfs_qm_adjust_dqtimers(
                 }
         } else {
                 if ((!d->d_ino_softlimit ||
-                     (be64_to_cpu(d->d_icount) <
+                     (be64_to_cpu(d->d_icount) <=
                       be64_to_cpu(d->d_ino_softlimit)))  &&
                     (!d->d_ino_hardlimit ||
-                     (be64_to_cpu(d->d_icount) <
+                     (be64_to_cpu(d->d_icount) <=
                       be64_to_cpu(d->d_ino_hardlimit)))) {
                         d->d_itimer = 0;
                 }
@@ -261,10 +185,10 @@ xfs_qm_adjust_dqtimers(
 
         if (!d->d_rtbtimer) {
                 if ((d->d_rtb_softlimit &&
-                     (be64_to_cpu(d->d_rtbcount) >=
+                     (be64_to_cpu(d->d_rtbcount) >
                       be64_to_cpu(d->d_rtb_softlimit))) ||
                     (d->d_rtb_hardlimit &&
-                     (be64_to_cpu(d->d_rtbcount) >=
+                     (be64_to_cpu(d->d_rtbcount) >
                       be64_to_cpu(d->d_rtb_hardlimit)))) {
                         d->d_rtbtimer = cpu_to_be32(get_seconds() +
                                         mp->m_quotainfo->qi_rtbtimelimit);
@@ -273,10 +197,10 @@ xfs_qm_adjust_dqtimers(
                 }
         } else {
                 if ((!d->d_rtb_softlimit ||
-                     (be64_to_cpu(d->d_rtbcount) <
+                     (be64_to_cpu(d->d_rtbcount) <=
                       be64_to_cpu(d->d_rtb_softlimit))) &&
                     (!d->d_rtb_hardlimit ||
-                     (be64_to_cpu(d->d_rtbcount) <
+                     (be64_to_cpu(d->d_rtbcount) <=
                       be64_to_cpu(d->d_rtb_hardlimit)))) {
                         d->d_rtbtimer = 0;
                 }
@@ -567,7 +491,32 @@ xfs_qm_dqread(
         int                     error;
         int                     cancelflags = 0;
 
-        dqp = xfs_qm_dqinit(mp, id, type);
+
+        dqp = kmem_zone_zalloc(xfs_Gqm->qm_dqzone, KM_SLEEP);
+
+        dqp->dq_flags = type;
+        dqp->q_core.d_id = cpu_to_be32(id);
+        dqp->q_mount = mp;
+        INIT_LIST_HEAD(&dqp->q_freelist);
+        mutex_init(&dqp->q_qlock);
+        init_waitqueue_head(&dqp->q_pinwait);
+
+        /*
+         * Because we want to use a counting completion, complete
+         * the flush completion once to allow a single access to
+         * the flush completion without blocking.
+         */
+        init_completion(&dqp->q_flush);
+        complete(&dqp->q_flush);
+
+        /*
+         * Make sure group quotas have a different lock class than user
+         * quotas.
+         */
+        if (!(type & XFS_DQ_USER))
+                lockdep_set_class(&dqp->q_qlock, &xfs_dquot_other_class);
+
+        atomic_inc(&xfs_Gqm->qm_totaldquots);
 
         trace_xfs_dqread(dqp);
 
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 541a508adea1..0ed9ee77937c 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -1489,7 +1489,7 @@ xlog_recover_add_to_cont_trans(
         old_ptr = item->ri_buf[item->ri_cnt-1].i_addr;
         old_len = item->ri_buf[item->ri_cnt-1].i_len;
 
-        ptr = kmem_realloc(old_ptr, len+old_len, old_len, 0u);
+        ptr = kmem_realloc(old_ptr, len+old_len, old_len, KM_SLEEP);
         memcpy(&ptr[old_len], dp, len); /* d, s, l */
         item->ri_buf[item->ri_cnt-1].i_len += len;
         item->ri_buf[item->ri_cnt-1].i_addr = ptr;
@@ -1981,7 +1981,7 @@ xfs_qm_dqcheck(
 
         if (!errs && ddq->d_id) {
                 if (ddq->d_blk_softlimit &&
-                    be64_to_cpu(ddq->d_bcount) >=
+                    be64_to_cpu(ddq->d_bcount) >
                                 be64_to_cpu(ddq->d_blk_softlimit)) {
                         if (!ddq->d_btimer) {
                                 if (flags & XFS_QMOPT_DOWARN)
@@ -1992,7 +1992,7 @@ xfs_qm_dqcheck(
                         }
                 }
                 if (ddq->d_ino_softlimit &&
-                    be64_to_cpu(ddq->d_icount) >=
+                    be64_to_cpu(ddq->d_icount) >
                                 be64_to_cpu(ddq->d_ino_softlimit)) {
                         if (!ddq->d_itimer) {
                                 if (flags & XFS_QMOPT_DOWARN)
@@ -2003,7 +2003,7 @@ xfs_qm_dqcheck(
                         }
                 }
                 if (ddq->d_rtb_softlimit &&
-                    be64_to_cpu(ddq->d_rtbcount) >=
+                    be64_to_cpu(ddq->d_rtbcount) >
                                 be64_to_cpu(ddq->d_rtb_softlimit)) {
                         if (!ddq->d_rtbtimer) {
                                 if (flags & XFS_QMOPT_DOWARN)
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 671f37eae1c7..c436def733bf 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -50,7 +50,6 @@
  */
 struct mutex    xfs_Gqm_lock;
 struct xfs_qm   *xfs_Gqm;
-uint            ndquot;
 
 kmem_zone_t     *qm_dqzone;
 kmem_zone_t     *qm_dqtrxzone;
@@ -93,7 +92,6 @@ xfs_Gqm_init(void)
                 goto out_free_udqhash;
 
         hsize /= sizeof(xfs_dqhash_t);
-        ndquot = hsize << 8;
 
         xqm = kmem_zalloc(sizeof(xfs_qm_t), KM_SLEEP);
         xqm->qm_dqhashmask = hsize - 1;
@@ -137,7 +135,6 @@ xfs_Gqm_init(void)
                 xqm->qm_dqtrxzone = qm_dqtrxzone;
 
         atomic_set(&xqm->qm_totaldquots, 0);
-        xqm->qm_dqfree_ratio = XFS_QM_DQFREE_RATIO;
         xqm->qm_nrefs = 0;
         return xqm;
 
@@ -1600,216 +1597,150 @@ xfs_qm_init_quotainos(
         return 0;
 }
 
+STATIC void
+xfs_qm_dqfree_one(
+        struct xfs_dquot        *dqp)
+{
+        struct xfs_mount        *mp = dqp->q_mount;
+        struct xfs_quotainfo    *qi = mp->m_quotainfo;
 
+        mutex_lock(&dqp->q_hash->qh_lock);
+        list_del_init(&dqp->q_hashlist);
+        dqp->q_hash->qh_version++;
+        mutex_unlock(&dqp->q_hash->qh_lock);
 
-/*
- * Pop the least recently used dquot off the freelist and recycle it.
- */
-STATIC struct xfs_dquot *
-xfs_qm_dqreclaim_one(void)
+        mutex_lock(&qi->qi_dqlist_lock);
+        list_del_init(&dqp->q_mplist);
+        qi->qi_dquots--;
+        qi->qi_dqreclaims++;
+        mutex_unlock(&qi->qi_dqlist_lock);
+
+        xfs_qm_dqdestroy(dqp);
+}
+
+STATIC void
+xfs_qm_dqreclaim_one(
+        struct xfs_dquot        *dqp,
+        struct list_head        *dispose_list)
 {
-        struct xfs_dquot        *dqp;
-        int                     restarts = 0;
+        struct xfs_mount        *mp = dqp->q_mount;
+        int                     error;
 
-        mutex_lock(&xfs_Gqm->qm_dqfrlist_lock);
-restart:
-        list_for_each_entry(dqp, &xfs_Gqm->qm_dqfrlist, q_freelist) {
-                struct xfs_mount *mp = dqp->q_mount;
+        if (!xfs_dqlock_nowait(dqp))
+                goto out_busy;
 
-                if (!xfs_dqlock_nowait(dqp))
-                        continue;
+        /*
+         * This dquot has acquired a reference in the meantime remove it from
+         * the freelist and try again.
+         */
+        if (dqp->q_nrefs) {
+                xfs_dqunlock(dqp);
 
-                /*
-                 * This dquot has already been grabbed by dqlookup.
-                 * Remove it from the freelist and try again.
-                 */
-                if (dqp->q_nrefs) {
-                        trace_xfs_dqreclaim_want(dqp);
-                        XQM_STATS_INC(xqmstats.xs_qm_dqwants);
-
-                        list_del_init(&dqp->q_freelist);
-                        xfs_Gqm->qm_dqfrlist_cnt--;
-                        restarts++;
-                        goto dqunlock;
-                }
+                trace_xfs_dqreclaim_want(dqp);
+                XQM_STATS_INC(xqmstats.xs_qm_dqwants);
 
-                ASSERT(dqp->q_hash);
-                ASSERT(!list_empty(&dqp->q_mplist));
+                list_del_init(&dqp->q_freelist);
+                xfs_Gqm->qm_dqfrlist_cnt--;
+                return;
+        }
 
-                /*
-                 * Try to grab the flush lock. If this dquot is in the process
-                 * of getting flushed to disk, we don't want to reclaim it.
-                 */
-                if (!xfs_dqflock_nowait(dqp))
-                        goto dqunlock;
+        ASSERT(dqp->q_hash);
+        ASSERT(!list_empty(&dqp->q_mplist));
 
-                /*
-                 * We have the flush lock so we know that this is not in the
-                 * process of being flushed. So, if this is dirty, flush it
-                 * DELWRI so that we don't get a freelist infested with
-                 * dirty dquots.
-                 */
-                if (XFS_DQ_IS_DIRTY(dqp)) {
-                        int     error;
+        /*
+         * Try to grab the flush lock. If this dquot is in the process of
+         * getting flushed to disk, we don't want to reclaim it.
+         */
+        if (!xfs_dqflock_nowait(dqp))
+                goto out_busy;
 
-                        trace_xfs_dqreclaim_dirty(dqp);
+        /*
+         * We have the flush lock so we know that this is not in the
+         * process of being flushed. So, if this is dirty, flush it
+         * DELWRI so that we don't get a freelist infested with
+         * dirty dquots.
+         */
+        if (XFS_DQ_IS_DIRTY(dqp)) {
+                trace_xfs_dqreclaim_dirty(dqp);
 
-                        /*
-                         * We flush it delayed write, so don't bother
-                         * releasing the freelist lock.
-                         */
-                        error = xfs_qm_dqflush(dqp, SYNC_TRYLOCK);
-                        if (error) {
-                                xfs_warn(mp, "%s: dquot %p flush failed",
-                                        __func__, dqp);
-                        }
-                        goto dqunlock;
+                /*
+                 * We flush it delayed write, so don't bother releasing the
+                 * freelist lock.
+                 */
+                error = xfs_qm_dqflush(dqp, 0);
+                if (error) {
+                        xfs_warn(mp, "%s: dquot %p flush failed",
+                                 __func__, dqp);
                 }
-                xfs_dqfunlock(dqp);
 
                 /*
-                 * Prevent lookup now that we are going to reclaim the dquot.
-                 * Once XFS_DQ_FREEING is set lookup won't touch the dquot,
-                 * thus we can drop the lock now.
+                 * Give the dquot another try on the freelist, as the
+                 * flushing will take some time.
                  */
-                dqp->dq_flags |= XFS_DQ_FREEING;
-                xfs_dqunlock(dqp);
-
-                mutex_lock(&dqp->q_hash->qh_lock);
-                list_del_init(&dqp->q_hashlist);
-                dqp->q_hash->qh_version++;
-                mutex_unlock(&dqp->q_hash->qh_lock);
-
-                mutex_lock(&mp->m_quotainfo->qi_dqlist_lock);
-                list_del_init(&dqp->q_mplist);
-                mp->m_quotainfo->qi_dquots--;
-                mp->m_quotainfo->qi_dqreclaims++;
-                mutex_unlock(&mp->m_quotainfo->qi_dqlist_lock);
+                goto out_busy;
+        }
+        xfs_dqfunlock(dqp);
 
-                ASSERT(dqp->q_nrefs == 0);
-                list_del_init(&dqp->q_freelist);
-                xfs_Gqm->qm_dqfrlist_cnt--;
+        /*
+         * Prevent lookups now that we are past the point of no return.
+         */
+        dqp->dq_flags |= XFS_DQ_FREEING;
+        xfs_dqunlock(dqp);
 
-                mutex_unlock(&xfs_Gqm->qm_dqfrlist_lock);
-                return dqp;
-dqunlock:
-                xfs_dqunlock(dqp);
-                if (restarts >= XFS_QM_RECLAIM_MAX_RESTARTS)
-                        break;
-                goto restart;
-        }
+        ASSERT(dqp->q_nrefs == 0);
+        list_move_tail(&dqp->q_freelist, dispose_list);
+        xfs_Gqm->qm_dqfrlist_cnt--;
 
-        mutex_unlock(&xfs_Gqm->qm_dqfrlist_lock);
-        return NULL;
-}
+        trace_xfs_dqreclaim_done(dqp);
+        XQM_STATS_INC(xqmstats.xs_qm_dqreclaims);
+        return;
 
-/*
- * Traverse the freelist of dquots and attempt to reclaim a maximum of
- * 'howmany' dquots. This operation races with dqlookup(), and attempts to
- * favor the lookup function ...
- */
-STATIC int
-xfs_qm_shake_freelist(
-        int     howmany)
-{
-        int             nreclaimed = 0;
-        xfs_dquot_t     *dqp;
+out_busy:
+        xfs_dqunlock(dqp);
 
-        if (howmany <= 0)
-                return 0;
+        /*
+         * Move the dquot to the tail of the list so that we don't spin on it.
+         */
+        list_move_tail(&dqp->q_freelist, &xfs_Gqm->qm_dqfrlist);
 
-        while (nreclaimed < howmany) {
-                dqp = xfs_qm_dqreclaim_one();
-                if (!dqp)
-                        return nreclaimed;
-                xfs_qm_dqdestroy(dqp);
-                nreclaimed++;
-        }
-        return nreclaimed;
+        trace_xfs_dqreclaim_busy(dqp);
+        XQM_STATS_INC(xqmstats.xs_qm_dqreclaim_misses);
 }
 
-/*
- * The kmem_shake interface is invoked when memory is running low.
- */
-/* ARGSUSED */
 STATIC int
 xfs_qm_shake(
-        struct shrinker *shrink,
-        struct shrink_control *sc)
+        struct shrinker         *shrink,
+        struct shrink_control   *sc)
 {
-        int     ndqused, nfree, n;
-        gfp_t gfp_mask = sc->gfp_mask;
-
-        if (!kmem_shake_allow(gfp_mask))
-                return 0;
-        if (!xfs_Gqm)
-                return 0;
-
-        nfree = xfs_Gqm->qm_dqfrlist_cnt; /* free dquots */
-        /* incore dquots in all f/s's */
-        ndqused = atomic_read(&xfs_Gqm->qm_totaldquots) - nfree;
-
-        ASSERT(ndqused >= 0);
+        int                     nr_to_scan = sc->nr_to_scan;
+        LIST_HEAD               (dispose_list);
+        struct xfs_dquot        *dqp;
 
-        if (nfree <= ndqused && nfree < ndquot)
+        if ((sc->gfp_mask & (__GFP_FS|__GFP_WAIT)) != (__GFP_FS|__GFP_WAIT))
                 return 0;
+        if (!nr_to_scan)
+                goto out;
 
-        ndqused *= xfs_Gqm->qm_dqfree_ratio;    /* target # of free dquots */
-        n = nfree - ndqused - ndquot;           /* # over target */
-
-        return xfs_qm_shake_freelist(MAX(nfree, n));
-}
-
-
-/*------------------------------------------------------------------*/
-
-/*
- * Return a new incore dquot. Depending on the number of
- * dquots in the system, we either allocate a new one on the kernel heap,
- * or reclaim a free one.
- * Return value is B_TRUE if we allocated a new dquot, B_FALSE if we managed
- * to reclaim an existing one from the freelist.
- */
-boolean_t
-xfs_qm_dqalloc_incore(
-        xfs_dquot_t **O_dqpp)
-{
-        xfs_dquot_t     *dqp;
-
-        /*
-         * Check against high water mark to see if we want to pop
-         * a nincompoop dquot off the freelist.
-         */
-        if (atomic_read(&xfs_Gqm->qm_totaldquots) >= ndquot) {
-                /*
-                 * Try to recycle a dquot from the freelist.
-                 */
-                if ((dqp = xfs_qm_dqreclaim_one())) {
-                        XQM_STATS_INC(xqmstats.xs_qm_dqreclaims);
-                        /*
-                         * Just zero the core here. The rest will get
-                         * reinitialized by caller. XXX we shouldn't even
-                         * do this zero ...
-                         */
-                        memset(&dqp->q_core, 0, sizeof(dqp->q_core));
-                        *O_dqpp = dqp;
-                        return B_FALSE;
-                }
-                XQM_STATS_INC(xqmstats.xs_qm_dqreclaim_misses);
+        mutex_lock(&xfs_Gqm->qm_dqfrlist_lock);
+        while (!list_empty(&xfs_Gqm->qm_dqfrlist)) {
+                if (nr_to_scan-- <= 0)
+                        break;
+                dqp = list_first_entry(&xfs_Gqm->qm_dqfrlist, struct xfs_dquot,
+                                       q_freelist);
+                xfs_qm_dqreclaim_one(dqp, &dispose_list);
         }
+        mutex_unlock(&xfs_Gqm->qm_dqfrlist_lock);
 
-        /*
-         * Allocate a brand new dquot on the kernel heap and return it
-         * to the caller to initialize.
-         */
-        ASSERT(xfs_Gqm->qm_dqzone != NULL);
-        *O_dqpp = kmem_zone_zalloc(xfs_Gqm->qm_dqzone, KM_SLEEP);
-        atomic_inc(&xfs_Gqm->qm_totaldquots);
-
-        return B_TRUE;
+        while (!list_empty(&dispose_list)) {
+                dqp = list_first_entry(&dispose_list, struct xfs_dquot,
+                                       q_freelist);
+                list_del_init(&dqp->q_freelist);
+                xfs_qm_dqfree_one(dqp);
+        }
+out:
+        return (xfs_Gqm->qm_dqfrlist_cnt / 100) * sysctl_vfs_cache_pressure;
 }
 
-
 /*
  * Start a transaction and write the incore superblock changes to
  * disk. flags parameter indicates which fields have changed.
diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h
index 9b4f3adefbc5..9a9b997e1a0a 100644
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
@@ -26,24 +26,12 @@
 struct xfs_qm;
 struct xfs_inode;
 
-extern uint             ndquot;
 extern struct mutex     xfs_Gqm_lock;
 extern struct xfs_qm    *xfs_Gqm;
 extern kmem_zone_t      *qm_dqzone;
 extern kmem_zone_t      *qm_dqtrxzone;
 
 /*
- * Ditto, for xfs_qm_dqreclaim_one.
- */
-#define XFS_QM_RECLAIM_MAX_RESTARTS     4
-
-/*
- * Ideal ratio of free to in use dquots. Quota manager makes an attempt
- * to keep this balance.
- */
-#define XFS_QM_DQFREE_RATIO             2
-
-/*
  * Dquot hashtable constants/threshold values.
  */
 #define XFS_QM_HASHSIZE_LOW             (PAGE_SIZE / sizeof(xfs_dqhash_t))
@@ -74,7 +62,6 @@ typedef struct xfs_qm {
         int              qm_dqfrlist_cnt;
         atomic_t         qm_totaldquots; /* total incore dquots */
         uint             qm_nrefs;       /* file systems with quota on */
-        int              qm_dqfree_ratio;/* ratio of free to inuse dquots */
         kmem_zone_t     *qm_dqzone;      /* dquot mem-alloc zone */
         kmem_zone_t     *qm_dqtrxzone;   /* t_dqinfo of transactions */
 } xfs_qm_t;
@@ -143,7 +130,6 @@ extern int		xfs_qm_quotacheck(xfs_mount_t *);
 extern int              xfs_qm_write_sb_changes(xfs_mount_t *, __int64_t);
 
 /* dquot stuff */
-extern boolean_t        xfs_qm_dqalloc_incore(xfs_dquot_t **);
 extern int              xfs_qm_dqpurge_all(xfs_mount_t *, uint);
 extern void             xfs_qm_dqrele_all_inodes(xfs_mount_t *, uint);
 
diff --git a/fs/xfs/xfs_qm_stats.c b/fs/xfs/xfs_qm_stats.c
index 8671a0b32644..5729ba570877 100644
--- a/fs/xfs/xfs_qm_stats.c
+++ b/fs/xfs/xfs_qm_stats.c
@@ -42,9 +42,9 @@ static int xqm_proc_show(struct seq_file *m, void *v)
 {
         /* maximum; incore; ratio free to inuse; freelist */
         seq_printf(m, "%d\t%d\t%d\t%u\n",
-                        ndquot,
+                        0,
                         xfs_Gqm? atomic_read(&xfs_Gqm->qm_totaldquots) : 0,
-                        xfs_Gqm? xfs_Gqm->qm_dqfree_ratio : 0,
+                        0,
                         xfs_Gqm? xfs_Gqm->qm_dqfrlist_cnt : 0);
         return 0;
 }
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index eafbcff81f3a..711a86e39ff0 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -813,11 +813,11 @@ xfs_qm_export_dquot(
              (XFS_IS_OQUOTA_ENFORCED(mp) &&
                         (dst->d_flags & (FS_PROJ_QUOTA | FS_GROUP_QUOTA)))) &&
             dst->d_id != 0) {
-                if (((int) dst->d_bcount >= (int) dst->d_blk_softlimit) &&
+                if (((int) dst->d_bcount > (int) dst->d_blk_softlimit) &&
                     (dst->d_blk_softlimit > 0)) {
                         ASSERT(dst->d_btimer != 0);
                 }
-                if (((int) dst->d_icount >= (int) dst->d_ino_softlimit) &&
+                if (((int) dst->d_icount > (int) dst->d_ino_softlimit) &&
                     (dst->d_ino_softlimit > 0)) {
                         ASSERT(dst->d_itimer != 0);
                 }
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 6b6df5802e95..bb134a819930 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -733,11 +733,10 @@ DEFINE_EVENT(xfs_dquot_class, name, \
 DEFINE_DQUOT_EVENT(xfs_dqadjust);
 DEFINE_DQUOT_EVENT(xfs_dqreclaim_want);
 DEFINE_DQUOT_EVENT(xfs_dqreclaim_dirty);
-DEFINE_DQUOT_EVENT(xfs_dqreclaim_unlink);
+DEFINE_DQUOT_EVENT(xfs_dqreclaim_busy);
+DEFINE_DQUOT_EVENT(xfs_dqreclaim_done);
 DEFINE_DQUOT_EVENT(xfs_dqattach_found);
 DEFINE_DQUOT_EVENT(xfs_dqattach_get);
-DEFINE_DQUOT_EVENT(xfs_dqinit);
-DEFINE_DQUOT_EVENT(xfs_dqreuse);
 DEFINE_DQUOT_EVENT(xfs_dqalloc);
 DEFINE_DQUOT_EVENT(xfs_dqtobp_read);
 DEFINE_DQUOT_EVENT(xfs_dqread);
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 329b06aba1c2..7adcdf15ae0c 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -1151,8 +1151,8 @@ xfs_trans_add_item(
 {
         struct xfs_log_item_desc *lidp;
 
-        ASSERT(lip->li_mountp = tp->t_mountp);
-        ASSERT(lip->li_ailp = tp->t_mountp->m_ail);
+        ASSERT(lip->li_mountp == tp->t_mountp);
+        ASSERT(lip->li_ailp == tp->t_mountp->m_ail);
 
         lidp = kmem_zone_zalloc(xfs_log_item_desc_zone, KM_SLEEP | KM_NOFS);
 
diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index 4d00ee67792d..c4ba366d24e6 100644
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -649,12 +649,12 @@ xfs_trans_dqresv(
                          * nblks.
                          */
                         if (hardlimit > 0ULL &&
-                            hardlimit <= nblks + *resbcountp) {
+                            hardlimit < nblks + *resbcountp) {
                                 xfs_quota_warn(mp, dqp, QUOTA_NL_BHARDWARN);
                                 goto error_return;
                         }
                         if (softlimit > 0ULL &&
-                            softlimit <= nblks + *resbcountp) {
+                            softlimit < nblks + *resbcountp) {
                                 if ((timer != 0 && get_seconds() > timer) ||
                                     (warns != 0 && warns >= warnlimit)) {
                                         xfs_quota_warn(mp, dqp,
@@ -677,11 +677,13 @@ xfs_trans_dqresv(
                         if (!softlimit)
                                 softlimit = q->qi_isoftlimit;
 
-                        if (hardlimit > 0ULL && count >= hardlimit) {
+                        if (hardlimit > 0ULL &&
+                            hardlimit < ninos + count) {
                                 xfs_quota_warn(mp, dqp, QUOTA_NL_IHARDWARN);
                                 goto error_return;
                         }
-                        if (softlimit > 0ULL && count >= softlimit) {
+                        if (softlimit > 0ULL &&
+                            softlimit < ninos + count) {
                                 if  ((timer != 0 && get_seconds() > timer) ||
                                      (warns != 0 && warns >= warnlimit)) {
                                         xfs_quota_warn(mp, dqp,
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 0cf52da9d246..ebdb88840a47 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -131,7 +131,8 @@ xfs_readlink(
                          __func__, (unsigned long long) ip->i_ino,
                          (long long) pathlen);
                 ASSERT(0);
-                return XFS_ERROR(EFSCORRUPTED);
+                error = XFS_ERROR(EFSCORRUPTED);
+                goto out;
         }
 
 
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 2fe8639b3ae7..7c9aebe8a7aa 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -218,9 +218,13 @@ acpi_status acpi_os_write_port(acpi_io_address address, u32 value, u32 width);
  */
 acpi_status
 acpi_os_read_memory(acpi_physical_address address, u32 * value, u32 width);
+acpi_status
+acpi_os_read_memory64(acpi_physical_address address, u64 *value, u32 width);
 
 acpi_status
 acpi_os_write_memory(acpi_physical_address address, u32 value, u32 width);
+acpi_status
+acpi_os_write_memory64(acpi_physical_address address, u64 value, u32 width);
 
 /*
  * Platform and hardware-independent PCI configuration space access
diff --git a/include/acpi/atomicio.h b/include/acpi/atomicio.h
deleted file mode 100644
index 8b9fb4b0b9ce..000000000000
--- a/include/acpi/atomicio.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef ACPI_ATOMIC_IO_H
-#define ACPI_ATOMIC_IO_H
-
-int acpi_pre_map_gar(struct acpi_generic_address *reg);
-int acpi_post_unmap_gar(struct acpi_generic_address *reg);
-
-int acpi_atomic_read(u64 *val, struct acpi_generic_address *reg);
-int acpi_atomic_write(u64 val, struct acpi_generic_address *reg);
-
-#endif
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 610f6fb1bbc2..8cf7e98a2c7b 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -195,6 +195,7 @@ struct acpi_processor_flags {
         u8 has_cst:1;
         u8 power_setup_done:1;
         u8 bm_rld_set:1;
+        u8 need_hotplug_init:1;
 };
 
 struct acpi_processor {
diff --git a/include/asm-generic/io-64-nonatomic-hi-lo.h b/include/asm-generic/io-64-nonatomic-hi-lo.h
new file mode 100644
index 000000000000..a6806a94250d
--- /dev/null
+++ b/include/asm-generic/io-64-nonatomic-hi-lo.h
@@ -0,0 +1,28 @@
+#ifndef _ASM_IO_64_NONATOMIC_HI_LO_H_
+#define _ASM_IO_64_NONATOMIC_HI_LO_H_
+
+#include <linux/io.h>
+#include <asm-generic/int-ll64.h>
+
+#ifndef readq
+static inline __u64 readq(const volatile void __iomem *addr)
+{
+        const volatile u32 __iomem *p = addr;
+        u32 low, high;
+
+        high = readl(p + 1);
+        low = readl(p);
+
+        return low + ((u64)high << 32);
+}
+#endif
+
+#ifndef writeq
+static inline void writeq(__u64 val, volatile void __iomem *addr)
+{
+        writel(val >> 32, addr + 4);
+        writel(val, addr);
+}
+#endif
+
+#endif  /* _ASM_IO_64_NONATOMIC_HI_LO_H_ */
diff --git a/include/asm-generic/io-64-nonatomic-lo-hi.h b/include/asm-generic/io-64-nonatomic-lo-hi.h
new file mode 100644
index 000000000000..ca546b1ff8b5
--- /dev/null
+++ b/include/asm-generic/io-64-nonatomic-lo-hi.h
@@ -0,0 +1,28 @@
+#ifndef _ASM_IO_64_NONATOMIC_LO_HI_H_
+#define _ASM_IO_64_NONATOMIC_LO_HI_H_
+
+#include <linux/io.h>
+#include <asm-generic/int-ll64.h>
+
+#ifndef readq
+static inline __u64 readq(const volatile void __iomem *addr)
+{
+        const volatile u32 __iomem *p = addr;
+        u32 low, high;
+
+        low = readl(p);
+        high = readl(p + 1);
+
+        return low + ((u64)high << 32);
+}
+#endif
+
+#ifndef writeq
+static inline void writeq(__u64 val, volatile void __iomem *addr)
+{
+        writel(val, addr);
+        writel(val >> 32, addr + 4);
+}
+#endif
+
+#endif  /* _ASM_IO_64_NONATOMIC_LO_HI_H_ */
diff --git a/include/asm-generic/pci_iomap.h b/include/asm-generic/pci_iomap.h
index 8de4b73e19e2..e58fcf891370 100644
--- a/include/asm-generic/pci_iomap.h
+++ b/include/asm-generic/pci_iomap.h
@@ -15,6 +15,16 @@ struct pci_dev;
 #ifdef CONFIG_PCI
 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
 extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
+/* Create a virtual mapping cookie for a port on a given PCI device.
+ * Do not call this directly, it exists to make it easier for architectures
+ * to override */
+#ifdef CONFIG_NO_GENERIC_PCI_IOPORT_MAP
+extern void __iomem *__pci_ioport_map(struct pci_dev *dev, unsigned long port,
+                                      unsigned int nr);
+#else
+#define __pci_ioport_map(dev, port, nr) ioport_map((port), (nr))
+#endif
+
 #else
 static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
 {
diff --git a/include/asm-generic/poll.h b/include/asm-generic/poll.h
index 44bce836d350..9ce7f44aebd2 100644
--- a/include/asm-generic/poll.h
+++ b/include/asm-generic/poll.h
@@ -28,6 +28,8 @@
 #define POLLRDHUP       0x2000
 #endif
 
+#define POLLFREE        0x4000  /* currently only for epoll */
+
 struct pollfd {
         int fd;
         short events;
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 76caa67c22e2..92f0981b5fb8 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1328,6 +1328,7 @@ extern int drm_getmagic(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
 extern int drm_authmagic(struct drm_device *dev, void *data,
                          struct drm_file *file_priv);
+extern int drm_remove_magic(struct drm_master *master, drm_magic_t magic);
 
 /* Cache management (drm_cache.c) */
 void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
diff --git a/include/keys/user-type.h b/include/keys/user-type.h
index c37c34275a44..bc9ec1d7698c 100644
--- a/include/keys/user-type.h
+++ b/include/keys/user-type.h
@@ -17,7 +17,7 @@
 
 /*****************************************************************************/
 /*
- * the payload for a key of type "user"
+ * the payload for a key of type "user" or "logon"
  * - once filled in and attached to a key:
  *   - the payload struct is invariant may not be changed, only replaced
  *   - the payload must be read with RCU procedures or with the key semaphore
@@ -33,6 +33,7 @@ struct user_key_payload {
 };
 
 extern struct key_type key_type_user;
+extern struct key_type key_type_logon;
 
 extern int user_instantiate(struct key *key, const void *data, size_t datalen);
 extern int user_update(struct key *key, const void *data, size_t datalen);
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index fd88a3945aa1..0092102db2de 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -18,7 +18,7 @@ struct pt_regs;
 #define BINPRM_BUF_SIZE 128
 
 #ifdef __KERNEL__
-#include <linux/list.h>
+#include <linux/sched.h>
 
 #define CORENAME_MAX_SIZE 128
 
@@ -58,6 +58,7 @@ struct linux_binprm {
         unsigned interp_flags;
         unsigned interp_data;
         unsigned long loader, exec;
+        char tcomm[TASK_COMM_LEN];
 };
 
 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 3c1063acb2ab..94300fe46cce 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -56,6 +56,26 @@ static inline unsigned long hweight_long(unsigned long w)
 }
 
 /**
+ * rol64 - rotate a 64-bit value left
+ * @word: value to rotate
+ * @shift: bits to roll
+ */
+static inline __u64 rol64(__u64 word, unsigned int shift)
+{
+        return (word << shift) | (word >> (64 - shift));
+}
+
+/**
+ * ror64 - rotate a 64-bit value right
+ * @word: value to rotate
+ * @shift: bits to roll
+ */
+static inline __u64 ror64(__u64 word, unsigned int shift)
+{
+        return (word >> shift) | (word << (64 - shift));
+}
+
+/**
  * rol32 - rotate a 32-bit value left
  * @word: value to rotate
  * @shift: bits to roll
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 6c6a1f008065..606cf339bb56 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -399,9 +399,6 @@ struct request_queue {
         /* Throttle data */
         struct throtl_data *td;
 #endif
-#ifdef CONFIG_LOCKDEP
-        int                     ioc_release_depth;
-#endif
 };
 
 #define QUEUE_FLAG_QUEUED       1       /* uses generic tag queueing */
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 35eae4b67503..7c48029dffe6 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -952,7 +952,8 @@ struct cdrom_device_info {
         char name[20];                  /* name of the device type */
 /* per-device flags */
         __u8 sanyo_slot         : 2;    /* Sanyo 3 CD changer support */
-        __u8 reserved           : 6;    /* not used yet */
+        __u8 keeplocked         : 1;    /* CDROM_LOCKDOOR status */
+        __u8 reserved           : 5;    /* not used yet */
         int cdda_method;                /* see flags */
         __u8 last_sense;
         __u8 media_written;             /* dirty flag, DVD+RW bookkeeping */
diff --git a/include/linux/device.h b/include/linux/device.h
index 5b3adb8f9588..b63fb393aa58 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -279,11 +279,11 @@ struct device *driver_find_device(struct device_driver *drv,
 
 /**
  * struct subsys_interface - interfaces to device functions
- * @name        name of the device function
- * @subsystem   subsytem of the devices to attach to
- * @node        the list of functions registered at the subsystem
- * @add         device hookup to device function handler
- * @remove      device hookup to device function handler
+ * @name:       name of the device function
+ * @subsys:     subsytem of the devices to attach to
+ * @node:       the list of functions registered at the subsystem
+ * @add_dev:    device hookup to device function handler
+ * @remove_dev: device hookup to device function handler
  *
  * Simple interfaces attached to a subsystem. Multiple interfaces can
  * attach to a subsystem and its devices. Unlike drivers, they do not
@@ -612,6 +612,7 @@ struct device_dma_parameters {
  * @archdata:   For arch-specific additions.
  * @of_node:    Associated device tree node.
  * @devt:       For creating the sysfs "dev".
+ * @id:         device instance
  * @devres_lock: Spinlock to protect the resource of the device.
  * @devres_head: The resources list of the device.
  * @knode_class: The node used to add the device to the class list.
@@ -1003,6 +1004,10 @@ extern long sysfs_deprecated;
  * Each module may only use this macro once, and calling it replaces
  * module_init() and module_exit().
  *
+ * @__driver: driver name
+ * @__register: register function for this driver type
+ * @__unregister: unregister function for this driver type
+ *
  * Use this macro to construct bus specific macros for registering
  * drivers, and do not use it on its own.
  */
diff --git a/include/linux/digsig.h b/include/linux/digsig.h
index b01558b15814..6f85a070bb45 100644
--- a/include/linux/digsig.h
+++ b/include/linux/digsig.h
@@ -30,7 +30,7 @@ enum digest_algo {
 
 struct pubkey_hdr {
         uint8_t         version;        /* key format version */
-        time_t          timestamp;      /* key made, always 0 for now */
+        uint32_t        timestamp;      /* key made, always 0 for now */
         uint8_t         algo;
         uint8_t         nmpi;
         char            mpi[0];
@@ -38,7 +38,7 @@ struct pubkey_hdr {
 
 struct signature_hdr {
         uint8_t         version;        /* signature format version */
-        time_t          timestamp;      /* signature made */
+        uint32_t        timestamp;      /* signature made */
         uint8_t         algo;
         uint8_t         hash;
         uint8_t         keyid[8];
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index c24f3d7fbf1e..7d4e0356f329 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -42,12 +42,6 @@ struct elevator_ops
         elevator_merged_fn *elevator_merged_fn;
         elevator_merge_req_fn *elevator_merge_req_fn;
         elevator_allow_merge_fn *elevator_allow_merge_fn;
-
-        /*
-         * Used for both plugged list and elevator merging and in the
-         * former case called without queue_lock.  Read comment on top of
-         * attempt_plug_merge() for details.
-         */
         elevator_bio_merged_fn *elevator_bio_merged_fn;
 
         elevator_dispatch_fn *elevator_dispatch_fn;
@@ -122,7 +116,6 @@ extern void elv_dispatch_add_tail(struct request_queue *, struct request *);
 extern void elv_add_request(struct request_queue *, struct request *, int);
 extern void __elv_add_request(struct request_queue *, struct request *, int);
 extern int elv_merge(struct request_queue *, struct request **, struct bio *);
-extern int elv_try_merge(struct request *, struct bio *);
 extern void elv_merge_requests(struct request_queue *, struct request *,
                                struct request *);
 extern void elv_merged_request(struct request_queue *, struct request *, int);
@@ -155,7 +148,7 @@ extern ssize_t elv_iosched_store(struct request_queue *, const char *, size_t);
 extern int elevator_init(struct request_queue *, char *);
 extern void elevator_exit(struct elevator_queue *);
 extern int elevator_change(struct request_queue *, const char *);
-extern int elv_rq_merge_ok(struct request *, struct bio *);
+extern bool elv_rq_merge_ok(struct request *, struct bio *);
 
 /*
  * Helper functions.
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
index 0ab54e16a91f..d09af4b67cf1 100644
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
@@ -39,6 +39,7 @@ extern bool __refrigerator(bool check_kthr_stop);
 extern int freeze_processes(void);
 extern int freeze_kernel_threads(void);
 extern void thaw_processes(void);
+extern void thaw_kernel_threads(void);
 
 static inline bool try_to_freeze(void)
 {
@@ -174,6 +175,7 @@ static inline bool __refrigerator(bool check_kthr_stop) { return false; }
 static inline int freeze_processes(void) { return -ENOSYS; }
 static inline int freeze_kernel_threads(void) { return -ENOSYS; }
 static inline void thaw_processes(void) {}
+static inline void thaw_kernel_threads(void) {}
 
 static inline bool try_to_freeze(void) { return false; }
 
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 0244082d42c5..69cd5bb640f5 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -396,6 +396,7 @@ struct inodes_stat_t {
 #include <linux/rculist_bl.h>
 #include <linux/atomic.h>
 #include <linux/shrinker.h>
+#include <linux/migrate_mode.h>
 
 #include <asm/byteorder.h>
 
@@ -526,7 +527,6 @@ enum positive_aop_returns {
 struct page;
 struct address_space;
 struct writeback_control;
-enum migrate_mode;
 
 struct iov_iter {
         const struct iovec *iov;
@@ -2496,6 +2496,7 @@ extern void get_filesystem(struct file_system_type *fs);
 extern void put_filesystem(struct file_system_type *fs);
 extern struct file_system_type *get_fs_type(const char *name);
 extern struct super_block *get_super(struct block_device *);
+extern struct super_block *get_super_thawed(struct block_device *);
 extern struct super_block *get_active_super(struct block_device *bdev);
 extern void drop_super(struct super_block *sb);
 extern void iterate_supers(void (*)(struct super_block *, void *), void *);
diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h
index b5ca4b2c08ec..004ff33ab38e 100644
--- a/include/linux/gpio_keys.h
+++ b/include/linux/gpio_keys.h
@@ -1,6 +1,8 @@
 #ifndef _GPIO_KEYS_H
 #define _GPIO_KEYS_H
 
+struct device;
+
 struct gpio_keys_button {
         /* Configuration parameters */
         unsigned int code;      /* input event code (KEY_*, SW_*) */
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 62b908e0e591..0ae065a5fcb2 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -35,7 +35,7 @@
 #include <linux/mod_devicetable.h>
 
 
-#define MAX_PAGE_BUFFER_COUNT                           18
+#define MAX_PAGE_BUFFER_COUNT                           19
 #define MAX_MULTIPAGE_BUFFER_COUNT                      32 /* 128K */
 
 #pragma pack(push, 1)
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 828181fbad5d..58404b0c5010 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -46,6 +46,10 @@ struct team_port {
         u32 speed;
         u8 duplex;
 
+        /* Custom gennetlink interface related flags */
+        bool changed;
+        bool removed;
+
         struct rcu_head rcu;
 };
 
@@ -72,6 +76,10 @@ struct team_option {
         enum team_option_type type;
         int (*getter)(struct team *team, void *arg);
         int (*setter)(struct team *team, void *arg);
+
+        /* Custom gennetlink interface related flags */
+        bool changed;
+        bool removed;
 };
 
 struct team_mode {
@@ -207,6 +215,7 @@ enum {
         TEAM_ATTR_OPTION_CHANGED,       /* flag */
         TEAM_ATTR_OPTION_TYPE,          /* u8 */
         TEAM_ATTR_OPTION_DATA,          /* dynamic */
+        TEAM_ATTR_OPTION_REMOVED,       /* flag */
 
         __TEAM_ATTR_OPTION_MAX,
         TEAM_ATTR_OPTION_MAX = __TEAM_ATTR_OPTION_MAX - 1,
@@ -227,6 +236,7 @@ enum {
         TEAM_ATTR_PORT_LINKUP,          /* flag */
         TEAM_ATTR_PORT_SPEED,           /* u32 */
         TEAM_ATTR_PORT_DUPLEX,          /* u8 */
+        TEAM_ATTR_PORT_REMOVED,         /* flag */
 
         __TEAM_ATTR_PORT_MAX,
         TEAM_ATTR_PORT_MAX = __TEAM_ATTR_PORT_MAX - 1,
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 7e1371c4bccf..119773eebe31 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -133,7 +133,7 @@ static inline struct io_context *ioc_task_link(struct io_context *ioc)
 
 struct task_struct;
 #ifdef CONFIG_BLOCK
-void put_io_context(struct io_context *ioc, struct request_queue *locked_q);
+void put_io_context(struct io_context *ioc);
 void exit_io_context(struct task_struct *task);
 struct io_context *get_task_io_context(struct task_struct *task,
                                        gfp_t gfp_flags, int node);
@@ -141,8 +141,7 @@ void ioc_ioprio_changed(struct io_context *ioc, int ioprio);
 void ioc_cgroup_changed(struct io_context *ioc);
 #else
 struct io_context;
-static inline void put_io_context(struct io_context *ioc,
-                                  struct request_queue *locked_q) { }
+static inline void put_io_context(struct io_context *ioc) { }
 static inline void exit_io_context(struct task_struct *task) { }
 #endif
 
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 2fa0901219d4..0d7d6a1b172f 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -50,9 +50,11 @@
  * note header.  For kdump, the code in vmcore.c runs in the context
  * of the second kernel to combine them into one note.
  */
+#ifndef KEXEC_NOTE_BYTES
 #define KEXEC_NOTE_BYTES ( (KEXEC_NOTE_HEAD_BYTES * 2) +                \
                             KEXEC_CORE_NOTE_NAME_BYTES +                \
                             KEXEC_CORE_NOTE_DESC_BYTES )
+#endif
 
 /*
  * This structure is used to hold the arguments that are used when loading
diff --git a/include/linux/lp8727.h b/include/linux/lp8727.h
index d21fa2865bf4..d21fa2865bf4 100755..100644
--- a/include/linux/lp8727.h
+++ b/include/linux/lp8727.h
diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h
index 1515e64e3663..f88c1cc0cb0f 100644
--- a/include/linux/mfd/mcp.h
+++ b/include/linux/mfd/mcp.h
@@ -10,7 +10,6 @@
 #ifndef MCP_H
 #define MCP_H
 
-#include <linux/mod_devicetable.h>
 #include <mach/dma.h>
 
 struct mcp_ops;
@@ -27,7 +26,7 @@ struct mcp {
         dma_device_t    dma_telco_rd;
         dma_device_t    dma_telco_wr;
         struct device   attached_device;
-        const char      *codec;
+        int             gpio_base;
 };
 
 struct mcp_ops {
@@ -45,11 +44,10 @@ void mcp_reg_write(struct mcp *, unsigned int, unsigned int);
 unsigned int mcp_reg_read(struct mcp *, unsigned int);
 void mcp_enable(struct mcp *);
 void mcp_disable(struct mcp *);
-const struct mcp_device_id *mcp_get_device_id(const struct mcp *mcp);
 #define mcp_get_sclk_rate(mcp)  ((mcp)->sclk_rate)
 
 struct mcp *mcp_host_alloc(struct device *, size_t);
-int mcp_host_register(struct mcp *, void *);
+int mcp_host_register(struct mcp *);
 void mcp_host_unregister(struct mcp *);
 
 struct mcp_driver {
@@ -58,7 +56,6 @@ struct mcp_driver {
         void (*remove)(struct mcp *);
         int (*suspend)(struct mcp *, pm_message_t);
         int (*resume)(struct mcp *);
-        const struct mcp_device_id *id_table;
 };
 
 int mcp_driver_register(struct mcp_driver *);
@@ -67,6 +64,9 @@ void mcp_driver_unregister(struct mcp_driver *);
 #define mcp_get_drvdata(mcp)    dev_get_drvdata(&(mcp)->attached_device)
 #define mcp_set_drvdata(mcp,d)  dev_set_drvdata(&(mcp)->attached_device, d)
 
-#define mcp_priv(mcp)           ((void *)((mcp)+1))
+static inline void *mcp_priv(struct mcp *mcp)
+{
+        return mcp + 1;
+}
 
 #endif
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 2463c2619596..9bc9ac651dad 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -187,8 +187,10 @@ struct twl6040 {
         int rev;
         u8 vibra_ctrl_cache[2];
 
+        /* PLL configuration */
         int pll;
         unsigned int sysclk;
+        unsigned int mclk;
 
         unsigned int irq;
         unsigned int irq_base;
diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h
index bc19e5fb7ea8..4321f044d1e4 100644
--- a/include/linux/mfd/ucb1x00.h
+++ b/include/linux/mfd/ucb1x00.h
@@ -104,9 +104,6 @@
 #define UCB_MODE_DYN_VFLAG_ENA  (1 << 12)
 #define UCB_MODE_AUD_OFF_CAN    (1 << 13)
 
-struct ucb1x00_plat_data {
-        int             gpio_base;
-};
 
 struct ucb1x00_irq {
         void *devid;
@@ -119,7 +116,7 @@ struct ucb1x00 {
         unsigned int            irq;
         struct semaphore        adc_sem;
         spinlock_t              io_lock;
-        const struct mcp_device_id *id;
+        u16                     id;
         u16                     io_dir;
         u16                     io_out;
         u16                     adc_cr;
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index eaf867412f7a..05ed2828a553 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -3,22 +3,10 @@
 
 #include <linux/mm.h>
 #include <linux/mempolicy.h>
+#include <linux/migrate_mode.h>
 
 typedef struct page *new_page_t(struct page *, unsigned long private, int **);
 
-/*
- * MIGRATE_ASYNC means never block
- * MIGRATE_SYNC_LIGHT in the current implementation means to allow blocking
- *      on most operations but not ->writepage as the potential stall time
- *      is too significant
- * MIGRATE_SYNC will block when migrating pages
- */
-enum migrate_mode {
-        MIGRATE_ASYNC,
-        MIGRATE_SYNC_LIGHT,
-        MIGRATE_SYNC,
-};
-
 #ifdef CONFIG_MIGRATION
 #define PAGE_MIGRATION 1
 
diff --git a/include/linux/migrate_mode.h b/include/linux/migrate_mode.h
new file mode 100644
index 000000000000..ebf3d89a3919
--- /dev/null
+++ b/include/linux/migrate_mode.h
@@ -0,0 +1,16 @@
+#ifndef MIGRATE_MODE_H_INCLUDED
+#define MIGRATE_MODE_H_INCLUDED
+/*
+ * MIGRATE_ASYNC means never block
+ * MIGRATE_SYNC_LIGHT in the current implementation means to allow blocking
+ *      on most operations but not ->writepage as the potential stall time
+ *      is too significant
+ * MIGRATE_SYNC will block when migrating pages
+ */
+enum migrate_mode {
+        MIGRATE_ASYNC,
+        MIGRATE_SYNC_LIGHT,
+        MIGRATE_SYNC,
+};
+
+#endif          /* MIGRATE_MODE_H_INCLUDED */
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 5c4fe8e5bfe5..aea61905499b 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -621,6 +621,7 @@ void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac);
 int mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac);
 int mlx4_get_eth_qp(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn);
 void mlx4_put_eth_qp(struct mlx4_dev *dev, u8 port, u64 mac, int qpn);
+void mlx4_set_stats_bitmap(struct mlx4_dev *dev, u64 *stats_bitmap);
 
 int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx);
 int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 9f22ba572de0..19a41d1737af 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -217,6 +217,7 @@ struct mmc_card {
 #define MMC_CARD_SDXC           (1<<6)          /* card is SDXC */
 #define MMC_CARD_REMOVED        (1<<7)          /* card has been removed */
 #define MMC_STATE_HIGHSPEED_200 (1<<8)          /* card is in HS200 mode */
+#define MMC_STATE_SLEEP         (1<<9)          /* card is in sleep state */
         unsigned int            quirks;         /* card quirks */
 #define MMC_QUIRK_LENIENT_FN0   (1<<0)          /* allow SDIO FN0 writes outside of the VS CCCR range */
 #define MMC_QUIRK_BLKSZ_FOR_BYTE_MODE (1<<1)    /* use func->cur_blksize */
@@ -382,6 +383,7 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)
 #define mmc_sd_card_uhs(c)      ((c)->state & MMC_STATE_ULTRAHIGHSPEED)
 #define mmc_card_ext_capacity(c) ((c)->state & MMC_CARD_SDXC)
 #define mmc_card_removed(c)     ((c) && ((c)->state & MMC_CARD_REMOVED))
+#define mmc_card_is_sleep(c)    ((c)->state & MMC_STATE_SLEEP)
 
 #define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT)
 #define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY)
@@ -393,7 +395,9 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)
 #define mmc_sd_card_set_uhs(c) ((c)->state |= MMC_STATE_ULTRAHIGHSPEED)
 #define mmc_card_set_ext_capacity(c) ((c)->state |= MMC_CARD_SDXC)
 #define mmc_card_set_removed(c) ((c)->state |= MMC_CARD_REMOVED)
+#define mmc_card_set_sleep(c)   ((c)->state |= MMC_STATE_SLEEP)
 
+#define mmc_card_clr_sleep(c)   ((c)->state &= ~MMC_STATE_SLEEP)
 /*
  * Quirk add/remove for MMC products.
  */
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index e8779c6d1759..aae5d1f1bb39 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -14,6 +14,8 @@
 #ifndef LINUX_MMC_DW_MMC_H
 #define LINUX_MMC_DW_MMC_H
 
+#include <linux/scatterlist.h>
+
 #define MAX_MCI_SLOTS   2
 
 enum dw_mci_state {
@@ -40,7 +42,7 @@ struct mmc_data;
  * @lock: Spinlock protecting the queue and associated data.
  * @regs: Pointer to MMIO registers.
  * @sg: Scatterlist entry currently being processed by PIO code, if any.
- * @pio_offset: Offset into the current scatterlist entry.
+ * @sg_miter: PIO mapping scatterlist iterator.
  * @cur_slot: The slot which is currently using the controller.
  * @mrq: The request currently being processed on @cur_slot,
  *      or NULL if the controller is idle.
@@ -115,7 +117,7 @@ struct dw_mci {
         void __iomem            *regs;
 
         struct scatterlist      *sg;
-        unsigned int            pio_offset;
+        struct sg_mapping_iter  sg_miter;
 
         struct dw_mci_slot      *cur_slot;
         struct mmc_request      *mrq;
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 0beba1e5e1ed..ee2b0363c040 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -257,6 +257,7 @@ struct mmc_host {
 #define MMC_CAP2_HS200_1_2V_SDR (1 << 6)        /* can support */
 #define MMC_CAP2_HS200          (MMC_CAP2_HS200_1_8V_SDR | \
                                  MMC_CAP2_HS200_1_2V_SDR)
+#define MMC_CAP2_BROKEN_VOLTAGE (1 << 7)        /* Use the broken voltage */
 
         mmc_pm_flag_t           pm_caps;        /* supported pm features */
         unsigned int        power_notify_type;
@@ -444,4 +445,23 @@ static inline int mmc_boot_partition_access(struct mmc_host *host)
         return !(host->caps2 & MMC_CAP2_BOOTPART_NOACC);
 }
 
+#ifdef CONFIG_MMC_CLKGATE
+void mmc_host_clk_hold(struct mmc_host *host);
+void mmc_host_clk_release(struct mmc_host *host);
+unsigned int mmc_host_clk_rate(struct mmc_host *host);
+
+#else
+static inline void mmc_host_clk_hold(struct mmc_host *host)
+{
+}
+
+static inline void mmc_host_clk_release(struct mmc_host *host)
+{
+}
+
+static inline unsigned int mmc_host_clk_rate(struct mmc_host *host)
+{
+        return host->ios.clock;
+}
+#endif
 #endif /* LINUX_MMC_HOST_H */
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index b29e7f6f8fa5..83ac0713ed0a 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -436,17 +436,6 @@ struct spi_device_id {
                         __attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 
-/* mcp */
-
-#define MCP_NAME_SIZE   20
-#define MCP_MODULE_PREFIX "mcp:"
-
-struct mcp_device_id {
-        char name[MCP_NAME_SIZE];
-        kernel_ulong_t driver_data      /* Data private to the driver */
-                        __attribute__((aligned(sizeof(kernel_ulong_t))));
-};
-
 /* dmi */
 enum dmi_field {
         DMI_NONE,
diff --git a/include/linux/mpi.h b/include/linux/mpi.h
index 06f88994ccaa..d02cca6cc8ce 100644
--- a/include/linux/mpi.h
+++ b/include/linux/mpi.h
@@ -57,8 +57,6 @@ struct gcry_mpi {
 
 typedef struct gcry_mpi *MPI;
 
-#define MPI_NULL NULL
-
 #define mpi_get_nlimbs(a)     ((a)->nlimbs)
 #define mpi_is_neg(a)         ((a)->sign)
 
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 1a81fde8f333..d43dc25af82e 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -427,9 +427,7 @@ static inline int mtd_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 
 static inline int mtd_suspend(struct mtd_info *mtd)
 {
-        if (!mtd->suspend)
-                return -EOPNOTSUPP;
-        return mtd->suspend(mtd);
+        return mtd->suspend ? mtd->suspend(mtd) : 0;
 }
 
 static inline void mtd_resume(struct mtd_info *mtd)
@@ -441,7 +439,7 @@ static inline void mtd_resume(struct mtd_info *mtd)
 static inline int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs)
 {
         if (!mtd->block_isbad)
-                return -EOPNOTSUPP;
+                return 0;
         return mtd->block_isbad(mtd, ofs);
 }
 
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index a764cef06b73..d6ba9a12591e 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -614,7 +614,6 @@ struct nfs_getaclargs {
         size_t                          acl_len;
         unsigned int                    acl_pgbase;
         struct page **                  acl_pages;
-        struct page *                   acl_scratch;
         struct nfs4_sequence_args       seq_args;
 };
 
@@ -624,6 +623,7 @@ struct nfs_getaclres {
         size_t                          acl_len;
         size_t                          acl_data_offset;
         int                             acl_flags;
+        struct page *                   acl_scratch;
         struct nfs4_sequence_res        seq_res;
 };
 
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 08855613ceb3..abb2776be1ba 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -587,6 +587,7 @@ struct hw_perf_event {
         u64                             sample_period;
         u64                             last_period;
         local64_t                       period_left;
+        u64                             interrupts_seq;
         u64                             interrupts;
 
         u64                             freq_time_stamp;
diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
index e5bbcbaa6f57..4d99e4e6ef83 100644
--- a/include/linux/pm_qos.h
+++ b/include/linux/pm_qos.h
@@ -110,7 +110,19 @@ static inline void pm_qos_remove_request(struct pm_qos_request *req)
                         { return; }
 
 static inline int pm_qos_request(int pm_qos_class)
-                        { return 0; }
+{
+        switch (pm_qos_class) {
+        case PM_QOS_CPU_DMA_LATENCY:
+                return PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
+        case PM_QOS_NETWORK_LATENCY:
+                return PM_QOS_NETWORK_LAT_DEFAULT_VALUE;
+        case PM_QOS_NETWORK_THROUGHPUT:
+                return PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE;
+        default:
+                return PM_QOS_DEFAULT_VALUE;
+        }
+}
+
 static inline int pm_qos_add_notifier(int pm_qos_class,
                                       struct notifier_block *notifier)
                         { return 0; }
diff --git a/include/linux/proportions.h b/include/linux/proportions.h
index ef35bb73f69b..26a8a4ed9b07 100644
--- a/include/linux/proportions.h
+++ b/include/linux/proportions.h
@@ -81,7 +81,11 @@ void prop_inc_percpu(struct prop_descriptor *pd, struct prop_local_percpu *pl)
  * Limit the time part in order to ensure there are some bits left for the
  * cycle counter and fraction multiply.
  */
+#if BITS_PER_LONG == 32
 #define PROP_MAX_SHIFT (3*BITS_PER_LONG/4)
+#else
+#define PROP_MAX_SHIFT (BITS_PER_LONG/2)
+#endif
 
 #define PROP_FRAC_SHIFT         (BITS_PER_LONG - PROP_MAX_SHIFT - 1)
 #define PROP_FRAC_BASE          (1UL << PROP_FRAC_SHIFT)
diff --git a/include/linux/quota.h b/include/linux/quota.h
index cb7855699037..c09fa042b5ea 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -230,7 +230,11 @@ struct mem_dqinfo {
 struct super_block;
 
 #define DQF_MASK 0xffff         /* Mask for format specific flags */
-#define DQF_INFO_DIRTY_B 16
+#define DQF_GETINFO_MASK 0x1ffff        /* Mask for flags passed to userspace */
+#define DQF_SETINFO_MASK 0xffff         /* Mask for flags modifiable from userspace */
+#define DQF_SYS_FILE_B          16
+#define DQF_SYS_FILE (1 << DQF_SYS_FILE_B)      /* Quota file stored as system file */
+#define DQF_INFO_DIRTY_B        31
 #define DQF_INFO_DIRTY (1 << DQF_INFO_DIRTY_B)  /* Is info dirty? */
 
 extern void mark_info_dirty(struct super_block *sb, int type);
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h
index c9d625ca659e..da81af086eaf 100644
--- a/include/linux/res_counter.h
+++ b/include/linux/res_counter.h
@@ -109,12 +109,18 @@ void res_counter_init(struct res_counter *counter, struct res_counter *parent);
  *
  * returns 0 on success and <0 if the counter->usage will exceed the
  * counter->limit _locked call expects the counter->lock to be taken
+ *
+ * charge_nofail works the same, except that it charges the resource
+ * counter unconditionally, and returns < 0 if the after the current
+ * charge we are over limit.
  */
 
 int __must_check res_counter_charge_locked(struct res_counter *counter,
                 unsigned long val);
 int __must_check res_counter_charge(struct res_counter *counter,
                 unsigned long val, struct res_counter **limit_fail_at);
+int __must_check res_counter_charge_nofail(struct res_counter *counter,
+                unsigned long val, struct res_counter **limit_fail_at);
 
 /*
  * uncharge - tell that some portion of the resource is released
@@ -142,7 +148,10 @@ static inline unsigned long long res_counter_margin(struct res_counter *cnt)
         unsigned long flags;
 
         spin_lock_irqsave(&cnt->lock, flags);
-        margin = cnt->limit - cnt->usage;
+        if (cnt->limit > cnt->usage)
+                margin = cnt->limit - cnt->usage;
+        else
+                margin = 0;
         spin_unlock_irqrestore(&cnt->lock, flags);
         return margin;
 }
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 4032ec1cf836..7d379a6bfd88 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2088,9 +2088,9 @@ extern int sched_setscheduler_nocheck(struct task_struct *, int,
 extern struct task_struct *idle_task(int cpu);
 /**
  * is_idle_task - is the specified task an idle task?
- * @tsk: the task in question.
+ * @p: the task in question.
  */
-static inline bool is_idle_task(struct task_struct *p)
+static inline bool is_idle_task(const struct task_struct *p)
 {
         return p->pid == 0;
 }
@@ -2259,6 +2259,12 @@ static inline void mmdrop(struct mm_struct * mm)
 extern void mmput(struct mm_struct *);
 /* Grab a reference to a task's mm, if it is not already going away */
 extern struct mm_struct *get_task_mm(struct task_struct *task);
+/*
+ * Grab a reference to a task's mm, if it is not already going away
+ * and ptrace_may_access with the mode parameter passed to it
+ * succeeds.
+ */
+extern struct mm_struct *mm_access(struct task_struct *task, unsigned int mode);
 /* Remove the current tasks stale references to the old mm_struct */
 extern void mm_release(struct task_struct *, struct mm_struct *);
 /* Allocate a new mm structure and copy contents from tsk->mm */
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
index 8cd7fe59cf1a..425450b980b8 100644
--- a/include/linux/sh_dma.h
+++ b/include/linux/sh_dma.h
@@ -70,6 +70,7 @@ struct sh_dmae_pdata {
         unsigned int needs_tend_set:1;
         unsigned int no_dmars:1;
         unsigned int chclr_present:1;
+        unsigned int slave_only:1;
 };
 
 /* DMA register */
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index e4c711c6f321..79ab2555b3b0 100644
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -48,6 +48,7 @@ extern struct file *shmem_file_setup(const char *name,
                                         loff_t size, unsigned long flags);
 extern int shmem_zero_setup(struct vm_area_struct *);
 extern int shmem_lock(struct file *file, int lock, struct user_struct *user);
+extern void shmem_unlock_mapping(struct address_space *mapping);
 extern struct page *shmem_read_mapping_page_gfp(struct address_space *mapping,
                                         pgoff_t index, gfp_t gfp_mask);
 extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end);
diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h
index 3ff4961da9b5..247399b2979a 100644
--- a/include/linux/signalfd.h
+++ b/include/linux/signalfd.h
@@ -61,13 +61,16 @@ static inline void signalfd_notify(struct task_struct *tsk, int sig)
                 wake_up(&tsk->sighand->signalfd_wqh);
 }
 
+extern void signalfd_cleanup(struct sighand_struct *sighand);
+
 #else /* CONFIG_SIGNALFD */
 
 static inline void signalfd_notify(struct task_struct *tsk, int sig) { }
 
+static inline void signalfd_cleanup(struct sighand_struct *sighand) { }
+
 #endif /* CONFIG_SIGNALFD */
 
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_SIGNALFD_H */
-
diff --git a/include/linux/snmp.h b/include/linux/snmp.h
index e16557a357e5..c1241c428179 100644
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
@@ -192,7 +192,6 @@ enum
         LINUX_MIB_TCPPARTIALUNDO,               /* TCPPartialUndo */
         LINUX_MIB_TCPDSACKUNDO,                 /* TCPDSACKUndo */
         LINUX_MIB_TCPLOSSUNDO,                  /* TCPLossUndo */
-        LINUX_MIB_TCPLOSS,                      /* TCPLoss */
         LINUX_MIB_TCPLOSTRETRANSMIT,            /* TCPLostRetransmit */
         LINUX_MIB_TCPRENOFAILURES,              /* TCPRenoFailures */
         LINUX_MIB_TCPSACKFAILURES,              /* TCPSackFailures */
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 95040cc33107..91784a4f8608 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -357,14 +357,29 @@ extern bool pm_save_wakeup_count(unsigned int count);
 
 static inline void lock_system_sleep(void)
 {
-        freezer_do_not_count();
+        current->flags |= PF_FREEZER_SKIP;
         mutex_lock(&pm_mutex);
 }
 
 static inline void unlock_system_sleep(void)
 {
+        /*
+         * Don't use freezer_count() because we don't want the call to
+         * try_to_freeze() here.
+         *
+         * Reason:
+         * Fundamentally, we just don't need it, because freezing condition
+         * doesn't come into effect until we release the pm_mutex lock,
+         * since the freezer always works with pm_mutex held.
+         *
+         * More importantly, in the case of hibernation,
+         * unlock_system_sleep() gets called in snapshot_read() and
+         * snapshot_write() when the freezing condition is still in effect.
+         * Which means, if we use try_to_freeze() here, it would make them
+         * enter the refrigerator, thus causing hibernation to lockup.
+         */
+        current->flags &= ~PF_FREEZER_SKIP;
         mutex_unlock(&pm_mutex);
-        freezer_count();
 }
 
 #else /* !CONFIG_PM_SLEEP */
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 06061a7f8e69..3e60228e7299 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -273,7 +273,7 @@ static inline int zone_reclaim(struct zone *z, gfp_t mask, unsigned int order)
 #endif
 
 extern int page_evictable(struct page *page, struct vm_area_struct *vma);
-extern void scan_mapping_unevictable_pages(struct address_space *);
+extern void check_move_unevictable_pages(struct page **, int nr_pages);
 
 extern unsigned long scan_unevictable_pages;
 extern int scan_unevictable_handler(struct ctl_table *, int,
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 515669fa3c1d..8ec1153ff57b 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -624,7 +624,7 @@ asmlinkage long sys_socketpair(int, int, int, int __user *);
 asmlinkage long sys_socketcall(int call, unsigned long __user *args);
 asmlinkage long sys_listen(int, int);
 asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds,
-                                long timeout);
+                                int timeout);
 asmlinkage long sys_select(int n, fd_set __user *inp, fd_set __user *outp,
                         fd_set __user *exp, struct timeval __user *tvp);
 asmlinkage long sys_old_select(struct sel_arg_struct __user *arg);
diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h
deleted file mode 100644
index 20f63d3e6144..000000000000
--- a/include/linux/sysdev.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- * System devices follow a slightly different driver model. 
- * They don't need to do dynammic driver binding, can't be probed, 
- * and don't reside on any type of peripheral bus. 
- * So, we represent and treat them a little differently.
- * 
- * We still have a notion of a driver for a system device, because we still
- * want to perform basic operations on these devices. 
- *
- * We also support auxiliary drivers binding to devices of a certain class.
- * 
- * This allows configurable drivers to register themselves for devices of
- * a certain type. And, it allows class definitions to reside in generic
- * code while arch-specific code can register specific drivers.
- *
- * Auxiliary drivers registered with a NULL cls are registered as drivers
- * for all system devices, and get notification calls for each device. 
- */
-
-
-#ifndef _SYSDEV_H_
-#define _SYSDEV_H_
-
-#include <linux/kobject.h>
-#include <linux/pm.h>
-
-
-struct sys_device;
-struct sysdev_class_attribute;
-
-struct sysdev_class {
-        const char *name;
-        struct list_head        drivers;
-        struct sysdev_class_attribute **attrs;
-        struct kset             kset;
-};
-
-struct sysdev_class_attribute {
-        struct attribute attr;
-        ssize_t (*show)(struct sysdev_class *, struct sysdev_class_attribute *,
-                        char *);
-        ssize_t (*store)(struct sysdev_class *, struct sysdev_class_attribute *,
-                         const char *, size_t);
-};
-
-#define _SYSDEV_CLASS_ATTR(_name,_mode,_show,_store)            \
-{                                                               \
-        .attr = {.name = __stringify(_name), .mode = _mode },   \
-        .show   = _show,                                        \
-        .store  = _store,                                       \
-}
-
-#define SYSDEV_CLASS_ATTR(_name,_mode,_show,_store)             \
-        struct sysdev_class_attribute attr_##_name =            \
-                _SYSDEV_CLASS_ATTR(_name,_mode,_show,_store)
-
-
-extern int sysdev_class_register(struct sysdev_class *);
-extern void sysdev_class_unregister(struct sysdev_class *);
-
-extern int sysdev_class_create_file(struct sysdev_class *,
-        struct sysdev_class_attribute *);
-extern void sysdev_class_remove_file(struct sysdev_class *,
-        struct sysdev_class_attribute *);
-/**
- * Auxiliary system device drivers.
- */
-
-struct sysdev_driver {
-        struct list_head        entry;
-        int     (*add)(struct sys_device *);
-        int     (*remove)(struct sys_device *);
-};
-
-
-extern int sysdev_driver_register(struct sysdev_class *, struct sysdev_driver *);
-extern void sysdev_driver_unregister(struct sysdev_class *, struct sysdev_driver *);
-
-
-/**
- * sys_devices can be simplified a lot from regular devices, because they're
- * simply not as versatile. 
- */
-
-struct sys_device {
-        u32             id;
-        struct sysdev_class     * cls;
-        struct kobject          kobj;
-};
-
-extern int sysdev_register(struct sys_device *);
-extern void sysdev_unregister(struct sys_device *);
-
-
-struct sysdev_attribute { 
-        struct attribute        attr;
-        ssize_t (*show)(struct sys_device *, struct sysdev_attribute *, char *);
-        ssize_t (*store)(struct sys_device *, struct sysdev_attribute *,
-                         const char *, size_t);
-};
-
-
-#define _SYSDEV_ATTR(_name, _mode, _show, _store)               \
-{                                                               \
-        .attr = { .name = __stringify(_name), .mode = _mode },  \
-        .show   = _show,                                        \
-        .store  = _store,                                       \
-}
-
-#define SYSDEV_ATTR(_name, _mode, _show, _store)                \
-        struct sysdev_attribute attr_##_name =                  \
-                _SYSDEV_ATTR(_name, _mode, _show, _store);
-
-extern int sysdev_create_file(struct sys_device *, struct sysdev_attribute *);
-extern void sysdev_remove_file(struct sys_device *, struct sysdev_attribute *);
-
-/* Create/remove NULL terminated attribute list */
-static inline int
-sysdev_create_files(struct sys_device *d, struct sysdev_attribute **a)
-{
-        return sysfs_create_files(&d->kobj, (const struct attribute **)a);
-}
-
-static inline void
-sysdev_remove_files(struct sys_device *d, struct sysdev_attribute **a)
-{
-        return sysfs_remove_files(&d->kobj, (const struct attribute **)a);
-}
-
-struct sysdev_ext_attribute {
-        struct sysdev_attribute attr;
-        void *var;
-};
-
-/*
- * Support for simple variable sysdev attributes.
- * The pointer to the variable is stored in a sysdev_ext_attribute
- */
-
-/* Add more types as needed */
-
-extern ssize_t sysdev_show_ulong(struct sys_device *, struct sysdev_attribute *,
-                                char *);
-extern ssize_t sysdev_store_ulong(struct sys_device *,
-                        struct sysdev_attribute *, const char *, size_t);
-extern ssize_t sysdev_show_int(struct sys_device *, struct sysdev_attribute *,
-                                char *);
-extern ssize_t sysdev_store_int(struct sys_device *,
-                        struct sysdev_attribute *, const char *, size_t);
-
-#define _SYSDEV_ULONG_ATTR(_name, _mode, _var)                          \
-        { _SYSDEV_ATTR(_name, _mode, sysdev_show_ulong, sysdev_store_ulong), \
-          &(_var) }
-#define SYSDEV_ULONG_ATTR(_name, _mode, _var)                   \
-        struct sysdev_ext_attribute attr_##_name =              \
-                _SYSDEV_ULONG_ATTR(_name, _mode, _var);
-#define _SYSDEV_INT_ATTR(_name, _mode, _var)                            \
-        { _SYSDEV_ATTR(_name, _mode, sysdev_show_int, sysdev_store_int), \
-          &(_var) }
-#define SYSDEV_INT_ATTR(_name, _mode, _var)                     \
-        struct sysdev_ext_attribute attr_##_name =              \
-                _SYSDEV_INT_ATTR(_name, _mode, _var);
-
-#endif /* _SYSDEV_H_ */
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 47b4a27e6e97..796f1ff0388c 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -152,9 +152,9 @@ struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
 void thermal_cooling_device_unregister(struct thermal_cooling_device *);
 
 #ifdef CONFIG_NET
-extern int generate_netlink_event(u32 orig, enum events event);
+extern int thermal_generate_netlink_event(u32 orig, enum events event);
 #else
-static inline int generate_netlink_event(u32 orig, enum events event)
+static inline int thermal_generate_netlink_event(u32 orig, enum events event)
 {
         return 0;
 }
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 27a4e16d2bf1..69d845739bc2 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1073,6 +1073,7 @@ typedef void (*usb_complete_t)(struct urb *);
  *      which the host controller driver should use in preference to the
  *      transfer_buffer.
  * @sg: scatter gather buffer list
+ * @num_mapped_sgs: (internal) number of mapped sg entries
  * @num_sgs: number of entries in the sg list
  * @transfer_buffer_length: How big is transfer_buffer.  The transfer may
  *      be broken up into chunks according to the current maximum packet
diff --git a/include/linux/usb/ch11.h b/include/linux/usb/ch11.h
index 31fdb4c6ee3d..0b83acd3360a 100644
--- a/include/linux/usb/ch11.h
+++ b/include/linux/usb/ch11.h
@@ -61,12 +61,6 @@
 #define USB_PORT_FEAT_TEST              21
 #define USB_PORT_FEAT_INDICATOR         22
 #define USB_PORT_FEAT_C_PORT_L1         23
-#define USB_PORT_FEAT_C_PORT_LINK_STATE 25
-#define USB_PORT_FEAT_C_PORT_CONFIG_ERROR 26
-#define USB_PORT_FEAT_PORT_REMOTE_WAKE_MASK 27
-#define USB_PORT_FEAT_BH_PORT_RESET     28
-#define USB_PORT_FEAT_C_BH_PORT_RESET   29
-#define USB_PORT_FEAT_FORCE_LINKPM_ACCEPT 30
 
 /*
  * Port feature selectors added by USB 3.0 spec.
@@ -75,8 +69,8 @@
 #define USB_PORT_FEAT_LINK_STATE                5
 #define USB_PORT_FEAT_U1_TIMEOUT                23
 #define USB_PORT_FEAT_U2_TIMEOUT                24
-#define USB_PORT_FEAT_C_LINK_STATE              25
-#define USB_PORT_FEAT_C_CONFIG_ERR              26
+#define USB_PORT_FEAT_C_PORT_LINK_STATE         25
+#define USB_PORT_FEAT_C_PORT_CONFIG_ERROR       26
 #define USB_PORT_FEAT_REMOTE_WAKE_MASK          27
 #define USB_PORT_FEAT_BH_PORT_RESET             28
 #define USB_PORT_FEAT_C_BH_PORT_RESET           29
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index 61b29057b054..3b6f628880f8 100644
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -589,7 +589,7 @@ static inline int usb_endpoint_is_isoc_out(
  */
 static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
 {
-        return le16_to_cpu(epd->wMaxPacketSize);
+        return __le16_to_cpu(epd->wMaxPacketSize);
 }
 
 /*-------------------------------------------------------------------------*/
diff --git a/include/linux/usb/langwell_otg.h b/include/linux/usb/langwell_otg.h
deleted file mode 100644
index 51f17b16d312..000000000000
--- a/include/linux/usb/langwell_otg.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Intel Langwell USB OTG transceiver driver
- * Copyright (C) 2008 - 2010, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef __LANGWELL_OTG_H
-#define __LANGWELL_OTG_H
-
-#include <linux/usb/intel_mid_otg.h>
-
-#define CI_USBCMD               0x30
-#       define USBCMD_RST               BIT(1)
-#       define USBCMD_RS                BIT(0)
-#define CI_USBSTS               0x34
-#       define USBSTS_SLI               BIT(8)
-#       define USBSTS_URI               BIT(6)
-#       define USBSTS_PCI               BIT(2)
-#define CI_PORTSC1              0x74
-#       define PORTSC_PP                BIT(12)
-#       define PORTSC_LS                (BIT(11) | BIT(10))
-#       define PORTSC_SUSP              BIT(7)
-#       define PORTSC_CCS               BIT(0)
-#define CI_HOSTPC1              0xb4
-#       define HOSTPC1_PHCD             BIT(22)
-#define CI_OTGSC                0xf4
-#       define OTGSC_DPIE               BIT(30)
-#       define OTGSC_1MSE               BIT(29)
-#       define OTGSC_BSEIE              BIT(28)
-#       define OTGSC_BSVIE              BIT(27)
-#       define OTGSC_ASVIE              BIT(26)
-#       define OTGSC_AVVIE              BIT(25)
-#       define OTGSC_IDIE               BIT(24)
-#       define OTGSC_DPIS               BIT(22)
-#       define OTGSC_1MSS               BIT(21)
-#       define OTGSC_BSEIS              BIT(20)
-#       define OTGSC_BSVIS              BIT(19)
-#       define OTGSC_ASVIS              BIT(18)
-#       define OTGSC_AVVIS              BIT(17)
-#       define OTGSC_IDIS               BIT(16)
-#       define OTGSC_DPS                BIT(14)
-#       define OTGSC_1MST               BIT(13)
-#       define OTGSC_BSE                BIT(12)
-#       define OTGSC_BSV                BIT(11)
-#       define OTGSC_ASV                BIT(10)
-#       define OTGSC_AVV                BIT(9)
-#       define OTGSC_ID                 BIT(8)
-#       define OTGSC_HABA               BIT(7)
-#       define OTGSC_HADP               BIT(6)
-#       define OTGSC_IDPU               BIT(5)
-#       define OTGSC_DP                 BIT(4)
-#       define OTGSC_OT                 BIT(3)
-#       define OTGSC_HAAR               BIT(2)
-#       define OTGSC_VC                 BIT(1)
-#       define OTGSC_VD                 BIT(0)
-#       define OTGSC_INTEN_MASK         (0x7f << 24)
-#       define OTGSC_INT_MASK           (0x5f << 24)
-#       define OTGSC_INTSTS_MASK        (0x7f << 16)
-#define CI_USBMODE              0xf8
-#       define USBMODE_CM               (BIT(1) | BIT(0))
-#       define USBMODE_IDLE             0
-#       define USBMODE_DEVICE           0x2
-#       define USBMODE_HOST             0x3
-#define USBCFG_ADDR                     0xff10801c
-#define USBCFG_LEN                      4
-#       define USBCFG_VBUSVAL           BIT(14)
-#       define USBCFG_AVALID            BIT(13)
-#       define USBCFG_BVALID            BIT(12)
-#       define USBCFG_SESEND            BIT(11)
-
-#define INTR_DUMMY_MASK (USBSTS_SLI | USBSTS_URI | USBSTS_PCI)
-
-enum langwell_otg_timer_type {
-        TA_WAIT_VRISE_TMR,
-        TA_WAIT_BCON_TMR,
-        TA_AIDL_BDIS_TMR,
-        TB_ASE0_BRST_TMR,
-        TB_SE0_SRP_TMR,
-        TB_SRP_INIT_TMR,
-        TB_SRP_FAIL_TMR,
-        TB_BUS_SUSPEND_TMR
-};
-
-#define TA_WAIT_VRISE   100
-#define TA_WAIT_BCON    30000
-#define TA_AIDL_BDIS    15000
-#define TB_ASE0_BRST    5000
-#define TB_SE0_SRP      2
-#define TB_SRP_INIT     100
-#define TB_SRP_FAIL     5500
-#define TB_BUS_SUSPEND  500
-
-struct langwell_otg_timer {
-        unsigned long expires;  /* Number of count increase to timeout */
-        unsigned long count;    /* Tick counter */
-        void (*function)(unsigned long);        /* Timeout function */
-        unsigned long data;     /* Data passed to function */
-        struct list_head list;
-};
-
-struct langwell_otg {
-        struct intel_mid_otg_xceiv      iotg;
-        struct device                   *dev;
-
-        void __iomem                    *usbcfg;        /* SCCBUSB config Reg */
-
-        unsigned                        region;
-        unsigned                        cfg_region;
-
-        struct work_struct              work;
-        struct workqueue_struct         *qwork;
-        struct timer_list               hsm_timer;
-
-        spinlock_t                      lock;
-        spinlock_t                      wq_lock;
-
-        struct notifier_block           iotg_notifier;
-};
-
-static inline
-struct langwell_otg *mid_xceiv_to_lnw(struct intel_mid_otg_xceiv *iotg)
-{
-        return container_of(iotg, struct langwell_otg, iotg);
-}
-
-#endif /* __LANGWELL_OTG_H__ */
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 5b2fed5eebf2..00596e816b4d 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1388,6 +1388,6 @@ struct hci_inquiry_req {
 };
 #define IREQ_CACHE_FLUSH 0x0001
 
-extern int enable_hs;
+extern bool enable_hs;
 
 #endif /* __HCI_H */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 15f4be7d768e..a067d30ce73e 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1140,6 +1140,7 @@ struct cfg80211_disassoc_request {
  * @bssid: Fixed BSSID requested, maybe be %NULL, if set do not
  *      search for IBSSs with a different BSSID.
  * @channel: The channel to use if no IBSS can be found to join.
+ * @channel_type: channel type (HT mode)
  * @channel_fixed: The channel should be fixed -- do not search for
  *      IBSSs to join on other channels.
  * @ie: information element(s) to include in the beacon
@@ -1978,6 +1979,11 @@ struct wiphy_wowlan_support {
  *      configured as RX antennas. Antenna configuration commands will be
  *      rejected unless this or @available_antennas_tx is set.
  *
+ * @probe_resp_offload:
+ *       Bitmap of supported protocols for probe response offloading.
+ *       See &enum nl80211_probe_resp_offload_support_attr. Only valid
+ *       when the wiphy flag @WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD is set.
+ *
  * @max_remain_on_channel_duration: Maximum time a remain-on-channel operation
  *      may request, if implemented.
  *
diff --git a/include/net/flow.h b/include/net/flow.h
index 9b582437fbea..6c469dbdb917 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -93,6 +93,16 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
         fl4->fl4_dport = dport;
         fl4->fl4_sport = sport;
 }
+
+/* Reset some input parameters after previous lookup */
+static inline void flowi4_update_output(struct flowi4 *fl4, int oif, __u8 tos,
+                                        __be32 daddr, __be32 saddr)
+{
+        fl4->flowi4_oif = oif;
+        fl4->flowi4_tos = tos;
+        fl4->daddr = daddr;
+        fl4->saddr = saddr;
+}
                                       
 
 struct flowi6 {
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h
index 3419bf5cd154..d55f43443335 100644
--- a/include/net/netns/generic.h
+++ b/include/net/netns/generic.h
@@ -41,6 +41,7 @@ static inline void *net_generic(const struct net *net, int id)
         ptr = ng->ptr[id - 1];
         rcu_read_unlock();
 
+        BUG_ON(!ptr);
         return ptr;
 }
 #endif
diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
index e503b87c4c1b..d58fdec47597 100644
--- a/include/net/netprio_cgroup.h
+++ b/include/net/netprio_cgroup.h
@@ -13,7 +13,6 @@
 
 #ifndef _NETPRIO_CGROUP_H
 #define _NETPRIO_CGROUP_H
-#include <linux/module.h>
 #include <linux/cgroup.h>
 #include <linux/hardirq.h>
 #include <linux/rcupdate.h>
@@ -38,19 +37,51 @@ extern int net_prio_subsys_id;
 
 extern void sock_update_netprioidx(struct sock *sk);
 
-static inline struct cgroup_netprio_state
-                *task_netprio_state(struct task_struct *p)
+#if IS_BUILTIN(CONFIG_NETPRIO_CGROUP)
+
+static inline u32 task_netprioidx(struct task_struct *p)
 {
-#if IS_ENABLED(CONFIG_NETPRIO_CGROUP)
-        return container_of(task_subsys_state(p, net_prio_subsys_id),
-                            struct cgroup_netprio_state, css);
-#else
-        return NULL;
-#endif
+        struct cgroup_netprio_state *state;
+        u32 idx;
+
+        rcu_read_lock();
+        state = container_of(task_subsys_state(p, net_prio_subsys_id),
+                             struct cgroup_netprio_state, css);
+        idx = state->prioidx;
+        rcu_read_unlock();
+        return idx;
+}
+
+#elif IS_MODULE(CONFIG_NETPRIO_CGROUP)
+
+static inline u32 task_netprioidx(struct task_struct *p)
+{
+        struct cgroup_netprio_state *state;
+        int subsys_id;
+        u32 idx = 0;
+
+        rcu_read_lock();
+        subsys_id = rcu_dereference_index_check(net_prio_subsys_id,
+                                                rcu_read_lock_held());
+        if (subsys_id >= 0) {
+                state = container_of(task_subsys_state(p, subsys_id),
+                                     struct cgroup_netprio_state, css);
+                idx = state->prioidx;
+        }
+        rcu_read_unlock();
+        return idx;
 }
 
 #else
 
+static inline u32 task_netprioidx(struct task_struct *p)
+{
+        return 0;
+}
+
+#endif /* CONFIG_NETPRIO_CGROUP */
+
+#else
 #define sock_update_netprioidx(sk)
 #endif
 
diff --git a/include/net/route.h b/include/net/route.h
index 91855d185b53..b1c0d5b564c2 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -270,6 +270,7 @@ static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
                 if (IS_ERR(rt))
                         return rt;
                 ip_rt_put(rt);
+                flowi4_update_output(fl4, oif, tos, fl4->daddr, fl4->saddr);
         }
         security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
         return ip_route_output_flow(net, fl4, sk);
@@ -284,6 +285,9 @@ static inline struct rtable *ip_route_newports(struct flowi4 *fl4, struct rtable
                 fl4->fl4_dport = dport;
                 fl4->fl4_sport = sport;
                 ip_rt_put(rt);
+                flowi4_update_output(fl4, sk->sk_bound_dev_if,
+                                     RT_CONN_FLAGS(sk), fl4->daddr,
+                                     fl4->saddr);
                 security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
                 return ip_route_output_flow(sock_net(sk), fl4, sk);
         }
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index f6bb08b73ca4..55ce96b53b09 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -220,9 +220,16 @@ struct tcf_proto {
 
 struct qdisc_skb_cb {
         unsigned int            pkt_len;
-        long                    data[];
+        unsigned char           data[24];
 };
 
+static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz)
+{
+        struct qdisc_skb_cb *qcb;
+        BUILD_BUG_ON(sizeof(skb->cb) < sizeof(unsigned int) + sz);
+        BUILD_BUG_ON(sizeof(qcb->data) < sz);
+}
+
 static inline int qdisc_qlen(const struct Qdisc *q)
 {
         return q->q.qlen;
diff --git a/include/net/sock.h b/include/net/sock.h
index bb972d254dff..91c1c8baf020 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -55,6 +55,7 @@
 #include <linux/uaccess.h>
 #include <linux/memcontrol.h>
 #include <linux/res_counter.h>
+#include <linux/jump_label.h>
 
 #include <linux/filter.h>
 #include <linux/rculist_nulls.h>
@@ -226,6 +227,7 @@ struct cg_proto;
   *     @sk_ack_backlog: current listen backlog
   *     @sk_max_ack_backlog: listen backlog set in listen()
   *     @sk_priority: %SO_PRIORITY setting
+  *     @sk_cgrp_prioidx: socket group's priority map index
   *     @sk_type: socket type (%SOCK_STREAM, etc)
   *     @sk_protocol: which protocol this socket belongs in this network family
   *     @sk_peer_pid: &struct pid for this socket's peer
@@ -921,7 +923,7 @@ inline void sk_refcnt_debug_release(const struct sock *sk)
 #define sk_refcnt_debug_release(sk) do { } while (0)
 #endif /* SOCK_REFCNT_DEBUG */
 
-#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
+#if defined(CONFIG_CGROUP_MEM_RES_CTLR_KMEM) && defined(CONFIG_NET)
 extern struct jump_label_key memcg_socket_limit_enabled;
 static inline struct cg_proto *parent_cg_proto(struct proto *proto,
                                                struct cg_proto *cg_proto)
@@ -1007,9 +1009,8 @@ static inline void memcg_memory_allocated_add(struct cg_proto *prot,
         struct res_counter *fail;
         int ret;
 
-        ret = res_counter_charge(prot->memory_allocated,
-                                 amt << PAGE_SHIFT, &fail);
-
+        ret = res_counter_charge_nofail(prot->memory_allocated,
+                                        amt << PAGE_SHIFT, &fail);
         if (ret < 0)
                 *parent_status = OVER_LIMIT;
 }
@@ -1053,12 +1054,11 @@ sk_memory_allocated_add(struct sock *sk, int amt, int *parent_status)
 }
 
 static inline void
-sk_memory_allocated_sub(struct sock *sk, int amt, int parent_status)
+sk_memory_allocated_sub(struct sock *sk, int amt)
 {
         struct proto *prot = sk->sk_prot;
 
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp &&
-            parent_status != OVER_LIMIT) /* Otherwise was uncharged already */
+        if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
                 memcg_memory_allocated_sub(sk->sk_cgrp, amt);
 
         atomic_long_sub(amt, prot->memory_allocated);
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 0118ea999f67..42c29bfbcee3 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -273,6 +273,14 @@ static inline int between(__u32 seq1, __u32 seq2, __u32 seq3)
         return seq3 - seq2 >= seq1 - seq2;
 }
 
+static inline bool tcp_out_of_memory(struct sock *sk)
+{
+        if (sk->sk_wmem_queued > SOCK_MIN_SNDBUF &&
+            sk_memory_allocated(sk) > sk_prot_mem_limits(sk, 2))
+                return true;
+        return false;
+}
+
 static inline bool tcp_too_many_orphans(struct sock *sk, int shift)
 {
         struct percpu_counter *ocp = sk->sk_prot->orphan_count;
@@ -283,13 +291,11 @@ static inline bool tcp_too_many_orphans(struct sock *sk, int shift)
                 if (orphans << shift > sysctl_tcp_max_orphans)
                         return true;
         }
-
-        if (sk->sk_wmem_queued > SOCK_MIN_SNDBUF &&
-            sk_memory_allocated(sk) > sk_prot_mem_limits(sk, 2))
-                return true;
         return false;
 }
 
+extern bool tcp_check_oom(struct sock *sk, int shift);
+
 /* syncookies: remember time of last synqueue overflow */
 static inline void tcp_synq_overflow(struct sock *sk)
 {
@@ -311,6 +317,8 @@ extern struct proto tcp_prot;
 #define TCP_ADD_STATS_USER(net, field, val) SNMP_ADD_STATS_USER((net)->mib.tcp_statistics, field, val)
 #define TCP_ADD_STATS(net, field, val)  SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val)
 
+extern void tcp_init_mem(struct net *net);
+
 extern void tcp_v4_err(struct sk_buff *skb, u32);
 
 extern void tcp_shutdown (struct sock *sk, int how);
diff --git a/include/sound/core.h b/include/sound/core.h
index 5ab255f196cc..cea1b5426dfa 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -417,6 +417,7 @@ static inline int __snd_bug_on(int cond)
 #define gameport_get_port_data(gp) (gp)->port_data
 #endif
 
+#ifdef CONFIG_PCI
 /* PCI quirk list helper */
 struct snd_pci_quirk {
         unsigned short subvendor;       /* PCI subvendor ID */
@@ -456,5 +457,6 @@ snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list);
 const struct snd_pci_quirk *
 snd_pci_quirk_lookup_id(u16 vendor, u16 device,
                         const struct snd_pci_quirk *list);
+#endif
 
 #endif /* __SOUND_CORE_H */
diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h
index 4866499bdeeb..e5e6ff98f0fa 100644
--- a/include/target/target_core_backend.h
+++ b/include/target/target_core_backend.h
@@ -59,7 +59,7 @@ int	transport_set_vpd_ident_type(struct t10_vpd *, unsigned char *);
 int     transport_set_vpd_ident(struct t10_vpd *, unsigned char *);
 
 /* core helpers also used by command snooping in pscsi */
-void    *transport_kmap_first_data_page(struct se_cmd *);
-void    transport_kunmap_first_data_page(struct se_cmd *);
+void    *transport_kmap_data_sg(struct se_cmd *);
+void    transport_kunmap_data_sg(struct se_cmd *);
 
 #endif /* TARGET_CORE_BACKEND_H */
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index daf532bc721a..dc4e345a0163 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -582,6 +582,7 @@ struct se_cmd {
 
         struct scatterlist      *t_data_sg;
         unsigned int            t_data_nents;
+        void                    *t_data_vmap;
         struct scatterlist      *t_bidi_data_sg;
         unsigned int            t_bidi_data_nents;
 
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 523e8bc104d4..d36fad317e78 100644
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -114,7 +114,7 @@ void	transport_init_se_cmd(struct se_cmd *, struct target_core_fabric_ops *,
                 struct se_session *, u32, int, int, unsigned char *);
 int     transport_lookup_cmd_lun(struct se_cmd *, u32);
 int     transport_generic_allocate_tasks(struct se_cmd *, unsigned char *);
-int     target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,
+void    target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,
                 unsigned char *, u32, u32, int, int, int);
 int     transport_handle_cdb_direct(struct se_cmd *);
 int     transport_generic_handle_cdb_map(struct se_cmd *);
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 8588a8918023..5973410e8f8c 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -47,7 +47,10 @@ DECLARE_EVENT_CLASS(writeback_work_class,
                 __field(int, reason)
         ),
         TP_fast_assign(
-                strncpy(__entry->name, dev_name(bdi->dev), 32);
+                struct device *dev = bdi->dev;
+                if (!dev)
+                        dev = default_backing_dev_info.dev;
+                strncpy(__entry->name, dev_name(dev), 32);
                 __entry->nr_pages = work->nr_pages;
                 __entry->sb_dev = work->sb ? work->sb->s_dev : 0;
                 __entry->sync_mode = work->sync_mode;
@@ -426,7 +429,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,
 
         TP_fast_assign(
                 strncpy(__entry->name,
-                        dev_name(inode->i_mapping->backing_dev_info->dev), 32);
+                        dev_name(inode_to_bdi(inode)->dev), 32);
                 __entry->ino            = inode->i_ino;
                 __entry->state          = inode->i_state;
                 __entry->dirtied_when   = inode->dirtied_when;
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 062b3b24ff10..483f67caa7ad 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -590,6 +590,11 @@ struct omap_dss_device {
         int (*get_backlight)(struct omap_dss_device *dssdev);
 };
 
+struct omap_dss_hdmi_data
+{
+        int hpd_gpio;
+};
+
 struct omap_dss_driver {
         struct device_driver driver;
 
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 9b7c8ab7d75c..86ee272de210 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -128,7 +128,6 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
 
         if (S_ISREG(mode)) {
                 struct mqueue_inode_info *info;
-                struct task_struct *p = current;
                 unsigned long mq_bytes, mq_msg_tblsz;
 
                 inode->i_fop = &mqueue_file_operations;
@@ -159,7 +158,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
 
                 spin_lock(&mq_lock);
                 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
-                    u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
+                    u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
                         spin_unlock(&mq_lock);
                         /* mqueue_evict_inode() releases info->messages */
                         ret = -EMFILE;
diff --git a/ipc/shm.c b/ipc/shm.c
index 02ecf2c078fc..b76be5bda6c2 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -870,9 +870,7 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int, cmd, struct shmid_ds __user *, buf)
         case SHM_LOCK:
         case SHM_UNLOCK:
         {
-                struct file *uninitialized_var(shm_file);
-
-                lru_add_drain_all();  /* drain pagevecs to lru lists */
+                struct file *shm_file;
 
                 shp = shm_lock_check(ns, shmid);
                 if (IS_ERR(shp)) {
@@ -895,22 +893,31 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int, cmd, struct shmid_ds __user *, buf)
                 err = security_shm_shmctl(shp, cmd);
                 if (err)
                         goto out_unlock;
-                
-                if(cmd==SHM_LOCK) {
+
+                shm_file = shp->shm_file;
+                if (is_file_hugepages(shm_file))
+                        goto out_unlock;
+
+                if (cmd == SHM_LOCK) {
                         struct user_struct *user = current_user();
-                        if (!is_file_hugepages(shp->shm_file)) {
-                                err = shmem_lock(shp->shm_file, 1, user);
-                                if (!err && !(shp->shm_perm.mode & SHM_LOCKED)){
-                                        shp->shm_perm.mode |= SHM_LOCKED;
-                                        shp->mlock_user = user;
-                                }
+                        err = shmem_lock(shm_file, 1, user);
+                        if (!err && !(shp->shm_perm.mode & SHM_LOCKED)) {
+                                shp->shm_perm.mode |= SHM_LOCKED;
+                                shp->mlock_user = user;
                         }
-                } else if (!is_file_hugepages(shp->shm_file)) {
-                        shmem_lock(shp->shm_file, 0, shp->mlock_user);
-                        shp->shm_perm.mode &= ~SHM_LOCKED;
-                        shp->mlock_user = NULL;
+                        goto out_unlock;
                 }
+
+                /* SHM_UNLOCK */
+                if (!(shp->shm_perm.mode & SHM_LOCKED))
+                        goto out_unlock;
+                shmem_lock(shm_file, 0, shp->mlock_user);
+                shp->shm_perm.mode &= ~SHM_LOCKED;
+                shp->mlock_user = NULL;
+                get_file(shm_file);
                 shm_unlock(shp);
+                shmem_unlock_mapping(shm_file->f_mapping);
+                fput(shm_file);
                 goto out;
         }
         case IPC_RMID:
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index caaea6e944f8..af1de0f34eae 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1863,11 +1863,12 @@ void __audit_syscall_entry(int arch, int major,
 
 /**
  * audit_syscall_exit - deallocate audit context after a system call
- * @pt_regs: syscall registers
+ * @success: success value of the syscall
+ * @return_code: return value of the syscall
  *
  * Tear down after system call.  If the audit context has been marked as
  * auditable (either because of the AUDIT_RECORD_CONTEXT state from
- * filtering, or because some other part of the kernel write an audit
+ * filtering, or because some other part of the kernel wrote an audit
  * message), then write out the syscall information.  In call cases,
  * free the names stored from getname().
  */
diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index 057e24b665cf..6581a040f399 100644
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -115,8 +115,6 @@ int get_callchain_buffers(void)
         }
 
         err = alloc_callchain_buffers();
-        if (err)
-                release_callchain_buffers();
 exit:
         mutex_unlock(&callchain_mutex);
 
diff --git a/kernel/events/core.c b/kernel/events/core.c
index a8f4ac001a00..1b5c081d8b9f 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -815,7 +815,7 @@ static void update_event_times(struct perf_event *event)
          * here.
          */
         if (is_cgroup_event(event))
-                run_end = perf_event_time(event);
+                run_end = perf_cgroup_event_time(event);
         else if (ctx->is_active)
                 run_end = ctx->time;
         else
@@ -2300,7 +2300,10 @@ do {					\
         return div64_u64(dividend, divisor);
 }
 
-static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count)
+static DEFINE_PER_CPU(int, perf_throttled_count);
+static DEFINE_PER_CPU(u64, perf_throttled_seq);
+
+static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count, bool disable)
 {
         struct hw_perf_event *hwc = &event->hw;
         s64 period, sample_period;
@@ -2319,22 +2322,40 @@ static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count)
         hwc->sample_period = sample_period;
 
         if (local64_read(&hwc->period_left) > 8*sample_period) {
-                event->pmu->stop(event, PERF_EF_UPDATE);
+                if (disable)
+                        event->pmu->stop(event, PERF_EF_UPDATE);
+
                 local64_set(&hwc->period_left, 0);
-                event->pmu->start(event, PERF_EF_RELOAD);
+
+                if (disable)
+                        event->pmu->start(event, PERF_EF_RELOAD);
         }
 }
 
-static void perf_ctx_adjust_freq(struct perf_event_context *ctx, u64 period)
+/*
+ * combine freq adjustment with unthrottling to avoid two passes over the
+ * events. At the same time, make sure, having freq events does not change
+ * the rate of unthrottling as that would introduce bias.
+ */
+static void perf_adjust_freq_unthr_context(struct perf_event_context *ctx,
+                                           int needs_unthr)
 {
         struct perf_event *event;
         struct hw_perf_event *hwc;
-        u64 interrupts, now;
+        u64 now, period = TICK_NSEC;
         s64 delta;
 
-        if (!ctx->nr_freq)
+        /*
+         * only need to iterate over all events iff:
+         * - context have events in frequency mode (needs freq adjust)
+         * - there are events to unthrottle on this cpu
+         */
+        if (!(ctx->nr_freq || needs_unthr))
                 return;
 
+        raw_spin_lock(&ctx->lock);
+        perf_pmu_disable(ctx->pmu);
+
         list_for_each_entry_rcu(event, &ctx->event_list, event_entry) {
                 if (event->state != PERF_EVENT_STATE_ACTIVE)
                         continue;
@@ -2344,13 +2365,8 @@ static void perf_ctx_adjust_freq(struct perf_event_context *ctx, u64 period)
 
                 hwc = &event->hw;
 
-                interrupts = hwc->interrupts;
-                hwc->interrupts = 0;
-
-                /*
-                 * unthrottle events on the tick
-                 */
-                if (interrupts == MAX_INTERRUPTS) {
+                if (needs_unthr && hwc->interrupts == MAX_INTERRUPTS) {
+                        hwc->interrupts = 0;
                         perf_log_throttle(event, 1);
                         event->pmu->start(event, 0);
                 }
@@ -2358,14 +2374,30 @@ static void perf_ctx_adjust_freq(struct perf_event_context *ctx, u64 period)
                 if (!event->attr.freq || !event->attr.sample_freq)
                         continue;
 
-                event->pmu->read(event);
+                /*
+                 * stop the event and update event->count
+                 */
+                event->pmu->stop(event, PERF_EF_UPDATE);
+
                 now = local64_read(&event->count);
                 delta = now - hwc->freq_count_stamp;
                 hwc->freq_count_stamp = now;
 
+                /*
+                 * restart the event
+                 * reload only if value has changed
+                 * we have stopped the event so tell that
+                 * to perf_adjust_period() to avoid stopping it
+                 * twice.
+                 */
                 if (delta > 0)
-                        perf_adjust_period(event, period, delta);
+                        perf_adjust_period(event, period, delta, false);
+
+                event->pmu->start(event, delta > 0 ? PERF_EF_RELOAD : 0);
         }
+
+        perf_pmu_enable(ctx->pmu);
+        raw_spin_unlock(&ctx->lock);
 }
 
 /*
@@ -2388,16 +2420,13 @@ static void rotate_ctx(struct perf_event_context *ctx)
  */
 static void perf_rotate_context(struct perf_cpu_context *cpuctx)
 {
-        u64 interval = (u64)cpuctx->jiffies_interval * TICK_NSEC;
         struct perf_event_context *ctx = NULL;
-        int rotate = 0, remove = 1, freq = 0;
+        int rotate = 0, remove = 1;
 
         if (cpuctx->ctx.nr_events) {
                 remove = 0;
                 if (cpuctx->ctx.nr_events != cpuctx->ctx.nr_active)
                         rotate = 1;
-                if (cpuctx->ctx.nr_freq)
-                        freq = 1;
         }
 
         ctx = cpuctx->task_ctx;
@@ -2405,37 +2434,26 @@ static void perf_rotate_context(struct perf_cpu_context *cpuctx)
                 remove = 0;
                 if (ctx->nr_events != ctx->nr_active)
                         rotate = 1;
-                if (ctx->nr_freq)
-                        freq = 1;
         }
 
-        if (!rotate && !freq)
+        if (!rotate)
                 goto done;
 
         perf_ctx_lock(cpuctx, cpuctx->task_ctx);
         perf_pmu_disable(cpuctx->ctx.pmu);
 
-        if (freq) {
-                perf_ctx_adjust_freq(&cpuctx->ctx, interval);
-                if (ctx)
-                        perf_ctx_adjust_freq(ctx, interval);
-        }
-
-        if (rotate) {
-                cpu_ctx_sched_out(cpuctx, EVENT_FLEXIBLE);
-                if (ctx)
-                        ctx_sched_out(ctx, cpuctx, EVENT_FLEXIBLE);
+        cpu_ctx_sched_out(cpuctx, EVENT_FLEXIBLE);
+        if (ctx)
+                ctx_sched_out(ctx, cpuctx, EVENT_FLEXIBLE);
 
-                rotate_ctx(&cpuctx->ctx);
-                if (ctx)
-                        rotate_ctx(ctx);
+        rotate_ctx(&cpuctx->ctx);
+        if (ctx)
+                rotate_ctx(ctx);
 
-                perf_event_sched_in(cpuctx, ctx, current);
-        }
+        perf_event_sched_in(cpuctx, ctx, current);
 
         perf_pmu_enable(cpuctx->ctx.pmu);
         perf_ctx_unlock(cpuctx, cpuctx->task_ctx);
-
 done:
         if (remove)
                 list_del_init(&cpuctx->rotation_list);
@@ -2445,10 +2463,22 @@ void perf_event_task_tick(void)
 {
         struct list_head *head = &__get_cpu_var(rotation_list);
         struct perf_cpu_context *cpuctx, *tmp;
+        struct perf_event_context *ctx;
+        int throttled;
 
         WARN_ON(!irqs_disabled());
 
+        __this_cpu_inc(perf_throttled_seq);
+        throttled = __this_cpu_xchg(perf_throttled_count, 0);
+
         list_for_each_entry_safe(cpuctx, tmp, head, rotation_list) {
+                ctx = &cpuctx->ctx;
+                perf_adjust_freq_unthr_context(ctx, throttled);
+
+                ctx = cpuctx->task_ctx;
+                if (ctx)
+                        perf_adjust_freq_unthr_context(ctx, throttled);
+
                 if (cpuctx->jiffies_interval == 1 ||
                                 !(jiffies % cpuctx->jiffies_interval))
                         perf_rotate_context(cpuctx);
@@ -4509,6 +4539,7 @@ static int __perf_event_overflow(struct perf_event *event,
 {
         int events = atomic_read(&event->event_limit);
         struct hw_perf_event *hwc = &event->hw;
+        u64 seq;
         int ret = 0;
 
         /*
@@ -4518,14 +4549,20 @@ static int __perf_event_overflow(struct perf_event *event,
         if (unlikely(!is_sampling_event(event)))
                 return 0;
 
-        if (unlikely(hwc->interrupts >= max_samples_per_tick)) {
-                if (throttle) {
+        seq = __this_cpu_read(perf_throttled_seq);
+        if (seq != hwc->interrupts_seq) {
+                hwc->interrupts_seq = seq;
+                hwc->interrupts = 1;
+        } else {
+                hwc->interrupts++;
+                if (unlikely(throttle
+                             && hwc->interrupts >= max_samples_per_tick)) {
+                        __this_cpu_inc(perf_throttled_count);
                         hwc->interrupts = MAX_INTERRUPTS;
                         perf_log_throttle(event, 0);
                         ret = 1;
                 }
-        } else
-                hwc->interrupts++;
+        }
 
         if (event->attr.freq) {
                 u64 now = perf_clock();
@@ -4534,7 +4571,7 @@ static int __perf_event_overflow(struct perf_event *event,
                 hwc->freq_time_stamp = now;
 
                 if (delta > 0 && delta < 2*TICK_NSEC)
-                        perf_adjust_period(event, delta, hwc->last_period);
+                        perf_adjust_period(event, delta, hwc->last_period, true);
         }
 
         /*
diff --git a/kernel/exit.c b/kernel/exit.c
index 294b1709170d..4b4042f9bc6a 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1038,6 +1038,22 @@ void do_exit(long code)
         if (tsk->nr_dirtied)
                 __this_cpu_add(dirty_throttle_leaks, tsk->nr_dirtied);
         exit_rcu();
+
+        /*
+         * The setting of TASK_RUNNING by try_to_wake_up() may be delayed
+         * when the following two conditions become true.
+         *   - There is race condition of mmap_sem (It is acquired by
+         *     exit_mm()), and
+         *   - SMI occurs before setting TASK_RUNINNG.
+         *     (or hypervisor of virtual machine switches to other guest)
+         *  As a result, we may become TASK_RUNNING after becoming TASK_DEAD
+         *
+         * To avoid it, we have to wait for releasing tsk->pi_lock which
+         * is held by try_to_wake_up()
+         */
+        smp_mb();
+        raw_spin_unlock_wait(&tsk->pi_lock);
+
         /* causes final put_task_struct in finish_task_switch(). */
         tsk->state = TASK_DEAD;
         tsk->flags |= PF_NOFREEZE;      /* tell freezer to ignore us */
diff --git a/kernel/fork.c b/kernel/fork.c
index 051f090d40c1..e2cd3e2a5ae8 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -66,6 +66,7 @@
 #include <linux/user-return-notifier.h>
 #include <linux/oom.h>
 #include <linux/khugepaged.h>
+#include <linux/signalfd.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
@@ -647,6 +648,26 @@ struct mm_struct *get_task_mm(struct task_struct *task)
 }
 EXPORT_SYMBOL_GPL(get_task_mm);
 
+struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
+{
+        struct mm_struct *mm;
+        int err;
+
+        err =  mutex_lock_killable(&task->signal->cred_guard_mutex);
+        if (err)
+                return ERR_PTR(err);
+
+        mm = get_task_mm(task);
+        if (mm && mm != current->mm &&
+                        !ptrace_may_access(task, mode)) {
+                mmput(mm);
+                mm = ERR_PTR(-EACCES);
+        }
+        mutex_unlock(&task->signal->cred_guard_mutex);
+
+        return mm;
+}
+
 /* Please note the differences between mmput and mm_release.
  * mmput is called whenever we stop holding onto a mm_struct,
  * error success whatever.
@@ -890,7 +911,7 @@ static int copy_io(unsigned long clone_flags, struct task_struct *tsk)
                         return -ENOMEM;
 
                 new_ioc->ioprio = ioc->ioprio;
-                put_io_context(new_ioc, NULL);
+                put_io_context(new_ioc);
         }
 #endif
         return 0;
@@ -915,8 +936,10 @@ static int copy_sighand(unsigned long clone_flags, struct task_struct *tsk)
 
 void __cleanup_sighand(struct sighand_struct *sighand)
 {
-        if (atomic_dec_and_test(&sighand->count))
+        if (atomic_dec_and_test(&sighand->count)) {
+                signalfd_cleanup(sighand);
                 kmem_cache_free(sighand_cachep, sighand);
+        }
 }
 
 
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 95dd7212e610..9788c0ec6f43 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1077,6 +1077,7 @@ void __kprobes kprobe_flush_task(struct task_struct *tk)
                 /* Early boot.  kretprobe_table_locks not yet initialized. */
                 return;
 
+        INIT_HLIST_HEAD(&empty_rp);
         hash = hash_ptr(tk, KPROBE_HASH_BITS);
         head = &kretprobe_inst_table[hash];
         kretprobe_table_lock(hash, &flags);
@@ -1085,7 +1086,6 @@ void __kprobes kprobe_flush_task(struct task_struct *tk)
                         recycle_rp_inst(ri, &empty_rp);
         }
         kretprobe_table_unlock(hash, &flags);
-        INIT_HLIST_HEAD(&empty_rp);
         hlist_for_each_entry_safe(ri, node, tmp, &empty_rp, hlist) {
                 hlist_del(&ri->hlist);
                 kfree(ri);
@@ -1673,8 +1673,12 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p,
                 ri->rp = rp;
                 ri->task = current;
 
-                if (rp->entry_handler && rp->entry_handler(ri, regs))
+                if (rp->entry_handler && rp->entry_handler(ri, regs)) {
+                        raw_spin_lock_irqsave(&rp->lock, flags);
+                        hlist_add_head(&ri->hlist, &rp->free_instances);
+                        raw_spin_unlock_irqrestore(&rp->lock, flags);
                         return 0;
+                }
 
                 arch_prepare_kretprobe(ri, regs);
 
diff --git a/kernel/params.c b/kernel/params.c
index 32ee04308285..4bc965d8a1fe 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -97,7 +97,8 @@ static int parse_one(char *param,
         for (i = 0; i < num_params; i++) {
                 if (parameq(param, params[i].name)) {
                         /* No one handled NULL, so do it here. */
-                        if (!val && params[i].ops->set != param_set_bool)
+                        if (!val && params[i].ops->set != param_set_bool
+                            && params[i].ops->set != param_set_bint)
                                 return -EINVAL;
                         pr_debug("They are equal!  Calling %p\n",
                                params[i].ops->set);
diff --git a/kernel/pid.c b/kernel/pid.c
index ce8e00deaccb..9f08dfabaf13 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -543,12 +543,12 @@ struct pid *find_ge_pid(int nr, struct pid_namespace *ns)
  */
 void __init pidhash_init(void)
 {
-        int i, pidhash_size;
+        unsigned int i, pidhash_size;
 
         pid_hash = alloc_large_system_hash("PID", sizeof(*pid_hash), 0, 18,
                                            HASH_EARLY | HASH_SMALL,
                                            &pidhash_shift, NULL, 4096);
-        pidhash_size = 1 << pidhash_shift;
+        pidhash_size = 1U << pidhash_shift;
 
         for (i = 0; i < pidhash_size; i++)
                 INIT_HLIST_HEAD(&pid_hash[i]);
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 0c4defe6d3b8..21724eee5206 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -231,8 +231,28 @@ extern int pm_test_level;
 #ifdef CONFIG_SUSPEND_FREEZER
 static inline int suspend_freeze_processes(void)
 {
-        int error = freeze_processes();
-        return error ? : freeze_kernel_threads();
+        int error;
+
+        error = freeze_processes();
+
+        /*
+         * freeze_processes() automatically thaws every task if freezing
+         * fails. So we need not do anything extra upon error.
+         */
+        if (error)
+                goto Finish;
+
+        error = freeze_kernel_threads();
+
+        /*
+         * freeze_kernel_threads() thaws only kernel threads upon freezing
+         * failure. So we have to thaw the userspace tasks ourselves.
+         */
+        if (error)
+                thaw_processes();
+
+ Finish:
+        return error;
 }
 
 static inline void suspend_thaw_processes(void)
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 77274c9ba2f1..7e426459e60a 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -143,7 +143,10 @@ int freeze_processes(void)
 /**
  * freeze_kernel_threads - Make freezable kernel threads go to the refrigerator.
  *
- * On success, returns 0.  On failure, -errno and system is fully thawed.
+ * On success, returns 0.  On failure, -errno and only the kernel threads are
+ * thawed, so as to give a chance to the caller to do additional cleanups
+ * (if any) before thawing the userspace tasks. So, it is the responsibility
+ * of the caller to thaw the userspace tasks, when the time is right.
  */
 int freeze_kernel_threads(void)
 {
@@ -159,7 +162,7 @@ int freeze_kernel_threads(void)
         BUG_ON(in_atomic());
 
         if (error)
-                thaw_processes();
+                thaw_kernel_threads();
         return error;
 }
 
@@ -188,3 +191,22 @@ void thaw_processes(void)
         printk("done.\n");
 }
 
+void thaw_kernel_threads(void)
+{
+        struct task_struct *g, *p;
+
+        pm_nosig_freezing = false;
+        printk("Restarting kernel threads ... ");
+
+        thaw_workqueues();
+
+        read_lock(&tasklist_lock);
+        do_each_thread(g, p) {
+                if (p->flags & (PF_KTHREAD | PF_WQ_WORKER))
+                        __thaw_task(p);
+        } while_each_thread(g, p);
+        read_unlock(&tasklist_lock);
+
+        schedule();
+        printk("done.\n");
+}
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 1cf88900ec4f..6a768e537001 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -812,7 +812,8 @@ unsigned int snapshot_additional_pages(struct zone *zone)
         unsigned int res;
 
         res = DIV_ROUND_UP(zone->spanned_pages, BM_BITS_PER_BLOCK);
-        res += DIV_ROUND_UP(res * sizeof(struct bm_block), PAGE_SIZE);
+        res += DIV_ROUND_UP(res * sizeof(struct bm_block),
+                            LINKED_PAGE_DATA_SIZE);
         return 2 * res;
 }
 
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 6b1ab7a88522..3e100075b13c 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -249,13 +249,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
                 }
                 pm_restore_gfp_mask();
                 error = hibernation_snapshot(data->platform_support);
-                if (!error) {
+                if (error) {
+                        thaw_kernel_threads();
+                } else {
                         error = put_user(in_suspend, (int __user *)arg);
                         if (!error && !freezer_test_done)
                                 data->ready = 1;
                         if (freezer_test_done) {
                                 freezer_test_done = false;
-                                thaw_processes();
+                                thaw_kernel_threads();
                         }
                 }
                 break;
@@ -274,6 +276,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
                 swsusp_free();
                 memset(&data->handle, 0, sizeof(struct snapshot_handle));
                 data->ready = 0;
+                /*
+                 * It is necessary to thaw kernel threads here, because
+                 * SNAPSHOT_CREATE_IMAGE may be invoked directly after
+                 * SNAPSHOT_FREE.  In that case, if kernel threads were not
+                 * thawed, the preallocation of memory carried out by
+                 * hibernation_snapshot() might run into problems (i.e. it
+                 * might fail or even deadlock).
+                 */
+                thaw_kernel_threads();
                 break;
 
         case SNAPSHOT_PREF_IMAGE_SIZE:
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
index 88f17b8a3b1d..a58ac285fc69 100644
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
@@ -56,8 +56,8 @@ static int nreaders = -1;	/* # reader threads, defaults to 2*ncpus */
 static int nfakewriters = 4;    /* # fake writer threads */
 static int stat_interval;       /* Interval between stats, in seconds. */
                                 /*  Defaults to "only at end of test". */
-static int verbose;             /* Print more debug info. */
-static int test_no_idle_hz;     /* Test RCU's support for tickless idle CPUs. */
+static bool verbose;            /* Print more debug info. */
+static bool test_no_idle_hz;    /* Test RCU's support for tickless idle CPUs. */
 static int shuffle_interval = 3; /* Interval between shuffles (in sec)*/
 static int stutter = 5;         /* Start/stop testing interval (in sec) */
 static int irqreader = 1;       /* RCU readers from irq (timers). */
@@ -1399,7 +1399,7 @@ rcu_torture_shutdown(void *arg)
  * Execute random CPU-hotplug operations at the interval specified
  * by the onoff_interval.
  */
-static int
+static int __cpuinit
 rcu_torture_onoff(void *arg)
 {
         int cpu;
@@ -1447,7 +1447,7 @@ rcu_torture_onoff(void *arg)
         return 0;
 }
 
-static int
+static int __cpuinit
 rcu_torture_onoff_init(void)
 {
         if (onoff_interval <= 0)
diff --git a/kernel/relay.c b/kernel/relay.c
index 4335e1d7ee2d..ab56a1764d4d 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -164,10 +164,14 @@ depopulate:
  */
 static struct rchan_buf *relay_create_buf(struct rchan *chan)
 {
-        struct rchan_buf *buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL);
-        if (!buf)
+        struct rchan_buf *buf;
+
+        if (chan->n_subbufs > UINT_MAX / sizeof(size_t *))
                 return NULL;
 
+        buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL);
+        if (!buf)
+                return NULL;
         buf->padding = kmalloc(chan->n_subbufs * sizeof(size_t *), GFP_KERNEL);
         if (!buf->padding)
                 goto free_buf;
@@ -574,6 +578,8 @@ struct rchan *relay_open(const char *base_filename,
 
         if (!(subbuf_size && n_subbufs))
                 return NULL;
+        if (subbuf_size > UINT_MAX / n_subbufs)
+                return NULL;
 
         chan = kzalloc(sizeof(struct rchan), GFP_KERNEL);
         if (!chan)
diff --git a/kernel/res_counter.c b/kernel/res_counter.c
index 6d269cce7aa1..d508363858b3 100644
--- a/kernel/res_counter.c
+++ b/kernel/res_counter.c
@@ -66,6 +66,31 @@ done:
         return ret;
 }
 
+int res_counter_charge_nofail(struct res_counter *counter, unsigned long val,
+                              struct res_counter **limit_fail_at)
+{
+        int ret, r;
+        unsigned long flags;
+        struct res_counter *c;
+
+        r = ret = 0;
+        *limit_fail_at = NULL;
+        local_irq_save(flags);
+        for (c = counter; c != NULL; c = c->parent) {
+                spin_lock(&c->lock);
+                r = res_counter_charge_locked(c, val);
+                if (r)
+                        c->usage += val;
+                spin_unlock(&c->lock);
+                if (r < 0 && ret == 0) {
+                        *limit_fail_at = c;
+                        ret = r;
+                }
+        }
+        local_irq_restore(flags);
+
+        return ret;
+}
 void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val)
 {
         if (WARN_ON(counter->usage < val))
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index df00cb09263e..5255c9d2e053 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -74,6 +74,7 @@
 
 #include <asm/tlb.h>
 #include <asm/irq_regs.h>
+#include <asm/mutex.h>
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #endif
@@ -723,9 +724,6 @@ static void dequeue_task(struct rq *rq, struct task_struct *p, int flags)
         p->sched_class->dequeue_task(rq, p, flags);
 }
 
-/*
- * activate_task - move a task to the runqueue.
- */
 void activate_task(struct rq *rq, struct task_struct *p, int flags)
 {
         if (task_contributes_to_load(p))
@@ -734,9 +732,6 @@ void activate_task(struct rq *rq, struct task_struct *p, int flags)
         enqueue_task(rq, p, flags);
 }
 
-/*
- * deactivate_task - remove a task from the runqueue.
- */
 void deactivate_task(struct rq *rq, struct task_struct *p, int flags)
 {
         if (task_contributes_to_load(p))
@@ -4134,7 +4129,7 @@ recheck:
         on_rq = p->on_rq;
         running = task_current(rq, p);
         if (on_rq)
-                deactivate_task(rq, p, 0);
+                dequeue_task(rq, p, 0);
         if (running)
                 p->sched_class->put_prev_task(rq, p);
 
@@ -4147,7 +4142,7 @@ recheck:
         if (running)
                 p->sched_class->set_curr_task(rq);
         if (on_rq)
-                activate_task(rq, p, 0);
+                enqueue_task(rq, p, 0);
 
         check_class_changed(rq, p, prev_class, oldprio);
         task_rq_unlock(rq, p, &flags);
@@ -4998,9 +4993,9 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu)
          * placed properly.
          */
         if (p->on_rq) {
-                deactivate_task(rq_src, p, 0);
+                dequeue_task(rq_src, p, 0);
                 set_task_cpu(p, dest_cpu);
-                activate_task(rq_dest, p, 0);
+                enqueue_task(rq_dest, p, 0);
                 check_preempt_curr(rq_dest, p, 0);
         }
 done:
@@ -7032,10 +7027,10 @@ static void normalize_task(struct rq *rq, struct task_struct *p)
 
         on_rq = p->on_rq;
         if (on_rq)
-                deactivate_task(rq, p, 0);
+                dequeue_task(rq, p, 0);
         __setscheduler(rq, p, SCHED_NORMAL, 0);
         if (on_rq) {
-                activate_task(rq, p, 0);
+                enqueue_task(rq, p, 0);
                 resched_task(rq->curr);
         }
 
diff --git a/kernel/sched/cpupri.c b/kernel/sched/cpupri.c
index b0d798eaf130..d72586fdf660 100644
--- a/kernel/sched/cpupri.c
+++ b/kernel/sched/cpupri.c
@@ -129,7 +129,7 @@ int cpupri_find(struct cpupri *cp, struct task_struct *p,
  * cpupri_set - update the cpu priority setting
  * @cp: The cpupri context
  * @cpu: The target cpu
- * @pri: The priority (INVALID-RT99) to assign to this CPU
+ * @newpri: The priority (INVALID-RT99) to assign to this CPU
  *
  * Note: Assumes cpu_rq(cpu)->lock is locked
  *
@@ -200,7 +200,6 @@ void cpupri_set(struct cpupri *cp, int cpu, int newpri)
 /**
  * cpupri_init - initialize the cpupri structure
  * @cp: The cpupri context
- * @bootmem: true if allocations need to use bootmem
  *
  * Returns: -ENOMEM if memory fails.
  */
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 84adb2d66cbd..7c6414fc669d 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4866,6 +4866,15 @@ static void nohz_balancer_kick(int cpu)
         return;
 }
 
+static inline void clear_nohz_tick_stopped(int cpu)
+{
+        if (unlikely(test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)))) {
+                cpumask_clear_cpu(cpu, nohz.idle_cpus_mask);
+                atomic_dec(&nohz.nr_cpus);
+                clear_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu));
+        }
+}
+
 static inline void set_cpu_sd_state_busy(void)
 {
         struct sched_domain *sd;
@@ -4904,6 +4913,12 @@ void select_nohz_load_balancer(int stop_tick)
 {
         int cpu = smp_processor_id();
 
+        /*
+         * If this cpu is going down, then nothing needs to be done.
+         */
+        if (!cpu_active(cpu))
+                return;
+
         if (stop_tick) {
                 if (test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)))
                         return;
@@ -4914,6 +4929,18 @@ void select_nohz_load_balancer(int stop_tick)
         }
         return;
 }
+
+static int __cpuinit sched_ilb_notifier(struct notifier_block *nfb,
+                                        unsigned long action, void *hcpu)
+{
+        switch (action & ~CPU_TASKS_FROZEN) {
+        case CPU_DYING:
+                clear_nohz_tick_stopped(smp_processor_id());
+                return NOTIFY_OK;
+        default:
+                return NOTIFY_DONE;
+        }
+}
 #endif
 
 static DEFINE_SPINLOCK(balancing);
@@ -5070,11 +5097,7 @@ static inline int nohz_kick_needed(struct rq *rq, int cpu)
         * busy tick after returning from idle, we will update the busy stats.
         */
         set_cpu_sd_state_busy();
-        if (unlikely(test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)))) {
-                clear_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu));
-                cpumask_clear_cpu(cpu, nohz.idle_cpus_mask);
-                atomic_dec(&nohz.nr_cpus);
-        }
+        clear_nohz_tick_stopped(cpu);
 
         /*
          * None are in tickless mode and hence no need for NOHZ idle load
@@ -5590,6 +5613,7 @@ __init void init_sched_fair_class(void)
 
 #ifdef CONFIG_NO_HZ
         zalloc_cpumask_var(&nohz.idle_cpus_mask, GFP_NOWAIT);
+        cpu_notifier(sched_ilb_notifier, 0);
 #endif
 #endif /* SMP */
 
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 3640ebbb466b..f42ae7fb5ec5 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -1587,6 +1587,11 @@ static int push_rt_task(struct rq *rq)
         if (!next_task)
                 return 0;
 
+#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW
+       if (unlikely(task_running(rq, next_task)))
+               return 0;
+#endif
+
 retry:
         if (unlikely(next_task == rq->curr)) {
                 WARN_ON(1);
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 1d7bca7f4f52..d117262deba3 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -296,7 +296,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)
                 if (__this_cpu_read(soft_watchdog_warn) == true)
                         return HRTIMER_RESTART;
 
-                printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n",
+                printk(KERN_EMERG "BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n",
                         smp_processor_id(), duration,
                         current->comm, task_pid_nr(current));
                 print_modules();
diff --git a/lib/Kconfig b/lib/Kconfig
index 169eb7c598e5..028aba9e72af 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -19,6 +19,9 @@ config RATIONAL
 config GENERIC_FIND_FIRST_BIT
         bool
 
+config NO_GENERIC_PCI_IOPORT_MAP
+        bool
+
 config GENERIC_PCI_IOMAP
         bool
 
@@ -279,6 +282,9 @@ config AVERAGE
 
           If unsure, say N.
 
+config CLZ_TAB
+        bool
+
 config CORDIC
         tristate "CORDIC algorithm"
         help
@@ -287,6 +293,7 @@ config CORDIC
 
 config MPILIB
         tristate
+        select CLZ_TAB
         help
           Multiprecision maths library from GnuPG.
           It is used to implement RSA digital signature verification,
diff --git a/lib/Makefile b/lib/Makefile
index d71aae1b01b3..18515f0267c4 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -121,6 +121,8 @@ obj-$(CONFIG_DQL) += dynamic_queue_limits.o
 obj-$(CONFIG_MPILIB) += mpi/
 obj-$(CONFIG_SIGNATURE) += digsig.o
 
+obj-$(CONFIG_CLZ_TAB) += clz_tab.o
+
 hostprogs-y     := gen_crc32table
 clean-files     := crc32table.h
 
diff --git a/lib/bug.c b/lib/bug.c
index 19552096d16b..a28c1415357c 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -169,7 +169,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
                 return BUG_TRAP_TYPE_WARN;
         }
 
-        printk(KERN_EMERG "------------[ cut here ]------------\n");
+        printk(KERN_DEFAULT "------------[ cut here ]------------\n");
 
         if (file)
                 printk(KERN_CRIT "kernel BUG at %s:%u!\n",
diff --git a/lib/clz_tab.c b/lib/clz_tab.c
new file mode 100644
index 000000000000..7287b4a991a7
--- /dev/null
+++ b/lib/clz_tab.c
@@ -0,0 +1,18 @@
+const unsigned char __clz_tab[] = {
+        0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5,
+            5, 5, 5, 5, 5, 5, 5, 5,
+        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+            6, 6, 6, 6, 6, 6, 6, 6,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+            7, 7, 7, 7, 7, 7, 7, 7,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+            7, 7, 7, 7, 7, 7, 7, 7,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            8, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            8, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            8, 8, 8, 8, 8, 8, 8, 8,
+        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+            8, 8, 8, 8, 8, 8, 8, 8,
+};
diff --git a/lib/digsig.c b/lib/digsig.c
index fd2402f67f89..286d558033e2 100644
--- a/lib/digsig.c
+++ b/lib/digsig.c
@@ -34,14 +34,9 @@ static int pkcs_1_v1_5_decode_emsa(const unsigned char *msg,
                         unsigned long  msglen,
                         unsigned long  modulus_bitlen,
                         unsigned char *out,
-                        unsigned long *outlen,
-                        int *is_valid)
+                        unsigned long *outlen)
 {
         unsigned long modulus_len, ps_len, i;
-        int result;
-
-        /* default to invalid packet */
-        *is_valid = 0;
 
         modulus_len = (modulus_bitlen >> 3) + (modulus_bitlen & 7 ? 1 : 0);
 
@@ -50,39 +45,30 @@ static int pkcs_1_v1_5_decode_emsa(const unsigned char *msg,
                 return -EINVAL;
 
         /* separate encoded message */
-        if ((msg[0] != 0x00) || (msg[1] != (unsigned char)1)) {
-                result = -EINVAL;
-                goto bail;
-        }
+        if ((msg[0] != 0x00) || (msg[1] != (unsigned char)1))
+                return -EINVAL;
 
         for (i = 2; i < modulus_len - 1; i++)
                 if (msg[i] != 0xFF)
                         break;
 
         /* separator check */
-        if (msg[i] != 0) {
+        if (msg[i] != 0)
                 /* There was no octet with hexadecimal value 0x00
                 to separate ps from m. */
-                result = -EINVAL;
-                goto bail;
-        }
+                return -EINVAL;
 
         ps_len = i - 2;
 
         if (*outlen < (msglen - (2 + ps_len + 1))) {
                 *outlen = msglen - (2 + ps_len + 1);
-                result = -EOVERFLOW;
-                goto bail;
+                return -EOVERFLOW;
         }
 
         *outlen = (msglen - (2 + ps_len + 1));
         memcpy(out, &msg[2 + ps_len + 1], *outlen);
 
-        /* valid packet */
-        *is_valid = 1;
-        result    = 0;
-bail:
-        return result;
+        return 0;
 }
 
 /*
@@ -96,7 +82,7 @@ static int digsig_verify_rsa(struct key *key,
         unsigned long len;
         unsigned long mlen, mblen;
         unsigned nret, l;
-        int valid, head, i;
+        int head, i;
         unsigned char *out1 = NULL, *out2 = NULL;
         MPI in = NULL, res = NULL, pkey[2];
         uint8_t *p, *datap, *endp;
@@ -105,6 +91,10 @@ static int digsig_verify_rsa(struct key *key,
 
         down_read(&key->sem);
         ukp = key->payload.data;
+
+        if (ukp->datalen < sizeof(*pkh))
+                goto err1;
+
         pkh = (struct pubkey_hdr *)ukp->data;
 
         if (pkh->version != 1)
@@ -117,18 +107,23 @@ static int digsig_verify_rsa(struct key *key,
                 goto err1;
 
         datap = pkh->mpi;
-        endp = datap + ukp->datalen;
+        endp = ukp->data + ukp->datalen;
+
+        err = -ENOMEM;
 
         for (i = 0; i < pkh->nmpi; i++) {
                 unsigned int remaining = endp - datap;
                 pkey[i] = mpi_read_from_buffer(datap, &remaining);
+                if (!pkey[i])
+                        goto err;
                 datap += remaining;
         }
 
         mblen = mpi_get_nbits(pkey[0]);
         mlen = (mblen + 7)/8;
 
-        err = -ENOMEM;
+        if (mlen == 0)
+                goto err;
 
         out1 = kzalloc(mlen, GFP_KERNEL);
         if (!out1)
@@ -167,10 +162,9 @@ static int digsig_verify_rsa(struct key *key,
         memset(out1, 0, head);
         memcpy(out1 + head, p, l);
 
-        err = -EINVAL;
-        pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len, &valid);
+        err = pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len);
 
-        if (valid && len == hlen)
+        if (!err && len == hlen)
                 err = memcmp(out2, h, hlen);
 
 err:
@@ -178,8 +172,8 @@ err:
         mpi_free(res);
         kfree(out1);
         kfree(out2);
-        mpi_free(pkey[0]);
-        mpi_free(pkey[1]);
+        while (--i >= 0)
+                mpi_free(pkey[i]);
 err1:
         up_read(&key->sem);
 
diff --git a/lib/kstrtox.c b/lib/kstrtox.c
index 7a94c8f14e29..b1dd3e7d88cb 100644
--- a/lib/kstrtox.c
+++ b/lib/kstrtox.c
@@ -44,12 +44,13 @@ const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
  *
  * Don't you dare use this function.
  */
-unsigned int _parse_integer(const char *s, unsigned int base, unsigned long long *res)
+unsigned int _parse_integer(const char *s, unsigned int base, unsigned long long *p)
 {
+        unsigned long long res;
         unsigned int rv;
         int overflow;
 
-        *res = 0;
+        res = 0;
         rv = 0;
         overflow = 0;
         while (*s) {
@@ -64,12 +65,19 @@ unsigned int _parse_integer(const char *s, unsigned int base, unsigned long long
 
                 if (val >= base)
                         break;
-                if (*res > div_u64(ULLONG_MAX - val, base))
-                        overflow = 1;
-                *res = *res * base + val;
+                /*
+                 * Check for overflow only if we are within range of
+                 * it in the max base we support (16)
+                 */
+                if (unlikely(res & (~0ull << 60))) {
+                        if (res > div_u64(ULLONG_MAX - val, base))
+                                overflow = 1;
+                }
+                res = res * base + val;
                 rv++;
                 s++;
         }
+        *p = res;
         if (overflow)
                 rv |= KSTRTOX_OVERFLOW;
         return rv;
diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h
index b87487b40a8b..29f98624ef93 100644
--- a/lib/mpi/longlong.h
+++ b/lib/mpi/longlong.h
@@ -1200,18 +1200,40 @@ do { \
         "r" ((USItype)(v)) \
         : "%g1", "%g2" __AND_CLOBBER_CC)
 #define UMUL_TIME 39            /* 39 instructions */
-#endif
-#ifndef udiv_qrnnd
-#ifndef LONGLONG_STANDALONE
+/* It's quite necessary to add this much assembler for the sparc.
+   The default udiv_qrnnd (in C) is more than 10 times slower!  */
 #define udiv_qrnnd(q, r, n1, n0, d) \
-do { USItype __r; \
-        (q) = __udiv_qrnnd(&__r, (n1), (n0), (d)); \
-        (r) = __r; \
-} while (0)
-        extern USItype __udiv_qrnnd();
-#define UDIV_TIME 140
-#endif /* LONGLONG_STANDALONE */
-#endif /* udiv_qrnnd */
+  __asm__ ("! Inlined udiv_qrnnd\n\t"                                   \
+           "mov 32,%%g1\n\t"                                            \
+           "subcc       %1,%2,%%g0\n\t"                                 \
+           "1:  bcs     5f\n\t"                                         \
+           "addxcc %0,%0,%0     ! shift n1n0 and a q-bit in lsb\n\t"    \
+           "sub %1,%2,%1        ! this kills msb of n\n\t"              \
+           "addx        %1,%1,%1        ! so this can't give carry\n\t" \
+           "subcc       %%g1,1,%%g1\n\t"                                \
+           "2:  bne     1b\n\t"                                         \
+           "subcc       %1,%2,%%g0\n\t"                                 \
+           "bcs 3f\n\t"                                                 \
+           "addxcc %0,%0,%0     ! shift n1n0 and a q-bit in lsb\n\t"    \
+           "b           3f\n\t"                                         \
+           "sub %1,%2,%1        ! this kills msb of n\n\t"              \
+           "4:  sub     %1,%2,%1\n\t"                                   \
+           "5:  addxcc  %1,%1,%1\n\t"                                   \
+           "bcc 2b\n\t"                                                 \
+           "subcc       %%g1,1,%%g1\n\t"                                \
+           "! Got carry from n.  Subtract next step to cancel this carry.\n\t" \
+           "bne 4b\n\t"                                                 \
+           "addcc       %0,%0,%0        ! shift n1n0 and a 0-bit in lsb\n\t" \
+           "sub %1,%2,%1\n\t"                                           \
+           "3:  xnor    %0,0,%0\n\t"                                    \
+           "! End of inline udiv_qrnnd\n"                               \
+           : "=&r" ((USItype)(q)),                                      \
+             "=&r" ((USItype)(r))                                       \
+           : "r" ((USItype)(d)),                                        \
+             "1" ((USItype)(n1)),                                       \
+             "0" ((USItype)(n0)) : "%g1", "cc")
+#define UDIV_TIME (3+7*32)      /* 7 instructions/iteration. 32 iterations.  */
+#endif
 #endif /* __sparc__ */
 
 /***************************************
diff --git a/lib/mpi/mpi-bit.c b/lib/mpi/mpi-bit.c
index 854c9c6da025..2f526627e4f5 100644
--- a/lib/mpi/mpi-bit.c
+++ b/lib/mpi/mpi-bit.c
@@ -21,25 +21,6 @@
 #include "mpi-internal.h"
 #include "longlong.h"
 
-const unsigned char __clz_tab[] = {
-        0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5,
-            5, 5, 5, 5, 5, 5, 5, 5,
-        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-            6, 6, 6, 6, 6, 6, 6, 6,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-            7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-            7, 7, 7, 7, 7, 7, 7, 7,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-};
-
 #define A_LIMB_1 ((mpi_limb_t) 1)
 
 /****************
diff --git a/lib/mpi/mpi-div.c b/lib/mpi/mpi-div.c
index c3087d1390ce..f68cbbb4d4a4 100644
--- a/lib/mpi/mpi-div.c
+++ b/lib/mpi/mpi-div.c
@@ -149,6 +149,9 @@ int mpi_tdiv_qr(MPI quot, MPI rem, MPI num, MPI den)
         mpi_ptr_t marker[5];
         int markidx = 0;
 
+        if (!dsize)
+                return -EINVAL;
+
         memset(marker, 0, sizeof(marker));
 
         /* Ensure space is enough for quotient and remainder.
@@ -207,6 +210,8 @@ int mpi_tdiv_qr(MPI quot, MPI rem, MPI num, MPI den)
                  * numerator would be gradually overwritten by the quotient limbs.  */
                 if (qp == np) { /* Copy NP object to temporary space.  */
                         np = marker[markidx++] = mpi_alloc_limb_space(nsize);
+                        if (!np)
+                                goto nomem;
                         MPN_COPY(np, qp, nsize);
                 }
         } else                  /* Put quotient at top of remainder. */
diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c
index b04a3cf80080..67f3e79af914 100644
--- a/lib/mpi/mpi-pow.c
+++ b/lib/mpi/mpi-pow.c
@@ -59,7 +59,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
         ep = exp->d;
 
         if (!msize)
-                msize = 1 / msize;      /* provoke a signal */
+                return -EINVAL;
 
         if (!esize) {
                 /* Exponent is zero, result is 1 mod MOD, i.e., 1 or 0
diff --git a/lib/mpi/mpicoder.c b/lib/mpi/mpicoder.c
index 716802b774ea..f26b41fcb48c 100644
--- a/lib/mpi/mpicoder.c
+++ b/lib/mpi/mpicoder.c
@@ -20,78 +20,15 @@
 
 #include "mpi-internal.h"
 
-#define DIM(v) (sizeof(v)/sizeof((v)[0]))
 #define MAX_EXTERN_MPI_BITS 16384
 
-static uint8_t asn[15] =        /* Object ID is 1.3.14.3.2.26 */
-{ 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03,
-        0x02, 0x1a, 0x05, 0x00, 0x04, 0x14
-};
-
-MPI do_encode_md(const void *sha_buffer, unsigned nbits)
-{
-        int nframe = (nbits + 7) / 8;
-        uint8_t *frame, *fr_pt;
-        int i = 0, n;
-        size_t asnlen = DIM(asn);
-        MPI a = MPI_NULL;
-
-        if (SHA1_DIGEST_LENGTH + asnlen + 4 > nframe)
-                pr_info("MPI: can't encode a %d bit MD into a %d bits frame\n",
-                       (int)(SHA1_DIGEST_LENGTH * 8), (int)nbits);
-
-        /* We encode the MD in this way:
-         *
-         *       0  A PAD(n bytes)   0  ASN(asnlen bytes)  MD(len bytes)
-         *
-         * PAD consists of FF bytes.
-         */
-        frame = kmalloc(nframe, GFP_KERNEL);
-        if (!frame)
-                return MPI_NULL;
-        n = 0;
-        frame[n++] = 0;
-        frame[n++] = 1;         /* block type */
-        i = nframe - SHA1_DIGEST_LENGTH - asnlen - 3;
-
-        if (i <= 1) {
-                pr_info("MPI: message digest encoding failed\n");
-                kfree(frame);
-                return a;
-        }
-
-        memset(frame + n, 0xff, i);
-        n += i;
-        frame[n++] = 0;
-        memcpy(frame + n, &asn, asnlen);
-        n += asnlen;
-        memcpy(frame + n, sha_buffer, SHA1_DIGEST_LENGTH);
-        n += SHA1_DIGEST_LENGTH;
-
-        i = nframe;
-        fr_pt = frame;
-
-        if (n != nframe) {
-                printk
-                    ("MPI: message digest encoding failed, frame length is wrong\n");
-                kfree(frame);
-                return a;
-        }
-
-        a = mpi_alloc((nframe + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB);
-        mpi_set_buffer(a, frame, nframe, 0);
-        kfree(frame);
-
-        return a;
-}
-
 MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread)
 {
         const uint8_t *buffer = xbuffer;
         int i, j;
         unsigned nbits, nbytes, nlimbs, nread = 0;
         mpi_limb_t a;
-        MPI val = MPI_NULL;
+        MPI val = NULL;
 
         if (*ret_nread < 2)
                 goto leave;
@@ -108,7 +45,7 @@ MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread)
         nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB;
         val = mpi_alloc(nlimbs);
         if (!val)
-                return MPI_NULL;
+                return NULL;
         i = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB;
         i %= BYTES_PER_MPI_LIMB;
         val->nbits = nbits;
@@ -212,30 +149,6 @@ int mpi_fromstr(MPI val, const char *str)
 EXPORT_SYMBOL_GPL(mpi_fromstr);
 
 /****************
- * Special function to get the low 8 bytes from an mpi.
- * This can be used as a keyid; KEYID is an 2 element array.
- * Return the low 4 bytes.
- */
-u32 mpi_get_keyid(const MPI a, u32 *keyid)
-{
-#if BYTES_PER_MPI_LIMB == 4
-        if (keyid) {
-                keyid[0] = a->nlimbs >= 2 ? a->d[1] : 0;
-                keyid[1] = a->nlimbs >= 1 ? a->d[0] : 0;
-        }
-        return a->nlimbs >= 1 ? a->d[0] : 0;
-#elif BYTES_PER_MPI_LIMB == 8
-        if (keyid) {
-                keyid[0] = a->nlimbs ? (u32) (a->d[0] >> 32) : 0;
-                keyid[1] = a->nlimbs ? (u32) (a->d[0] & 0xffffffff) : 0;
-        }
-        return a->nlimbs ? (u32) (a->d[0] & 0xffffffff) : 0;
-#else
-#error Make this function work with other LIMB sizes
-#endif
-}
-
-/****************
  * Return an allocated buffer with the MPI (msb first).
  * NBYTES receives the length of this buffer. Caller must free the
  * return string (This function does return a 0 byte buffer with NBYTES
diff --git a/lib/mpi/mpih-div.c b/lib/mpi/mpih-div.c
index 87ede162dfab..cde1aaec18da 100644
--- a/lib/mpi/mpih-div.c
+++ b/lib/mpi/mpih-div.c
@@ -217,6 +217,10 @@ mpihelp_divrem(mpi_ptr_t qp, mpi_size_t qextra_limbs,
         case 0:
                 /* We are asked to divide by zero, so go ahead and do it!  (To make
                    the compiler not remove this statement, return the value.)  */
+                /*
+                 * existing clients of this function have been modified
+                 * not to call it with dsize == 0, so this should not happen
+                 */
                 return 1 / dsize;
 
         case 1:
diff --git a/lib/mpi/mpiutil.c b/lib/mpi/mpiutil.c
index eefc55d6b7f5..26e4ed31e256 100644
--- a/lib/mpi/mpiutil.c
+++ b/lib/mpi/mpiutil.c
@@ -58,6 +58,9 @@ mpi_ptr_t mpi_alloc_limb_space(unsigned nlimbs)
 {
         size_t len = nlimbs * sizeof(mpi_limb_t);
 
+        if (!len)
+                return NULL;
+
         return kmalloc(len, GFP_KERNEL);
 }
 
@@ -135,7 +138,7 @@ int mpi_copy(MPI *copied, const MPI a)
         size_t i;
         MPI b;
 
-        *copied = MPI_NULL;
+        *copied = NULL;
 
         if (a) {
                 b = mpi_alloc(a->nlimbs);
diff --git a/lib/pci_iomap.c b/lib/pci_iomap.c
index 4b0fdc22e688..0d83ea8a9605 100644
--- a/lib/pci_iomap.c
+++ b/lib/pci_iomap.c
@@ -34,7 +34,7 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
         if (maxlen && len > maxlen)
                 len = maxlen;
         if (flags & IORESOURCE_IO)
-                return ioport_map(start, len);
+                return __pci_ioport_map(dev, start, len);
         if (flags & IORESOURCE_MEM) {
                 if (flags & IORESOURCE_CACHEABLE)
                         return ioremap(start, len);
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 7ba8feae11b8..dd8e2aafb07e 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -318,7 +318,7 @@ static void wakeup_timer_fn(unsigned long data)
         if (bdi->wb.task) {
                 trace_writeback_wake_thread(bdi);
                 wake_up_process(bdi->wb.task);
-        } else {
+        } else if (bdi->dev) {
                 /*
                  * When bdi tasks are inactive for long time, they are killed.
                  * In this case we have to wake-up the forker thread which
@@ -584,6 +584,8 @@ EXPORT_SYMBOL(bdi_register_dev);
  */
 static void bdi_wb_shutdown(struct backing_dev_info *bdi)
 {
+        struct task_struct *task;
+
         if (!bdi_cap_writeback_dirty(bdi))
                 return;
 
@@ -602,8 +604,13 @@ static void bdi_wb_shutdown(struct backing_dev_info *bdi)
          * Finally, kill the kernel thread. We don't need to be RCU
          * safe anymore, since the bdi is gone from visibility.
          */
-        if (bdi->wb.task)
-                kthread_stop(bdi->wb.task);
+        spin_lock_bh(&bdi->wb_lock);
+        task = bdi->wb.task;
+        bdi->wb.task = NULL;
+        spin_unlock_bh(&bdi->wb_lock);
+
+        if (task)
+                kthread_stop(task);
 }
 
 /*
@@ -623,7 +630,9 @@ static void bdi_prune_sb(struct backing_dev_info *bdi)
 
 void bdi_unregister(struct backing_dev_info *bdi)
 {
-        if (bdi->dev) {
+        struct device *dev = bdi->dev;
+
+        if (dev) {
                 bdi_set_min_ratio(bdi, 0);
                 trace_writeback_bdi_unregister(bdi);
                 bdi_prune_sb(bdi);
@@ -632,8 +641,12 @@ void bdi_unregister(struct backing_dev_info *bdi)
                 if (!bdi_cap_flush_forker(bdi))
                         bdi_wb_shutdown(bdi);
                 bdi_debug_unregister(bdi);
-                device_unregister(bdi->dev);
+
+                spin_lock_bh(&bdi->wb_lock);
                 bdi->dev = NULL;
+                spin_unlock_bh(&bdi->wb_lock);
+
+                device_unregister(dev);
         }
 }
 EXPORT_SYMBOL(bdi_unregister);
diff --git a/mm/compaction.c b/mm/compaction.c
index 71a58f67f481..d9ebebe1a2aa 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -313,12 +313,34 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
                 } else if (!locked)
                         spin_lock_irq(&zone->lru_lock);
 
+                /*
+                 * migrate_pfn does not necessarily start aligned to a
+                 * pageblock. Ensure that pfn_valid is called when moving
+                 * into a new MAX_ORDER_NR_PAGES range in case of large
+                 * memory holes within the zone
+                 */
+                if ((low_pfn & (MAX_ORDER_NR_PAGES - 1)) == 0) {
+                        if (!pfn_valid(low_pfn)) {
+                                low_pfn += MAX_ORDER_NR_PAGES - 1;
+                                continue;
+                        }
+                }
+
                 if (!pfn_valid_within(low_pfn))
                         continue;
                 nr_scanned++;
 
-                /* Get the page and skip if free */
+                /*
+                 * Get the page and ensure the page is within the same zone.
+                 * See the comment in isolate_freepages about overlapping
+                 * nodes. It is deliberate that the new zone lock is not taken
+                 * as memory compaction should not move pages between nodes.
+                 */
                 page = pfn_to_page(low_pfn);
+                if (page_zone(page) != zone)
+                        continue;
+
+                /* Skip if free */
                 if (PageBuddy(page))
                         continue;
 
diff --git a/mm/filemap.c b/mm/filemap.c
index 97f49ed35bd2..b66275757c28 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1400,15 +1400,12 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
         unsigned long seg = 0;
         size_t count;
         loff_t *ppos = &iocb->ki_pos;
-        struct blk_plug plug;
 
         count = 0;
         retval = generic_segment_checks(iov, &nr_segs, &count, VERIFY_WRITE);
         if (retval)
                 return retval;
 
-        blk_start_plug(&plug);
-
         /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */
         if (filp->f_flags & O_DIRECT) {
                 loff_t size;
@@ -1424,8 +1421,12 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                         retval = filemap_write_and_wait_range(mapping, pos,
                                         pos + iov_length(iov, nr_segs) - 1);
                         if (!retval) {
+                                struct blk_plug plug;
+
+                                blk_start_plug(&plug);
                                 retval = mapping->a_ops->direct_IO(READ, iocb,
                                                         iov, pos, nr_segs);
+                                blk_finish_plug(&plug);
                         }
                         if (retval > 0) {
                                 *ppos = pos + retval;
@@ -1481,7 +1482,6 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                         break;
         }
 out:
-        blk_finish_plug(&plug);
         return retval;
 }
 EXPORT_SYMBOL(generic_file_aio_read);
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index f91b2f687343..a4eb31132229 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -263,7 +263,12 @@ found:
                                                         xip_pfn);
                 if (err == -ENOMEM)
                         return VM_FAULT_OOM;
-                BUG_ON(err);
+                /*
+                 * err == -EBUSY is fine, we've raced against another thread
+                 * that faulted-in the same page
+                 */
+                if (err != -EBUSY)
+                        BUG_ON(err);
                 return VM_FAULT_NOPAGE;
         } else {
                 int err, ret = VM_FAULT_OOM;
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index b3ffc21ce801..91d3efb25d15 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2083,7 +2083,7 @@ static void collect_mm_slot(struct mm_slot *mm_slot)
 {
         struct mm_struct *mm = mm_slot->mm;
 
-        VM_BUG_ON(!spin_is_locked(&khugepaged_mm_lock));
+        VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&khugepaged_mm_lock));
 
         if (khugepaged_test_exit(mm)) {
                 /* free mm_slot */
@@ -2113,7 +2113,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
         int progress = 0;
 
         VM_BUG_ON(!pages);
-        VM_BUG_ON(!spin_is_locked(&khugepaged_mm_lock));
+        VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&khugepaged_mm_lock));
 
         if (khugepaged_scan.mm_slot)
                 mm_slot = khugepaged_scan.mm_slot;
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index ea8c3a4cd2ae..5f34bd8dda34 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2508,6 +2508,7 @@ static int hugetlb_no_page(struct mm_struct *mm, struct vm_area_struct *vma,
 {
         struct hstate *h = hstate_vma(vma);
         int ret = VM_FAULT_SIGBUS;
+        int anon_rmap = 0;
         pgoff_t idx;
         unsigned long size;
         struct page *page;
@@ -2562,14 +2563,13 @@ retry:
                         spin_lock(&inode->i_lock);
                         inode->i_blocks += blocks_per_huge_page(h);
                         spin_unlock(&inode->i_lock);
-                        page_dup_rmap(page);
                 } else {
                         lock_page(page);
                         if (unlikely(anon_vma_prepare(vma))) {
                                 ret = VM_FAULT_OOM;
                                 goto backout_unlocked;
                         }
-                        hugepage_add_new_anon_rmap(page, vma, address);
+                        anon_rmap = 1;
                 }
         } else {
                 /*
@@ -2582,7 +2582,6 @@ retry:
                               VM_FAULT_SET_HINDEX(h - hstates);
                         goto backout_unlocked;
                 }
-                page_dup_rmap(page);
         }
 
         /*
@@ -2606,6 +2605,10 @@ retry:
         if (!huge_pte_none(huge_ptep_get(ptep)))
                 goto backout;
 
+        if (anon_rmap)
+                hugepage_add_new_anon_rmap(page, vma, address);
+        else
+                page_dup_rmap(page);
         new_pte = make_huge_pte(vma, page, ((vma->vm_flags & VM_WRITE)
                                 && (vma->vm_flags & VM_SHARED)));
         set_huge_pte_at(mm, address, ptep, new_pte);
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index c833addd94d7..45eb6217bf38 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -1036,7 +1036,7 @@ void __ref kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp)
 {
         pr_debug("%s(0x%p)\n", __func__, ptr);
 
-        if (atomic_read(&kmemleak_enabled) && ptr && !IS_ERR(ptr))
+        if (atomic_read(&kmemleak_enabled) && ptr && size && !IS_ERR(ptr))
                 add_scan_area((unsigned long)ptr, size, gfp);
         else if (atomic_read(&kmemleak_early_log))
                 log_early(KMEMLEAK_SCAN_AREA, ptr, size, 0);
@@ -1757,6 +1757,7 @@ void __init kmemleak_init(void)
 
 #ifdef CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF
         if (!kmemleak_skip_disable) {
+                atomic_set(&kmemleak_early_log, 0);
                 kmemleak_disable();
                 return;
         }
diff --git a/mm/memblock.c b/mm/memblock.c
index 2f55f19b7c86..77b5f227e1d8 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -106,14 +106,17 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,
         if (end == MEMBLOCK_ALLOC_ACCESSIBLE)
                 end = memblock.current_limit;
 
-        /* adjust @start to avoid underflow and allocating the first page */
-        start = max3(start, size, (phys_addr_t)PAGE_SIZE);
+        /* avoid allocating the first page */
+        start = max_t(phys_addr_t, start, PAGE_SIZE);
         end = max(start, end);
 
         for_each_free_mem_range_reverse(i, nid, &this_start, &this_end, NULL) {
                 this_start = clamp(this_start, start, end);
                 this_end = clamp(this_end, start, end);
 
+                if (this_end < size)
+                        continue;
+
                 cand = round_down(this_end - size, align);
                 if (cand >= this_start)
                         return cand;
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 3dbff4dcde35..228d6461c12a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -379,7 +379,7 @@ static void mem_cgroup_put(struct mem_cgroup *memcg);
 static bool mem_cgroup_is_root(struct mem_cgroup *memcg);
 void sock_update_memcg(struct sock *sk)
 {
-        if (static_branch(&memcg_socket_limit_enabled)) {
+        if (mem_cgroup_sockets_enabled) {
                 struct mem_cgroup *memcg;
 
                 BUG_ON(!sk->sk_prot->proto_cgroup);
@@ -411,7 +411,7 @@ EXPORT_SYMBOL(sock_update_memcg);
 
 void sock_release_memcg(struct sock *sk)
 {
-        if (static_branch(&memcg_socket_limit_enabled) && sk->sk_cgrp) {
+        if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {
                 struct mem_cgroup *memcg;
                 WARN_ON(!sk->sk_cgrp->memcg);
                 memcg = sk->sk_cgrp->memcg;
@@ -776,7 +776,8 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page)
         /* threshold event is triggered in finer grain than soft limit */
         if (unlikely(mem_cgroup_event_ratelimit(memcg,
                                                 MEM_CGROUP_TARGET_THRESH))) {
-                bool do_softlimit, do_numainfo;
+                bool do_softlimit;
+                bool do_numainfo __maybe_unused;
 
                 do_softlimit = mem_cgroup_event_ratelimit(memcg,
                                                 MEM_CGROUP_TARGET_SOFTLIMIT);
@@ -3247,7 +3248,7 @@ int mem_cgroup_prepare_migration(struct page *page,
                 ctype = MEM_CGROUP_CHARGE_TYPE_CACHE;
         else
                 ctype = MEM_CGROUP_CHARGE_TYPE_SHMEM;
-        __mem_cgroup_commit_charge(memcg, page, 1, pc, ctype);
+        __mem_cgroup_commit_charge(memcg, newpage, 1, pc, ctype);
         return ret;
 }
 
@@ -4413,6 +4414,9 @@ static void mem_cgroup_usage_unregister_event(struct cgroup *cgrp,
          */
         BUG_ON(!thresholds);
 
+        if (!thresholds->primary)
+                goto unlock;
+
         usage = mem_cgroup_usage(memcg, type == _MEMSWAP);
 
         /* Check if a threshold crossed before removing */
@@ -4461,7 +4465,7 @@ swap_buffers:
 
         /* To be sure that nobody uses thresholds */
         synchronize_rcu();
-
+unlock:
         mutex_unlock(&memcg->thresholds_lock);
 }
 
diff --git a/mm/memory.c b/mm/memory.c
index 5e30583c2605..fa2f04e0337c 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -878,15 +878,24 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
                         }
                         if (likely(!non_swap_entry(entry)))
                                 rss[MM_SWAPENTS]++;
-                        else if (is_write_migration_entry(entry) &&
-                                        is_cow_mapping(vm_flags)) {
-                                /*
-                                 * COW mappings require pages in both parent
-                                 * and child to be set to read.
-                                 */
-                                make_migration_entry_read(&entry);
-                                pte = swp_entry_to_pte(entry);
-                                set_pte_at(src_mm, addr, src_pte, pte);
+                        else if (is_migration_entry(entry)) {
+                                page = migration_entry_to_page(entry);
+
+                                if (PageAnon(page))
+                                        rss[MM_ANONPAGES]++;
+                                else
+                                        rss[MM_FILEPAGES]++;
+
+                                if (is_write_migration_entry(entry) &&
+                                    is_cow_mapping(vm_flags)) {
+                                        /*
+                                         * COW mappings require pages in both
+                                         * parent and child to be set to read.
+                                         */
+                                        make_migration_entry_read(&entry);
+                                        pte = swp_entry_to_pte(entry);
+                                        set_pte_at(src_mm, addr, src_pte, pte);
+                                }
                         }
                 }
                 goto out_set_pte;
@@ -1191,6 +1200,16 @@ again:
 
                         if (!non_swap_entry(entry))
                                 rss[MM_SWAPENTS]--;
+                        else if (is_migration_entry(entry)) {
+                                struct page *page;
+
+                                page = migration_entry_to_page(entry);
+
+                                if (PageAnon(page))
+                                        rss[MM_ANONPAGES]--;
+                                else
+                                        rss[MM_FILEPAGES]--;
+                        }
                         if (unlikely(!free_swap_and_cache(entry)))
                                 print_bad_pte(vma, addr, ptent, NULL);
                 }
diff --git a/mm/migrate.c b/mm/migrate.c
index 9871a56d82c3..df141f60289e 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -445,7 +445,6 @@ void migrate_page_copy(struct page *newpage, struct page *page)
         ClearPageSwapCache(page);
         ClearPagePrivate(page);
         set_page_private(page, 0);
-        page->mapping = NULL;
 
         /*
          * If any waiters have accumulated on the new page then
@@ -667,6 +666,7 @@ static int move_to_new_page(struct page *newpage, struct page *page,
         } else {
                 if (remap_swapcache)
                         remove_migration_ptes(page, newpage);
+                page->mapping = NULL;
         }
 
         unlock_page(newpage);
diff --git a/mm/nommu.c b/mm/nommu.c
index b982290fd962..f59e170fceb4 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -696,9 +696,11 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
         if (vma->vm_file) {
                 mapping = vma->vm_file->f_mapping;
 
+                mutex_lock(&mapping->i_mmap_mutex);
                 flush_dcache_mmap_lock(mapping);
                 vma_prio_tree_insert(vma, &mapping->i_mmap);
                 flush_dcache_mmap_unlock(mapping);
+                mutex_unlock(&mapping->i_mmap_mutex);
         }
 
         /* add the VMA to the tree */
@@ -760,9 +762,11 @@ static void delete_vma_from_mm(struct vm_area_struct *vma)
         if (vma->vm_file) {
                 mapping = vma->vm_file->f_mapping;
 
+                mutex_lock(&mapping->i_mmap_mutex);
                 flush_dcache_mmap_lock(mapping);
                 vma_prio_tree_remove(vma, &mapping->i_mmap);
                 flush_dcache_mmap_unlock(mapping);
+                mutex_unlock(&mapping->i_mmap_mutex);
         }
 
         /* remove from the MM's tree and list */
@@ -775,8 +779,6 @@ static void delete_vma_from_mm(struct vm_area_struct *vma)
 
         if (vma->vm_next)
                 vma->vm_next->vm_prev = vma->vm_prev;
-
-        vma->vm_mm = NULL;
 }
 
 /*
@@ -2052,6 +2054,7 @@ int nommu_shrink_inode_mappings(struct inode *inode, size_t size,
         high = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
 
         down_write(&nommu_region_sem);
+        mutex_lock(&inode->i_mapping->i_mmap_mutex);
 
         /* search for VMAs that fall within the dead zone */
         vma_prio_tree_foreach(vma, &iter, &inode->i_mapping->i_mmap,
@@ -2059,6 +2062,7 @@ int nommu_shrink_inode_mappings(struct inode *inode, size_t size,
                 /* found one - only interested if it's shared out of the page
                  * cache */
                 if (vma->vm_flags & VM_SHARED) {
+                        mutex_unlock(&inode->i_mapping->i_mmap_mutex);
                         up_write(&nommu_region_sem);
                         return -ETXTBSY; /* not quite true, but near enough */
                 }
@@ -2086,6 +2090,7 @@ int nommu_shrink_inode_mappings(struct inode *inode, size_t size,
                 }
         }
 
+        mutex_unlock(&inode->i_mapping->i_mmap_mutex);
         up_write(&nommu_region_sem);
         return 0;
 }
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0027d8f4a1bb..a13ded1938f0 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5236,6 +5236,7 @@ void *__init alloc_large_system_hash(const char *tablename,
                 max = ((unsigned long long)nr_all_pages << PAGE_SHIFT) >> 4;
                 do_div(max, bucketsize);
         }
+        max = min(max, 0x80000000ULL);
 
         if (numentries > max)
                 numentries = max;
@@ -5413,7 +5414,25 @@ __count_immobile_pages(struct zone *zone, struct page *page, int count)
 
 bool is_pageblock_removable_nolock(struct page *page)
 {
-        struct zone *zone = page_zone(page);
+        struct zone *zone;
+        unsigned long pfn;
+
+        /*
+         * We have to be careful here because we are iterating over memory
+         * sections which are not zone aware so we might end up outside of
+         * the zone but still within the section.
+         * We have to take care about the node as well. If the node is offline
+         * its NODE_DATA will be NULL - see page_zone.
+         */
+        if (!node_online(page_to_nid(page)))
+                return false;
+
+        zone = page_zone(page);
+        pfn = page_to_pfn(page);
+        if (zone->zone_start_pfn > pfn ||
+                        zone->zone_start_pfn + zone->spanned_pages <= pfn)
+                return false;
+
         return __count_immobile_pages(zone, page, 0);
 }
 
diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
index e920aa3ce104..c20ff48994c2 100644
--- a/mm/process_vm_access.c
+++ b/mm/process_vm_access.c
@@ -298,23 +298,18 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
                 goto free_proc_pages;
         }
 
-        task_lock(task);
-        if (__ptrace_may_access(task, PTRACE_MODE_ATTACH)) {
-                task_unlock(task);
-                rc = -EPERM;
-                goto put_task_struct;
-        }
-        mm = task->mm;
-
-        if (!mm || (task->flags & PF_KTHREAD)) {
-                task_unlock(task);
-                rc = -EINVAL;
+        mm = mm_access(task, PTRACE_MODE_ATTACH);
+        if (!mm || IS_ERR(mm)) {
+                rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
+                /*
+                 * Explicitly map EACCES to EPERM as EPERM is a more a
+                 * appropriate error code for process_vw_readv/writev
+                 */
+                if (rc == -EACCES)
+                        rc = -EPERM;
                 goto put_task_struct;
         }
 
-        atomic_inc(&mm->mm_users);
-        task_unlock(task);
-
         for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) {
                 rc = process_vm_rw_single_vec(
                         (unsigned long)rvec[i].iov_base, rvec[i].iov_len,
diff --git a/mm/shmem.c b/mm/shmem.c
index feead1943d92..269d049294ab 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -379,7 +379,7 @@ static int shmem_free_swap(struct address_space *mapping,
 /*
  * Pagevec may contain swap entries, so shuffle up pages before releasing.
  */
-static void shmem_pagevec_release(struct pagevec *pvec)
+static void shmem_deswap_pagevec(struct pagevec *pvec)
 {
         int i, j;
 
@@ -389,7 +389,36 @@ static void shmem_pagevec_release(struct pagevec *pvec)
                         pvec->pages[j++] = page;
         }
         pvec->nr = j;
-        pagevec_release(pvec);
+}
+
+/*
+ * SysV IPC SHM_UNLOCK restore Unevictable pages to their evictable lists.
+ */
+void shmem_unlock_mapping(struct address_space *mapping)
+{
+        struct pagevec pvec;
+        pgoff_t indices[PAGEVEC_SIZE];
+        pgoff_t index = 0;
+
+        pagevec_init(&pvec, 0);
+        /*
+         * Minor point, but we might as well stop if someone else SHM_LOCKs it.
+         */
+        while (!mapping_unevictable(mapping)) {
+                /*
+                 * Avoid pagevec_lookup(): find_get_pages() returns 0 as if it
+                 * has finished, if it hits a row of PAGEVEC_SIZE swap entries.
+                 */
+                pvec.nr = shmem_find_get_pages_and_swap(mapping, index,
+                                        PAGEVEC_SIZE, pvec.pages, indices);
+                if (!pvec.nr)
+                        break;
+                index = indices[pvec.nr - 1] + 1;
+                shmem_deswap_pagevec(&pvec);
+                check_move_unevictable_pages(pvec.pages, pvec.nr);
+                pagevec_release(&pvec);
+                cond_resched();
+        }
 }
 
 /*
@@ -440,7 +469,8 @@ void shmem_truncate_range(struct inode *inode, loff_t lstart, loff_t lend)
                         }
                         unlock_page(page);
                 }
-                shmem_pagevec_release(&pvec);
+                shmem_deswap_pagevec(&pvec);
+                pagevec_release(&pvec);
                 mem_cgroup_uncharge_end();
                 cond_resched();
                 index++;
@@ -470,7 +500,8 @@ void shmem_truncate_range(struct inode *inode, loff_t lstart, loff_t lend)
                         continue;
                 }
                 if (index == start && indices[0] > end) {
-                        shmem_pagevec_release(&pvec);
+                        shmem_deswap_pagevec(&pvec);
+                        pagevec_release(&pvec);
                         break;
                 }
                 mem_cgroup_uncharge_start();
@@ -494,7 +525,8 @@ void shmem_truncate_range(struct inode *inode, loff_t lstart, loff_t lend)
                         }
                         unlock_page(page);
                 }
-                shmem_pagevec_release(&pvec);
+                shmem_deswap_pagevec(&pvec);
+                pagevec_release(&pvec);
                 mem_cgroup_uncharge_end();
                 index++;
         }
@@ -1068,13 +1100,6 @@ int shmem_lock(struct file *file, int lock, struct user_struct *user)
                 user_shm_unlock(inode->i_size, user);
                 info->flags &= ~VM_LOCKED;
                 mapping_clear_unevictable(file->f_mapping);
-                /*
-                 * Ensure that a racing putback_lru_page() can see
-                 * the pages of this mapping are evictable when we
-                 * skip them due to !PageLRU during the scan.
-                 */
-                smp_mb__after_clear_bit();
-                scan_mapping_unevictable_pages(file->f_mapping);
         }
         retval = 0;
 
@@ -2445,6 +2470,10 @@ int shmem_lock(struct file *file, int lock, struct user_struct *user)
         return 0;
 }
 
+void shmem_unlock_mapping(struct address_space *mapping)
+{
+}
+
 void shmem_truncate_range(struct inode *inode, loff_t lstart, loff_t lend)
 {
         truncate_inode_pages_range(inode->i_mapping, lstart, lend);
diff --git a/mm/swap.c b/mm/swap.c
index b0f529b38979..fff1ff7fb9ad 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -659,7 +659,7 @@ void lru_add_page_tail(struct zone* zone,
         VM_BUG_ON(!PageHead(page));
         VM_BUG_ON(PageCompound(page_tail));
         VM_BUG_ON(PageLRU(page_tail));
-        VM_BUG_ON(!spin_is_locked(&zone->lru_lock));
+        VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&zone->lru_lock));
 
         SetPageLRU(page_tail);
 
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 2880396f7953..c52b23552659 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -26,7 +26,6 @@
 #include <linux/buffer_head.h>  /* for try_to_release_page(),
                                         buffer_heads_over_limit */
 #include <linux/mm_inline.h>
-#include <linux/pagevec.h>
 #include <linux/backing-dev.h>
 #include <linux/rmap.h>
 #include <linux/topology.h>
@@ -661,7 +660,7 @@ redo:
                  * When racing with an mlock or AS_UNEVICTABLE clearing
                  * (page is unlocked) make sure that if the other thread
                  * does not observe our setting of PG_lru and fails
-                 * isolation/check_move_unevictable_page,
+                 * isolation/check_move_unevictable_pages,
                  * we see PG_mlocked/AS_UNEVICTABLE cleared below and move
                  * the page back to the evictable list.
                  *
@@ -3499,100 +3498,61 @@ int page_evictable(struct page *page, struct vm_area_struct *vma)
         return 1;
 }
 
+#ifdef CONFIG_SHMEM
 /**
- * check_move_unevictable_page - check page for evictability and move to appropriate zone lru list
- * @page: page to check evictability and move to appropriate lru list
- * @zone: zone page is in
+ * check_move_unevictable_pages - check pages for evictability and move to appropriate zone lru list
+ * @pages:      array of pages to check
+ * @nr_pages:   number of pages to check
  *
- * Checks a page for evictability and moves the page to the appropriate
- * zone lru list.
+ * Checks pages for evictability and moves them to the appropriate lru list.
  *
- * Restrictions: zone->lru_lock must be held, page must be on LRU and must
- * have PageUnevictable set.
+ * This function is only used for SysV IPC SHM_UNLOCK.
  */
-static void check_move_unevictable_page(struct page *page, struct zone *zone)
+void check_move_unevictable_pages(struct page **pages, int nr_pages)
 {
         struct lruvec *lruvec;
+        struct zone *zone = NULL;
+        int pgscanned = 0;
+        int pgrescued = 0;
+        int i;
 
-        VM_BUG_ON(PageActive(page));
-retry:
-        ClearPageUnevictable(page);
-        if (page_evictable(page, NULL)) {
-                enum lru_list l = page_lru_base_type(page);
-
-                __dec_zone_state(zone, NR_UNEVICTABLE);
-                lruvec = mem_cgroup_lru_move_lists(zone, page,
-                                                   LRU_UNEVICTABLE, l);
-                list_move(&page->lru, &lruvec->lists[l]);
-                __inc_zone_state(zone, NR_INACTIVE_ANON + l);
-                __count_vm_event(UNEVICTABLE_PGRESCUED);
-        } else {
-                /*
-                 * rotate unevictable list
-                 */
-                SetPageUnevictable(page);
-                lruvec = mem_cgroup_lru_move_lists(zone, page, LRU_UNEVICTABLE,
-                                                   LRU_UNEVICTABLE);
-                list_move(&page->lru, &lruvec->lists[LRU_UNEVICTABLE]);
-                if (page_evictable(page, NULL))
-                        goto retry;
-        }
-}
-
-/**
- * scan_mapping_unevictable_pages - scan an address space for evictable pages
- * @mapping: struct address_space to scan for evictable pages
- *
- * Scan all pages in mapping.  Check unevictable pages for
- * evictability and move them to the appropriate zone lru list.
- */
-void scan_mapping_unevictable_pages(struct address_space *mapping)
-{
-        pgoff_t next = 0;
-        pgoff_t end   = (i_size_read(mapping->host) + PAGE_CACHE_SIZE - 1) >>
-                         PAGE_CACHE_SHIFT;
-        struct zone *zone;
-        struct pagevec pvec;
-
-        if (mapping->nrpages == 0)
-                return;
-
-        pagevec_init(&pvec, 0);
-        while (next < end &&
-                pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
-                int i;
-                int pg_scanned = 0;
-
-                zone = NULL;
-
-                for (i = 0; i < pagevec_count(&pvec); i++) {
-                        struct page *page = pvec.pages[i];
-                        pgoff_t page_index = page->index;
-                        struct zone *pagezone = page_zone(page);
+        for (i = 0; i < nr_pages; i++) {
+                struct page *page = pages[i];
+                struct zone *pagezone;
 
-                        pg_scanned++;
-                        if (page_index > next)
-                                next = page_index;
-                        next++;
+                pgscanned++;
+                pagezone = page_zone(page);
+                if (pagezone != zone) {
+                        if (zone)
+                                spin_unlock_irq(&zone->lru_lock);
+                        zone = pagezone;
+                        spin_lock_irq(&zone->lru_lock);
+                }
 
-                        if (pagezone != zone) {
-                                if (zone)
-                                        spin_unlock_irq(&zone->lru_lock);
-                                zone = pagezone;
-                                spin_lock_irq(&zone->lru_lock);
-                        }
+                if (!PageLRU(page) || !PageUnevictable(page))
+                        continue;
 
-                        if (PageLRU(page) && PageUnevictable(page))
-                                check_move_unevictable_page(page, zone);
+                if (page_evictable(page, NULL)) {
+                        enum lru_list lru = page_lru_base_type(page);
+
+                        VM_BUG_ON(PageActive(page));
+                        ClearPageUnevictable(page);
+                        __dec_zone_state(zone, NR_UNEVICTABLE);
+                        lruvec = mem_cgroup_lru_move_lists(zone, page,
+                                                LRU_UNEVICTABLE, lru);
+                        list_move(&page->lru, &lruvec->lists[lru]);
+                        __inc_zone_state(zone, NR_INACTIVE_ANON + lru);
+                        pgrescued++;
                 }
-                if (zone)
-                        spin_unlock_irq(&zone->lru_lock);
-                pagevec_release(&pvec);
-
-                count_vm_events(UNEVICTABLE_PGSCANNED, pg_scanned);
         }
 
+        if (zone) {
+                __count_vm_events(UNEVICTABLE_PGRESCUED, pgrescued);
+                __count_vm_events(UNEVICTABLE_PGSCANNED, pgscanned);
+                spin_unlock_irq(&zone->lru_lock);
+        }
 }
+#endif /* CONFIG_SHMEM */
 
 static void warn_scan_unevictable_pages(void)
 {
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 845da3ee56a0..9de93714213a 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -55,7 +55,7 @@
 
 #define AUTO_OFF_TIMEOUT 2000
 
-int enable_hs;
+bool enable_hs;
 
 static void hci_rx_work(struct work_struct *work);
 static void hci_cmd_work(struct work_struct *work);
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 673728add60b..82c57069415f 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -59,8 +59,6 @@ struct cfcnfg *get_cfcnfg(struct net *net)
 {
         struct caif_net *caifn;
         caifn = net_generic(net, caif_net_id);
-        if (!caifn)
-                return NULL;
         return caifn->cfg;
 }
 EXPORT_SYMBOL(get_cfcnfg);
@@ -69,8 +67,6 @@ static struct caif_device_entry_list *caif_device_list(struct net *net)
 {
         struct caif_net *caifn;
         caifn = net_generic(net, caif_net_id);
-        if (!caifn)
-                return NULL;
         return &caifn->caifdevs;
 }
 
@@ -99,8 +95,6 @@ static struct caif_device_entry *caif_device_alloc(struct net_device *dev)
         struct caif_device_entry *caifd;
 
         caifdevs = caif_device_list(dev_net(dev));
-        if (!caifdevs)
-                return NULL;
 
         caifd = kzalloc(sizeof(*caifd), GFP_KERNEL);
         if (!caifd)
@@ -120,8 +114,6 @@ static struct caif_device_entry *caif_get(struct net_device *dev)
         struct caif_device_entry_list *caifdevs =
             caif_device_list(dev_net(dev));
         struct caif_device_entry *caifd;
-        if (!caifdevs)
-                return NULL;
 
         list_for_each_entry_rcu(caifd, &caifdevs->list, list) {
                 if (caifd->netdev == dev)
@@ -321,8 +313,6 @@ void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,
         struct caif_device_entry_list *caifdevs;
 
         caifdevs = caif_device_list(dev_net(dev));
-        if (!cfg || !caifdevs)
-                return;
         caifd = caif_device_alloc(dev);
         if (!caifd)
                 return;
@@ -374,8 +364,6 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
 
         cfg = get_cfcnfg(dev_net(dev));
         caifdevs = caif_device_list(dev_net(dev));
-        if (!cfg || !caifdevs)
-                return 0;
 
         caifd = caif_get(dev);
         if (caifd == NULL && dev->type != ARPHRD_CAIF)
@@ -507,9 +495,6 @@ static struct notifier_block caif_device_notifier = {
 static int caif_init_net(struct net *net)
 {
         struct caif_net *caifn = net_generic(net, caif_net_id);
-        if (WARN_ON(!caifn))
-                return -EINVAL;
-
         INIT_LIST_HEAD(&caifn->caifdevs.list);
         mutex_init(&caifn->caifdevs.lock);
 
@@ -527,9 +512,6 @@ static void caif_exit_net(struct net *net)
             caif_device_list(net);
         struct cfcnfg *cfg =  get_cfcnfg(net);
 
-        if (!cfg || !caifdevs)
-                return;
-
         rtnl_lock();
         mutex_lock(&caifdevs->lock);
 
@@ -569,7 +551,7 @@ static int __init caif_device_init(void)
 {
         int result;
 
-        result = register_pernet_device(&caif_net_ops);
+        result = register_pernet_subsys(&caif_net_ops);
 
         if (result)
                 return result;
@@ -582,7 +564,7 @@ static int __init caif_device_init(void)
 
 static void __exit caif_device_exit(void)
 {
-        unregister_pernet_device(&caif_net_ops);
+        unregister_pernet_subsys(&caif_net_ops);
         unregister_netdevice_notifier(&caif_device_notifier);
         dev_remove_pack(&caif_packet_type);
 }
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index a98628086452..a97d97a3a512 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -539,8 +539,10 @@ static int transmit_skb(struct sk_buff *skb, struct caifsock *cf_sk,
         pkt = cfpkt_fromnative(CAIF_DIR_OUT, skb);
         memset(skb->cb, 0, sizeof(struct caif_payload_info));
 
-        if (cf_sk->layer.dn == NULL)
+        if (cf_sk->layer.dn == NULL) {
+                kfree_skb(skb);
                 return -EINVAL;
+        }
 
         return cf_sk->layer.dn->transmit(cf_sk->layer.dn, pkt);
 }
@@ -683,10 +685,10 @@ static int caif_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
                 }
                 err = transmit_skb(skb, cf_sk,
                                 msg->msg_flags&MSG_DONTWAIT, timeo);
-                if (err < 0) {
-                        kfree_skb(skb);
+                if (err < 0)
+                        /* skb is already freed */
                         goto pipe_err;
-                }
+
                 sent += size;
         }
 
diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c
index 598aafb4cb51..ba9cfd47778a 100644
--- a/net/caif/cfcnfg.c
+++ b/net/caif/cfcnfg.c
@@ -309,7 +309,6 @@ int caif_connect_client(struct net *net, struct caif_connect_request *conn_req,
         int err;
         struct cfctrl_link_param param;
         struct cfcnfg *cfg = get_cfcnfg(net);
-        caif_assert(cfg != NULL);
 
         rcu_read_lock();
         err = caif_connect_req_to_link_param(cfg, conn_req, &param);
diff --git a/net/caif/cfmuxl.c b/net/caif/cfmuxl.c
index b36f24a4c8e7..94b08612a4d8 100644
--- a/net/caif/cfmuxl.c
+++ b/net/caif/cfmuxl.c
@@ -248,7 +248,6 @@ static void cfmuxl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
 {
         struct cfmuxl *muxl = container_obj(layr);
         struct cflayer *layer;
-        int idx;
 
         rcu_read_lock();
         list_for_each_entry_rcu(layer, &muxl->srvl_list, node) {
@@ -257,14 +256,9 @@ static void cfmuxl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
 
                         if ((ctrl == _CAIF_CTRLCMD_PHYIF_DOWN_IND ||
                                 ctrl == CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND) &&
-                                        layer->id != 0) {
-
-                                idx = layer->id % UP_CACHE_SIZE;
-                                spin_lock_bh(&muxl->receive_lock);
-                                RCU_INIT_POINTER(muxl->up_cache[idx], NULL);
-                                list_del_rcu(&layer->node);
-                                spin_unlock_bh(&muxl->receive_lock);
-                        }
+                                        layer->id != 0)
+                                cfmuxl_remove_uplayer(layr, layer->id);
+
                         /* NOTE: ctrlcmd is not allowed to block */
                         layer->ctrlcmd(layer, ctrl, phyid);
                 }
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 97f70e50ad3b..761ad9d6cc3b 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -85,8 +85,6 @@ int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid)
         } else {
                 pr_info("client%lld fsid %pU\n", ceph_client_id(client), fsid);
                 memcpy(&client->fsid, fsid, sizeof(*fsid));
-                ceph_debugfs_client_init(client);
-                client->have_fsid = true;
         }
         return 0;
 }
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index 0b62deae42bd..1845cde26227 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -8,8 +8,8 @@
 
 #include <linux/ceph/mon_client.h>
 #include <linux/ceph/libceph.h>
+#include <linux/ceph/debugfs.h>
 #include <linux/ceph/decode.h>
-
 #include <linux/ceph/auth.h>
 
 /*
@@ -340,8 +340,19 @@ static void ceph_monc_handle_map(struct ceph_mon_client *monc,
         client->monc.monmap = monmap;
         kfree(old);
 
+        if (!client->have_fsid) {
+                client->have_fsid = true;
+                mutex_unlock(&monc->mutex);
+                /*
+                 * do debugfs initialization without mutex to avoid
+                 * creating a locking dependency
+                 */
+                ceph_debugfs_client_init(client);
+                goto out_unlocked;
+        }
 out:
         mutex_unlock(&monc->mutex);
+out_unlocked:
         wake_up_all(&client->auth_wq);
 }
 
diff --git a/net/core/dev.c b/net/core/dev.c
index 115dee1d985d..6ca32f6b3105 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3500,14 +3500,20 @@ static inline gro_result_t
 __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
 {
         struct sk_buff *p;
+        unsigned int maclen = skb->dev->hard_header_len;
 
         for (p = napi->gro_list; p; p = p->next) {
                 unsigned long diffs;
 
                 diffs = (unsigned long)p->dev ^ (unsigned long)skb->dev;
                 diffs |= p->vlan_tci ^ skb->vlan_tci;
-                diffs |= compare_ether_header(skb_mac_header(p),
-                                              skb_gro_mac_header(skb));
+                if (maclen == ETH_HLEN)
+                        diffs |= compare_ether_header(skb_mac_header(p),
+                                                      skb_gro_mac_header(skb));
+                else if (!diffs)
+                        diffs = memcmp(skb_mac_header(p),
+                                       skb_gro_mac_header(skb),
+                                       maclen);
                 NAPI_GRO_CB(p)->same_flow = !diffs;
                 NAPI_GRO_CB(p)->flush = 0;
         }
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 921aa2b4b415..3f79db1b612a 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -1190,6 +1190,8 @@ static noinline_for_stack int ethtool_flash_device(struct net_device *dev,
         if (!dev->ethtool_ops->flash_device)
                 return -EOPNOTSUPP;
 
+        efl.data[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0;
+
         return dev->ethtool_ops->flash_device(dev, &efl);
 }
 
@@ -1311,6 +1313,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
         case ETHTOOL_GRXCSUM:
         case ETHTOOL_GTXCSUM:
         case ETHTOOL_GSG:
+        case ETHTOOL_GSSET_INFO:
         case ETHTOOL_GSTRINGS:
         case ETHTOOL_GTSO:
         case ETHTOOL_GPERMADDR:
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 0985b9b14b80..a225089df5b6 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -1,4 +1,5 @@
 #include <linux/skbuff.h>
+#include <linux/export.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/if_vlan.h>
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index aefcd7acbffa..0e950fda9a0a 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -30,6 +30,20 @@ EXPORT_SYMBOL(init_net);
 
 #define INITIAL_NET_GEN_PTRS    13 /* +1 for len +2 for rcu_head */
 
+static unsigned int max_gen_ptrs = INITIAL_NET_GEN_PTRS;
+
+static struct net_generic *net_alloc_generic(void)
+{
+        struct net_generic *ng;
+        size_t generic_size = offsetof(struct net_generic, ptr[max_gen_ptrs]);
+
+        ng = kzalloc(generic_size, GFP_KERNEL);
+        if (ng)
+                ng->len = max_gen_ptrs;
+
+        return ng;
+}
+
 static int net_assign_generic(struct net *net, int id, void *data)
 {
         struct net_generic *ng, *old_ng;
@@ -43,8 +57,7 @@ static int net_assign_generic(struct net *net, int id, void *data)
         if (old_ng->len >= id)
                 goto assign;
 
-        ng = kzalloc(sizeof(struct net_generic) +
-                        id * sizeof(void *), GFP_KERNEL);
+        ng = net_alloc_generic();
         if (ng == NULL)
                 return -ENOMEM;
 
@@ -59,7 +72,6 @@ static int net_assign_generic(struct net *net, int id, void *data)
          * the old copy for kfree after a grace period.
          */
 
-        ng->len = id;
         memcpy(&ng->ptr, &old_ng->ptr, old_ng->len * sizeof(void*));
 
         rcu_assign_pointer(net->gen, ng);
@@ -161,18 +173,6 @@ out_undo:
         goto out;
 }
 
-static struct net_generic *net_alloc_generic(void)
-{
-        struct net_generic *ng;
-        size_t generic_size = sizeof(struct net_generic) +
-                INITIAL_NET_GEN_PTRS * sizeof(void *);
-
-        ng = kzalloc(generic_size, GFP_KERNEL);
-        if (ng)
-                ng->len = INITIAL_NET_GEN_PTRS;
-
-        return ng;
-}
 
 #ifdef CONFIG_NET_NS
 static struct kmem_cache *net_cachep;
@@ -483,6 +483,7 @@ again:
                         }
                         return error;
                 }
+                max_gen_ptrs = max_t(unsigned int, max_gen_ptrs, *ops->id);
         }
         error = __register_pernet_operations(list, ops);
         if (error) {
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 556b08298669..ddefc513b44a 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -194,7 +194,7 @@ static void netpoll_poll_dev(struct net_device *dev)
 
         poll_napi(dev);
 
-        if (dev->priv_flags & IFF_SLAVE) {
+        if (dev->flags & IFF_SLAVE) {
                 if (dev->npinfo) {
                         struct net_device *bond_dev = dev->master;
                         struct sk_buff *skb;
diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
index 3a9fd4826b75..4dacc44637ef 100644
--- a/net/core/netprio_cgroup.c
+++ b/net/core/netprio_cgroup.c
@@ -58,11 +58,12 @@ static int get_prioidx(u32 *prio)
 
         spin_lock_irqsave(&prioidx_map_lock, flags);
         prioidx = find_first_zero_bit(prioidx_map, sizeof(unsigned long) * PRIOIDX_SZ);
+        if (prioidx == sizeof(unsigned long) * PRIOIDX_SZ) {
+                spin_unlock_irqrestore(&prioidx_map_lock, flags);
+                return -ENOSPC;
+        }
         set_bit(prioidx, prioidx_map);
         spin_unlock_irqrestore(&prioidx_map_lock, flags);
-        if (prioidx == sizeof(unsigned long) * PRIOIDX_SZ)
-                return -ENOSPC;
-
         atomic_set(&max_prioidx, prioidx);
         *prio = prioidx;
         return 0;
@@ -107,7 +108,7 @@ static void extend_netdev_table(struct net_device *dev, u32 new_len)
 static void update_netdev_tables(void)
 {
         struct net_device *dev;
-        u32 max_len = atomic_read(&max_prioidx);
+        u32 max_len = atomic_read(&max_prioidx) + 1;
         struct netprio_map *map;
 
         rtnl_lock();
@@ -270,7 +271,6 @@ static int netprio_device_event(struct notifier_block *unused,
 {
         struct net_device *dev = ptr;
         struct netprio_map *old;
-        u32 max_len = atomic_read(&max_prioidx);
 
         /*
          * Note this is called with rtnl_lock held so we have update side
@@ -278,11 +278,6 @@ static int netprio_device_event(struct notifier_block *unused,
          */
 
         switch (event) {
-
-        case NETDEV_REGISTER:
-                if (max_len)
-                        extend_netdev_table(dev, max_len);
-                break;
         case NETDEV_UNREGISTER:
                 old = rtnl_dereference(dev->priomap);
                 RCU_INIT_POINTER(dev->priomap, NULL);
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 65f80c7b1656..4d8ce93cd503 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -767,8 +767,8 @@ done:
         return i;
 }
 
-static unsigned long num_arg(const char __user * user_buffer,
-                             unsigned long maxlen, unsigned long *num)
+static long num_arg(const char __user *user_buffer, unsigned long maxlen,
+                                unsigned long *num)
 {
         int i;
         *num = 0;
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index f16444bc6cbb..65aebd450027 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1509,6 +1509,9 @@ errout:
 
         if (send_addr_notify)
                 call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
+        min_ifinfo_dump_size = max_t(u16, if_nlmsg_size(dev),
+                                     min_ifinfo_dump_size);
+
         return err;
 }
 
diff --git a/net/core/sock.c b/net/core/sock.c
index 5c5af9988f94..02f8dfe320b7 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1171,13 +1171,10 @@ EXPORT_SYMBOL(sock_update_classid);
 
 void sock_update_netprioidx(struct sock *sk)
 {
-        struct cgroup_netprio_state *state;
         if (in_interrupt())
                 return;
-        rcu_read_lock();
-        state = task_netprio_state(current);
-        sk->sk_cgrp_prioidx = state ? state->prioidx : 0;
-        rcu_read_unlock();
+
+        sk->sk_cgrp_prioidx = task_netprioidx(current);
 }
 EXPORT_SYMBOL_GPL(sock_update_netprioidx);
 #endif
@@ -1827,7 +1824,7 @@ suppress_allocation:
         /* Alas. Undo changes. */
         sk->sk_forward_alloc -= amt * SK_MEM_QUANTUM;
 
-        sk_memory_allocated_sub(sk, amt, parent_status);
+        sk_memory_allocated_sub(sk, amt);
 
         return 0;
 }
@@ -1840,7 +1837,7 @@ EXPORT_SYMBOL(__sk_mem_schedule);
 void __sk_mem_reclaim(struct sock *sk)
 {
         sk_memory_allocated_sub(sk,
-                                sk->sk_forward_alloc >> SK_MEM_QUANTUM_SHIFT, 0);
+                                sk->sk_forward_alloc >> SK_MEM_QUANTUM_SHIFT);
         sk->sk_forward_alloc &= SK_MEM_QUANTUM - 1;
 
         if (sk_under_memory_pressure(sk) &&
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index aa2a2c79776f..d183262943d9 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -409,7 +409,7 @@ config INET_TCP_DIAG
 
 config INET_UDP_DIAG
         tristate "UDP: socket monitoring interface"
-        depends on INET_DIAG
+        depends on INET_DIAG && (IPV6 || IPV6=n)
         default n
         ---help---
           Support for UDP socket monitoring interface used by the ss tool.
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 59402be133f0..63e49890ad31 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -863,7 +863,8 @@ static int arp_process(struct sk_buff *skb)
                         if (addr_type == RTN_UNICAST  &&
                             (arp_fwd_proxy(in_dev, dev, rt) ||
                              arp_fwd_pvlan(in_dev, dev, rt, sip, tip) ||
-                             pneigh_lookup(&arp_tbl, net, &tip, dev, 0))) {
+                             (rt->dst.dev != dev &&
+                              pneigh_lookup(&arp_tbl, net, &tip, dev, 0)))) {
                                 n = neigh_event_ns(&arp_tbl, sha, &sip, dev);
                                 if (n)
                                         neigh_release(n);
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 2e4e24476c4c..19d66cefd7d3 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -123,11 +123,14 @@ again:
                                                 smallest_size = tb->num_owners;
                                                 smallest_rover = rover;
                                                 if (atomic_read(&hashinfo->bsockets) > (high - low) + 1) {
-                                                        spin_unlock(&head->lock);
                                                         snum = smallest_rover;
-                                                        goto have_snum;
+                                                        goto tb_found;
                                                 }
                                         }
+                                        if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) {
+                                                snum = rover;
+                                                goto tb_found;
+                                        }
                                         goto next;
                                 }
                         break;
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 2b53a1f7abf6..6b3ca5ba4450 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -422,6 +422,10 @@ static struct ip_tunnel *ipgre_tunnel_locate(struct net *net,
         if (register_netdevice(dev) < 0)
                 goto failed_free;
 
+        /* Can use a lockless transmit, unless we generate output sequences */
+        if (!(nt->parms.o_flags & GRE_SEQ))
+                dev->features |= NETIF_F_LLTX;
+
         dev_hold(dev);
         ipgre_tunnel_link(ign, nt);
         return nt;
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index 1e60f7679075..42dd1a90edea 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -573,8 +573,8 @@ void ip_forward_options(struct sk_buff *skb)
                 }
                 if (srrptr + 3 <= srrspace) {
                         opt->is_changed = 1;
-                        ip_rt_get_source(&optptr[srrptr-1], skb, rt);
                         ip_hdr(skb)->daddr = opt->nexthop;
+                        ip_rt_get_source(&optptr[srrptr-1], skb, rt);
                         optptr[2] = srrptr+4;
                 } else if (net_ratelimit())
                         printk(KERN_CRIT "ip_forward(): Argh! Destination lost!\n");
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 3569d8ecaeac..6afc807ee2ad 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -216,7 +216,6 @@ static const struct snmp_mib snmp4_net_list[] = {
         SNMP_MIB_ITEM("TCPPartialUndo", LINUX_MIB_TCPPARTIALUNDO),
         SNMP_MIB_ITEM("TCPDSACKUndo", LINUX_MIB_TCPDSACKUNDO),
         SNMP_MIB_ITEM("TCPLossUndo", LINUX_MIB_TCPLOSSUNDO),
-        SNMP_MIB_ITEM("TCPLoss", LINUX_MIB_TCPLOSS),
         SNMP_MIB_ITEM("TCPLostRetransmit", LINUX_MIB_TCPLOSTRETRANSMIT),
         SNMP_MIB_ITEM("TCPRenoFailures", LINUX_MIB_TCPRENOFAILURES),
         SNMP_MIB_ITEM("TCPSackFailures", LINUX_MIB_TCPSACKFAILURES),
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 4aa7e9dc0cbb..7a7724da9bff 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -778,7 +778,6 @@ EXPORT_SYMBOL_GPL(net_ipv4_ctl_path);
 static __net_init int ipv4_sysctl_init_net(struct net *net)
 {
         struct ctl_table *table;
-        unsigned long limit;
 
         table = ipv4_net_table;
         if (!net_eq(net, &init_net)) {
@@ -814,11 +813,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
 
         net->ipv4.sysctl_rt_cache_rebuild_count = 4;
 
-        limit = nr_free_buffer_pages() / 8;
-        limit = max(limit, 128UL);
-        net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3;
-        net->ipv4.sysctl_tcp_mem[1] = limit;
-        net->ipv4.sysctl_tcp_mem[2] = net->ipv4.sysctl_tcp_mem[0] * 2;
+        tcp_init_mem(net);
 
         net->ipv4.ipv4_hdr = register_net_sysctl_table(net,
                         net_ipv4_ctl_path, table);
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 9bcdec3ad772..22ef5f9fd2ff 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1876,6 +1876,20 @@ void tcp_shutdown(struct sock *sk, int how)
 }
 EXPORT_SYMBOL(tcp_shutdown);
 
+bool tcp_check_oom(struct sock *sk, int shift)
+{
+        bool too_many_orphans, out_of_socket_memory;
+
+        too_many_orphans = tcp_too_many_orphans(sk, shift);
+        out_of_socket_memory = tcp_out_of_memory(sk);
+
+        if (too_many_orphans && net_ratelimit())
+                pr_info("TCP: too many orphaned sockets\n");
+        if (out_of_socket_memory && net_ratelimit())
+                pr_info("TCP: out of memory -- consider tuning tcp_mem\n");
+        return too_many_orphans || out_of_socket_memory;
+}
+
 void tcp_close(struct sock *sk, long timeout)
 {
         struct sk_buff *skb;
@@ -2015,10 +2029,7 @@ adjudge_to_death:
         }
         if (sk->sk_state != TCP_CLOSE) {
                 sk_mem_reclaim(sk);
-                if (tcp_too_many_orphans(sk, 0)) {
-                        if (net_ratelimit())
-                                printk(KERN_INFO "TCP: too many of orphaned "
-                                       "sockets\n");
+                if (tcp_check_oom(sk, 0)) {
                         tcp_set_state(sk, TCP_CLOSE);
                         tcp_send_active_reset(sk, GFP_ATOMIC);
                         NET_INC_STATS_BH(sock_net(sk),
@@ -3216,11 +3227,21 @@ static int __init set_thash_entries(char *str)
 }
 __setup("thash_entries=", set_thash_entries);
 
+void tcp_init_mem(struct net *net)
+{
+        unsigned long limit = nr_free_buffer_pages() / 8;
+        limit = max(limit, 128UL);
+        net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3;
+        net->ipv4.sysctl_tcp_mem[1] = limit;
+        net->ipv4.sysctl_tcp_mem[2] = net->ipv4.sysctl_tcp_mem[0] * 2;
+}
+
 void __init tcp_init(void)
 {
         struct sk_buff *skb = NULL;
         unsigned long limit;
-        int i, max_share, cnt;
+        int max_share, cnt;
+        unsigned int i;
         unsigned long jiffy = jiffies;
 
         BUILD_BUG_ON(sizeof(struct tcp_skb_cb) > sizeof(skb->cb));
@@ -3263,7 +3284,7 @@ void __init tcp_init(void)
                                         &tcp_hashinfo.bhash_size,
                                         NULL,
                                         64 * 1024);
-        tcp_hashinfo.bhash_size = 1 << tcp_hashinfo.bhash_size;
+        tcp_hashinfo.bhash_size = 1U << tcp_hashinfo.bhash_size;
         for (i = 0; i < tcp_hashinfo.bhash_size; i++) {
                 spin_lock_init(&tcp_hashinfo.bhash[i].lock);
                 INIT_HLIST_HEAD(&tcp_hashinfo.bhash[i].chain);
@@ -3276,9 +3297,10 @@ void __init tcp_init(void)
         sysctl_tcp_max_orphans = cnt / 2;
         sysctl_max_syn_backlog = max(128, cnt / 256);
 
+        tcp_init_mem(&init_net);
         /* Set per-socket limits to no more than 1/128 the pressure threshold */
-        limit = ((unsigned long)init_net.ipv4.sysctl_tcp_mem[1])
-                << (PAGE_SHIFT - 7);
+        limit = nr_free_buffer_pages() << (PAGE_SHIFT - 10);
+        limit = max(limit, 128UL);
         max_share = min(4UL*1024*1024, limit);
 
         sysctl_tcp_wmem[0] = SK_MEM_QUANTUM;
diff --git a/net/ipv4/tcp_bic.c b/net/ipv4/tcp_bic.c
index 6187eb4d1dcf..f45e1c242440 100644
--- a/net/ipv4/tcp_bic.c
+++ b/net/ipv4/tcp_bic.c
@@ -63,7 +63,6 @@ static inline void bictcp_reset(struct bictcp *ca)
 {
         ca->cnt = 0;
         ca->last_max_cwnd = 0;
-        ca->loss_cwnd = 0;
         ca->last_cwnd = 0;
         ca->last_time = 0;
         ca->epoch_start = 0;
@@ -72,7 +71,11 @@ static inline void bictcp_reset(struct bictcp *ca)
 
 static void bictcp_init(struct sock *sk)
 {
-        bictcp_reset(inet_csk_ca(sk));
+        struct bictcp *ca = inet_csk_ca(sk);
+
+        bictcp_reset(ca);
+        ca->loss_cwnd = 0;
+
         if (initial_ssthresh)
                 tcp_sk(sk)->snd_ssthresh = initial_ssthresh;
 }
@@ -127,7 +130,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd)
         }
 
         /* if in slow start or link utilization is very low */
-        if (ca->loss_cwnd == 0) {
+        if (ca->last_max_cwnd == 0) {
                 if (ca->cnt > 20) /* increase cwnd 5% per RTT */
                         ca->cnt = 20;
         }
@@ -185,7 +188,7 @@ static u32 bictcp_undo_cwnd(struct sock *sk)
 {
         const struct tcp_sock *tp = tcp_sk(sk);
         const struct bictcp *ca = inet_csk_ca(sk);
-        return max(tp->snd_cwnd, ca->last_max_cwnd);
+        return max(tp->snd_cwnd, ca->loss_cwnd);
 }
 
 static void bictcp_state(struct sock *sk, u8 new_state)
diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c
index f376b05cca81..a9077f441cb2 100644
--- a/net/ipv4/tcp_cubic.c
+++ b/net/ipv4/tcp_cubic.c
@@ -107,7 +107,6 @@ static inline void bictcp_reset(struct bictcp *ca)
 {
         ca->cnt = 0;
         ca->last_max_cwnd = 0;
-        ca->loss_cwnd = 0;
         ca->last_cwnd = 0;
         ca->last_time = 0;
         ca->bic_origin_point = 0;
@@ -142,7 +141,10 @@ static inline void bictcp_hystart_reset(struct sock *sk)
 
 static void bictcp_init(struct sock *sk)
 {
-        bictcp_reset(inet_csk_ca(sk));
+        struct bictcp *ca = inet_csk_ca(sk);
+
+        bictcp_reset(ca);
+        ca->loss_cwnd = 0;
 
         if (hystart)
                 bictcp_hystart_reset(sk);
@@ -275,7 +277,7 @@ static inline void bictcp_update(struct bictcp *ca, u32 cwnd)
          * The initial growth of cubic function may be too conservative
          * when the available bandwidth is still unknown.
          */
-        if (ca->loss_cwnd == 0 && ca->cnt > 20)
+        if (ca->last_max_cwnd == 0 && ca->cnt > 20)
                 ca->cnt = 20;   /* increase cwnd 5% per RTT */
 
         /* TCP Friendly */
@@ -342,7 +344,7 @@ static u32 bictcp_undo_cwnd(struct sock *sk)
 {
         struct bictcp *ca = inet_csk_ca(sk);
 
-        return max(tcp_sk(sk)->snd_cwnd, ca->last_max_cwnd);
+        return max(tcp_sk(sk)->snd_cwnd, ca->loss_cwnd);
 }
 
 static void bictcp_state(struct sock *sk, u8 new_state)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 2877c3e09587..53c8ce4046b2 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -105,7 +105,6 @@ int sysctl_tcp_abc __read_mostly;
 #define FLAG_SYN_ACKED          0x10 /* This ACK acknowledged SYN.              */
 #define FLAG_DATA_SACKED        0x20 /* New SACK.                               */
 #define FLAG_ECE                0x40 /* ECE in this ACK                         */
-#define FLAG_DATA_LOST          0x80 /* SACK detected data lossage.             */
 #define FLAG_SLOWPATH           0x100 /* Do not skip RFC checks for window update.*/
 #define FLAG_ONLY_ORIG_SACKED   0x200 /* SACKs only non-rexmit sent before RTO */
 #define FLAG_SND_UNA_ADVANCED   0x400 /* Snd_una was changed (!= FLAG_DATA_ACKED) */
@@ -1040,13 +1039,11 @@ static void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp,
  * These 6 states form finite state machine, controlled by the following events:
  * 1. New ACK (+SACK) arrives. (tcp_sacktag_write_queue())
  * 2. Retransmission. (tcp_retransmit_skb(), tcp_xmit_retransmit_queue())
- * 3. Loss detection event of one of three flavors:
+ * 3. Loss detection event of two flavors:
  *      A. Scoreboard estimator decided the packet is lost.
  *         A'. Reno "three dupacks" marks head of queue lost.
- *         A''. Its FACK modfication, head until snd.fack is lost.
- *      B. SACK arrives sacking data transmitted after never retransmitted
- *         hole was sent out.
- *      C. SACK arrives sacking SND.NXT at the moment, when the
+ *         A''. Its FACK modification, head until snd.fack is lost.
+ *      B. SACK arrives sacking SND.NXT at the moment, when the
  *         segment was retransmitted.
  * 4. D-SACK added new rule: D-SACK changes any tag to S.
  *
@@ -1153,7 +1150,7 @@ static int tcp_is_sackblock_valid(struct tcp_sock *tp, int is_dsack,
 }
 
 /* Check for lost retransmit. This superb idea is borrowed from "ratehalving".
- * Event "C". Later note: FACK people cheated me again 8), we have to account
+ * Event "B". Later note: FACK people cheated me again 8), we have to account
  * for reordering! Ugly, but should help.
  *
  * Search retransmitted skbs from write_queue that were sent when snd_nxt was
@@ -1310,25 +1307,26 @@ static int tcp_match_skb_to_sack(struct sock *sk, struct sk_buff *skb,
         return in_sack;
 }
 
-static u8 tcp_sacktag_one(const struct sk_buff *skb, struct sock *sk,
-                          struct tcp_sacktag_state *state,
+/* Mark the given newly-SACKed range as such, adjusting counters and hints. */
+static u8 tcp_sacktag_one(struct sock *sk,
+                          struct tcp_sacktag_state *state, u8 sacked,
+                          u32 start_seq, u32 end_seq,
                           int dup_sack, int pcount)
 {
         struct tcp_sock *tp = tcp_sk(sk);
-        u8 sacked = TCP_SKB_CB(skb)->sacked;
         int fack_count = state->fack_count;
 
         /* Account D-SACK for retransmitted packet. */
         if (dup_sack && (sacked & TCPCB_RETRANS)) {
                 if (tp->undo_marker && tp->undo_retrans &&
-                    after(TCP_SKB_CB(skb)->end_seq, tp->undo_marker))
+                    after(end_seq, tp->undo_marker))
                         tp->undo_retrans--;
                 if (sacked & TCPCB_SACKED_ACKED)
                         state->reord = min(fack_count, state->reord);
         }
 
         /* Nothing to do; acked frame is about to be dropped (was ACKed). */
-        if (!after(TCP_SKB_CB(skb)->end_seq, tp->snd_una))
+        if (!after(end_seq, tp->snd_una))
                 return sacked;
 
         if (!(sacked & TCPCB_SACKED_ACKED)) {
@@ -1347,13 +1345,13 @@ static u8 tcp_sacktag_one(const struct sk_buff *skb, struct sock *sk,
                                 /* New sack for not retransmitted frame,
                                  * which was in hole. It is reordering.
                                  */
-                                if (before(TCP_SKB_CB(skb)->seq,
+                                if (before(start_seq,
                                            tcp_highest_sack_seq(tp)))
                                         state->reord = min(fack_count,
                                                            state->reord);
 
                                 /* SACK enhanced F-RTO (RFC4138; Appendix B) */
-                                if (!after(TCP_SKB_CB(skb)->end_seq, tp->frto_highmark))
+                                if (!after(end_seq, tp->frto_highmark))
                                         state->flag |= FLAG_ONLY_ORIG_SACKED;
                         }
 
@@ -1371,8 +1369,7 @@ static u8 tcp_sacktag_one(const struct sk_buff *skb, struct sock *sk,
 
                 /* Lost marker hint past SACKed? Tweak RFC3517 cnt */
                 if (!tcp_is_fack(tp) && (tp->lost_skb_hint != NULL) &&
-                    before(TCP_SKB_CB(skb)->seq,
-                           TCP_SKB_CB(tp->lost_skb_hint)->seq))
+                    before(start_seq, TCP_SKB_CB(tp->lost_skb_hint)->seq))
                         tp->lost_cnt_hint += pcount;
 
                 if (fack_count > tp->fackets_out)
@@ -1391,6 +1388,9 @@ static u8 tcp_sacktag_one(const struct sk_buff *skb, struct sock *sk,
         return sacked;
 }
 
+/* Shift newly-SACKed bytes from this skb to the immediately previous
+ * already-SACKed sk_buff. Mark the newly-SACKed bytes as such.
+ */
 static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb,
                            struct tcp_sacktag_state *state,
                            unsigned int pcount, int shifted, int mss,
@@ -1398,10 +1398,13 @@ static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb,
 {
         struct tcp_sock *tp = tcp_sk(sk);
         struct sk_buff *prev = tcp_write_queue_prev(sk, skb);
+        u32 start_seq = TCP_SKB_CB(skb)->seq;   /* start of newly-SACKed */
+        u32 end_seq = start_seq + shifted;      /* end of newly-SACKed */
 
         BUG_ON(!pcount);
 
-        if (skb == tp->lost_skb_hint)
+        /* Adjust hint for FACK. Non-FACK is handled in tcp_sacktag_one(). */
+        if (tcp_is_fack(tp) && (skb == tp->lost_skb_hint))
                 tp->lost_cnt_hint += pcount;
 
         TCP_SKB_CB(prev)->end_seq += shifted;
@@ -1427,8 +1430,11 @@ static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb,
                 skb_shinfo(skb)->gso_type = 0;
         }
 
-        /* We discard results */
-        tcp_sacktag_one(skb, sk, state, dup_sack, pcount);
+        /* Adjust counters and hints for the newly sacked sequence range but
+         * discard the return value since prev is already marked.
+         */
+        tcp_sacktag_one(sk, state, TCP_SKB_CB(skb)->sacked,
+                        start_seq, end_seq, dup_sack, pcount);
 
         /* Difference in this won't matter, both ACKed by the same cumul. ACK */
         TCP_SKB_CB(prev)->sacked |= (TCP_SKB_CB(skb)->sacked & TCPCB_EVER_RETRANS);
@@ -1667,10 +1673,14 @@ static struct sk_buff *tcp_sacktag_walk(struct sk_buff *skb, struct sock *sk,
                         break;
 
                 if (in_sack) {
-                        TCP_SKB_CB(skb)->sacked = tcp_sacktag_one(skb, sk,
-                                                                  state,
-                                                                  dup_sack,
-                                                                  tcp_skb_pcount(skb));
+                        TCP_SKB_CB(skb)->sacked =
+                                tcp_sacktag_one(sk,
+                                                state,
+                                                TCP_SKB_CB(skb)->sacked,
+                                                TCP_SKB_CB(skb)->seq,
+                                                TCP_SKB_CB(skb)->end_seq,
+                                                dup_sack,
+                                                tcp_skb_pcount(skb));
 
                         if (!before(TCP_SKB_CB(skb)->seq,
                                     tcp_highest_sack_seq(tp)))
@@ -1844,10 +1854,6 @@ tcp_sacktag_write_queue(struct sock *sk, const struct sk_buff *ack_skb,
                 if (found_dup_sack && ((i + 1) == first_sack_index))
                         next_dup = &sp[i + 1];
 
-                /* Event "B" in the comment above. */
-                if (after(end_seq, tp->high_seq))
-                        state.flag |= FLAG_DATA_LOST;
-
                 /* Skip too early cached blocks */
                 while (tcp_sack_cache_ok(tp, cache) &&
                        !before(start_seq, cache->end_seq))
@@ -2515,8 +2521,11 @@ static void tcp_timeout_skbs(struct sock *sk)
         tcp_verify_left_out(tp);
 }
 
-/* Mark head of queue up as lost. With RFC3517 SACK, the packets is
- * is against sacked "cnt", otherwise it's against facked "cnt"
+/* Detect loss in event "A" above by marking head of queue up as lost.
+ * For FACK or non-SACK(Reno) senders, the first "packets" number of segments
+ * are considered lost. For RFC3517 SACK, a segment is considered lost if it
+ * has at least tp->reordering SACKed seqments above it; "packets" refers to
+ * the maximum SACKed segments to pass before reaching this limit.
  */
 static void tcp_mark_head_lost(struct sock *sk, int packets, int mark_head)
 {
@@ -2525,6 +2534,8 @@ static void tcp_mark_head_lost(struct sock *sk, int packets, int mark_head)
         int cnt, oldcnt;
         int err;
         unsigned int mss;
+        /* Use SACK to deduce losses of new sequences sent during recovery */
+        const u32 loss_high = tcp_is_sack(tp) ?  tp->snd_nxt : tp->high_seq;
 
         WARN_ON(packets > tp->packets_out);
         if (tp->lost_skb_hint) {
@@ -2546,7 +2557,7 @@ static void tcp_mark_head_lost(struct sock *sk, int packets, int mark_head)
                 tp->lost_skb_hint = skb;
                 tp->lost_cnt_hint = cnt;
 
-                if (after(TCP_SKB_CB(skb)->end_seq, tp->high_seq))
+                if (after(TCP_SKB_CB(skb)->end_seq, loss_high))
                         break;
 
                 oldcnt = cnt;
@@ -3033,19 +3044,10 @@ static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked,
         if (tcp_check_sack_reneging(sk, flag))
                 return;
 
-        /* C. Process data loss notification, provided it is valid. */
-        if (tcp_is_fack(tp) && (flag & FLAG_DATA_LOST) &&
-            before(tp->snd_una, tp->high_seq) &&
-            icsk->icsk_ca_state != TCP_CA_Open &&
-            tp->fackets_out > tp->reordering) {
-                tcp_mark_head_lost(sk, tp->fackets_out - tp->reordering, 0);
-                NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPLOSS);
-        }
-
-        /* D. Check consistency of the current state. */
+        /* C. Check consistency of the current state. */
         tcp_verify_left_out(tp);
 
-        /* E. Check state exit conditions. State can be terminated
+        /* D. Check state exit conditions. State can be terminated
          *    when high_seq is ACKed. */
         if (icsk->icsk_ca_state == TCP_CA_Open) {
                 WARN_ON(tp->retrans_out != 0);
@@ -3077,7 +3079,7 @@ static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked,
                 }
         }
 
-        /* F. Process state. */
+        /* E. Process state. */
         switch (icsk->icsk_ca_state) {
         case TCP_CA_Recovery:
                 if (!(flag & FLAG_SND_UNA_ADVANCED)) {
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 1eb4ad57670e..94d683a61cba 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -631,7 +631,7 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
         arg.iov[0].iov_len  = sizeof(rep.th);
 
 #ifdef CONFIG_TCP_MD5SIG
-        key = sk ? tcp_v4_md5_do_lookup(sk, ip_hdr(skb)->daddr) : NULL;
+        key = sk ? tcp_v4_md5_do_lookup(sk, ip_hdr(skb)->saddr) : NULL;
         if (key) {
                 rep.opt[0] = htonl((TCPOPT_NOP << 24) |
                                    (TCPOPT_NOP << 16) |
@@ -651,6 +651,11 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
                                       arg.iov[0].iov_len, IPPROTO_TCP, 0);
         arg.csumoffset = offsetof(struct tcphdr, check) / 2;
         arg.flags = (sk && inet_sk(sk)->transparent) ? IP_REPLY_ARG_NOSRCCHECK : 0;
+        /* When socket is gone, all binding information is lost.
+         * routing might fail in this case. using iif for oif to
+         * make sure we can deliver it
+         */
+        arg.bound_dev_if = sk ? sk->sk_bound_dev_if : inet_iif(skb);
 
         net = dev_net(skb_dst(skb)->dev);
         arg.tos = ip_hdr(skb)->tos;
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 8c8de2780c7a..4ff3b6dc74fc 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1141,11 +1141,9 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len)
         sk_mem_uncharge(sk, len);
         sock_set_flag(sk, SOCK_QUEUE_SHRUNK);
 
-        /* Any change of skb->len requires recalculation of tso
-         * factor and mss.
-         */
+        /* Any change of skb->len requires recalculation of tso factor. */
         if (tcp_skb_pcount(skb) > 1)
-                tcp_set_skb_tso_segs(sk, skb, tcp_current_mss(sk));
+                tcp_set_skb_tso_segs(sk, skb, tcp_skb_mss(skb));
 
         return 0;
 }
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index a516d1e399df..cd2e0723266d 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -77,10 +77,7 @@ static int tcp_out_of_resources(struct sock *sk, int do_reset)
         if (sk->sk_err_soft)
                 shift++;
 
-        if (tcp_too_many_orphans(sk, shift)) {
-                if (net_ratelimit())
-                        printk(KERN_INFO "Out of socket memory\n");
-
+        if (tcp_check_oom(sk, shift)) {
                 /* Catch exceptional cases, when connection requires reset.
                  *      1. Last segment was sent recently. */
                 if ((s32)(tcp_time_stamp - tp->lsndtime) <= TCP_TIMEWAIT_LEN ||
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index a225d5ee3c2f..c02280a4d126 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -502,29 +502,31 @@ static void addrconf_forward_change(struct net *net, __s32 newf)
         rcu_read_unlock();
 }
 
-static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old)
+static int addrconf_fixup_forwarding(struct ctl_table *table, int *p, int newf)
 {
         struct net *net;
+        int old;
+
+        if (!rtnl_trylock())
+                return restart_syscall();
 
         net = (struct net *)table->extra2;
-        if (p == &net->ipv6.devconf_dflt->forwarding)
-                return 0;
+        old = *p;
+        *p = newf;
 
-        if (!rtnl_trylock()) {
-                /* Restore the original values before restarting */
-                *p = old;
-                return restart_syscall();
+        if (p == &net->ipv6.devconf_dflt->forwarding) {
+                rtnl_unlock();
+                return 0;
         }
 
         if (p == &net->ipv6.devconf_all->forwarding) {
-                __s32 newf = net->ipv6.devconf_all->forwarding;
                 net->ipv6.devconf_dflt->forwarding = newf;
                 addrconf_forward_change(net, newf);
-        } else if ((!*p) ^ (!old))
+        } else if ((!newf) ^ (!old))
                 dev_forward_change((struct inet6_dev *)table->extra1);
         rtnl_unlock();
 
-        if (*p)
+        if (newf)
                 rt6_purge_dflt_routers(net);
         return 1;
 }
@@ -4260,9 +4262,17 @@ int addrconf_sysctl_forward(ctl_table *ctl, int write,
         int *valp = ctl->data;
         int val = *valp;
         loff_t pos = *ppos;
+        ctl_table lctl;
         int ret;
 
-        ret = proc_dointvec(ctl, write, buffer, lenp, ppos);
+        /*
+         * ctl->data points to idev->cnf.forwarding, we should
+         * not modify it until we get the rtnl lock.
+         */
+        lctl = *ctl;
+        lctl.data = &val;
+
+        ret = proc_dointvec(&lctl, write, buffer, lenp, ppos);
 
         if (write)
                 ret = addrconf_fixup_forwarding(ctl, valp, val);
@@ -4300,26 +4310,27 @@ static void addrconf_disable_change(struct net *net, __s32 newf)
         rcu_read_unlock();
 }
 
-static int addrconf_disable_ipv6(struct ctl_table *table, int *p, int old)
+static int addrconf_disable_ipv6(struct ctl_table *table, int *p, int newf)
 {
         struct net *net;
+        int old;
+
+        if (!rtnl_trylock())
+                return restart_syscall();
 
         net = (struct net *)table->extra2;
+        old = *p;
+        *p = newf;
 
-        if (p == &net->ipv6.devconf_dflt->disable_ipv6)
+        if (p == &net->ipv6.devconf_dflt->disable_ipv6) {
+                rtnl_unlock();
                 return 0;
-
-        if (!rtnl_trylock()) {
-                /* Restore the original values before restarting */
-                *p = old;
-                return restart_syscall();
         }
 
         if (p == &net->ipv6.devconf_all->disable_ipv6) {
-                __s32 newf = net->ipv6.devconf_all->disable_ipv6;
                 net->ipv6.devconf_dflt->disable_ipv6 = newf;
                 addrconf_disable_change(net, newf);
-        } else if ((!*p) ^ (!old))
+        } else if ((!newf) ^ (!old))
                 dev_disable_change((struct inet6_dev *)table->extra1);
 
         rtnl_unlock();
@@ -4333,9 +4344,17 @@ int addrconf_sysctl_disable(ctl_table *ctl, int write,
         int *valp = ctl->data;
         int val = *valp;
         loff_t pos = *ppos;
+        ctl_table lctl;
         int ret;
 
-        ret = proc_dointvec(ctl, write, buffer, lenp, ppos);
+        /*
+         * ctl->data points to idev->cnf.disable_ipv6, we should
+         * not modify it until we get the rtnl lock.
+         */
+        lctl = *ctl;
+        lctl.data = &val;
+
+        ret = proc_dointvec(&lctl, write, buffer, lenp, ppos);
 
         if (write)
                 ret = addrconf_disable_ipv6(ctl, valp, val);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 906c7ca43542..3edd05ae4388 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1083,7 +1083,7 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
 
 #ifdef CONFIG_TCP_MD5SIG
         if (sk)
-                key = tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->daddr);
+                key = tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->saddr);
 #endif
 
         if (th->ack)
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index d21e7ebd91ca..55670ec3cd0f 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -393,11 +393,6 @@ static int l2tp_ip_backlog_recv(struct sock *sk, struct sk_buff *skb)
 {
         int rc;
 
-        if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
-                goto drop;
-
-        nf_reset(skb);
-
         /* Charge it to the socket, dropping if the queue is full. */
         rc = sock_queue_rcv_skb(sk, skb);
         if (rc < 0)
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index a18e6c3d36e3..b9bef2c75026 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -713,6 +713,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,
         struct sk_buff *skb = NULL;
         struct sock *sk = sock->sk;
         struct llc_sock *llc = llc_sk(sk);
+        unsigned long cpu_flags;
         size_t copied = 0;
         u32 peek_seq = 0;
         u32 *seq;
@@ -838,7 +839,9 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,
                         goto copy_uaddr;
 
                 if (!(flags & MSG_PEEK)) {
+                        spin_lock_irqsave(&sk->sk_receive_queue.lock, cpu_flags);
                         sk_eat_skb(sk, skb, 0);
+                        spin_unlock_irqrestore(&sk->sk_receive_queue.lock, cpu_flags);
                         *seq = 0;
                 }
 
@@ -859,7 +862,9 @@ copy_uaddr:
                 llc_cmsg_rcv(msg, skb);
 
         if (!(flags & MSG_PEEK)) {
+                        spin_lock_irqsave(&sk->sk_receive_queue.lock, cpu_flags);
                         sk_eat_skb(sk, skb, 0);
+                        spin_unlock_irqrestore(&sk->sk_receive_queue.lock, cpu_flags);
                         *seq = 0;
         }
 
diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c
index 38e6101190d9..59edcd95a58d 100644
--- a/net/mac80211/debugfs_key.c
+++ b/net/mac80211/debugfs_key.c
@@ -225,9 +225,9 @@ KEY_OPS(key);
                             key, &key_##name##_ops);
 
 void ieee80211_debugfs_key_add(struct ieee80211_key *key)
-  {
+{
         static int keycount;
-        char buf[50];
+        char buf[100];
         struct sta_info *sta;
 
         if (!key->local->debugfs.keys)
@@ -244,7 +244,8 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key)
 
         sta = key->sta;
         if (sta) {
-                sprintf(buf, "../../stations/%pM", sta->sta.addr);
+                sprintf(buf, "../../netdev:%s/stations/%pM",
+                        sta->sdata->name, sta->sta.addr);
                 key->debugfs.stalink =
                         debugfs_create_symlink("station", key->debugfs.dir, buf);
         }
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index b3d76b756cd5..a4643969a13b 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -106,6 +106,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
 
         sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
 
+        local->oper_channel = chan;
         channel_type = ifibss->channel_type;
         if (channel_type > NL80211_CHAN_HT20 &&
             !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index e47768cb8cb3..01a21c2f6ab3 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1314,6 +1314,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
                         continue;
                 }
                 /* count everything else */
+                sdata->vif.bss_conf.idle = false;
                 count++;
         }
 
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 0a0d94ad9b08..b142bd4c2390 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -910,6 +910,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
                 wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",
                             result);
 
+        ieee80211_led_init(local);
+
         rtnl_lock();
 
         result = ieee80211_init_rate_ctrl_alg(local,
@@ -931,8 +933,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 
         rtnl_unlock();
 
-        ieee80211_led_init(local);
-
         local->network_latency_notifier.notifier_call =
                 ieee80211_max_network_latency;
         result = pm_qos_add_notifier(PM_QOS_NETWORK_LATENCY,
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 73abb7524b2c..54df1b2bafd2 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -119,12 +119,12 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags,
         int hdr_len = offsetof(struct ieee80211_mgmt, u.action.u.mesh_action) +
                       sizeof(mgmt->u.action.u.mesh_action);
 
-        skb = dev_alloc_skb(local->hw.extra_tx_headroom +
+        skb = dev_alloc_skb(local->tx_headroom +
                             hdr_len +
                             2 + 37); /* max HWMP IE */
         if (!skb)
                 return -1;
-        skb_reserve(skb, local->hw.extra_tx_headroom);
+        skb_reserve(skb, local->tx_headroom);
         mgmt = (struct ieee80211_mgmt *) skb_put(skb, hdr_len);
         memset(mgmt, 0, hdr_len);
         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
@@ -250,12 +250,12 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn,
         if (time_before(jiffies, ifmsh->next_perr))
                 return -EAGAIN;
 
-        skb = dev_alloc_skb(local->hw.extra_tx_headroom +
+        skb = dev_alloc_skb(local->tx_headroom +
                             hdr_len +
                             2 + 15 /* PERR IE */);
         if (!skb)
                 return -1;
-        skb_reserve(skb, local->tx_headroom + local->hw.extra_tx_headroom);
+        skb_reserve(skb, local->tx_headroom);
         mgmt = (struct ieee80211_mgmt *) skb_put(skb, hdr_len);
         memset(mgmt, 0, hdr_len);
         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 41ef1b476442..a17251730b9e 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -172,7 +172,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
         int hdr_len = offsetof(struct ieee80211_mgmt, u.action.u.self_prot) +
                       sizeof(mgmt->u.action.u.self_prot);
 
-        skb = dev_alloc_skb(local->hw.extra_tx_headroom +
+        skb = dev_alloc_skb(local->tx_headroom +
                             hdr_len +
                             2 + /* capability info */
                             2 + /* AID */
@@ -186,7 +186,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
                             sdata->u.mesh.ie_len);
         if (!skb)
                 return -1;
-        skb_reserve(skb, local->hw.extra_tx_headroom);
+        skb_reserve(skb, local->tx_headroom);
         mgmt = (struct ieee80211_mgmt *) skb_put(skb, hdr_len);
         memset(mgmt, 0, hdr_len);
         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index ecb4c84c1bb3..295be92f7c77 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2750,7 +2750,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
 {
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
-        struct ieee80211_work *wk;
         u8 bssid[ETH_ALEN];
         bool assoc_bss = false;
 
@@ -2763,30 +2762,47 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
                 assoc_bss = true;
         } else {
                 bool not_auth_yet = false;
+                struct ieee80211_work *tmp, *wk = NULL;
 
                 mutex_unlock(&ifmgd->mtx);
 
                 mutex_lock(&local->mtx);
-                list_for_each_entry(wk, &local->work_list, list) {
-                        if (wk->sdata != sdata)
+                list_for_each_entry(tmp, &local->work_list, list) {
+                        if (tmp->sdata != sdata)
                                 continue;
 
-                        if (wk->type != IEEE80211_WORK_DIRECT_PROBE &&
-                            wk->type != IEEE80211_WORK_AUTH &&
-                            wk->type != IEEE80211_WORK_ASSOC &&
-                            wk->type != IEEE80211_WORK_ASSOC_BEACON_WAIT)
+                        if (tmp->type != IEEE80211_WORK_DIRECT_PROBE &&
+                            tmp->type != IEEE80211_WORK_AUTH &&
+                            tmp->type != IEEE80211_WORK_ASSOC &&
+                            tmp->type != IEEE80211_WORK_ASSOC_BEACON_WAIT)
                                 continue;
 
-                        if (memcmp(req->bss->bssid, wk->filter_ta, ETH_ALEN))
+                        if (memcmp(req->bss->bssid, tmp->filter_ta, ETH_ALEN))
                                 continue;
 
-                        not_auth_yet = wk->type == IEEE80211_WORK_DIRECT_PROBE;
-                        list_del_rcu(&wk->list);
-                        free_work(wk);
+                        not_auth_yet = tmp->type == IEEE80211_WORK_DIRECT_PROBE;
+                        list_del_rcu(&tmp->list);
+                        synchronize_rcu();
+                        wk = tmp;
                         break;
                 }
                 mutex_unlock(&local->mtx);
 
+                if (wk && wk->type == IEEE80211_WORK_ASSOC) {
+                        /* clean up dummy sta & TX sync */
+                        sta_info_destroy_addr(wk->sdata, wk->filter_ta);
+                        if (wk->assoc.synced)
+                                drv_finish_tx_sync(local, wk->sdata,
+                                                   wk->filter_ta,
+                                                   IEEE80211_TX_SYNC_ASSOC);
+                } else if (wk && wk->type == IEEE80211_WORK_AUTH) {
+                        if (wk->probe_auth.synced)
+                                drv_finish_tx_sync(local, wk->sdata,
+                                                   wk->filter_ta,
+                                                   IEEE80211_TX_SYNC_AUTH);
+                }
+                kfree(wk);
+
                 /*
                  * If somebody requests authentication and we haven't
                  * sent out an auth frame yet there's no need to send
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 751409120769..5a5e504a8ffb 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -611,7 +611,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
         index = seq_sub(tid_agg_rx->head_seq_num, tid_agg_rx->ssn) %
                                                 tid_agg_rx->buf_size;
         if (!tid_agg_rx->reorder_buf[index] &&
-            tid_agg_rx->stored_mpdu_num > 1) {
+            tid_agg_rx->stored_mpdu_num) {
                 /*
                  * No buffers ready to be released, but check whether any
                  * frames in the reorder buffer have timed out.
diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index bb6ad81b671d..424ff622ab5f 100644
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -68,7 +68,6 @@ static int rds_release(struct socket *sock)
 {
         struct sock *sk = sock->sk;
         struct rds_sock *rs;
-        unsigned long flags;
 
         if (!sk)
                 goto out;
@@ -94,10 +93,10 @@ static int rds_release(struct socket *sock)
         rds_rdma_drop_keys(rs);
         rds_notify_queue_get(rs, NULL);
 
-        spin_lock_irqsave(&rds_sock_lock, flags);
+        spin_lock_bh(&rds_sock_lock);
         list_del_init(&rs->rs_item);
         rds_sock_count--;
-        spin_unlock_irqrestore(&rds_sock_lock, flags);
+        spin_unlock_bh(&rds_sock_lock);
 
         rds_trans_put(rs->rs_transport);
 
@@ -409,7 +408,6 @@ static const struct proto_ops rds_proto_ops = {
 
 static int __rds_create(struct socket *sock, struct sock *sk, int protocol)
 {
-        unsigned long flags;
         struct rds_sock *rs;
 
         sock_init_data(sock, sk);
@@ -426,10 +424,10 @@ static int __rds_create(struct socket *sock, struct sock *sk, int protocol)
         spin_lock_init(&rs->rs_rdma_lock);
         rs->rs_rdma_keys = RB_ROOT;
 
-        spin_lock_irqsave(&rds_sock_lock, flags);
+        spin_lock_bh(&rds_sock_lock);
         list_add_tail(&rs->rs_item, &rds_sock_list);
         rds_sock_count++;
-        spin_unlock_irqrestore(&rds_sock_lock, flags);
+        spin_unlock_bh(&rds_sock_lock);
 
         return 0;
 }
@@ -471,12 +469,11 @@ static void rds_sock_inc_info(struct socket *sock, unsigned int len,
 {
         struct rds_sock *rs;
         struct rds_incoming *inc;
-        unsigned long flags;
         unsigned int total = 0;
 
         len /= sizeof(struct rds_info_message);
 
-        spin_lock_irqsave(&rds_sock_lock, flags);
+        spin_lock_bh(&rds_sock_lock);
 
         list_for_each_entry(rs, &rds_sock_list, rs_item) {
                 read_lock(&rs->rs_recv_lock);
@@ -492,7 +489,7 @@ static void rds_sock_inc_info(struct socket *sock, unsigned int len,
                 read_unlock(&rs->rs_recv_lock);
         }
 
-        spin_unlock_irqrestore(&rds_sock_lock, flags);
+        spin_unlock_bh(&rds_sock_lock);
 
         lens->nr = total;
         lens->each = sizeof(struct rds_info_message);
@@ -504,11 +501,10 @@ static void rds_sock_info(struct socket *sock, unsigned int len,
 {
         struct rds_info_socket sinfo;
         struct rds_sock *rs;
-        unsigned long flags;
 
         len /= sizeof(struct rds_info_socket);
 
-        spin_lock_irqsave(&rds_sock_lock, flags);
+        spin_lock_bh(&rds_sock_lock);
 
         if (len < rds_sock_count)
                 goto out;
@@ -529,7 +525,7 @@ out:
         lens->nr = rds_sock_count;
         lens->each = sizeof(struct rds_info_socket);
 
-        spin_unlock_irqrestore(&rds_sock_lock, flags);
+        spin_unlock_bh(&rds_sock_lock);
 }
 
 static void rds_exit(void)
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c
index 4cba13e46ffd..ae3a035f5390 100644
--- a/net/rxrpc/ar-key.c
+++ b/net/rxrpc/ar-key.c
@@ -232,7 +232,7 @@ static int rxrpc_krb5_decode_principal(struct krb5_principal *princ,
         if (toklen <= (n_parts + 1) * 4)
                 return -EINVAL;
 
-        princ->name_parts = kcalloc(sizeof(char *), n_parts, GFP_KERNEL);
+        princ->name_parts = kcalloc(n_parts, sizeof(char *), GFP_KERNEL);
         if (!princ->name_parts)
                 return -ENOMEM;
 
@@ -355,7 +355,7 @@ static int rxrpc_krb5_decode_tagged_array(struct krb5_tagged_data **_td,
 
                 _debug("n_elem %d", n_elem);
 
-                td = kcalloc(sizeof(struct krb5_tagged_data), n_elem,
+                td = kcalloc(n_elem, sizeof(struct krb5_tagged_data),
                              GFP_KERNEL);
                 if (!td)
                         return -ENOMEM;
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index e465064d39a3..7e267d7b9c75 100644
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -148,8 +148,7 @@ struct choke_skb_cb {
 
 static inline struct choke_skb_cb *choke_skb_cb(const struct sk_buff *skb)
 {
-        BUILD_BUG_ON(sizeof(skb->cb) <
-                sizeof(struct qdisc_skb_cb) + sizeof(struct choke_skb_cb));
+        qdisc_cb_private_validate(skb, sizeof(struct choke_skb_cb));
         return (struct choke_skb_cb *)qdisc_skb_cb(skb)->data;
 }
 
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index e7e1d0b57b3d..e83d61ca78ca 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -130,8 +130,7 @@ struct netem_skb_cb {
 
 static inline struct netem_skb_cb *netem_skb_cb(struct sk_buff *skb)
 {
-        BUILD_BUG_ON(sizeof(skb->cb) <
-                sizeof(struct qdisc_skb_cb) + sizeof(struct netem_skb_cb));
+        qdisc_cb_private_validate(skb, sizeof(struct netem_skb_cb));
         return (struct netem_skb_cb *)qdisc_skb_cb(skb)->data;
 }
 
@@ -419,7 +418,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 
         cb = netem_skb_cb(skb);
         if (q->gap == 0 ||              /* not doing reordering */
-            q->counter < q->gap ||      /* inside last reordering gap */
+            q->counter < q->gap - 1 ||  /* inside last reordering gap */
             q->reorder < get_crandom(&q->reorder_cor)) {
                 psched_time_t now;
                 psched_tdiff_t delay;
diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c
index 96e42cae4c7a..d7eea99333e9 100644
--- a/net/sched/sch_sfb.c
+++ b/net/sched/sch_sfb.c
@@ -94,8 +94,7 @@ struct sfb_skb_cb {
 
 static inline struct sfb_skb_cb *sfb_skb_cb(const struct sk_buff *skb)
 {
-        BUILD_BUG_ON(sizeof(skb->cb) <
-                sizeof(struct qdisc_skb_cb) + sizeof(struct sfb_skb_cb));
+        qdisc_cb_private_validate(skb, sizeof(struct sfb_skb_cb));
         return (struct sfb_skb_cb *)qdisc_skb_cb(skb)->data;
 }
 
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 67494aef9acf..60d47180f043 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -166,9 +166,8 @@ struct sfq_skb_cb {
 
 static inline struct sfq_skb_cb *sfq_skb_cb(const struct sk_buff *skb)
 {
-       BUILD_BUG_ON(sizeof(skb->cb) <
-               sizeof(struct qdisc_skb_cb) + sizeof(struct sfq_skb_cb));
-       return (struct sfq_skb_cb *)qdisc_skb_cb(skb)->data;
+        qdisc_cb_private_validate(skb, sizeof(struct sfq_skb_cb));
+        return (struct sfq_skb_cb *)qdisc_skb_cb(skb)->data;
 }
 
 static unsigned int sfq_hash(const struct sfq_sched_data *q,
diff --git a/net/sunrpc/auth_generic.c b/net/sunrpc/auth_generic.c
index 1426ec3d0a53..75762f346975 100644
--- a/net/sunrpc/auth_generic.c
+++ b/net/sunrpc/auth_generic.c
@@ -92,6 +92,7 @@ generic_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
         if (gcred->acred.group_info != NULL)
                 get_group_info(gcred->acred.group_info);
         gcred->acred.machine_cred = acred->machine_cred;
+        gcred->acred.principal = acred->principal;
 
         dprintk("RPC:       allocated %s cred %p for uid %d gid %d\n",
                         gcred->acred.machine_cred ? "machine" : "generic",
@@ -123,6 +124,17 @@ generic_destroy_cred(struct rpc_cred *cred)
         call_rcu(&cred->cr_rcu, generic_free_cred_callback);
 }
 
+static int
+machine_cred_match(struct auth_cred *acred, struct generic_cred *gcred, int flags)
+{
+        if (!gcred->acred.machine_cred ||
+            gcred->acred.principal != acred->principal ||
+            gcred->acred.uid != acred->uid ||
+            gcred->acred.gid != acred->gid)
+                return 0;
+        return 1;
+}
+
 /*
  * Match credentials against current process creds.
  */
@@ -132,9 +144,12 @@ generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags)
         struct generic_cred *gcred = container_of(cred, struct generic_cred, gc_base);
         int i;
 
+        if (acred->machine_cred)
+                return machine_cred_match(acred, gcred, flags);
+
         if (gcred->acred.uid != acred->uid ||
             gcred->acred.gid != acred->gid ||
-            gcred->acred.machine_cred != acred->machine_cred)
+            gcred->acred.machine_cred != 0)
                 goto out_nomatch;
 
         /* Optimisation in the case where pointers are identical... */
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index aad8fb699989..85d3bb7490aa 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1918,7 +1918,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                 struct sk_buff *skb;
 
                 unix_state_lock(sk);
-                skb = skb_dequeue(&sk->sk_receive_queue);
+                skb = skb_peek(&sk->sk_receive_queue);
                 if (skb == NULL) {
                         unix_sk(sk)->recursion_level = 0;
                         if (copied >= target)
@@ -1958,11 +1958,8 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                 if (check_creds) {
                         /* Never glue messages from different writers */
                         if ((UNIXCB(skb).pid  != siocb->scm->pid) ||
-                            (UNIXCB(skb).cred != siocb->scm->cred)) {
-                                skb_queue_head(&sk->sk_receive_queue, skb);
-                                sk->sk_data_ready(sk, skb->len);
+                            (UNIXCB(skb).cred != siocb->scm->cred))
                                 break;
-                        }
                 } else {
                         /* Copy credentials */
                         scm_set_cred(siocb->scm, UNIXCB(skb).pid, UNIXCB(skb).cred);
@@ -1977,8 +1974,6 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
 
                 chunk = min_t(unsigned int, skb->len, size);
                 if (memcpy_toiovec(msg->msg_iov, skb->data, chunk)) {
-                        skb_queue_head(&sk->sk_receive_queue, skb);
-                        sk->sk_data_ready(sk, skb->len);
                         if (copied == 0)
                                 copied = -EFAULT;
                         break;
@@ -1993,13 +1988,10 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                         if (UNIXCB(skb).fp)
                                 unix_detach_fds(siocb->scm, skb);
 
-                        /* put the skb back if we didn't use it up.. */
-                        if (skb->len) {
-                                skb_queue_head(&sk->sk_receive_queue, skb);
-                                sk->sk_data_ready(sk, skb->len);
+                        if (skb->len)
                                 break;
-                        }
 
+                        skb_unlink(skb, &sk->sk_receive_queue);
                         consume_skb(skb);
 
                         if (siocb->scm->fp)
@@ -2010,9 +2002,6 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                         if (UNIXCB(skb).fp)
                                 siocb->scm->fp = scm_fp_dup(UNIXCB(skb).fp);
 
-                        /* put message back and return */
-                        skb_queue_head(&sk->sk_receive_queue, skb);
-                        sk->sk_data_ready(sk, skb->len);
                         break;
                 }
         } while (size);
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e3bfcbe8a520..a3b9782441f9 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1924,6 +1924,12 @@ sub process {
                         my $pre_ctx = "$1$2";
 
                         my ($level, @ctx) = ctx_statement_level($linenr, $realcnt, 0);
+
+                        if ($line =~ /^\+\t{6,}/) {
+                                WARN("DEEP_INDENTATION",
+                                     "Too many leading tabs - consider code refactoring\n" . $herecurr);
+                        }
+
                         my $ctx_cnt = $realcnt - $#ctx - 1;
                         my $ctx = join("\n", @ctx);
 
diff --git a/scripts/coccicheck b/scripts/coccicheck
index 3c2776466d87..823e972149e5 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -9,15 +9,10 @@ if [ "$C" = "1" -o "$C" = "2" ]; then
 #    FLAGS="-ignore_unknown_options -very_quiet"
 #    OPTIONS=$*
 
-    if [ "$KBUILD_EXTMOD" = "" ] ; then
-        # Workaround for Coccinelle < 0.2.3
-        FLAGS="-I $srctree/include -very_quiet"
-        shift $(( $# - 1 ))
-        OPTIONS=$1
-    else
-        echo M= is not currently supported when C=1 or C=2
-        exit 1
-    fi
+# Workaround for Coccinelle < 0.2.3
+        FLAGS="-I $srctree/include -very_quiet"
+        shift $(( $# - 1 ))
+        OPTIONS=$1
 else
     ONLINE=0
     FLAGS="-very_quiet"
diff --git a/scripts/depmod.sh b/scripts/depmod.sh
index a27235685949..2ae481703141 100755
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
@@ -9,12 +9,6 @@ fi
 DEPMOD=$1
 KERNELRELEASE=$2
 
-if ! "$DEPMOD" -V 2>/dev/null | grep -q module-init-tools; then
-        echo "Warning: you may need to install module-init-tools" >&2
-        echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt" >&2
-        sleep 1
-fi
-
 if ! test -r System.map -a -x "$DEPMOD"; then
         exit 0
 fi
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index d793001929cf..9b0c0b8b4ab4 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -5,7 +5,7 @@ use strict;
 ## Copyright (c) 1998 Michael Zucchi, All Rights Reserved        ##
 ## Copyright (C) 2000, 1  Tim Waugh <twaugh@redhat.com>          ##
 ## Copyright (C) 2001  Simon Huggins                             ##
-## Copyright (C) 2005-2010  Randy Dunlap                         ##
+## Copyright (C) 2005-2012  Randy Dunlap                         ##
 ##                                                               ##
 ## #define enhancements by Armin Kuster <akuster@mvista.com>     ##
 ## Copyright (c) 2000 MontaVista Software, Inc.                  ##
@@ -1785,6 +1785,7 @@ sub dump_function($$) {
     $prototype =~ s/__devinit +//;
     $prototype =~ s/__init +//;
     $prototype =~ s/__init_or_module +//;
+    $prototype =~ s/__must_check +//;
     $prototype =~ s/^#\s*define\s+//; #ak added
     $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//;
 
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index c0e14b3f2306..d0de2a2c3a2d 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -823,16 +823,6 @@ static int do_spi_entry(const char *filename, struct spi_device_id *id,
 }
 ADD_TO_DEVTABLE("spi", struct spi_device_id, do_spi_entry);
 
-/* Looks like: mcp:S */
-static int do_mcp_entry(const char *filename, struct mcp_device_id *id,
-                        char *alias)
-{
-        sprintf(alias, MCP_MODULE_PREFIX "%s", id->name);
-
-        return 1;
-}
-ADD_TO_DEVTABLE("mcp", struct mcp_device_id, do_mcp_entry); 
-
 static const struct dmifield {
         const char *prefix;
         int field;
@@ -942,7 +932,7 @@ static int do_isapnp_entry(const char *filename,
                 (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
         return 1;
 }
-ADD_TO_DEVTABLE("isa", struct isapnp_device_id, do_isapnp_entry);
+ADD_TO_DEVTABLE("isapnp", struct isapnp_device_id, do_isapnp_entry);
 
 /*
  * Append a match expression for a single masked hex digit.
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 2bd594e6d1b4..9adb667dd31a 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1494,6 +1494,13 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
         return 0;
 }
 
+#ifndef R_ARM_CALL
+#define R_ARM_CALL      28
+#endif
+#ifndef R_ARM_JUMP24
+#define R_ARM_JUMP24    29
+#endif
+
 static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
 {
         unsigned int r_typ = ELF_R_TYPE(r->r_info);
@@ -1505,6 +1512,8 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
                               (elf->symtab_start + ELF_R_SYM(r->r_info));
                 break;
         case R_ARM_PC24:
+        case R_ARM_CALL:
+        case R_ARM_JUMP24:
                 /* From ARM ABI: ((S + A) | T) - P */
                 r->r_addend = (int)(long)(elf->hdr +
                               sechdr->sh_offset +
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index f6cbc3ddb68b..3c6c0b14c807 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -238,14 +238,14 @@ EOF
 fi
 
 # Build header package
-(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$)
-(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$)
-(cd $objtree; find .config Module.symvers include scripts -type f >> /tmp/objfiles$$)
+(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
+(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
+(cd $objtree; find .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"
-(cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -)
-(cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -)
-rm -f /tmp/files$$ /tmp/objfiles$$
+(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
+(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
+rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
 arch=$(dpkg --print-architecture)
 
 cat <<EOF >> debian/control
diff --git a/security/keys/internal.h b/security/keys/internal.h
index c7a7caec4830..65647f825584 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -33,6 +33,7 @@
 
 extern struct key_type key_type_dead;
 extern struct key_type key_type_user;
+extern struct key_type key_type_logon;
 
 /*****************************************************************************/
 /*
diff --git a/security/keys/key.c b/security/keys/key.c
index 4f64c7267afb..7ada8019be1f 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -999,6 +999,7 @@ void __init key_init(void)
         list_add_tail(&key_type_keyring.link, &key_types_list);
         list_add_tail(&key_type_dead.link, &key_types_list);
         list_add_tail(&key_type_user.link, &key_types_list);
+        list_add_tail(&key_type_logon.link, &key_types_list);
 
         /* record the root user tracking */
         rb_link_node(&root_key_user.node,
diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c
index 2aee3c5a3b99..c7660a25a3e4 100644
--- a/security/keys/user_defined.c
+++ b/security/keys/user_defined.c
@@ -18,6 +18,8 @@
 #include <asm/uaccess.h>
 #include "internal.h"
 
+static int logon_vet_description(const char *desc);
+
 /*
  * user defined keys take an arbitrary string as the description and an
  * arbitrary blob of data as the payload
@@ -36,6 +38,24 @@ struct key_type key_type_user = {
 EXPORT_SYMBOL_GPL(key_type_user);
 
 /*
+ * This key type is essentially the same as key_type_user, but it does
+ * not define a .read op. This is suitable for storing username and
+ * password pairs in the keyring that you do not want to be readable
+ * from userspace.
+ */
+struct key_type key_type_logon = {
+        .name                   = "logon",
+        .instantiate            = user_instantiate,
+        .update                 = user_update,
+        .match                  = user_match,
+        .revoke                 = user_revoke,
+        .destroy                = user_destroy,
+        .describe               = user_describe,
+        .vet_description        = logon_vet_description,
+};
+EXPORT_SYMBOL_GPL(key_type_logon);
+
+/*
  * instantiate a user defined key
  */
 int user_instantiate(struct key *key, const void *data, size_t datalen)
@@ -189,3 +209,20 @@ long user_read(const struct key *key, char __user *buffer, size_t buflen)
 }
 
 EXPORT_SYMBOL_GPL(user_read);
+
+/* Vet the description for a "logon" key */
+static int logon_vet_description(const char *desc)
+{
+        char *p;
+
+        /* require a "qualified" description string */
+        p = strchr(desc, ':');
+        if (!p)
+                return -EINVAL;
+
+        /* also reject description with ':' as first char */
+        if (p == desc)
+                return -EINVAL;
+
+        return 0;
+}
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index dac3633507c9..a68aed7fce02 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -441,19 +441,22 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg)
                 params = kmalloc(sizeof(*params), GFP_KERNEL);
                 if (!params)
                         return -ENOMEM;
-                if (copy_from_user(params, (void __user *)arg, sizeof(*params)))
-                        return -EFAULT;
+                if (copy_from_user(params, (void __user *)arg, sizeof(*params))) {
+                        retval = -EFAULT;
+                        goto out;
+                }
                 retval = snd_compr_allocate_buffer(stream, params);
                 if (retval) {
-                        kfree(params);
-                        return -ENOMEM;
+                        retval = -ENOMEM;
+                        goto out;
                 }
                 retval = stream->ops->set_params(stream, params);
                 if (retval)
                         goto out;
                 stream->runtime->state = SNDRV_PCM_STATE_SETUP;
-        } else
+        } else {
                 return -EPERM;
+        }
 out:
         kfree(params);
         return retval;
diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c
index e09f144177f5..c99c6078be33 100644
--- a/sound/isa/sb/emu8000_patch.c
+++ b/sound/isa/sb/emu8000_patch.c
@@ -22,7 +22,6 @@
 #include "emu8000_local.h"
 #include <asm/uaccess.h>
 #include <linux/moduleparam.h>
-#include <linux/moduleparam.h>
 
 static int emu8000_reset_addr;
 module_param(emu8000_reset_addr, int, 0444);
diff --git a/sound/pci/hda/alc880_quirks.c b/sound/pci/hda/alc880_quirks.c
index 5b68435d195b..501501ef36a9 100644
--- a/sound/pci/hda/alc880_quirks.c
+++ b/sound/pci/hda/alc880_quirks.c
@@ -762,16 +762,22 @@ static void alc880_uniwill_unsol_event(struct hda_codec *codec,
         /* Looks like the unsol event is incompatible with the standard
          * definition.  4bit tag is placed at 28 bit!
          */
-        switch (res >> 28) {
+        res >>= 28;
+        switch (res) {
         case ALC_MIC_EVENT:
                 alc88x_simple_mic_automute(codec);
                 break;
         default:
-                alc_sku_unsol_event(codec, res);
+                alc_exec_unsol_event(codec, res);
                 break;
         }
 }
 
+static void alc880_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        alc_exec_unsol_event(codec, res >> 28);
+}
+
 static void alc880_uniwill_p53_setup(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
@@ -800,10 +806,11 @@ static void alc880_uniwill_p53_unsol_event(struct hda_codec *codec,
         /* Looks like the unsol event is incompatible with the standard
          * definition.  4bit tag is placed at 28 bit!
          */
-        if ((res >> 28) == ALC_DCVOL_EVENT)
+        res >>= 28;
+        if (res == ALC_DCVOL_EVENT)
                 alc880_uniwill_p53_dcvol_automute(codec);
         else
-                alc_sku_unsol_event(codec, res);
+                alc_exec_unsol_event(codec, res);
 }
 
 /*
@@ -1677,7 +1684,7 @@ static const struct alc_config_preset alc880_presets[] = {
                 .channel_mode = alc880_lg_ch_modes,
                 .need_dac_fix = 1,
                 .input_mux = &alc880_lg_capture_source,
-                .unsol_event = alc_sku_unsol_event,
+                .unsol_event = alc880_unsol_event,
                 .setup = alc880_lg_setup,
                 .init_hook = alc_hp_automute,
 #ifdef CONFIG_SND_HDA_POWER_SAVE
diff --git a/sound/pci/hda/alc882_quirks.c b/sound/pci/hda/alc882_quirks.c
index bdf0ed4ab3e2..bb364a53f546 100644
--- a/sound/pci/hda/alc882_quirks.c
+++ b/sound/pci/hda/alc882_quirks.c
@@ -730,6 +730,11 @@ static void alc889A_mb31_unsol_event(struct hda_codec *codec, unsigned int res)
                 alc889A_mb31_automute(codec);
 }
 
+static void alc882_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        alc_exec_unsol_event(codec, res >> 26);
+}
+
 /*
  * configuration and preset
  */
@@ -775,7 +780,7 @@ static const struct alc_config_preset alc882_presets[] = {
                         .channel_mode = alc885_mba21_ch_modes,
                         .num_channel_mode = ARRAY_SIZE(alc885_mba21_ch_modes),
                         .input_mux = &alc882_capture_source,
-                        .unsol_event = alc_sku_unsol_event,
+                        .unsol_event = alc882_unsol_event,
                         .setup = alc885_mba21_setup,
                         .init_hook = alc_hp_automute,
        },
@@ -791,7 +796,7 @@ static const struct alc_config_preset alc882_presets[] = {
                 .input_mux = &alc882_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_sku_unsol_event,
+                .unsol_event = alc882_unsol_event,
                 .setup = alc885_mbp3_setup,
                 .init_hook = alc_hp_automute,
         },
@@ -806,7 +811,7 @@ static const struct alc_config_preset alc882_presets[] = {
                 .input_mux = &mb5_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_sku_unsol_event,
+                .unsol_event = alc882_unsol_event,
                 .setup = alc885_mb5_setup,
                 .init_hook = alc_hp_automute,
         },
@@ -821,7 +826,7 @@ static const struct alc_config_preset alc882_presets[] = {
                 .input_mux = &macmini3_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_sku_unsol_event,
+                .unsol_event = alc882_unsol_event,
                 .setup = alc885_macmini3_setup,
                 .init_hook = alc_hp_automute,
         },
@@ -836,7 +841,7 @@ static const struct alc_config_preset alc882_presets[] = {
                 .input_mux = &alc889A_imac91_capture_source,
                 .dig_out_nid = ALC882_DIGOUT_NID,
                 .dig_in_nid = ALC882_DIGIN_NID,
-                .unsol_event = alc_sku_unsol_event,
+                .unsol_event = alc882_unsol_event,
                 .setup = alc885_imac91_setup,
                 .init_hook = alc_hp_automute,
         },
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 4df72c0e8c37..c2c65f63bf06 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1447,7 +1447,7 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
                 for (i = 0; i < c->cvt_setups.used; i++) {
                         p = snd_array_elem(&c->cvt_setups, i);
                         if (!p->active && p->stream_tag == stream_tag &&
-                            get_wcaps_type(get_wcaps(codec, p->nid)) == type)
+                            get_wcaps_type(get_wcaps(c, p->nid)) == type)
                                 p->dirty = 1;
                 }
         }
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index fb35474c1203..95dfb6874941 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -469,6 +469,7 @@ struct azx {
         unsigned int irq_pending_warned :1;
         unsigned int probing :1; /* codec probing phase */
         unsigned int snoop:1;
+        unsigned int align_buffer_size:1;
 
         /* for debugging */
         unsigned int last_cmd[AZX_MAX_CODECS];
@@ -1690,7 +1691,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
         runtime->hw.rates = hinfo->rates;
         snd_pcm_limit_hw_rates(runtime);
         snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
-        if (align_buffer_size)
+        if (chip->align_buffer_size)
                 /* constrain buffer sizes to be multiple of 128
                    bytes. This is more efficient in terms of memory
                    access but isn't required by the HDA spec and
@@ -2773,8 +2774,9 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         }
 
         /* disable buffer size rounding to 128-byte multiples if supported */
+        chip->align_buffer_size = align_buffer_size;
         if (chip->driver_caps & AZX_DCAPS_BUFSIZE)
-                align_buffer_size = 0;
+                chip->align_buffer_size = 0;
 
         /* allow 64bit DMA address if supported by H/W */
         if ((gcap & ICH6_GCAP_64OK) && !pci_set_dma_mask(pci, DMA_BIT_MASK(64)))
diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index d8a35da0803f..9d819c4b4923 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -282,7 +282,8 @@ int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
 EXPORT_SYMBOL_HDA(snd_hda_jack_add_kctl);
 
 static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
-                         const struct auto_pin_cfg *cfg)
+                         const struct auto_pin_cfg *cfg,
+                         char *lastname, int *lastidx)
 {
         unsigned int def_conf, conn;
         char name[44];
@@ -298,6 +299,10 @@ static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
                 return 0;
 
         snd_hda_get_pin_label(codec, nid, cfg, name, sizeof(name), &idx);
+        if (!strcmp(name, lastname) && idx == *lastidx)
+                idx++;
+        strncpy(lastname, name, 44);
+        *lastidx = idx;
         err = snd_hda_jack_add_kctl(codec, nid, name, idx);
         if (err < 0)
                 return err;
@@ -311,41 +316,42 @@ int snd_hda_jack_add_kctls(struct hda_codec *codec,
                            const struct auto_pin_cfg *cfg)
 {
         const hda_nid_t *p;
-        int i, err;
+        int i, err, lastidx = 0;
+        char lastname[44] = "";
 
         for (i = 0, p = cfg->line_out_pins; i < cfg->line_outs; i++, p++) {
-                err = add_jack_kctl(codec, *p, cfg);
+                err = add_jack_kctl(codec, *p, cfg, lastname, &lastidx);
                 if (err < 0)
                         return err;
         }
         for (i = 0, p = cfg->hp_pins; i < cfg->hp_outs; i++, p++) {
                 if (*p == *cfg->line_out_pins) /* might be duplicated */
                         break;
-                err = add_jack_kctl(codec, *p, cfg);
+                err = add_jack_kctl(codec, *p, cfg, lastname, &lastidx);
                 if (err < 0)
                         return err;
         }
         for (i = 0, p = cfg->speaker_pins; i < cfg->speaker_outs; i++, p++) {
                 if (*p == *cfg->line_out_pins) /* might be duplicated */
                         break;
-                err = add_jack_kctl(codec, *p, cfg);
+                err = add_jack_kctl(codec, *p, cfg, lastname, &lastidx);
                 if (err < 0)
                         return err;
         }
         for (i = 0; i < cfg->num_inputs; i++) {
-                err = add_jack_kctl(codec, cfg->inputs[i].pin, cfg);
+                err = add_jack_kctl(codec, cfg->inputs[i].pin, cfg, lastname, &lastidx);
                 if (err < 0)
                         return err;
         }
         for (i = 0, p = cfg->dig_out_pins; i < cfg->dig_outs; i++, p++) {
-                err = add_jack_kctl(codec, *p, cfg);
+                err = add_jack_kctl(codec, *p, cfg, lastname, &lastidx);
                 if (err < 0)
                         return err;
         }
-        err = add_jack_kctl(codec, cfg->dig_in_pin, cfg);
+        err = add_jack_kctl(codec, cfg->dig_in_pin, cfg, lastname, &lastidx);
         if (err < 0)
                 return err;
-        err = add_jack_kctl(codec, cfg->mono_out_pin, cfg);
+        err = add_jack_kctl(codec, cfg->mono_out_pin, cfg, lastname, &lastidx);
         if (err < 0)
                 return err;
         return 0;
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 35abe3c62908..21d91d580da8 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -728,18 +728,19 @@ static int ca0132_hp_switch_put(struct snd_kcontrol *kcontrol,
 
         err = chipio_read(codec, REG_CODEC_MUTE, &data);
         if (err < 0)
-                return err;
+                goto exit;
 
         /* *valp 0 is mute, 1 is unmute */
         data = (data & 0x7f) | (*valp ? 0 : 0x80);
-        chipio_write(codec, REG_CODEC_MUTE, data);
+        err = chipio_write(codec, REG_CODEC_MUTE, data);
         if (err < 0)
-                return err;
+                goto exit;
 
         spec->curr_hp_switch = *valp;
 
+ exit:
         snd_hda_power_down(codec);
-        return 1;
+        return err < 0 ? err : 1;
 }
 
 static int ca0132_speaker_switch_get(struct snd_kcontrol *kcontrol,
@@ -770,18 +771,19 @@ static int ca0132_speaker_switch_put(struct snd_kcontrol *kcontrol,
 
         err = chipio_read(codec, REG_CODEC_MUTE, &data);
         if (err < 0)
-                return err;
+                goto exit;
 
         /* *valp 0 is mute, 1 is unmute */
         data = (data & 0xef) | (*valp ? 0 : 0x10);
-        chipio_write(codec, REG_CODEC_MUTE, data);
+        err = chipio_write(codec, REG_CODEC_MUTE, data);
         if (err < 0)
-                return err;
+                goto exit;
 
         spec->curr_speaker_switch = *valp;
 
+ exit:
         snd_hda_power_down(codec);
-        return 1;
+        return err < 0 ? err : 1;
 }
 
 static int ca0132_hp_volume_get(struct snd_kcontrol *kcontrol,
@@ -819,25 +821,26 @@ static int ca0132_hp_volume_put(struct snd_kcontrol *kcontrol,
 
         err = chipio_read(codec, REG_CODEC_HP_VOL_L, &data);
         if (err < 0)
-                return err;
+                goto exit;
 
         val = 31 - left_vol;
         data = (data & 0xe0) | val;
-        chipio_write(codec, REG_CODEC_HP_VOL_L, data);
+        err = chipio_write(codec, REG_CODEC_HP_VOL_L, data);
         if (err < 0)
-                return err;
+                goto exit;
 
         val = 31 - right_vol;
         data = (data & 0xe0) | val;
-        chipio_write(codec, REG_CODEC_HP_VOL_R, data);
+        err = chipio_write(codec, REG_CODEC_HP_VOL_R, data);
         if (err < 0)
-                return err;
+                goto exit;
 
         spec->curr_hp_volume[0] = left_vol;
         spec->curr_hp_volume[1] = right_vol;
 
+ exit:
         snd_hda_power_down(codec);
-        return 1;
+        return err < 0 ? err : 1;
 }
 
 static int add_hp_switch(struct hda_codec *codec, hda_nid_t nid)
@@ -936,6 +939,8 @@ static int ca0132_build_controls(struct hda_codec *codec)
                 if (err < 0)
                         return err;
                 err = add_in_volume(codec, spec->dig_in, "IEC958");
+                if (err < 0)
+                        return err;
         }
         return 0;
 }
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 0e99357e822c..bc5a993d1146 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -988,8 +988,10 @@ static void cs_automic(struct hda_codec *codec)
                         change_cur_input(codec, !spec->automic_idx, 0);
         } else {
                 if (present) {
-                        spec->last_input = spec->cur_input;
-                        spec->cur_input = spec->automic_idx;
+                        if (spec->cur_input != spec->automic_idx) {
+                                spec->last_input = spec->cur_input;
+                                spec->cur_input = spec->automic_idx;
+                        }
                 } else  {
                         spec->cur_input = spec->last_input;
                 }
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 8a32a69c83c3..a7a5733aa4d2 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3027,7 +3027,7 @@ static const struct snd_pci_quirk cxt5066_cfg_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x21c6, "Thinkpad Edge 13", CXT5066_ASUS),
-        SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),
+        SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo T510", CXT5066_AUTO),
         SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520 & W520", CXT5066_AUTO),
         SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT5066_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT5066_THINKPAD),
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 5e82acf77c5a..3647baa9bfed 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -80,6 +80,8 @@ enum {
         ALC_AUTOMUTE_MIXER,     /* mute/unmute mixer widget AMP */
 };
 
+#define MAX_VOL_NIDS    0x40
+
 struct alc_spec {
         /* codec parameterization */
         const struct snd_kcontrol_new *mixers[5];       /* mixer arrays */
@@ -118,8 +120,8 @@ struct alc_spec {
         const hda_nid_t *capsrc_nids;
         hda_nid_t dig_in_nid;           /* digital-in NID; optional */
         hda_nid_t mixer_nid;            /* analog-mixer NID */
-        DECLARE_BITMAP(vol_ctls, 0x20 << 1);
-        DECLARE_BITMAP(sw_ctls, 0x20 << 1);
+        DECLARE_BITMAP(vol_ctls, MAX_VOL_NIDS << 1);
+        DECLARE_BITMAP(sw_ctls, MAX_VOL_NIDS << 1);
 
         /* capture setup for dynamic dual-adc switch */
         hda_nid_t cur_adc;
@@ -177,6 +179,7 @@ struct alc_spec {
         unsigned int detect_lo:1;       /* Line-out detection enabled */
         unsigned int automute_speaker_possible:1; /* there are speakers and either LO or HP */
         unsigned int automute_lo_possible:1;      /* there are line outs and HP */
+        unsigned int keep_vref_in_automute:1; /* Don't clear VREF in automute */
 
         /* other flags */
         unsigned int no_analog :1; /* digital I/O only */
@@ -185,7 +188,6 @@ struct alc_spec {
         unsigned int vol_in_capsrc:1; /* use capsrc volume (ADC has no vol) */
         unsigned int parse_flags; /* passed to snd_hda_parse_pin_defcfg() */
         unsigned int shared_mic_hp:1; /* HP/Mic-in sharing */
-        unsigned int use_jack_tbl:1; /* 1 for model=auto */
 
         /* auto-mute control */
         int automute_mode;
@@ -496,13 +498,24 @@ static void do_automute(struct hda_codec *codec, int num_pins, hda_nid_t *pins,
 
         for (i = 0; i < num_pins; i++) {
                 hda_nid_t nid = pins[i];
+                unsigned int val;
                 if (!nid)
                         break;
                 switch (spec->automute_mode) {
                 case ALC_AUTOMUTE_PIN:
+                        /* don't reset VREF value in case it's controlling
+                         * the amp (see alc861_fixup_asus_amp_vref_0f())
+                         */
+                        if (spec->keep_vref_in_automute) {
+                                val = snd_hda_codec_read(codec, nid, 0,
+                                        AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                                val &= ~PIN_HP;
+                        } else
+                                val = 0;
+                        val |= pin_bits;
                         snd_hda_codec_write(codec, nid, 0,
                                             AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            pin_bits);
+                                            val);
                         break;
                 case ALC_AUTOMUTE_AMP:
                         snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
@@ -621,17 +634,10 @@ static void alc_mic_automute(struct hda_codec *codec)
                 alc_mux_select(codec, 0, spec->int_mic_idx, false);
 }
 
-/* unsolicited event for HP jack sensing */
-static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
+/* handle the specified unsol action (ALC_XXX_EVENT) */
+static void alc_exec_unsol_event(struct hda_codec *codec, int action)
 {
-        struct alc_spec *spec = codec->spec;
-        if (codec->vendor_id == 0x10ec0880)
-                res >>= 28;
-        else
-                res >>= 26;
-        if (spec->use_jack_tbl)
-                res = snd_hda_jack_get_action(codec, res);
-        switch (res) {
+        switch (action) {
         case ALC_HP_EVENT:
                 alc_hp_automute(codec);
                 break;
@@ -645,6 +651,17 @@ static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
         snd_hda_jack_report_sync(codec);
 }
 
+/* unsolicited event for HP jack sensing */
+static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        if (codec->vendor_id == 0x10ec0880)
+                res >>= 28;
+        else
+                res >>= 26;
+        res = snd_hda_jack_get_action(codec, res);
+        alc_exec_unsol_event(codec, res);
+}
+
 /* call init functions of standard auto-mute helpers */
 static void alc_inithook(struct hda_codec *codec)
 {
@@ -1840,6 +1857,8 @@ static const char * const alc_slave_vols[] = {
         "Speaker Playback Volume",
         "Mono Playback Volume",
         "Line-Out Playback Volume",
+        "CLFE Playback Volume",
+        "Bass Speaker Playback Volume",
         "PCM Playback Volume",
         NULL,
 };
@@ -1855,6 +1874,8 @@ static const char * const alc_slave_sws[] = {
         "Mono Playback Switch",
         "IEC958 Playback Switch",
         "Line-Out Playback Switch",
+        "CLFE Playback Switch",
+        "Bass Speaker Playback Switch",
         "PCM Playback Switch",
         NULL,
 };
@@ -1883,7 +1904,7 @@ static const struct snd_kcontrol_new alc_beep_mixer[] = {
 };
 #endif
 
-static int alc_build_controls(struct hda_codec *codec)
+static int __alc_build_controls(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
         struct snd_kcontrol *kctl = NULL;
@@ -2029,11 +2050,16 @@ static int alc_build_controls(struct hda_codec *codec)
 
         alc_free_kctls(codec); /* no longer needed */
 
-        err = snd_hda_jack_add_kctls(codec, &spec->autocfg);
+        return 0;
+}
+
+static int alc_build_controls(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+        int err = __alc_build_controls(codec);
         if (err < 0)
                 return err;
-
-        return 0;
+        return snd_hda_jack_add_kctls(codec, &spec->autocfg);
 }
 
 
@@ -2298,7 +2324,7 @@ static int alc_build_pcms(struct hda_codec *codec)
                  "%s Analog", codec->chip_name);
         info->name = spec->stream_name_analog;
 
-        if (spec->multiout.dac_nids > 0) {
+        if (spec->multiout.num_dacs > 0) {
                 p = spec->stream_analog_playback;
                 if (!p)
                         p = &alc_pcm_analog_playback;
@@ -3125,7 +3151,10 @@ static int alc_auto_fill_dac_nids(struct hda_codec *codec)
 static inline unsigned int get_ctl_pos(unsigned int data)
 {
         hda_nid_t nid = get_amp_nid_(data);
-        unsigned int dir = get_amp_direction_(data);
+        unsigned int dir;
+        if (snd_BUG_ON(nid >= MAX_VOL_NIDS))
+                return 0;
+        dir = get_amp_direction_(data);
         return (nid << 1) | dir;
 }
 
@@ -3233,7 +3262,7 @@ static int alc_auto_create_multi_out_ctls(struct hda_codec *codec,
         int i, err, noutputs;
 
         noutputs = cfg->line_outs;
-        if (spec->multi_ios > 0)
+        if (spec->multi_ios > 0 && cfg->line_outs < 3)
                 noutputs += spec->multi_ios;
 
         for (i = 0; i < noutputs; i++) {
@@ -3904,7 +3933,6 @@ static void set_capture_mixer(struct hda_codec *codec)
 static void alc_auto_init_std(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
-        spec->use_jack_tbl = 1;
         alc_auto_init_multi_out(codec);
         alc_auto_init_extra_out(codec);
         alc_auto_init_analog_input(codec);
@@ -4168,6 +4196,8 @@ static int patch_alc880(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC_MODEL_AUTO)
                 spec->init_hook = alc_auto_init_std;
+        else
+                codec->patch_ops.build_controls = __alc_build_controls;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
                 spec->loopback.amplist = alc880_loopbacks;
@@ -4297,6 +4327,8 @@ static int patch_alc260(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC_MODEL_AUTO)
                 spec->init_hook = alc_auto_init_std;
+        else
+                codec->patch_ops.build_controls = __alc_build_controls;
         spec->shutup = alc_eapd_shutup;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
@@ -4347,6 +4379,7 @@ enum {
         ALC882_FIXUP_ACER_ASPIRE_8930G,
         ALC882_FIXUP_ASPIRE_8930G_VERBS,
         ALC885_FIXUP_MACPRO_GPIO,
+        ALC889_FIXUP_DAC_ROUTE,
 };
 
 static void alc889_fixup_coef(struct hda_codec *codec,
@@ -4400,6 +4433,31 @@ static void alc885_fixup_macpro_gpio(struct hda_codec *codec,
         alc882_gpio_mute(codec, 1, 0);
 }
 
+/* Fix the connection of some pins for ALC889:
+ * At least, Acer Aspire 5935 shows the connections to DAC3/4 don't
+ * work correctly (bko#42740)
+ */
+static void alc889_fixup_dac_route(struct hda_codec *codec,
+                                   const struct alc_fixup *fix, int action)
+{
+        if (action == ALC_FIXUP_ACT_PRE_PROBE) {
+                /* fake the connections during parsing the tree */
+                hda_nid_t conn1[2] = { 0x0c, 0x0d };
+                hda_nid_t conn2[2] = { 0x0e, 0x0f };
+                snd_hda_override_conn_list(codec, 0x14, 2, conn1);
+                snd_hda_override_conn_list(codec, 0x15, 2, conn1);
+                snd_hda_override_conn_list(codec, 0x18, 2, conn2);
+                snd_hda_override_conn_list(codec, 0x1a, 2, conn2);
+        } else if (action == ALC_FIXUP_ACT_PROBE) {
+                /* restore the connections */
+                hda_nid_t conn[5] = { 0x0c, 0x0d, 0x0e, 0x0f, 0x26 };
+                snd_hda_override_conn_list(codec, 0x14, 5, conn);
+                snd_hda_override_conn_list(codec, 0x15, 5, conn);
+                snd_hda_override_conn_list(codec, 0x18, 5, conn);
+                snd_hda_override_conn_list(codec, 0x1a, 5, conn);
+        }
+}
+
 static const struct alc_fixup alc882_fixups[] = {
         [ALC882_FIXUP_ABIT_AW9D_MAX] = {
                 .type = ALC_FIXUP_PINS,
@@ -4547,6 +4605,10 @@ static const struct alc_fixup alc882_fixups[] = {
                 .type = ALC_FIXUP_FUNC,
                 .v.func = alc885_fixup_macpro_gpio,
         },
+        [ALC889_FIXUP_DAC_ROUTE] = {
+                .type = ALC_FIXUP_FUNC,
+                .v.func = alc889_fixup_dac_route,
+        },
 };
 
 static const struct snd_pci_quirk alc882_fixup_tbl[] = {
@@ -4571,6 +4633,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x0142, "Acer Aspire 7730G",
                       ALC882_FIXUP_ACER_ASPIRE_4930G),
         SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", ALC882_FIXUP_PB_M5210),
+        SND_PCI_QUIRK(0x1025, 0x0259, "Acer Aspire 5935", ALC889_FIXUP_DAC_ROUTE),
         SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", ALC882_FIXUP_ACER_ASPIRE_7736),
         SND_PCI_QUIRK(0x1043, 0x13c2, "Asus A7M", ALC882_FIXUP_EAPD),
         SND_PCI_QUIRK(0x1043, 0x1873, "ASUS W90V", ALC882_FIXUP_ASUS_W90V),
@@ -4691,6 +4754,8 @@ static int patch_alc882(struct hda_codec *codec)
         codec->patch_ops = alc_patch_ops;
         if (board_config == ALC_MODEL_AUTO)
                 spec->init_hook = alc_auto_init_std;
+        else
+                codec->patch_ops.build_controls = __alc_build_controls;
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)
@@ -4722,7 +4787,6 @@ enum {
         ALC262_FIXUP_FSC_H270,
         ALC262_FIXUP_HP_Z200,
         ALC262_FIXUP_TYAN,
-        ALC262_FIXUP_TOSHIBA_RX1,
         ALC262_FIXUP_LENOVO_3000,
         ALC262_FIXUP_BENQ,
         ALC262_FIXUP_BENQ_T31,
@@ -4752,16 +4816,6 @@ static const struct alc_fixup alc262_fixups[] = {
                         { }
                 }
         },
-        [ALC262_FIXUP_TOSHIBA_RX1] = {
-                .type = ALC_FIXUP_PINS,
-                .v.pins = (const struct alc_pincfg[]) {
-                        { 0x14, 0x90170110 }, /* speaker */
-                        { 0x15, 0x0421101f }, /* HP */
-                        { 0x1a, 0x40f000f0 }, /* N/A */
-                        { 0x1b, 0x40f000f0 }, /* N/A */
-                        { 0x1e, 0x40f000f0 }, /* N/A */
-                }
-        },
         [ALC262_FIXUP_LENOVO_3000] = {
                 .type = ALC_FIXUP_VERBS,
                 .v.verbs = (const struct hda_verb[]) {
@@ -4794,8 +4848,6 @@ static const struct snd_pci_quirk alc262_fixup_tbl[] = {
         SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FIXUP_BENQ),
         SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FIXUP_BENQ),
         SND_PCI_QUIRK(0x10f1, 0x2915, "Tyan Thunder n6650W", ALC262_FIXUP_TYAN),
-        SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
-                      ALC262_FIXUP_TOSHIBA_RX1),
         SND_PCI_QUIRK(0x1734, 0x1147, "FSC Celsius H270", ALC262_FIXUP_FSC_H270),
         SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000", ALC262_FIXUP_LENOVO_3000),
         SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_FIXUP_BENQ),
@@ -5364,7 +5416,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",
                       ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1013, "ASUS N61Da", ALC269_FIXUP_AMIC),
-        SND_PCI_QUIRK(0x1043, 0x1113, "ASUS N63Jn", ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1143, "ASUS B53f", ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1133, "ASUS UJ20ft", ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1183, "ASUS K72DR", ALC269_FIXUP_AMIC),
@@ -5573,8 +5624,28 @@ static const struct hda_amp_list alc861_loopbacks[] = {
 /* Pin config fixes */
 enum {
         PINFIX_FSC_AMILO_PI1505,
+        PINFIX_ASUS_A6RP,
 };
 
+/* On some laptops, VREF of pin 0x0f is abused for controlling the main amp */
+static void alc861_fixup_asus_amp_vref_0f(struct hda_codec *codec,
+                        const struct alc_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        unsigned int val;
+
+        if (action != ALC_FIXUP_ACT_INIT)
+                return;
+        val = snd_hda_codec_read(codec, 0x0f, 0,
+                                 AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+        if (!(val & (AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN)))
+                val |= AC_PINCTL_IN_EN;
+        val |= AC_PINCTL_VREF_50;
+        snd_hda_codec_write(codec, 0x0f, 0,
+                            AC_VERB_SET_PIN_WIDGET_CONTROL, val);
+        spec->keep_vref_in_automute = 1;
+}
+
 static const struct alc_fixup alc861_fixups[] = {
         [PINFIX_FSC_AMILO_PI1505] = {
                 .type = ALC_FIXUP_PINS,
@@ -5584,9 +5655,16 @@ static const struct alc_fixup alc861_fixups[] = {
                         { }
                 }
         },
+        [PINFIX_ASUS_A6RP] = {
+                .type = ALC_FIXUP_FUNC,
+                .v.func = alc861_fixup_asus_amp_vref_0f,
+        },
 };
 
 static const struct snd_pci_quirk alc861_fixup_tbl[] = {
+        SND_PCI_QUIRK_VENDOR(0x1043, "ASUS laptop", PINFIX_ASUS_A6RP),
+        SND_PCI_QUIRK(0x1584, 0x0000, "Uniwill ECS M31EI", PINFIX_ASUS_A6RP),   
+        SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", PINFIX_ASUS_A6RP),
         SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505),
         {}
 };
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 3556408d6ece..6345df131a00 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -1608,7 +1608,7 @@ static const struct snd_pci_quirk stac92hd73xx_codec_id_cfg_tbl[] = {
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x043a,
                       "Alienware M17x", STAC_ALIENWARE_M17X),
         SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490,
-                      "Alienware M17x", STAC_ALIENWARE_M17X),
+                      "Alienware M17x R3", STAC_DELL_EQ),
         {} /* terminator */
 };
 
@@ -4163,13 +4163,15 @@ static int enable_pin_detect(struct hda_codec *codec, hda_nid_t nid,
         return 1;
 }
 
-static int is_nid_hp_pin(struct auto_pin_cfg *cfg, hda_nid_t nid)
+static int is_nid_out_jack_pin(struct auto_pin_cfg *cfg, hda_nid_t nid)
 {
         int i;
         for (i = 0; i < cfg->hp_outs; i++)
                 if (cfg->hp_pins[i] == nid)
                         return 1; /* nid is a HP-Out */
-
+        for (i = 0; i < cfg->line_outs; i++)
+                if (cfg->line_out_pins[i] == nid)
+                        return 1; /* nid is a line-Out */
         return 0; /* nid is not a HP-Out */
 };
 
@@ -4375,7 +4377,7 @@ static int stac92xx_init(struct hda_codec *codec)
                         continue;
                 }
 
-                if (is_nid_hp_pin(cfg, nid))
+                if (is_nid_out_jack_pin(cfg, nid))
                         continue; /* already has an unsol event */
 
                 pinctl = snd_hda_codec_read(codec, nid, 0,
@@ -4868,7 +4870,14 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity)
                         /* BIOS bug: unfilled OEM string */
                         if (strstr(dev->name, "HP_Mute_LED_P_G")) {
                                 set_hp_led_gpio(codec);
-                                spec->gpio_led_polarity = 1;
+                                switch (codec->subsystem_id) {
+                                case 0x103c148a:
+                                        spec->gpio_led_polarity = 0;
+                                        break;
+                                default:
+                                        spec->gpio_led_polarity = 1;
+                                        break;
+                                }
                                 return 1;
                         }
                 }
@@ -5069,9 +5078,9 @@ static int stac92xx_update_led_status(struct hda_codec *codec)
                                 spec->gpio_dir, spec->gpio_data);
         } else {
                 notmtd_lvl = spec->gpio_led_polarity ?
-                                AC_PINCTL_VREF_HIZ : AC_PINCTL_VREF_GRD;
+                                AC_PINCTL_VREF_50 : AC_PINCTL_VREF_GRD;
                 muted_lvl = spec->gpio_led_polarity ?
-                                AC_PINCTL_VREF_GRD : AC_PINCTL_VREF_HIZ;
+                                AC_PINCTL_VREF_GRD : AC_PINCTL_VREF_50;
                 spec->vref_led = muted ? muted_lvl : notmtd_lvl;
                 stac_vrefout_set(codec, spec->vref_mute_led_nid,
                                  spec->vref_led);
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 03e63fed9caf..dff9a00ee8fb 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -199,6 +199,9 @@ struct via_spec {
         unsigned int no_pin_power_ctl;
         enum VIA_HDA_CODEC codec_type;
 
+        /* analog low-power control */
+        bool alc_mode;
+
         /* smart51 setup */
         unsigned int smart51_nums;
         hda_nid_t smart51_pins[2];
@@ -663,6 +666,9 @@ static void via_auto_init_analog_input(struct hda_codec *codec)
         /* init input-src */
         for (i = 0; i < spec->num_adc_nids; i++) {
                 int adc_idx = spec->inputs[spec->cur_mux[i]].adc_idx;
+                /* secondary ADCs must have the unique MUX */
+                if (i > 0 && !spec->mux_nids[i])
+                        break;
                 if (spec->mux_nids[adc_idx]) {
                         int mux_idx = spec->inputs[spec->cur_mux[i]].mux_idx;
                         snd_hda_codec_write(codec, spec->mux_nids[adc_idx], 0,
@@ -687,6 +693,15 @@ static void via_auto_init_analog_input(struct hda_codec *codec)
         }
 }
 
+static void update_power_state(struct hda_codec *codec, hda_nid_t nid,
+                               unsigned int parm)
+{
+        if (snd_hda_codec_read(codec, nid, 0,
+                               AC_VERB_GET_POWER_STATE, 0) == parm)
+                return;
+        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE, parm);
+}
+
 static void set_pin_power_state(struct hda_codec *codec, hda_nid_t nid,
                                 unsigned int *affected_parm)
 {
@@ -709,7 +724,7 @@ static void set_pin_power_state(struct hda_codec *codec, hda_nid_t nid,
         } else
                 parm = AC_PWRST_D3;
 
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, nid, parm);
 }
 
 static int via_pin_power_ctl_info(struct snd_kcontrol *kcontrol,
@@ -749,6 +764,7 @@ static int via_pin_power_ctl_put(struct snd_kcontrol *kcontrol,
                 return 0;
         spec->no_pin_power_ctl = val;
         set_widgets_power_state(codec);
+        analog_low_current_mode(codec);
         return 1;
 }
 
@@ -1036,13 +1052,19 @@ static bool is_aa_path_mute(struct hda_codec *codec)
 }
 
 /* enter/exit analog low-current mode */
-static void analog_low_current_mode(struct hda_codec *codec)
+static void __analog_low_current_mode(struct hda_codec *codec, bool force)
 {
         struct via_spec *spec = codec->spec;
         bool enable;
         unsigned int verb, parm;
 
-        enable = is_aa_path_mute(codec) && (spec->opened_streams != 0);
+        if (spec->no_pin_power_ctl)
+                enable = false;
+        else
+                enable = is_aa_path_mute(codec) && !spec->opened_streams;
+        if (enable == spec->alc_mode && !force)
+                return;
+        spec->alc_mode = enable;
 
         /* decide low current mode's verb & parameter */
         switch (spec->codec_type) {
@@ -1074,6 +1096,11 @@ static void analog_low_current_mode(struct hda_codec *codec)
         snd_hda_codec_write(codec, codec->afg, 0, verb, parm);
 }
 
+static void analog_low_current_mode(struct hda_codec *codec)
+{
+        return __analog_low_current_mode(codec, false);
+}
+
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
@@ -1446,6 +1473,7 @@ static int via_build_controls(struct hda_codec *codec)
         struct snd_kcontrol *kctl;
         int err, i;
 
+        spec->no_pin_power_ctl = 1;
         if (spec->set_widgets_power_state)
                 if (!via_clone_control(spec, &via_pin_power_ctl_enum))
                         return -ENOMEM;
@@ -1499,10 +1527,6 @@ static int via_build_controls(struct hda_codec *codec)
                         return err;
         }
 
-        /* init power states */
-        set_widgets_power_state(codec);
-        analog_low_current_mode(codec);
-
         via_free_kctls(codec); /* no longer needed */
 
         err = snd_hda_jack_add_kctls(codec, &spec->autocfg);
@@ -2295,10 +2319,7 @@ static int via_mux_enum_put(struct snd_kcontrol *kcontrol,
 
         if (mux) {
                 /* switch to D0 beofre change index */
-                if (snd_hda_codec_read(codec, mux, 0,
-                               AC_VERB_GET_POWER_STATE, 0x00) != AC_PWRST_D0)
-                        snd_hda_codec_write(codec, mux, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, mux, AC_PWRST_D0);
                 snd_hda_codec_write(codec, mux, 0,
                                     AC_VERB_SET_CONNECT_SEL,
                                     spec->inputs[cur].mux_idx);
@@ -2776,6 +2797,10 @@ static int via_init(struct hda_codec *codec)
         for (i = 0; i < spec->num_iverbs; i++)
                 snd_hda_sequence_write(codec, spec->init_verbs[i]);
 
+        /* init power states */
+        set_widgets_power_state(codec);
+        __analog_low_current_mode(codec, true);
+
         via_auto_init_multi_out(codec);
         via_auto_init_hp_out(codec);
         via_auto_init_speaker_out(codec);
@@ -2922,9 +2947,9 @@ static void set_widgets_power_state_vt1708B(struct hda_codec *codec)
         if (imux_is_smixer)
                 parm = AC_PWRST_D0;
         /* SW0 (17h), AIW 0/1 (13h/14h) */
-        snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x17, parm);
+        update_power_state(codec, 0x13, parm);
+        update_power_state(codec, 0x14, parm);
 
         /* outputs */
         /* PW0 (19h), SW1 (18h), AOW1 (11h) */
@@ -2932,8 +2957,8 @@ static void set_widgets_power_state_vt1708B(struct hda_codec *codec)
         set_pin_power_state(codec, 0x19, &parm);
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x1b, &parm);
-        snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x18, parm);
+        update_power_state(codec, 0x11, parm);
 
         /* PW6 (22h), SW2 (26h), AOW2 (24h) */
         if (is_8ch) {
@@ -2941,20 +2966,16 @@ static void set_widgets_power_state_vt1708B(struct hda_codec *codec)
                 set_pin_power_state(codec, 0x22, &parm);
                 if (spec->smart51_enabled)
                         set_pin_power_state(codec, 0x1a, &parm);
-                snd_hda_codec_write(codec, 0x26, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x24, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x26, parm);
+                update_power_state(codec, 0x24, parm);
         } else if (codec->vendor_id == 0x11064397) {
                 /* PW7(23h), SW2(27h), AOW2(25h) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x23, &parm);
                 if (spec->smart51_enabled)
                         set_pin_power_state(codec, 0x1a, &parm);
-                snd_hda_codec_write(codec, 0x27, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x25, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x27, parm);
+                update_power_state(codec, 0x25, parm);
         }
 
         /* PW 3/4/7 (1ch/1dh/23h) */
@@ -2966,17 +2987,13 @@ static void set_widgets_power_state_vt1708B(struct hda_codec *codec)
                 set_pin_power_state(codec, 0x23, &parm);
 
         /* MW0 (16h), Sw3 (27h), AOW 0/3 (10h/25h) */
-        snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,
-                            imux_is_smixer ? AC_PWRST_D0 : parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x16, imux_is_smixer ? AC_PWRST_D0 : parm);
+        update_power_state(codec, 0x10, parm);
         if (is_8ch) {
-                snd_hda_codec_write(codec, 0x25, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x27, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x25, parm);
+                update_power_state(codec, 0x27, parm);
         } else if (codec->vendor_id == 0x11064397 && spec->hp_independent_mode)
-                snd_hda_codec_write(codec, 0x25, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x25, parm);
 }
 
 static int patch_vt1708S(struct hda_codec *codec);
@@ -3149,10 +3166,10 @@ static void set_widgets_power_state_vt1702(struct hda_codec *codec)
         if (imux_is_smixer)
                 parm = AC_PWRST_D0; /* SW0 (13h) = stereo mixer (idx 3) */
         /* SW0 (13h), AIW 0/1/2 (12h/1fh/20h) */
-        snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x12, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x13, parm);
+        update_power_state(codec, 0x12, parm);
+        update_power_state(codec, 0x1f, parm);
+        update_power_state(codec, 0x20, parm);
 
         /* outputs */
         /* PW 3/4 (16h/17h) */
@@ -3160,10 +3177,9 @@ static void set_widgets_power_state_vt1702(struct hda_codec *codec)
         set_pin_power_state(codec, 0x17, &parm);
         set_pin_power_state(codec, 0x16, &parm);
         /* MW0 (1ah), AOW 0/1 (10h/1dh) */
-        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE,
-                            imux_is_smixer ? AC_PWRST_D0 : parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x1d, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1a, imux_is_smixer ? AC_PWRST_D0 : parm);
+        update_power_state(codec, 0x10, parm);
+        update_power_state(codec, 0x1d, parm);
 }
 
 static int patch_vt1702(struct hda_codec *codec)
@@ -3228,52 +3244,48 @@ static void set_widgets_power_state_vt1718S(struct hda_codec *codec)
         if (imux_is_smixer)
                 parm = AC_PWRST_D0;
         /* MUX6/7 (1eh/1fh), AIW 0/1 (10h/11h) */
-        snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1e, parm);
+        update_power_state(codec, 0x1f, parm);
+        update_power_state(codec, 0x10, parm);
+        update_power_state(codec, 0x11, parm);
 
         /* outputs */
         /* PW3 (27h), MW2 (1ah), AOW3 (bh) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x27, &parm);
-        snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0xb, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1a, parm);
+        update_power_state(codec, 0xb, parm);
 
         /* PW2 (26h), AOW2 (ah) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x26, &parm);
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x2b, &parm);
-        snd_hda_codec_write(codec, 0xa, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0xa, parm);
 
         /* PW0 (24h), AOW0 (8h) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x24, &parm);
         if (!spec->hp_independent_mode) /* check for redirected HP */
                 set_pin_power_state(codec, 0x28, &parm);
-        snd_hda_codec_write(codec, 0x8, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x8, parm);
         /* MW9 (21h), Mw2 (1ah), AOW0 (8h) */
-        snd_hda_codec_write(codec, 0x21, 0, AC_VERB_SET_POWER_STATE,
-                            imux_is_smixer ? AC_PWRST_D0 : parm);
+        update_power_state(codec, 0x21, imux_is_smixer ? AC_PWRST_D0 : parm);
 
         /* PW1 (25h), AOW1 (9h) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x25, &parm);
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x2a, &parm);
-        snd_hda_codec_write(codec, 0x9, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x9, parm);
 
         if (spec->hp_independent_mode) {
                 /* PW4 (28h), MW3 (1bh), MUX1(34h), AOW4 (ch) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x28, &parm);
-                snd_hda_codec_write(codec, 0x1b, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x34, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0xc, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x1b, parm);
+                update_power_state(codec, 0x34, parm);
+                update_power_state(codec, 0xc, parm);
         }
 }
 
@@ -3433,8 +3445,8 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
         if (imux_is_smixer)
                 parm = AC_PWRST_D0;
         /* SW0 (17h), AIW0(13h) */
-        snd_hda_codec_write(codec, 0x17, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x13, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x17, parm);
+        update_power_state(codec, 0x13, parm);
 
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x1e, &parm);
@@ -3442,12 +3454,11 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
         if (spec->dmic_enabled)
                 set_pin_power_state(codec, 0x22, &parm);
         else
-                snd_hda_codec_write(codec, 0x22, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                update_power_state(codec, 0x22, AC_PWRST_D3);
 
         /* SW2(26h), AIW1(14h) */
-        snd_hda_codec_write(codec, 0x26, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x14, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x26, parm);
+        update_power_state(codec, 0x14, parm);
 
         /* outputs */
         /* PW0 (19h), SW1 (18h), AOW1 (11h) */
@@ -3456,8 +3467,8 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
         /* Smart 5.1 PW2(1bh) */
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x1b, &parm);
-        snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x18, parm);
+        update_power_state(codec, 0x11, parm);
 
         /* PW7 (23h), SW3 (27h), AOW3 (25h) */
         parm = AC_PWRST_D3;
@@ -3465,12 +3476,12 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
         /* Smart 5.1 PW1(1ah) */
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x1a, &parm);
-        snd_hda_codec_write(codec, 0x27, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x27, parm);
 
         /* Smart 5.1 PW5(1eh) */
         if (spec->smart51_enabled)
                 set_pin_power_state(codec, 0x1e, &parm);
-        snd_hda_codec_write(codec, 0x25, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x25, parm);
 
         /* Mono out */
         /* SW4(28h)->MW1(29h)-> PW12 (2ah)*/
@@ -3486,9 +3497,9 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
                         mono_out = 1;
         }
         parm = mono_out ? AC_PWRST_D0 : AC_PWRST_D3;
-        snd_hda_codec_write(codec, 0x28, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x29, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x2a, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x28, parm);
+        update_power_state(codec, 0x29, parm);
+        update_power_state(codec, 0x2a, parm);
 
         /* PW 3/4 (1ch/1dh) */
         parm = AC_PWRST_D3;
@@ -3496,15 +3507,12 @@ static void set_widgets_power_state_vt1716S(struct hda_codec *codec)
         set_pin_power_state(codec, 0x1d, &parm);
         /* HP Independent Mode, power on AOW3 */
         if (spec->hp_independent_mode)
-                snd_hda_codec_write(codec, 0x25, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x25, parm);
 
         /* force to D0 for internal Speaker */
         /* MW0 (16h), AOW0 (10h) */
-        snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_POWER_STATE,
-                            imux_is_smixer ? AC_PWRST_D0 : parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE,
-                            mono_out ? AC_PWRST_D0 : parm);
+        update_power_state(codec, 0x16, imux_is_smixer ? AC_PWRST_D0 : parm);
+        update_power_state(codec, 0x10, mono_out ? AC_PWRST_D0 : parm);
 }
 
 static int patch_vt1716S(struct hda_codec *codec)
@@ -3580,54 +3588,45 @@ static void set_widgets_power_state_vt2002P(struct hda_codec *codec)
         set_pin_power_state(codec, 0x2b, &parm);
         parm = AC_PWRST_D0;
         /* MUX9/10 (1eh/1fh), AIW 0/1 (10h/11h) */
-        snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1e, parm);
+        update_power_state(codec, 0x1f, parm);
+        update_power_state(codec, 0x10, parm);
+        update_power_state(codec, 0x11, parm);
 
         /* outputs */
         /* AOW0 (8h)*/
-        snd_hda_codec_write(codec, 0x8, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x8, parm);
 
         if (spec->codec_type == VT1802) {
                 /* PW4 (28h), MW4 (18h), MUX4(38h) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x28, &parm);
-                snd_hda_codec_write(codec, 0x18, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x38, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x18, parm);
+                update_power_state(codec, 0x38, parm);
         } else {
                 /* PW4 (26h), MW4 (1ch), MUX4(37h) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x26, &parm);
-                snd_hda_codec_write(codec, 0x1c, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x37, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x1c, parm);
+                update_power_state(codec, 0x37, parm);
         }
 
         if (spec->codec_type == VT1802) {
                 /* PW1 (25h), MW1 (15h), MUX1(35h), AOW1 (9h) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x25, &parm);
-                snd_hda_codec_write(codec, 0x15, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x35, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x15, parm);
+                update_power_state(codec, 0x35, parm);
         } else {
                 /* PW1 (25h), MW1 (19h), MUX1(35h), AOW1 (9h) */
                 parm = AC_PWRST_D3;
                 set_pin_power_state(codec, 0x25, &parm);
-                snd_hda_codec_write(codec, 0x19, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x35, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x19, parm);
+                update_power_state(codec, 0x35, parm);
         }
 
         if (spec->hp_independent_mode)
-                snd_hda_codec_write(codec, 0x9, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, 0x9, AC_PWRST_D0);
 
         /* Class-D */
         /* PW0 (24h), MW0(18h/14h), MUX0(34h) */
@@ -3637,12 +3636,10 @@ static void set_widgets_power_state_vt2002P(struct hda_codec *codec)
         set_pin_power_state(codec, 0x24, &parm);
         parm = present ? AC_PWRST_D3 : AC_PWRST_D0;
         if (spec->codec_type == VT1802)
-                snd_hda_codec_write(codec, 0x14, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x14, parm);
         else
-                snd_hda_codec_write(codec, 0x18, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x34, 0, AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x18, parm);
+        update_power_state(codec, 0x34, parm);
 
         /* Mono Out */
         present = snd_hda_jack_detect(codec, 0x26);
@@ -3650,28 +3647,20 @@ static void set_widgets_power_state_vt2002P(struct hda_codec *codec)
         parm = present ? AC_PWRST_D3 : AC_PWRST_D0;
         if (spec->codec_type == VT1802) {
                 /* PW15 (33h), MW8(1ch), MUX8(3ch) */
-                snd_hda_codec_write(codec, 0x33, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x1c, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x3c, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x33, parm);
+                update_power_state(codec, 0x1c, parm);
+                update_power_state(codec, 0x3c, parm);
         } else {
                 /* PW15 (31h), MW8(17h), MUX8(3bh) */
-                snd_hda_codec_write(codec, 0x31, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x17, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
-                snd_hda_codec_write(codec, 0x3b, 0,
-                                    AC_VERB_SET_POWER_STATE, parm);
+                update_power_state(codec, 0x31, parm);
+                update_power_state(codec, 0x17, parm);
+                update_power_state(codec, 0x3b, parm);
         }
         /* MW9 (21h) */
         if (imux_is_smixer || !is_aa_path_mute(codec))
-                snd_hda_codec_write(codec, 0x21, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, 0x21, AC_PWRST_D0);
         else
-                snd_hda_codec_write(codec, 0x21, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                update_power_state(codec, 0x21, AC_PWRST_D3);
 }
 
 /* patch for vt2002P */
@@ -3731,30 +3720,28 @@ static void set_widgets_power_state_vt1812(struct hda_codec *codec)
         set_pin_power_state(codec, 0x2b, &parm);
         parm = AC_PWRST_D0;
         /* MUX10/11 (1eh/1fh), AIW 0/1 (10h/11h) */
-        snd_hda_codec_write(codec, 0x1e, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1e, parm);
+        update_power_state(codec, 0x1f, parm);
+        update_power_state(codec, 0x10, parm);
+        update_power_state(codec, 0x11, parm);
 
         /* outputs */
         /* AOW0 (8h)*/
-        snd_hda_codec_write(codec, 0x8, 0,
-                            AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+        update_power_state(codec, 0x8, AC_PWRST_D0);
 
         /* PW4 (28h), MW4 (18h), MUX4(38h) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x28, &parm);
-        snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x38, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x18, parm);
+        update_power_state(codec, 0x38, parm);
 
         /* PW1 (25h), MW1 (15h), MUX1(35h), AOW1 (9h) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x25, &parm);
-        snd_hda_codec_write(codec, 0x15, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x35, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x15, parm);
+        update_power_state(codec, 0x35, parm);
         if (spec->hp_independent_mode)
-                snd_hda_codec_write(codec, 0x9, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, 0x9, AC_PWRST_D0);
 
         /* Internal Speaker */
         /* PW0 (24h), MW0(14h), MUX0(34h) */
@@ -3763,15 +3750,11 @@ static void set_widgets_power_state_vt1812(struct hda_codec *codec)
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x24, &parm);
         if (present) {
-                snd_hda_codec_write(codec, 0x14, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-                snd_hda_codec_write(codec, 0x34, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                update_power_state(codec, 0x14, AC_PWRST_D3);
+                update_power_state(codec, 0x34, AC_PWRST_D3);
         } else {
-                snd_hda_codec_write(codec, 0x14, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                snd_hda_codec_write(codec, 0x34, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, 0x14, AC_PWRST_D0);
+                update_power_state(codec, 0x34, AC_PWRST_D0);
         }
 
 
@@ -3782,26 +3765,20 @@ static void set_widgets_power_state_vt1812(struct hda_codec *codec)
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x31, &parm);
         if (present) {
-                snd_hda_codec_write(codec, 0x1c, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-                snd_hda_codec_write(codec, 0x3c, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
-                snd_hda_codec_write(codec, 0x3e, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);
+                update_power_state(codec, 0x1c, AC_PWRST_D3);
+                update_power_state(codec, 0x3c, AC_PWRST_D3);
+                update_power_state(codec, 0x3e, AC_PWRST_D3);
         } else {
-                snd_hda_codec_write(codec, 0x1c, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                snd_hda_codec_write(codec, 0x3c, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
-                snd_hda_codec_write(codec, 0x3e, 0,
-                                    AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
+                update_power_state(codec, 0x1c, AC_PWRST_D0);
+                update_power_state(codec, 0x3c, AC_PWRST_D0);
+                update_power_state(codec, 0x3e, AC_PWRST_D0);
         }
 
         /* PW15 (33h), MW15 (1dh), MUX15(3dh) */
         parm = AC_PWRST_D3;
         set_pin_power_state(codec, 0x33, &parm);
-        snd_hda_codec_write(codec, 0x1d, 0, AC_VERB_SET_POWER_STATE, parm);
-        snd_hda_codec_write(codec, 0x3d, 0, AC_VERB_SET_POWER_STATE, parm);
+        update_power_state(codec, 0x1d, parm);
+        update_power_state(codec, 0x3d, parm);
 
 }
 
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 9f3b01bb72c8..e0a4263baa20 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2102,6 +2102,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
         },
         {
                 .subvendor = 0x161f,
+                .subdevice = 0x202f,
+                .name = "Gateway M520",
+                .type = AC97_TUNE_INV_EAPD
+        },
+        {
+                .subvendor = 0x161f,
                 .subdevice = 0x203a,
                 .name = "Gateway 4525GZ",               /* AD1981B */
                 .type = AC97_TUNE_INV_EAPD
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index 26c7e8bcb229..c0dbb52d45be 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -618,9 +618,12 @@ static int ac97_volume_get(struct snd_kcontrol *ctl,
         mutex_lock(&chip->mutex);
         reg = oxygen_read_ac97(chip, codec, index);
         mutex_unlock(&chip->mutex);
-        value->value.integer.value[0] = 31 - (reg & 0x1f);
-        if (stereo)
-                value->value.integer.value[1] = 31 - ((reg >> 8) & 0x1f);
+        if (!stereo) {
+                value->value.integer.value[0] = 31 - (reg & 0x1f);
+        } else {
+                value->value.integer.value[0] = 31 - ((reg >> 8) & 0x1f);
+                value->value.integer.value[1] = 31 - (reg & 0x1f);
+        }
         return 0;
 }
 
@@ -636,14 +639,14 @@ static int ac97_volume_put(struct snd_kcontrol *ctl,
 
         mutex_lock(&chip->mutex);
         oldreg = oxygen_read_ac97(chip, codec, index);
-        newreg = oldreg;
-        newreg = (newreg & ~0x1f) |
-                (31 - (value->value.integer.value[0] & 0x1f));
-        if (stereo)
-                newreg = (newreg & ~0x1f00) |
-                        ((31 - (value->value.integer.value[1] & 0x1f)) << 8);
-        else
-                newreg = (newreg & ~0x1f00) | ((newreg & 0x1f) << 8);
+        if (!stereo) {
+                newreg = oldreg & ~0x1f;
+                newreg |= 31 - (value->value.integer.value[0] & 0x1f);
+        } else {
+                newreg = oldreg & ~0x1f1f;
+                newreg |= (31 - (value->value.integer.value[0] & 0x1f)) << 8;
+                newreg |= 31 - (value->value.integer.value[1] & 0x1f);
+        }
         change = newreg != oldreg;
         if (change)
                 oxygen_write_ac97(chip, codec, index, newreg);
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index e57b89e8aa89..94ab728f5ca8 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -286,17 +286,22 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_ymfpci_pcm_4ch(chip, 2, NULL)) < 0) {
+        err = snd_ymfpci_mixer(chip, rear_switch[dev]);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_ymfpci_pcm2(chip, 3, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_ymfpci_mixer(chip, rear_switch[dev])) < 0) {
-                snd_card_free(card);
-                return err;
+        if (chip->ac97->ext_id & AC97_EI_SDAC) {
+                err = snd_ymfpci_pcm_4ch(chip, 2, NULL);
+                if (err < 0) {
+                        snd_card_free(card);
+                        return err;
+                }
+                err = snd_ymfpci_pcm2(chip, 3, NULL);
+                if (err < 0) {
+                        snd_card_free(card);
+                        return err;
+                }
         }
         if ((err = snd_ymfpci_timer(chip, 0)) < 0) {
                 snd_card_free(card);
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 03ee4e365311..12a9a2b03387 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -1614,6 +1614,14 @@ static int snd_ymfpci_put_dup4ch(struct snd_kcontrol *kcontrol, struct snd_ctl_e
         return change;
 }
 
+static struct snd_kcontrol_new snd_ymfpci_dup4ch __devinitdata = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "4ch Duplication",
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+        .info = snd_ymfpci_info_dup4ch,
+        .get = snd_ymfpci_get_dup4ch,
+        .put = snd_ymfpci_put_dup4ch,
+};
 
 static struct snd_kcontrol_new snd_ymfpci_controls[] __devinitdata = {
 {
@@ -1642,13 +1650,6 @@ YMFPCI_DOUBLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,VOLUME), 1, YDSXGR_SPDIFLOOPVOL),
 YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), 0, YDSXGR_SPDIFOUTCTRL, 0),
 YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0, YDSXGR_SPDIFINCTRL, 0),
 YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("Loop",NONE,NONE), 0, YDSXGR_SPDIFINCTRL, 4),
-{
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name = "4ch Duplication",
-        .info = snd_ymfpci_info_dup4ch,
-        .get = snd_ymfpci_get_dup4ch,
-        .put = snd_ymfpci_put_dup4ch,
-},
 };
 
 
@@ -1838,6 +1839,12 @@ int __devinit snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch)
                 if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_ymfpci_controls[idx], chip))) < 0)
                         return err;
         }
+        if (chip->ac97->ext_id & AC97_EI_SDAC) {
+                kctl = snd_ctl_new1(&snd_ymfpci_dup4ch, chip);
+                err = snd_ctl_add(chip->card, kctl);
+                if (err < 0)
+                        return err;
+        }
 
         /* add S/PDIF control */
         if (snd_BUG_ON(!chip->pcm_spdif))
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 5ef70b5d27e4..278c0a0575f5 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -146,13 +146,10 @@ static const struct snd_kcontrol_new ak4642_snd_controls[] = {
 
         SOC_DOUBLE_R_TLV("Digital Playback Volume", L_DVC, R_DVC,
                          0, 0xFF, 1, out_tlv),
-
-        SOC_SINGLE("Headphone Switch", PW_MGMT2, 6, 1, 0),
 };
 
-static const struct snd_kcontrol_new ak4642_hpout_mixer_controls[] = {
-        SOC_DAPM_SINGLE("DACH", MD_CTL4, 0, 1, 0),
-};
+static const struct snd_kcontrol_new ak4642_headphone_control =
+        SOC_DAPM_SINGLE("Switch", PW_MGMT2, 6, 1, 0);
 
 static const struct snd_kcontrol_new ak4642_lout_mixer_controls[] = {
         SOC_DAPM_SINGLE("DACL", SG_SL1, 4, 1, 0),
@@ -165,13 +162,12 @@ static const struct snd_soc_dapm_widget ak4642_dapm_widgets[] = {
         SND_SOC_DAPM_OUTPUT("HPOUTR"),
         SND_SOC_DAPM_OUTPUT("LINEOUT"),
 
-        SND_SOC_DAPM_MIXER("HPOUTL Mixer", PW_MGMT2, 5, 0,
-                           &ak4642_hpout_mixer_controls[0],
-                           ARRAY_SIZE(ak4642_hpout_mixer_controls)),
+        SND_SOC_DAPM_PGA("HPL Out", PW_MGMT2, 5, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("HPR Out", PW_MGMT2, 4, 0, NULL, 0),
+        SND_SOC_DAPM_SWITCH("Headphone Enable", SND_SOC_NOPM, 0, 0,
+                            &ak4642_headphone_control),
 
-        SND_SOC_DAPM_MIXER("HPOUTR Mixer", PW_MGMT2, 4, 0,
-                           &ak4642_hpout_mixer_controls[0],
-                           ARRAY_SIZE(ak4642_hpout_mixer_controls)),
+        SND_SOC_DAPM_PGA("DACH", MD_CTL4, 0, 0, NULL, 0),
 
         SND_SOC_DAPM_MIXER("LINEOUT Mixer", PW_MGMT1, 3, 0,
                            &ak4642_lout_mixer_controls[0],
@@ -184,12 +180,17 @@ static const struct snd_soc_dapm_widget ak4642_dapm_widgets[] = {
 static const struct snd_soc_dapm_route ak4642_intercon[] = {
 
         /* Outputs */
-        {"HPOUTL", NULL, "HPOUTL Mixer"},
-        {"HPOUTR", NULL, "HPOUTR Mixer"},
+        {"HPOUTL", NULL, "HPL Out"},
+        {"HPOUTR", NULL, "HPR Out"},
         {"LINEOUT", NULL, "LINEOUT Mixer"},
 
-        {"HPOUTL Mixer", "DACH", "DAC"},
-        {"HPOUTR Mixer", "DACH", "DAC"},
+        {"HPL Out", NULL, "Headphone Enable"},
+        {"HPR Out", NULL, "Headphone Enable"},
+
+        {"Headphone Enable", "Switch", "DACH"},
+
+        {"DACH", NULL, "DAC"},
+
         {"LINEOUT Mixer", "DACL", "DAC"},
 };
 
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 9d38db8f1919..78979b3e0e95 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -1113,7 +1113,7 @@ static int cs42l73_pcm_hw_params(struct snd_pcm_substream *substream,
                 priv->config[id].mmcc &= 0xC0;
                 priv->config[id].mmcc |= cs42l73_mclk_coeffs[mclk_coeff].mmcc;
                 priv->config[id].spc &= 0xFC;
-                priv->config[id].spc &= MCK_SCLK_64FS;
+                priv->config[id].spc |= MCK_SCLK_MCLK;
         } else {
                 /* CS42L73 Slave */
                 priv->config[id].spc &= 0xFC;
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index f8863ebb4304..7f4ba819a9f6 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -987,12 +987,12 @@ static int sgtl5000_restore_regs(struct snd_soc_codec *codec)
         /* restore regular registers */
         for (reg = 0; reg <= SGTL5000_CHIP_SHORT_CTRL; reg += 2) {
 
-                /* this regs depends on the others */
+                /* These regs should restore in particular order */
                 if (reg == SGTL5000_CHIP_ANA_POWER ||
                         reg == SGTL5000_CHIP_CLK_CTRL ||
                         reg == SGTL5000_CHIP_LINREG_CTRL ||
                         reg == SGTL5000_CHIP_LINE_OUT_CTRL ||
-                        reg == SGTL5000_CHIP_CLK_CTRL)
+                        reg == SGTL5000_CHIP_REF_CTRL)
                         continue;
 
                 snd_soc_write(codec, reg, cache[reg]);
@@ -1003,8 +1003,17 @@ static int sgtl5000_restore_regs(struct snd_soc_codec *codec)
                 snd_soc_write(codec, reg, cache[reg]);
 
         /*
-         * restore power and other regs according
-         * to set_power() and set_clock()
+         * restore these regs according to the power setting sequence in
+         * sgtl5000_set_power_regs() and clock setting sequence in
+         * sgtl5000_set_clock().
+         *
+         * The order of restore is:
+         * 1. SGTL5000_CHIP_CLK_CTRL MCLK_FREQ bits (1:0) should be restore after
+         *    SGTL5000_CHIP_ANA_POWER PLL bits set
+         * 2. SGTL5000_CHIP_LINREG_CTRL should be set before
+         *    SGTL5000_CHIP_ANA_POWER LINREG_D restored
+         * 3. SGTL5000_CHIP_REF_CTRL controls Analog Ground Voltage,
+         *    prefer to resotre it after SGTL5000_CHIP_ANA_POWER restored
          */
         snd_soc_write(codec, SGTL5000_CHIP_LINREG_CTRL,
                         cache[SGTL5000_CHIP_LINREG_CTRL]);
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index eb401ef021fb..372b0b83bd9f 100644
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -60,7 +60,6 @@ struct aic32x4_rate_divs {
 
 struct aic32x4_priv {
         u32 sysclk;
-        s32 master;
         u8 page_no;
         void *control_data;
         u32 power_cfg;
@@ -369,7 +368,6 @@ static int aic32x4_set_dai_sysclk(struct snd_soc_dai *codec_dai,
 static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 {
         struct snd_soc_codec *codec = codec_dai->codec;
-        struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);
         u8 iface_reg_1;
         u8 iface_reg_2;
         u8 iface_reg_3;
@@ -384,11 +382,9 @@ static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
         /* set master/slave audio interface */
         switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
         case SND_SOC_DAIFMT_CBM_CFM:
-                aic32x4->master = 1;
                 iface_reg_1 |= AIC32X4_BCLKMASTER | AIC32X4_WCLKMASTER;
                 break;
         case SND_SOC_DAIFMT_CBS_CFS:
-                aic32x4->master = 0;
                 break;
         default:
                 printk(KERN_ERR "aic32x4: invalid DAI master/slave interface\n");
@@ -526,64 +522,58 @@ static int aic32x4_mute(struct snd_soc_dai *dai, int mute)
 static int aic32x4_set_bias_level(struct snd_soc_codec *codec,
                                   enum snd_soc_bias_level level)
 {
-        struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);
-
         switch (level) {
         case SND_SOC_BIAS_ON:
-                if (aic32x4->master) {
-                        /* Switch on PLL */
-                        snd_soc_update_bits(codec, AIC32X4_PLLPR,
-                                            AIC32X4_PLLEN, AIC32X4_PLLEN);
-
-                        /* Switch on NDAC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_NDAC,
-                                            AIC32X4_NDACEN, AIC32X4_NDACEN);
-
-                        /* Switch on MDAC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_MDAC,
-                                            AIC32X4_MDACEN, AIC32X4_MDACEN);
-
-                        /* Switch on NADC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_NADC,
-                                            AIC32X4_NADCEN, AIC32X4_NADCEN);
-
-                        /* Switch on MADC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_MADC,
-                                            AIC32X4_MADCEN, AIC32X4_MADCEN);
-
-                        /* Switch on BCLK_N Divider */
-                        snd_soc_update_bits(codec, AIC32X4_BCLKN,
-                                            AIC32X4_BCLKEN, AIC32X4_BCLKEN);
-                }
+                /* Switch on PLL */
+                snd_soc_update_bits(codec, AIC32X4_PLLPR,
+                                    AIC32X4_PLLEN, AIC32X4_PLLEN);
+
+                /* Switch on NDAC Divider */
+                snd_soc_update_bits(codec, AIC32X4_NDAC,
+                                    AIC32X4_NDACEN, AIC32X4_NDACEN);
+
+                /* Switch on MDAC Divider */
+                snd_soc_update_bits(codec, AIC32X4_MDAC,
+                                    AIC32X4_MDACEN, AIC32X4_MDACEN);
+
+                /* Switch on NADC Divider */
+                snd_soc_update_bits(codec, AIC32X4_NADC,
+                                    AIC32X4_NADCEN, AIC32X4_NADCEN);
+
+                /* Switch on MADC Divider */
+                snd_soc_update_bits(codec, AIC32X4_MADC,
+                                    AIC32X4_MADCEN, AIC32X4_MADCEN);
+
+                /* Switch on BCLK_N Divider */
+                snd_soc_update_bits(codec, AIC32X4_BCLKN,
+                                    AIC32X4_BCLKEN, AIC32X4_BCLKEN);
                 break;
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
-                if (aic32x4->master) {
-                        /* Switch off PLL */
-                        snd_soc_update_bits(codec, AIC32X4_PLLPR,
-                                            AIC32X4_PLLEN, 0);
-
-                        /* Switch off NDAC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_NDAC,
-                                            AIC32X4_NDACEN, 0);
-
-                        /* Switch off MDAC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_MDAC,
-                                            AIC32X4_MDACEN, 0);
-
-                        /* Switch off NADC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_NADC,
-                                            AIC32X4_NADCEN, 0);
-
-                        /* Switch off MADC Divider */
-                        snd_soc_update_bits(codec, AIC32X4_MADC,
-                                            AIC32X4_MADCEN, 0);
-
-                        /* Switch off BCLK_N Divider */
-                        snd_soc_update_bits(codec, AIC32X4_BCLKN,
-                                            AIC32X4_BCLKEN, 0);
-                }
+                /* Switch off PLL */
+                snd_soc_update_bits(codec, AIC32X4_PLLPR,
+                                    AIC32X4_PLLEN, 0);
+
+                /* Switch off NDAC Divider */
+                snd_soc_update_bits(codec, AIC32X4_NDAC,
+                                    AIC32X4_NDACEN, 0);
+
+                /* Switch off MDAC Divider */
+                snd_soc_update_bits(codec, AIC32X4_MDAC,
+                                    AIC32X4_MDACEN, 0);
+
+                /* Switch off NADC Divider */
+                snd_soc_update_bits(codec, AIC32X4_NADC,
+                                    AIC32X4_NADCEN, 0);
+
+                /* Switch off MADC Divider */
+                snd_soc_update_bits(codec, AIC32X4_MADC,
+                                    AIC32X4_MADCEN, 0);
+
+                /* Switch off BCLK_N Divider */
+                snd_soc_update_bits(codec, AIC32X4_BCLKN,
+                                    AIC32X4_BCLKEN, 0);
                 break;
         case SND_SOC_BIAS_OFF:
                 break;
@@ -651,9 +641,11 @@ static int aic32x4_probe(struct snd_soc_codec *codec)
         if (aic32x4->power_cfg & AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE) {
                 snd_soc_write(codec, AIC32X4_PWRCFG, AIC32X4_AVDDWEAKDISABLE);
         }
-        if (aic32x4->power_cfg & AIC32X4_PWR_AIC32X4_LDO_ENABLE) {
-                snd_soc_write(codec, AIC32X4_LDOCTL, AIC32X4_LDOCTLEN);
-        }
+
+        tmp_reg = (aic32x4->power_cfg & AIC32X4_PWR_AIC32X4_LDO_ENABLE) ?
+                        AIC32X4_LDOCTLEN : 0;
+        snd_soc_write(codec, AIC32X4_LDOCTL, tmp_reg);
+
         tmp_reg = snd_soc_read(codec, AIC32X4_CMMODE);
         if (aic32x4->power_cfg & AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36) {
                 tmp_reg |= AIC32X4_LDOIN_18_36;
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index c2880907fced..a75c3766aede 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -733,8 +733,9 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         struct wm2000_priv *wm2000;
         struct wm2000_platform_data *pdata;
         const char *filename;
-        const struct firmware *fw;
-        int reg, ret;
+        const struct firmware *fw = NULL;
+        int ret;
+        int reg;
         u16 id;
 
         wm2000 = devm_kzalloc(&i2c->dev, sizeof(struct wm2000_priv),
@@ -751,7 +752,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
                 ret = PTR_ERR(wm2000->regmap);
                 dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
                         ret);
-                goto err;
+                goto out;
         }
 
         /* Verify that this is a WM2000 */
@@ -763,7 +764,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         if (id != 0x2000) {
                 dev_err(&i2c->dev, "Device is not a WM2000 - ID %x\n", id);
                 ret = -ENODEV;
-                goto err_regmap;
+                goto out_regmap_exit;
         }
 
         reg = wm2000_read(i2c, WM2000_REG_REVISON);
@@ -782,7 +783,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         ret = request_firmware(&fw, filename, &i2c->dev);
         if (ret != 0) {
                 dev_err(&i2c->dev, "Failed to acquire ANC data: %d\n", ret);
-                goto err_regmap;
+                goto out_regmap_exit;
         }
 
         /* Pre-cook the concatenation of the register address onto the image */
@@ -793,15 +794,13 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
         if (wm2000->anc_download == NULL) {
                 dev_err(&i2c->dev, "Out of memory\n");
                 ret = -ENOMEM;
-                goto err_fw;
+                goto out_regmap_exit;
         }
 
         wm2000->anc_download[0] = 0x80;
         wm2000->anc_download[1] = 0x00;
         memcpy(wm2000->anc_download + 2, fw->data, fw->size);
 
-        release_firmware(fw);
-
         wm2000->anc_eng_ena = 1;
         wm2000->anc_active = 1;
         wm2000->spk_ena = 1;
@@ -809,18 +808,14 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
 
         wm2000_reset(wm2000);
 
-        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm2000,
-                                     NULL, 0);
-        if (ret != 0)
-                goto err_fw;
+        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm2000, NULL, 0);
+        if (!ret)
+                goto out;
 
-        return 0;
-
-err_fw:
-        release_firmware(fw);
-err_regmap:
+out_regmap_exit:
         regmap_exit(wm2000->regmap);
-err:
+out:
+        release_firmware(fw);
         return ret;
 }
 
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 8b24323d6b2c..89f2af77b1c3 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -1377,6 +1377,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
 
                         switch (wm5100->rev) {
                         case 0:
+                                regcache_cache_bypass(wm5100->regmap, true);
                                 snd_soc_write(codec, 0x11, 0x3);
                                 snd_soc_write(codec, 0x203, 0xc);
                                 snd_soc_write(codec, 0x206, 0);
@@ -1392,6 +1393,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
                                         snd_soc_write(codec,
                                                       wm5100_reva_patches[i].reg,
                                                       wm5100_reva_patches[i].val);
+                                regcache_cache_bypass(wm5100->regmap, false);
                                 break;
                         default:
                                 break;
@@ -1402,6 +1404,8 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
                 break;
 
         case SND_SOC_BIAS_OFF:
+                regcache_cache_only(wm5100->regmap, true);
+                regcache_mark_dirty(wm5100->regmap);
                 if (wm5100->pdata.ldo_ena)
                         gpio_set_value_cansleep(wm5100->pdata.ldo_ena, 0);
                 regulator_bulk_disable(ARRAY_SIZE(wm5100->core_supplies),
@@ -2180,6 +2184,7 @@ static void wm5100_micd_irq(struct snd_soc_codec *codec)
                 if (wm5100->jack_detecting) {
                         dev_dbg(codec->dev, "Microphone detected\n");
                         wm5100->jack_mic = true;
+                        wm5100->jack_detecting = false;
                         snd_soc_jack_report(wm5100->jack,
                                             SND_JACK_HEADSET,
                                             SND_JACK_HEADSET | SND_JACK_BTN_0);
@@ -2218,6 +2223,7 @@ static void wm5100_micd_irq(struct snd_soc_codec *codec)
                                             SND_JACK_BTN_0);
                 } else if (wm5100->jack_detecting) {
                         dev_dbg(codec->dev, "Headphone detected\n");
+                        wm5100->jack_detecting = false;
                         snd_soc_jack_report(wm5100->jack, SND_JACK_HEADPHONE,
                                             SND_JACK_HEADPHONE);
 
@@ -2607,6 +2613,13 @@ static const struct regmap_config wm5100_regmap = {
         .cache_type = REGCACHE_RBTREE,
 };
 
+static const unsigned int wm5100_mic_ctrl_reg[] = {
+        WM5100_IN1L_CONTROL,
+        WM5100_IN2L_CONTROL,
+        WM5100_IN3L_CONTROL,
+        WM5100_IN4L_CONTROL,
+};
+
 static __devinit int wm5100_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
@@ -2739,7 +2752,7 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c,
         }
 
         for (i = 0; i < ARRAY_SIZE(wm5100->pdata.in_mode); i++) {
-                regmap_update_bits(wm5100->regmap, WM5100_IN1L_CONTROL,
+                regmap_update_bits(wm5100->regmap, wm5100_mic_ctrl_reg[i],
                                    WM5100_IN1_MODE_MASK |
                                    WM5100_IN1_DMIC_SUP_MASK,
                                    (wm5100->pdata.in_mode[i] <<
diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index 8d4ea43d40a3..40ac888faf3d 100644
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -55,7 +55,7 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
                 return 0;
 
         if (fw->size < 32) {
-                dev_err(codec->dev, "%s: firmware too short (%d bytes)\n",
+                dev_err(codec->dev, "%s: firmware too short (%zd bytes)\n",
                         name, fw->size);
                 goto err;
         }
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 296de4e30d26..0ac228b7dc04 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -96,7 +96,7 @@ static int wm8962_regulator_event_##n(struct notifier_block *nb, \
         struct wm8962_priv *wm8962 = container_of(nb, struct wm8962_priv, \
                                                   disable_nb[n]); \
         if (event & REGULATOR_EVENT_DISABLE) { \
-                regcache_cache_only(wm8962->regmap, true);      \
+                regcache_mark_dirty(wm8962->regmap);    \
         } \
         return 0; \
 }
@@ -2564,7 +2564,7 @@ static int dsp2_event(struct snd_soc_dapm_widget *w,
         return 0;
 }
 
-static const char *st_text[] = { "None", "Right", "Left" };
+static const char *st_text[] = { "None", "Left", "Right" };
 
 static const struct soc_enum str_enum =
         SOC_ENUM_SINGLE(WM8962_DAC_DSP_MIXING_1, 2, 3, st_text);
@@ -3159,13 +3159,13 @@ static int wm8962_hw_params(struct snd_pcm_substream *substream,
         case SNDRV_PCM_FORMAT_S16_LE:
                 break;
         case SNDRV_PCM_FORMAT_S20_3LE:
-                aif0 |= 0x40;
+                aif0 |= 0x4;
                 break;
         case SNDRV_PCM_FORMAT_S24_LE:
-                aif0 |= 0x80;
+                aif0 |= 0x8;
                 break;
         case SNDRV_PCM_FORMAT_S32_LE:
-                aif0 |= 0xc0;
+                aif0 |= 0xc;
                 break;
         default:
                 return -EINVAL;
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 93d27b660257..ec69a6c152fe 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -770,6 +770,8 @@ static void vmid_reference(struct snd_soc_codec *codec)
 {
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
+        pm_runtime_get_sync(codec->dev);
+
         wm8994->vmid_refcount++;
 
         dev_dbg(codec->dev, "Referencing VMID, refcount is now %d\n",
@@ -783,7 +785,12 @@ static void vmid_reference(struct snd_soc_codec *codec)
                                     WM8994_VMID_RAMP_MASK,
                                     WM8994_STARTUP_BIAS_ENA |
                                     WM8994_VMID_BUF_ENA |
-                                    (0x11 << WM8994_VMID_RAMP_SHIFT));
+                                    (0x3 << WM8994_VMID_RAMP_SHIFT));
+
+                /* Remove discharge for line out */
+                snd_soc_update_bits(codec, WM8994_ANTIPOP_1,
+                                    WM8994_LINEOUT1_DISCH |
+                                    WM8994_LINEOUT2_DISCH, 0);
 
                 /* Main bias enable, VMID=2x40k */
                 snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
@@ -837,6 +844,8 @@ static void vmid_dereference(struct snd_soc_codec *codec)
                                     WM8994_VMID_BUF_ENA |
                                     WM8994_VMID_RAMP_MASK, 0);
         }
+
+        pm_runtime_put(codec->dev);
 }
 
 static int vmid_event(struct snd_soc_dapm_widget *w,
@@ -2753,11 +2762,6 @@ static int wm8994_resume(struct snd_soc_codec *codec)
                 codec->cache_only = 0;
         }
 
-        /* Restore the registers */
-        ret = snd_soc_cache_sync(codec);
-        if (ret != 0)
-                dev_err(codec->dev, "Failed to sync cache: %d\n", ret);
-
         wm8994_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) {
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index d8da10fe5b52..61f7daa4d0e6 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -108,7 +108,7 @@ static int wm8996_regulator_event_##n(struct notifier_block *nb, \
         struct wm8996_priv *wm8996 = container_of(nb, struct wm8996_priv, \
                                                   disable_nb[n]); \
         if (event & REGULATOR_EVENT_DISABLE) { \
-                regcache_cache_only(wm8996->regmap, true);      \
+                regcache_mark_dirty(wm8996->regmap);    \
         } \
         return 0; \
 }
@@ -1120,7 +1120,8 @@ SND_SOC_DAPM_SUPPLY_S("SYSCLK", 1, WM8996_AIF_CLOCKING_1, 0, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY_S("SYSDSPCLK", 2, WM8996_CLOCKING_1, 1, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY_S("AIFCLK", 2, WM8996_CLOCKING_1, 2, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY_S("Charge Pump", 2, WM8996_CHARGE_PUMP_1, 15, 0, cp_event,
-                      SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+                      SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                      SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("Bandgap", SND_SOC_NOPM, 0, 0, bg_event,
                     SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("LDO2", WM8996_POWER_MANAGEMENT_2, 1, 0, NULL, 0),
@@ -2007,6 +2008,7 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai,
         struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
         int lfclk = 0;
         int ratediv = 0;
+        int sync = WM8996_REG_SYNC;
         int src;
         int old;
 
@@ -2051,6 +2053,7 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai,
         case 32000:
         case 32768:
                 lfclk = WM8996_LFCLK_ENA;
+                sync = 0;
                 break;
         default:
                 dev_warn(codec->dev, "Unsupported clock rate %dHz\n",
@@ -2064,6 +2067,8 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai,
                             WM8996_SYSCLK_SRC_MASK | WM8996_SYSCLK_DIV_MASK,
                             src << WM8996_SYSCLK_SRC_SHIFT | ratediv);
         snd_soc_update_bits(codec, WM8996_CLOCKING_1, WM8996_LFCLK_ENA, lfclk);
+        snd_soc_update_bits(codec, WM8996_CONTROL_INTERFACE_1,
+                            WM8996_REG_SYNC, sync);
         snd_soc_update_bits(codec, WM8996_AIF_CLOCKING_1,
                             WM8996_SYSCLK_ENA, old);
 
diff --git a/sound/soc/codecs/wm8996.h b/sound/soc/codecs/wm8996.h
index 0fde643194ce..de9ac3e44aec 100644
--- a/sound/soc/codecs/wm8996.h
+++ b/sound/soc/codecs/wm8996.h
@@ -1567,6 +1567,10 @@ int wm8996_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
 /*
  * R257 (0x101) - Control Interface (1)
  */
+#define WM8996_REG_SYNC                         0x8000  /* REG_SYNC */
+#define WM8996_REG_SYNC_MASK                    0x8000  /* REG_SYNC */
+#define WM8996_REG_SYNC_SHIFT                       15  /* REG_SYNC */
+#define WM8996_REG_SYNC_WIDTH                        1  /* REG_SYNC */
 #define WM8996_AUTO_INC                         0x0004  /* AUTO_INC */
 #define WM8996_AUTO_INC_MASK                    0x0004  /* AUTO_INC */
 #define WM8996_AUTO_INC_SHIFT                        2  /* AUTO_INC */
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 2a61094075f8..8a68cea4a3ee 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -586,14 +586,14 @@ SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER1, 0, 1, 0),
 };
 
 static const struct snd_kcontrol_new line2_mix[] = {
-SOC_DAPM_SINGLE("IN2R Switch", WM8993_LINE_MIXER2, 2, 1, 0),
-SOC_DAPM_SINGLE("IN2L Switch", WM8993_LINE_MIXER2, 1, 1, 0),
+SOC_DAPM_SINGLE("IN1L Switch", WM8993_LINE_MIXER2, 2, 1, 0),
+SOC_DAPM_SINGLE("IN1R Switch", WM8993_LINE_MIXER2, 1, 1, 0),
 SOC_DAPM_SINGLE("Output Switch", WM8993_LINE_MIXER2, 0, 1, 0),
 };
 
 static const struct snd_kcontrol_new line2n_mix[] = {
-SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER2, 6, 1, 0),
-SOC_DAPM_SINGLE("Right Output Switch", WM8993_LINE_MIXER2, 5, 1, 0),
+SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER2, 5, 1, 0),
+SOC_DAPM_SINGLE("Right Output Switch", WM8993_LINE_MIXER2, 6, 1, 0),
 };
 
 static const struct snd_kcontrol_new line2p_mix[] = {
@@ -613,6 +613,8 @@ SND_SOC_DAPM_INPUT("IN2RP:VXRP"),
 SND_SOC_DAPM_SUPPLY("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0, NULL, 0),
 
+SND_SOC_DAPM_SUPPLY("LINEOUT_VMID_BUF", WM8993_ANTIPOP1, 7, 0, NULL, 0),
+
 SND_SOC_DAPM_MIXER("IN1L PGA", WM8993_POWER_MANAGEMENT_2, 6, 0,
                    in1l_pga, ARRAY_SIZE(in1l_pga)),
 SND_SOC_DAPM_MIXER("IN1R PGA", WM8993_POWER_MANAGEMENT_2, 4, 0,
@@ -834,9 +836,11 @@ static const struct snd_soc_dapm_route lineout1_diff_routes[] = {
 };
 
 static const struct snd_soc_dapm_route lineout1_se_routes[] = {
+        { "LINEOUT1N Mixer", NULL, "LINEOUT_VMID_BUF" },
         { "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" },
         { "LINEOUT1N Mixer", "Right Output Switch", "Right Output PGA" },
 
+        { "LINEOUT1P Mixer", NULL, "LINEOUT_VMID_BUF" },
         { "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" },
 
         { "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" },
@@ -844,8 +848,8 @@ static const struct snd_soc_dapm_route lineout1_se_routes[] = {
 };
 
 static const struct snd_soc_dapm_route lineout2_diff_routes[] = {
-        { "LINEOUT2 Mixer", "IN2L Switch", "IN2L PGA" },
-        { "LINEOUT2 Mixer", "IN2R Switch", "IN2R PGA" },
+        { "LINEOUT2 Mixer", "IN1L Switch", "IN1L PGA" },
+        { "LINEOUT2 Mixer", "IN1R Switch", "IN1R PGA" },
         { "LINEOUT2 Mixer", "Output Switch", "Right Output PGA" },
 
         { "LINEOUT2N Driver", NULL, "LINEOUT2 Mixer" },
@@ -853,9 +857,11 @@ static const struct snd_soc_dapm_route lineout2_diff_routes[] = {
 };
 
 static const struct snd_soc_dapm_route lineout2_se_routes[] = {
+        { "LINEOUT2N Mixer", NULL, "LINEOUT_VMID_BUF" },
         { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" },
         { "LINEOUT2N Mixer", "Right Output Switch", "Right Output PGA" },
 
+        { "LINEOUT2P Mixer", NULL, "LINEOUT_VMID_BUF" },
         { "LINEOUT2P Mixer", "Right Output Switch", "Right Output PGA" },
 
         { "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" },
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index dccfb37a9626..f204dbac11d4 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -124,6 +124,8 @@ static int mxs_saif_set_clk(struct mxs_saif *saif,
          *
          * If MCLK is not used, we just set saif clk to 512*fs.
          */
+        clk_prepare_enable(master_saif->clk);
+
         if (master_saif->mclk_in_use) {
                 if (mclk % 32 == 0) {
                         scr &= ~BM_SAIF_CTRL_BITCLK_BASE_RATE;
@@ -133,6 +135,7 @@ static int mxs_saif_set_clk(struct mxs_saif *saif,
                         ret = clk_set_rate(master_saif->clk, 384 * rate);
                 } else {
                         /* SAIF MCLK should be either 32x or 48x */
+                        clk_disable_unprepare(master_saif->clk);
                         return -EINVAL;
                 }
         } else {
@@ -140,6 +143,8 @@ static int mxs_saif_set_clk(struct mxs_saif *saif,
                 scr &= ~BM_SAIF_CTRL_BITCLK_BASE_RATE;
         }
 
+        clk_disable_unprepare(master_saif->clk);
+
         if (ret)
                 return ret;
 
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index 7ac0ba2025c3..c6012ff5bd3e 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -230,8 +230,6 @@ static const struct snd_kcontrol_new neo1973_wm8753_controls[] = {
 
 /* GTA02 specific routes and controls */
 
-#ifdef CONFIG_MACH_NEO1973_GTA02
-
 static int gta02_speaker_enabled;
 
 static int lm4853_set_spk(struct snd_kcontrol *kcontrol,
@@ -311,10 +309,6 @@ static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
         return 0;
 }
 
-#else
-static int neo1973_gta02_wm8753_init(struct snd_soc_code *codec) { return 0; }
-#endif
-
 static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
@@ -322,10 +316,6 @@ static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
         int ret;
 
         /* set up NC codec pins */
-        if (machine_is_neo1973_gta01()) {
-                snd_soc_dapm_nc_pin(dapm, "LOUT2");
-                snd_soc_dapm_nc_pin(dapm, "ROUT2");
-        }
         snd_soc_dapm_nc_pin(dapm, "OUT3");
         snd_soc_dapm_nc_pin(dapm, "OUT4");
         snd_soc_dapm_nc_pin(dapm, "LINE1");
@@ -370,50 +360,6 @@ static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
         return 0;
 }
 
-/* GTA01 specific controls */
-
-#ifdef CONFIG_MACH_NEO1973_GTA01
-
-static const struct snd_soc_dapm_route neo1973_lm4857_routes[] = {
-        {"Amp IN", NULL, "ROUT1"},
-        {"Amp IN", NULL, "LOUT1"},
-
-        {"Handset Spk", NULL, "Amp EP"},
-        {"Stereo Out", NULL, "Amp LS"},
-        {"Headphone", NULL, "Amp HP"},
-};
-
-static const struct snd_soc_dapm_widget neo1973_lm4857_dapm_widgets[] = {
-        SND_SOC_DAPM_SPK("Handset Spk", NULL),
-        SND_SOC_DAPM_SPK("Stereo Out", NULL),
-        SND_SOC_DAPM_HP("Headphone", NULL),
-};
-
-static int neo1973_lm4857_init(struct snd_soc_dapm_context *dapm)
-{
-        int ret;
-
-        ret = snd_soc_dapm_new_controls(dapm, neo1973_lm4857_dapm_widgets,
-                        ARRAY_SIZE(neo1973_lm4857_dapm_widgets));
-        if (ret)
-                return ret;
-
-        ret = snd_soc_dapm_add_routes(dapm, neo1973_lm4857_routes,
-                        ARRAY_SIZE(neo1973_lm4857_routes));
-        if (ret)
-                return ret;
-
-        snd_soc_dapm_ignore_suspend(dapm, "Stereo Out");
-        snd_soc_dapm_ignore_suspend(dapm, "Handset Spk");
-        snd_soc_dapm_ignore_suspend(dapm, "Headphone");
-
-        return 0;
-}
-
-#else
-static int neo1973_lm4857_init(struct snd_soc_dapm_context *dapm) { return 0; };
-#endif
-
 static struct snd_soc_dai_link neo1973_dai[] = {
 { /* Hifi Playback - for similatious use with voice below */
         .name = "WM8753",
@@ -440,11 +386,6 @@ static struct snd_soc_aux_dev neo1973_aux_devs[] = {
                 .name = "dfbmcs320",
                 .codec_name = "dfbmcs320.0",
         },
-        {
-                .name = "lm4857",
-                .codec_name = "lm4857.0-007c",
-                .init = neo1973_lm4857_init,
-        },
 };
 
 static struct snd_soc_codec_conf neo1973_codec_conf[] = {
@@ -454,14 +395,10 @@ static struct snd_soc_codec_conf neo1973_codec_conf[] = {
         },
 };
 
-#ifdef CONFIG_MACH_NEO1973_GTA02
 static const struct gpio neo1973_gta02_gpios[] = {
         { GTA02_GPIO_HP_IN, GPIOF_OUT_INIT_HIGH, "GTA02_HP_IN" },
         { GTA02_GPIO_AMP_SHUT, GPIOF_OUT_INIT_HIGH, "GTA02_AMP_SHUT" },
 };
-#else
-static const struct gpio neo1973_gta02_gpios[] = {};
-#endif
 
 static struct snd_soc_card neo1973 = {
         .name = "neo1973",
@@ -480,7 +417,7 @@ static int __init neo1973_init(void)
 {
         int ret;
 
-        if (!machine_is_neo1973_gta01() && !machine_is_neo1973_gta02())
+        if (!machine_is_neo1973_gta02())
                 return -ENODEV;
 
         if (machine_is_neo1973_gta02()) {
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index db6c89a28bda..ea4a82d01160 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1152,12 +1152,8 @@ static snd_pcm_uframes_t fsi_pointer(struct snd_pcm_substream *substream)
 {
         struct fsi_priv *fsi = fsi_get_priv(substream);
         struct fsi_stream *io = fsi_get_stream(fsi, fsi_is_play(substream));
-        int samples_pos = io->buff_sample_pos - 1;
 
-        if (samples_pos < 0)
-                samples_pos = 0;
-
-        return fsi_sample2frame(fsi, samples_pos);
+        return fsi_sample2frame(fsi, io->buff_sample_pos);
 }
 
 static struct snd_pcm_ops fsi_pcm_ops = {
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b5ecf6d23214..92cee24ed2dc 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -567,6 +567,17 @@ int snd_soc_suspend(struct device *dev)
                 if (!codec->suspended && codec->driver->suspend) {
                         switch (codec->dapm.bias_level) {
                         case SND_SOC_BIAS_STANDBY:
+                                /*
+                                 * If the CODEC is capable of idle
+                                 * bias off then being in STANDBY
+                                 * means it's doing something,
+                                 * otherwise fall through.
+                                 */
+                                if (codec->dapm.idle_bias_off) {
+                                        dev_dbg(codec->dev,
+                                                "idle_bias_off CODEC on over suspend\n");
+                                        break;
+                                }
                         case SND_SOC_BIAS_OFF:
                                 codec->driver->suspend(codec);
                                 codec->suspended = 1;
diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c
index 2cf87f5afed4..fde9a7a29cb6 100644
--- a/sound/usb/caiaq/audio.c
+++ b/sound/usb/caiaq/audio.c
@@ -311,8 +311,10 @@ snd_usb_caiaq_pcm_pointer(struct snd_pcm_substream *sub)
 
         spin_lock(&dev->spinlock);
 
-        if (dev->input_panic || dev->output_panic)
+        if (dev->input_panic || dev->output_panic) {
                 ptr = SNDRV_PCM_POS_XRUN;
+                goto unlock;
+        }
 
         if (sub->stream == SNDRV_PCM_STREAM_PLAYBACK)
                 ptr = bytes_to_frames(sub->runtime,
@@ -321,6 +323,7 @@ snd_usb_caiaq_pcm_pointer(struct snd_pcm_substream *sub)
                 ptr = bytes_to_frames(sub->runtime,
                                         dev->audio_in_buf_pos[index]);
 
+unlock:
         spin_unlock(&dev->spinlock);
         return ptr;
 }
diff --git a/sound/usb/card.h b/sound/usb/card.h
index a39edcc32a93..da5fa1ac4eda 100644
--- a/sound/usb/card.h
+++ b/sound/usb/card.h
@@ -1,6 +1,7 @@
 #ifndef __USBAUDIO_CARD_H
 #define __USBAUDIO_CARD_H
 
+#define MAX_NR_RATES    1024
 #define MAX_PACKS       20
 #define MAX_PACKS_HS    (MAX_PACKS * 8) /* in high speed mode */
 #define MAX_URBS        8
diff --git a/sound/usb/format.c b/sound/usb/format.c
index e09aba19375c..ddfef57c4c9f 100644
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -209,8 +209,6 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof
         return 0;
 }
 
-#define MAX_UAC2_NR_RATES 1024
-
 /*
  * Helper function to walk the array of sample rate triplets reported by
  * the device. The problem is that we need to parse whole array first to
@@ -255,7 +253,7 @@ static int parse_uac2_sample_rate_range(struct audioformat *fp, int nr_triplets,
                         fp->rates |= snd_pcm_rate_to_rate_bit(rate);
 
                         nr_rates++;
-                        if (nr_rates >= MAX_UAC2_NR_RATES) {
+                        if (nr_rates >= MAX_NR_RATES) {
                                 snd_printk(KERN_ERR "invalid uac2 rates\n");
                                 break;
                         }
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 8edc5035fc8f..d89ab4c7d44b 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -1618,6 +1618,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 {
+        /* Edirol UM-3G */
+        USB_DEVICE_VENDOR_SPEC(0x0582, 0x0108),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .ifnum = 0,
+                .type = QUIRK_MIDI_STANDARD_INTERFACE
+        }
+},
+{
         /* Boss JS-8 Jam Station  */
         USB_DEVICE(0x0582, 0x0109),
         .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index a3ddac0deffd..27817266867a 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -132,10 +132,14 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
         unsigned *rate_table = NULL;
 
         fp = kmemdup(quirk->data, sizeof(*fp), GFP_KERNEL);
-        if (! fp) {
+        if (!fp) {
                 snd_printk(KERN_ERR "cannot memdup\n");
                 return -ENOMEM;
         }
+        if (fp->nr_rates > MAX_NR_RATES) {
+                kfree(fp);
+                return -EINVAL;
+        }
         if (fp->nr_rates > 0) {
                 rate_table = kmemdup(fp->rate_table,
                                      sizeof(int) * fp->nr_rates, GFP_KERNEL);
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index ac86d67b636e..7c12650165ae 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -104,7 +104,7 @@ endif
 
 CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
 EXTLIBS = -lpthread -lrt -lelf -lm
-ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 ALL_LDFLAGS = $(LDFLAGS)
 STRIP ?= strip
 
@@ -168,10 +168,7 @@ endif
 
 ### --- END CONFIGURATION SECTION ---
 
-# Those must not be GNU-specific; they are shared with perl/ which may
-# be built by a different compiler. (Note that this is an artifact now
-# but it still might be nice to keep that distinction.)
-BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include
+BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 BASIC_LDFLAGS =
 
 # Guard against environment variables
diff --git a/tools/perf/bench/mem-memcpy-x86-64-asm.S b/tools/perf/bench/mem-memcpy-x86-64-asm.S
index a57b66e853c2..185a96d66dd1 100644
--- a/tools/perf/bench/mem-memcpy-x86-64-asm.S
+++ b/tools/perf/bench/mem-memcpy-x86-64-asm.S
@@ -1,2 +1,8 @@
 
 #include "../../../arch/x86/lib/memcpy_64.S"
+/*
+ * We need to provide note.GNU-stack section, saying that we want
+ * NOT executable stack. Otherwise the final linking will assume that
+ * the ELF stack should not be restricted at all and set it RWX.
+ */
+.section .note.GNU-stack,"",@progbits
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 59d43abfbfec..fb8566181f27 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#define _GNU_SOURCE
 #include <sys/utsname.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -31,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#undef _GNU_SOURCE
 #include "perf.h"
 #include "builtin.h"
 #include "util/util.h"
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 8f80df896038..dd162aa24baa 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -89,8 +89,6 @@ void get_term_dimensions(struct winsize *ws)
 
 static void perf_top__update_print_entries(struct perf_top *top)
 {
-        top->print_entries = top->winsize.ws_row;
-
         if (top->print_entries > 9)
                 top->print_entries -= 9;
 }
@@ -100,6 +98,13 @@ static void perf_top__sig_winch(int sig __used, siginfo_t *info __used, void *ar
         struct perf_top *top = arg;
 
         get_term_dimensions(&top->winsize);
+        if (!top->print_entries
+            || (top->print_entries+4) > top->winsize.ws_row) {
+                top->print_entries = top->winsize.ws_row;
+        } else {
+                top->print_entries += 4;
+                top->winsize.ws_row = top->print_entries;
+        }
         perf_top__update_print_entries(top);
 }
 
@@ -453,8 +458,10 @@ static void perf_top__handle_keypress(struct perf_top *top, int c)
                                 };
                                 perf_top__sig_winch(SIGWINCH, NULL, top);
                                 sigaction(SIGWINCH, &act, NULL);
-                        } else
+                        } else {
+                                perf_top__sig_winch(SIGWINCH, NULL, top);
                                 signal(SIGWINCH, SIG_DFL);
+                        }
                         break;
                 case 'E':
                         if (top->evlist->nr_entries > 1) {
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 73ddaf06b8e7..2044324b755a 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -554,7 +554,7 @@ static int perf_event__process_kernel_mmap(struct perf_tool *tool __used,
 
         is_kernel_mmap = memcmp(event->mmap.filename,
                                 kmmap_prefix,
-                                strlen(kmmap_prefix)) == 0;
+                                strlen(kmmap_prefix) - 1) == 0;
         if (event->mmap.filename[0] == '/' ||
             (!is_kernel_mmap && event->mmap.filename[0] == '[')) {
 
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 667f3b78bb2c..7132ee834e0e 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -463,6 +463,7 @@ int perf_event__parse_sample(const union perf_event *event, u64 type,
         memset(data, 0, sizeof(*data));
         data->cpu = data->pid = data->tid = -1;
         data->stream_id = data->id = data->time = -1ULL;
+        data->period = 1;
 
         if (event->header.type != PERF_RECORD_SAMPLE) {
                 if (!sample_id_all)
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 3e7e0b09c12c..ecd7f4dd7eea 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2105,7 +2105,7 @@ int perf_event__synthesize_event_type(struct perf_tool *tool,
         strncpy(ev.event_type.event_type.name, name, MAX_EVENT_NAME - 1);
 
         ev.event_type.header.type = PERF_RECORD_HEADER_EVENT_TYPE;
-        size = strlen(name);
+        size = strlen(ev.event_type.event_type.name);
         size = ALIGN(size, sizeof(u64));
         ev.event_type.header.size = sizeof(ev.event_type) -
                 (sizeof(ev.event_type.event_type.name) - size);
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index eb25900e2211..29cb65459811 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -19,7 +19,6 @@
  *
  */
 
-#define _GNU_SOURCE
 #include <sys/utsname.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -33,7 +32,6 @@
 #include <limits.h>
 #include <elf.h>
 
-#undef _GNU_SOURCE
 #include "util.h"
 #include "event.h"
 #include "string.h"
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 215d50f2042e..0975438c3e72 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1,4 +1,3 @@
-#define _GNU_SOURCE
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 6c164dc9ee95..1a8d4dc4f386 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -21,14 +21,13 @@
  *  The parts for function graph printing was taken and modified from the
  *  Linux Kernel that were written by Frederic Weisbecker.
  */
-#define _GNU_SOURCE
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 
-#undef _GNU_SOURCE
 #include "../perf.h"
 #include "util.h"
 #include "trace-event.h"
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index 1212a386a033..e81aef1f2569 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -1,6 +1,4 @@
-#define _GNU_SOURCE
 #include <stdio.h>
-#undef _GNU_SOURCE
 #include "../libslang.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/perf/util/ui/helpline.c b/tools/perf/util/ui/helpline.c
index 6ef3c5691762..4f48f5901b30 100644
--- a/tools/perf/util/ui/helpline.c
+++ b/tools/perf/util/ui/helpline.c
@@ -1,4 +1,3 @@
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index b9c530cce79a..ecf9898169c8 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -40,7 +40,6 @@
 #define decimal_length(x)       ((int)(sizeof(x) * 2.56 + 0.5) + 1)
 
 #define _ALL_SOURCE 1
-#define _GNU_SOURCE 1
 #define _BSD_SOURCE 1
 #define HAS_BOOL
 
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 7287bf5d1c9e..a91f980077d8 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1543,7 +1543,7 @@ void mark_page_dirty_in_slot(struct kvm *kvm, struct kvm_memory_slot *memslot,
         if (memslot && memslot->dirty_bitmap) {
                 unsigned long rel_gfn = gfn - memslot->base_gfn;
 
-                if (!__test_and_set_bit_le(rel_gfn, memslot->dirty_bitmap))
+                if (!test_and_set_bit_le(rel_gfn, memslot->dirty_bitmap))
                         memslot->nr_dirty_pages++;
         }
 }